composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source 
# Conflicts:
#	lib/composer/autoload_files.php
#	lib/composer/autoload_static.php
#	templates/pages/backoffice/oauth/Wizard.html.twig
This commit is contained in:
Benjamin Dalsass
2022-06-27 08:38:01 +02:00
parent 306e16147a 1b76e96720
commit 02dab4eb72
170 changed files with 2988 additions and 4456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/config.class.inc.php
View File

@@ -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',