odain
b0a792afab
N°8796 - Add PHP code style validation in iTop and extensions - format whole code base
2025-11-07 20:39:38 +01:00
odain
7681c157ec
Merge branch 'support/3.2' into develop
2025-11-07 20:33:14 +01:00
odain
890a2568c8
N°8796 - Add PHP code style validation in iTop and extensions - format whole code base
2025-11-07 15:39:53 +01:00
Eduardo Mozart de Oliveira
86776edfb3
Improved PT-BR Translation ( #362 )
2025-09-29 11:01:25 +02:00
Timothee
e93d909a38
🌐 Dictionaries update
2025-02-07 15:36:58 +01:00
Purple Grape
8647a76dbf
🌐 Translations - improved translation for zh cn 20241108 ( #679 )
...
* improved translation for zh cn
2024-12-16 11:39:26 +01:00
Lars Kaltefleiter
596e26a96f
🌐 N°7932 Translations - British English ( #677 )
...
* Translation into EN GB
2024-11-18 14:38:53 +01:00
Timothee
311c5d0d51
🌐 ES localization
2024-11-06 17:12:47 +01:00
Eric Espie
6ae8a72a35
Add Fast setup for developers
2024-10-29 10:51:16 +01:00
Anne-Cath
60de41e6fd
N°7824 - Update czech translations for iTop3.2 thanks to @Stetinac
2024-09-18 11:54:51 +02:00
DudekArtur
33b6f2cbc4
N°7693 - Update polish translations ( #658 )
2024-07-24 11:37:19 +02:00
Thomas Casteleyn
a3a0f33ad4
N°7686 - Update Dutch translations ( #657 )
2024-07-24 09:01:12 +02:00
Timothee
d4b41d892c
Automated dictionaries synchronization with english reference
2024-06-11 17:43:44 +02:00
Timothee
09a5d7a35f
Automated dictionaries synchronization with english reference
2024-06-11 16:38:40 +02:00
jf-cbd
ffcc8ff32a
N°7459 optimize memory consumption during compilation with php 8.1+ ( #650 )
...
N°7459 optimize memory consumption during compilation with PHP 8.1+
2024-06-05 11:03:43 +02:00
Molkobain
ad36066126
📝 Copyright year bump
2024-05-06 18:35:31 +02:00
DarkNight97boss
955d04252e
N°7247 - Update italian translations thanks to @DarkNight97boss ( #594 )
...
* Improved IT Translation
🌐
I proceeded to improve the Italian translation of iTop.
Currently some files, despite having the Italian classification, are not Italian.
* Update it.dict.authent-ldap.php
* Update it.dict.itop-config.php
* Update it.dict.itop-tickets.php
* Update it.dict.itop-faq-light.php
* Update it.dict.itop-bridge-cmdb-ticket.php
* Update it.dict.itop-portal-base.php
* Update it.dict.combodo-db-tools.php
* Update it.dict.itop-oauth-client.php
* Update it.dict.itop-files-information.php
* Update it.dict.itop-service-mgmt.php
* Update it.dict.itop-change-mgmt-itil.php
* Update it.dict.itop-backup.php
* Update it.dict.itop-core-update.php
* Update it.dict.authent-local.php
* Update it.dict.itop-request-mgmt-itil.php
* Update it.dict.itop-attachments.php
* Update it.dict.itop-hub-connector.php
* Update it.dict.itop-bridge-cmdb-services.php
* Update it.dict.authent-cas.php
* Update it.dict.itop-change-mgmt.php
* Update it.dict.itop-config-mgmt.php
* Update it.dict.itop-request-mgmt.php
* Update it.dict.itop-service-mgmt-provider.php
* Update it.dict.combodo-backoffice-darkmoon-theme.php
* Update it.dictionary.itop.core.php
* Update it.dictionary.itop.ui.php
* Update it.dictionary.itop.object.php
* Update it.dictionary.itop.bulk.php
* Update it.dictionary.itop.page-content.php
* Update en.dictionary.itop.object.php
* Update it.dictionary.itop.preferences.php
* Update it.dictionary.itop.orm-document.php
* Update it.dictionary.itop.display-block.php
* Update it.dictionary.itop.modal.php
* Update it.dictionary.itop.errorpage.php
* Update it.dictionary.itop.breadcrumbs.php
* Update it.dictionary.itop.tab-container.php
* Update it.dictionary.itop.quick-create.php
* Update it.dictionary.itop.activity-panel.php
* Update it.dictionary.itop.object-details.php
* Update it.dictionary.itop.global-search.php
* Update it.dictionary.itop.navigation-menu.php
* Update it.dictionary.itop.ui-content-block.php
* Update it.dictionary.itop.links.php
* Update it.dictionary.itop.datatable.php
* Update it.dictionary.itop.input.php
* Update it.dictionary.itop.field.php
* Update it.dictionary.itop.uniqueness-rule.php
* Update en.dictionary.itop.object.php - reverting
revert bad changes for mistake
* Apply suggestions from code review
* Remove trailing ~~ from translated entries
* Restore deleted entries
---------
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2024-02-14 16:57:43 +01:00
Pierre Goiffon
85dac470aa
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
...
# Conflicts:
# datamodels/2.x/itop-files-information/dictionaries/zh_cn.dict.itop-files-information.php
# datamodels/2.x/itop-oauth-client/dictionaries/zh_cn.dict.itop-oauth-client.php
# datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-portal-base.php
# dictionaries/cs.dictionary.itop.core.php
# dictionaries/cs.dictionary.itop.ui.php
# dictionaries/zh_cn.dictionary.itop.core.php
# dictionaries/zh_cn.dictionary.itop.ui.php
# tests/php-unit-tests/README.md
2024-02-14 15:09:23 +01: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
Pierre Goiffon
8ef04bedf2
N°7143 Move datamodels/2.x dict files to dictionaries subdir
...
New phpunit method to ensure it won't happen again
2024-01-15 15:35:15 +01:00
Pierre Goiffon
6724658181
Merge remote-tracking branch 'origin/support/3.1' into develop
...
# Conflicts:
# README.md
# datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php
2024-01-04 09:03:14 +01:00
Pierre Goiffon
379062f1f7
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
Most of the conflicts are caused by HU translations (N°7077 / #584 )
# Conflicts:
# css/setup.css
# datamodels/2.x/authent-cas/dictionaries/hu.dict.authent-cas.php
# datamodels/2.x/authent-ldap/dictionaries/hu.dict.authent-ldap.php
# datamodels/2.x/authent-local/dictionaries/hu.dict.authent-local.php
# datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/hu.dict.combodo-backoffice-darkmoon-theme.php
# datamodels/2.x/combodo-db-tools/dictionaries/hu.dict.combodo-db-tools.php
# datamodels/2.x/itop-attachments/dictionaries/hu.dict.itop-attachments.php
# datamodels/2.x/itop-backup/dictionaries/hu.dict.itop-backup.php
# datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/hu.dict.itop-bridge-cmdb-ticket.php
# datamodels/2.x/itop-change-mgmt-itil/dictionaries/hu.dict.itop-change-mgmt-itil.php
# datamodels/2.x/itop-change-mgmt/dictionaries/hu.dict.itop-change-mgmt.php
# datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config/dictionaries/hu.dict.itop-config.php
# datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php
# datamodels/2.x/itop-faq-light/dictionaries/hu.dict.itop-faq-light.php
# datamodels/2.x/itop-hub-connector/dictionaries/hu.dict.itop-hub-connector.php
# datamodels/2.x/itop-incident-mgmt-itil/dictionaries/hu.dict.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-knownerror-mgmt/dictionaries/hu.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-oauth-client/hu.dict.itop-oauth-client.php
# datamodels/2.x/itop-portal-base/dictionaries/hu.dict.itop-portal-base.php
# datamodels/2.x/itop-portal/dictionaries/hu.dict.itop-portal.php
# datamodels/2.x/itop-problem-mgmt/dictionaries/hu.dict.itop-problem-mgmt.php
# datamodels/2.x/itop-request-mgmt-itil/dictionaries/hu.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt/dictionaries/hu.dict.itop-request-mgmt.php
# datamodels/2.x/itop-service-mgmt-provider/dictionaries/hu.dict.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php
# datamodels/2.x/itop-structure/dictionaries/hu.dict.itop-structure.php
# datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php
# dictionaries/hu.dictionary.itop.core.php
# dictionaries/hu.dictionary.itop.ui.php
# dictionaries/ui/components/breadcrumbs/hu.dictionary.itop.breadcrumbs.php
# dictionaries/ui/components/datatable/hu.dictionary.itop.datatable.php
# dictionaries/ui/components/field/hu.dictionary.itop.field.php
# dictionaries/ui/components/global-search/hu.dictionary.itop.global-search.php
# dictionaries/ui/components/input/hu.dictionary.itop.input.php
# dictionaries/ui/components/quick-create/hu.dictionary.itop.quick-create.php
# dictionaries/ui/layouts/activity-panel/hu.dictionary.itop.activity-panel.php
# dictionaries/ui/layouts/navigation-menu/hu.dictionary.itop.navigation-menu.php
# dictionaries/ui/layouts/object-details/hu.dictionary.itop.object-details.php
# dictionaries/ui/layouts/page-content/hu.dictionary.itop.page-content.php
# dictionaries/ui/layouts/tab-container/hu.dictionary.itop.tab-container.php
# dictionaries/ui/pages/errorpage/hu.dictionary.itop.errorpage.php
# dictionaries/ui/pages/preferences/hu.dictionary.itop.preferences.php
# tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php
2024-01-03 17:30:57 +01:00
Pierre Goiffon
f84e2060be
N°7077 Hungarian translations based on iTop 3.0.2-1 ( #584 )
...
Many thanks to Csaba TARJÁNYI (@tacsaby) !
2023-12-20 15:52:41 +01:00
Devin
12a1321bc1
N°6907 - Update chinese translations thanks to @bdejin ( #563 )
...
* Add missing translations
* add missing translation
* minor update on translation "see setting
* add missing translations
* add missing translation for file dictionaries\zh_cn.dictionary.itop.core.php
* add missing translation for file dictionaries\zh_cn.dictionary.itop.ui.php
* add missing translation for file dictionaries\zh_cn.dictionary.itop.ui.php
* added missing translation for core and ui
* added missing translation for the rest files
* 🌐 minor Chinese translation updates following comments from chileeb on PR #563
* 🌐 update most of the 'class' translation from '类' to '类型'
* 🌐 add kitty message translation
* 🌐 update '表格中暂无数据' in dictionaries\ui\components\datatable\zh_cn.dictionary.itop.datatable.php to '当前列表没有数据'
2023-11-14 17:16:09 +01:00
Pierre Goiffon
9a8e9a0b01
N°5491 Fix HU iTopUpdate:Error:MissingFile dict key
2023-09-18 08:45:45 +02:00
acognet
29ba5e73fa
N°5491 - Inconsistent dictionnary entries regarding arguments to pass to Dict::Format - fix dictionnary
2023-09-06 10:02:28 +02:00
Lars Kaltefleiter
0d9f33ec4c
🌐 Updated german translations for 3.1 ( #511 )
2023-06-29 09:05:27 +02:00
vdumas
3a9198bf1c
N°6422 - Finalize french dictionaries
2023-06-16 16:39:05 +02:00
Timothee
f548dc2898
Dictionaries update for 3.1 beta
2023-06-15 09:47:51 +02:00
Purple Grape
68e1f359d3
N°6417 - Update chinese translations thanks to @purplegrape ( #500 )
2023-06-13 17:36:27 +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
Molkobain
cd72eee6dd
N°6013 - Update hungarian translations thanks to @tacsaby
2023-02-22 14:47:10 +01:00
Thomas Casteleyn
bbea978259
N°5929 - Update hungarian translations thanks to @tacsaby ( #438 )
...
Co-authored-by: tacsaby
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2023-01-30 17:15:08 +01:00
DudekArtur
07fc8c1e5b
N°5706 - Update polish translations thanks to @DudekArtur ! ( #357 )
...
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2022-11-08 21:06:25 +01:00
Eduardo Mozart de Oliveira
9f963686b5
N°4765 - Update brazilian translations thanks to @eduardomozart ( #268 )
...
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2022-09-13 17:20:53 +02:00
acognet
ebab664c1a
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-11 16:54:43 +02:00
jbostoen
d17e399a5f
🌐 N°5397 - Updated Dutch translations ( #262 )
...
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@me.com >
2022-08-11 14:07:51 +02:00
Stephen Abello
1f3e91efae
Merge branch 'support/3.0' into develop
2022-08-10 14:09:50 +02:00
Stephen Abello
118622493f
N°5050 Revert entry deleted in 3b83d3f2
2022-08-10 14:07:38 +02:00
Eric Espie
8d8cefe948
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-09 17:11:34 +02:00
Stephen Abello
3b83d3f209
N°5050 Update Spanish translations (thanks to Miguel Turrubiates!)
2022-08-09 14:27:09 +02:00
Purple Grape
0c14423213
improved Chinese translation ( #302 )
...
1. words refine
2. remove unwanted blank
3. punctuation related issue
Co-Authored-By: Devin <bdejin@hotmail.com >
2022-06-28 12:34:21 +02: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
Pierre Goiffon
8fcd454445
N°4919 New 'Launch setup" in Application Upgrade ( #244 )
...
Admin will now be able to re-launch the iTop setup directly from the administration console in the Administration / Application Upgrade screen.
Before the only way to launch setup on an existing iTop instance was to change permissions on the configuration file.
This button will be enabled depending on the isDevEnv (if true it will be displayed) and `setup.launch_button.enabled` new configuration parameter (not present by default ; if set to false will always hide the button, if set to true will always display it, if not set will display button depending on isDevEnv only).
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2022-04-19 14:36:15 +02:00
acognet
0c80a4e430
N°4644 - Core update : confusing warning message when integrity of iTop std files is modified - merge from 2.7.0
2022-03-14 15:28:47 +01: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
