Molkobain
3653a4bc90
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# css/setup.css
2024-03-21 15:52:57 +01:00
Molkobain
bdfd956825
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# css/setup.css
# setup/setuppage.class.inc.php
2024-03-21 15:37:33 +01:00
Molkobain
da99a250bf
N°7075 - Add check for Content Security Policies (CSP) in the setup
2024-03-21 14:20:22 +01:00
Eric Espie
a4a3797cc1
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-03-19 14:07:55 +01:00
Eric Espie
6098842d9f
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
...
# Conflicts:
# core/designdocument.class.inc.php
# lib/composer/autoload_files.php
# lib/composer/autoload_static.php
2024-03-19 14:06:24 +01:00
Eric Espié
2f30a0146e
N°6974 - Flatten classes in datamodel ( #603 )
...
* N°6974 - Flatten classes in datamodel
* N°6882 - LoadDelta() in lax/strict mode
* N°6974 - Flatten classes in datamodel
* N°6882 - LoadDelta() in lax/strict mode
* N°7186 - Code hardening
* N°6974 - Flatten classes in datamodel
* N°6660 and N°7318 - Support delete_if_exists and define_if_not_exists in XML injection
* N°6974 - Flatten classes in datamodel
* Apply suggestions from code review
* Update core/designdocument.class.inc.php
---------
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2024-03-19 13:53:14 +01:00
Pierre Goiffon
dbd5ba0377
N°7302 Fix SetupUtilsTest::testHumanReadableSize
2024-03-13 09:56:31 +01:00
Pierre Goiffon
4880052559
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-03-13 09:28:07 +01:00
Pierre Goiffon
61e04c5a73
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
2024-03-13 09:27:53 +01:00
Pierre Goiffon
9cc7ccb1cd
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-03-13 09:27:39 +01:00
Pierre Goiffon
a337ef3d88
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# setup/modelfactory.class.inc.php
# setup/setuputils.class.inc.php
2024-03-13 09:27:06 +01:00
Pierre Goiffon
986c24d777
N°7302 Fix unit name in \SetupUtils::HumanReadableSize ( #626 )
2024-03-12 18:09:29 +01:00
Pierre Goiffon
a5efd981d8
N°7343 Catch ParseError when loading dict files in setup ( #615 )
2024-03-12 18:05:38 +01:00
Pierre Goiffon
0f8247ce69
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-03-11 16:32:03 +01:00
Stephen Abello
722765c0aa
N°7130 - When moving data in the setup from multiple columns, prevent later data from erasing previous data when it's NULL
2024-03-11 16:11:30 +01:00
Benjamin Dalsass
dae3be99ce
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-03-11 16:05:34 +01:00
Benjamin Dalsass
5e9b4da68c
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
2024-03-11 16:04:48 +01:00
Benjamin Dalsass
af2c6d9ab8
N°7279 - AttributeClass defined in XML datamodel compilation issue
...
- make more_values property optional
2024-03-11 16:03:38 +01:00
Benjamin Dalsass
8bb551eb10
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-03-07 14:34:20 +01:00
Benjamin Dalsass
34c4d753d3
N°797 - Delete of DataSynchro incomplete
2024-03-07 14:05:50 +01:00
Molkobain
9e08143981
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-03-06 14:47:29 +01:00
Molkobain
fe6ee083f6
N°7315 - Migrate deprecated usages of WebPage::add_linked_stylesheet()
2024-03-05 23:06:44 +01:00
Molkobain
33ba754277
N°7315 - Migrate deprecated usages of WebPage::add_linked_script()
2024-03-05 22:58:57 +01:00
Molkobain
db4dfe1ba3
N°7315 - Migrate usages of WebPage::add_linked_script() to absolute URIs to ensure they are correctly loaded no matter the endpoint location
2024-03-05 21:53:04 +01:00
Anne-Cath
4e53deec9d
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-02-28 10:37:15 +01:00
Anne-Catherine
1394bc221d
N°3363 - Add favicon in branding ( #522 )
2024-02-28 09:59:11 +01:00
Benjamin Dalsass
ba0a585256
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
2024-02-21 10:48:22 +01:00
Benjamin Dalsass
f41f2a063d
N°7279 - AttributeClass defined in XML datamodel compilation issue
2024-02-21 10:41:47 +01:00
Benjamin Dalsass
623f63abb3
N°7279 - AttributeClass defined in XML datamodel compilation issue
2024-02-21 09:53:57 +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
aa53de467d
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2024-02-14 11:39:42 +01:00
Pierre Goiffon
5d6c4939f6
N°7245 Bettor logs on RunTimeEnvironment::CallInstallerHandlers exceptions ( #606 )
2024-02-14 11:01:12 +01:00
Pierre Goiffon
41eb927480
N°7244 Fix setup ContextTag init ( #609 )
2024-02-14 10:51:52 +01:00
Pierre Goiffon
9c6db1d730
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-01-30 11:47:04 +01:00
Molkobain
de86682562
N°6037 - Increase PHP max. non-supported version to 8.4.0
2024-01-30 09:52:52 +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
Pierre Goiffon
1e3ef6846d
N°3677 - Fix AttributeImage.default_image URLs not up to date after app_root_url change ( #526 )
...
Many thanks to @sg-gcouronne for this contribution !
2024-01-22 16:02:41 +01:00
Molkobain
31225b9e23
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
2024-01-17 23:03:02 +01:00
Eric Espie
cc5e105d7f
N°7070 - remove _delta attribute from datamodel and avoid _delta attributes under a node having _delta in [define, define_if_not_exist, redefine, force] in deltas
2024-01-17 15:12:08 +01:00
Stephen Abello
73c989ee67
N°7130 - Allows to ignore existing column field in setup's data migration method ( #597 )
...
* Allows to ignore existing column field in setup's data migration method
* Update setup/moduleinstaller.class.inc.php
* N°7130 - Fix typo in variable extraction
* N°7130 - Add unit tests
* Update setup/moduleinstaller.class.inc.php
---------
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2024-01-09 09:43:22 +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
6042e7f74d
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# tests/php-unit-tests/post-build-integration-tests/SetupCssIntegrityChecklistTest.php
# tests/php-unit-tests/unitary-tests/core/CMDBSource/CMDBSourceTest.php
2024-01-03 10:43:41 +01:00
Benjamin Dalsass
34f0053db7
N°7059 - Symfony 6.4 - Add missing namespaces to match PSR-4 convention ( #589 )
2023-12-21 10:18:11 +01:00
Pierre Goiffon
6995a3c641
N°6889 backup mysqldump call : restore possibility to connect using socket protocol ( #591 )
...
With previous fix (N°6123) we forced to use the tcp protocol each time. This was blocking for users wanting to connect using the socket protocol on localhost.
Now for localhost we will :
- send both port and protocol arguments if the `db_host` config parameter does contain a port
- don't send any of the port or protocol arguments if `db_host` doesn't contain a port
2023-12-20 15:19:50 +01:00
Pierre Goiffon
afbdff928d
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-12-19 18:42:11 +01:00
Pierre Goiffon
e007e09155
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# pages/ajax.render.php
2023-12-19 18:41:57 +01:00
Pierre Goiffon
4ee70cb95a
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# application/ajaxwebpage.class.inc.php
# application/csvpage.class.inc.php
# application/itopwebpage.class.inc.php
# application/webpage.class.inc.php
# application/xmlpage.class.inc.php
# datamodels/2.x/itop-hub-connector/hubconnectorpage.class.inc.php
# pages/ajax.document.php
# pages/ajax.render.php
# sources/application/TwigBase/Controller/Controller.php
# webservices/export-v2.php
2023-12-19 18:38:45 +01:00
