Stephen Abello
59129bc3ce
N°2039 N°7298 - Allow Actions to be asynchronous ( #625 )
...
* N°2039 - Allows Actions to be asynchronous
* Add unit test
* Apply suggestions from code review
* Apply suggestions from code review
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
* Apply suggestions from code review
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
* Apply suggestions from code review
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
* Apply suggestions from code review
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
* Apply suggestions from code review
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
* Apply suggestions from code review
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
* Apply suggestions from code review
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
* Apply suggestions from code review
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
* Apply suggestions from code review
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
* Apply suggestions from code review
* GetAsynchronousGlobalSetting is now static
* None of the async task for itop notification attribute should be null
* Rename follow_global_setting to user_global_setting
---------
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2024-03-01 09:27:56 +01:00
Pierre Goiffon
85dac470aa
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
...
# Conflicts:
# datamodels/2.x/itop-files-information/dictionaries/zh_cn.dict.itop-files-information.php
# datamodels/2.x/itop-oauth-client/dictionaries/zh_cn.dict.itop-oauth-client.php
# datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-portal-base.php
# dictionaries/cs.dictionary.itop.core.php
# dictionaries/cs.dictionary.itop.ui.php
# dictionaries/zh_cn.dictionary.itop.core.php
# dictionaries/zh_cn.dictionary.itop.ui.php
# tests/php-unit-tests/README.md
2024-02-14 15:09:23 +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
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
Liberty
ef083d5e8f
N°2039 - Update Chinese translations for the newsroom ( #595 )
...
* Some Chinese Translation:ActioniTopNotification & EventiTopNotification
* optimize
* Update dictionaries/en.dictionary.itop.core.php
good idea!
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
* Update dictionaries/zh_cn.dictionary.itop.core.php
good idea!
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
* optimize
---------
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2024-01-09 16:58:36 +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
Devin
12a1321bc1
N°6907 - Update chinese translations thanks to @bdejin ( #563 )
...
* Add missing translations
* add missing translation
* minor update on translation "see setting
* add missing translations
* add missing translation for file dictionaries\zh_cn.dictionary.itop.core.php
* add missing translation for file dictionaries\zh_cn.dictionary.itop.ui.php
* add missing translation for file dictionaries\zh_cn.dictionary.itop.ui.php
* added missing translation for core and ui
* added missing translation for the rest files
* 🌐 minor Chinese translation updates following comments from chileeb on PR #563
* 🌐 update most of the 'class' translation from '类' to '类型'
* 🌐 add kitty message translation
* 🌐 update '表格中暂无数据' in dictionaries\ui\components\datatable\zh_cn.dictionary.itop.datatable.php to '当前列表没有数据'
2023-11-14 17:16:09 +01:00
purplegrape
72873a3343
🌐 Improve zh-cn dict
...
Manual merge for #516
Translation by @purplegrape, many thanks !
2023-07-27 11:17:09 +02:00
Purple Grape
47400d94ba
N°6468 update zh-cn dict ( #512 )
2023-06-23 09:03:49 +02:00
Timothee
f548dc2898
Dictionaries update for 3.1 beta
2023-06-15 09:47:51 +02:00
Purple Grape
68e1f359d3
N°6417 - Update chinese translations thanks to @purplegrape ( #500 )
2023-06-13 17:36:27 +02:00
Molkobain
c767ebe989
📝 Copyright year bump
2023-03-17 18:28:47 +01:00
Molkobain
f0bce86e28
N°4765 - Revert unwanted change on ActionEmail::status values tooltip translations
2022-10-24 23:15:41 +02:00
Eduardo Mozart de Oliveira
9f963686b5
N°4765 - Update brazilian translations thanks to @eduardomozart ( #268 )
...
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2022-09-13 17:20:53 +02:00
Purple Grape
0c14423213
improved Chinese translation ( #302 )
...
1. words refine
2. remove unwanted blank
3. punctuation related issue
Co-Authored-By: Devin <bdejin@hotmail.com >
2022-06-28 12:34:21 +02:00
bdalsass
2b885beb82
Feature/merge 3 0 develop ( #298 )
...
* merging 3.0 into develop
* N°5102 - Allow to send emails (eg. notifications) using GSuite SMTP and OAuth
* migration to iTop 3.1
Co-authored-by: Eric Espie <eric.espie@combodo.com >
2022-06-08 16:27:20 +02: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
