Pierre Goiffon
5aaaeda6c5
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-23 16:01:03 +01:00
Pierre Goiffon
9266458cba
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2023-11-23 15:55:33 +01:00
Pierre Goiffon
6f1de11c59
N°6976 Fix DeprecatedCallsLog error handler never set ( #576 )
...
Caused by N°6274 (disabling error handler when running phpunit)
There is now a test testing the handler is really fixed when not in the phpunit context
Also a TRACE log is made on setting the handler
2023-11-23 15:54:10 +01:00
Molkobain
3bdb883f1c
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-23 15:08:22 +01:00
Molkobain
a18f50615a
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# pages/exec.php
2023-11-23 15:07:11 +01:00
Anne-Cath
fbd69f6d3a
Merge remote-tracking branch 'origin/support/3.1' into develop
...
# Conflicts:
# datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php
2023-11-23 14:30:27 +01:00
Molkobain
e02b6ee14a
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2023-11-23 14:25:16 +01:00
Anne-Catherine
0d388cb3e7
N°3465 - Fix attachment file name hardcoded to "uploaded-file" when imported from CSV import ( #533 )
...
N°3465 - Fix attachment file name hardcoded to "uploaded-file" when imported from CSV import
2023-11-23 14:15:59 +01:00
Anne-Catherine
5283df5ae9
N°3767 - Impact analysis: Display filtering box on CIs list and groups ( #473 )
...
N°3767 - Impact analysis: Display filtering box on CIs list and groups
2023-11-23 14:06:10 +01:00
Eric Espie
f736634c3e
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-23 11:27:04 +01:00
Eric Espie
8e0d6d1f00
N°6228 - Refactor after review
2023-11-23 11:14:37 +01:00
Eric Espie
f72d8f4955
N°6531 - Trigger on Update on n-n fields not working when object updated in pop-up
2023-11-23 11:14:37 +01:00
Pierre Goiffon
ea845dc6eb
N°6228 - CheckToWrite() propagation to target objects based on with_php_constraint property
2023-11-23 11:14:37 +01:00
Molkobain
3b2da39469
N°6989 - Security hardening
2023-11-22 18:02:50 +01:00
odain-cbd
9a59bc7890
N°6901 - Enable tracking of iTop active sessions (monitoring) ( #568 )
...
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
Co-authored-by: Romain Quetiez <romain.quetiez@combodo.com >
2023-11-22 17:46:00 +01:00
odain
4b19911e12
Merge branch 'support/3.1' into develop
2023-11-22 12:31:21 +01:00
odain
88008b3925
Merge branch 'support/3.0' into support/3.1
2023-11-22 12:31:02 +01:00
odain
e73f2c9a30
Merge branch 'support/3.1' into develop
2023-11-22 11:16:46 +01:00
odain
8484bee269
N°6949 - Run subset of itop core unit tests after the setup when validating a module github code
2023-11-22 11:16:03 +01:00
odain
c5b43f3157
Merge branch 'support/2.7' into support/3.0
2023-11-22 11:10:06 +01:00
odain
fc22d91232
N°6949 - Run subset of itop core unit tests after the setup when validating a module github code
2023-11-22 10:14:58 +01:00
Pierre Goiffon
87bb3d17a9
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-21 18:10:11 +01:00
Pierre Goiffon
cfe73699cf
N°6967 Deprecate DBDeleteTracked_Internal methods
2023-11-21 18:05:29 +01:00
Pierre Goiffon
fa830bdd7f
N°6966 Deprecate DBCloneTracked and DBCloneTracked_Internal methods
2023-11-21 18:04:05 +01:00
Pierre Goiffon
33596249a1
N°6973 Fix composer platform check
2023-11-21 11:03:58 +01:00
Pierre Goiffon
26beeb6a80
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-21 11:02:28 +01:00
Pierre Goiffon
2c1df77f4d
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2023-11-21 11:01:31 +01:00
Pierre Goiffon
3068a6a360
N°6951 Fix autoloader
2023-11-21 11:01:16 +01:00
Stephen Abello
982b3aa5f3
Merge branch 'support/3.1' into develop
...
# Conflicts:
# dictionaries/ui/application/bulk/zh_cn.dictionary.itop.bulk.php
# dictionaries/zh_cn.dictionary.itop.core.php
2023-11-21 10:26:15 +01:00
Stephen Abello
47e7c35c2b
Merge branch 'support/3.0' into support/3.1
...
# Conflicts:
# dictionaries/cs.dictionary.itop.core.php
# dictionaries/da.dictionary.itop.core.php
# dictionaries/de.dictionary.itop.core.php
# dictionaries/es_cr.dictionary.itop.core.php
# dictionaries/hu.dictionary.itop.core.php
# dictionaries/it.dictionary.itop.core.php
# dictionaries/ja.dictionary.itop.core.php
# dictionaries/nl.dictionary.itop.core.php
# dictionaries/pl.dictionary.itop.core.php
# dictionaries/pt_br.dictionary.itop.core.php
# dictionaries/ru.dictionary.itop.core.php
# dictionaries/sk.dictionary.itop.core.php
# dictionaries/tr.dictionary.itop.core.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_static.php
# sources/Application/Helper/ExportHelper.php
2023-11-21 10:24:29 +01:00
Stephen Abello
083a0b79bf
N°6951 - Security hardening
2023-11-21 10:08:46 +01:00
Stephen Abello
e22220b4fe
Merge branch 'support/2.7' into support/3.0
...
# Conflicts:
# core/csvbulkexport.class.inc.php
# core/excelbulkexport.class.inc.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_files.php
# lib/composer/autoload_real.php
# lib/composer/autoload_static.php
2023-11-21 09:47:14 +01:00
Stephen Abello
b10bcb976d
N°6951 - Security hardening
2023-11-21 09:42:11 +01:00
Pierre Goiffon
8e179f0563
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-21 09:25:35 +01:00
Pierre Goiffon
a2181b3478
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2023-11-21 09:25:21 +01:00
Pierre Goiffon
154a20b757
💡 Fix ItopCustomDatamodelTestCase since phpdoc
...
See https://docs.phpdoc.org/guide/references/phpdoc/tags/since.html#since
2023-11-21 09:21:30 +01:00
Pierre Goiffon
79c24dfc96
N°6975 Fix ItopCustomDatamodelTestCase removing symlinks flag ( #574 )
2023-11-21 09:20:11 +01:00
Molkobain
95e0f02cae
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-20 15:55:52 +01:00
Benjamin Dalsass
c0b1e877ad
Upgrade PHP min version to 8.1.0
2023-11-20 15:21:00 +01:00
Molkobain
403c369ea0
N°6963 - Update comment
2023-11-20 09:20:09 +01:00
Molkobain
d5875047fa
N°6963 - Update PHP min version prerequisite (8.1) for next iTop version (3.2.0)
2023-11-17 10:25:22 +01:00
Molkobain
444c9e0589
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-17 08:50:26 +01:00
Molkobain
6955f74c97
N°5281 - Fix methods name case
2023-11-17 08:48:51 +01:00
Molkobain
fb0f692c73
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-16 16:34:30 +01:00
Molkobain
6bf9ce3237
Merge remote-tracking branch 'origin/release/designer-lot-3' into support/3.1
2023-11-16 16:33:17 +01:00
Molkobain
5726f9f81a
N°6960 - Fix \MFDocument::GetNodes() adding a predicate on last expression only instead of the whole XPath
2023-11-16 16:31:47 +01:00
Pierre Goiffon
90a0e50e75
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-16 16:18:22 +01:00
Pierre Goiffon
be93b41363
✅ N°6458 Fix failing tests due to ItopDataTestCase modifications
2023-11-16 15:43:11 +01:00
Pierre Goiffon
d33d82bcd8
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2023-11-16 15:35:52 +01:00
Pierre Goiffon
b9d960e89e
✅ N°6458 Fix ItopDataTestCase::$bIsUsingSilo visibility
2023-11-16 15:35:04 +01:00
