From d64b5a52af6b7d6eb338b12510611e4c043b1afb Mon Sep 17 00:00:00 2001 From: Andy Date: Tue, 16 Jun 2015 08:46:07 -0500 Subject: [PATCH 01/23] Maintain alphabetical order --- resources/lang/en/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 358b4eee..20acc9a6 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -70,8 +70,8 @@ return [ 'string' => 'The :attribute must be :size characters.', 'array' => 'The :attribute must contain :size items.', ], - 'timezone' => 'The :attribute must be a valid zone.', 'string' => 'The :attribute must be a string.', + 'timezone' => 'The :attribute must be a valid zone.', 'unique' => 'The :attribute has already been taken.', 'url' => 'The :attribute format is invalid.', From 7a8800c6b48dd73a8838d3e336a8f55e4e420cd0 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sat, 20 Jun 2015 14:56:23 -0500 Subject: [PATCH 02/23] add Homestead.yaml to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c47965c2..7c8b031e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /vendor /node_modules +Homestead.yaml .env From ad08717680f441c34c6b0def11c1c2f7bb2b209c Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Mon, 22 Jun 2015 18:24:47 -0500 Subject: [PATCH 03/23] tweak default asset setup --- gulpfile.js | 2 +- package.json | 3 ++- resources/assets/less/app.less | 1 - resources/assets/sass/app.scss | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 resources/assets/less/app.less create mode 100644 resources/assets/sass/app.scss diff --git a/gulpfile.js b/gulpfile.js index 7cf62673..483f6d31 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -12,5 +12,5 @@ var elixir = require('laravel-elixir'); */ elixir(function(mix) { - mix.less('app.less'); + mix.sass('app.scss'); }); diff --git a/package.json b/package.json index b5d941f6..c4df8172 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "private": true, "devDependencies": { "gulp": "^3.8.8", - "laravel-elixir": "^2.0.0" + "laravel-elixir": "^2.0.0", + "bootstrap-sass": "^3.0.0" } } diff --git a/resources/assets/less/app.less b/resources/assets/less/app.less deleted file mode 100644 index 8b137891..00000000 --- a/resources/assets/less/app.less +++ /dev/null @@ -1 +0,0 @@ - diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss new file mode 100644 index 00000000..bb76e29c --- /dev/null +++ b/resources/assets/sass/app.scss @@ -0,0 +1,2 @@ +// @import "node_modules/bootstrap-sass/assets/stylesheets/bootstrap"; + From 04709cf0edd1f54889b4dd733a8d851b8de0b0e9 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 23 Jun 2015 10:58:54 -0500 Subject: [PATCH 04/23] tweak package file --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index c4df8172..b1b4a6e6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,9 @@ { "private": true, "devDependencies": { - "gulp": "^3.8.8", + "gulp": "^3.8.8" + }, + "dependencies": { "laravel-elixir": "^2.0.0", "bootstrap-sass": "^3.0.0" } From 8910cb9726ce24ab17a79892d464a33da5f92654 Mon Sep 17 00:00:00 2001 From: Jose Jimenez Date: Tue, 23 Jun 2015 10:07:33 -0700 Subject: [PATCH 05/23] Use the ::class notation Updated to use ::class notation. --- database/seeds/DatabaseSeeder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index fb9e6007..988ea210 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -14,7 +14,7 @@ class DatabaseSeeder extends Seeder { Model::unguard(); - // $this->call('UserTableSeeder'); + // $this->call(UserTableSeeder::class); Model::reguard(); } From bb86ab62f234070ade3fcf2789459ad2107ac806 Mon Sep 17 00:00:00 2001 From: Tony Li Date: Tue, 23 Jun 2015 12:04:52 -0700 Subject: [PATCH 06/23] use double quotes for html attributes --- resources/views/errors/503.blade.php | 2 +- resources/views/welcome.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php index 123339bb..0380666a 100644 --- a/resources/views/errors/503.blade.php +++ b/resources/views/errors/503.blade.php @@ -3,7 +3,7 @@ Be right back. - +
Laravel 5
-
{{ Inspiring::quote() }}
From a9ca36a8ca6bfe9b6df6fc3e4a3c6a24f485bc7c Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Thu, 25 Jun 2015 13:34:04 -0500 Subject: [PATCH 08/23] no margin needed. --- resources/views/welcome.blade.php | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index af4bb069..cb5d3530 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -32,7 +32,6 @@ .title { font-size: 96px; - margin-bottom: 40px; } From dd036f559b3213279e4dfa8ab055aeac3dab2521 Mon Sep 17 00:00:00 2001 From: Ben Sampson Date: Fri, 26 Jun 2015 14:26:44 +0100 Subject: [PATCH 09/23] Fix redirect loop .htaccess Folders that exist have a redirect loop when visiting them. This is because Apache redirects to trailing slash for folders and the current rule is removing it, Apache then adds a trailing slash again. --- public/.htaccess | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/.htaccess b/public/.htaccess index 77827ae7..69389272 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -5,7 +5,8 @@ RewriteEngine On - # Redirect Trailing Slashes... + # Redirect Trailing Slashes but not for folders... + RewriteCond %{REQUEST_FILENAME} !-d RewriteRule ^(.*)/$ /$1 [L,R=301] # Handle Front Controller... From 804b9d746078482ee4e644d680bd87ca4e47b003 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 26 Jun 2015 08:30:59 -0500 Subject: [PATCH 10/23] fix wording --- public/.htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/.htaccess b/public/.htaccess index 69389272..8eb2dd0d 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -5,7 +5,7 @@ RewriteEngine On - # Redirect Trailing Slashes but not for folders... + # Redirect Trailing Slashes If Not A Folder... RewriteCond %{REQUEST_FILENAME} !-d RewriteRule ^(.*)/$ /$1 [L,R=301] From 5deca95ccf4351038cb84eae9b6223d60f3f68cb Mon Sep 17 00:00:00 2001 From: Mikael Mattsson Date: Sat, 27 Jun 2015 14:21:37 +0200 Subject: [PATCH 11/23] Change comment to reflect the change of the default css preprocessor. --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index 483f6d31..dc6f1ebb 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -6,7 +6,7 @@ var elixir = require('laravel-elixir'); |-------------------------------------------------------------------------- | | Elixir provides a clean, fluent API for defining some basic Gulp tasks - | for your Laravel application. By default, we are compiling the Less + | for your Laravel application. By default, we are compiling the Sass | file for our application, as well as publishing vendor resources. | */ From 901a45fd96a7479e77f63ea5f8d1147a2766cafa Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 1 Jul 2015 13:30:05 -0500 Subject: [PATCH 12/23] added throttles logins trait by default --- app/Http/Controllers/Auth/AuthController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index df32bfcc..c0ad3b8e 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers\Auth; use App\User; use Validator; use App\Http\Controllers\Controller; +use Illuminate\Foundation\Auth\ThrottlesLogins; use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers; class AuthController extends Controller @@ -20,7 +21,7 @@ class AuthController extends Controller | */ - use AuthenticatesAndRegistersUsers; + use AuthenticatesAndRegistersUsers, ThrottlesLogins; /** * Create a new authentication controller instance. From bd583fedd73d5c5f3cd6308439c48e9cbca47433 Mon Sep 17 00:00:00 2001 From: Antony Budianto Date: Thu, 2 Jul 2015 19:03:17 +0700 Subject: [PATCH 13/23] Add ThrottleLogin localization support add default language --- resources/lang/en/passwords.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php index 7c10cba1..ab433c11 100644 --- a/resources/lang/en/passwords.php +++ b/resources/lang/en/passwords.php @@ -18,5 +18,6 @@ return [ 'token' => 'This password reset token is invalid.', 'sent' => 'We have e-mailed your password reset link!', 'reset' => 'Your password has been reset!', + 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', ]; From ecd52ef1d2887f3fbd27ab20315a435f99a57e18 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Thu, 2 Jul 2015 14:20:33 -0500 Subject: [PATCH 14/23] fix order --- resources/lang/en/passwords.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php index ab433c11..ec2d9400 100644 --- a/resources/lang/en/passwords.php +++ b/resources/lang/en/passwords.php @@ -14,10 +14,10 @@ return [ */ 'password' => 'Passwords must be at least six characters and match the confirmation.', - 'user' => "We can't find a user with that e-mail address.", - 'token' => 'This password reset token is invalid.', - 'sent' => 'We have e-mailed your password reset link!', 'reset' => 'Your password has been reset!', + 'sent' => 'We have e-mailed your password reset link!', 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', + 'token' => 'This password reset token is invalid.', + 'user' => "We can't find a user with that e-mail address.", ]; From ef958716c37fcdf0ea80bb89ba0c93394ae0b157 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 3 Jul 2015 20:41:09 -0500 Subject: [PATCH 15/23] change language files --- resources/lang/en/auth.php | 19 +++++++++++++++++++ resources/lang/en/passwords.php | 1 - 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 resources/lang/en/auth.php diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php new file mode 100644 index 00000000..e5506df2 --- /dev/null +++ b/resources/lang/en/auth.php @@ -0,0 +1,19 @@ + 'These credentials do not match our records.', + 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', + +]; diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php index ec2d9400..e6f3a671 100644 --- a/resources/lang/en/passwords.php +++ b/resources/lang/en/passwords.php @@ -16,7 +16,6 @@ return [ 'password' => 'Passwords must be at least six characters and match the confirmation.', 'reset' => 'Your password has been reset!', 'sent' => 'We have e-mailed your password reset link!', - 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', 'token' => 'This password reset token is invalid.', 'user' => "We can't find a user with that e-mail address.", From 7bb132653587941cb5bf87a2cb17c408da30b9d4 Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 7 Jul 2015 14:47:02 -0500 Subject: [PATCH 16/23] type hint faker generator allow IDE to help with autocompletion --- database/factories/ModelFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php index ae7165b8..43fc1e90 100644 --- a/database/factories/ModelFactory.php +++ b/database/factories/ModelFactory.php @@ -11,7 +11,7 @@ | */ -$factory->define(App\User::class, function ($faker) { +$factory->define(App\User::class, function (\Faker\Generator $faker) { return [ 'name' => $faker->name, 'email' => $faker->email, From 037769e1aa908bc79d4d2aa58216971a51f1b3dd Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 7 Jul 2015 15:44:15 -0500 Subject: [PATCH 17/23] remove leading slash requested by project maintainer --- database/factories/ModelFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php index 43fc1e90..7b4bf9ff 100644 --- a/database/factories/ModelFactory.php +++ b/database/factories/ModelFactory.php @@ -11,7 +11,7 @@ | */ -$factory->define(App\User::class, function (\Faker\Generator $faker) { +$factory->define(App\User::class, function (Faker\Generator $faker) { return [ 'name' => $faker->name, 'email' => $faker->email, From 83ffbc65d198beb6068d3604842b7d5a45830b6d Mon Sep 17 00:00:00 2001 From: Duilio Palacios Date: Mon, 13 Jul 2015 16:05:37 +0000 Subject: [PATCH 18/23] Using the bcrypt function in users generated by the model factory --- database/factories/ModelFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php index 7b4bf9ff..0876c70c 100644 --- a/database/factories/ModelFactory.php +++ b/database/factories/ModelFactory.php @@ -15,7 +15,7 @@ $factory->define(App\User::class, function (Faker\Generator $faker) { return [ 'name' => $faker->name, 'email' => $faker->email, - 'password' => str_random(10), + 'password' => bcrypt(str_random(10)), 'remember_token' => str_random(10), ]; }); From fef3aa070940d3c997f5ed065a9d5c1b09923168 Mon Sep 17 00:00:00 2001 From: Jonathan Torres Date: Fri, 17 Jul 2015 23:27:24 +0000 Subject: [PATCH 19/23] Newline. --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 214b4621..8eb8f575 100644 --- a/.env.example +++ b/.env.example @@ -16,4 +16,4 @@ MAIL_HOST=mailtrap.io MAIL_PORT=2525 MAIL_USERNAME=null MAIL_PASSWORD=null -MAIL_ENCRYPTION=null \ No newline at end of file +MAIL_ENCRYPTION=null From 191c68766d592a1fd30928dfb4647cc1b023c36a Mon Sep 17 00:00:00 2001 From: Fumio Furukawa Date: Thu, 23 Jul 2015 15:34:28 +0900 Subject: [PATCH 20/23] Sorted by alphabetic. Sorted by alphabetic. --- resources/lang/en/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 20acc9a6..a48ac724 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -35,8 +35,8 @@ return [ 'digits' => 'The :attribute must be :digits digits.', 'digits_between' => 'The :attribute must be between :min and :max digits.', 'email' => 'The :attribute must be a valid email address.', - 'filled' => 'The :attribute field is required.', 'exists' => 'The selected :attribute is invalid.', + 'filled' => 'The :attribute field is required.', 'image' => 'The :attribute must be an image.', 'in' => 'The selected :attribute is invalid.', 'integer' => 'The :attribute must be an integer.', From 8061c2132c7bfd3bb2e8420c2155c2e08cec1f92 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Thu, 23 Jul 2015 10:58:15 -0500 Subject: [PATCH 21/23] Convert some variables to env variables in services.php. --- config/services.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/config/services.php b/config/services.php index 51abbbd1..93eec863 100644 --- a/config/services.php +++ b/config/services.php @@ -15,24 +15,24 @@ return [ */ 'mailgun' => [ - 'domain' => '', - 'secret' => '', + 'domain' => env('MAILGUN_DOMAIN'), + 'secret' => env('MAILGUN_SECRET'), ], 'mandrill' => [ - 'secret' => '', + 'secret' => env('MANDRILL_SECRET'), ], 'ses' => [ - 'key' => '', - 'secret' => '', + 'key' => env('SES_KEY'), + 'secret' => env('SES_SECRET'), 'region' => 'us-east-1', ], 'stripe' => [ 'model' => App\User::class, - 'key' => '', - 'secret' => '', + 'key' => env('STRIPE_KEY'), + 'secret' => env('STRIPE_SECRET'), ], ]; From 12386cf670f512ebd9781ad7252bc12e1109f2c7 Mon Sep 17 00:00:00 2001 From: Andrew Hood Date: Sat, 25 Jul 2015 12:57:52 -0700 Subject: [PATCH 22/23] Ignore Homestead.json --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7c8b031e..2ff24d0f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /vendor /node_modules Homestead.yaml +Homestead.json .env From 64e1cf9812e84761ccc3f2afa8f75ea1041e70f2 Mon Sep 17 00:00:00 2001 From: Laracasts Date: Mon, 27 Jul 2015 13:42:38 -0400 Subject: [PATCH 23/23] Bump Laravel Elixir version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b1b4a6e6..8b7c633c 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "gulp": "^3.8.8" }, "dependencies": { - "laravel-elixir": "^2.0.0", + "laravel-elixir": "^3.0.0", "bootstrap-sass": "^3.0.0" } }