odain
|
a58f0bfc0b
|
Merge branch 'support/3.0' into support/3.1
|
2024-04-02 15:02:26 +02:00 |
|
odain
|
ff1305165e
|
N°5120 - PR merge adaptation to CLIPage
|
2024-04-02 14:42:21 +02:00 |
|
Molkobain
|
356dd46537
|
Merge remote-tracking branch 'origin/support/3.2' into develop
|
2024-04-02 10:40:57 +02:00 |
|
Molkobain
|
d9b87064a1
|
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
|
2024-04-02 10:39:59 +02:00 |
|
Molkobain
|
a468bf8f7e
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
|
2024-04-02 10:38:30 +02:00 |
|
Molkobain
|
65c706fdfe
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
|
2024-04-02 10:37:08 +02:00 |
|
odain-cbd
|
5a34c76cc4
|
N°5120 - Unattended install : use cty toolkit version (#624)
* N°5120 - Unattended install : use cty toolkit version
* N°5120 - CLI mode validation
* 5120 - bring CI enhancements
* 5120 - bring back saas use-itop-config option: to read db settings from conf directly
* 5120 - move unattended script in setup folder/unattended-install
* 5120 - use-itop-config option: take db_tls_enabled and db_tls_ca into account
* 5120 - move test
* 5120 - put ci enhancements back - logs and conf preservation with install mode
* 5120 - keep PR simple - remove saas use-itop-config option for now
* 5120 - remove ci enhancement to preserve configuration
* Update setup/unattended-install/README.md
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@super-visions.com>
* 5120 - documentation
* 5120 - fix log level
* 5120 - fix test
* fix phpunit test comment
---------
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@super-visions.com>
|
2024-03-29 11:09:27 +01:00 |
|
Eric Espie
|
3e421c770b
|
Merge remote-tracking branch 'origin/support/3.2' into develop
|
2024-03-27 11:30:02 +01:00 |
|
Molkobain
|
739afdb1ec
|
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
|
2024-03-26 13:00:25 +01:00 |
|
Eric Espie
|
7b999cef50
|
Compilation issue
|
2024-03-26 11:57:08 +01:00 |
|
Anne-Cath
|
19cb0e873a
|
Merge remote-tracking branch 'origin/support/3.2' into develop
|
2024-03-26 11:41:26 +01:00 |
|
Molkobain
|
babdd9f163
|
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
|
2024-03-22 14:23:00 +01:00 |
|
Eric Espie
|
90458f6048
|
N°6974 - Flatten classes in datamodel - Allow _delta="merge" in strict mode
|
2024-03-22 10:11:25 +01:00 |
|
Molkobain
|
ed81dbc4a2
|
Merge remote-tracking branch 'origin/support/3.2' into develop
|
2024-03-21 17:43:41 +01:00 |
|
Molkobain
|
673b01585d
|
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
# Conflicts:
# css/setup.css
# setup/setuppage.class.inc.php
|
2024-03-21 17:38:49 +01:00 |
|
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 |
|