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
acognet
ebab664c1a
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-11 16:54:43 +02:00
jbostoen
d17e399a5f
🌐 N°5397 - Updated Dutch translations ( #262 )
...
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@me.com >
2022-08-11 14:07:51 +02:00
acognet
26b779cd0e
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-10 17:51:35 +02:00
Stephen Abello
5164976b76
N°5050 * Revert changes made in 3b83d3f2 in english dictionary 🤦
...
* Move it to Spanish dictionary
2022-08-10 15:38:42 +02:00
Eric Espie
8d8cefe948
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-09 17:11:34 +02:00
Stephen Abello
3b83d3f209
N°5050 Update Spanish translations (thanks to Miguel Turrubiates!)
2022-08-09 14:27:09 +02:00
Molkobain
8357e5b8d0
Fix typo
2022-08-05 19:53:12 +02:00
acognet
aad4a5e20c
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-04 16:43:20 +02:00
acognet
b704e0d131
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2022-08-04 16:38:47 +02:00
acognet
f9ac07830e
Fix translation
2022-08-04 16:26:01 +02:00
Molkobain
86e1f165cd
Merge remote-tracking branch 'origin/develop' into feature/4517-from-dev
...
# Conflicts:
# CONTRIBUTING.md
# composer.lock
# core/designdocument.class.inc.php
# lib/composer/installed.json
# lib/composer/installed.php
2022-07-28 10:30:25 +02:00
Molkobain
91c73b562a
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-07-13 17:15:53 +02:00
Molkobain
28df2dad60
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# js/wizardhelper.js
2022-07-13 17:11:04 +02:00
Molkobain
73af605892
Fix typo in dictionaries
2022-07-13 17:03:00 +02:00
Molkobain
01023801b8
Prepare 3.0.0-beta4
...
- Update translations
- Update version number
2022-07-01 11:35:40 +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
Benjamin Dalsass
02dab4eb72
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# lib/composer/autoload_files.php
# lib/composer/autoload_static.php
# templates/pages/backoffice/oauth/Wizard.html.twig
2022-06-27 08:38:01 +02:00
Benjamin Dalsass
f0b94dd0f7
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# core/config.class.inc.php
# datamodels/2.x/installation.xml
# datamodels/2.x/itop-oauth-client/assets/img/icons8-adjust.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-administrative-tools.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-application-window.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-apps-tab.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-archive-folder.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-audit.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-automatic.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-bandage.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-book-error.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-calendar.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-cassette.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-change-approved.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-change-emergency.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-change-normal.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-change-routine.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-change.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-checkmark.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-cloud-file.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-conflict.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-contract.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-customer.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-database-custom.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-database.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-delete.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-department.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-desktop.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-discussion-forum.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-documents.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-electrical.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-electricity.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-electronics.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-enclosure-for-servers.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-export-csv.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-faq.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-farm.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-file.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-globe-cable.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-globe-fiber.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-globe-wire.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-hdd.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-hierarchy.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-hypervisor.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-import-csv.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-important-book.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-in-transit.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-laptop.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-licence.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-map-as-drive.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-map-marker.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-mobile.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-music-robot.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-nas.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-network.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-new-item.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-note.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-office-phone.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-old-vmware-logo.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-organization.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-person-female.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-phone.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-plug-socket.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-power-plant.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-print.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-process-improvement.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-puzzle.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-rack.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-server-custom.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-server-storage.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-server.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-service.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-services.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-smartphone-tablet.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-software-instance.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-software-license.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-software-other.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-software.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-solve.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-stack.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-switch-san.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-switch.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-tape-library.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-tasklist.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-team.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-telephone.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-time-limit.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-virtual-machine.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-web.svg
# datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml
# dictionaries/cs.dictionary.itop.ui.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.ui.php
# dictionaries/ja.dictionary.itop.ui.php
# dictionaries/nl.dictionary.itop.ui.php
# dictionaries/pt_br.dictionary.itop.ui.php
# dictionaries/ru.dictionary.itop.ui.php
# dictionaries/sk.dictionary.itop.ui.php
# dictionaries/tr.dictionary.itop.ui.php
# dictionaries/zh_cn.dictionary.itop.ui.php
# js/wizardhelper.js
# lib/composer/autoload_classmap.php
# lib/composer/autoload_real.php
# lib/composer/autoload_static.php
# templates/pages/backoffice/oauth/Wizard.html.twig
2022-06-27 08:11:28 +02:00
Eric Espie
aa90d5b6ab
N°5102 - Allow to send emails using GSuite SMTP and OAuth - Rework
2022-06-21 13:51:08 +02:00
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
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
