Anne-Cath
df9d71e2f5
Merge remote-tracking branch 'origin/support/3.1' into develop
2024-01-15 16:35:57 +01:00
Anne-Cath
3005bc1234
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-01-15 16:34:01 +01:00
Anne-Cath
3f3b0cbe55
Fix merge support/2.7 to support/3.0
2024-01-15 16:25:10 +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
Anne-Cath
a8cd9566ac
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-01-15 16:01:48 +01:00
Anne-Cath
dab03e5b5d
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# application/cmdbabstract.class.inc.php
2024-01-15 15:56:24 +01:00
Pierre Goiffon
5935800b21
Merge remote-tracking branch 'origin/support/3.1' into develop
2024-01-15 15:55:54 +01:00
Anne-Catherine
87582a021b
N°6993 - Error message on bulk transition on object containing a null blob ( #596 )
2024-01-15 15:49:19 +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
Pierre Goiffon
9eeb4b8751
N°7143 itop-hub-connector dic files: fix buggy br tags
2024-01-15 15:35:15 +01:00
Pierre Goiffon
ae3d0f9444
N°7143 Fix bytes unit in attachments EN dict
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
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
Molkobain
dfd5a5bebc
N°7136 - Portal: Add JS API to enable attachments IDs retrieval in an object form
2024-01-11 14:14:58 +01:00
Benjamin Dalsass
490f8600e5
N°7133 - Linkset displayed as property failed when filter contains single quote or new line
2024-01-10 16:52:05 +01:00
Benjamin Dalsass
03b095f246
N°7133 - Linkset displayed as property failed when filter contains single quote or new line
2024-01-10 16:50:03 +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
Liberty
ef083d5e8f
N°2039 - Update Chinese translations for the newsroom ( #595 )
...
* Some Chinese Translation:ActioniTopNotification & EventiTopNotification
* optimize
* Update dictionaries/en.dictionary.itop.core.php
good idea!
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
* Update dictionaries/zh_cn.dictionary.itop.core.php
good idea!
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
* optimize
---------
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2024-01-09 16:58:36 +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
Pierre Goiffon
e8c371174c
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# approot.inc.php
# datamodels/2.x/authent-cas/module.authent-cas.php
# datamodels/2.x/authent-external/module.authent-external.php
# datamodels/2.x/authent-ldap/module.authent-ldap.php
# datamodels/2.x/authent-local/module.authent-local.php
# datamodels/2.x/combodo-backoffice-darkmoon-theme/module.combodo-backoffice-darkmoon-theme.php
# datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php
# datamodels/2.x/itop-attachments/module.itop-attachments.php
# datamodels/2.x/itop-backup/module.itop-backup.php
# datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php
# datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php
# datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php
# datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php
# datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
# datamodels/2.x/itop-config/module.itop-config.php
# datamodels/2.x/itop-core-update/module.itop-core-update.php
# datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php
# datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php
# datamodels/2.x/itop-faq-light/module.itop-faq-light.php
# datamodels/2.x/itop-files-information/module.itop-files-information.php
# datamodels/2.x/itop-full-itil/module.itop-full-itil.php
# datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php
# datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
# datamodels/2.x/itop-oauth-client/module.itop-oauth-client.php
# datamodels/2.x/itop-portal-base/module.itop-portal-base.php
# datamodels/2.x/itop-portal/module.itop-portal.php
# datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php
# datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php
# datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php
# datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
# datamodels/2.x/itop-sla-computation/module.itop-sla-computation.php
# datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php
# datamodels/2.x/itop-structure/module.itop-structure.php
# datamodels/2.x/itop-themes-compat/module.itop-themes-compat.php
# datamodels/2.x/itop-tickets/module.itop-tickets.php
# datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php
# datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php
# datamodels/2.x/version.xml
2024-01-05 17:48:19 +01:00
Pierre Goiffon
b8892e9651
🔖 Prepare 3.0.4 version
2024-01-05 17:34:39 +01:00
Pierre Goiffon
8cde0ce5c5
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# approot.inc.php
# css/css-variables.scss
# datamodels/2.x/authent-cas/module.authent-cas.php
# datamodels/2.x/authent-external/module.authent-external.php
# datamodels/2.x/authent-ldap/module.authent-ldap.php
# datamodels/2.x/authent-local/module.authent-local.php
# datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php
# datamodels/2.x/itop-attachments/module.itop-attachments.php
# datamodels/2.x/itop-backup/module.itop-backup.php
# datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php
# datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php
# datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php
# datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
# datamodels/2.x/itop-config/module.itop-config.php
# datamodels/2.x/itop-core-update/module.itop-core-update.php
# datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php
# datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php
# datamodels/2.x/itop-files-information/module.itop-files-information.php
# datamodels/2.x/itop-full-itil/module.itop-full-itil.php
# datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php
# datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
# datamodels/2.x/itop-oauth-client/module.itop-oauth-client.php
# datamodels/2.x/itop-portal-base/module.itop-portal-base.php
# datamodels/2.x/itop-portal/module.itop-portal.php
# datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php
# datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php
# datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php
# datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
# datamodels/2.x/itop-sla-computation/module.itop-sla-computation.php
# datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php
# datamodels/2.x/itop-tickets/module.itop-tickets.php
# datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php
# datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php
# datamodels/2.x/version.xml
2024-01-05 17:26:28 +01:00
Pierre Goiffon
2fd9523c16
🔖 Prepare 2.7.10 version
2024-01-05 15:50:41 +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
Pierre Goiffon
a32dd779cb
Merge remote-tracking branch 'Combodo/support/3.1' into develop
2024-01-05 11:11:13 +01:00
Pierre Goiffon
fad5571d9b
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-01-05 11:03:34 +01:00
Pierre Goiffon
48c4e2d13d
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# application/ajaxwebpage.class.inc.php
# application/webpage.class.inc.php
# application/xmlpage.class.inc.php
# core/config.class.inc.php
2024-01-05 10:58:51 +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
Pierre Goiffon
a4f6f6e877
N°4368 Fix CORB blocking regression ( #598 )
...
Don't send X-Content-Type-Options HTTP header for certain WebPage impl to workaround CORB blocking
To disable globally this new behavior introduced in 9865bf07
2024-01-05 10:41:18 +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
Pierre Goiffon
abb3ea3272
N°7080 - EVENT_DB_LINKS_CHANGED not fired when deleting a user
...
Fix regressions caused by deletion plan reorder
2024-01-04 18:07:16 +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
96d4aac650
Merge branch 'support/3.1' into develop
2024-01-04 11:24:58 +01:00
jf-cbd
20478958ad
Merge branch 'support/3.1.1' into support/3.1
2024-01-04 11:07:07 +01:00
