Benjamin Dalsass
|
0819b9baba
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts:
# composer.json
# composer.lock
# core/config.class.inc.php
# core/dbobject.class.php
# core/email.class.inc.php
# datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/it.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/ja.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/nl.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/ru.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/sk.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/tr.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig
# datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
# datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
# datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml
# dictionaries/cs.dictionary.itop.core.php
# dictionaries/cs.dictionary.itop.ui.php
# dictionaries/da.dictionary.itop.core.php
# dictionaries/da.dictionary.itop.ui.php
# dictionaries/de.dictionary.itop.core.php
# dictionaries/de.dictionary.itop.ui.php
# dictionaries/en.dictionary.itop.ui.php
# dictionaries/es_cr.dictionary.itop.core.php
# dictionaries/es_cr.dictionary.itop.ui.php
# dictionaries/fr.dictionary.itop.core.php
# dictionaries/fr.dictionary.itop.ui.php
# dictionaries/hu.dictionary.itop.core.php
# dictionaries/hu.dictionary.itop.ui.php
# dictionaries/it.dictionary.itop.core.php
# dictionaries/it.dictionary.itop.ui.php
# dictionaries/ja.dictionary.itop.core.php
# dictionaries/ja.dictionary.itop.ui.php
# dictionaries/nl.dictionary.itop.core.php
# dictionaries/nl.dictionary.itop.ui.php
# dictionaries/pt_br.dictionary.itop.core.php
# dictionaries/pt_br.dictionary.itop.ui.php
# dictionaries/ru.dictionary.itop.core.php
# dictionaries/ru.dictionary.itop.ui.php
# dictionaries/sk.dictionary.itop.core.php
# dictionaries/sk.dictionary.itop.ui.php
# dictionaries/tr.dictionary.itop.core.php
# dictionaries/tr.dictionary.itop.ui.php
# dictionaries/zh_cn.dictionary.itop.core.php
# dictionaries/zh_cn.dictionary.itop.ui.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_real.php
# lib/composer/autoload_static.php
# lib/composer/installed.json
# lib/composer/installed.php
# sources/application/TwigBase/Controller/Controller.php
# sources/application/TwigBase/Twig/TwigHelper.php
|
2022-06-02 16:30:48 +02:00 |
|
Christian Beer
|
6cf781da33
|
🌐 Improve German translation (#277)
Many thanks @ChristianBeer for this great contribution, and @larhip for the validation !
|
2022-03-10 14:16:59 +01:00 |
|
Pierre Goiffon
|
8578d18e7f
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts:
# core/cmdbsource.class.inc.php
# core/config.class.inc.php
# core/displayablegraph.class.inc.php
# core/log.class.inc.php
# datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php
# datamodels/2.x/itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php
# datamodels/2.x/itop-tickets/tr.dict.itop-tickets.php
# datamodels/2.x/itop-welcome-itil/tr.dict.itop-welcome-itil.php
# dictionaries/tr.dictionary.itop.core.php
# dictionaries/tr.dictionary.itop.ui.php
# pages/UI.php
# setup/itopdesignformat.class.inc.php
# test/core/LogAPITest.php
# test/integration/iTopModulesPhpVersionChecklistTest.php
# test/postbuild_integration/SetupCssIntegrityChecklistTest.php
# test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php
# test/status/StatusTest.php
|
2022-01-10 16:15:00 +01:00 |
|
annProg
|
05e98be6c7
|
🌐 Person Name for chinese user
|
2021-12-13 15:38:57 +01:00 |
|
Purple Grape
|
a00f4156ea
|
improved translation for ZH_CN
|
2021-12-13 15:36:15 +01:00 |
|
Pierre Goiffon
|
f57785e422
|
Merge remote-tracking branch 'origin/support/2.7' into develop
# Conflicts:
# datamodels/2.x/authent-local/dictionaries/es_cr.dict.authent-local.php
# datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
# datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php
# datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
# datamodels/2.x/itop-welcome-itil/es_cr.dict.itop-welcome-itil.php
# dictionaries/es_cr.dictionary.itop.ui.php
# test/integration/DictionariesConsistencyTest.php
|
2021-11-22 09:08:34 +01:00 |
|
Pierre Goiffon
|
67fa156c0e
|
Merge remote-tracking branch 'origin/support/2.7' into develop
# Conflicts:
# application/dashboard.class.inc.php
# core/action.class.inc.php
# datamodels/2.x/combodo-db-tools/dictionaries/es_cr.dict.combodo-db-tools.php
# datamodels/2.x/itop-attachments/dictionaries/es_cr.dict.itop-attachments.php
# datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
# datamodels/2.x/itop-core-update/dictionaries/es_cr.dict.itop-core-update.php
# datamodels/2.x/itop-hub-connector/dictionaries/es_cr.dict.itop-hub-connector.php
# datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-portal-base/dictionaries/es_cr.dict.itop-portal-base.php
# datamodels/2.x/itop-request-mgmt-itil/dictionaries/es_cr.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt/dictionaries/es_cr.dict.itop-request-mgmt.php
# datamodels/2.x/itop-sla-computation/dictionaries/es_cr.dict.itop-sla-computation.php
# datamodels/2.x/itop-storage-mgmt/dictionaries/es_cr.dict.itop-storage-mgmt.php
# datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
# datamodels/2.x/itop-virtualization-mgmt/dictionaries/es_cr.dict.itop-virtualization-mgmt.php
# datamodels/2.x/itop-welcome-itil/es_cr.dict.itop-welcome-itil.php
# dictionaries/es_cr.dictionary.itop.core.php
# dictionaries/es_cr.dictionary.itop.ui.php
# pages/ajax.render.php
# setup/wizardsteps.class.inc.php
# synchro/synchro_import.php
|
2021-11-19 10:28:46 +01:00 |
|
Molkobain
|
58e35ea33b
|
N°1047 - Replace hard coded 'iTop' occurrences with ITOP_APPLICATION_SHORT
|
2021-08-14 22:43:29 +02:00 |
|
Stephen Abello
|
7a770b32ee
|
N°4082 Update German translations (many thanks to ITOMIG!)
|
2021-06-16 14:44:51 +02:00 |
|
Purple Grape
|
6b899d3f77
|
🌐 improved chinese for 3.0 (#207)
|
2021-04-16 11:00:16 +02:00 |
|
Molkobain
|
deed948f54
|
N°3936 - Remove 🌕 emoji from the theme label, it's was a bit too much 😁
|
2021-04-09 09:05:52 +02:00 |
|
Molkobain
|
e527324468
|
N°3936 - Update dictionaries
|
2021-04-08 18:26:18 +02:00 |
|
Molkobain
|
8ccada40d1
|
N°3936 - Add user preference to choose backoffice theme
|
2021-04-08 18:26:18 +02:00 |
|
Purple Grape
|
8a4372762e
|
🌐 ZH translations for iTop 3.0 (#198)
Many thanks @purplegrape !
|
2021-03-30 09:42:31 +02:00 |
|
Pierre Goiffon
|
fdf01b770a
|
🚚 Move dict files to dictionaries subdirectory
Affected modules in datamodels/2.x :
- itop-bridge-cmdb-ticket
- itop-portal
- itop-structure
|
2021-03-23 19:12:13 +01:00 |
|