Merge branch 'master' of github.com:akaunting/akaunting
Conflicts: app/Http/Controllers/Auth/Login.php
This commit is contained in:
@@ -49,7 +49,7 @@ class Login extends Controller
|
||||
public function store()
|
||||
{
|
||||
// Attempt to login
|
||||
if (!auth()->attempt(request(['email', 'password']))) {
|
||||
if (!auth()->attempt(request(['email', 'password']), request('remember', false))) {
|
||||
flash(trans('auth.failed'))->error();
|
||||
|
||||
return back();
|
||||
@@ -79,6 +79,11 @@ class Login extends Controller
|
||||
return redirect($path);
|
||||
}
|
||||
|
||||
// Check wizard
|
||||
if (!setting('general.wizard', false)) {
|
||||
return redirect('wizard');
|
||||
}
|
||||
|
||||
return redirect()->intended('/');
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user