From 336d80c1f1d164319b9a7dbce24b6e6b012bd64d Mon Sep 17 00:00:00 2001 From: Sadika Sumanapala Date: Sat, 30 Apr 2016 12:39:22 +0530 Subject: [PATCH 1/3] Get guest middleware using guestMiddleware() method guestMiddleware() defined on ResetsPasswords trait This change is required to fix issue #13383 Depends on pull request laravel/framework#13384 --- app/Http/Controllers/Auth/PasswordController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php index 1ceed97b..66f77366 100644 --- a/app/Http/Controllers/Auth/PasswordController.php +++ b/app/Http/Controllers/Auth/PasswordController.php @@ -27,6 +27,6 @@ class PasswordController extends Controller */ public function __construct() { - $this->middleware('guest'); + $this->middleware($this->guestMiddleware()); } } From da64a014e749d1d4164b147fe79bfd7d86158aa5 Mon Sep 17 00:00:00 2001 From: Mohamed Said Date: Mon, 9 May 2016 17:49:14 +0200 Subject: [PATCH 2/3] Add language line for image dimensions validation rule --- resources/lang/en/validation.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index b1e61204..b720584b 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -34,6 +34,7 @@ 'different' => 'The :attribute and :other must be different.', 'digits' => 'The :attribute must be :digits digits.', 'digits_between' => 'The :attribute must be between :min and :max digits.', + 'dimensions' => 'The :attribute has invalid image dimensions.', 'distinct' => 'The :attribute field has a duplicate value.', 'email' => 'The :attribute must be a valid email address.', 'exists' => 'The selected :attribute is invalid.', From 9352968734aa339c47218a931ba85b9b0d58fe23 Mon Sep 17 00:00:00 2001 From: Luqman Rom Date: Sun, 29 May 2016 21:47:02 +0800 Subject: [PATCH 3/3] Add missing Mandrill secret keys in config.services --- config/services.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/services.php b/config/services.php index 287b1186..1581f1db 100644 --- a/config/services.php +++ b/config/services.php @@ -19,6 +19,10 @@ 'secret' => env('MAILGUN_SECRET'), ], + 'mandrill' => [ + 'secret' => env('MANDRILL_SECRET'), + ], + 'ses' => [ 'key' => env('SES_KEY'), 'secret' => env('SES_SECRET'),