Benjamin DALSASS
54a0dfd06f
Merge branch 'support/3.2' into develop
...
# Conflicts:
# application/transaction.class.inc.php
# dictionaries/en.dictionary.itop.ui.php
# dictionaries/fr.dictionary.itop.ui.php
# dictionaries/pt_br.dictionary.itop.ui.php
# dictionaries/ru.dictionary.itop.ui.php
# dictionaries/zh_cn.dictionary.itop.ui.php
2026-08-25 07:16:55 +02:00
odain
e31492fe27
N°9949 - code style
2026-08-24 19:49:01 +02:00
odain-cbd
dfd7f4cd0a
N°9949 - Cannot uninstall IPAM from setup wizard screen - extension management fix ( #1024 )
...
* N°9949 - Cannot uninstall IPAM from setup wizard screen - fix extension mgt as well
* N°9949 - remove dupicated line
* N°9949 - fix log level
* N°9949 - log enhancement in ext mgt
* N°9949 - phpstan code cleanup
2026-08-24 19:35:06 +02:00
v-dumas
edb33e31da
N°9643 - Move REST and KAFKA sample as Protocol
2026-08-24 09:14:02 +02:00
Lars Kaltefleiter
4bd5c22d36
N°9973 - Update british english translations ( #1008 )
...
Some `en_gb` entries still carried the US spelling, so British users were served
the American form. This pull request:
- corrects 49 entries that used a US spelling (organization, synchronize,
synchronized, resynchronization, catalog, categorize, customize, customizable,
containerization, virtualization, personalized, localized, serialized,
sanitize, and their capitalised forms)
- drops the `~~` marker from 175 entries whose text already is correct British
English
- adds 1 `en_gb` dictionary for a module that shipped none
Code identifiers keep their US spelling on purpose, for example the PHP setting
`post_max_size`.
Dictionary keys and the EN US entries are untouched. Where an `en_gb` entry is
absent, `Dict` already falls back to EN US, so nothing is duplicated for the
sake of it.
2026-08-22 09:45:34 +02:00
Lars Kaltefleiter
2c53b740fc
N°9956 - Update german translations ( #1007 )
...
* 🌐 Complete the German (de) translations (iTop 3.3)
German was incomplete in ways that the `~~` marker alone does not reveal.
This pull request:
- translates 317 entries that still carried the `~~` fallback marker
- fills 265 descriptions that were empty while the English entry had text
- adds 69 keys that existed only in the English dictionary
- updates 57 entries that still mirrored an older, much shorter English wording
- restores 8 broken printf placeholders
- adds 3 German dictionaries for modules that shipped none
English source strings and dictionary keys are untouched; only German values
change. Each printf placeholder was checked against its English entry.
* 🌐 Translate the new welcome popup entries (iTop 3.3)
Follow-up to the develop merge: translates the new `330_05_Portal` title and
description, extends `330_01_Welcome` with the sentences added upstream, and
restores the German wording that the merge had reverted to English for
`330_01_Welcome:Title`, `330_02_AIFoundations:Title` and
`330_04_MFA:Description`.
---------
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2026-08-22 09:21:39 +02:00
v-dumas
62ea1c1fd6
N°9763 - Fix error in Model sample data (2)
2026-08-21 14:55:51 +02:00
v-dumas
b919adf4d8
N°9763 - Fix error in Model sample data
2026-08-21 11:57:01 +02:00
v-dumas
4ebd03eebb
Ensure extensions menus in Service Management end up after Catalog
2026-08-20 17:43:55 +02:00
odain-cbd
4722551a16
N°9875 - Error deprecated on component version object ( #1010 )
...
* N°9875 - Error deprecated on component version object - propose boilerplate methods to handle ZipArchive
* N°9875 - Error deprecated on component version object - use ZipArchive boilerplate methods
* N°9875 - code style
* N°9875 - review feedbacks
* N°9875 - simplify return type of ZipArchiveCreateWithTempNam
* N°9875 - add @since
2026-08-19 15:14:32 +02:00
Molkobain
b43d71f324
N°824 - Fix typo in notification filling
2026-08-19 09:54:23 +02:00
Benjamin Dalsass
97364af71d
Feature/8420 transaction id lifetime ( #1009 )
2026-08-19 08:45:49 +02:00
Stephen Abello
fac132f707
Merge branch 'support/3.2' into develop
2026-08-18 08:52:38 +02:00
Stephen Abello
6f9a4cb55f
N°9937 - Restore modal icon spins around the text ( #1005 )
2026-08-18 08:46:17 +02:00
v-dumas
97c589c440
N°9643 - Dataflow: fix duplicated format
2026-08-17 10:20:45 +02:00
v-dumas
68e799c0fd
N°9643 - Dataflow: add other formats and protocols
2026-08-17 09:34:48 +02:00
Eric Espie
a28e481ee4
N°9455 - Feature removal - Access rights
2026-08-14 14:48:48 +02:00
Vincent Dumas
6032628a70
N°9460 - Ticket ITIL : Add Child Incidents tab on UserRequest ( #1000 )
2026-08-14 10:08:10 +02:00
Benjamin Dalsass
2892949e33
N°8726 - Portal deprecated removal ( #990 )
2026-08-14 09:14:51 +02:00
Vincent Dumas
3711e8a5a1
N°9666 & N°9658 - Localize sample data (User and Delivery Model) ( #999 )
2026-08-13 10:57:33 +02:00
Stephen Abello
a38fef5bbf
Merge branch 'support/3.2' into develop
...
# Conflicts:
# css/setup.css
# datamodels/2.x/itop-portal-base/portal/public/css/portal.css
# datamodels/2.x/itop-portal-base/portal/public/css/portal.scss
2026-08-13 09:35:42 +02:00
Stephen Abello
23e4ce7263
N°9128 - Add padding to fullscreen CKEditor ( #998 )
2026-08-13 09:29:41 +02:00
Eric Espie
1bba486ee8
N°9902 - Can't MTP with 3.3.0-dev
2026-08-12 16:58:00 +02:00
Vincent Dumas
812f0b573d
N°9643 - Dataflow: split protocol & type, add url and last change ( #994 )
2026-08-11 11:44:13 +02:00
v-dumas
3739067473
N°9900 - The plural of Software is... Software !
2026-08-10 17:09:33 +02:00
Purple Grape
d7625d9650
N°9891 - Update chinese translations ( #937 )
...
* update zh_cn translation
rebase on the latest develop branch
* update zh_cn translation
rebase on the latest develop branch
* update zh_cn translation
* Update zh_cn.dict.itop-oauth-client.php
* Update zh_cn.dictionary.itop.core.php
* Update zh_cn.dict.itop-request-mgmt.php
* update zh_cn translation
rebase on the latest develop branch
* update zh_cn translation
rebase on the latest develop branch
* update zh_cn translation
* Update zh_cn.dict.itop-oauth-client.php
* Update zh_cn.dict.itop-request-mgmt.php
* Update zh_cn.dict.itop-portal-base.php
* Update zh_cn.dictionary.itop.datatable.php
* Update zh_cn.dictionary.itop.welcome-popup.php
* Update zh_cn.dictionary.itop.ui.php
2026-08-09 18:41:18 +02:00
Thomas Casteleyn
61464fc819
N°9881 - Update dutch translations of itop-config-mgmt module ( #986 )
...
* dict(itop-config-mgmt): Update NL translations
* Update datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php
2026-08-07 10:35:40 +02:00
v-dumas
c281677768
N°8142 - Ticket menus label/tooltip standardisation
2026-08-07 08:57:51 +02:00
Molkobain
f657308137
✅ Fix PHP code styles for Chinese dictionaries
2026-08-06 16:33:31 +02:00
Molkobain
8d75531d95
Merge remote-tracking branch 'origin/support/3.2' into develop
...
# Conflicts:
# datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/dictionaries/zh_cn.dict.combodo-backoffice-fullmoon-high-contrast-theme.php
# datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/dictionaries/zh_cn.dict.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.php
# datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/dictionaries/zh_cn.dict.combodo-backoffice-fullmoon-tritanopia-theme.php
# datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php
# datamodels/2.x/itop-backup/dictionaries/zh_cn.dict.itop-backup.php
# datamodels/2.x/itop-bridge-cmdb-services/dictionaries/zh_cn.dict.itop-bridge-cmdb-services.php
# datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/zh_cn.dict.itop-bridge-cmdb-ticket.php
# datamodels/2.x/itop-change-mgmt-itil/dictionaries/zh_cn.dict.itop-change-mgmt-itil.php
# datamodels/2.x/itop-change-mgmt/dictionaries/zh_cn.dict.itop-change-mgmt.php
# datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config/dictionaries/zh_cn.dict.itop-config.php
# datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php
# datamodels/2.x/itop-hub-connector/dictionaries/zh_cn.dict.itop-hub-connector.php
# datamodels/2.x/itop-incident-mgmt-itil/dictionaries/zh_cn.dict.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-knownerror-mgmt/dictionaries/zh_cn.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-portal-base.php
# datamodels/2.x/itop-problem-mgmt/dictionaries/zh_cn.dict.itop-problem-mgmt.php
# datamodels/2.x/itop-request-mgmt-itil/dictionaries/zh_cn.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt/dictionaries/zh_cn.dict.itop-request-mgmt.php
# datamodels/2.x/itop-service-mgmt-provider/dictionaries/zh_cn.dict.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt/dictionaries/zh_cn.dict.itop-service-mgmt.php
# datamodels/2.x/itop-storage-mgmt/dictionaries/zh_cn.dict.itop-storage-mgmt.php
# datamodels/2.x/itop-structure/dictionaries/zh_cn.dict.itop-structure.php
# datamodels/2.x/itop-themes-compat/dictionaries/zh_cn.dict.itop-themes-compat.php
# datamodels/2.x/itop-tickets/dictionaries/zh_cn.dict.itop-tickets.php
# datamodels/2.x/itop-virtualization-mgmt/dictionaries/zh_cn.dict.itop-virtualization-mgmt.php
# dictionaries/core/orm-value/orm-document/zh_cn.dictionary.itop.orm-document.php
# dictionaries/core/uniqueness-rule/zh_cn.dictionary.itop.uniqueness-rule.php
# dictionaries/ui/application/links/zh_cn.dictionary.itop.links.php
# dictionaries/ui/application/newsroom/zh_cn.dictionary.itop.newsroom.php
# dictionaries/ui/application/welcome-popup/zh_cn.dictionary.itop.welcome-popup.php
# dictionaries/ui/layouts/activity-panel/zh_cn.dictionary.itop.activity-panel.php
# dictionaries/ui/layouts/navigation-menu/zh_cn.dictionary.itop.navigation-menu.php
# dictionaries/ui/pages/notifications-center/zh_cn.dictionary.itop.notifications-center.php
# dictionaries/ui/pages/preferences/zh_cn.dictionary.itop.preferences.php
# dictionaries/zh_cn.dictionary.itop.core.php
# dictionaries/zh_cn.dictionary.itop.ui.php
# setup/wizardsteps/WizStepLicense2.php
2026-08-04 18:00:19 +02:00
Purple Grape
c7570d62c1
N°9889 - Update zh_cn translation for 3.2 branch ( #938 )
...
* rebase on the latest 3.2 branch
rebase
Co-Authored-By: Thomas Casteleyn <thomas.casteleyn@me.com >
* Update zh_cn.dict.authent-cas.php
* Update zh_cn.dict.authent-external.php
* Update zh_cn.dict.authent-ldap.php
* Update zh_cn.dict.authent-local.php
* Update zh_cn.dict.combodo-backoffice-darkmoon-theme.php
* Update zh_cn.dict.itop-backup.php
* Update zh_cn.dict.itop-change-mgmt.php
* Update zh_cn.dict.itop-faq-light.php
* Update zh_cn.dict.itop-config.php
* Update zh_cn.dict.itop-config-mgmt.php
* Update zh_cn.dict.itop-hub-connector.php
* Update zh_cn.dict.itop-knownerror-mgmt.php
* Update zh_cn.dictionary.itop.core.php
* Update zh_cn.dict.authent-cas.php
* Update zh_cn.dict.authent-external.php
* Update zh_cn.dict.authent-ldap.php
* Update zh_cn.dict.authent-local.php
* Update zh_cn.dict.combodo-backoffice-darkmoon-theme.php
* Update zh_cn.dict.itop-backup.php
* Update zh_cn.dict.itop-config-mgmt.php
* Update zh_cn.dict.itop-config.php
* Update zh_cn.dict.itop-faq-light.php
* update license url
* Update datamodels/2.x/authent-ldap/dictionaries/zh_cn.dict.authent-ldap.php
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@me.com >
* Update datamodels/2.x/authent-cas/dictionaries/en.dict.authent-cas.php
---------
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@me.com >
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2026-08-04 15:26:11 +02:00
Benjamin DALSASS
dd77124b07
N°4720 - Remove old unreferenced methods or pages that are @deprecated
...
- deleted function GetTileTemplatePath called in aggragte brick
2026-08-04 14:36:09 +02:00
Lenaick
9bfe0430f5
N°9118 - No Safeguard when hub installation fail ( #988 )
...
* N°9118 - No Safeguard when hub installation fail
* Apply suggestion from @greptile-apps[bot]
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
---------
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
2026-08-04 09:01:34 +02:00
Stephen Abello
ccb9633226
Align portal ui_version default value with XML ui_version
2026-08-03 10:14:00 +02:00
Thomas Casteleyn
82b50dc6cd
N°9880 - Add dutch translations to itop-flow-map module ( #985 )
2026-08-03 09:22:14 +02:00
Vladimir Kunin
d3451f8c30
N°9879 - Update russian translations ( #983 )
2026-08-03 09:17:43 +02:00
Stephen Abello
b976471a0d
N°9385 - Action button is not displaying its dropdown in a filtered BrowseBrick
2026-07-28 10:24:02 +02:00
Benjamin DALSASS
fa66a09104
N°9838 - Polishing CKEditor for iTop 3.2.4
...
- fix php unit test
2026-07-28 09:39:58 +02:00
Benjamin DALSASS
476ec75a2e
N°9838 - Polishing CKEditor for iTop 3.2.4
2026-07-28 08:39:24 +02:00
v-dumas
5bb288ffca
N°9800 - broken setup in CI
2026-07-27 18:36:03 +02:00
Vincent Dumas
56d7e40f4c
N°9800 New sample data for KnownError and FAQ ( #982 )
...
* N°9800 - Fix typos in sample data in User and Service in FR
* N°9800 - typo in sample Server ids and Rack id
2026-07-27 18:16:58 +02:00
Benjamin Dalsass
9ee0548767
N°9807 - Polishing CKEditor for iTop 3.3.0-beta1 ( #976 )
2026-07-24 09:22:24 +02:00
Molkobain
2cc071b07a
Merge remote-tracking branch 'origin/support/3.3-beta1' into develop
2026-07-23 10:47:12 +02:00
Molkobain
76a410e00d
Revert "N°9541 itop-virtualization-mgmt cannot currently be uninstalled" now that N°9831 has been fixed
...
This reverts commit 52fca750b0 .
2026-07-23 10:45:44 +02:00
Molkobain
c68887c2bc
N°9831 - Fix ext. management deletion plan analysis by avoiding overwriting entity for a previously processed class
2026-07-23 10:21:31 +02:00
Molkobain
837b433622
N°9831 - Fix DataCleanupService so it handles external keys the same way as \Combodo\iTop\DataFeatureRemoval\Service\StaticDeletionPlan::DeletionPlanForReferencingClasses and \DBObject::MakeDeletionPlan
...
- Check if ext. key is nullable first
- Then check if its a DEL_MANUAL option
2026-07-23 10:21:31 +02:00
Timmy38
52fca750b0
N°9541 itop-virtualization-mgmt cannot currently be uninstalled
2026-07-22 17:37:19 +02:00
Timmy38
d1aedee245
N°9692 - Fix flag name
2026-07-21 17:04:37 +02:00
Timmy38
1b70b4bf70
N°9692 - Fix flag name
2026-07-21 12:02:31 +02:00
Lenaick
c8aea56171
N°9565 - Extension Mgmt : display progression during analysis ( #975 )
...
* N°9565 - Extension Mgmt : display progression during analysis
* N°9565 - Extension Mgmt : display progression during analysis
* N°9565 - Extension Mgmt : display progression during analysis
* N°9565 - Extension Mgmt : display progression during analysis
* N°9565 - Extension Mgmt : display progression during analysis
* N°9565 - Validate transaction id
* N°9565 - Move unset bForceCompilation
2026-07-20 11:38:30 +02:00