Pierre Goiffon
c02b36a00c
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2022-10-03 15:56:02 +02:00
Pierre Goiffon
1e1f1f78bf
📝 Backup : more details on check-backup parameters
2022-10-03 14:41:44 +02:00
Pierre Goiffon
1494604740
📝 Backup : move info from wiki to distrib file
2022-10-03 14:35:14 +02:00
Molkobain
59b20ac1ee
Fix typo
2022-09-27 20:14:53 +02:00
Molkobain
c753b57265
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2022-09-21 16:23:42 +02:00
Molkobain
583ab98210
Fix typo
2022-09-21 16:11:24 +02:00
Pierre Goiffon
a5b5518533
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# core/cmdbsource.class.inc.php
# test/core/CMDBSource/TransactionsTest.php
2022-09-21 14:21:28 +02:00
Pierre Goiffon
88d743b1cc
✅ N°5538 Make PHPUnit test fail if transaction opened but not closed
2022-09-21 14:05:27 +02:00
Pierre Goiffon
7ac4bc95bb
ItopDataTestCase : improve log message
2022-09-21 11:51:07 +02:00
Molkobain
7071712a0a
N°5535 - Fix PHP max version to 8.1 in composer for iTop 3.0.2+
2022-09-20 13:42:45 +02:00
Molkobain
e55ac6002a
Increase ITOP_VERSION to 3.0.3-dev
2022-09-20 13:22:18 +02:00
Molkobain
e9c6549847
N°5535 - Fix PHP not validated version to 8.1 in iTop 3.0.2+
2022-09-20 13:17:59 +02:00
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
