jf-cbd
623d2823ff
Fix merge conflict
2025-02-04 11:29:19 +01:00
jf-cbd
5d5849b724
Merge remote-tracking branch 'origin/support/3.2' into develop
...
# Conflicts:
# tests/php-unit-tests/unitary-tests/core/AttributeDefinitionTest.php
2025-02-04 10:52:18 +01:00
XGUI
3a497524dc
N°8129 - Fix unexpected identifier self
2025-02-04 10:48:28 +01:00
XGUI
902e2259a9
N°8129 - Remove duplicated test method
2025-02-04 10:33:35 +01:00
XGUI
b87fb65ac4
Merge branch 'support/3.2' into develop
...
# Conflicts:
# core/attributedef.class.inc.php
# datamodels/2.x/version.xml
# tests/php-unit-tests/src/BaseTestCase/ItopTestCase.php
# tests/php-unit-tests/unitary-tests/core/AttributeDefinitionTest.php
2025-02-04 10:14:41 +01:00
Anne-Catherine
8e0e01ad40
N°7216 import improves error handling missing or null data ( #612 )
...
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@super-visions.com >
2025-01-30 16:14:14 +01:00
XGUI
5851b2e1ff
N°8129 - Fix missing namespace backslash
2025-01-30 15:06:00 +01:00
XGUI
803ebfbe33
N°8129 - Dont crash if date/time default value has a bad format
2025-01-30 14:14:31 +01:00
odain
d12c8a183c
N°8143 - Setup page in error in support.combodo.com
2025-01-30 11:16:07 +01:00
XGUI
f1594ad974
Merge remote-tracking branch 'origin/develop' into develop
2025-01-29 15:58:06 +01:00
XGUI
9e3f99a150
N°8129 - Dont crash if date/time default value has a bad format
2025-01-29 15:55:20 +01:00
Eric Espie
71244e5c15
Merge remote-tracking branch 'origin/support/3.2' into develop
2025-01-29 09:37:10 +01:00
Eric Espie
a3c911e93e
N°8139 - ✅ Avoid double writing in lifecycle action
2025-01-29 09:32:21 +01:00
Eric Espie
72e0750c1b
Merge remote-tracking branch 'origin/support/3.2' into develop
2025-01-28 11:13:05 +01:00
Eric Espie
38e0fb27f1
N°8131 - ✅ Issue on DBlinkchange event when object is deleted
2025-01-28 11:12:11 +01:00
Eric Espie
4b4197d910
N°8131 - ✅ Issue on DBlinkchange event when object is deleted
2025-01-28 11:09:31 +01:00
jf-cbd
ac8004561b
Merge remote-tracking branch 'origin/support/3.2' into develop
2025-01-28 10:53:15 +01:00
Eric Espie
52097f5e12
N°8131 - ✅ Issue on DBlinkchange event when object is deleted
2025-01-28 10:33:11 +01:00
jf-cbd
4c8392b332
Merge remote-tracking branch 'origin/support/3.2' into develop
2025-01-21 17:43:35 +01:00
jf-cbd
470f145747
N°6284 - fix regex
2025-01-21 17:41:53 +01:00
odain
d0bdde30ad
Merge branch 'support/3.2' into develop
2025-01-14 08:34:41 +01:00
odain
95dbe4c859
N°7873 - ci fix remove useless require_once
2025-01-14 07:52:07 +01:00
Benjamin Dalsass
3fe8b6c696
Merge remote-tracking branch 'origin/support/3.2' into develop
2025-01-13 15:01:55 +01:00
Benjamin Dalsass
ec6adee9c1
Remove useless require_once and replace it with inheritance
2025-01-13 14:32:06 +01:00
odain
a4490e2b5f
N°7873 - Portal: Brick visible despite XML security tag allowed profiles
2025-01-13 11:06:27 +01:00
Eric Espie
e0b12144cb
Merge remote-tracking branch 'origin/support/3.2' into develop
...
# Conflicts:
# sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanel.php
2025-01-13 09:18:00 +01:00
Romain Quetiez
93dba0644d
N°5791 - Handle NOT IN and NOT LIKE too
2025-01-10 16:21:12 +01:00
Eric Espie
886db5d6ad
N°7145 - UI - Init Value DateTime and Date with Day Time (use OQL syntax for default value)
2025-01-09 10:49:35 +01:00
Eric Espie
79a46581ef
Merge remote-tracking branch 'origin/support/3.2' into develop
...
# Conflicts:
# tests/php-unit-tests/src/BaseTestCase/ItopDataTestCase.php
2025-01-07 13:31:49 +01:00
Eric Espie
0e8ddf990c
N°7145 - UI - Init Value DateTime and Date with Day Time (Fix Event class)
2025-01-07 13:21:13 +01:00
Eric Espie
346a8eadec
N°5791 - Obsolescence condition containing IN makes object creation fail
2025-01-07 11:29:33 +01:00
Eric Espie
301a7a92a0
N°7145 - UI - Init Value DateTime and Date with Day Time
2025-01-06 16:52:32 +01:00
Eric Espie
73bb80ebea
N°7206 - Force DBUpdate() when a transition is asked, and it leads to the same state
2025-01-06 11:31:36 +01:00
v-dumas
1225ee1e78
✅ improve test
2025-01-03 17:18:24 +01:00
v-dumas
a91de9fb36
✅ Add helpers for stopwatches manipulation
2025-01-03 17:04:41 +01:00
v-dumas
71b3a415a6
N°7206 - Add tests
2025-01-03 16:17:51 +01:00
Romain Quetiez
b97c7433c8
🎨 N°7633 Cosmetics on unit tests
2025-01-03 11:57:51 +01:00
jf-cbd
5a59d16c99
Merge remote-tracking branch 'origin/support/3.2' into develop
2025-01-02 09:34:32 +01:00
jf-cbd
11fc958a7b
🐛 N°6284 - Add data-object-key
2024-12-31 15:01:36 +01:00
odain
a63a3d3d9c
Merge branch 'support/3.2' into develop
2024-12-27 11:14:21 +01:00
odain
a151e40b75
Merge branch 'support/3.1' into support/3.2
2024-12-27 11:13:50 +01:00
odain
5780f26817
N°7810: fix merge
2024-12-27 11:13:31 +01:00
odain
ed6e4f612a
Merge branch 'support/3.2' into develop
2024-12-27 09:24:49 +01:00
odain
9a690861a3
Merge branch 'support/3.1' into support/3.2
2024-12-27 09:24:33 +01:00
odain
343f3286b8
Merge branch 'support/2.7' into support/3.1
2024-12-27 09:08:47 +01:00
Eric Espie
37fc1a5723
N°7810 - security hardening
2024-12-27 09:04:28 +01:00
Stephen Abello
ea5473ad77
Merge branch 'support/3.2' into develop
2024-12-19 15:16:51 +01:00
Eric Espie
30ef2735b6
N°8001 - TriggerOnObjectMention : load of the icon failed
2024-12-18 16:03:39 +01:00
odain
d25bf4ef66
Merge branch 'support/3.2' into develop
2024-12-17 17:32:17 +01:00
odain-cbd
5f85757630
N°7633 - Reloads the same user multiple times if it no longer exists ( #692 )
...
* N°7633 - Reloads the same user multiple times if it no longer exists
* Update core/userrights.class.inc.php
good catch
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@super-visions.com >
* Update core/userrights.class.inc.php
good catch (again)
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@super-visions.com >
* Update core/userrights.class.inc.php
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@super-visions.com >
* PR feedbacks from Romain
* ci: rename user logins
---------
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@super-visions.com >
2024-12-17 17:27:49 +01:00
