Timothee
|
66230199f8
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
|
2024-06-21 12:41:17 +02:00 |
|
Timothee
|
1f1a2b660f
|
N°7581 Improve error message readability during object creation/modification in the portal (regression introduced with N°7545)
|
2024-06-21 12:36:52 +02:00 |
|
Molkobain
|
4f36369ea1
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
|
2024-06-21 11:32:21 +02:00 |
|
Molkobain
|
33a906f11a
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
|
2024-06-21 11:29:18 +02:00 |
|
Molkobain
|
82d11eeb47
|
N°7127 - Upgrade handlebars.js to v4.7.8
|
2024-06-21 11:19:39 +02:00 |
|
Eric Espie
|
b8bf66031b
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
|
2024-06-20 11:07:57 +02:00 |
|
Eric Espie
|
2596a150bf
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
|
2024-06-20 11:07:36 +02:00 |
|
Eric Espie
|
142d6c8993
|
N°7533 - Detect and warns on Galera clusters
|
2024-06-20 11:06:57 +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 |
|
Eric Espie
|
f96d28a0a8
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
|
2024-06-12 16:48:39 +02:00 |
|
Eric Espie
|
d3b9965283
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts:
# core/cmdbsource.class.inc.php
|
2024-06-12 16:48:06 +02:00 |
|
Eric Espie
|
f03d731b1d
|
N°7533 - Prevent installation of iTop on Galera clusters
|
2024-06-12 16:14:23 +02:00 |
|
Eric Espie
|
3e3ac0d83f
|
N°7542 - code hardening
|
2024-05-30 12:04:36 +02:00 |
|
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 |
|