Commit Graph

6198 Commits

Author SHA1 Message Date
Taylor Otwell f589a7e897 Merge branch 'master' into develop 2019-12-18 12:24:10 -06:00
Taylor Otwell 99f183b5c7 Merge branch 'master' of github.com:laravel/laravel 2019-12-18 12:02:53 -06:00
Taylor Otwell 140d4d9b0a use class name to be consistent with web middleware 2019-12-18 12:02:46 -06:00
Anton Komarev b2734a9c31 Add MAIL_FROM_ADDRESS & MAIL_FROM_NAME to .env file (#5180) 2019-12-18 11:17:32 -06:00
Andrew Minion c5f9126981 default email from name to app name (#5178) 2019-12-18 09:41:11 -06:00
Michael Stokoe 17f0ff2205 Updated config/logging.php (#5179)
This adds a default emergency logger path to the logging config file.
This change goes hand-in-hand with my changes found here:
7a03776bc8
2019-12-18 09:38:03 -06:00
Dries Vints 89e83915e9
Merge pull request #5175 from canvural/patch-1
[6.x] Update redirectTo return type PHPDoc
2019-12-16 11:35:41 +01:00
Can Vural 40f93daa83
Update redirectTo return type PHPDoc 2019-12-14 11:48:14 +01:00
Taylor Otwell dd93aca597 Merge branch 'master' of github.com:laravel/laravel 2019-12-13 22:43:22 -06:00
Taylor Otwell f48e2d500c change some default settings 2019-12-13 22:42:46 -06:00
Bert Heyman 136085bfd8 Add "none" to supported same site options in session config (#5174) 2019-12-13 08:18:09 -06:00
Taylor Otwell 972f3cd283
DRY up path (#5173) 2019-12-10 08:59:27 -06:00
Dries Vints f4b1dc6df0 [6.x] Implement integration test and in-memory DB (#5169)
* Use in-memory DB for testing

* Extend from PHPUnit test case for unit tests
2019-12-06 09:46:02 -06:00
byjml 9b6643226d Consistent order (#5167)
Keep the alphabetical order of the validation messages.
2019-12-04 12:57:13 -06:00
Graham Campbell 5d50d30c94 Bumped versions 2019-11-27 15:26:11 +00:00
Graham Campbell fb3e88c313 Merge branch 'master' into develop 2019-11-27 15:21:41 +00:00
Graham Campbell b56fe84011 Use laravel/tinker v2 (#5161) 2019-11-26 12:46:10 -06:00
Nuno Maduro b7a5bc7f3c Bumps Collision dependency to v4.0 (#5160) 2019-11-25 14:46:55 -06:00
Graham Campbell 2913a55d87 [7.x] Switch to Symfony 5 (#5157)
* Update exception handler

* Explictly specify 'lax' same site config

* Use the null secure option for session cookies
2019-11-25 08:46:29 -06:00
Mark van den Broek 2f8e55a9ec Rename `encrypted` to `forceTLS`. (#5159) 2019-11-25 08:10:36 -06:00
Dries Vints c473b53626
Merge branch 'master' into develop
# Conflicts:
#	CHANGELOG.md
2019-11-21 18:29:26 +01:00
Dries Vints 1ee38a10f8
Update CHANGELOG.md 2019-11-21 18:28:39 +01:00
Dries Vints 3c92fb3a19
Merge branch 'master' into develop 2019-11-12 17:35:09 +01:00
Dries Vints c15a5ee0d2
Update readme 2019-11-12 17:34:53 +01:00
Dries Vints 21f2478481
Merge branch 'master' into develop 2019-11-12 16:06:22 +01:00
Dries Vints 94056af6e8
Rename readme 2019-11-12 16:06:05 +01:00
Dries Vints 5780189402
Consistent readme 2019-11-12 16:05:52 +01:00
Dries Vints 2e2be97c26 Implement new primary key syntax (#5147) 2019-11-01 08:53:14 -04:00
Graham Campbell b659069bce Merge branch 'master' into develop 2019-11-01 11:52:38 +00:00
Graham Campbell bfd4b1e92f Update .styleci.yml 2019-11-01 11:51:17 +00:00
Graham Campbell 89a80da132 Merge branch 'master' into develop 2019-11-01 11:12:48 +00:00
Taylor Otwell 953b488b8b fix key 2019-10-21 13:47:27 -05:00
Taylor Otwell ba2f2abe83 tweak formatting 2019-10-21 13:42:31 -05:00
Michael Chernyshev ace38c133f Security fix: Waiting before retrying password reset 2019-10-18 13:57:19 +03:00
Gert de Pagter 400df0b02b Add xml schema to phpunit (#5139)
This allows an IDE to do auto completion, and show any errors in the configuration
2019-10-16 08:18:19 -05:00
Taylor Otwell 9df12c3ca1 ignition doesn't support laravel 7 yet 2019-10-15 13:15:52 -05:00
Nuno Maduro bb969c61d4 Fixes required version of the framework within `composer.json` (#5130) 2019-10-08 15:44:05 -05:00
Dries Vints dfa5c1f06e
Merge branch 'master' into develop
# Conflicts:
#	CHANGELOG.md
2019-10-08 18:39:31 +02:00
Dries Vints 39c28801e8
Update CHANGELOG.md 2019-10-08 18:38:11 +02:00
Taylor Otwell 9bc23ee468 formatting 2019-10-08 07:35:48 -05:00
Taylor Otwell d1f7a5a886 formatting 2019-10-08 07:27:05 -05:00
Taylor Otwell bc82317a02 Merge branch 'password-confirmation' of https://github.com/driesvints/laravel into driesvints-password-confirmation 2019-10-08 07:24:50 -05:00
Dries Vints ba3aae6c33
Implement password confirmation 2019-10-08 13:45:40 +02:00
Dries Vints 4036f17416
Remove middleware from password reset
It's not necessary for the user to be logged out when resetting their password. This allows users to reset their password while logged in. Can be used in combination with the new RequiresPassword middleware.
2019-10-08 13:39:57 +02:00
Dries Vints 050c1d880e
Add new password rule language line 2019-10-08 11:26:03 +02:00
Sangrak Choi 51a1297a24 [6.x] Added OP.GG sponsor (#5121)
* Added OP.GG sponsor

* Update readme.md
2019-09-26 07:24:53 -05:00
Roger Vilà c70c986e58 [6.x] Add 'null' logging channel (#5106)
* Add 'none' logging channel

* Remove extra spaces

* Rename 'none' channel to 'null'

* Update logging.php
2019-09-13 14:47:34 -05:00
Tim MacDonald 42e864f3f5 remove testing bootstrap extension (#5107) 2019-09-13 07:19:06 -05:00
James Merrix cba8d19f86 Added Appoly sponsor (#5105) 2019-09-12 07:48:34 -05:00
Graham Campbell 56157b9cd2 Revert "According to PHP Bug 78516 Argon2 requires at least 8KB (#5097)" (#5102)
This reverts commit 74d84e9371.
2019-09-11 14:10:18 +02:00