Pierre Goiffon
|
e87502e7bf
|
Merge remote-tracking branch 'origin/support/3.2' into develop
|
2024-02-08 11:35:03 +01:00 |
|
Pierre Goiffon
|
5dd5986b88
|
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
|
2024-02-08 11:34:48 +01:00 |
|
Pierre Goiffon
|
8f250e82f4
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
|
2024-02-08 11:34:32 +01:00 |
|
Pierre Goiffon
|
ed694b09b0
|
💡 Update test PHPDoc
|
2024-02-08 11:34:13 +01:00 |
|
Pierre Goiffon
|
e45049a602
|
Merge remote-tracking branch 'origin/support/3.2' into develop
|
2024-01-29 17:20:46 +01:00 |
|
Pierre Goiffon
|
e92b006f70
|
N°7177 Update pelago/emogrifier from 6.0.0 to 7.2.0
|
2024-01-29 17:18:15 +01:00 |
|
Molkobain
|
54b2e41afd
|
Merge remote-tracking branch 'origin/support/3.2' into develop
|
2024-01-29 15:07:10 +01:00 |
|
Molkobain
|
8eca200023
|
N°6037 - PHP 8.3: Fix calling ReflectionProperty::setValue() with a single argument is deprecated
|
2024-01-24 20:35:40 +01:00 |
|
Molkobain
|
ede6e6dd87
|
Merge remote-tracking branch 'origin/support/3.2' into develop
|
2024-01-24 15:22:21 +01:00 |
|
Molkobain
|
b63af9b919
|
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
|
2024-01-24 15:21:05 +01:00 |
|
odain
|
9a26c37ffd
|
N°7147 - Error HTTP 500 due to access_token not URL decoded
|
2024-01-23 16:50:21 +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 |
|
jf-cbd
|
436b6808b5
|
N°7134 - Can't retrieve the list of changes when editing URP_UserProfile
|
2024-01-17 15:12:55 +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 |
|
jf-cbd
|
7f62bd61e3
|
N°7134 - Can't retrieve the list of changes when editing URP_UserProfile
|
2024-01-17 15:05:30 +01:00 |
|
Pierre Goiffon
|
ed99433448
|
Merge remote-tracking branch 'origin/support/3.1' into develop
|
2024-01-16 11:22:04 +01:00 |
|
Pierre Goiffon
|
669e6f93fa
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
|
2024-01-16 11:00:52 +01:00 |
|
Pierre Goiffon
|
a5aac0caad
|
N°7143 Woops removed forgotten echo
|
2024-01-16 10:25:28 +01:00 |
|
Pierre Goiffon
|
31e29506fa
|
N°7143 DictionariesConsistencyTest::testNoDictFileInDatamodelsModuleRootDirectory Add exclusion list to remove modules that must be compatible with iTop 2.7
|
2024-01-16 10:18:50 +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 |
|
Pierre Goiffon
|
5935800b21
|
Merge remote-tracking branch 'origin/support/3.1' into develop
|
2024-01-15 15:55:54 +01:00 |
|
Pierre Goiffon
|
200cdefa1a
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
# Conflicts:
# datamodels/2.x/itop-core-update/dictionaries/pt_br.dict.itop-core-update.php
# datamodels/2.x/itop-hub-connector/dictionaries/pl.dict.itop-hub-connector.php
# datamodels/2.x/itop-hub-connector/dictionaries/pt_br.dict.itop-hub-connector.php
# datamodels/2.x/itop-hub-connector/dictionaries/zh_cn.dict.itop-hub-connector.php
# datamodels/2.x/itop-welcome-itil/dictionaries/tr.dict.itop-welcome-itil.php
|
2024-01-15 15:44:48 +01:00 |
|
Pierre Goiffon
|
8ef04bedf2
|
N°7143 Move datamodels/2.x dict files to dictionaries subdir
New phpunit method to ensure it won't happen again
|
2024-01-15 15:35:15 +01:00 |
|
Molkobain
|
9ddb82073c
|
Merge remote-tracking branch 'origin/support/3.1' into develop
|
2024-01-12 12:08:31 +01:00 |
|
Molkobain
|
1fa4fe6d35
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
|
2024-01-12 12:05:24 +01:00 |
|
Molkobain
|
2ed0666c3b
|
N°7085 - Remove comment about annotation as on support/3.0 branch not using runTestsInSeparateProcesses is the standard
|
2024-01-12 10:53:24 +01:00 |
|
odain
|
51fdd04881
|
Merge branch 'support/3.1' into develop
|
2024-01-12 08:58:29 +01:00 |
|
odain
|
9b5988133b
|
Merge branch 'support/3.0' into support/3.1
|
2024-01-12 08:57:51 +01:00 |
|
odain
|
a61b117f71
|
Merge branch 'support/2.7' into support/3.0
|
2024-01-12 08:56:25 +01:00 |
|
odain
|
9830178a47
|
N°7085 - ci restore runTestsInSeparateProcesses
|
2024-01-12 08:36:15 +01:00 |
|
odain
|
83ac219ec9
|
Merge branch 'support/2.7' into support/3.0
|
2024-01-12 08:19:05 +01:00 |
|
odain-cbd
|
c140ebcb6b
|
N°7085 - Fix infinite loop in login page until fatal error occurs (#592)
* N°7085 - login page infinite loop until fatal error- add Config->AddAllowedLoginTypes
* N°7085 - reproduce issue via a test
* N°7085-fix infinite loop
* N°7085 - ci: fix config file rights in tearDown
* N°7085 - ci: fix config file rights in tearDown (again)
* N°7085 - ci: fix config file content
* N°7085 - ci : add runTestsInSeparateProcesses
* Update core/config.class.inc.php
Co-authored-by: Molkobain <lajarige.guillaume@free.fr>
* N°7085 - exit -1 + enhance log message
* PR feedbacks from Romain regarding LoginTest annotations
---------
Co-authored-by: Molkobain <lajarige.guillaume@free.fr>
|
2024-01-12 08:13:40 +01:00 |
|
Molkobain
|
b3be796277
|
✅ N°7130 - Fix most Person:first_name being empty after unit tests due to monkey code (mine) 🐒
|
2024-01-10 10:04:23 +01:00 |
|
Pierre Goiffon
|
b3f2232ba4
|
✅ N°6037 Fix PHP 8.2 deprecated syntax
|
2024-01-10 09:48:29 +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
|
bfb05d331e
|
Merge remote-tracking branch 'origin/support/3.1' into develop
|
2024-01-05 17:48:42 +01:00 |
|
Eric Espie
|
18887bf7f9
|
N°7118 - Act on guaranteed object deletion, with the object still accessible (EVENT_DB_ABOUT_TO_DELETE)
|
2024-01-05 11:21:59 +01:00 |
|
Eric Espie
|
3607748f49
|
Merge remote-tracking branch 'origin/support/3.1' into develop
|
2024-01-05 10:52:13 +01:00 |
|
Eric Espie
|
5b2b9c92e1
|
Merge branch 'support/3.1.1' into support/3.1
|
2024-01-05 10:51:21 +01:00 |
|
Eric Espie
|
68fa3d0236
|
N°7080 - EVENT_DB_LINKS_CHANGED not fired when deleting a user
|
2024-01-05 10:36:37 +01:00 |
|
Eric Espie
|
1de390a24d
|
N°7080 - EVENT_DB_LINKS_CHANGED not fired when deleting a user
|
2024-01-04 15:56:48 +01:00 |
|
jf-cbd
|
20478958ad
|
Merge branch 'support/3.1.1' into support/3.1
|
2024-01-04 11:07:07 +01:00 |
|
jf-cbd
|
5619586645
|
Merge branch 'support/3.1.1' into develop
|
2024-01-04 11:05:58 +01:00 |
|
jf-cbd
|
34499a719f
|
Update test - broken with N°7079 fix
|
2024-01-04 10:59:51 +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 |
|