From 4369e9144ce1062941eda2b19772dbdcb10e9027 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 14 Mar 2018 12:40:35 -0500 Subject: [PATCH 01/32] add middleware --- app/Http/Kernel.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 74b1cbdd..3439540c 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -57,6 +57,7 @@ class Kernel extends HttpKernel 'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class, 'can' => \Illuminate\Auth\Middleware\Authorize::class, 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, + 'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, ]; } From 66f5757d58cb3f6d1152ec2d5f12e247eb2242e2 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 14 Mar 2018 14:17:27 -0500 Subject: [PATCH 02/32] add stderr example --- config/logging.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/config/logging.php b/config/logging.php index 902efafb..bf075861 100644 --- a/config/logging.php +++ b/config/logging.php @@ -1,5 +1,7 @@ 'critical', ], + 'stderr' => [ + 'driver' => 'monolog', + 'handler' => StreamHandler::class, + 'with' => [ + 'stream' => 'php://stderr', + ], + ], + 'syslog' => [ 'driver' => 'syslog', 'level' => 'debug', From 29a1739099a2011f5de2a60fccf1c4ac16f007cf Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 14 Mar 2018 14:19:07 -0500 Subject: [PATCH 03/32] add wording --- config/logging.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/logging.php b/config/logging.php index bf075861..400bc7f4 100644 --- a/config/logging.php +++ b/config/logging.php @@ -27,7 +27,8 @@ return [ | you a variety of powerful log handlers / formatters to utilize. | | Available Drivers: "single", "daily", "slack", "syslog", - | "errorlog", "custom", "stack" + | "errorlog", "monolog", + | "custom", "stack" | */ From 4f8a093dcc347e830023e3d1e5a8c9060120e573 Mon Sep 17 00:00:00 2001 From: Hugues Joyal Date: Sun, 18 Mar 2018 07:47:34 -0400 Subject: [PATCH 04/32] Add hashing configuration --- config/hashing.php | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/config/hashing.php b/config/hashing.php index f929cf0c..6156519b 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -17,4 +17,43 @@ return [ 'driver' => 'bcrypt', + /* + |-------------------------------------------------------------------------- + | bcrypt options + |-------------------------------------------------------------------------- + | + | We could define the number of rounds the bcrypt algo will be using. + | + | The two digit cost parameter is the base-2 logarithm of the iteration + | count for the underlying Blowfish-based hashing algorithmeter and must + | be in range 04-31, values outside this range will cause crypt() to fail + | + | Default: 10 + */ + 'bcrypt' => [ + 'rounds' => 10 + ], + + /* + |-------------------------------------------------------------------------- + | argon options + |-------------------------------------------------------------------------- + | + | These settings could be adjusted depending on your hardware. + | + | time: Maximum amount of time it may take to compute the Argon2 hash. + | (default: 2) + | + | memory: Maximum memory (in bytes) that may be used to compute the Argon2 hash + | (default : 1024) + | + | threads: Number of threads to use for computing the Argon2 hash + | (default : 2) + | + */ + 'argon' => [ + 'time' => 2, + 'memory' => 1024, + 'threads' => 2 + ] ]; From 010d7138984bbc77a10eb1bdb2206be6e3abd1d2 Mon Sep 17 00:00:00 2001 From: Hugues Joyal Date: Sun, 18 Mar 2018 07:50:27 -0400 Subject: [PATCH 05/32] style-ci fix --- config/hashing.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/hashing.php b/config/hashing.php index 6156519b..f31f4c2a 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -31,7 +31,7 @@ return [ | Default: 10 */ 'bcrypt' => [ - 'rounds' => 10 + 'rounds' => 10, ], /* @@ -54,6 +54,6 @@ return [ 'argon' => [ 'time' => 2, 'memory' => 1024, - 'threads' => 2 - ] + 'threads' => 2, + ], ]; From 18701f51eab923cf53f1e3dd2cf22b7aa5700109 Mon Sep 17 00:00:00 2001 From: Hugues Joyal Date: Sun, 18 Mar 2018 08:38:20 -0400 Subject: [PATCH 06/32] New line formating --- config/hashing.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/hashing.php b/config/hashing.php index f31f4c2a..6cf05673 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -30,6 +30,7 @@ return [ | | Default: 10 */ + 'bcrypt' => [ 'rounds' => 10, ], @@ -51,6 +52,7 @@ return [ | (default : 2) | */ + 'argon' => [ 'time' => 2, 'memory' => 1024, From af91d97b68d903fd08ac4cce26c0318c407185d2 Mon Sep 17 00:00:00 2001 From: Hugues Joyal Date: Sun, 18 Mar 2018 08:59:04 -0400 Subject: [PATCH 07/32] better comment formating --- config/hashing.php | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/config/hashing.php b/config/hashing.php index 6cf05673..d470eb40 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -24,11 +24,11 @@ return [ | | We could define the number of rounds the bcrypt algo will be using. | - | The two digit cost parameter is the base-2 logarithm of the iteration - | count for the underlying Blowfish-based hashing algorithmeter and must - | be in range 04-31, values outside this range will cause crypt() to fail - | - | Default: 10 + | rounds: The two digit cost parameter is the base-2 logarithm of the + | iteration count for the underlying Blowfish-based hashing + | algorithmeter and must be in range 04-31, values outside this + | range will cause crypt() to fail. + | (default: 10) */ 'bcrypt' => [ @@ -42,14 +42,15 @@ return [ | | These settings could be adjusted depending on your hardware. | - | time: Maximum amount of time it may take to compute the Argon2 hash. - | (default: 2) + | time: Maximum amount of time it may take to compute the Argon2 hash. + | (default: 2) | - | memory: Maximum memory (in bytes) that may be used to compute the Argon2 hash - | (default : 1024) + | memory: Maximum memory (in bytes) that may be used to compute the Argon2 + | hash. + | (default : 1024) | - | threads: Number of threads to use for computing the Argon2 hash - | (default : 2) + | threads: Number of threads to use for computing the Argon2 hash. + | (default : 2) | */ From 7259889fcd6284065a2f010f583c354f878bf9b8 Mon Sep 17 00:00:00 2001 From: Hugues Joyal Date: Mon, 19 Mar 2018 13:29:20 -0400 Subject: [PATCH 08/32] missing newline --- config/hashing.php | 1 + 1 file changed, 1 insertion(+) diff --git a/config/hashing.php b/config/hashing.php index d470eb40..8005524a 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -59,4 +59,5 @@ return [ 'memory' => 1024, 'threads' => 2, ], + ]; From d79e7ccb8b26d5ff77582f700fd83195b5e8184a Mon Sep 17 00:00:00 2001 From: Hugues Joyal Date: Mon, 19 Mar 2018 15:15:25 -0400 Subject: [PATCH 09/32] fix styling --- config/hashing.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/hashing.php b/config/hashing.php index 8005524a..581b2acc 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -45,8 +45,8 @@ return [ | time: Maximum amount of time it may take to compute the Argon2 hash. | (default: 2) | - | memory: Maximum memory (in bytes) that may be used to compute the Argon2 - | hash. + | memory: Maximum memory (in bytes) that may be used to compute the + | Argon2 hash. | (default : 1024) | | threads: Number of threads to use for computing the Argon2 hash. From f33dc10bed088b40672ad2960fa11ac258bfaad6 Mon Sep 17 00:00:00 2001 From: Hugues Joyal Date: Mon, 19 Mar 2018 15:26:46 -0400 Subject: [PATCH 10/32] gammar --- config/hashing.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/hashing.php b/config/hashing.php index 581b2acc..92ade748 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -22,7 +22,7 @@ return [ | bcrypt options |-------------------------------------------------------------------------- | - | We could define the number of rounds the bcrypt algo will be using. + | Here you can define the number of rounds the bcrypt algo will be using. | | rounds: The two digit cost parameter is the base-2 logarithm of the | iteration count for the underlying Blowfish-based hashing @@ -40,7 +40,7 @@ return [ | argon options |-------------------------------------------------------------------------- | - | These settings could be adjusted depending on your hardware. + | These settings can be adjusted depending on your hardware. | | time: Maximum amount of time it may take to compute the Argon2 hash. | (default: 2) From 657b25a6cbbb93f99df970572b1f630a663ea542 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 21 Mar 2018 16:29:49 -0700 Subject: [PATCH 11/32] update comment --- 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 e119db62..91cb6d1c 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -5,7 +5,7 @@ use Illuminate\Database\Seeder; class DatabaseSeeder extends Seeder { /** - * Run the database seeds. + * Seed the application's database. * * @return void */ From b51c038ff2162f95588bc47e5897349adf99157b Mon Sep 17 00:00:00 2001 From: refael iliaguyev Date: Thu, 22 Mar 2018 18:45:03 +0200 Subject: [PATCH 12/32] Simplify the npm watch command --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3de8d8d1..e81ab87f 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "scripts": { "dev": "npm run development", "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch": "npm run development -- --watch", "watch-poll": "npm run watch -- --watch-poll", "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", "prod": "npm run production", From 283413b2563de7ffdc720e5622d1d8daa0052cca Mon Sep 17 00:00:00 2001 From: Andrew Date: Sat, 24 Mar 2018 03:12:17 -0500 Subject: [PATCH 13/32] update handler remove comment suggesting to send reports to bug trackers in this method --- app/Exceptions/Handler.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 7e2563a8..043cad6b 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -29,8 +29,6 @@ class Handler extends ExceptionHandler /** * Report or log an exception. * - * This is a great spot to send exceptions to Sentry, Bugsnag, etc. - * * @param \Exception $exception * @return void */ From 50ffc7d9fd223bd8b66e36c785395f6268ba0c4a Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sat, 24 Mar 2018 14:25:38 -0700 Subject: [PATCH 14/32] formatting --- config/hashing.php | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/config/hashing.php b/config/hashing.php index 92ade748..f3332ede 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -19,16 +19,13 @@ return [ /* |-------------------------------------------------------------------------- - | bcrypt options + | Bcrypt Options |-------------------------------------------------------------------------- | - | Here you can define the number of rounds the bcrypt algo will be using. + | Here you may specify the configuration options that should be used when + | passwords are hashed using the Bcrypt algorithm. This will allow you + | to control the amount of time it takes to hash the given password. | - | rounds: The two digit cost parameter is the base-2 logarithm of the - | iteration count for the underlying Blowfish-based hashing - | algorithmeter and must be in range 04-31, values outside this - | range will cause crypt() to fail. - | (default: 10) */ 'bcrypt' => [ @@ -37,27 +34,19 @@ return [ /* |-------------------------------------------------------------------------- - | argon options + | Argon Options |-------------------------------------------------------------------------- | - | These settings can be adjusted depending on your hardware. - | - | time: Maximum amount of time it may take to compute the Argon2 hash. - | (default: 2) - | - | memory: Maximum memory (in bytes) that may be used to compute the - | Argon2 hash. - | (default : 1024) - | - | threads: Number of threads to use for computing the Argon2 hash. - | (default : 2) + | Here you may specify the configuration options that should be used when + | passwords are hashed using the Argon algorithm. These will allow you + | to control the amount of time it takes to hash the given password. | */ 'argon' => [ - 'time' => 2, 'memory' => 1024, 'threads' => 2, + 'time' => 2, ], ]; From 67795c0e05aed20be3fe4b33899cb8b8effca2ce Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 28 Mar 2018 17:10:11 +0300 Subject: [PATCH 15/32] Added Invoice Ninja to the readme --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index 5e90f480..084b30e5 100644 --- a/readme.md +++ b/readme.md @@ -45,6 +45,7 @@ We would like to extend our thanks to the following sponsors for helping fund on - [Pulse Storm](http://www.pulsestorm.net/) - [Runtime Converter](http://runtimeconverter.com/) - [WebL'Agence](https://weblagence.com/) +- [Invoice Ninja](https://www.invoiceninja.com) ## Contributing From bebd3e4b35c8f867ece64cb2db279cbd1b4ee3ec Mon Sep 17 00:00:00 2001 From: Cubet Techno Labs Pvt LTD Date: Wed, 4 Apr 2018 17:54:12 +0530 Subject: [PATCH 16/32] Added Cubet as a Sponsor Cubet is an official sponsor of Laravel- https://laravel.com/partners Added an entry to list Cubet under Laravel Sponsors. --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index 084b30e5..9556f636 100644 --- a/readme.md +++ b/readme.md @@ -34,6 +34,7 @@ We would like to extend our thanks to the following sponsors for helping fund on - **[Vehikl](https://vehikl.com/)** - **[Tighten Co.](https://tighten.co)** - **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)** +- **[Cubet Techno Labs](https://cubettech.com)** - **[British Software Development](https://www.britishsoftware.co)** - [Fragrantica](https://www.fragrantica.com) - [SOFTonSOFA](https://softonsofa.com/) From 20b9daa8f365639607a4578f2bfda276253067cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Fri, 6 Apr 2018 20:13:20 +0200 Subject: [PATCH 17/32] Request::HEADER_X_FORWARDED_ALL is an integer it is int(30) --- app/Http/Middleware/TrustProxies.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index 3ce02144..02bd9e6b 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -17,7 +17,7 @@ class TrustProxies extends Middleware /** * The headers that should be used to detect proxies. * - * @var string + * @var integer */ protected $headers = Request::HEADER_X_FORWARDED_ALL; } From 2683de70828e6c4dcf8613a60fc7304ff90e6acc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Fri, 6 Apr 2018 20:15:18 +0200 Subject: [PATCH 18/32] Request::HEADER_X_FORWARDED_ALL is an int =30 --- app/Http/Middleware/TrustProxies.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index 02bd9e6b..7daf51f1 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -17,7 +17,7 @@ class TrustProxies extends Middleware /** * The headers that should be used to detect proxies. * - * @var integer + * @var int */ protected $headers = Request::HEADER_X_FORWARDED_ALL; } From d75a0f3bafe9e4b56f24ea52d43c0d68d877c1dd Mon Sep 17 00:00:00 2001 From: Gareth Thompson Date: Mon, 9 Apr 2018 12:35:17 +0100 Subject: [PATCH 19/32] Add SES_REGION to local environment file The region used by SES was hardcoded into the config file, when all other values were set as environment variables. Tweaked to keep the region consistent with other config options --- config/services.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/services.php b/config/services.php index 4460f0ec..1e28ff5e 100644 --- a/config/services.php +++ b/config/services.php @@ -22,7 +22,7 @@ return [ 'ses' => [ 'key' => env('SES_KEY'), 'secret' => env('SES_SECRET'), - 'region' => 'us-east-1', + 'region' => env('SES_REGION','us-east-1'), ], 'sparkpost' => [ From 13990ebbd0d0e9db9f89e5894c5703974a2d0722 Mon Sep 17 00:00:00 2001 From: Gareth Thompson Date: Mon, 9 Apr 2018 12:42:18 +0100 Subject: [PATCH 20/32] Formatting fix --- config/services.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/services.php b/config/services.php index 1e28ff5e..aa1f7f82 100644 --- a/config/services.php +++ b/config/services.php @@ -22,7 +22,7 @@ return [ 'ses' => [ 'key' => env('SES_KEY'), 'secret' => env('SES_SECRET'), - 'region' => env('SES_REGION','us-east-1'), + 'region' => env('SES_REGION', 'us-east-1'), ], 'sparkpost' => [ From 8e878b2d46e6c646fa060155ae41e7c40a6054d7 Mon Sep 17 00:00:00 2001 From: Alan Storm Date: Tue, 10 Apr 2018 11:36:17 -0700 Subject: [PATCH 21/32] Removing Link --- readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/readme.md b/readme.md index 9556f636..8594271b 100644 --- a/readme.md +++ b/readme.md @@ -43,7 +43,6 @@ We would like to extend our thanks to the following sponsors for helping fund on - [CodeBrisk](https://codebrisk.com) - [1Forge](https://1forge.com) - [TECPRESSO](https://tecpresso.co.jp/) -- [Pulse Storm](http://www.pulsestorm.net/) - [Runtime Converter](http://runtimeconverter.com/) - [WebL'Agence](https://weblagence.com/) - [Invoice Ninja](https://www.invoiceninja.com) From dc320c894253a4c18541bf27447e0066b16c825d Mon Sep 17 00:00:00 2001 From: Roberto Aguilar Date: Wed, 18 Apr 2018 10:09:32 -0500 Subject: [PATCH 22/32] Set bcrypt rounds using the hashing config --- config/hashing.php | 2 +- phpunit.xml | 1 + tests/CreatesApplication.php | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/config/hashing.php b/config/hashing.php index f3332ede..d3c8e2fb 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -29,7 +29,7 @@ return [ */ 'bcrypt' => [ - 'rounds' => 10, + 'rounds' => env('BCRYPT_ROUNDS', 10), ], /* diff --git a/phpunit.xml b/phpunit.xml index 9ee3e734..c9e326b6 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -24,6 +24,7 @@ + diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php index ff133fb4..547152f6 100644 --- a/tests/CreatesApplication.php +++ b/tests/CreatesApplication.php @@ -2,7 +2,6 @@ namespace Tests; -use Illuminate\Support\Facades\Hash; use Illuminate\Contracts\Console\Kernel; trait CreatesApplication @@ -18,8 +17,6 @@ trait CreatesApplication $app->make(Kernel::class)->bootstrap(); - Hash::driver('bcrypt')->setRounds(4); - return $app; } } From 51507a6d8aef31fadac8125663f83f3302405a72 Mon Sep 17 00:00:00 2001 From: Alymosul Date: Sun, 6 May 2018 17:54:33 +0300 Subject: [PATCH 23/32] Add language lines for the newly added comparison validation rules. --- resources/lang/en/validation.php | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 77d23022..78ee4ee7 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -42,6 +42,30 @@ return [ 'exists' => 'The selected :attribute is invalid.', 'file' => 'The :attribute must be a file.', 'filled' => 'The :attribute field must have a value.', + 'gt' => [ + 'numeric' => 'The :attribute must be greater than :value.', + 'file' => 'The :attribute must be greater than :value kilobytes.', + 'string' => 'The :attribute must be greater than :value characters.', + 'array' => 'The :attribute must have more than :value items.', + ], + 'lt' => [ + 'numeric' => 'The :attribute must be less than :value.', + 'file' => 'The :attribute must be less than :value kilobytes.', + 'string' => 'The :attribute must be less than :value characters.', + 'array' => 'The :attribute must have less than :value items.', + ], + 'gte' => [ + 'numeric' => 'The :attribute must be greater than or equal :value.', + 'file' => 'The :attribute must be greater than or equal :value kilobytes.', + 'string' => 'The :attribute must be greater than or equal :value characters.', + 'array' => 'The :attribute must have :value items or more.', + ], + 'lte' => [ + 'numeric' => 'The :attribute must be less than or equal :value.', + 'file' => 'The :attribute must be less than or equal :value kilobytes.', + 'string' => 'The :attribute must be less than or equal :value characters.', + 'array' => 'The :attribute must not have more than :value items.', + ], 'image' => 'The :attribute must be an image.', 'in' => 'The selected :attribute is invalid.', 'in_array' => 'The :attribute field does not exist in :other.', From 7d8e91ab66d0e8cba4e24394f6340109fbce024e Mon Sep 17 00:00:00 2001 From: Fred Delrieu Date: Tue, 8 May 2018 15:58:10 +0200 Subject: [PATCH 24/32] fix: alphabetical order --- resources/lang/en/validation.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 78ee4ee7..0d47547a 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -48,24 +48,12 @@ return [ 'string' => 'The :attribute must be greater than :value characters.', 'array' => 'The :attribute must have more than :value items.', ], - 'lt' => [ - 'numeric' => 'The :attribute must be less than :value.', - 'file' => 'The :attribute must be less than :value kilobytes.', - 'string' => 'The :attribute must be less than :value characters.', - 'array' => 'The :attribute must have less than :value items.', - ], 'gte' => [ 'numeric' => 'The :attribute must be greater than or equal :value.', 'file' => 'The :attribute must be greater than or equal :value kilobytes.', 'string' => 'The :attribute must be greater than or equal :value characters.', 'array' => 'The :attribute must have :value items or more.', ], - 'lte' => [ - 'numeric' => 'The :attribute must be less than or equal :value.', - 'file' => 'The :attribute must be less than or equal :value kilobytes.', - 'string' => 'The :attribute must be less than or equal :value characters.', - 'array' => 'The :attribute must not have more than :value items.', - ], 'image' => 'The :attribute must be an image.', 'in' => 'The selected :attribute is invalid.', 'in_array' => 'The :attribute field does not exist in :other.', @@ -74,6 +62,18 @@ return [ 'ipv4' => 'The :attribute must be a valid IPv4 address.', 'ipv6' => 'The :attribute must be a valid IPv6 address.', 'json' => 'The :attribute must be a valid JSON string.', + 'lt' => [ + 'numeric' => 'The :attribute must be less than :value.', + 'file' => 'The :attribute must be less than :value kilobytes.', + 'string' => 'The :attribute must be less than :value characters.', + 'array' => 'The :attribute must have less than :value items.', + ], + 'lte' => [ + 'numeric' => 'The :attribute must be less than or equal :value.', + 'file' => 'The :attribute must be less than or equal :value kilobytes.', + 'string' => 'The :attribute must be less than or equal :value characters.', + 'array' => 'The :attribute must not have more than :value items.', + ], 'max' => [ 'numeric' => 'The :attribute may not be greater than :max.', 'file' => 'The :attribute may not be greater than :max kilobytes.', From 83dc9471117097388b614bf13f686d216342b039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Till=20Kru=CC=88ss?= Date: Tue, 8 May 2018 08:39:47 -0700 Subject: [PATCH 25/32] add release notes for v5.6.7 and v5.6.12 --- CHANGELOG.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f989f14..d656e03c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,29 @@ # Release Notes +## v5.6.12 (2018-03-14) + +### Added +- Added message for `not_regex` validation rule ([#4602](https://github.com/laravel/laravel/pull/4602)) +- Added `signed` middleware alias for `ValidateSignature` ([4369e91](https://github.com/laravel/laravel/commit/4369e9144ce1062941eda2b19772dbdcb10e9027)) +- Added `stderr` example to `config/logging.php` ([66f5757](https://github.com/laravel/laravel/commit/66f5757d58cb3f6d1152ec2d5f12e247eb2242e2)) + +### Changed +- Set `MAIL_DRIVER` in `phpunit.xml` ([#4607](https://github.com/laravel/laravel/pull/4607)) + +### Removed +- Removed "thanks" package ([#4593](https://github.com/laravel/laravel/pull/4593)) + + +## v5.6.7 (2018-02-27) + +### Changed +- Use `Hash::make()` in `RegisterController` ([#4570](https://github.com/laravel/laravel/pull/4570)) +- Update Collision to `2.0` ([#4581](https://github.com/laravel/laravel/pull/4581)) + +### Removed +- Removed Bootstrap 3 variables ([#4572](https://github.com/laravel/laravel/pull/4572)) + + ## v5.6.0 (2018-02-07) ### Added From 3c338b6afdf271c20e941e8374c3cfa8ff867461 Mon Sep 17 00:00:00 2001 From: Roberto Aguilar Date: Thu, 10 May 2018 10:34:22 -0500 Subject: [PATCH 26/32] Add .editorconfig file --- .editorconfig | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..1492202b --- /dev/null +++ b/.editorconfig @@ -0,0 +1,16 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +indent_style = space +indent_size = 4 +trim_trailing_whitespace = true + +[*.md] +trim_trailing_whitespace = false + +[*.yml] +indent_style = space +indent_size = 2 From 7ff917aa203b2f0869761c99283d18b6a2eb6cf8 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Fri, 18 May 2018 14:52:24 +0200 Subject: [PATCH 27/32] Fix alpha_dash It also accepts underscores as valid signs as explicitly stated in the docs and source code so I believe it would be best to also add it to the validation 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 0d47547a..b163c424 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -18,7 +18,7 @@ return [ 'after' => 'The :attribute must be a date after :date.', 'after_or_equal' => 'The :attribute must be a date after or equal to :date.', 'alpha' => 'The :attribute may only contain letters.', - 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.', + 'alpha_dash' => 'The :attribute may only contain letters, numbers, dashes and underscores.', 'alpha_num' => 'The :attribute may only contain letters and numbers.', 'array' => 'The :attribute must be an array.', 'before' => 'The :attribute must be a date before :date.', From 4fe0d4c13a6057706f99a149297e71f302b34284 Mon Sep 17 00:00:00 2001 From: Alexander Menk Date: Fri, 1 Jun 2018 14:44:00 +0200 Subject: [PATCH 28/32] Add iMi digital new Patreon Sponsor to readme --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index 8594271b..81722a33 100644 --- a/readme.md +++ b/readme.md @@ -46,6 +46,7 @@ We would like to extend our thanks to the following sponsors for helping fund on - [Runtime Converter](http://runtimeconverter.com/) - [WebL'Agence](https://weblagence.com/) - [Invoice Ninja](https://www.invoiceninja.com) +- [iMi digital](https://www.imi-digital.de/) ## Contributing From 769dc6b96bf08d417182f78a790de457af9f5e60 Mon Sep 17 00:00:00 2001 From: Benedikt Franke Date: Mon, 18 Jun 2018 09:27:59 +0200 Subject: [PATCH 29/32] Switch execution order of testsuites, unit tests first Unit tests usually run faster and provide more fine-granular feedback if something is broken. If some small part of the application is broken, it may easily cause all the feature tests to fail, while not providing useful feedback. --- phpunit.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phpunit.xml b/phpunit.xml index c9e326b6..4942aa2a 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -9,13 +9,13 @@ processIsolation="false" stopOnFailure="false"> - - ./tests/Feature - - ./tests/Unit + + + ./tests/Feature + From c6d7d83ba3c81b31d663ae2917be4c81cc905b8b Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 29 Jun 2018 14:45:06 -0500 Subject: [PATCH 30/32] add sponsor --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index 81722a33..9c8c703a 100644 --- a/readme.md +++ b/readme.md @@ -36,6 +36,7 @@ We would like to extend our thanks to the following sponsors for helping fund on - **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)** - **[Cubet Techno Labs](https://cubettech.com)** - **[British Software Development](https://www.britishsoftware.co)** +- [UserInsights](https://userinsights.com) - [Fragrantica](https://www.fragrantica.com) - [SOFTonSOFA](https://softonsofa.com/) - [User10](https://user10.com) From 6bd50e79a90a16bc46458717049eb10060c5b2fe Mon Sep 17 00:00:00 2001 From: Tobias Date: Thu, 12 Jul 2018 01:13:44 +0200 Subject: [PATCH 31/32] Adding boilerplate maintenance middleware with excepted URIs array --- app/Http/Kernel.php | 2 +- app/Http/Middleware/CheckForMaintenanceMode.php | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 app/Http/Middleware/CheckForMaintenanceMode.php diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 3439540c..fb9616a3 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -14,7 +14,7 @@ class Kernel extends HttpKernel * @var array */ protected $middleware = [ - \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class, + \App\Http\Middleware\CheckForMaintenanceMode::class, \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, \App\Http\Middleware\TrimStrings::class, \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, diff --git a/app/Http/Middleware/CheckForMaintenanceMode.php b/app/Http/Middleware/CheckForMaintenanceMode.php new file mode 100644 index 00000000..35b9824b --- /dev/null +++ b/app/Http/Middleware/CheckForMaintenanceMode.php @@ -0,0 +1,17 @@ + Date: Thu, 19 Jul 2018 07:48:31 -0500 Subject: [PATCH 32/32] update font and colors --- resources/assets/sass/_variables.scss | 16 ++++++++++++++-- resources/assets/sass/app.scss | 4 ++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/resources/assets/sass/_variables.scss b/resources/assets/sass/_variables.scss index 70ecfdb3..6799fc45 100644 --- a/resources/assets/sass/_variables.scss +++ b/resources/assets/sass/_variables.scss @@ -1,8 +1,20 @@ // Body -$body-bg: #f5f8fa; +$body-bg: #f8fafc; // Typography -$font-family-sans-serif: "Raleway", sans-serif; +$font-family-sans-serif: "Nunito", sans-serif; $font-size-base: 0.9rem; $line-height-base: 1.6; + +// Colors +$blue: #3490dc; +$indigo: #6574cd; +$purple: #9561e2; +$pink: #f66D9b; +$red: #e3342f; +$orange: #f6993f; +$yellow: #ffed4a; +$green: #38c172; +$teal: #4dc0b5; +$cyan: #6cb2eb; diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index 0077cb14..f42e7986 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -1,9 +1,9 @@ // Fonts -@import url("https://fonts.googleapis.com/css?family=Raleway:300,400,600"); +@import url('https://fonts.googleapis.com/css?family=Nunito'); // Variables -@import "variables"; +@import 'variables'; // Bootstrap @import '~bootstrap/scss/bootstrap';