Pierre Goiffon
391c78ae42
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# datamodels/2.x/combodo-db-tools/dictionaries/zh_cn.dict.combodo-db-tools.php
# datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php
# datamodels/2.x/itop-backup/dictionaries/da.dict.itop-backup.php
# datamodels/2.x/itop-backup/dictionaries/it.dict.itop-backup.php
# datamodels/2.x/itop-backup/dictionaries/ja.dict.itop-backup.php
# datamodels/2.x/itop-backup/dictionaries/sk.dict.itop-backup.php
# datamodels/2.x/itop-backup/dictionaries/tr.dict.itop-backup.php
# datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config/dictionaries/da.dict.itop-config.php
# datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php
# datamodels/2.x/itop-config/dictionaries/ja.dict.itop-config.php
# datamodels/2.x/itop-config/dictionaries/sk.dict.itop-config.php
# datamodels/2.x/itop-config/dictionaries/tr.dict.itop-config.php
# datamodels/2.x/itop-core-update/dictionaries/cs.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/da.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/it.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/ja.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/sk.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/tr.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php
# datamodels/2.x/itop-faq-light/dictionaries/zh_cn.dict.itop-faq-light.php
# datamodels/2.x/itop-files-information/dictionaries/de.dict.itop-files-information.php
# datamodels/2.x/itop-files-information/dictionaries/pl.dict.itop-files-information.php
# datamodels/2.x/itop-files-information/dictionaries/zh_cn.dict.itop-files-information.php
# datamodels/2.x/itop-hub-connector/dictionaries/pt_br.dict.itop-hub-connector.php
# datamodels/2.x/itop-oauth-client/dictionaries/cs.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/da.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/es_cr.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/it.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/ja.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/nl.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/pt_br.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/ru.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/sk.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/tr.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/zh_cn.dict.itop-oauth-client.php
# datamodels/2.x/itop-service-mgmt-provider/dictionaries/de.dict.itop-service-mgmt-provider.php
# datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php
# datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php
# datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php
# datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php
# dictionaries/cs.dictionary.itop.ui.php
# dictionaries/da.dictionary.itop.core.php
# dictionaries/da.dictionary.itop.ui.php
# dictionaries/de.dictionary.itop.ui.php
# dictionaries/en.dictionary.itop.ui.php
# dictionaries/es_cr.dictionary.itop.ui.php
# dictionaries/fr.dictionary.itop.ui.php
# dictionaries/hu.dictionary.itop.ui.php
# dictionaries/it.dictionary.itop.core.php
# dictionaries/it.dictionary.itop.ui.php
# dictionaries/ja.dictionary.itop.core.php
# dictionaries/ja.dictionary.itop.ui.php
# dictionaries/nl.dictionary.itop.ui.php
# dictionaries/pl.dictionary.itop.core.php
# dictionaries/pl.dictionary.itop.ui.php
# dictionaries/pt_br.dictionary.itop.core.php
# dictionaries/pt_br.dictionary.itop.ui.php
# dictionaries/ru.dictionary.itop.core.php
# dictionaries/ru.dictionary.itop.ui.php
# dictionaries/sk.dictionary.itop.core.php
# dictionaries/sk.dictionary.itop.ui.php
# dictionaries/tr.dictionary.itop.core.php
# dictionaries/tr.dictionary.itop.ui.php
# dictionaries/zh_cn.dictionary.itop.core.php
# dictionaries/zh_cn.dictionary.itop.ui.php
# tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php
2024-02-14 14:21:22 +01:00
Pierre Goiffon
aa53de467d
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2024-02-14 11:39:42 +01:00
Pierre Goiffon
bc6efc99ed
N°7246 Fix dict files : remove keys defined multiple times in the same file
2024-02-14 11:20:02 +01:00
Pierre Goiffon
bb3ab76205
N°7246 Fix dict files : missing constants in dict labels
2024-02-14 11:20:02 +01:00
Pierre Goiffon
0b1bdfff55
N°7246 Fix dict files : translated keys with tildes
...
Note that there were some keys in EN files with tildes at the end
2024-02-14 11:20:02 +01:00
Pierre Goiffon
77c0cdf5aa
N°7246 📝 test README : add markTestAsSkipped restrictions
2024-02-14 11:20:02 +01:00
Pierre Goiffon
af9fb74c54
N°7246 Add new tests methods in DictionariesConsistencyTest ( #610 )
...
Adding following checks:
* no duplicate key in the same file
* for each value different than its EN counterpart, no tildes at the end
* good use of iTop name constants (ITOP_APPLICATION_SHORT, ITOP_APPLICATION, ITOP_VERSION_NAME), eg `'my value ITOP_APPLICATION'` instead of `'my value '.ITOP_APPLICATION`
2024-02-14 11:20:02 +01:00
Pierre Goiffon
5d6c4939f6
N°7245 Bettor logs on RunTimeEnvironment::CallInstallerHandlers exceptions ( #606 )
2024-02-14 11:01:12 +01:00
Pierre Goiffon
5663c61e51
N°7179 Remove unused var in ActionEmail::PrepareMessageContent ( #605 )
...
Introduced in fed149d
2024-02-14 10:32:23 +01:00
Pierre Goiffon
51d0d16a11
N°7052 synchro_import.php: fix undefined offset notices ( #583 )
...
Regression brought by #269
2024-02-14 09:53:31 +01:00
Pierre Goiffon
848528567e
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# dictionaries/en.dictionary.itop.ui.php
2024-02-09 13:41:23 +01:00
Pierre Goiffon
b0634c9fbc
N°7232 Fix regression on UI:RunQuery:Error
...
In the UI:RunQuery:Error key, the placeholder was removed when we migrated run_query.php to using UiBlock and Panel.
But it was restored by mistake in f65c6904
2024-02-09 13:30:47 +01:00
Pierre Goiffon
fabeea8dba
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-02-09 12:05:00 +01:00
Pierre Goiffon
c951a33646
📝 Update js/README.md file locations
2024-02-09 12:04:21 +01:00
Pierre Goiffon
8f250e82f4
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-02-08 11:34:32 +01:00
Pierre Goiffon
ed694b09b0
💡 Update test PHPDoc
2024-02-08 11:34:13 +01:00
Timmy38
18deb79068
N°7172 HTML markup for n:n set properties ( #604 )
...
* N°7172 HTML markup for n:n set properties
2024-01-29 15:35:17 +01:00
Molkobain
4d4cdf9e60
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-01-24 15:18:37 +01:00
Molkobain
3868d57d28
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2024-01-24 15:11:29 +01:00
Molkobain
1b3a2c8470
N°5775 - Show error message to user in case of issue during token generation
2024-01-24 14:49:51 +01:00
Dennis Lassiter
618d8e6468
N°5775 - Allow configuration of OAuth client on MS Azure with single tenant ( #553 )
...
* Add Tenant-Support for Azure OAuthClient
* Improvement: Make tenant required
* Improvment: Removed check for null-value
Since last commit, the "tenant"-field either set to a custom value or "common" by default. It is not allowed to be null
* Add field description
---------
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2024-01-24 14:38:54 +01:00
odain
53a2a7a8e2
N°7147 - cleanup
2024-01-23 20:45:35 +01:00
odain
9a26c37ffd
N°7147 - Error HTTP 500 due to access_token not URL decoded
2024-01-23 16:50:21 +01:00
Eric Espie
cc5e105d7f
N°7070 - remove _delta attribute from datamodel and avoid _delta attributes under a node having _delta in [define, define_if_not_exist, redefine, force] in deltas
2024-01-17 15:12:08 +01:00
jf-cbd
7f62bd61e3
N°7134 - Can't retrieve the list of changes when editing URP_UserProfile
2024-01-17 15:05:30 +01:00
Molkobain
72bbc31cd9
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-01-16 19:48:33 +01:00
Molkobain
f54d1273c9
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2024-01-16 19:46:55 +01:00
Molkobain
01a955a16f
📝 Add PR template
2024-01-16 19:42:39 +01:00
Pierre Goiffon
669e6f93fa
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-01-16 11:00:52 +01:00
Pierre Goiffon
a5aac0caad
N°7143 Woops removed forgotten echo
2024-01-16 10:25:28 +01:00
Pierre Goiffon
31e29506fa
N°7143 DictionariesConsistencyTest::testNoDictFileInDatamodelsModuleRootDirectory Add exclusion list to remove modules that must be compatible with iTop 2.7
2024-01-16 10:18:50 +01:00
Anne-Cath
3005bc1234
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-01-15 16:34:01 +01:00
Anne-Cath
3f3b0cbe55
Fix merge support/2.7 to support/3.0
2024-01-15 16:25:10 +01:00
Anne-Catherine
cff50f8732
N°3448 - Framework field size check not correctly implemented for multibytes languages/strings ( #528 )
2024-01-15 16:10:23 +01:00
Anne-Cath
a8cd9566ac
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-01-15 16:01:48 +01:00
Anne-Cath
dab03e5b5d
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# application/cmdbabstract.class.inc.php
2024-01-15 15:56:24 +01:00
Anne-Catherine
87582a021b
N°6993 - Error message on bulk transition on object containing a null blob ( #596 )
2024-01-15 15:49:19 +01:00
Pierre Goiffon
200cdefa1a
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# datamodels/2.x/itop-core-update/dictionaries/pt_br.dict.itop-core-update.php
# datamodels/2.x/itop-hub-connector/dictionaries/pl.dict.itop-hub-connector.php
# datamodels/2.x/itop-hub-connector/dictionaries/pt_br.dict.itop-hub-connector.php
# datamodels/2.x/itop-hub-connector/dictionaries/zh_cn.dict.itop-hub-connector.php
# datamodels/2.x/itop-welcome-itil/dictionaries/tr.dict.itop-welcome-itil.php
2024-01-15 15:44:48 +01:00
Pierre Goiffon
8ef04bedf2
N°7143 Move datamodels/2.x dict files to dictionaries subdir
...
New phpunit method to ensure it won't happen again
2024-01-15 15:35:15 +01:00
Pierre Goiffon
9eeb4b8751
N°7143 itop-hub-connector dic files: fix buggy br tags
2024-01-15 15:35:15 +01:00
Pierre Goiffon
ae3d0f9444
N°7143 Fix bytes unit in attachments EN dict
2024-01-15 15:35:15 +01:00
Molkobain
1fa4fe6d35
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-01-12 12:05:24 +01:00
Molkobain
2ed0666c3b
N°7085 - Remove comment about annotation as on support/3.0 branch not using runTestsInSeparateProcesses is the standard
2024-01-12 10:53:24 +01:00
odain
9b5988133b
Merge branch 'support/3.0' into support/3.1
2024-01-12 08:57:51 +01:00
odain
a61b117f71
Merge branch 'support/2.7' into support/3.0
2024-01-12 08:56:25 +01:00
odain
9830178a47
N°7085 - ci restore runTestsInSeparateProcesses
2024-01-12 08:36:15 +01:00
odain
83ac219ec9
Merge branch 'support/2.7' into support/3.0
2024-01-12 08:19:05 +01:00
odain-cbd
c140ebcb6b
N°7085 - Fix infinite loop in login page until fatal error occurs ( #592 )
...
* N°7085 - login page infinite loop until fatal error- add Config->AddAllowedLoginTypes
* N°7085 - reproduce issue via a test
* N°7085-fix infinite loop
* N°7085 - ci: fix config file rights in tearDown
* N°7085 - ci: fix config file rights in tearDown (again)
* N°7085 - ci: fix config file content
* N°7085 - ci : add runTestsInSeparateProcesses
* Update core/config.class.inc.php
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
* N°7085 - exit -1 + enhance log message
* PR feedbacks from Romain regarding LoginTest annotations
---------
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2024-01-12 08:13:40 +01:00
Molkobain
fddf9e36c7
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2024-01-11 22:16:10 +01:00
Molkobain
b181914d25
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2024-01-11 22:04:48 +01:00
