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
Pierre Goiffon
a84077782d
N°4354 N°6587 ✅ Remove duplicated ItopDataTestCase::CreateContactlessUser method
...
Regression introduced by 26048150
2023-07-27 16:48:49 +02:00
Pierre Goiffon
26048150d3
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# tests/php-unit-tests/ItopDataTestCase.php
2023-07-27 16:44:02 +02:00
Pierre Goiffon
e5b6e2eb8c
N°4354 N°6587 ✅ Add test to cover $oUser->Get('profile_list') VS security.hide_administrators config param
2023-07-27 16:42:56 +02:00
Pierre Goiffon
87b6ea4def
📝 Version history : add missing 3.1.0-beta
2023-07-27 14:55:55 +02:00
purplegrape
72873a3343
🌐 Improve zh-cn dict
...
Manual merge for #516
Translation by @purplegrape, many thanks !
2023-07-27 11:17:09 +02:00
Pierre Goiffon
5ef25ccb77
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2023-07-26 12:07:50 +02:00
Pierre Goiffon
1682a85cc0
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2023-07-26 12:07:35 +02:00
Pierre Goiffon
cd9beec313
Merge remote-tracking branch 'origin/support/2.6' into support/2.7
2023-07-26 12:07:09 +02:00
Pierre Goiffon
8295eaed90
Merge remote-tracking branch 'origin/support/2.5' into support/2.6
2023-07-26 12:06:32 +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
67ca554261
📝 Version history : add 3.1.0-1
2023-07-25 17:07:30 +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
Pierre Goiffon
2e049aa244
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2023-07-24 11:59:57 +02:00
Pierre Goiffon
a57b6471c9
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2023-07-24 11:59:40 +02:00
Pierre Goiffon
bc7c1b4744
✅ N°6590 Fix DictionariesConsistencyTest for PL dict files
2023-07-24 11:14:37 +02:00
Eric Espie
12c78697f4
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2023-07-19 15:20:15 +02:00
Eric Espie
046e857768
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# core/config.class.inc.php
2023-07-19 15:19:06 +02:00
Eric Espie
4d8246c4d8
N°6436 - Integrate Performance Audit pre requisite in iTop Pro 2.7.9 (changed config variable name)
2023-07-19 15:13:43 +02:00
Eric Espie
5c61d725e1
N°6436 - Integrate Performance Audit pre requisite in iTop Pro 2.7.9 (changed config variable name)
2023-07-19 15:06:00 +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
00b070b3cf
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# core/kpi.class.inc.php
2023-07-19 10:44:22 +02:00
Eric Espie
2c4cad4dac
N°6436 - Integrate Performance Audit pre requisite in iTop Pro 2.7.9 (avoid unnecessary calls)
2023-07-19 10:37:41 +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
Eric Espie
b2e80d37dd
N°6436 - typo
2023-07-18 14:48:32 +02:00
Eric Espie
6432678de9
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# application/cmdbabstract.class.inc.php
# application/utils.inc.php
# bootstrap.inc.php
# composer.json
# core/MyHelpers.class.inc.php
# core/cmdbsource.class.inc.php
# core/config.class.inc.php
# core/dbobject.class.php
# core/kpi.class.inc.php
# core/metamodel.class.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_real.php
# lib/composer/autoload_static.php
2023-07-18 14:36:58 +02:00
Pierre Goiffon
952194b385
N°6570 Fix BulkChangeExtKeyTest errors
...
- transaction started but never stopped
- invalid value label typo
- urlencode on search url
2023-07-18 14:12:29 +02:00
Pierre Goiffon
bfb452dd69
N°6570 Rename BulkChangeExtKeyTest file so it is run in Jenkins
...
Was *Test.inc.php instead of default *Test.php
2023-07-18 14:12:29 +02:00
Pierre Goiffon
64baeba1c7
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2023-07-18 09:49:03 +02:00
Molkobain
71ed784c60
N°6532 - Fix missing "/" in path
...
(cherry picked from commit 32fd75bc4b
2023-07-18 09:40:34 +02:00
Eric Espie
da45651121
Merge branch 'feature/6548_Hide_DBHost_and_DBUser_in_log' into support/2.7
2023-07-18 09:34:48 +02:00
Eric Espie
d388ce9a06
Merge branch 'feature/6548_Hide_DBHost_and_DBUser_in_log' into support/2.7
2023-07-18 09:17:40 +02:00
Eric Espie
47e71d8838
Merge branch 'feature/6436-Integrate_Performance_Audit_extensibility' into support/2.7
2023-07-18 09:17:05 +02:00
Stephen Abello
2b5973ec67
N°6436 - Integrate Performance Audit pre requisite in iTop Pro 2.7.9
2023-07-18 09:15:37 +02:00
Benjamin Dalsass
e58918f53e
N°6546 - AttributeLinkedSetIndirect filter dosen't work
2023-07-18 08:53:26 +02:00
Molkobain
125715af3f
N°6562 - Temporarily disable XML conversion unit tests failing in PHP 8.2.8
2023-07-14 21:09:37 +02:00
Molkobain
ea8e7c5131
N°6562 - Temporarily disable XML conversion unit tests failing in PHP 8.1.21
2023-07-13 10:11:56 +02:00
Eric Espie
06e5e0b102
Merge branch 'support/3.1.0' into support/3.1
2023-07-12 13:31:34 +02:00
Eric Espie
df1cb0b6e3
N°6408 - CRUD : Fix log consuming too much memory
2023-07-12 11:21:32 +02:00
Pierre Goiffon
5247f5b3ea
🔖 Prepare version 3.1.1
2023-07-11 09:56:59 +02:00
Eric Espie
78396d8e4a
6548 - [ER] Hide DBHost and DBUser in log
2023-07-10 17:37:27 +02:00
Pierre Goiffon
f1ee22cbed
Merge branch 'release/3.1.0' into develop
2023-07-10 16:57:23 +02:00
Molkobain
9b409b117f
N°6043 - Booking: Move \TemporaryObjectDescriptor to /core to keep compatibility with legacy/custom packages
...
Cherry picked from 39305468
2023-07-10 13:16:53 +02:00
Molkobain
39305468f8
N°6043 - Booking: Move \TemporaryObjectDescriptor to /core to keep compatibility with legacy/custom packages
2023-07-10 12:25:32 +02:00
Molkobain
32fd75bc4b
N°6532 - Fix missing "/" in path
2023-07-10 09:43:28 +02:00
