diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 0aad2598..5e4a31b2 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -13,7 +13,7 @@ class Kernel extends ConsoleKernel * @var array */ protected $commands = [ - \App\Console\Commands\Inspire::class, + Commands\Inspire::class, ]; /** diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index 4fbafecf..a5ef9c69 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -15,7 +15,7 @@ class Authenticate protected $auth; /** - * Create a new filter instance. + * Create a new middleware instance. * * @param Guard $auth * @return void diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index 495b629c..c85f9e50 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -35,7 +35,7 @@ class RedirectIfAuthenticated public function handle($request, Closure $next) { if ($this->auth->check()) { - return redirect('/home'); + return redirect('/'); } return $next($request); diff --git a/config/app.php b/config/app.php index 656f4bb0..036282a6 100644 --- a/config/app.php +++ b/config/app.php @@ -95,7 +95,7 @@ return [ | */ - 'log' => 'single', + 'log' => env('APP_LOG', 'single'), /* |-------------------------------------------------------------------------- @@ -176,7 +176,6 @@ return [ 'Gate' => Illuminate\Support\Facades\Gate::class, 'Hash' => Illuminate\Support\Facades\Hash::class, 'Input' => Illuminate\Support\Facades\Input::class, - 'Inspiring' => Illuminate\Foundation\Inspiring::class, 'Lang' => Illuminate\Support\Facades\Lang::class, 'Log' => Illuminate\Support\Facades\Log::class, 'Mail' => Illuminate\Support\Facades\Mail::class, diff --git a/package.json b/package.json index 8b7c633c..460ee907 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "gulp": "^3.8.8" }, "dependencies": { - "laravel-elixir": "^3.0.0", + "laravel-elixir": "^4.0.0", "bootstrap-sass": "^3.0.0" } } diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php index e6f3a671..e5544d20 100644 --- a/resources/lang/en/passwords.php +++ b/resources/lang/en/passwords.php @@ -4,7 +4,7 @@ return [ /* |-------------------------------------------------------------------------- - | Password Reminder Language Lines + | Password Reset Language Lines |-------------------------------------------------------------------------- | | The following language lines are the default lines which match reasons diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 992122e8..b0a1f143 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -60,7 +60,7 @@ return [ 'regex' => 'The :attribute format is invalid.', 'required' => 'The :attribute field is required.', 'required_if' => 'The :attribute field is required when :other is :value.', - 'required_unless' => 'The :attribute field is required unless :other is in :value.', + 'required_unless' => 'The :attribute field is required unless :other is in :values.', 'required_with' => 'The :attribute field is required when :values is present.', 'required_with_all' => 'The :attribute field is required when :values is present.', 'required_without' => 'The :attribute field is required when :values is not present.',