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>
This commit is contained in:
bdalsass
2022-06-08 16:27:20 +02:00
committed by GitHub
parent 1fd792fed9
commit 2b885beb82
347 changed files with 53400 additions and 3034 deletions

View File

@@ -1688,3 +1688,19 @@ Dict::Add('EN US', 'English', 'English', array(
'Menu:Queries' => 'Queries',
'Menu:ConfigurationTools' => 'Configuration',
));
// OAuth
Dict::Add('EN US', 'English', 'English', array(
'Menu:OAuthWizardMenu' => 'OAuth 2.0',
'core/Operation:Wizard/Title' => 'OAuth 2.0 Configuration',
'UI:OAuth:Wizard:Page:Title' => 'OAuth 2.0 Configuration',
'UI:OAuth:Wizard:Form:Panel:Title' => 'OAuth 2.0 Configuration',
'UI:OAuth:Wizard:Form:Input:ClientId:Label' => 'Client Id',
'UI:OAuth:Wizard:Form:Input:ClientSecret:Label' => 'Client Secret',
'UI:OAuth:Wizard:Form:Input:Scope:Label' => 'Scope',
'UI:OAuth:Wizard:Form:Input:Additional:Label' => 'Additional parameters',
'UI:OAuth:Wizard:Form:Input:RedirectUri:Label' => 'Redirect Uri',
'UI:OAuth:Wizard:Form:Button:Submit:Label' => 'Authentication',
'UI:OAuth:Wizard:ResultConf:Panel:Title' => 'Configuration for SMTP',
'UI:OAuth:Wizard:ResultConf:Panel:Description' => 'Paste this content into your configuration file to use this OAuth connection for your outgoing emails',
));