diff --git a/.laravel-commit b/.laravel-commit index 138f078..9fc2af1 100644 --- a/.laravel-commit +++ b/.laravel-commit @@ -1 +1 @@ -07360db40aa6b74c399d06744a8a2d95e0e818b6 +7da6edf8c14772f14ff11616199fb16bd19909ae diff --git a/config/auth.php b/config/auth.php index a57bdc7..7817501 100644 --- a/config/auth.php +++ b/config/auth.php @@ -81,10 +81,6 @@ return [ | Resetting Passwords |-------------------------------------------------------------------------- | - | Here you may set the options for resetting passwords including the view - | that is your password reset e-mail. You may also set the name of the - | table that maintains all of the reset tokens for your application. - | | You may specify multiple password reset configurations if you have more | than one user table or model in the application and you want to have | separate password reset settings based on the specific user types. diff --git a/config/session.php b/config/session.php index 5503ee0..807fdcf 100644 --- a/config/session.php +++ b/config/session.php @@ -161,7 +161,7 @@ return [ | */ - 'secure' => false, + 'secure' => env('SESSION_SECURE_COOKIE', false), /* |-------------------------------------------------------------------------- diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 28c6677..73b49d0 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -53,6 +53,7 @@ return [ 'array' => 'The :attribute may not have more than :max items.', ], 'mimes' => 'The :attribute must be a file of type: :values.', + 'mimetypes' => 'The :attribute must be a file of type: :values.', 'min' => [ 'numeric' => 'The :attribute must be at least :min.', 'file' => 'The :attribute must be at least :min kilobytes.', @@ -80,6 +81,7 @@ return [ 'string' => 'The :attribute must be a string.', 'timezone' => 'The :attribute must be a valid zone.', 'unique' => 'The :attribute has already been taken.', + 'uploaded' => 'The :attribute failed to upload.', 'url' => 'The :attribute format is invalid.', /*