jf-cbd
3064ab4b25
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-04-05 15:01:41 +02:00
jf-cbd
a3553202d9
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
...
# Conflicts:
# pages/csvimport.php
2024-04-05 14:56:38 +02:00
jf-cbd
b10d381dda
N°7374 - Security hardening
2024-04-05 14:40:56 +02:00
Eric Espie
9dc7b6dc0c
N°7405 - ✅ Fix unit tests
2024-04-05 11:29:41 +02:00
Eric Espie
1be67f349f
N°7405 - Cache error message
2024-04-05 11:08:47 +02:00
Eric Espie
3e421c770b
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-03-27 11:30:02 +01:00
Molkobain
739afdb1ec
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
2024-03-26 13:00:25 +01:00
Eric Espie
7b999cef50
Compilation issue
2024-03-26 11:57:08 +01:00
Anne-Cath
19cb0e873a
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-03-26 11:41:26 +01:00
Molkobain
babdd9f163
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
2024-03-22 14:23:00 +01:00
Eric Espie
90458f6048
N°6974 - Flatten classes in datamodel - Allow _delta="merge" in strict mode
2024-03-22 10:11:25 +01:00
Molkobain
3a990f46d3
N°7157 - Add 'subscription_policy' to remaning Trigger zlists
2024-03-22 09:46:31 +01:00
Molkobain
ed81dbc4a2
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-03-21 17:43:41 +01:00
Molkobain
def10a9877
Add log channel for data integrity
2024-03-20 10:09:10 +01:00
Eric Espie
a4a3797cc1
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-03-19 14:07:55 +01:00
Eric Espie
6098842d9f
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
...
# Conflicts:
# core/designdocument.class.inc.php
# lib/composer/autoload_files.php
# lib/composer/autoload_static.php
2024-03-19 14:06:24 +01:00
Eric Espié
2f30a0146e
N°6974 - Flatten classes in datamodel ( #603 )
...
* N°6974 - Flatten classes in datamodel
* N°6882 - LoadDelta() in lax/strict mode
* N°6974 - Flatten classes in datamodel
* N°6882 - LoadDelta() in lax/strict mode
* N°7186 - Code hardening
* N°6974 - Flatten classes in datamodel
* N°6660 and N°7318 - Support delete_if_exists and define_if_not_exists in XML injection
* N°6974 - Flatten classes in datamodel
* Apply suggestions from code review
* Update core/designdocument.class.inc.php
---------
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2024-03-19 13:53:14 +01:00
jf-cbd
ff7eca2f08
Merge branch 'support/3.2' into develop
...
# Conflicts:
# lib/composer/installed.php
2024-03-14 17:17:55 +01:00
Pierre Goiffon
912c7fa956
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
2024-03-14 09:14:30 +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
Pierre Goiffon
147043857b
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-03-12 18:39:44 +01:00
Pierre Goiffon
27ac1fe276
N°7345 Accept DateTime objects for DBObject::Set() calls on AttributeDateTime and children ( #618 )
2024-03-12 18:29:55 +01:00
Pierre Goiffon
1bfa1a7746
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-03-12 17:44:49 +01:00
Pierre Goiffon
6450b52697
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
...
# Conflicts:
# core/dbobject.class.php
# tests/php-unit-tests/unitary-tests/core/DBObjectTest.php
2024-03-12 17:44:33 +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
Benjamin Dalsass
dae3be99ce
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-03-11 16:05:34 +01:00
Thomas Casteleyn
5be386d03e
N°4894 - Improve AttributeDecimal validation during CSV import ( #248 )
...
* Update AttributeDecimal validation pattern
* Update phpdoc
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
* Reduce unneeded sprintf flags
---------
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2024-03-08 17:03:51 +01:00
Pierre Goiffon
1b9b4fdd39
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-03-07 15:28:27 +01:00
Stephen Abello
3650cf761d
N°2039 - Correctly pass context arguments to recipients OQL
2024-03-07 15:06:53 +01:00
Benjamin Dalsass
8bb551eb10
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-03-07 14:34:20 +01:00
Benjamin Dalsass
34c4d753d3
N°797 - Delete of DataSynchro incomplete
2024-03-07 14:05:50 +01:00
Molkobain
6177035f84
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-03-07 13:26:29 +01:00
Molkobain
4d1f8e5704
N°7157 - Fix ValueSetEnum values as array must conserve keys
2024-03-07 11:17:35 +01:00
Pierre Goiffon
e6d3ce5918
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-03-07 11:12:39 +01:00
Pierre Goiffon
7ac283bffb
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
2024-03-07 11:11:48 +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
Molkobain
8e8d586dcc
N°7157 - Add support for backed-enum in \ValueSetEnum constructor
2024-03-07 11:02:23 +01:00
Molkobain
e05b4e772c
N°7157 - Fix usage of Enum case value
2024-03-06 23:05:16 +01:00
Molkobain
02efea4e55
N°7157 - Migrate enum values from strings to PHP Enum
2024-03-06 19:31:17 +01:00
Molkobain
17bab06ff5
N°7157 - Migrate enum values from strings to PHP Enum
2024-03-06 18:40:47 +01:00
Molkobain
9e08143981
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-03-06 14:47:29 +01:00
Molkobain
33ba754277
N°7315 - Migrate deprecated usages of WebPage::add_linked_script()
2024-03-05 22:58:57 +01:00
Molkobain
8c7b33fb06
N°7315 - Migrate relative images URLs to absolute ones in order to support pages on different depth levels
2024-03-05 21:55:00 +01:00
