Pierre Goiffon
ba0020fa63
N°7246 Fix dict files : translated keys with tildes in /dictionaries/**
2024-02-15 10:59:10 +01:00
Pierre Goiffon
1e83f2eb60
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# dictionaries/ui/layouts/navigation-menu/pt_br.dictionary.itop.navigation-menu.php
# dictionaries/ui/layouts/navigation-menu/zh_cn.dictionary.itop.navigation-menu.php
2024-02-15 10:55:54 +01:00
Pierre Goiffon
dd27a3ebb4
N°7246 Fix dict files : translated keys with tildes in /dictionaries/**
2024-02-15 10:50:08 +01:00
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
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
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
379062f1f7
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
Most of the conflicts are caused by HU translations (N°7077 / #584 )
# Conflicts:
# css/setup.css
# datamodels/2.x/authent-cas/dictionaries/hu.dict.authent-cas.php
# datamodels/2.x/authent-ldap/dictionaries/hu.dict.authent-ldap.php
# datamodels/2.x/authent-local/dictionaries/hu.dict.authent-local.php
# datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/hu.dict.combodo-backoffice-darkmoon-theme.php
# datamodels/2.x/combodo-db-tools/dictionaries/hu.dict.combodo-db-tools.php
# datamodels/2.x/itop-attachments/dictionaries/hu.dict.itop-attachments.php
# datamodels/2.x/itop-backup/dictionaries/hu.dict.itop-backup.php
# datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/hu.dict.itop-bridge-cmdb-ticket.php
# datamodels/2.x/itop-change-mgmt-itil/dictionaries/hu.dict.itop-change-mgmt-itil.php
# datamodels/2.x/itop-change-mgmt/dictionaries/hu.dict.itop-change-mgmt.php
# datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config/dictionaries/hu.dict.itop-config.php
# datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php
# datamodels/2.x/itop-faq-light/dictionaries/hu.dict.itop-faq-light.php
# datamodels/2.x/itop-hub-connector/dictionaries/hu.dict.itop-hub-connector.php
# datamodels/2.x/itop-incident-mgmt-itil/dictionaries/hu.dict.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-knownerror-mgmt/dictionaries/hu.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-oauth-client/hu.dict.itop-oauth-client.php
# datamodels/2.x/itop-portal-base/dictionaries/hu.dict.itop-portal-base.php
# datamodels/2.x/itop-portal/dictionaries/hu.dict.itop-portal.php
# datamodels/2.x/itop-problem-mgmt/dictionaries/hu.dict.itop-problem-mgmt.php
# datamodels/2.x/itop-request-mgmt-itil/dictionaries/hu.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt/dictionaries/hu.dict.itop-request-mgmt.php
# datamodels/2.x/itop-service-mgmt-provider/dictionaries/hu.dict.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php
# datamodels/2.x/itop-structure/dictionaries/hu.dict.itop-structure.php
# datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php
# dictionaries/hu.dictionary.itop.core.php
# dictionaries/hu.dictionary.itop.ui.php
# dictionaries/ui/components/breadcrumbs/hu.dictionary.itop.breadcrumbs.php
# dictionaries/ui/components/datatable/hu.dictionary.itop.datatable.php
# dictionaries/ui/components/field/hu.dictionary.itop.field.php
# dictionaries/ui/components/global-search/hu.dictionary.itop.global-search.php
# dictionaries/ui/components/input/hu.dictionary.itop.input.php
# dictionaries/ui/components/quick-create/hu.dictionary.itop.quick-create.php
# dictionaries/ui/layouts/activity-panel/hu.dictionary.itop.activity-panel.php
# dictionaries/ui/layouts/navigation-menu/hu.dictionary.itop.navigation-menu.php
# dictionaries/ui/layouts/object-details/hu.dictionary.itop.object-details.php
# dictionaries/ui/layouts/page-content/hu.dictionary.itop.page-content.php
# dictionaries/ui/layouts/tab-container/hu.dictionary.itop.tab-container.php
# dictionaries/ui/pages/errorpage/hu.dictionary.itop.errorpage.php
# dictionaries/ui/pages/preferences/hu.dictionary.itop.preferences.php
# tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php
2024-01-03 17:30:57 +01:00
Pierre Goiffon
f84e2060be
N°7077 Hungarian translations based on iTop 3.0.2-1 ( #584 )
...
Many thanks to Csaba TARJÁNYI (@tacsaby) !
2023-12-20 15:52:41 +01:00
Pierre Goiffon
ea845dc6eb
N°6228 - CheckToWrite() propagation to target objects based on with_php_constraint property
2023-11-23 11:14:37 +01:00
Stephen Abello
47e7c35c2b
Merge branch 'support/3.0' into support/3.1
...
# Conflicts:
# dictionaries/cs.dictionary.itop.core.php
# dictionaries/da.dictionary.itop.core.php
# dictionaries/de.dictionary.itop.core.php
# dictionaries/es_cr.dictionary.itop.core.php
# dictionaries/hu.dictionary.itop.core.php
# dictionaries/it.dictionary.itop.core.php
# dictionaries/ja.dictionary.itop.core.php
# dictionaries/nl.dictionary.itop.core.php
# dictionaries/pl.dictionary.itop.core.php
# dictionaries/pt_br.dictionary.itop.core.php
# dictionaries/ru.dictionary.itop.core.php
# dictionaries/sk.dictionary.itop.core.php
# dictionaries/tr.dictionary.itop.core.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_static.php
# sources/Application/Helper/ExportHelper.php
2023-11-21 10:24:29 +01:00
Stephen Abello
083a0b79bf
N°6951 - Security hardening
2023-11-21 10:08:46 +01:00
Stephen Abello
e22220b4fe
Merge branch 'support/2.7' into support/3.0
...
# Conflicts:
# core/csvbulkexport.class.inc.php
# core/excelbulkexport.class.inc.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_files.php
# lib/composer/autoload_real.php
# lib/composer/autoload_static.php
2023-11-21 09:47:14 +01:00
Stephen Abello
b10bcb976d
N°6951 - Security hardening
2023-11-21 09:42:11 +01:00
vdumas
85a6bd0a05
Typo in EN Dictionary - Allowed orgs class name
2023-11-02 17:43:48 +01:00
Stephen Abello
92cd1e3f19
N°6861 - Display warning message when creating/editing a mandatory blob in modal depending on edition mode and blob value
2023-11-02 14:58:46 +01:00
odain-cbd
eaa80c5396
N°6824 - Notification with current_contact placeholder trigger hundred of email sent ( #562 )
...
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@super-visions.com >
Co-authored-by: Romain Quetiez <romain.quetiez@combodo.com >
2023-10-31 16:17:57 +01:00
Stephen Abello
4f336abeb8
N°6861 - Display warning message when creating/editing a mandatory blob in modal
2023-10-23 15:51:38 +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
3c51d6fb98
N°5491- fix dictionary test
2023-09-13 10:27:19 +02:00
odain
7cfe1389aa
Merge branch 'support/3.0' into support/3.1
2023-09-13 10:20:38 +02:00
odain
f65c690462
N°5491-fix test
2023-09-13 10:03:05 +02:00
odain
ecf8bc42fa
Merge branch 'support/2.7' into support/3.0
2023-09-13 10:01:15 +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
Lars Kaltefleiter
0d9f33ec4c
🌐 Updated german translations for 3.1 ( #511 )
2023-06-29 09:05:27 +02:00
Stephen Abello
ccf1d7ecfb
N°6446 Fix OAuth landing page missing jQuery library needed in ajax calls
2023-06-27 11:24:06 +02:00
Purple Grape
47400d94ba
N°6468 update zh-cn dict ( #512 )
2023-06-23 09:03:49 +02:00
Benjamin Dalsass
85a879b587
N°5305 - CSV import ergonomy for SaaS
...
- Change checkbox error ugly font
- Improve errors messages (ambiguous, mismatch)
2023-06-20 17:21:39 +02:00
vdumas
7b5ef52865
N°6422 - Improve french dictionary
2023-06-20 08:37:17 +02:00
Timothee
f548dc2898
Dictionaries update for 3.1 beta
2023-06-15 09:47:51 +02:00
Tarjányi Csaba
a1daef70e2
N°6419 - Update hungarian translations thanks to @tacsaby ( #472 )
...
* Update hu.dictionary.itop.ui.php
Some corrections
* Revert formatting changes
---------
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2023-06-13 18:00:21 +02:00
Purple Grape
68e1f359d3
N°6417 - Update chinese translations thanks to @purplegrape ( #500 )
2023-06-13 17:36:27 +02:00
Denis
9a5ad6681d
Typo in en.dictionary.itop.core.php
2023-06-13 13:44:20 +02:00
Denis
fed149dc66
N°918 - Translate placeholders in notifications ( #506 )
...
- Localization of date & time formats
- Use of DataLocalizer (if present)
- All placeholders can be used in the uploaded HTML template as well as in the notification "message"
2023-06-13 09:51:32 +02:00
vdumas
01fb3466c8
N°1350 - Audit: propose domains selection as default
2023-06-12 09:22:34 +02:00
vdumas
b5a637fa11
N°1350 - Audit: Title, breadcrumb, back button and link to configure
2023-06-09 20:13:44 +02:00
vdumas
68a1c0f0cb
N°1350 - Audit result and audit configuration: add navigation from one to the other
2023-06-07 20:17:39 +02:00
Denis
120b8b55ed
Typo
2023-06-07 15:53:52 +02:00
vdumas
d778203f99
N°6370 - Replace Audit Category menu by a dashboard
2023-06-05 18:32:57 +02:00
vdumas
652a9f6e40
N°6370 - Replace Audit Category menu by a dashboard
2023-06-05 17:58:14 +02:00
Benjamin Dalsass
8eb1053daa
N°803 - Allow display & edition of attributes on n:n relations on Portal
2023-06-05 16:19:06 +02:00
Eric Espie
b99ff5e84a
✏️ typo
2023-06-05 08:22:29 +02:00
vdumas
c2fb0150b0
N°6347 - 1:n Add nice french dico entry on standard 1:n relationship
2023-06-01 11:56:34 +02:00
Eric Espie
3e7c48d5c6
N°6357 - Prevent entering same password on change user password
2023-05-31 17:12:26 +02:00
vdumas
0af8f65a11
N°6339 - n:n Add nice french dico entry
2023-05-31 16:33:48 +02:00
vdumas
4d9b054430
N°2639 - Add Tooltips EN/FR dico entries for Data Synchro
2023-05-30 15:42:42 +02:00
vdumas
52fd333922
N°6339 - n:n Add nice french dico entry on standard lnk
2023-05-24 18:17:58 +02:00
Stephen Abello
2f20cf52f3
N°6219 Fix issues in dictionary entries
2023-05-10 10:08:18 +02:00
