Molkobain
|
f3d488de26
|
Update Jimmy avatar for the sample data
|
2023-09-25 15:52:10 +02:00 |
|
Stephen Abello
|
ebc15db75e
|
Merge branch 'support/3.1' into develop
|
2023-09-21 16:32:40 +02:00 |
|
Stephen Abello
|
61565b25a3
|
N°6767 - Error in ajax request when there's dict to load and no onready scripts
|
2023-09-21 10:40:22 +02:00 |
|
Pierre Goiffon
|
dd28aca260
|
Merge remote-tracking branch 'origin/support/3.1' into develop
|
2023-09-20 18:13:27 +02:00 |
|
Pierre Goiffon
|
7619d055dd
|
N°6695 Handle multiline dict entries in portal tooltips (#542)
Report Tippy fix from admin console (/css/backoffice/vendors/_tippy.scss) to user portal.
Thanks DaveHeart for the bug report !
|
2023-09-20 18:10:56 +02:00 |
|
Molkobain
|
2a6e5b21a9
|
Merge remote-tracking branch 'origin/support/3.1' into develop
|
2023-09-20 16:18:55 +02:00 |
|
Molkobain
|
f01997f2ad
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
|
2023-09-20 16:16:53 +02:00 |
|
Molkobain
|
fc6e98b534
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
|
2023-09-20 16:12:51 +02:00 |
|
Molkobain
|
8ecebee511
|
✅ PHP unit tests: Fix typo for "final private" methods as they can't be both
|
2023-09-20 16:11:39 +02:00 |
|
Eric Espie
|
b5e26061e1
|
Merge branch 'issue/6667_trigger_on_state_enter' into support/3.1
|
2023-09-20 10:11:58 +02:00 |
|
Pierre Goiffon
|
14f6ce3626
|
Merge remote-tracking branch 'origin/support/3.1' into develop
|
2023-09-19 12:30:33 +02:00 |
|
Pierre Goiffon
|
14fa20b428
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
# Conflicts:
# tests/ci_description.ini
|
2023-09-19 12:30:16 +02:00 |
|
Pierre Goiffon
|
2690fa3315
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
|
2023-09-19 12:27:19 +02:00 |
|
Pierre Goiffon
|
35cd965360
|
N°6629 Update ci_description php_version
|
2023-09-19 12:25:40 +02:00 |
|
Pierre Goiffon
|
34a2a6ce03
|
Merge remote-tracking branch 'origin/support/3.1' into develop
|
2023-09-19 09:59:06 +02:00 |
|
Pierre Goiffon
|
133fc29ad5
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
|
2023-09-19 09:58:53 +02:00 |
|
Pierre Goiffon
|
83a5b98f82
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
|
2023-09-19 09:58:40 +02:00 |
|
Pierre Goiffon
|
e5dd51f637
|
N°6600 Portal download attachment : don't display anymore SQL query on attachment not found error (#525)
|
2023-09-19 09:54:43 +02:00 |
|
Molkobain
|
db940e3bba
|
Merge remote-tracking branch 'origin/support/3.1' into develop
|
2023-09-19 08:52:06 +02:00 |
|
Molkobain
|
2f6bcc3534
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
|
2023-09-19 08:41:46 +02:00 |
|
Molkobain
|
4923418f58
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
|
2023-09-19 08:39:41 +02:00 |
|
Molkobain
|
0a6c82dfe1
|
N°6752 - PHP unit tests: Fix typo in postbuild_integration.xml.dist
|
2023-09-19 08:37:46 +02:00 |
|
Molkobain
|
9f3a6be255
|
Merge remote-tracking branch 'origin/support/3.1' into develop
|
2023-09-18 16:23:49 +02:00 |
|
Molkobain
|
f89d843ab3
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
|
2023-09-18 16:06:53 +02:00 |
|
Molkobain
|
2dd7f5cada
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
|
2023-09-18 15:37:32 +02:00 |
|
Molkobain
|
24c0f4950f
|
Add missing .htaccess / web.config files in .gitignore for /extensions folder
|
2023-09-18 15:26:06 +02:00 |
|
Molkobain
|
d4dbbc59d4
|
N°6754 - PHP unit tests: Add local PHPUnit XML files to .gitignore
|
2023-09-18 15:23:52 +02:00 |
|
Molkobain
|
dc0cd44c79
|
N°6752 - PHP unit tests: Migrate usages of unitestautoload.php to composer autoloader
|
2023-09-18 15:14:44 +02:00 |
|
Pierre Goiffon
|
b6ac92d192
|
Merge remote-tracking branch 'origin/support/3.1' into develop
# Conflicts:
# datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php
|
2023-09-18 15:10:58 +02:00 |
|
Pierre Goiffon
|
d7df249586
|
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
# Conflicts:
# application/ajaxwebpage.class.inc.php
# application/capturewebpage.class.inc.php
# application/clipage.class.inc.php
# application/csvpage.class.inc.php
# application/errorpage.class.inc.php
# application/itopwebpage.class.inc.php
# application/itopwizardwebpage.class.inc.php
# application/nicewebpage.class.inc.php
# application/pdfpage.class.inc.php
# application/webpage.class.inc.php
# application/xmlpage.class.inc.php
|
2023-09-18 15:10:19 +02:00 |
|
Pierre Goiffon
|
f3c4fcb0f5
|
💡 Pages files : add depreciation version
|
2023-09-18 15:07:32 +02:00 |
|
Pierre Goiffon
|
9a8e9a0b01
|
N°5491 Fix HU iTopUpdate:Error:MissingFile dict key
|
2023-09-18 08:45:45 +02:00 |
|
vdumas
|
f6a7e6b4e1
|
N°3506 - allow_target_creation based on UR_ACTION_MODIFY
|
2023-09-15 16:40:20 +02:00 |
|
Stephen Abello
|
ce1c517a9f
|
Merge branch 'support/3.1' into develop
|
2023-09-15 15:45:36 +02:00 |
|
Stephen Abello
|
2829fb291f
|
Update contribution stickers with 2023 design (better late than never 🙃)
|
2023-09-15 15:43:50 +02:00 |
|
odain
|
6110abfc7f
|
Merge branch 'support/3.0' into support/3.1
|
2023-09-15 10:08:37 +02:00 |
|
odain
|
6046f44f56
|
Merge branch 'support/2.7' into support/3.0
|
2023-09-15 10:08:08 +02:00 |
|
odain
|
6c6131ce03
|
N°5491 - test enhancement to reduce false positive
|
2023-09-15 10:07:42 +02:00 |
|
Stephen Abello
|
178c922407
|
Merge branch 'support/3.0' into support/3.1
|
2023-09-15 09:57:59 +02:00 |
|
Stephen Abello
|
343e87a8d4
|
N°6581 - Security hardening
|
2023-09-15 09:55:51 +02:00 |
|
Stephen Abello
|
d7e5d6fb7f
|
N°6734 - Fix not being able to add dashlets to a dashboard when iBackofficeDictEntriesExtension is used and its JS files are loaded through ajax calls
|
2023-09-14 17:25:00 +02:00 |
|
Pierre Goiffon
|
75b6a3ede8
|
Merge remote-tracking branch 'origin/support/3.1' into develop
# Conflicts:
# dictionaries/hu.dictionary.itop.ui.php
# dictionaries/ja.dictionary.itop.ui.php
# dictionaries/sk.dictionary.itop.ui.php
# dictionaries/ui/layouts/navigation-menu/pt_br.dictionary.itop.navigation-menu.php
|
2023-09-14 16:55:38 +02:00 |
|
Pierre Goiffon
|
993606f102
|
Merge branch 'support/3.1.0' into support/3.1
# Conflicts:
# setup/itopdesignformat.class.inc.php
|
2023-09-14 16:54:28 +02:00 |
|
Pierre Goiffon
|
bdf0b4daa9
|
N°6562 Fix DOMNode->textContent write
This attribute is read only
Causes layout issues on PHP 8.1.21 and 8.2.8
(cherry picked from commit 734a788340)
(cherry picked from commit 7aa478d6ff)
|
2023-09-14 15:31:02 +02:00 |
|
Eric Espie
|
44c189223e
|
Merge branch 'support/3.1.0' into support/3.1
# Conflicts:
# tests/php-unit-tests/unitary-tests/core/DBObjectTest.php
|
2023-09-14 14:31:29 +02:00 |
|
Eric Espie
|
7fdbb59c30
|
N°6716 - High memory Consomption and performance issue
3.1.0-3
|
2023-09-14 14:09:05 +02:00 |
|
Eric Espie
|
5acf38ac36
|
✅ Fix unit tests for MariaDB
(cherry picked from commit 61a9a4ac65)
|
2023-09-14 14:09:05 +02:00 |
|
odain-cbd
|
e76728b2bf
|
N°5491 - Inconsistent dictionnary entries regarding arguments to pass to Dict::Format-test first (#545)
|
2023-09-13 12:02:49 +02:00 |
|
odain
|
3e258f32cc
|
N°5491-fix redundant GetNonPublicStaticProperty
|
2023-09-13 10:30:56 +02:00 |
|
odain
|
3c51d6fb98
|
N°5491- fix dictionary test
|
2023-09-13 10:27:19 +02:00 |
|