6281 Commits

Author SHA1 Message Date
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 v6.5.2 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 v6.4.0 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 v6.2.0 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 74d84e9371b2d2486edcc8f458adc9f22957d68b.
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 v6.0.2 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 v5.8.35 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 86908e1eb4a6cc8f5474b1355db4c104c548619e.
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