Eric Espie
c31443cb79
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-05-24 10:18:48 +02:00
Eric Espie
094a9ed82f
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
...
# Conflicts:
# tests/php-unit-tests/unitary-tests/core/CRUDEventTest.php
# tests/php-unit-tests/unitary-tests/core/DBObject/MockDBObjectWithCRUDEventListener.php
2024-05-24 10:04:40 +02:00
Eric Espie
a0b76a25be
N°7491 - Fix Events during DBObject CRUD
2024-05-24 09:35:00 +02:00
Molkobain
e7728ee7dd
N°5298 - Downsize CKEditor buttons / components for better integration with our UIs
2024-05-22 21:54:27 +02:00
Molkobain
6fb1afaa2f
N°5298 - Fix CKEditor fullscreen style in the end-users portal
2024-05-22 13:24:16 +02:00
Molkobain
8cb92e3bd3
N°7494 - Update highlight.js to v11.9.0
...
Mind that this lib is not maintained through NPM yet as its sources alone don't allow to be used in CKEditor out of the box, it needs extra steps to be built/used. And as we are already struggling with the CKEditor integration, we rather make baby steps.
2024-05-22 13:24:16 +02:00
vdumas
d9fcde8dbb
N°7484 - "autoresolve" Parent-Child now supports Friendlyname customization
2024-05-22 12:41:27 +02:00
jf-cbd
5103f898e1
Merge remote-tracking branch 'refs/remotes/origin/support/3.2' into develop
2024-05-17 11:23:08 +02:00
vdumas
0489235c67
N°7477 - Log execution result on DataSynchro made without administrator profile
2024-05-17 09:48:08 +02:00
Romain Quetiez
68ee3231f4
Merge branch 'support/3.2' into develop
...
# Conflicts:
# tests/php-unit-tests/src/Hook/TestsRunStartHook.php
2024-05-16 20:24:38 +02:00
vdumas
5bc8717d2b
N°7480 - Setup theme compilation warning
2024-05-16 17:06:44 +02:00
Eric Espie
fb96184401
N°7468 - SQL error on MTP and DBTools on 3.2-dev
2024-05-16 14:50:52 +02:00
vdumas
bdd2e9ab4d
N°7484 - UserRequest/Incident solution field supports HTML
2024-05-14 17:57:45 +02:00
vdumas
08b8be1ab2
N°7484 - UserRequest/Incident solution field supports HTML
2024-05-14 17:57:24 +02:00
Molkobain
46738d4ba4
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2024-05-07 10:38:50 +02:00
Molkobain
5d5df5ad1a
N°7255 - Fix misc. stylesheets not working in portal since N°7047
2024-05-07 10:37:39 +02:00
Molkobain
ad36066126
📝 Copyright year bump
2024-05-06 18:35:31 +02:00
jf-cbd
e51e55b634
Merge remote-tracking branch 'refs/remotes/origin/support/3.2' into develop
...
# Conflicts:
# pages/ajax.render.php
2024-04-30 08:18:57 +02:00
Stephen Abello
b1290072b5
N°6167 - Fix high contrast theme for new welcome popup
2024-04-29 11:09:41 +02:00
Stephen Abello
c82f169248
N°6167 - Fix darkmoon theme for new welcome popup
2024-04-29 10:51:59 +02:00
Eric Espie
b99249d2d2
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-04-24 16:11:58 +02:00
Molkobain
78215439ee
N°2039 - Add complementary name on child classes to avoid empty summary cards in iTop 3.1+
2024-04-23 19:14:44 +02:00
jf-cbd
23aed5415c
Merge remote-tracking branch 'refs/remotes/origin/support/3.2' into develop
2024-04-23 15:24:52 +02:00
jf-cbd
028c7f0604
Merge remote-tracking branch 'refs/remotes/origin/support/3.1' into support/3.2
2024-04-23 14:45:23 +02:00
jf-cbd
e56d5ed3aa
Merge remote-tracking branch 'refs/remotes/origin/support/3.0' into support/3.1
...
# Conflicts:
# datamodels/2.x/itop-hub-connector/launch.php
# setup/wizardsteps.class.inc.php
2024-04-23 14:13:40 +02:00
jf-cbd
e5a8bd61b0
Merge remote-tracking branch 'refs/remotes/origin/support/2.7' into support/3.0
...
# Conflicts:
# datamodels/2.x/itop-hub-connector/launch.php
2024-04-23 14:03:15 +02:00
jf-cbd
eeec57536b
Security hardening
2024-04-23 11:55:39 +02:00
Stephen Abello
e18018cacd
Merge branch 'support/3.2' into develop
2024-04-16 09:22:58 +02:00
Stephen Abello
dc553ca83c
N°5298 - Update CKEditor to version 5
2024-04-15 12:53:21 +02:00
vdumas
14c637c7f3
N°7428 - Fix spelling mistake on FR dictionary (lnkxxxToFunctionalCI)
2024-04-15 12:27:56 +02:00
jf-cbd
e5764ac495
Merge branch 'refs/heads/support/3.2' into develop
2024-04-08 14:14:31 +02:00
vdumas
a458d98688
N°7399 - Remove deprecated datamodel methods
2024-04-05 15:59:00 +02:00
Molkobain
d2f8d2e903
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-04-04 15:22:25 +02:00
Stephen Abello
3f401e4de0
N°7391 N°7392 - Add themes for accessibility ( #639 )
...
* N°7391 - Add color blind friendly themes
* N°7392 - Add high contrast theme
* Add modules to installation.xml
2024-04-04 11:17:14 +02:00
Eric Espie
dcf2780cac
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-03-28 13:33:04 +01:00
Eric Espie
2c68f78027
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
2024-03-28 13:32:33 +01:00
Eric Espie
7f9b60d66f
N°5913 - Add Event Listener methods & enhance methods management
2024-03-28 11:02:55 +01:00
Eric Espie
3e421c770b
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-03-27 11:30:02 +01:00
Eric Espie
816df1b551
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
2024-03-27 11:29:32 +01:00
Eric Espie
1278c4b196
N°7165 - Error message on application upgrade fatal Error due to CSS compilation
2024-03-27 11:11:55 +01:00
Eric Espie
a7f3bf9a56
N°7294 - EVENT_ADD_ATTACHMENT_TO_OBJECT not triggered
2024-03-27 10:34:48 +01:00
Eric Espie
4eed5bdeb9
N°7165 - Error message on application upgrade fatal Error due to CSS compilation
2024-03-27 10:12:21 +01:00
Stephen Abello
c29bff4d91
N°7355 - Fix deprecated jQuery call
2024-03-26 11:58:17 +01:00
Molkobain
ed81dbc4a2
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-03-21 17:43:41 +01:00
Molkobain
d57fd05552
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
2024-03-21 14:06:14 +01:00
Molkobain
5554241877
N°7122 N°4164 - Fix wrong merge in b08b5297
2024-03-21 14:04:18 +01:00
vdumas
d9232a645d
N°7379 - Default search for Workorder, lnkContactToTicket & Contact
2024-03-20 16:47:46 +01:00
Pierre Goiffon
ce13ee8a55
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-03-18 18:17:20 +01:00
Molkobain
7b5fa0a912
N°7122 - Fix wrongfully merged JS inclusion in b08b5297
2024-03-15 11:05:08 +01:00
Molkobain
5f88391935
N°7122 - Fix wrongfully merged JS inclusion
2024-03-15 09:36:15 +01:00