Timothee
3233b9776f
Revert "Merge remote-tracking branch 'origin/support/3.1' into support/3.2"
...
This reverts commit 905bbf91181c00461f4d
2024-06-17 18:03:12 +02:00
Timothee
905bbf9118
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
2024-06-17 17:04:05 +02:00
Timothee
d70e5dff45
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-06-17 16:55:26 +02:00
Timothee
c4fc0ed982
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2024-06-17 16:51:30 +02:00
Timothee
320922a13d
N°7545 Correctly display error message
2024-06-17 16:49:33 +02:00
jf-cbd
7e8ff50886
Merge remote-tracking branch 'refs/remotes/origin/support/3.2' into develop
...
# Conflicts:
# js/ckeditor/src/plugins/maximize/maximize.plugin.ts
2024-06-13 17:53:06 +02:00
Benjamin Dalsass
6c0dfd13eb
N°7552 - Polishing CKeditor
...
- set an editor height to prevent editor growing
2024-06-13 16:21:58 +02:00
jf-cbd
b8c4be7a3d
N°7552 - Polishing CKeditor (maximized mode, focus impossible if editor in a modal)
...
Fullscreen mode for portal (native browser method)
Windowed mode for console (JS method)
portal.css not minified
2024-06-13 15:30:57 +02:00
Romain Quetiez
c34dc34e3e
Complete french translations (reviewed with Vincent)
2024-06-12 18:08:54 +02:00
Vincent Dumas
a1e48cc438
Fix FR missing translations
2024-06-12 17:31:11 +02:00
Timothee
d4b41d892c
Automated dictionaries synchronization with english reference
2024-06-11 17:43:44 +02:00
Timothee
09a5d7a35f
Automated dictionaries synchronization with english reference
2024-06-11 16:38:40 +02:00
Benjamin Dalsass
645d68d5d0
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-06-07 08:20:40 +02:00
jf-cbd
ffcc8ff32a
N°7459 optimize memory consumption during compilation with php 8.1+ ( #650 )
...
N°7459 optimize memory consumption during compilation with PHP 8.1+
2024-06-05 11:03:43 +02:00
vdumas
f9fd4f1e2a
N°6303 - Add search ticket bricks in portal
2024-06-04 21:58:18 +02:00
vdumas
f568aaf732
N°6303 - Add search ticket bricks in portal
2024-06-04 11:40:59 +02:00
Benjamin Dalsass
a9a9fb1da2
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-05-30 09:21:58 +02:00
Benjamin Dalsass
fa43aaba49
N°5298 - Upgrade CKEditor to version 5
...
- set a minimum editor height (180px) in portal
2024-05-30 09:17:40 +02:00
Benjamin Dalsass
12fc7fbfd9
N°5298 - Upgrade CKEditor to version 5
...
- set a minimum editor height (180px) in portal
2024-05-30 09:16:39 +02:00
Benjamin Dalsass
8bea29f0e7
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-05-28 16:07:36 +02:00
Benjamin Dalsass
7cf607c34e
N°5298 - Upgrade CKEditor to version 5
...
- restore portal highlight js import
2024-05-28 11:28:46 +02:00
Benjamin Dalsass
74a42a4d4f
Merge remote-tracking branch 'origin/support/3.2' into develop
2024-05-24 16:14:44 +02:00
Benjamin Dalsass
9bf0addc9c
N°5298 - Upgrade CKEditor to version 5 ( #647 )
2024-05-24 16:13:20 +02:00
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
