Eric Espie
320eb83c10
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-09-07 10:48:45 +02:00
Eric Espie
cb2a597267
Fix notice on empty case log
2022-09-07 10:33:31 +02:00
Eric Espie
7621a0fd31
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-09-05 12:14:57 +02:00
Eric Espie
57bb0160c4
Merge branch 'support/3.0.2' into support/3.0
2022-09-05 12:08:53 +02:00
Eric Espie
6c4cd6c99c
constants missing if no ticket in DM (vanilla)
2022-09-02 13:57:36 +02:00
Eric Espie
6190429f51
N°5394 - Rework session start
2022-09-01 16:08:16 +02:00
Benjamin Dalsass
2b84c0384d
N°5085 - Move menu is impossible - Error after compilation
2022-08-31 15:31:00 +02:00
Molkobain
146ed0f6a6
N°3390 - Update comment
2022-08-30 20:18:30 +02:00
Molkobain
9826b40ec6
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# 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
2022-08-30 17:53:13 +02:00
Molkobain
bdda29ef6a
Merge remote-tracking branch 'origin/support/3.0.2' into support/3.0
2022-08-30 17:46:25 +02:00
Benjamin Dalsass
b154952869
N°3390 - Upgrade from Symfony 3.4 to Symfony 5.4
2022-08-30 14:36:26 +02:00
Pierre Goiffon
ef07f8366d
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-29 13:50:34 +02:00
Pierre Goiffon
9c57b0b1b7
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2022-08-29 12:33:06 +02:00
Pierre Goiffon
02a0969b53
N°5414 Fix undefined constant error in notification with wrong placeholder
...
Fix regression introduced in 33c2168#282 )
2022-08-29 12:31:45 +02:00
Molkobain
6e3ff0e429
Update iTop version to 3.0.2
2022-08-29 09:40:47 +02:00
Benjamin Dalsass
9a9707e15c
N°4517 - PHP 8.1 compatibility: Fix deprecated call str_replace with null value
2022-08-25 11:52:11 +02:00
Stephen Abello
bc7749602d
Merge branch 'support/3.0.2' into support/3.0
...
# Conflicts:
# setup/setup.js
2022-08-24 16:46:16 +02:00
Stephen Abello
14facb4d6c
N°5462 Add a setup check to verify if directory-level configuration files (.htaccess and web.config) are used by the server
2022-08-24 16:44:11 +02:00
Stephen Abello
7c6cc23aa8
Merge branch 'support/2.7' into support/3.0
...
# Conflicts:
# setup/setup.js
2022-08-24 16:40:18 +02:00
Stephen Abello
d78a25ee4e
N°5462 Add a setup check to verify if directory-level configuration files (.htaccess and web.config) are used by the server
2022-08-24 16:33:54 +02:00
Pierre Goiffon
06c3e295d6
Fix iTopXmlVersionIntegrationTest
...
* remove annotations for data tests : we are only comparing constants
* remove itop-community group : this test can be run whatever target was used to build
* remove wrong `@covers` annotation
2022-08-24 14:54:02 +02:00
Pierre Goiffon
6f438d52b2
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# test/integration/iTopModulesPhpVersionChecklistTest.php
2022-08-24 14:46:55 +02:00
Pierre Goiffon
7a6a3d1ac0
Integration tests : move and comment itop-community group
2022-08-24 14:41:32 +02:00
odain
f923ac879f
ci: tag some tests with addition annotations to ease exclusion/inclusion mechanism
2022-08-24 12:07:04 +02:00
odain
0b46ab9e48
ci: add phpunit defaultProfiles annotation + tag some tests with addition annotations to ease exclusion/inclusion mechanism
2022-08-24 11:02:11 +02:00
Molkobain
bdf11e32a7
N°5318 - Security hardening
2022-08-24 10:47:40 +02:00
Molkobain
bbb5b86864
N°5122 - Minor libs update according to new PHP min version
2022-08-23 11:26:47 +02:00
Molkobain
7b60c9c71a
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# composer.json
# composer.lock
# lib/composer/installed.json
# lib/composer/installed.php
# lib/twig/twig/.travis.yml
# lib/twig/twig/CHANGELOG
# lib/twig/twig/composer.json
# lib/twig/twig/lib/Twig/Loader/String.php
# lib/twig/twig/src/Environment.php
# lib/twig/twig/src/ExpressionParser.php
# lib/twig/twig/src/Extension/AbstractExtension.php
# lib/twig/twig/src/Extension/CoreExtension.php
# lib/twig/twig/src/Extension/ProfilerExtension.php
# lib/twig/twig/src/Loader/ArrayLoader.php
# lib/twig/twig/src/Loader/ChainLoader.php
# lib/twig/twig/src/Loader/FilesystemLoader.php
# lib/twig/twig/src/Node/EmbedNode.php
# lib/twig/twig/src/Node/Expression/BlockReferenceExpression.php
# lib/twig/twig/src/Node/Expression/Test/DefinedTest.php
# lib/twig/twig/src/Node/Expression/TestExpression.php
# lib/twig/twig/src/Node/ForNode.php
# lib/twig/twig/src/Node/IfNode.php
# lib/twig/twig/src/Node/IncludeNode.php
# lib/twig/twig/src/Node/ModuleNode.php
# lib/twig/twig/src/Node/Node.php
# lib/twig/twig/src/Node/WithNode.php
# lib/twig/twig/src/Template.php
# lib/twig/twig/src/TokenParser/ApplyTokenParser.php
2022-08-23 10:38:09 +02:00
Molkobain
2caf3e2217
Merge remote-tracking branch 'origin/support/3.0.2' into support/3.0
2022-08-23 10:27:59 +02:00
Molkobain
1441b8a1d2
N°5318 - Fix bad merge of the coreexception.class.inc.php file
2022-08-23 10:01:51 +02:00
Stephen Abello
b1bc2cec1b
N°5138 Fix tooltips flickering in bulk modify when it contains hyperlinks
2022-08-22 16:59:24 +02:00
Molkobain
e280f99996
N°5437 - PHP 8.0: Fix deprecated PHP notice in TWIG lib
2022-08-22 16:43:38 +02:00
Pierre Goiffon
2f90b8e6a6
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-22 09:04:39 +02:00
acognet
d33bd88832
N°5428 - Request template: autocomplete field can not be a master field
2022-08-19 15:06:38 +02:00
Pierre Goiffon
a92b1971c0
N°5423 Fix "unexpected value" error on \CMDBChangeOpSetAttributeURL.newvalue for AttributeUrl with custom patterns
2022-08-18 14:48:55 +02:00
Molkobain
428827ed91
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-18 09:26:01 +02:00
Molkobain
0efaf47325
N°4910 - Improve comment
2022-08-18 09:25:03 +02:00
Pierre Goiffon
a31451d5af
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-17 14:29:49 +02:00
Pierre Goiffon
a8f1b1d9d8
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# core/action.class.inc.php
2022-08-17 14:29:27 +02:00
Pierre Goiffon
6b32be0899
N°5216 Fix invalid message-id when sending notification using cron on system with a specific locale set ( #297 )
...
The timestamp used was indeed locale dependent.
This commit fixes this behavior by removing the locale dependency using a better printf format (see https://www.php.net/manual/fr/function.sprintf.php )
2022-08-17 14:11:32 +02:00
Pierre Goiffon
33c2168af2
🔊 Adds a debug log for invalid placeholders ( #282 )
...
This adds a debug log when a placeholder cannot be replaced.
Before the placeholder was just not replaced.
Now we can enable a debug log on the LogChannels::NOTIFICATION channel.
2022-08-17 14:09:59 +02:00
Molkobain
99f75111ce
N°4517 - PHP 8.1: Fix str_replace() called with null value
2022-08-16 19:03:30 +02:00
Molkobain
a2c6b08cf4
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
2022-08-16 17:52:03 +02:00
Molkobain
efd2fbb19a
Fix module version after wrong merge
2022-08-16 17:49:23 +02:00
Molkobain
25af155113
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
2022-08-16 17:38:10 +02:00
Molkobain
c8b82e6e48
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
2022-08-16 17:35:00 +02:00
Lars Kaltefleiter
ae021064a4
🌐 Update German translations for oauth-client ( #319 )
2022-08-16 17:02:37 +02:00
Pierre Goiffon
d5917299fc
N°5410 Fix PHP notice after removing autoloader
2022-08-16 16:58:58 +02:00
Molkobain
25103b9f0b
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-16 14:35:39 +02:00
Molkobain
c5d5379c49
N°5408 - Mentions: Fix empty results for class with no image attribute
2022-08-16 14:21:28 +02:00
