Pierre Goiffon
091aaac55e
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2022-09-14 15:34:36 +02:00
Pierre Goiffon
d431811725
N°4947 Fix Email always picking "production" env config file ( #331 )
...
Note that the code was duplicated in both Email* impl, this is refactored : LoadConfig and m_oConfig are pulled up in Email, and SetRecipientFrom() calls are also refactored in Email
2022-09-14 15:33:48 +02:00
Pierre Goiffon
203cf17c67
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# setup/setuputils.class.inc.php
# setup/wizardsteps.class.inc.php
2022-09-14 12:16:35 +02:00
xtophe38
7512f721e9
Setup wizard : use the ITOP_APPLICATION constant instead of hardcoded "iTop" string ( #335 )
...
* Update wizardsteps.class.inc.php
* Done as requested
* Fix typo for better readability/genericity
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2022-09-13 20:11:38 +02:00
Pierre Goiffon
bdfe3a3b35
N°5235 Tmp dir setup check is now non blocking (woops previous commit was incomplete) ( #301 )
2022-09-13 18:22:29 +02:00
Pierre Goiffon
5cf391c3bb
N°5235 - Add non blocking setup check : is tmp dir is writable ( #301 )
2022-09-13 18:20:35 +02:00
acognet
1ee5432b96
N°5508 - PHP 8 and PHP 8.1 : Add compatibility Alarm Console
2022-09-13 18:04:28 +02:00
Eric Espie
425362f515
N°5510 - Add unit test
2022-09-13 12:14:04 +02:00
Eric Espie
d50fe1573c
Merge branch 'support/3.0.2' 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
2022-09-12 11:00:07 +02:00
Eric Espie
2a064fd97d
N°5394 - use session for the FSM
2022-09-12 10:56:25 +02:00
Eric Espie
e9a3974b98
N°5394 - revert 2.7 merge
2022-09-12 10:54:55 +02:00
Eric Espie
f02bc529fe
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
2022-09-12 09:55:01 +02:00
Eric Espie
4c1df9927d
N°5394 - use session for the FSM
2022-09-12 09:45:30 +02:00
Eric Espie
ca3c0cb163
N°5510 - Exception "$amount: Expected 5% to be within 0% and 1%" when compiling a theme
2022-09-09 09:20:52 +02:00
Pierre Goiffon
56e7992d4a
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# test/ItopTestCase.php
2022-09-08 18:25:15 +02:00
Pierre Goiffon
74003f12c1
N°5513 Remove test name debug info
2022-09-08 18:20:52 +02:00
Pierre Goiffon
3bc12b0434
N°5513 Improve PHPUnit output to stdout
...
Will allow to see progress when looking at the Jenkins output
2022-09-08 15:11:02 +02:00
Eric Espie
44c0e236b0
N°5509 - User Provisioning Issue
2022-09-08 09:58:29 +02:00
Eric Espie
cb2a597267
Fix notice on empty case log
2022-09-07 10:33:31 +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
Molkobain
bdda29ef6a
Merge remote-tracking branch 'origin/support/3.0.2' into support/3.0
2022-08-30 17:46:25 +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
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
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
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
0efaf47325
N°4910 - Improve comment
2022-08-18 09:25:03 +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
efd2fbb19a
Fix module version after wrong merge
2022-08-16 17:49:23 +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
Molkobain
c5d5379c49
N°5408 - Mentions: Fix empty results for class with no image attribute
2022-08-16 14:21:28 +02:00
