From ad33b2f884f59a3ebddcb09bd6cee8020181a9ef Mon Sep 17 00:00:00 2001 From: anewmanjones Date: Tue, 22 Apr 2014 13:32:37 +0100 Subject: [PATCH 1/4] Fix grammar in config/mail.php --- app/config/mail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/mail.php b/app/config/mail.php index 41b4c4b4..4fcc8983 100644 --- a/app/config/mail.php +++ b/app/config/mail.php @@ -35,7 +35,7 @@ return array( | SMTP Host Port |-------------------------------------------------------------------------- | - | This is the SMTP port used by your application to delivery e-mails to + | This is the SMTP port used by your application to deliver e-mails to | users of your application. Like the host we have set this value to | stay compatible with the Mailgun e-mail applications by default. | From 3e29d067087f48f395b7f41e2c35b6cf4175a088 Mon Sep 17 00:00:00 2001 From: Colin Work Date: Tue, 22 Apr 2014 10:14:03 -0400 Subject: [PATCH 2/4] Added redis to list of available queue drivers --- app/config/queue.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 app/config/queue.php diff --git a/app/config/queue.php b/app/config/queue.php old mode 100644 new mode 100755 index 6a879f78..391842a9 --- a/app/config/queue.php +++ b/app/config/queue.php @@ -11,7 +11,7 @@ return array( | API, giving you convenient access to each back-end using the same | syntax for each one. Here you may set the default queue driver. | - | Supported: "sync", "beanstalkd", "sqs", "iron" + | Supported: "sync", "beanstalkd", "sqs", "iron", "redis" | */ From 3bab2d4487be7cf0d2fa46187aec0f444a661eb1 Mon Sep 17 00:00:00 2001 From: "Barry vd. Heuvel" Date: Fri, 23 May 2014 10:57:57 +0200 Subject: [PATCH 3/4] Add note about expire time Might be confusing for users, if the expire time is not stated. --- app/views/emails/auth/reminder.blade.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/emails/auth/reminder.blade.php b/app/views/emails/auth/reminder.blade.php index d92f2b3f..aebea9e3 100644 --- a/app/views/emails/auth/reminder.blade.php +++ b/app/views/emails/auth/reminder.blade.php @@ -7,7 +7,8 @@

Password Reset

- To reset your password, complete this form: {{ URL::to('password/reset', array($token)) }}. + To reset your password, complete this form: {{ URL::to('password/reset', array($token)) }}.
+ This link will expire in {{ Config::get('auth.reminder.expire', 60) }} minutes.
From 5a7d9a0c25e12454b59abdfb3ba92a56f29d4fb7 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 30 May 2014 14:39:17 -0500 Subject: [PATCH 4/4] Fix wording. --- app/config/mail.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/config/mail.php b/app/config/mail.php index 4fcc8983..d5fe2568 100644 --- a/app/config/mail.php +++ b/app/config/mail.php @@ -36,8 +36,8 @@ return array( |-------------------------------------------------------------------------- | | This is the SMTP port used by your application to deliver e-mails to - | users of your application. Like the host we have set this value to - | stay compatible with the Mailgun e-mail applications by default. + | users of the application. Like the host we have set this value to + | stay compatible with the Mailgun e-mail application by default. | */