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
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
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
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
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
Molkobain
078fc7bfb8
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-08 11:44:23 +01:00
Molkobain
d5a8a3bb09
N°4756 - Fix PHPDoc
2023-11-07 12:00:19 +01:00
jf-cbd
eaeb114754
N°6852 - Use "email_default_sender_address" when "forgot_password_from" config param is empty
2023-11-06 10:47:40 +01:00
Molkobain
a67d095c70
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-03 09:21:48 +01:00
Stephen Abello
92cd1e3f19
N°6861 - Display warning message when creating/editing a mandatory blob in modal depending on edition mode and blob value
2023-11-02 14:58:46 +01:00
Stephen Abello
647f43882b
Merge branch 'support/3.1' into develop
2023-11-02 11:21:47 +01:00
Stephen Abello
b54022e2ad
N°6385 - Move Linkset flags and edit_when logic from UIBlock to DisplayBareRelations
2023-11-02 10:16:35 +01:00
Molkobain
3027bb5092
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-10-31 14:01:53 +01:00
Molkobain
83313ce1d5
N°6866 - Fix usages of hard-coded "listInObject" to \DisplayBlock::ENUM_STYLE_LIST_IN_OBJECT
2023-10-31 14:01:19 +01:00
Molkobain
0ad8db565d
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-10-30 17:00:20 +01:00
Stephen Abello
95aa4afe75
N°6385 - Allow to disable LinkedSet (1:n & n:n) edition by XML in host edition
2023-10-30 16:29:25 +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
Romain Quetiez
29e9a06dc1
✅ Optimize tests execution time (no need for process isolation as long as we leave the premises clean)
2023-10-26 21:10:47 +02:00
Molkobain
e3c26c97f2
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-10-26 11:27:40 +02:00
Stephen Abello
4f336abeb8
N°6861 - Display warning message when creating/editing a mandatory blob in modal
2023-10-23 15:51:38 +02:00
Pierre Goiffon
4e13cce770
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-10-17 11:27:09 +02:00
Stephen Abello
aa618468d1
Merge branch 'support/3.0' into support/3.1
2023-10-17 09:23:06 +02:00
Stephen Abello
fadfd94bac
Merge branch 'support/2.7' into support/3.0
2023-10-17 09:19:16 +02:00
Stephen Abello
9469681a0c
N°6777 - Security hardening
2023-10-17 09:12:40 +02:00
Pierre Goiffon
800d1b03c1
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-10-13 17:37:29 +02:00
Pierre Goiffon
d4ab55dd9a
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# pages/ajax.render.php
2023-10-13 17:33:26 +02:00
Pierre Goiffon
da27ddba82
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# application/utils.inc.php
# pages/ajax.render.php
2023-10-13 17:27:03 +02:00
Pierre Goiffon
c72cb7e70e
N°6606 security hardening
2023-10-13 17:15:37 +02:00
Pierre Goiffon
9df92665e0
N°6606 Backport of utils::ENUM_SANITIZATION_FILTER_* constants
...
Were introduced in 3.0.0, but not added to the support/2.7 branch
2023-10-13 17:10:35 +02:00
Molkobain
7d0feab078
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-09-26 22:23:18 +02:00
Molkobain
a472d83e3d
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# application/wizardhelper.class.inc.php
# pages/ajax.render.php
2023-09-26 22:21:48 +02:00
Molkobain
6dc6392fab
Merge remote-tracking branch 'origin/support/3.0.3' into support/3.0
2023-09-26 22:20:02 +02:00
Anne-Catherine
e793b02f8b
N°6766 - Fix dependent fields not updated due to WizardHelper.UpdateFields() being triggered too early ( #548 )
...
* N°6766 - Javascript : function WizardHelper.UpdateFields triggered to early does not update fields
* N°6766 - Code review
---------
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2023-09-26 12:25:56 +02:00
Pierre Goiffon
b6ac92d192
Merge remote-tracking branch 'origin/support/3.1' into develop
...
# Conflicts:
# datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php
2023-09-18 15:10:58 +02:00
Pierre Goiffon
d7df249586
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# application/ajaxwebpage.class.inc.php
# application/capturewebpage.class.inc.php
# application/clipage.class.inc.php
# application/csvpage.class.inc.php
# application/errorpage.class.inc.php
# application/itopwebpage.class.inc.php
# application/itopwizardwebpage.class.inc.php
# application/nicewebpage.class.inc.php
# application/pdfpage.class.inc.php
# application/webpage.class.inc.php
# application/xmlpage.class.inc.php
2023-09-18 15:10:19 +02:00
Pierre Goiffon
f3c4fcb0f5
💡 Pages files : add depreciation version
2023-09-18 15:07:32 +02:00
vdumas
f6a7e6b4e1
N°3506 - allow_target_creation based on UR_ACTION_MODIFY
2023-09-15 16:40:20 +02:00
Stephen Abello
ce1c517a9f
Merge branch 'support/3.1' into develop
2023-09-15 15:45:36 +02:00
Stephen Abello
178c922407
Merge branch 'support/3.0' into support/3.1
2023-09-15 09:57:59 +02:00
Stephen Abello
343e87a8d4
N°6581 - Security hardening
2023-09-15 09:55:51 +02:00
Pierre Goiffon
75b6a3ede8
Merge remote-tracking branch 'origin/support/3.1' into develop
...
# Conflicts:
# dictionaries/hu.dictionary.itop.ui.php
# dictionaries/ja.dictionary.itop.ui.php
# dictionaries/sk.dictionary.itop.ui.php
# dictionaries/ui/layouts/navigation-menu/pt_br.dictionary.itop.navigation-menu.php
2023-09-14 16:55:38 +02:00
