Eric Espie
|
32835f70b9
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
|
2024-05-29 18:19:48 +02:00 |
|
Eric Espie
|
63cf78f64d
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts:
# pages/preferences.php
|
2024-05-29 18:18:55 +02:00 |
|
Eric Espie
|
8be7628668
|
N°7548 - Code hardening
|
2024-05-29 18:11:36 +02:00 |
|
Eric Espie
|
5e64be8580
|
N°7491 - ✅ Fix unit tests
|
2024-05-24 09:48:07 +02:00 |
|
Eric Espie
|
a0b76a25be
|
N°7491 - Fix Events during DBObject CRUD
|
2024-05-24 09:35:00 +02:00 |
|
Eric Espie
|
e2f2afad54
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
|
2024-05-21 15:07:28 +02:00 |
|
Eric Espie
|
f632cf3155
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
|
2024-05-21 15:07:08 +02:00 |
|
Eric Espie
|
13dfdc3d9d
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.1
|
2024-05-21 14:29:10 +02:00 |
|
Eric Espie
|
62caf16153
|
N°7364 - Code hardening
|
2024-05-21 14:20:30 +02:00 |
|
jf-cbd
|
020a37ead9
|
N°7526 - Profile input unfocus: Previously entered value still filters
|
2024-05-17 10:58:29 +02:00 |
|
odain
|
163a3afc0f
|
N°7426 - no session created - replace php_sapi_name() by PHP_SAPI in unattended
|
2024-05-16 15:31:08 +02:00 |
|
odain
|
35265718c1
|
Merge branch 'support/3.0' into support/3.1
|
2024-05-16 14:37:41 +02:00 |
|
odain
|
d98e35d918
|
Merge branch 'support/2.7' into support/3.0
|
2024-05-16 14:13:24 +02:00 |
|
odain
|
f8b54be896
|
N°7426 - no session created - replace php_sapi_name() by PHP_SAPI
|
2024-05-16 14:10:54 +02:00 |
|
Romain Quetiez
|
a88ce075cc
|
Merge branch 'support/3.0' into support/3.1
# Conflicts:
# tests/php-unit-tests/src/BaseTestCase/ItopTestCase.php
|
2024-05-16 14:07:36 +02:00 |
|
Romain Quetiez
|
c6f3e36451
|
Merge branch 'support/2.7' into support/3.0
# Conflicts:
# tests/php-unit-tests/src/BaseTestCase/ItopTestCase.php
# tests/php-unit-tests/unitary-tests/core/iTopConfigParserTest.php
|
2024-05-16 10:09:11 +02:00 |
|
Romain Quetiez
|
53dc452d61
|
✅ Avoid unnecessary custom test environment compilations (base compilation of file modification time)
|
2024-05-16 09:53:04 +02:00 |
|
Romain Quetiez
|
ccaf2dc5b7
|
Make the tests compatible with windows (and linux)
|
2024-05-16 09:53:04 +02:00 |
|
Molkobain
|
d9581a083d
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
|
2024-05-07 10:41:04 +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 |
|
jf-cbd
|
8c46c99ecc
|
N°7313 - Bad display of single quotes in charts
|
2024-04-30 15:04:28 +02:00 |
|
jf-cbd
|
02be397e8f
|
Merge remote-tracking branch 'refs/remotes/origin/support/3.0' into support/3.1
|
2024-04-30 10:57:06 +02:00 |
|
jf-cbd
|
61469a28b9
|
N°7445 - Invalid Unicode escape sequence on dashlet Header with statistics
|
2024-04-30 10:56:09 +02:00 |
|
jf-cbd
|
9ff54cead8
|
Merge remote-tracking branch 'refs/remotes/origin/support/3.0' into support/3.1
|
2024-04-30 08:14:11 +02:00 |
|
jf-cbd
|
dbcbb187b2
|
N°7445 - Invalid Unicode escape sequence on dashlet Header with statistics
|
2024-04-30 08:13:37 +02:00 |
|
jf-cbd
|
71b4d672d4
|
Merge remote-tracking branch 'refs/remotes/origin/support/3.0' into support/3.1
# Conflicts:
# pages/ajax.render.php
|
2024-04-30 08:04:45 +02:00 |
|
jf-cbd
|
93bba66323
|
N°7445 - Invalid Unicode escape sequence on dashlet Header with statistics
|
2024-04-30 08:03:14 +02:00 |
|
Molkobain
|
0a95aa385a
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
# Conflicts:
# tests/php-unit-tests/unitary-tests/application/applicationextension/Delta/application-extension-usages-in-snippets.xml
|
2024-04-29 14:03:16 +02:00 |
|
Molkobain
|
cab6394cba
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
|
2024-04-29 13:58:13 +02:00 |
|
Molkobain
|
32140b360f
|
✅ Cherry pick fixes from 59a955f4
|
2024-04-29 11:45:09 +02:00 |
|
Benjamin Dalsass
|
06a8481511
|
N°7279 - AttributeClass defined in XML datamodel compilation issue
|
2024-04-25 11:39:54 +02:00 |
|
jf-cbd
|
59a955f491
|
🐛 N°7313 - Bad display of single quotes in charts (#627)
* 🐛 N°7313 - Bad display of single quotes in charts
* Fix and improve ItopCustomDatamodelTestCase
|
2024-04-24 17:03:47 +02:00 |
|
jf-cbd
|
2ffcfd2f57
|
Merge remote-tracking branch 'refs/remotes/origin/support/3.0' into support/3.1
|
2024-04-24 12:00:47 +02:00 |
|
jf-cbd
|
e657052d17
|
Merge remote-tracking branch 'refs/remotes/origin/support/2.7' into support/3.0
|
2024-04-24 11:58:13 +02:00 |
|
jf-cbd
|
d85767a838
|
Update test to run only on commmunity builds
|
2024-04-24 11:14:40 +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 |
|
jf-cbd
|
7fba61ff35
|
N°7445 - Invalid Unicode escape sequence on dashlet Header with statistics
|
2024-04-19 15:21:48 +02:00 |
|
jf-cbd
|
1bf156bdda
|
Revert "Merge branch 'refs/heads/support/3.0' into support/3.1"
This reverts commit 1164e757de, reversing
changes made to 1235452a1b.
|
2024-04-19 15:16:57 +02:00 |
|
jf-cbd
|
1164e757de
|
Merge branch 'refs/heads/support/3.0' into support/3.1
# Conflicts:
# pages/ajax.render.php
|
2024-04-19 11:24:56 +02:00 |
|
jf-cbd
|
514e0b80a5
|
N°7445 - Invalid Unicode escape sequence on dashlet Header with statistics
|
2024-04-19 11:17:09 +02:00 |
|
Molkobain
|
1235452a1b
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
|
2024-04-19 09:24:21 +02:00 |
|
Molkobain
|
35f4ab4941
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
|
2024-04-19 09:22:32 +02:00 |
|
Molkobain
|
16ff6341d0
|
N°7455 - Fix regression from 4c784886, wrong class tested
|
2024-04-19 09:14:53 +02:00 |
|
Molkobain
|
12ad3c2732
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
|
2024-04-18 18:49:08 +02:00 |
|
Molkobain
|
ac826cb9f1
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
|
2024-04-18 18:48:24 +02:00 |
|
Molkobain
|
9dab8679d6
|
N°7448 - Update dictionary entry
|
2024-04-18 18:44:20 +02:00 |
|
Molkobain
|
4f3b25aa46
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
|
2024-04-18 18:17:41 +02:00 |
|