Pierre Goiffon
4e13cce770
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-10-17 11:27:09 +02:00
Stephen Abello
aa618468d1
Merge branch 'support/3.0' into support/3.1
2023-10-17 09:23:06 +02:00
Stephen Abello
fadfd94bac
Merge branch 'support/2.7' into support/3.0
2023-10-17 09:19:16 +02:00
Stephen Abello
9469681a0c
N°6777 - Security hardening
2023-10-17 09:12:40 +02:00
Pierre Goiffon
800d1b03c1
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-10-13 17:37:29 +02:00
Pierre Goiffon
d4ab55dd9a
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# pages/ajax.render.php
2023-10-13 17:33:26 +02:00
Pierre Goiffon
da27ddba82
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# application/utils.inc.php
# pages/ajax.render.php
2023-10-13 17:27:03 +02:00
Pierre Goiffon
c72cb7e70e
N°6606 security hardening
2023-10-13 17:15:37 +02:00
Pierre Goiffon
9df92665e0
N°6606 Backport of utils::ENUM_SANITIZATION_FILTER_* constants
...
Were introduced in 3.0.0, but not added to the support/2.7 branch
2023-10-13 17:10:35 +02:00
Molkobain
7d0feab078
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-09-26 22:23:18 +02:00
Molkobain
a472d83e3d
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# application/wizardhelper.class.inc.php
# pages/ajax.render.php
2023-09-26 22:21:48 +02:00
Molkobain
6dc6392fab
Merge remote-tracking branch 'origin/support/3.0.3' into support/3.0
2023-09-26 22:20:02 +02:00
Anne-Catherine
e793b02f8b
N°6766 - Fix dependent fields not updated due to WizardHelper.UpdateFields() being triggered too early ( #548 )
...
* N°6766 - Javascript : function WizardHelper.UpdateFields triggered to early does not update fields
* N°6766 - Code review
---------
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2023-09-26 12:25:56 +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
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
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
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
odain
7cfe1389aa
Merge branch 'support/3.0' into support/3.1
2023-09-13 10:20:38 +02:00
Anne-Catherine
d797436786
N°6555 - Add class description in tooltip of Dashlet badge ( #504 )
...
cheery pick from branch develop due to target branch error
2023-08-31 14:55:06 +02:00
Anne-Catherine
73a2c935a7
N°6555 - Add class description in tooltip of Dashlet badge ( #504 )
2023-08-31 14:37:37 +02:00
Anne-Catherine
b508c0d983
N°6152 - Search: Criteria & object list loaded twice ( #495 )
2023-08-31 12:03:31 +02:00
vdumas
59e4bb028f
N°6682 - Pbs with Audit classes and AccessRight
2023-08-29 16:41:27 +02:00
vdumas
42acbe66c3
N°6682 - Pbs with Audit classes and AccessRight
2023-08-29 16:27:28 +02:00
Molkobain
b9acd0a9a6
N°6670 - Fix unescaped quote from c761364b
2023-08-22 16:19:59 +02:00
Molkobain
c761364bed
N°6670 - Fix EVENT_DOWNLOAD_DOCUMENT event XML declaration missing elements
2023-08-22 16:11:59 +02:00
Molkobain
e5716e66bb
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-08-11 11:06:21 +02:00
Molkobain
f238593966
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# tests/php-unit-tests/src/BaseTestCase/ItopDataTestCase.php
# tests/php-unit-tests/src/BaseTestCase/ItopTestCase.php
2023-08-11 09:19:49 +02:00
Molkobain
ccceb870e3
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# tests/php-unit-tests/src/BaseTestCase/ItopDataTestCase.php
# tests/php-unit-tests/src/BaseTestCase/ItopTestCase.php
2023-08-10 15:53:05 +02:00
Molkobain
851ab9c356
N°6097 - Add \utils::GetDataPath() method to avoid duplicating manual path build
2023-08-10 15:45:39 +02:00
Eric Espie
eb1eb15791
N°6061 - Allow services to implement interfaces
...
N°6061 - allow local path from an arbitrary path
(cherry picked from commit 19e7fc9cb9fb23bddeb2750ecd4804
2023-07-28 10:46:06 +02:00
Eric Espie
750ecd4804
N°6061 - allow local path from an arbitrary path
2023-07-28 10:01:43 +02:00
Eric Espie
fb23bddeb2
N°6061 - allow local path from an arbitrary path
2023-07-27 12:06:14 +02:00
Eric Espie
19e7fc9cb9
N°6061 - Allow services to implement interfaces
2023-07-27 10:23:05 +02:00
Eric Espie
3c9c13a371
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-07-25 17:56:45 +02:00
Eric Espie
86a7cefa68
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2023-07-25 17:56:12 +02:00
Eric Espie
829b648dd2
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2023-07-25 17:55:45 +02:00
Eric Espie
5475b9fbbe
N°3454 - MoveToProd in 2 steps - fix utils::GetCurrentModuleName()
2023-07-25 17:44:43 +02:00
Eric Espie
6f8e7c7002
N°3454 - MoveToProd in 2 steps - fix utils::GetCurrentModuleUrl()
2023-07-25 17:20:37 +02:00
Pierre Goiffon
629a8412dc
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-07-24 15:39:25 +02:00
Pierre Goiffon
f89953f39e
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2023-07-24 15:39:09 +02:00
Pierre Goiffon
772368ef8a
💡 PHPDoc for object list panels
2023-07-24 15:38:57 +02:00
Eric Espie
b3121d46c4
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-07-19 11:01:13 +02:00
Eric Espie
0c7195f1a3
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# core/kpi.class.inc.php
2023-07-19 10:53:09 +02:00
Eric Espie
f60d03ddd3
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-07-19 09:28:23 +02:00
Eric Espie
9c37d5c23e
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# application/applicationextension.inc.php
# application/cmdbabstract.class.inc.php
# core/dbobject.class.php
# core/kpi.class.inc.php
# core/metamodel.class.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_static.php
# tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php
2023-07-19 09:26:46 +02:00
Stephen Abello
89145593ef
N°6552 - Security hardening
2023-07-19 09:25:48 +02:00
