Molkobain
bf3de38214
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-27 15:18:05 +01:00
Eric Espie
ad8922861b
N°6531 - Fix refactor
2023-11-27 14:49:27 +01:00
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
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
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
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
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
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
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
ad0fa6636b
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-15 15:47:24 +01:00
Pierre Goiffon
e3e8b25cfc
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# core/dbobject.class.php
# datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
# lib/composer/autoload_files.php
# lib/composer/autoload_real.php
# lib/composer/autoload_static.php
# pages/UI.php
# tests/php-unit-tests/unitary-tests/core/DBObjectTest.php
2023-11-15 15:31:56 +01:00
Pierre Goiffon
c955fe00b7
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# application/cmdbabstract.class.inc.php
# application/utils.inc.php
# core/coreexception.class.inc.php
# core/userrights.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
# tests/php-unit-tests/README.md
# tests/php-unit-tests/unitary-tests/core/DBObjectTest.php
2023-11-15 15:03:04 +01:00
Pierre Goiffon
5a43448644
N°6458 Security hardening
2023-11-15 11:14:07 +01:00
Pierre Goiffon
c41ecb1b9d
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-13 16:28:34 +01:00
Pierre Goiffon
f5a0b4bf8e
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2023-11-13 16:27:34 +01:00
Pierre Goiffon
a2b9583379
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2023-11-13 16:25:53 +01:00
Pierre Goiffon
77409eed99
🎨 DBObject small phpdoc fixes
2023-11-13 16:25:37 +01:00
Molkobain
770bf4c42a
Merge remote-tracking branch 'origin/support/3.1' into develop
...
# Conflicts:
# sources/Service/Events/EventService.php
2023-11-13 15:24:47 +01:00
Eric Espie
4d5a704d9a
N°6062 - ✅ Fix unit tests
2023-11-13 15:14:29 +01:00
Eric Espie
b758113752
N°6436 - Integrate Performance Audit pre requisite (log events for extensions)
2023-11-13 15:02:54 +01:00
Romain Quetiez
473c4cf3fa
✅ N°6658 - Reset the "current user" status (defensive programming)
2023-11-10 16:33:56 +01:00
Romain Quetiez
347156f900
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-10 16:30:22 +01:00
Romain Quetiez
3b987f97eb
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2023-11-10 16:15:08 +01:00
Romain Quetiez
d9bdcfeae3
✅ N°6658 - Fix regression: do not reset current user's profile cache
2023-11-10 15:57:08 +01:00
Molkobain
336b5da2a7
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-09 18:24:30 +01:00
Molkobain
2d8ecd465b
N°6903 - Fix crash when emptying file attribute (eg. picture of a contact)
2023-11-09 18:17:35 +01:00
Stephen Abello
647f43882b
Merge branch 'support/3.1' into develop
2023-11-02 11:21:47 +01:00
odain-cbd
eaa80c5396
N°6824 - Notification with current_contact placeholder trigger hundred of email sent ( #562 )
...
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@super-visions.com >
Co-authored-by: Romain Quetiez <romain.quetiez@combodo.com >
2023-10-31 16:17:57 +01:00
Romain Quetiez
e7d11e4bec
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-10-27 19:41:01 +02:00
Romain Quetiez
73fd0b06b2
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php
# tests/php-unit-tests/src/BaseTestCase/ItopTestCase.php
# tests/php-unit-tests/unitary-tests/core/CMDBSource/TransactionsTest.php
# tests/php-unit-tests/unitary-tests/sources/Application/TwigBase/Twig/TwigTest.php
2023-10-27 14:12:06 +02:00
Molkobain
e3c26c97f2
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-10-26 11:27:40 +02:00
Romain Quetiez
8893cdac1d
✅ Optimize tests execution time (no need for process isolation as long as we leave the premises clean)
2023-10-26 10:44:37 +02:00
Stephen Abello
a9bd62dc43
N°6385 - Allow to disable LinkedSet (1:n & n:n) edition by XML
...
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2023-10-24 11:09:12 +02:00
Anne-Cath
58257fa25e
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-10-20 17:07:38 +02:00
Anne-Cath
c597c34e5c
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2023-10-20 17:06:11 +02:00
Anne-Cath
0cc0f39d9e
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2023-10-20 17:04:26 +02:00
Anne-Catherine
a2cdf214f0
N°3715 - Export above 1000 entries ignore obsolete data from user preference ( #468 )
...
* N°3715 - Export above 10000 entries ignore obsolete data from user preference
2023-10-20 17:02:16 +02:00
Anne-Cath
8ca20e3135
Remove change push by error
2023-10-17 11:45:27 +02:00
Pierre Goiffon
4e13cce770
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-10-17 11:27:09 +02:00
Pierre Goiffon
31a1370028
Merge branch 'support/3.1.0' into support/3.1
...
# Conflicts:
# core/DbConnectionWrapper.php
# tests/php-unit-tests/unitary-tests/core/CMDBSource/TransactionsTest.php
2023-10-17 11:13:29 +02:00
