Stephen Abello
118622493f
N°5050 Revert entry deleted in 3b83d3f2
2022-08-10 14:07:38 +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
Eric Espie
48957fd2f0
N°5102 - Allow to send emails using GSuite SMTP and OAuth - refactor scopes
2022-07-05 17:54:43 +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
Eric Espie
df5d514c28
N°4642 - Core Update : limit the usage of this function to minor version - fix error message (revert)
2022-06-13 15:59:25 +02:00
Eric Espie
16663797b2
N°4642 - Core Update : limit the usage of this function to minor version - fix error message
2022-06-13 15:51:36 +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
f014ebfeb1
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# core/log.class.inc.php
# setup/modelfactory.class.inc.php
2022-06-08 13:04:50 +02:00
Eric Espie
9674378c56
N°5211 - Core update not working with auto-selected modules (comments)
2022-06-08 10:36:55 +02:00
Eric Espie
9e314ba77b
N°5211 - Core update not working with auto-selected modules
2022-06-08 10:24:03 +02:00
Eric Espie
cdd7dcdc5c
N°5211 - Core update not working with auto-selected modules
2022-06-08 10:12:19 +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
a3f122184c
N°4642 - Core Update : limit the usage of this function - revert due to N°4666 fix
2022-05-20 10:20:47 +02:00
Eric Espie
183c3c1baf
N°4666 - Core Update : handle modules
2022-05-19 16:30:06 +02:00
Pierre Goiffon
c47f224566
💡 N°4919 add @since
2022-04-19 15:29:35 +02:00
Pierre Goiffon
8fcd454445
N°4919 New 'Launch setup" in Application Upgrade ( #244 )
...
Admin will now be able to re-launch the iTop setup directly from the administration console in the Administration / Application Upgrade screen.
Before the only way to launch setup on an existing iTop instance was to change permissions on the configuration file.
This button will be enabled depending on the isDevEnv (if true it will be displayed) and `setup.launch_button.enabled` new configuration parameter (not present by default ; if set to false will always hide the button, if set to true will always display it, if not set will display button depending on isDevEnv only).
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2022-04-19 14:36:15 +02:00
acognet
1db4b9a12e
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-03-16 09:44:33 +01:00
acognet
0c80a4e430
N°4644 - Core update : confusing warning message when integrity of iTop std files is modified - merge from 2.7.0
2022-03-14 15:28:47 +01:00
acognet
779211e638
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# 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/de.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/en.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/es_cr.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/fr.dict.itop-core-update.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/SelectUpdateFile.html.twig
# datamodels/2.x/itop-datacenter-mgmt/dictionaries/pl.dict.itop-datacenter-mgmt.php
# datamodels/2.x/itop-endusers-devices/dictionaries/pl.dict.itop-endusers-devices.php
# datamodels/2.x/itop-files-information/src/Service/FilesIntegrity.php
2022-03-14 15:17:28 +01:00
acognet
4c99f497cc
N°4644 - Core update : confusing warning message when integrity of iTop std files is modified - List all modified files
2022-03-14 14:45:07 +01:00
Molkobain
143c30b099
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# datamodels/2.x/itop-core-update/cs.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/da.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/de.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/en.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/es_cr.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/fr.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/hu.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/it.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/ja.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/nl.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/ru.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/sk.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/src/Service/CoreUpdater.php
# datamodels/2.x/itop-core-update/tr.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig
# datamodels/2.x/itop-core-update/zh_cn.dict.itop-core-update.php
2022-03-11 18:03:21 +01:00
Molkobain
d29880b1b8
Update PHPDoc
2022-03-11 17:52:10 +01:00
acognet
2d156bd77b
N°4642 - Core Update : limit the usage of this function - disable if new modules found
2022-03-10 16:47:21 +01:00
acognet
d122dbfdd6
N°4642 - Core Update : limit the usage of this function - disable if new modules found
2022-03-10 16:06:37 +01:00
acognet
46d58e6512
N°4642 - Core Update : limit the usage of this function - disable if new modules found
2022-03-10 15:24:29 +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
93a138606f
N°4664 - Core Update : block zip file upload until instance declared OK
2022-03-09 18:21:08 +01:00
Molkobain
70074ee1cb
N°4644 - Core update: Update translations with missing entry
2022-03-09 17:31:22 +01:00
Molkobain
d28ccb264f
N°4644 - Core update : confusing warning message when integrity of iTop std files is modified
...
(cherry picked from commit 69a0bd0c34 )
2022-03-09 17:28:38 +01:00
Molkobain
5854c199d0
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-03-07 12:54:13 +01:00
Molkobain
684efee5d2
N°4664 - Code format
2022-03-07 12:49:27 +01:00
acognet
e347989dcb
N°4664 - Core Update : block zip file upload until instance declared OK
2022-03-07 12:05:54 +01:00
acognet
7152277760
N°4642 - Core Update : limit the usage of this function to minor version or disable the functionality ?
2022-03-03 22:02:35 +01:00
acognet
14d05da9f6
N°4664 - Core Update : block zip file upload until instance declared OK
2022-03-03 22:00:15 +01:00
acognet
69a0bd0c34
N°4644 - Core update : confusing warning message when integrity of iTop std files is modified
2022-03-03 21:59:04 +01:00
Pierre Goiffon
923c3a27a3
Prepare 3.0.1 version
2022-02-08 14:28:27 +01:00
Pierre Goiffon
e14845728c
Prepare 2.7.7
2022-02-01 15:19:10 +01:00
acognet
c1e2ba8abc
Change version number to 3.1.0
2021-12-23 17:05:54 +01:00
acognet
d301562ffe
Change version number to 3.1.0
2021-12-23 09:41:16 +01:00
Pierre Goiffon
b190d0e385
Prepare 2.7.6 version
2021-12-14 16:54:42 +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
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
Eric Espie
11d3d5af49
N°3908 - Fix button location (moved to the right of the screen)
2021-09-29 15:56:52 +02:00
Eric Espie
9dcb789cfd
N°3908 - Polishing: Application Upgrade - move the buttons at the bottom
2021-09-28 17:04:08 +02:00
acognet
722cae240e
align style of spinner
2021-09-24 10:09:02 +02:00
Molkobain
0004586779
N°4327 - Fix JS "ReferenceError" in Application Upgrade
2021-09-23 17:40:48 +02:00
Eric Espie
540b9f8164
N°3908 - Polishing: Application Upgrade - display the installation progress bar
2021-09-16 11:24:22 +02:00