Eric Espie
|
fb23bddeb2
|
N°6061 - allow local path from an arbitrary path
|
2023-07-27 12:06:14 +02:00 |
|
Pierre Goiffon
|
aa6fa4c674
|
Merge remote-tracking branch 'origin/support/3.1' into develop
|
2023-07-27 11:32:52 +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 |
|
Eric Espie
|
19e7fc9cb9
|
N°6061 - Allow services to implement interfaces
|
2023-07-27 10:23:05 +02:00 |
|
Pierre Goiffon
|
a0a66f3b54
|
Merge remote-tracking branch 'origin/support/3.1' into develop
|
2023-07-26 12:08: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
|
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()
2.7.9
|
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
|
96d04e35f9
|
Merge remote-tracking branch 'origin/support/3.1' into develop
|
2023-07-25 17:07:44 +02:00 |
|
Pierre Goiffon
|
67ca554261
|
📝 Version history : add 3.1.0-1
|
2023-07-25 17:07:30 +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 |
|
Pierre Goiffon
|
19a83bc944
|
Merge remote-tracking branch 'origin/support/3.1' into develop
|
2023-07-24 12:00:25 +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
|
a59dacf679
|
N°6436 - Performance Audit (KPI analysis)
|
2023-07-20 12:05:13 +02:00 |
|
Eric Espie
|
8b93a404ef
|
Merge remote-tracking branch 'origin/support/3.1' into develop
|
2023-07-19 15:42:02 +02:00 |
|
Molkobain
|
ded204344d
|
👥 Add @Stetinac to the contributors list 🙌
|
2023-07-19 15:24:52 +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
|
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
|
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
|
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 |
|
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
|
3d8345b92c
|
Merge remote-tracking branch 'origin/support/3.1' into develop
|
2023-07-18 14:17: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
|
9ab928e92e
|
Merge remote-tracking branch 'origin/support/3.1' into develop
|
2023-07-18 09:49:17 +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 |
|