Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,239 Commits 2 Branches 0 Tags 14 MiB
Commit Graph

6239 Commits

Author SHA1 Message Date
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
Dries Vints 83d2ecc0e9
Remove Stripe config settings 
These now ship with a dedicated config file for Cashier.
 2019-08-13 18:19:40 +02:00
Dries Vints 4852f48346 Remove deprecated language line (#5074) 2019-08-12 07:48:54 -05:00
Dries Vints a5111cf70f
Merge branch 'master' into develop 2019-08-12 11:56:28 +02:00
Dries Vints d5691a2e6d
Add missing trailing semicolon 2019-08-06 14:32:07 +02:00
Chuck Rincón fad6ef3d4b [6.0] - Add vapor link on the welcome view (#5072) 2019-08-02 15:54:12 -05:00
Taylor Otwell 8f2a27868f formatting 2019-07-30 16:40:52 -05:00
Taylor Otwell e21657dc5a Merge branch 'config_caching_v2' of https://github.com/timacdonald/laravel into timacdonald-config_caching_v2 2019-07-30 16:36:53 -05:00
Dries Vints 5391cccaad Update version constraint (#5066) 2019-07-29 11:22:12 -04:00
Dries Vints 0dd31baf2a
Merge branch 'master' into develop 2019-07-25 00:49:45 -04:00
Ryan Purcella f73795ac05 Update number of Laracasts videos (#5063) 2019-07-18 08:20:32 -05:00
Guilherme Pressutto ddbbd0e67b Using environment variable to set redis prefix (#5062) 
It was the only redis setting that wasn't overridable by an environment variable. It can help if you have multiple instances using the same `APP_NAME`, e.g. a staging instance
 2019-07-16 13:38:28 -06:00
Artem Pakhomov ff15a66d8c Fixed lodash version (CVE-2019-10744) (#5060) 2019-07-15 10:41:13 -06:00
Gergő D. Nagy 7c9e5ea412 [5.9] Add ThrottleRequests to the priority array (#5057) 
* add ThrottleRequests to the priority array

* Move ThrottleRequests under Authenticate middleware
 2019-07-12 07:59:55 -06:00
Miloš Gavrilović afb7cd7311 update deprecated pusher option (#5058) 2019-07-11 09:03:22 -06:00
Gary Green e71f50f664 Move TrustProxies to highest priority - fixes maintenance mode ip whitelist if behind proxy e.g. Cloudflare (#5055) 2019-07-10 09:11:28 -06:00
Tim MacDonald 8ca562265e
style fix 2019-07-09 13:05:55 +10:00
Tim MacDonald 56960ed2a0
introduce test bootstrapping 2019-07-09 11:54:50 +10:00
Taylor Otwell 78143a1ea0 Merge branch 'develop' of github.com:laravel/laravel into develop 2019-06-27 20:01:41 -05:00
Taylor Otwell fc39b073f3 remove ui scaffolding 2019-06-27 19:57:39 -05:00
Graham Campbell 386a4e5c92 Merge branch 'master' into develop 2019-06-21 14:24:52 +01:00
Sjors Ottjes ebc6f6e2c7 Update .gitignore (#5046) 2019-06-18 12:18:58 +02:00
Taylor Otwell 61a0829f43 Merge branch 'master' into develop 2019-06-04 08:10:42 -05:00