mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-13 07:24:13 +01:00
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
This commit is contained in:
Benjamin Dalsass
@@ -576,46 +576,6 @@ class Config
|
||||
'source_of_value' => '',
|
||||
'show_in_conf_sample' => false,
|
||||
],
|
||||
'email_transport_smtp.oauth.provider' => [
|
||||
'type' => 'string',
|
||||
'description' => 'Email OAuth provider',
|
||||
'default' => '',
|
||||
'value' => '',
|
||||
'source_of_value' => '',
|
||||
'show_in_conf_sample' => false,
|
||||
],
|
||||
'email_transport_smtp.oauth.client_id' => [
|
||||
'type' => 'string',
|
||||
'description' => 'Email OAuth client id',
|
||||
'default' => '',
|
||||
'value' => '',
|
||||
'source_of_value' => '',
|
||||
'show_in_conf_sample' => false,
|
||||
],
|
||||
'email_transport_smtp.oauth.client_secret' => [
|
||||
'type' => 'string',
|
||||
'description' => 'Email OAuth client secret',
|
||||
'default' => '',
|
||||
'value' => '',
|
||||
'source_of_value' => '',
|
||||
'show_in_conf_sample' => false,
|
||||
],
|
||||
'email_transport_smtp.oauth.access_token' => [
|
||||
'type' => 'string',
|
||||
'description' => 'Email OAuth access token',
|
||||
'default' => '',
|
||||
'value' => '',
|
||||
'source_of_value' => '',
|
||||
'show_in_conf_sample' => false,
|
||||
],
|
||||
'email_transport_smtp.oauth.refresh_token' => [
|
||||
'type' => 'string',
|
||||
'description' => 'Email OAuth refresh token',
|
||||
'default' => '',
|
||||
'value' => '',
|
||||
'source_of_value' => '',
|
||||
'show_in_conf_sample' => false,
|
||||
],
|
||||
'email_css' => [
|
||||
'type' => 'string',
|
||||
'description' => 'CSS that will override the standard stylesheet used for the notifications',
|
||||
|
||||
Reference in New Issue
Block a user