odain
|
7bbcc388ea
|
Merge branch 'support/3.2' into develop
|
2025-11-14 10:52:27 +01:00 |
|
odain
|
5b7a5e14a3
|
code style fix
|
2025-11-14 10:41:47 +01:00 |
|
odain
|
2b1ecf15b4
|
Merge branch 'support/3.2.1' into support/3.2
|
2025-11-14 10:39:04 +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
|
9aa13f57d8
|
N°8413 - Make data synchro work on DBObject
|
2025-05-21 10:12:11 +02:00 |
|
Stephen Abello
|
e0b8ee2143
|
Merge branch 'support/3.2' into develop
|
2025-05-20 09:50:11 +02:00 |
|
bdalsass
|
61c25f85e7
|
N°8313 - edit dashboard (fix broken test 3.2)
|
2025-05-19 13:12:02 +02:00 |
|
Eric Espie
|
e0b12144cb
|
Merge remote-tracking branch 'origin/support/3.2' into develop
# Conflicts:
# sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanel.php
|
2025-01-13 09:18:00 +01:00 |
|
Eric Espie
|
dc8f521b12
|
N°7145 - UI - Init Value DateTime and Date with Day Time (Add default values on mandatory dates)
|
2025-01-09 11:56:55 +01:00 |
|
Anne-Catherine
|
261106fa9d
|
N°1681 - Add new triggers for attachment creation and removal (#534)
|
2024-12-10 09:33:20 +01:00 |
|
vdumas
|
0489235c67
|
N°7477 - Log execution result on DataSynchro made without administrator profile
|
2024-05-17 09:48:08 +02:00 |
|
Molkobain
|
ad36066126
|
📝 Copyright year bump
|
2024-05-06 18:35:31 +02:00 |
|
Benjamin Dalsass
|
7a7b7381c9
|
N°2732 - DataSynchro : process stopped when memory peak usage exceeds 2
|
2024-03-12 09:48:01 +01:00 |
|
Benjamin Dalsass
|
34c4d753d3
|
N°797 - Delete of DataSynchro incomplete
|
2024-03-07 14:05:50 +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
|
51d0d16a11
|
N°7052 synchro_import.php: fix undefined offset notices (#583)
Regression brought by #269
|
2024-02-14 09:53:31 +01:00 |
|
Anne-Cath
|
df9d71e2f5
|
Merge remote-tracking branch 'origin/support/3.1' into develop
|
2024-01-15 16:35:57 +01:00 |
|
Anne-Catherine
|
cff50f8732
|
N°3448 - Framework field size check not correctly implemented for multibytes languages/strings (#528)
|
2024-01-15 16:10:23 +01:00 |
|
Molkobain
|
d721632f2b
|
Merge remote-tracking branch 'origin/support/3.1' into develop
|
2024-01-11 22:25:31 +01:00 |
|
Molkobain
|
fddf9e36c7
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
|
2024-01-11 22:16:10 +01:00 |
|
Molkobain
|
b181914d25
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
|
2024-01-11 22:04:48 +01:00 |
|
Molkobain
|
7a0a4e377b
|
N°7137 - Fix regression from 7fffbb60, missing "default_value" parameter
|
2024-01-11 16:40:40 +01:00 |
|
Thomas Casteleyn
|
7fffbb60e9
|
N°7137 - DataSynchro: Remove "Organization" as default value for SynchroReplica->dest_class (#551)
|
2024-01-11 15:38:02 +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 |
|
Eric Espie
|
9c37d5c23e
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
# Conflicts:
# application/applicationextension.inc.php
# application/cmdbabstract.class.inc.php
# core/dbobject.class.php
# core/kpi.class.inc.php
# core/metamodel.class.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_static.php
# tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php
|
2023-07-19 09:26:46 +02:00 |
|
Molkobain
|
3bd3081359
|
Merge remote-tracking branch 'origin/support/3.0' into develop
# Conflicts:
# synchro/synchro_exec.php
|
2023-06-27 18:19:48 +02:00 |
|
Molkobain
|
5a33fb7a6a
|
N°6474 - Fix regression introduced by 70e6f707
|
2023-06-27 18:16:55 +02:00 |
|
Stephen Abello
|
29a90fe244
|
N°6474 - Fix undefined variable due to failed merge + refactoring
|
2023-06-27 16:55:25 +02:00 |
|
Eric Espie
|
62ed5adbc5
|
Merge remote-tracking branch 'origin/support/3.0' into develop
# Conflicts:
# application/loginwebpage.class.inc.php
# composer.json
# lib/composer/installed.json
# lib/guzzlehttp/psr7/.github/workflows/ci.yml
# lib/guzzlehttp/psr7/.github/workflows/integration.yml
# lib/guzzlehttp/psr7/.github/workflows/static.yml
# lib/guzzlehttp/psr7/CHANGELOG.md
# lib/guzzlehttp/psr7/composer.json
# lib/guzzlehttp/psr7/src/MessageTrait.php
# tests/php-unit-tests/ItopDataTestCase.php
|
2023-06-07 17:45:50 +02:00 |
|
Eric Espie
|
0fbd41a884
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0 -> fix syntax error
|
2023-06-07 17:30:39 +02:00 |
|
Eric Espie
|
e76ada641f
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts:
# application/loginbasic.class.inc.php
# application/loginexternal.class.inc.php
# application/loginform.class.inc.php
# application/loginurl.class.inc.php
# application/loginwebpage.class.inc.php
# composer.lock
# datamodels/2.x/authent-cas/src/CASLoginExtension.php
# lib/composer/autoload_real.php
# lib/composer/installed.php
# synchro/synchro_exec.php
# synchro/synchro_import.php
# tests/php-unit-tests/unitary-tests/application/utilsTest.php
|
2023-06-07 17:21:09 +02:00 |
|
Eric Espie
|
c596fa2967
|
N°6358 - Login API REST
|
2023-06-07 09:17:24 +02:00 |
|
Molkobain
|
04a80fcd39
|
N°6055 - Fix undefined offset error in synchro_exec.php (#465)
Co-authored-by: odain <olivier.dain@combodo.com>
|
2023-03-24 22:25:58 +01:00 |
|
Molkobain
|
c767ebe989
|
📝 Copyright year bump
|
2023-03-17 18:28:47 +01:00 |
|
Thomas Casteleyn
|
fc97491708
|
N°6105 - Cleanup unnecessary use of dirname(__FILE__) (#453)
|
2023-03-14 18:51:01 +01:00 |
|
Pierre Goiffon
|
099a045852
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2023-02-27 15:20:12 +01:00 |
|
odain
|
939771aa15
|
N°6022 - Make synchro scripts work by http via token authentication with SYNCHRO scopes
|
2023-02-27 11:07:52 +01:00 |
|
Eric Espie
|
8940051c3d
|
N°5906 - CRUD Event - fire event EVENT_DB_LINKS_CHANGED when an n-n link is created/updated/deleted
|
2023-02-17 14:25:01 +01:00 |
|
Molkobain
|
29e0df9bbc
|
Merge remote-tracking branch 'origin/support/3.0' into develop
# Conflicts:
# test/sources/application/Helper/WebResourcesHelperTest.php
# tests/php-unit-tests/ItopTestCase.php
# tests/php-unit-tests/composer.lock
# tests/php-unit-tests/unitary-tests/.make/release/DatamodelsXmlFilesTest.php
# tests/php-unit-tests/unitary-tests/application/UI/Base/Layout/NavigationMenuTest.php
# tests/php-unit-tests/unitary-tests/application/query/QueryTest.php
# tests/php-unit-tests/unitary-tests/core/DBSearchTest.php
# tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/BulkChangeExtKeyTest.inc.php
# tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/CRUD/DBObjectTest.php
# tests/php-unit-tests/unitary-tests/service/EventTest.php
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.0_to_3.1.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.0_to_3.1.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.input.xml
# tests/php-unit-tests/unitary-tests/sources/Application/Helper/WebResourcesHelperTest.php
# tests/php-unit-tests/unitary-tests/sources/Router/RouterTest.php
# tests/php-unit-tests/unitary-tests/sources/application/Helper/WebResourcesHelperTest.php
# tests/php-unit-tests/unitary-tests/webservices/ImportTest.inc.php
# tests/php-unit-tests/unitary-tests/webservices/RestTest.php
|
2023-01-11 15:55:08 +01:00 |
|
Thomas Casteleyn
|
b593beb8c7
|
N°5867 Display binary data size in SynchroReplica details (#286)
|
2023-01-10 18:53:00 +01:00 |
|
acognet
|
7ec12f1e12
|
N°4517 - PHP 8.1: Replace htmlentities(***, ENT_QUOTES, 'UTF-8') with utils::EscapeHtml
|
2022-07-01 09:22:25 +02:00 |
|
Thomas Casteleyn
|
cbef9bb267
|
Allow binary data to be imported/synchronised with the synchro_import.php
|
2022-02-11 12:16:09 +01:00 |
|
Pierre Goiffon
|
67fa156c0e
|
Merge remote-tracking branch 'origin/support/2.7' into develop
# Conflicts:
# application/dashboard.class.inc.php
# core/action.class.inc.php
# datamodels/2.x/combodo-db-tools/dictionaries/es_cr.dict.combodo-db-tools.php
# datamodels/2.x/itop-attachments/dictionaries/es_cr.dict.itop-attachments.php
# datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
# datamodels/2.x/itop-core-update/dictionaries/es_cr.dict.itop-core-update.php
# datamodels/2.x/itop-hub-connector/dictionaries/es_cr.dict.itop-hub-connector.php
# datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-portal-base/dictionaries/es_cr.dict.itop-portal-base.php
# datamodels/2.x/itop-request-mgmt-itil/dictionaries/es_cr.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt/dictionaries/es_cr.dict.itop-request-mgmt.php
# datamodels/2.x/itop-sla-computation/dictionaries/es_cr.dict.itop-sla-computation.php
# datamodels/2.x/itop-storage-mgmt/dictionaries/es_cr.dict.itop-storage-mgmt.php
# datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
# datamodels/2.x/itop-virtualization-mgmt/dictionaries/es_cr.dict.itop-virtualization-mgmt.php
# datamodels/2.x/itop-welcome-itil/es_cr.dict.itop-welcome-itil.php
# dictionaries/es_cr.dictionary.itop.core.php
# dictionaries/es_cr.dictionary.itop.ui.php
# pages/ajax.render.php
# setup/wizardsteps.class.inc.php
# synchro/synchro_import.php
|
2021-11-19 10:28:46 +01:00 |
|
Pierre Goiffon
|
06985d3cf2
|
N°4387 synchro_import restore previous set_time_limit call
Was changed in b1761e04 (iTop 2.7.0) by mistake
Added noinspection as the IDE warning (https://github.com/kalessil/phpinspectionsea/blob/master/docs/control-flow.md#statement-could-be-decoupled-from-foreach) seems to be a false positive ?
|
2021-11-08 16:14:19 +01:00 |
|
Eric Espie
|
4b8ef4f919
|
N°3572 - Fix Data Integrity tab results display
- fix synchrodatasource SQL definitions
- fix Hierarchical keys warnings due to bad parameters
|
2021-09-30 14:53:00 +02:00 |
|
acognet
|
7d0550879f
|
N°3910 - Polishing: data synchro
|
2021-09-14 09:09:36 +02:00 |
|
Pierre Goiffon
|
e53cab0d1d
|
🎨 fix param order for \CMDBSource::IsSameFieldTypes call + code formatting
|
2021-04-02 08:22:36 +02:00 |
|