Benjamin Dalsass
683ab25e83
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# lib/composer/autoload_files.php
# lib/composer/autoload_static.php
2022-06-17 10:14:01 +02:00
Benjamin Dalsass
4d180eb303
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# composer.lock
# js/wizardhelper.js
# lib/composer/autoload_real.php
# lib/composer/installed.json
# lib/composer/installed.php
# lib/guzzlehttp/guzzle/CHANGELOG.md
# setup/wizardsteps.class.inc.php
2022-06-17 09:25:57 +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
Eric Espie
6d3118d9e9
N°5102 - Allow to send emails (eg. notifications) using GSuite SMTP and OAuth (fix config error message)
2022-06-08 13:24:29 +02:00
Benjamin Dalsass
834084a3e2
Correct dictionary entry
2022-06-02 17:15:10 +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
6a332ca60b
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-05-18 10:43:22 +02:00
Thomas Casteleyn
3d04cf1cd6
🌐 Improve DBObject::CheckValue and CheckConsistency error messages ( #288 )
...
Now contains attribute code and value
2022-05-17 17:01:41 +02:00
Eric Espie
1d45eff9b0
N°3169 - Add feature to connect Gsuite mail box with OAuth
...
N°2504 - Add feature to connect Office mail box with OAuth2 for Microsoft Graph
N°5102 - Allow to send emails (eg. notifications) using GSuite SMTP and OAuth
* 2.7 migration
2022-05-17 10:11:15 +02:00
Stephen Abello
caf939bf58
N°2504 N°3169 N°5102 Add dictionaries
2022-05-13 14:06:11 +02:00
acognet
1db4b9a12e
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-03-16 09:44:33 +01:00
Christian Beer
6cf781da33
🌐 Improve German translation ( #277 )
...
Many thanks @ChristianBeer for this great contribution, and @larhip for the validation !
2022-03-10 14:16:59 +01:00
Molkobain
5854c199d0
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-03-07 12:54:13 +01:00
Molkobain
ede720c9b9
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2022-03-07 12:52:09 +01:00
acognet
2fab7de34b
N°4806 - UI:WelcomeMenu:Text contains empty string
2022-03-04 10:36:28 +01:00
Molkobain
03ed9c9deb
N°4905 - Fix usage of ITOP_APPLICATION constant in dictionaries
2022-03-04 10:31:01 +01:00
acognet
9f27cf2b84
N°4525 - bad source for extensions in system information and about iTop with iTop Pr
2022-03-03 15:14:28 +01:00
Pierre Goiffon
9ce88699ca
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_mosaic.html.twig
# datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_tree.html.twig
2022-02-22 09:40:37 +01:00
Pierre Goiffon
815870fe6b
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# application/cmdbabstract.class.inc.php
# dictionaries/cs.dictionary.itop.model.php
# dictionaries/da.dictionary.itop.model.php
# dictionaries/de.dictionary.itop.model.php
# dictionaries/es_cr.dictionary.itop.model.php
# dictionaries/fr.dictionary.itop.model.php
# dictionaries/hu.dictionary.itop.model.php
# dictionaries/it.dictionary.itop.model.php
# dictionaries/ja.dictionary.itop.model.php
# dictionaries/pl.dictionary.itop.model.php
# dictionaries/pt_br.dictionary.itop.model.php
# dictionaries/tr.dictionary.itop.model.php
# dictionaries/zh_cn.dictionary.itop.model.php
2022-02-22 09:36:06 +01:00
Pierre Goiffon
5048421bfa
🔥 N°4815 Remove .model files in /dictionaries
...
They were added with 3fb0c768 in 2.5.2, probably by mistake as they :
* exists only for certain languages and not for english
* only contain comments
2022-02-16 10:17:42 +01:00
Pierre Goiffon
b1ed15f31c
N°4787 Remove useless "+" dict entries
...
Emptied "+" entries when their value is the same as its counterpart
2022-02-14 16:33:10 +01:00
Molkobain
3bec96abe1
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# core/config.class.inc.php
# setup/itopdesignformat.class.inc.php
2022-01-27 16:09:22 +01:00
Molkobain
cc5f7608e3
N°3861 - Dictionaries: Replace usages of hardcoded "iTop" string by ITOP_APPLICATION_SHORT constant
2022-01-26 10:28:47 +01:00
Molkobain
102528195b
Fix typo, thanks to @jbostoen
2022-01-23 16:10:42 +01:00
Benjamin Dalsass
91d4da85e1
N°4454 - Measuring the use of the queryphrase book
2022-01-14 11:12:30 +01:00
acognet
24e6840a8b
N°4647 - Dictionaries for Polish not up to date
2022-01-10 18:07:30 +01:00
Pierre Goiffon
8578d18e7f
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# core/cmdbsource.class.inc.php
# core/config.class.inc.php
# core/displayablegraph.class.inc.php
# core/log.class.inc.php
# datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php
# datamodels/2.x/itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php
# datamodels/2.x/itop-tickets/tr.dict.itop-tickets.php
# datamodels/2.x/itop-welcome-itil/tr.dict.itop-welcome-itil.php
# dictionaries/tr.dictionary.itop.core.php
# dictionaries/tr.dictionary.itop.ui.php
# pages/UI.php
# setup/itopdesignformat.class.inc.php
# test/core/LogAPITest.php
# test/integration/iTopModulesPhpVersionChecklistTest.php
# test/postbuild_integration/SetupCssIntegrityChecklistTest.php
# test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php
# test/status/StatusTest.php
2022-01-10 16:15:00 +01:00
Stephen Abello
365c7bb89e
N°4397 Update Turkish translations
2022-01-07 11:09:51 +01:00
Molkobain
2a0fc227de
Fix chinese dictionaries
2021-12-13 15:55:39 +01:00
Purple Grape
a00f4156ea
improved translation for ZH_CN
2021-12-13 15:36:15 +01:00
Molkobain
ae323d393d
Fix usage of ITOP_APPLICATION_SHORT constant in dictionaries
2021-12-10 15:35:04 +01:00
Stephen Abello
4771908f42
Adv. Search hints: Remove markup from dict files and display hint message in a tooltip
2021-12-10 11:11:00 +01:00
acognet
9b6dabf5fb
update dictionnaries for 3.0
2021-12-09 14:00:49 +01:00
acognet
de004af288
update dictionnaries for 3.0
2021-12-09 11:57:22 +01:00
acognet
f48cdd51f4
update dictionnaries for 3.0
2021-12-09 11:29:39 +01:00
acognet
6de4511601
Fix Language name
2021-12-07 16:16:00 +01:00
Molkobain
afc0a02058
N°3508 - Rework notifications page to have distinct tabs depending on the action type
2021-12-04 20:49:30 +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
61a0028d02
Change welcome message to remove "responsive" mention to be honest with ourselves 🤡
2021-11-30 15:45:47 +01:00
Stephen Abello
cb67dd1f1c
Fix French dict typo
2021-11-25 09:42:09 +01:00
Pierre Goiffon
f57785e422
Merge remote-tracking branch 'origin/support/2.7' into develop
...
# Conflicts:
# datamodels/2.x/authent-local/dictionaries/es_cr.dict.authent-local.php
# datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
# datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php
# datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
# datamodels/2.x/itop-welcome-itil/es_cr.dict.itop-welcome-itil.php
# dictionaries/es_cr.dictionary.itop.ui.php
# test/integration/DictionariesConsistencyTest.php
2021-11-22 09:08:34 +01:00
Pierre Goiffon
77880c3675
🌐 N°3635 ES dict : change 'Español, Castellaño' to 'Español, Castellano'
2021-11-22 08:55:08 +01:00
Stephen Abello
cdc452282e
Fix dictionnary entries
2021-11-19 11:38:08 +01:00
Stephen Abello
72d1ab5cbc
N°3523 Add accessibility to silo selection and user menu toggler
2021-11-19 11:16:19 +01:00
Pierre Goiffon
67fa156c0e
Merge remote-tracking branch 'origin/support/2.7' into develop
...
# Conflicts:
# application/dashboard.class.inc.php
# core/action.class.inc.php
# datamodels/2.x/combodo-db-tools/dictionaries/es_cr.dict.combodo-db-tools.php
# datamodels/2.x/itop-attachments/dictionaries/es_cr.dict.itop-attachments.php
# datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
# datamodels/2.x/itop-core-update/dictionaries/es_cr.dict.itop-core-update.php
# datamodels/2.x/itop-hub-connector/dictionaries/es_cr.dict.itop-hub-connector.php
# datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-portal-base/dictionaries/es_cr.dict.itop-portal-base.php
# datamodels/2.x/itop-request-mgmt-itil/dictionaries/es_cr.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt/dictionaries/es_cr.dict.itop-request-mgmt.php
# datamodels/2.x/itop-sla-computation/dictionaries/es_cr.dict.itop-sla-computation.php
# datamodels/2.x/itop-storage-mgmt/dictionaries/es_cr.dict.itop-storage-mgmt.php
# datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
# datamodels/2.x/itop-virtualization-mgmt/dictionaries/es_cr.dict.itop-virtualization-mgmt.php
# datamodels/2.x/itop-welcome-itil/es_cr.dict.itop-welcome-itil.php
# dictionaries/es_cr.dictionary.itop.core.php
# dictionaries/es_cr.dictionary.itop.ui.php
# pages/ajax.render.php
# setup/wizardsteps.class.inc.php
# synchro/synchro_import.php
2021-11-19 10:28:46 +01:00
Pierre Goiffon
9437e689fd
N°3635 Update ES translations
...
Many thanks to Miguel Turrubiates !
2021-11-18 17:48:43 +01:00
Molkobain
b0904cabfd
N°4447 - Update german translations thanks to Martin Raeker from @itomig-de !
2021-11-17 10:26:12 +01:00
Molkobain
4a6b351c37
N°4440 - Fix hierarchy tooltip on ext. key widget
2021-11-10 18:49:25 +01:00
vdumas
2df8bb1707
N°3735 - Add SetComputedDate on DBObject
2021-11-02 16:55:25 +01:00