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 |
|
Benjamin Dalsass
|
0819b9baba
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts:
# composer.json
# composer.lock
# core/config.class.inc.php
# core/dbobject.class.php
# core/email.class.inc.php
# datamodels/2.x/itop-core-update/dictionaries/hu.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/nl.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/ru.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-core-update/pt_br.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig
# datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
# datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
# datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml
# dictionaries/cs.dictionary.itop.core.php
# dictionaries/cs.dictionary.itop.ui.php
# dictionaries/da.dictionary.itop.core.php
# dictionaries/da.dictionary.itop.ui.php
# dictionaries/de.dictionary.itop.core.php
# dictionaries/de.dictionary.itop.ui.php
# dictionaries/en.dictionary.itop.ui.php
# dictionaries/es_cr.dictionary.itop.core.php
# dictionaries/es_cr.dictionary.itop.ui.php
# dictionaries/fr.dictionary.itop.core.php
# dictionaries/fr.dictionary.itop.ui.php
# dictionaries/hu.dictionary.itop.core.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.core.php
# dictionaries/nl.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
# lib/composer/autoload_classmap.php
# lib/composer/autoload_real.php
# lib/composer/autoload_static.php
# lib/composer/installed.json
# lib/composer/installed.php
# sources/application/TwigBase/Controller/Controller.php
# sources/application/TwigBase/Twig/TwigHelper.php
|
2022-06-02 16:30:48 +02:00 |
|
Eric Espie
|
0abec767e3
|
Dictionaries
|
2022-06-01 10:45:53 +02:00 |
|
Molkobain
|
102528195b
|
Fix typo, thanks to @jbostoen
|
2022-01-23 16:10:42 +01:00 |
|
Purple Grape
|
a00f4156ea
|
improved translation for ZH_CN
|
2021-12-13 15:36:15 +01:00 |
|
acognet
|
de004af288
|
update dictionnaries for 3.0
|
2021-12-09 11:57:22 +01:00 |
|
Molkobain
|
a5bf059e23
|
N°3508 - Add warning message on save if action has no trigger attached
|
2021-12-04 19:43:51 +01:00 |
|
Molkobain
|
4bde828dbb
|
🌐 N°2875 - Fix missing word in TriggerOnObjectMention:mentioned_filter(+) thanks to @jbostoen
|
2021-10-19 21:36:23 +02:00 |
|
Molkobain
|
0b0c99c935
|
🌐 N°2875 - Add TriggerOnObjectMention:mentioned_filter(+) translations
|
2021-10-19 15:16:42 +02:00 |
|
Molkobain
|
b9a68f4aeb
|
🌐 N°2875 - Add TriggerOnObject:filter description
Note: The new translations are based on the russian one as it seemed pretty good, hence the russian translation is not "reset".
|
2021-10-19 15:16:41 +02:00 |
|
Molkobain
|
58e35ea33b
|
N°1047 - Replace hard coded 'iTop' occurrences with ITOP_APPLICATION_SHORT
|
2021-08-14 22:43:29 +02:00 |
|
Molkobain
|
39bcd3e4cd
|
🌐 N°3712 - Add dict. entries for CMDBChange->origin values
|
2021-08-02 19:42:32 +02:00 |
|
Pierre Goiffon
|
d8e2a1cc7c
|
Merge branch 'support/2.7' into develop
# Conflicts:
# README.md
# composer.json
# composer.lock
# core/cmdbsource.class.inc.php
# core/dbobject.class.php
# datamodels/2.x/combodo-db-tools/db_analyzer.class.inc.php
# datamodels/2.x/combodo-db-tools/dbtools.php
# 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-core-update/dictionaries/zh_cn.dict.itop-core-update.php
# dictionaries/zh_cn.dictionary.itop.core.php
# dictionaries/zh_cn.dictionary.itop.ui.php
# lib/composer/InstalledVersions.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_static.php
# lib/composer/installed.php
# lib/composer/platform_check.php
# pages/ajax.render.php
# pages/csvimport.php
# setup/ajax.dataloader.php
# setup/index.php
# setup/setuputils.class.inc.php
# test/application/UtilsTest.php
|
2021-06-14 16:19:56 +02:00 |
|
Purple Grape
|
7168860a0b
|
🌐 Improved chinese for 2.7 (#218)
|
2021-06-02 08:06:16 +02:00 |
|
Purple Grape
|
6b899d3f77
|
🌐 improved chinese for 3.0 (#207)
|
2021-04-16 11:00:16 +02:00 |
|
Pierre Goiffon
|
0fd3cb01cf
|
🌐 Prepare 3.0.0-beta : align all dictionnaries with keys in EN dict
|
2021-03-23 18:16:27 +01:00 |
|
Molkobain
|
8dd96ea636
|
Copyright year bump
|
2021-03-15 09:29:45 +01:00 |
|
Lars Kaltefleiter
|
43cadb0ede
|
N°3287 - Set from display name / label in action email
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@me.com>
|
2020-09-11 09:50:14 +02:00 |
|
Eric
|
e564f71c14
|
N°2986 - Reintegrate application menus from "welcome itil" into application
|
2020-07-08 11:49:52 +02:00 |
|
Pierre Goiffon
|
5b496f4d15
|
N°2866 Change "cron" case in labels as it is not an acronym
Thanks @Hipska for the feedback done in Combodo/iTop#124 !
|
2020-03-26 11:15:47 +01:00 |
|
Pierre Goiffon
|
f8df84aa7b
|
Update dict for 2.7.0-RC
|
2020-03-17 10:55:53 +01:00 |
|
Eric
|
08eb9ee630
|
🌐 update dictionaries for 2.7.0-beta2
|
2020-01-28 15:29:12 +01:00 |
|
Purple Grape
|
97ebffd5fb
|
improved chinese translations
1 improved chinese translations
2 fix some missing enries
3 correct line number against english language
|
2020-01-06 08:43:25 +01:00 |
|
Eric
|
d45326606d
|
🌐 Update translations
|
2019-12-17 10:09:10 +01:00 |
|
Eric
|
e68340273b
|
Merge branch 'master' into develop
# Conflicts:
# core/config.class.inc.php
# core/htmlsanitizer.class.inc.php
# css/css-variables.scss
# css/light-grey.css
# datamodels/2.x/version.xml
# dictionaries/zh_cn.dictionary.itop.ui.php
# synchro/synchrodatasource.class.inc.php
|
2019-06-20 16:11:38 +02:00 |
|
Eric
|
5c341138e1
|
N°2129 - Fix lost dict. entries by toolkit updating script
|
2019-06-20 15:48:41 +02:00 |
|
Pierre Goiffon
|
065895aa73
|
Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
# datamodels/2.x/itop-portal-base/zh_cn.dict.itop-portal-base.php
# dictionaries/zh_cn.dictionary.itop.core.php
# dictionaries/zh_cn.dictionary.itop.ui.php
|
2019-03-04 09:21:14 +01:00 |
|
Pierre Goiffon
|
06592d7d37
|
🐛 Fix datepicker locale not set correctly for ZH CN and PT BR
Reused code made by @annProg in PR #40, many thanks !
|
2019-02-27 12:53:37 +01:00 |
|
Eric
|
ebe026b2e9
|
N°1966 - Missing dictionaries entries (other languages)
|
2019-02-25 17:20:47 +01:00 |
|
purplegrape
|
1df19f65c4
|
small translation improvement for chinese
1 symbols should not be translated
2 small improvement
|
2019-01-11 17:31:36 +01:00 |
|
purplegrape
|
1bbed99636
|
chinsese translation improvement for relase 2.6
chinsese translation improvement for relase 2.6
|
2018-12-27 10:40:53 +01:00 |
|
Purple Grape
|
bc4873dfe5
|
🌐 update 2.6 chinese translation and corresponding licences (#45)
* Update zh_cn.dict.authent-external.php
* Update zh_cn.dict.authent-ldap.php
* Update zh_cn.dict.authent-local.php
* Update zh_cn.dict.itop-attachments.php
* Update zh_cn.dict.itop-backup.php
* Update zh_cn.dict.itop-change-mgmt-itil.php
* Update zh_cn.dict.itop-change-mgmt.php
* Update zh_cn.dict.itop-config-mgmt.php
* Update zh_cn.dict.itop-config.php
* Update zh_cn.dict.itop-datacenter-mgmt.php
* Update zh.dict.itop-endusers-devices.php
* Update zh_cn.dict.itop-hub-connector.php
* Update zh_cn.dict.itop-incident-mgmt-itil.php
* Update zh_cn.dict.itop-knownerror-mgmt.php
* Update zh_cn.dict.itop-portal-base.php
* Update zh_cn.dict.itop-portal-base.php
* Update zh_cn.dict.itop-problem-mgmt.php
* Update zh_cn.dict.itop-request-mgmt-itil.php
* Update zh_cn.dict.itop-request-mgmt.php
* Update zh_cn.dict.itop-welcome-itil.php
* Update zh_cn.dict.itop-tickets.php
* Update zh_cn.dict.itop-service-mgmt-provider.php
* Update zh_cn.dict.itop-service-mgmt.php
* Update zh_cn.dictionary.itop.core.php
* Update zh_cn.dictionary.itop.ui.php
|
2018-12-18 18:11:20 +01:00 |
|
Pierre Goiffon
|
b880ca05a5
|
Merge remote-tracking branch 'origin/support/2.5' into release/2.6
# Conflicts:
# composer.json
# setup/setuputils.class.inc.php
|
2018-12-17 17:04:39 +01:00 |
|
“purplegrape”
|
9828b905b2
|
rename chinese translation file from zh.dict*php to zh_cn.dict*php .
in case guys from HongKong ,TaiWan or Singapore wana have their own translations.
|
2018-12-17 11:16:25 +01:00 |
|