Commit Graph

6111 Commits

Author SHA1 Message Date
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
Dries Vints ccef55ba55
Merge branch 'master' into develop
# Conflicts:
#	CHANGELOG.md
2019-09-10 20:42:16 +02:00
Dries Vints 7d72850619
Update CHANGELOG.md 2019-09-10 20:41:25 +02:00
Dries Vints 1f48b2c5e8
Merge branch 'master' into develop 2019-09-10 17:27:12 +02:00
Dries Vints e656932002 Apply fixes from StyleCI (#5100) 2019-09-10 17:26:00 +02:00
Dries Vints 79fb6af96e
Order imports alphabetically 2019-09-10 17:25:19 +02:00
Patrick Heppler 74d84e9371 According to PHP Bug 78516 Argon2 requires at least 8KB (#5097)
https://bugs.php.net/bug.php?id=78516
Argon2 requires at least 8KB
On PHP 7.4 memory 1024 will throw:
password_hash(): Memory cost is outside of allowed memory range
2019-09-09 20:51:51 +02:00
Dries Vints 55b314eadb
Update CHANGELOG.md 2019-09-09 18:41:28 +02:00
Dries Vints 00c00b87be
Merge branch 'master' into develop 2019-09-09 18:40:26 +02:00
Dries Vints 4dbe9888a5
Update CHANGELOG.md 2019-09-09 18:39:25 +02:00
Dries Vints 9f2f3b1eee
Merge branch '5.8'
# Conflicts:
#	CHANGELOG.md
2019-09-09 18:29:25 +02:00
Dries Vints ca3f91e7ed
Update CHANGELOG.md 2019-09-09 18:29:02 +02:00
Dries Vints 8b96bf0128
Update CHANGELOG.md 2019-09-09 18:26:19 +02:00
Dries Vints cb5047c200
Merge branch 'master' into develop 2019-09-09 18:03:17 +02:00
Taylor Otwell 31394de4d7
Revert "Set argon defaults to prevent password_hash(): Memory cost is outside of allowed memory range on PHP 7.4 (#5094)" (#5095)
This reverts commit 86908e1eb4.
2019-09-07 02:18:51 +02:00
Taylor Otwell 4992230ca9 Merge branch 'patch-1' of https://github.com/SjorsO/laravel into SjorsO-patch-1 2019-09-06 13:43:32 -05:00
Patrick Heppler 86908e1eb4 Set argon defaults to prevent password_hash(): Memory cost is outside of allowed memory range on PHP 7.4 (#5094)
With the values 
````
'argon' => [
        'memory' => 1024,
        'threads' => 2,
        'time' => 2,
    ],
```
Hash::make() produces password_hash(): Memory cost is outside of allowed memory range on PHP 7.4
2019-09-06 14:16:32 +02:00
Dries Vints 2967197b8e
Merge branch 'master' into develop 2019-09-06 13:14:50 +02:00
Sjors Ottjes 42936c656c style 2019-09-06 08:17:43 +02:00
Sjors Ottjes 731cd4c499 add phpunit extension 2019-09-06 08:16:34 +02:00
Sjors Ottjes 360993c11e
Update bootstrap.php 2019-09-05 16:10:59 +02:00
Darren Craig 65959b25bf Allowing optional use of yml/yaml file extensions in .editorconfig (#5090) 2019-09-03 18:37:05 +02:00
Dries Vints af15fe5ec6
Revert "Bump PHPUnit"
This reverts commit 5fde1337d6.
2019-09-03 15:54:41 +02:00
Dries Vints 5fde1337d6
Bump PHPUnit 2019-09-03 15:54:00 +02:00
Dries Vints 054bb43038
Laravel 7 2019-09-03 15:53:35 +02:00
Taylor Otwell 13ab419d59 add ignition 2019-09-03 08:37:49 -05:00
Taylor Otwell 41ee35d01f add ignition 2019-09-03 08:37:29 -05:00
Taylor Otwell e6becd2ca3 add new failed driver option 2019-08-27 16:26:48 -05:00
Taylor Otwell 6ff5d6c7b8 Merge branch 'master' into develop 2019-08-23 11:59:05 -05:00
Dries Vints 665dfc4328 [6.0] Use phpredis as default Redis client (#5085)
* Use phpredis as default Redis client

Follow up for https://github.com/laravel/framework/pull/29688

It's best that we already start using `phpredis` as a default to discourage usage of Predis.

* Update database.php
2019-08-22 08:22:14 -05:00
Christopher Lass b67acda892 Rename 2019_08_19_175727_create_failed_jobs_table.php to 2019_08_19_000000_create_failed_jobs_table.php (#5082) 2019-08-21 08:14:32 -05:00
Jess Archer aa74fcb38f Remove manual adding of X-CSRF-TOKEN header (#5083)
This is unnessecery code because Axios already automatically adds
a X-XSRF-TOKEN header from the XSRF-TOKEN cookie encrypted value on
same-origin requests. The `VerifyCsrfToken` middleware and Passport's
`TokenGuard` already allow using the `X-XSRF-TOKEN` header.
2019-08-21 07:47:43 -05:00
Taylor Otwell b84bcc6446
Update readme.md 2019-08-20 15:04:04 -05:00
Taylor Otwell 41e915ae90
Update readme.md 2019-08-20 15:03:32 -05:00
Taylor Otwell b7d2b48b75 add failed jobs table 2019-08-19 12:57:41 -05:00
Taylor Otwell 051dea5941 formatting 2019-08-14 09:19:31 -05:00
Dries Vints c07809e224
Merge branch 'master' into develop
# Conflicts:
#	config/services.php
2019-08-14 13:49:52 +02:00
Taylor Otwell bb43372548 formatting 2019-08-13 15:05:56 -05:00