From d09efa26d2b0ed4a2bc9a48df5439d213ad6c052 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Thu, 1 Sep 2016 09:01:57 -0500 Subject: [PATCH 01/30] remove irrelevant comment --- config/auth.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/auth.php b/config/auth.php index a57bdc77..78175010 100644 --- a/config/auth.php +++ b/config/auth.php @@ -81,10 +81,6 @@ | 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. From 537b6288fba5181bff6011facecbf05b6de0bbb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20Mu=CC=88ller?= Date: Thu, 1 Sep 2016 17:25:33 +0200 Subject: [PATCH 02/30] Add missing translation for `mimetypes` validation --- 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 28c6677f..fcbdf915 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -52,6 +52,7 @@ 'string' => 'The :attribute may not be greater than :max characters.', 'array' => 'The :attribute may not have more than :max items.', ], + 'mimetypes' => 'The :attribute must be a file of type: :values.', 'mimes' => 'The :attribute must be a file of type: :values.', 'min' => [ 'numeric' => 'The :attribute must be at least :min.', From 41b05603757a056e5312d174530253086667b628 Mon Sep 17 00:00:00 2001 From: Jason McCreary Date: Thu, 1 Sep 2016 21:22:34 -0400 Subject: [PATCH 03/30] Environment configuration for HTTPS only cookie --- config/session.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/session.php b/config/session.php index ace3ef0e..e2779ad8 100644 --- a/config/session.php +++ b/config/session.php @@ -161,7 +161,7 @@ | */ - 'secure' => false, + 'secure' => env('SESSION_SECURE_COOKIE', false), /* |-------------------------------------------------------------------------- From dd1e64a7a4cdcec6c846aed13330d6523d457b91 Mon Sep 17 00:00:00 2001 From: Fernando Henrique Bandeira Date: Fri, 2 Sep 2016 08:39:34 -0300 Subject: [PATCH 04/30] Changing 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 fcbdf915..3abb85f5 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -52,8 +52,8 @@ 'string' => 'The :attribute may not be greater than :max characters.', 'array' => 'The :attribute may not have more than :max items.', ], - 'mimetypes' => 'The :attribute must be a file of type: :values.', '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.', From 1562407562859a880f5f494647d5c52f8af8d44e Mon Sep 17 00:00:00 2001 From: Mohamed Said Date: Fri, 2 Sep 2016 15:41:18 +0200 Subject: [PATCH 05/30] add langiage line for uploaded 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 3abb85f5..4d53b961 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -81,6 +81,7 @@ '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 uploading failed.', 'url' => 'The :attribute format is invalid.', /* From 7da6edf8c14772f14ff11616199fb16bd19909ae Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 2 Sep 2016 08:48:07 -0500 Subject: [PATCH 06/30] working on message --- 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 4d53b961..73b49d08 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -81,7 +81,7 @@ '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 uploading failed.', + 'uploaded' => 'The :attribute failed to upload.', 'url' => 'The :attribute format is invalid.', /* From 78f4e85f74fb903d92fd46cbdb75fc57b6aad709 Mon Sep 17 00:00:00 2001 From: Bryce Adams Date: Mon, 5 Sep 2016 20:54:21 +1000 Subject: [PATCH 07/30] Map API routes before Web routes --- app/Providers/RouteServiceProvider.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 7e6b14f8..87ffb05a 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -35,10 +35,10 @@ public function boot() */ public function map() { - $this->mapWebRoutes(); - $this->mapApiRoutes(); + $this->mapWebRoutes(); + // } From 30d0e2dcca9f673e1d364123571902872d7e88ea Mon Sep 17 00:00:00 2001 From: Francisco Daniel Date: Tue, 6 Sep 2016 17:39:17 -0500 Subject: [PATCH 08/30] fix comments --- app/Http/Controllers/Auth/LoginController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 2abd9e04..cdaf8667 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -14,14 +14,14 @@ class LoginController extends Controller | | This controller handles authenticating users for the application and | redirecting them to your home screen. The controller uses a trait - | to conveniently provide its functionality to your applications. + | to conveniently provide its functionality to your application. | */ use AuthenticatesUsers; /** - * Where to redirect users after login / registration. + * Where to redirect users after login. * * @var string */ From 31fce5c503d872c5389ffbbae59310413f9f9966 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 6 Sep 2016 20:49:16 -0500 Subject: [PATCH 09/30] change wording --- app/Http/Controllers/Auth/LoginController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index cdaf8667..75949531 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -14,7 +14,7 @@ class LoginController extends Controller | | This controller handles authenticating users for the application and | redirecting them to your home screen. The controller uses a trait - | to conveniently provide its functionality to your application. + | to conveniently provide its functionality to your applications. | */ From d829d7553e6cb45e18c67e5e4bb7c8665debd753 Mon Sep 17 00:00:00 2001 From: Ramon Date: Wed, 14 Sep 2016 11:19:50 +0200 Subject: [PATCH 10/30] Rename variables.scss to _variables.scss We don't need variables.scss to be compiled into CSS, because it's being imported into app.scss (and get's compiled there). Added an underscore so the Sass compiler ignores this file, which is a common practice with Sass partials (see http://sass-lang.com/guide @ Partials). --- resources/assets/sass/{variables.scss => _variables.scss} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename resources/assets/sass/{variables.scss => _variables.scss} (100%) diff --git a/resources/assets/sass/variables.scss b/resources/assets/sass/_variables.scss similarity index 100% rename from resources/assets/sass/variables.scss rename to resources/assets/sass/_variables.scss From 49a48100a79c13da3de27e91b0a77742e7cb2227 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 14 Sep 2016 09:57:39 -0500 Subject: [PATCH 11/30] different default name --- config/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/app.php b/config/app.php index fb5ba390..082a35b8 100644 --- a/config/app.php +++ b/config/app.php @@ -12,7 +12,7 @@ | any other location as required by the application or its packages. */ - 'name' => 'My Application', + 'name' => 'Laravel', /* |-------------------------------------------------------------------------- From dcf971805df5e5cb86b03ced4240c5bbbe516164 Mon Sep 17 00:00:00 2001 From: Kai Rienow Date: Tue, 20 Sep 2016 08:23:40 +0200 Subject: [PATCH 12/30] Add unique modifier --- 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 59951643..e0dc8694 100644 --- a/database/factories/ModelFactory.php +++ b/database/factories/ModelFactory.php @@ -16,7 +16,7 @@ return [ 'name' => $faker->name, - 'email' => $faker->safeEmail, + 'email' => $faker->unique()->safeEmail, 'password' => $password ?: $password = bcrypt('secret'), 'remember_token' => str_random(10), ]; From a80e5bca0b36e2377b884772c560f7c871d0bf1f Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 20 Sep 2016 08:38:45 -0500 Subject: [PATCH 13/30] add bus alias --- config/app.php | 1 + 1 file changed, 1 insertion(+) diff --git a/config/app.php b/config/app.php index 082a35b8..717ee983 100644 --- a/config/app.php +++ b/config/app.php @@ -197,6 +197,7 @@ 'Artisan' => Illuminate\Support\Facades\Artisan::class, 'Auth' => Illuminate\Support\Facades\Auth::class, 'Blade' => Illuminate\Support\Facades\Blade::class, + 'Bus' => Illuminate\Support\Facades\Bus::class, 'Cache' => Illuminate\Support\Facades\Cache::class, 'Config' => Illuminate\Support\Facades\Config::class, 'Cookie' => Illuminate\Support\Facades\Cookie::class, From 76db1006cca54f0364b313bef604ac59c5f9b1f0 Mon Sep 17 00:00:00 2001 From: Wayne Harris Date: Thu, 22 Sep 2016 10:36:43 +0100 Subject: [PATCH 14/30] Update Vue Resource Propose updating Vue Resource. Will require changing the way the X-CSRF-TOKEN header in bootstrap.js This seems to be compatible with Larval Passport --- package.json | 2 +- resources/assets/js/bootstrap.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d490671c..4c6745cd 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,6 @@ "laravel-elixir-webpack-official": "^1.0.2", "lodash": "^4.14.0", "vue": "^1.0.26", - "vue-resource": "^0.9.3" + "vue-resource": "^1.0.2" } } diff --git a/resources/assets/js/bootstrap.js b/resources/assets/js/bootstrap.js index 3f4c5cf5..a2f3529f 100644 --- a/resources/assets/js/bootstrap.js +++ b/resources/assets/js/bootstrap.js @@ -26,7 +26,7 @@ require('vue-resource'); */ Vue.http.interceptors.push((request, next) => { - request.headers['X-CSRF-TOKEN'] = Laravel.csrfToken; + request.headers.set('X-CSRF-TOKEN', Laravel.csrfToken); next(); }); From 1117be09e7f38b20f9acf9430c589644b44c28ea Mon Sep 17 00:00:00 2001 From: Erik Telford Date: Sun, 2 Oct 2016 21:33:25 -0500 Subject: [PATCH 15/30] Use vue 2 and elixir-vue-2 --- gulpfile.js | 2 +- package.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 04d503d8..442dd3fd 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,6 +1,6 @@ const elixir = require('laravel-elixir'); -require('laravel-elixir-vue'); +require('laravel-elixir-vue-2'); /* |-------------------------------------------------------------------------- diff --git a/package.json b/package.json index 4c6745cd..e9993aa8 100644 --- a/package.json +++ b/package.json @@ -9,10 +9,10 @@ "gulp": "^3.9.1", "jquery": "^3.1.0", "laravel-elixir": "^6.0.0-9", - "laravel-elixir-vue": "^0.1.4", + "laravel-elixir-vue-2": "^0.2.0", "laravel-elixir-webpack-official": "^1.0.2", - "lodash": "^4.14.0", - "vue": "^1.0.26", - "vue-resource": "^1.0.2" + "lodash": "^4.16.2", + "vue": "^2.0.1", + "vue-resource": "^1.0.3" } } From 6f9a450f5c43dc9c05f0af25e187e537916729cc Mon Sep 17 00:00:00 2001 From: Erik Telford Date: Sun, 2 Oct 2016 21:33:42 -0500 Subject: [PATCH 16/30] Bind to #app instead of body --- resources/assets/js/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index 87dd5ad1..a8eb8e2d 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -16,5 +16,5 @@ require('./bootstrap'); Vue.component('example', require('./components/Example.vue')); const app = new Vue({ - el: 'body' + el: '#app' }); From e0573e67e00ce172ef895862d14a81cd0ca2cadf Mon Sep 17 00:00:00 2001 From: Erik Telford Date: Sun, 2 Oct 2016 21:33:52 -0500 Subject: [PATCH 17/30] Use mounted instead of ready --- resources/assets/js/components/Example.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/components/Example.vue b/resources/assets/js/components/Example.vue index 067ef661..86a0b70f 100644 --- a/resources/assets/js/components/Example.vue +++ b/resources/assets/js/components/Example.vue @@ -16,7 +16,7 @@