Pierre Goiffon
|
f4a027b474
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts:
# composer.json
# core/cmdbchangeop.class.inc.php
# core/cmdbobject.class.inc.php
# css/light-grey.scss
# setup/setuputils.class.inc.php
# test/ItopTestCase.php
# test/core/ConfigTest.php
# test/core/LogAPITest.php
# test/core/UserRightsTest.php
# test/core/dictApcuTest.php
# test/core/dictTest.php
# test/core/iTopConfigParserTest.php
# test/core/ormLinkSetTest.php
# test/phpunit.xml.dist
# test/postbuild_integration.xml.dist
# test/setup/SetupUtilsTest.php
# test/status/StatusIncTest.php
# webservices/cron.php
|
2022-04-22 15:26:18 +02:00 |
|
Pierre Goiffon
|
ec143c43db
|
N°3091 Update PHPUnit to 8.5 : fix setUp and teardDown methods signatures
"Return type declaration must be compatible with parent"
See https://phpunit.de/announcements/phpunit-8.html "Return Type of Template Methods"
|
2022-04-21 12:02:35 +02:00 |
|
Pierre Goiffon
|
8578d18e7f
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts:
# core/cmdbsource.class.inc.php
# core/config.class.inc.php
# core/displayablegraph.class.inc.php
# core/log.class.inc.php
# datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php
# datamodels/2.x/itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php
# datamodels/2.x/itop-tickets/tr.dict.itop-tickets.php
# datamodels/2.x/itop-welcome-itil/tr.dict.itop-welcome-itil.php
# dictionaries/tr.dictionary.itop.core.php
# dictionaries/tr.dictionary.itop.ui.php
# pages/UI.php
# setup/itopdesignformat.class.inc.php
# test/core/LogAPITest.php
# test/integration/iTopModulesPhpVersionChecklistTest.php
# test/postbuild_integration/SetupCssIntegrityChecklistTest.php
# test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php
# test/status/StatusTest.php
|
2022-01-10 16:15:00 +01:00 |
|
Pierre Goiffon
|
ddb8378fe6
|
N°4624 align phpunit annotations
Remove processIsolation when not needed
When needed, make sure to have also their counterpart (preserveGlobalState and backupGlobals)
|
2022-01-07 15:20:34 +01:00 |
|
Pierre Goiffon
|
74fbd12709
|
Merge remote-tracking branch 'origin/support/2.7' into develop
# Conflicts:
# datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php
# datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig
|
2021-11-26 17:24:41 +01:00 |
|
Molkobain
|
7f2eef4a24
|
Merge remote-tracking branch 'origin/support/2.6' into support/2.7
|
2021-11-26 13:59:29 +01:00 |
|
Molkobain
|
8a65a592f3
|
N°4360 - Rename class to match other classes convention
|
2021-11-26 13:47:05 +01:00 |
|
Pierre Goiffon
|
ddd6bf22af
|
Merge remote-tracking branch 'origin/support/2.7' into develop
# Conflicts:
# core/attributedef.class.inc.php
# core/config.class.inc.php
# core/htmlsanitizer.class.inc.php
# sources/Renderer/RenderingOutput.php
# test/core/sanitizer/HTMLDOMSanitizerTest.php
# test/integration/DictionariesConsistencyTest.php
|
2021-11-24 15:01:38 +01:00 |
|
Pierre Goiffon
|
efaf53e568
|
Merge remote-tracking branch 'origin/support/2.6' into support/2.7
# Conflicts:
# core/htmlsanitizer.class.inc.php
|
2021-11-23 18:07:02 +01:00 |
|
Pierre Goiffon
|
81a2a9278c
|
✅ N°4360 Fix SvgDOMSanitizer expected data
|
2021-11-23 17:38:30 +01:00 |
|
Pierre Goiffon
|
e15d4bfab6
|
N°4360 Security hardening
|
2021-11-23 17:25:50 +01:00 |
|
Molkobain
|
c3140c2db3
|
Copyright year bump
|
2021-03-12 18:48:46 +01:00 |
|
bruno DA SILVA
|
d3525190d5
|
N°2556 - Html sanitization preserve content of removed tags (except for a forbidden list)
forbidden list: see $aTagsContentRemovableList
(cherry picked from commit 746b47bb0e)
(cherry picked from commit 79909fadc0)
|
2020-06-22 11:40:38 +02:00 |
|
Pierre Goiffon
|
8d73eb6dff
|
Revert "N°2556 - Html sanitization preserve content of removed tags (except for a forbidden list)"
This reverts commit 746b47bb0e.
Revert "N°2556 - Repair CI"
This reverts commit 79909fadc0.
|
2020-06-22 11:36:46 +02:00 |
|
bruno DA SILVA
|
746b47bb0e
|
N°2556 - Html sanitization preserve content of removed tags (except for a forbidden list)
forbidden list: see $aTagsContentRemovableList
|
2020-05-14 10:33:30 +02:00 |
|
Pierre Goiffon
|
b67dc888fe
|
N°2558 Test for the HTMLDOMSanitizer white list
|
2019-12-03 08:42:25 +01:00 |
|