webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-08-09 10:22:51 +03:00
Code Activity

Merge branch 'feature/autoregistration_social_login' of git://github.com/ibrahimennafaa/BookStack into ibrahimennafaa-feature/autoregistration_social_login

Browse Source
This commit is contained in:
Dan Brown
2018-09-21 16:14:52 +01:00
parent 131fcae4c7 d2f5313f92
commit 7ad8314bd7
4 changed files with 50 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/lang/en/settings.php
View File

@@ -43,6 +43,8 @@ return [
'reg_settings' => 'Registration Settings',
'reg_allow' => 'Allow registration?',
'reg_auto_social_allow' => 'Allow auto social registration?',
'reg_auto_social_allow_desc' => 'If the social user doesn\'t exist, automatically sign him up. Domain restriction is respected if set. Email is also automatically validated for this kind of social registration.',
'reg_default_role' => 'Default user role after registration',
'reg_confirm_email' => 'Require email confirmation?',
'reg_confirm_email_desc' => 'If domain restriction is used then email confirmation will be required and the below value will be ignored.',
@@ -148,7 +150,7 @@ return [
'it' => 'Italian',
'ru' => 'Русский',
'zh_CN' => '简体中文',
'zh_TW' => '繁體中文'
'zh_TW' => '繁體中文'
]
///////////////////////////////////
];

5
resources/views/settings/index.blade.php
View File

@@ -136,6 +136,11 @@
@endforeach
</select>
</div>
<div class="form-group">
<label for="setting-autosocialregistration-confirmation">{{ trans('settings.reg_auto_social_allow') }}</label>
<p class="small">{{ trans('settings.reg_auto_social_allow_desc') }}</p>
@include('components.toggle-switch', ['name' => 'setting-autosocialregistration-confirmation', 'value' => setting('autosocialregistration-confirmation')])
</div>
<div class="form-group">
<label for="setting-registration-confirmation">{{ trans('settings.reg_confirm_email') }}</label>
<p class="small">{{ trans('settings.reg_confirm_email_desc') }}</p>