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
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
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
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
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
03b095f246
N°7133 - Linkset displayed as property failed when filter contains single quote or new line
2024-01-10 16:50:03 +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
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
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
20478958ad
Merge branch 'support/3.1.1' into support/3.1
2024-01-04 11:07:07 +01:00
jf-cbd
34499a719f
Update test - broken with N°7079 fix
2024-01-04 10:59:51 +01:00
jf-cbd
ba99f8f5a4
Merge branch 'support/3.1.1' into support/3.1
2024-01-04 10:34:48 +01:00
jf-cbd
8092f566a5
N°7079 - EVENT_DB_LINKS_CHANGED not fired when creating/updating a user with profiles
2024-01-04 10:29:25 +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
denis.flaven@combodo.com
5e233f4bec
N°7017 - Prevent race conditions when rebuilding cache
2024-01-02 17:02:44 +01:00
Molkobain
19c93249e3
Merge remote-tracking branch 'origin/support/3.1.1' into support/3.1
2024-01-02 11:56:30 +01:00
denis.flaven@combodo.com
a1e2b648f4
N°7001 - Being admin to generate oAuth token is too restrictive
2024-01-02 11:38:43 +01:00
Molkobain
94c604a6af
N°3062 - Fix setup.css compilation test to ensure that it is versioned correctly.
2023-12-21 12:00:26 +01:00
Pierre Goiffon
f84e2060be
N°7077 Hungarian translations based on iTop 3.0.2-1 ( #584 )
...
Many thanks to Csaba TARJÁNYI (@tacsaby) !
2023-12-20 15:52:41 +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
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
Pierre Goiffon
9865bf0779
N°4368 add sending X-Content-Type-Options HTTP header
...
Replace in consumers the \WebPage::add_xframe_options call by \WebPage::add_http_headers
2023-12-19 18:25:26 +01:00
Molkobain
2144933927
N°6816 - Search: Fix JS "me._onACSearchContainsSuccess is not a function" error ( #556 )
2023-12-14 10:57:53 +01:00
Molkobain
e2574a0738
Merge remote-tracking branch 'origin/support/3.1.0' into support/3.1
2023-12-13 18:47:00 +01:00
denis.flaven@combodo.com
3fb5c05467
N°7001 - Being admin to generate oAuth token is too restrictive
2023-12-13 13:57:44 +01:00
jf-cbd
17d131a9b1
N°7021 - Fix error log and useless compilation time due to SCSS file unnecessary compilation #579
2023-12-13 09:21:26 +01:00
