Eric Espie
6ae8a72a35
Add Fast setup for developers
2024-10-29 10:51:16 +01:00
Timothee
09a5d7a35f
Automated dictionaries synchronization with english reference
2024-06-11 16:38:40 +02:00
Molkobain
ad36066126
📝 Copyright year bump
2024-05-06 18:35:31 +02:00
Pierre Goiffon
391c78ae42
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# datamodels/2.x/combodo-db-tools/dictionaries/zh_cn.dict.combodo-db-tools.php
# datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php
# datamodels/2.x/itop-backup/dictionaries/da.dict.itop-backup.php
# datamodels/2.x/itop-backup/dictionaries/it.dict.itop-backup.php
# datamodels/2.x/itop-backup/dictionaries/ja.dict.itop-backup.php
# datamodels/2.x/itop-backup/dictionaries/sk.dict.itop-backup.php
# datamodels/2.x/itop-backup/dictionaries/tr.dict.itop-backup.php
# datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config/dictionaries/da.dict.itop-config.php
# datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php
# datamodels/2.x/itop-config/dictionaries/ja.dict.itop-config.php
# datamodels/2.x/itop-config/dictionaries/sk.dict.itop-config.php
# datamodels/2.x/itop-config/dictionaries/tr.dict.itop-config.php
# datamodels/2.x/itop-core-update/dictionaries/cs.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/da.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/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-faq-light/dictionaries/zh_cn.dict.itop-faq-light.php
# datamodels/2.x/itop-files-information/dictionaries/de.dict.itop-files-information.php
# datamodels/2.x/itop-files-information/dictionaries/pl.dict.itop-files-information.php
# datamodels/2.x/itop-files-information/dictionaries/zh_cn.dict.itop-files-information.php
# datamodels/2.x/itop-hub-connector/dictionaries/pt_br.dict.itop-hub-connector.php
# datamodels/2.x/itop-oauth-client/dictionaries/cs.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/da.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/es_cr.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/it.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/ja.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/nl.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/pt_br.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/ru.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/sk.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/tr.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/zh_cn.dict.itop-oauth-client.php
# datamodels/2.x/itop-service-mgmt-provider/dictionaries/de.dict.itop-service-mgmt-provider.php
# datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php
# datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php
# datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php
# datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php
# dictionaries/cs.dictionary.itop.ui.php
# dictionaries/da.dictionary.itop.core.php
# dictionaries/da.dictionary.itop.ui.php
# dictionaries/de.dictionary.itop.ui.php
# dictionaries/en.dictionary.itop.ui.php
# dictionaries/es_cr.dictionary.itop.ui.php
# dictionaries/fr.dictionary.itop.ui.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.ui.php
# dictionaries/pl.dictionary.itop.core.php
# dictionaries/pl.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
# tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php
2024-02-14 14:21:22 +01:00
Pierre Goiffon
0b1bdfff55
N°7246 Fix dict files : translated keys with tildes
...
Note that there were some keys in EN files with tildes at the end
2024-02-14 11:20:02 +01:00
Timothee
f548dc2898
Dictionaries update for 3.1 beta
2023-06-15 09:47:51 +02:00
BenGrenoble
33818e188b
N°6200 - Hamonize menu entries - Fix missing entries
2023-04-27 17:39:14 +02:00
Molkobain
c767ebe989
📝 Copyright year bump
2023-03-17 18:28:47 +01:00
bdalsass
2b885beb82
Feature/merge 3 0 develop ( #298 )
...
* merging 3.0 into develop
* N°5102 - Allow to send emails (eg. notifications) using GSuite SMTP and OAuth
* migration to iTop 3.1
Co-authored-by: Eric Espie <eric.espie@combodo.com >
2022-06-08 16:27:20 +02:00
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
acognet
779211e638
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# datamodels/2.x/itop-core-update/dictionaries/cs.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/da.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/de.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/en.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/es_cr.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/fr.dict.itop-core-update.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/SelectUpdateFile.html.twig
# datamodels/2.x/itop-datacenter-mgmt/dictionaries/pl.dict.itop-datacenter-mgmt.php
# datamodels/2.x/itop-endusers-devices/dictionaries/pl.dict.itop-endusers-devices.php
# datamodels/2.x/itop-files-information/src/Service/FilesIntegrity.php
2022-03-14 15:17:28 +01:00
Molkobain
143c30b099
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# datamodels/2.x/itop-core-update/cs.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/da.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/de.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/en.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/es_cr.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/fr.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/hu.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/it.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/ja.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/nl.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/ru.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/sk.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/src/Service/CoreUpdater.php
# datamodels/2.x/itop-core-update/tr.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig
# datamodels/2.x/itop-core-update/zh_cn.dict.itop-core-update.php
2022-03-11 18:03:21 +01:00
Molkobain
684efee5d2
N°4664 - Code format
2022-03-07 12:49:27 +01:00
acognet
e347989dcb
N°4664 - Core Update : block zip file upload until instance declared OK
2022-03-07 12:05:54 +01:00
acognet
69a0bd0c34
N°4644 - Core update : confusing warning message when integrity of iTop std files is modified
2022-03-03 21:59:04 +01:00
Molkobain
58e35ea33b
N°1047 - Replace hard coded 'iTop' occurrences with ITOP_APPLICATION_SHORT
2021-08-14 22:43:29 +02:00
Pierre Goiffon
0fd3cb01cf
🌐 Prepare 3.0.0-beta : align all dictionnaries with keys in EN dict
2021-03-23 18:16:27 +01:00
Molkobain
8dd96ea636
Copyright year bump
2021-03-15 09:29:45 +01:00
Eric
077772ea9c
N°2969 - moved dictionaries
2020-08-24 09:31:34 +02:00
