Merge branch 'master' of https://github.com/devcode-it/openstamanager
This commit is contained in:
commit
1c8c33893c
2
mail.php
2
mail.php
|
@ -178,7 +178,7 @@ echo '
|
||||||
'label' => tr('Contenuto'),
|
'label' => tr('Contenuto'),
|
||||||
'name' => 'body',
|
'name' => 'body',
|
||||||
'id' => 'body_'.rand(0, 999),
|
'id' => 'body_'.rand(0, 999),
|
||||||
'value' => json_encode($body),
|
'value' => $body,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
echo'
|
echo'
|
||||||
|
|
|
@ -38,12 +38,12 @@ class Account extends Model
|
||||||
'microsoft' => [
|
'microsoft' => [
|
||||||
'name' => 'Microsoft',
|
'name' => 'Microsoft',
|
||||||
'class' => Microsoft::class,
|
'class' => Microsoft::class,
|
||||||
'help' => 'https://docs.openstamanager.com/v/2.4.40/configurazioni/configurazione-oauth2#microsoft',
|
'help' => 'https://docs.openstamanager.com/v/2.4.41/configurazioni/configurazione-oauth2#microsoft',
|
||||||
],
|
],
|
||||||
'google' => [
|
'google' => [
|
||||||
'name' => 'Google',
|
'name' => 'Google',
|
||||||
'class' => Google::class,
|
'class' => Google::class,
|
||||||
'help' => 'https://docs.openstamanager.com/v/2.4.40/configurazioni/configurazione-oauth2#google',
|
'help' => 'https://docs.openstamanager.com/v/2.4.41/configurazioni/configurazione-oauth2#google',
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue