Benjamin DALSASS
|
7c8670b57c
|
Merge remote-tracking branch 'origin/support/3.2' into develop
# Conflicts:
# core/attributedef.class.inc.php
# setup/extensionsmap.class.inc.php
# tests/php-unit-tests/composer.lock
|
2026-03-17 08:05:10 +01:00 |
|
jf-cbd
|
4fe61cbdc7
|
N°8543 - Add checks on exec.php (#835)
|
2026-03-16 17:06:37 +01:00 |
|
Eric Espie
|
57a0b5691f
|
Merge support/3.2 into develop
|
2026-02-25 10:44:19 +01:00 |
|
Eric Espié
|
f82389d156
|
N°8632 - Various fixes (#814)
* N°8632 - Check existence of parameter file within iTop
* N°8632 - block parameter file from request
* log on error
* PHP CS fixer
* N°8632 - param files must be outside iTop
* PHP CS fixer
* Update webservices/export.php
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update tests/php-unit-tests/unitary-tests/application/utilsTest.php
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* ✅ Fix CI
---------
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
|
2026-02-25 10:42:04 +01:00 |
|
Eric Espie
|
dad39c3ebe
|
Merge support/3.2 into develop
|
2026-02-24 13:55:55 +01:00 |
|
lenaick.moreira
|
34c8a57814
|
N°8851 - Explicit nullable in functions parameters
|
2026-02-20 10:07:30 +01:00 |
|
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 |
|
odain-cbd
|
696e2c9565
|
N°4720 - Remove old unreferenced methods or pages that are @deprecated (#747)
* N°4720 - Remove old unreferenced methods that are @deprecated
* N°4720-Config addson getter/setter removal
* small deprecation removal
* revert @deprecation 3.3 removal: ResizeImageToFit
* small deprecation removal
* revert deprecation 3.3 removal: Config/GSetAddons
|
2025-09-11 15:52:00 +02:00 |
|
Benjamin Dalsass
|
bf1b2a5104
|
Merge remote-tracking branch 'origin/support/3.2' into develop
# Conflicts:
# .doc/README.md
# .doc/phpdoc-templates/combodo-wiki/graphs/class.html.twig
# composer.lock
# lib/composer/InstalledVersions.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_psr4.php
# lib/composer/autoload_static.php
# lib/composer/installed.json
# lib/composer/installed.php
# lib/symfony/cache/Traits/Relay/MoveTrait.php
# lib/symfony/http-foundation/Request.php
# lib/symfony/runtime/SymfonyRuntime.php
|
2025-09-10 07:57:41 +02:00 |
|
Stephen Abello
|
901f8f2a7b
|
N°8691 - Backup modal icon spins around the text
|
2025-09-09 14:24:18 +02:00 |
|
jf-cbd
|
5811dc06e3
|
Merge remote-tracking branch 'origin/support/3.2' into develop
|
2025-05-15 09:48:22 +02:00 |
|
jf-cbd
|
6811a82e1a
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.2
# Conflicts:
# datamodels/2.x/itop-backup/status.php
# setup/setuputils.class.inc.php
|
2025-05-13 16:40:11 +02:00 |
|
jf-cbd
|
544c4ae888
|
N°8379 - fix backup issue
|
2025-05-13 16:05:39 +02:00 |
|
Timothee
|
cc47d27fd8
|
Merge branch 'support/3.2' into develop
# Conflicts:
# datamodels/2.x/itop-attachments/dictionaries/cs.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/dictionaries/da.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/dictionaries/de.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/dictionaries/es_cr.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/dictionaries/fr.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/dictionaries/hu.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/dictionaries/it.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/dictionaries/ja.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/dictionaries/nl.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/dictionaries/pl.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/dictionaries/pt_br.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/dictionaries/ru.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/dictionaries/sk.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/dictionaries/tr.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php
# datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php
# datamodels/2.x/itop-incident-mgmt-itil/dictionaries/it.dict.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-knownerror-mgmt/dictionaries/it.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-portal/dictionaries/it.dict.itop-portal.php
# datamodels/2.x/itop-problem-mgmt/dictionaries/it.dict.itop-problem-mgmt.php
# datamodels/2.x/itop-request-mgmt-itil/dictionaries/it.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt/dictionaries/it.dict.itop-request-mgmt.php
# dictionaries/cs.dictionary.itop.core.php
# dictionaries/da.dictionary.itop.core.php
# dictionaries/de.dictionary.itop.core.php
# dictionaries/es_cr.dictionary.itop.core.php
# dictionaries/fr.dictionary.itop.core.php
# dictionaries/fr.dictionary.itop.ui.php
# dictionaries/hu.dictionary.itop.core.php
# dictionaries/it.dictionary.itop.core.php
# dictionaries/it.dictionary.itop.ui.php
# dictionaries/ja.dictionary.itop.core.php
# dictionaries/nl.dictionary.itop.core.php
# dictionaries/pl.dictionary.itop.core.php
# dictionaries/pt_br.dictionary.itop.core.php
# dictionaries/ru.dictionary.itop.core.php
# dictionaries/sk.dictionary.itop.core.php
# dictionaries/tr.dictionary.itop.core.php
# dictionaries/ui/components/quick-create/cs.dictionary.itop.quick-create.php
# dictionaries/ui/components/quick-create/da.dictionary.itop.quick-create.php
# dictionaries/ui/components/quick-create/de.dictionary.itop.quick-create.php
# dictionaries/ui/components/quick-create/es_cr.dictionary.itop.quick-create.php
# dictionaries/ui/components/quick-create/fr.dictionary.itop.quick-create.php
# dictionaries/ui/components/quick-create/hu.dictionary.itop.quick-create.php
# dictionaries/ui/components/quick-create/it.dictionary.itop.quick-create.php
# dictionaries/ui/components/quick-create/ja.dictionary.itop.quick-create.php
# dictionaries/ui/components/quick-create/nl.dictionary.itop.quick-create.php
# dictionaries/ui/components/quick-create/pl.dictionary.itop.quick-create.php
# dictionaries/ui/components/quick-create/pt_br.dictionary.itop.quick-create.php
# dictionaries/ui/components/quick-create/ru.dictionary.itop.quick-create.php
# dictionaries/ui/components/quick-create/sk.dictionary.itop.quick-create.php
# dictionaries/ui/components/quick-create/tr.dictionary.itop.quick-create.php
|
2025-02-21 17:58:13 +01:00 |
|
Timothee
|
e93d909a38
|
🌐 Dictionaries update
|
2025-02-07 15:36:58 +01:00 |
|
denis.flaven@combodo.com
|
cf57549370
|
Merge branch 'support/3.1' into support/3.2
|
2025-02-07 10:29:24 +01:00 |
|
denis.flaven@combodo.com
|
46aaeb4301
|
Merge branch 'support/2.7' into support/3.1
|
2025-02-07 10:24:18 +01:00 |
|
denis.flaven@combodo.com
|
affed69999
|
Version number bump.
|
2025-02-07 10:09:48 +01:00 |
|
jf-cbd
|
9fdf183851
|
Merge branch 'support/3.2' into develop
# Conflicts:
# dictionaries/ui/components/quick-create/zh_cn.dictionary.itop.quick-create.php
# dictionaries/zh_cn.dictionary.itop.core.php
# setup/runtimeenv.class.inc.php
|
2024-12-16 18:38:07 +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 |
|
jf-cbd
|
0d8a20c35e
|
Merge remote-tracking branch 'origin/support/3.2' into develop
|
2024-11-19 08:50:29 +01:00 |
|
Lars Kaltefleiter
|
596e26a96f
|
🌐 N°7932 Translations - British English (#677)
* Translation into EN GB
|
2024-11-18 14:38:53 +01:00 |
|
jf-cbd
|
5d8db176f4
|
Merge remote-tracking branch 'origin/support/3.2' into develop
# Conflicts:
# dictionaries/es_cr.dictionary.itop.core.php
|
2024-11-07 14:57:54 +01:00 |
|
Timothee
|
311c5d0d51
|
🌐 ES localization
|
2024-11-06 17:12:47 +01:00 |
|
jf-cbd
|
a728cf312d
|
🔖 Update XML 3.3.0 version
|
2024-10-21 18:21:37 +02:00 |
|
jf-cbd
|
e321e27899
|
🔖 Prepare 3.3.0 version
|
2024-10-21 18:07:54 +02:00 |
|
jf-cbd
|
508918a684
|
Temporary rollback : waiting for datamodel upgrade
|
2024-10-21 17:56:43 +02:00 |
|
jf-cbd
|
bd5e55aad9
|
🔖 Prepare 3.3.0 version
|
2024-10-21 17:26:15 +02:00 |
|
denis.flaven@combodo.com
|
052e2a1a42
|
🔖 Prepare 3.1.2 version
|
2024-10-03 12:14:32 +02:00 |
|
denis.flaven@combodo.com
|
8cb701bda3
|
🔖 Prepare 2.7.11 version
|
2024-09-26 16:53:24 +02:00 |
|
Anne-Cath
|
143a59a19d
|
Merge remote-tracking branch 'origin/support/3.2' into develop
|
2024-09-18 11:59:16 +02:00 |
|
Anne-Cath
|
60de41e6fd
|
N°7824 - Update czech translations for iTop3.2 thanks to @Stetinac
|
2024-09-18 11:54:51 +02:00 |
|
Molkobain
|
7ee1af3cc8
|
Merge remote-tracking branch 'origin/support/3.2' into develop
|
2024-07-24 10:58:05 +02:00 |
|
Thomas Casteleyn
|
a3a0f33ad4
|
N°7686 - Update Dutch translations (#657)
|
2024-07-24 09:01:12 +02:00 |
|
jf-cbd
|
7e8ff50886
|
Merge remote-tracking branch 'refs/remotes/origin/support/3.2' into develop
# Conflicts:
# js/ckeditor/src/plugins/maximize/maximize.plugin.ts
|
2024-06-13 17:53:06 +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 |
|
Benjamin Dalsass
|
645d68d5d0
|
Merge remote-tracking branch 'origin/support/3.2' into develop
|
2024-06-07 08:20: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 |
|
Romain Quetiez
|
68ee3231f4
|
Merge branch 'support/3.2' into develop
# Conflicts:
# tests/php-unit-tests/src/Hook/TestsRunStartHook.php
|
2024-05-16 20:24:38 +02:00 |
|
Molkobain
|
ad36066126
|
📝 Copyright year bump
|
2024-05-06 18:35:31 +02:00 |
|
Pierre Goiffon
|
98bc04697e
|
Merge remote-tracking branch 'origin/support/3.2' into develop
|
2024-02-15 09:51:46 +01: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
|
118b22fe56
|
Merge remote-tracking branch 'origin/support/3.2' into develop
|
2024-02-14 15:13:54 +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 |
|
Molkobain
|
e18ea88735
|
N°6648 - Use \utils::GetDataPath() instead of hard-coded paths (#555)
* N°6648 - Use \utils::GetDataPath() instead of hard-coded paths
* Update setup/applicationinstaller.class.inc.php
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@super-visions.com>
---------
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@super-visions.com>
|
2024-01-22 21:06:08 +01:00 |
|