nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-05-17 10:45:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source 
* dev:
  v1.5.1-beta.2
  v1.5.1-beta.1
This commit is contained in:
carodej
2020-05-22 09:59:05 +02:00
parent 2eaf399441 beae4277ca
commit deff8d8741
14 changed files with 118 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Console/Commands/Deploy.php
+1 -1
View File
@@ -44,7 +44,7 @@ class Deploy extends Command
// Exec commands
exec('git pull origin ' . config('app.deploy_branch'));
exec('composer update --no-interaction --prefer-dist');
//exec('composer update --no-interaction --prefer-dist');
$this->migrateDatabase();
// Stop deployment
app/Notifications/ResetPassword.php
+6 -4
View File
@@ -43,10 +43,12 @@ class ResetPassword extends Notification
$reset_url = url('/create-new-password?token=' . $this->token);
return (new MailMessage)
->subject('Reset password for your account on ' . config('vuefilemanager.app_name'))
->line('You are receiving this email because we received a password reset request for your account.')
->action('Reset Password', $reset_url)
->line('If you did not request a password reset, no further action is required.');
->subject(__('vuefilemanager.reset_password_subject') . config('vuefilemanager.app_name'))
->greeting(__('vuefilemanager.reset_password_greeting'))
->line(__('vuefilemanager.reset_password_line_1'))
->action(__('vuefilemanager.reset_password_action'), $reset_url)
->line(__('vuefilemanager.reset_password_line_2'))
->salutation(__('vuefilemanager.salutation') . ', ' . config('vuefilemanager.app_name'));
}
/**