Merge remote-tracking branch 'origin/email-verification'

# Conflicts:
#	composer.lock
#	public/mix-manifest.json
#	tests/TestCase.php
This commit is contained in:
Peter Papp
2021-07-15 14:00:43 +02:00
43 changed files with 988 additions and 12292 deletions
+1 -1
View File
@@ -131,7 +131,7 @@ return [
*/
'features' => [
Features::registration(),
// Features::registration(),
//Features::resetPasswords(),
// Features::emailVerification(),
Features::updateProfileInformation(),
+13
View File
@@ -291,6 +291,8 @@ return [
'admin_settings.email.username_plac' => 'Type your mail username',
'admin_settings.others.allow_registration' => 'Allow User Registration',
'admin_settings.others.allow_registration_help' => 'You can disable public registration for new users. You will still able to <br/>create new users in administration panel.',
'admin_settings.others.allow_user_verification' => 'Allow User Email Verification',
'admin_settings.others.allow_user_verification_help' => 'Turn on, if you want to allow user email verification.',
'admin_settings.others.cache_clear' => 'Clear Cache',
'admin_settings.others.cache_disclaimer' => 'Did you change anything in your .env file or change your Stripe credentials? Then clear your cache.',
'admin_settings.others.contact_email' => 'Contact Email',
@@ -396,6 +398,7 @@ return [
'menu.latest' => 'Recent Uploads',
'menu.logout' => 'Log Out',
'menu.password' => 'Password',
'menu.token' => 'Access Token',
'menu.profile' => 'Profile Settings',
'menu.settings' => 'Settings',
'menu.shared' => 'Shared Files',
@@ -472,6 +475,13 @@ return [
'page_sign_in.placeholder_password' => 'Type your password',
'page_sign_in.subtitle' => 'Confirm you by your password',
'page_sign_in.title' => 'Are You {name}?',
'page_not_verified.subtitle' => 'Your account is not verified. Before login, verify your account please.',
'page_not_verified.resend_text' => 'Do you want resend verification email?',
'page_not_verified.resend_button' => 'Resend verification email.',
'page_email_successfully_verified.title' => 'Your account was successfully verified!',
'page_email_successfully_verified.subtitle' => 'Now you can log in.',
'page_email_successfully_send.title' => 'Verification email was successfully send!',
'page_email_successfully_send.subtitle' => 'Check your email address where the email was send.',
'popup_create_folder.folder_default_name' => 'New Folder',
'popup_create_folder.label' => 'Type Name',
'popup_create_folder.placeholder' => 'Type your name',
@@ -539,6 +549,7 @@ return [
'routes_title.profile' => 'My Profile',
'routes_title.settings' => 'Settings',
'routes_title.settings_password' => 'Change Password',
'routes_title.token' => 'Access Token',
'routes_title.settings_storage' => 'Storage',
'routes_title.user_create' => 'Create User',
'routes_title.users_delete' => 'Delete User',
@@ -614,6 +625,7 @@ return [
'user_box_role.title' => 'Change User Role',
'user_box_storage.description' => "Change user storage capacity by input bellow. You have to type only number e.g. value '5' means, user will have 5GB of storage capacity.",
'user_box_storage.title' => 'Change User Storage Capacity',
'user_token.title' => 'Access Tokens',
'user_password.title' => 'Change Your Password',
'user_settings.address' => 'Address',
'user_settings.address_plac' => 'Type your billing address',
@@ -674,5 +686,6 @@ return [
'app_touch_icon' => 'App Touch Icon',
'app_touch_icon_description' => 'If user store bookmark on his phone screen, this icon appear in app thumbnail. Preferred size is 156x156',
'select_search_placeholder' => 'Search in list...',
'go_home' => 'Go to the homepage',
],
];