Pierre Goiffon
1de9e704fc
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-03-18 18:19:52 +01:00
Pierre Goiffon
f4b9a9a5fe
N°6455 Fix datepicker widget icon on button
...
The buttonText is now escaped
(cherry picked from commit fa5d03fc6e
2024-03-18 18:19:30 +01:00
Pierre Goiffon
fa5d03fc6e
N°6455 Fix datepicker widget icon on button
...
The buttonText is now escaped
2024-03-18 18:15:39 +01:00
jf-cbd
8ffcb01c43
Merge branch 'support/3.0' into support/3.1
2024-03-14 17:00:20 +01:00
jf-cbd
5c46b4ef4a
✅ Added modules to GetLtsCompatibleModulesList (Dictionnarie tests)
2024-03-14 16:59:32 +01:00
Pierre Goiffon
79cdb837b5
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# core/log.class.inc.php
2024-03-14 09:13:56 +01:00
Pierre Goiffon
a97935ca01
N°7336 DeprecatedCallsLog robustness ( #632 )
...
Was creating PHP notices when deprecated method caller wasn't a class/method
Found in iTop 3.2.0-dev with itop-object-copier copy.php : it is calling WebPage::add_linked_script directly inside the copy.php script (no class nor function)
Co-authored-by: odain <olivier.dain@combodo.com >
2024-03-13 15:38:21 +01:00
Molkobain
87181669d1
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-03-13 15:18:33 +01:00
Molkobain
efd7fb0f59
N°7331 - Fix wrong file extension in .htaccess file
2024-03-13 15:16:46 +01:00
Pierre Goiffon
71a0f8b87d
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-03-13 10:03:48 +01:00
Pierre Goiffon
a4edf8cb21
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# tests/php-unit-tests/unitary-tests/setup/SetupUtilsTest.php
2024-03-13 09:59:28 +01:00
Pierre Goiffon
dbd5ba0377
N°7302 Fix SetupUtilsTest::testHumanReadableSize
2024-03-13 09:56:31 +01:00
Pierre Goiffon
5d6f293956
N°7302 Report SetupUtilsTest::testHumanReadableSize in the 2.7 branch
2024-03-13 09:48:46 +01:00
Pierre Goiffon
65e6c84477
N°7302 Fix SetupUtilsTest::testHumanReadableSize
2024-03-13 09:37:34 +01:00
Pierre Goiffon
9cc7ccb1cd
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-03-13 09:27:39 +01:00
Pierre Goiffon
a337ef3d88
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# setup/modelfactory.class.inc.php
# setup/setuputils.class.inc.php
2024-03-13 09:27:06 +01:00
Pierre Goiffon
986c24d777
N°7302 Fix unit name in \SetupUtils::HumanReadableSize ( #626 )
2024-03-12 18:09:29 +01:00
Pierre Goiffon
763112c179
N°7344 rest.php core/get : add try/catch around query execution ( #622 )
...
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@super-visions.com >
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2024-03-12 18:08:04 +01:00
Pierre Goiffon
a5efd981d8
N°7343 Catch ParseError when loading dict files in setup ( #615 )
2024-03-12 18:05:38 +01:00
Pierre Goiffon
c0e4d04a1c
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# tests/php-unit-tests/unitary-tests/core/DBObjectTest.php
2024-03-12 17:36:04 +01:00
Pierre Goiffon
289ca7b505
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2024-03-12 17:34:51 +01:00
Pierre Goiffon
2922b22478
\DBObject::GetSearchForUniquenessRule remove wrong @api
2024-03-12 17:34:28 +01:00
Pierre Goiffon
2af05a437e
N°4314 - Fix Uniqueness rules not working with Silo
...
(cherry picked from commit e8c11f38d2
2024-03-12 17:32:56 +01:00
vdumas
71d9536bc4
N°7268 Method SetComputedDate fails on Date only attribute
...
(cherry picked from commit b6caa51552c8810708ef
2024-03-12 17:29:04 +01:00
Molkobain
b08b5297cf
N°7122 N°4164 - Adjustment to Symfony 5.4
2024-03-11 21:57:37 +01:00
Molkobain
3e6e096f62
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig
2024-03-11 21:27:59 +01:00
Molkobain
6377a738c5
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2024-03-11 21:18:53 +01:00
Molkobain
a9f8dcc5e8
N°7122 N°4164 - Portal: Hide log off button when user can't actually log off (eg. SSO using SAML or other providers) ( #599 )
...
* N°7122 N°4164 - Portal: Hide log off button when user can't actually log off (eg. SSO using SAML or other providers)
* N°7122 - Fix typo
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@super-visions.com >
---------
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@super-visions.com >
2024-03-11 21:13:09 +01:00
Pierre Goiffon
9750fec959
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-03-11 16:40:14 +01:00
Pierre Goiffon
969a301cbb
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2024-03-11 16:40:01 +01:00
Pierre Goiffon
c325294e17
N°6599 Update moment from 2.22.2 to 2.30.1
2024-03-11 16:39:05 +01:00
Benjamin Dalsass
af2c6d9ab8
N°7279 - AttributeClass defined in XML datamodel compilation issue
...
- make more_values property optional
2024-03-11 16:03:38 +01:00
Eric Espie
cf6e8ab22a
N°6974 - Add unit tests for compatibility validation
2024-03-08 13:29:04 +01:00
Pierre Goiffon
9032dac314
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-03-08 11:13:43 +01:00
Pierre Goiffon
a29b0a8e33
N°6455 Update JQuery-UI from 1.12.1 to 1.13.2
2024-03-08 11:13:32 +01:00
Pierre Goiffon
c1efad7556
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-03-07 11:11:34 +01:00
Pierre Goiffon
f78b57521a
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2024-03-07 11:11:19 +01:00
Pierre Goiffon
da490739be
💡 Fix \CMDBSource::Query phpdoc block
2024-03-07 11:10:53 +01:00
Pierre Goiffon
bf4b07a366
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-03-04 08:41:25 +01:00
Pierre Goiffon
48de13b5cf
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2024-03-04 08:32:59 +01:00
Pierre Goiffon
b867faa355
✅ Fix DBObjectTest
...
Error was "Class 'Combodo\iTop\Test\UnitTest\Core\DBObjectSet' not found"
2024-03-04 08:09:35 +01:00
Pierre Goiffon
849c495093
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-03-01 17:26:19 +01:00
Pierre Goiffon
e878938e25
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2024-03-01 17:26:05 +01:00
jf-cbd
7453cc184f
✏️ fix a typo
2024-03-01 17:25:08 +01:00
Eric Espie
3b9ca4ad18
N°7310 - New Event to handle available Transitions
2024-03-01 09:39:00 +01:00
Anne-Cath
eddc750ca8
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# pages/audit.php
# tests/php-unit-tests/unitary-tests/core/DBSearchTest.php
2024-02-29 16:53:39 +01:00
Anne-Cath
f3abe1ff13
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# pages/audit.php
2024-02-29 16:50:04 +01:00
Anne-Catherine
473cf004b6
N°6968 - Audit duration : add of a rule multiplie by 4 the time of response ( #575 )
2024-02-29 16:33:04 +01:00
Pierre Goiffon
46273dfc12
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-02-28 16:43:51 +01:00
Pierre Goiffon
24f1cf8ca1
💡 Fix deprecated in JSDoc
2024-02-28 16:43:40 +01:00
