From 7634bc6ab74e218f18eb55ae89fc7babeb70a10f Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Mon, 12 Nov 2018 08:48:08 -0600 Subject: [PATCH 01/10] add sponsor --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index 98a3e643..736a2ad3 100644 --- a/readme.md +++ b/readme.md @@ -38,6 +38,7 @@ We would like to extend our thanks to the following sponsors for helping fund on - **[Cubet Techno Labs](https://cubettech.com)** - **[British Software Development](https://www.britishsoftware.co)** - **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)** +- **[DevSquad](https://devsquad.com)** - [UserInsights](https://userinsights.com) - [Fragrantica](https://www.fragrantica.com) - [SOFTonSOFA](https://softonsofa.com/) From 7003366e99ba6b7be80444f70d35abb915634a01 Mon Sep 17 00:00:00 2001 From: Aryeh Raber Date: Tue, 13 Nov 2018 16:28:28 +0100 Subject: [PATCH 02/10] Remove lodash dependency --- resources/js/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/js/app.js b/resources/js/app.js index 543dd59b..35f99bd3 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -22,7 +22,7 @@ Vue.component('example-component', require('./components/ExampleComponent.vue')) // const files = require.context('./', true, /\.vue$/i) // files.keys().map(key => { -// return Vue.component(_.last(key.split('/')).split('.')[0], files(key)) +// return Vue.component(key.split('/').pop().split('.')[0], files(key)) // }) /** From 52cedb64b14f7c6207c62cf6831e908bd2ca5129 Mon Sep 17 00:00:00 2001 From: Aryeh Raber Date: Tue, 13 Nov 2018 16:41:07 +0100 Subject: [PATCH 03/10] Clean up --- resources/js/app.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/resources/js/app.js b/resources/js/app.js index 35f99bd3..24b5dbf7 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -20,10 +20,7 @@ window.Vue = require('vue'); Vue.component('example-component', require('./components/ExampleComponent.vue')); // const files = require.context('./', true, /\.vue$/i) - -// files.keys().map(key => { -// return Vue.component(key.split('/').pop().split('.')[0], files(key)) -// }) +// files.keys().map(key => Vue.component(key.split('/').pop().split('.')[0], files(key))) /** * Next, we will create a fresh Vue application instance and attach it to From 63a403912362654962654e30cec695128d418987 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 14 Nov 2018 14:36:47 -0600 Subject: [PATCH 04/10] add asset url configuration option --- config/app.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/app.php b/config/app.php index 01081dca..57ee5b75 100644 --- a/config/app.php +++ b/config/app.php @@ -54,6 +54,8 @@ return [ 'url' => env('APP_URL', 'http://localhost'), + 'asset_url' => env('ASSET_URL', null), + /* |-------------------------------------------------------------------------- | Application Timezone From 822dcafe48fe7664393a0b868ec989b902c12804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Nikolaou?= Date: Thu, 15 Nov 2018 21:15:59 +0200 Subject: [PATCH 05/10] Add `log_channel` configuration option --- config/mail.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/config/mail.php b/config/mail.php index bb92224c..9af9e645 100644 --- a/config/mail.php +++ b/config/mail.php @@ -120,4 +120,17 @@ return [ ], ], + /* + |-------------------------------------------------------------------------- + | Log Channel + |-------------------------------------------------------------------------- + | + | If you are using the "log" driver, you may specify a different channel + | name if you prefer to keep e-mail messages separated from other log + | messages. Otherwise, Laravel will select the default log channel. + | + */ + + 'log_channel' => null, + ]; From 546720c04194fd276e685f919aaa36bf8d0254b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Nikolaou?= Date: Fri, 16 Nov 2018 13:47:37 +0200 Subject: [PATCH 06/10] Pick `log_channel` from environment variable --- config/mail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/mail.php b/config/mail.php index 9af9e645..32624d0e 100644 --- a/config/mail.php +++ b/config/mail.php @@ -131,6 +131,6 @@ return [ | */ - 'log_channel' => null, + 'log_channel' => env('MAIL_LOG_CHANNEL'), ]; From 7d16a052ab8456088669120f3558c76cdbe1863e Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Fri, 16 Nov 2018 12:30:41 +0000 Subject: [PATCH 07/10] Fixed comment alignment --- config/mail.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/mail.php b/config/mail.php index 32624d0e..91b01e85 100644 --- a/config/mail.php +++ b/config/mail.php @@ -126,8 +126,8 @@ return [ |-------------------------------------------------------------------------- | | If you are using the "log" driver, you may specify a different channel - | name if you prefer to keep e-mail messages separated from other log - | messages. Otherwise, Laravel will select the default log channel. + | name if you prefer to keep email messages separated from other log + | messages. Otherwise, Laravel will use the default log channel. | */ From b88d8fd18fcb953a7dd9749a51c4898823dd0062 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 16 Nov 2018 08:09:12 -0600 Subject: [PATCH 08/10] formatting --- config/mail.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/mail.php b/config/mail.php index 91b01e85..6f4affae 100644 --- a/config/mail.php +++ b/config/mail.php @@ -125,9 +125,9 @@ return [ | Log Channel |-------------------------------------------------------------------------- | - | If you are using the "log" driver, you may specify a different channel - | name if you prefer to keep email messages separated from other log - | messages. Otherwise, Laravel will use the default log channel. + | If you are using the "log" driver, you may specify the logging channel + | if you prefer to keep mail messages separate from other log entries + | for simpler reading. Otherwise, The default channel will be used. | */ From ed7b78de4603e6f16046ce2e4c3f31ac0d06ce67 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Fri, 16 Nov 2018 16:20:27 +0100 Subject: [PATCH 09/10] Typo --- config/mail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/mail.php b/config/mail.php index 6f4affae..f4006459 100644 --- a/config/mail.php +++ b/config/mail.php @@ -127,7 +127,7 @@ return [ | | If you are using the "log" driver, you may specify the logging channel | if you prefer to keep mail messages separate from other log entries - | for simpler reading. Otherwise, The default channel will be used. + | for simpler reading. Otherwise, the default channel will be used. | */ From 3128c2932f2fbca202a89dd0f54ccea13c360a24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sun, 18 Nov 2018 10:40:46 +0100 Subject: [PATCH 10/10] Enhancement: Normalize composer.json --- composer.json | 52 ++++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/composer.json b/composer.json index f587e089..b473a9b7 100644 --- a/composer.json +++ b/composer.json @@ -1,9 +1,12 @@ { "name": "laravel/laravel", - "description": "The Laravel Framework.", - "keywords": ["framework", "laravel"], - "license": "MIT", "type": "project", + "description": "The Laravel Framework.", + "keywords": [ + "framework", + "laravel" + ], + "license": "MIT", "require": { "php": "^7.1.3", "fideloper/proxy": "^4.0", @@ -18,43 +21,42 @@ "nunomaduro/collision": "^2.0", "phpunit/phpunit": "^7.0" }, + "config": { + "optimize-autoloader": true, + "preferred-install": "dist", + "sort-packages": true + }, + "extra": { + "laravel": { + "dont-discover": [] + } + }, "autoload": { + "psr-4": { + "App\\": "app/" + }, "classmap": [ "database/seeds", "database/factories" - ], - "psr-4": { - "App\\": "app/" - } + ] }, "autoload-dev": { "psr-4": { "Tests\\": "tests/" } }, - "extra": { - "laravel": { - "dont-discover": [ - ] - } - }, + "minimum-stability": "dev", + "prefer-stable": true, "scripts": { + "post-autoload-dump": [ + "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", + "@php artisan package:discover --ansi" + ], "post-root-package-install": [ "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" ], "post-create-project-cmd": [ "@php artisan key:generate --ansi" - ], - "post-autoload-dump": [ - "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", - "@php artisan package:discover --ansi" ] - }, - "config": { - "preferred-install": "dist", - "sort-packages": true, - "optimize-autoloader": true - }, - "minimum-stability": "dev", - "prefer-stable": true + } }