Commit Graph

5883 Commits

Author SHA1 Message Date
Taylor Otwell 2330aa7504 Merge branch 'develop' of github.com:laravel/laravel into develop 2018-08-31 13:53:35 +02:00
Taylor Otwell 0d43633f9f add illustrations 2018-08-31 13:53:27 +02:00
Matt McDonald deef01d5a2 Define mix as const 2018-08-31 10:35:44 +01:00
Taylor Otwell c29266a0c0
Merge pull request #4736 from nunomaduro/patch-1
[5.7] Use semver caret operator for laravel-dump-server
2018-08-27 08:16:02 -05:00
Nuno Maduro 799a3ef8ec
Use semver caret operator for laravel-dump-server 2018-08-27 10:48:40 +02:00
Taylor Otwell 663f7c2c05
Merge pull request #4735 from vemcogroup/master
Extract 2 core configurations for sessions to environment
2018-08-25 20:11:29 -05:00
Danijel K b9ac4417ee
corrected bad copy paste 2018-08-25 18:45:33 +02:00
Danijel K 375b7c6a43
Extract core 2 session configurations to environment
In the spirit of JMac & LaravelShift I've extracted 2 session variables to the environment file. Not 'just because' but rather that one is able to set SESSION_DRIVER to redis, but unable to set a connection without touching the core session config file.
2018-08-25 18:44:30 +02:00
Taylor Otwell 53686dd018 Merge branch 'develop' of github.com:laravel/laravel into develop 2018-08-24 10:40:47 -05:00
Taylor Otwell dda50109be update composer 2018-08-24 10:40:40 -05:00
Taylor Otwell edc937c5e6 Merge branch 'develop' of github.com:laravel/laravel into develop 2018-08-22 14:13:33 -05:00
Taylor Otwell 0c62780402 fix conflicts 2018-08-22 14:13:25 -05:00
Taylor Otwell 289b145731 Merge branch 'master' of github.com:laravel/laravel 2018-08-22 14:12:47 -05:00
Taylor Otwell 4e6838a6cc add nova 2018-08-22 14:12:42 -05:00
Taylor Otwell b2d7facfbb
Merge pull request #4730 from ahinkle/ahinkle-patch-1
Upgrade Lodash (Security Vulnerability)
2018-08-15 16:04:03 -05:00
Andy Hinkle e2d44a5115
Upgrade Lodash because of Security Vulnerability 2018-08-15 09:23:50 -05:00
Taylor Otwell d6acad21cb Merge branch 'master' into develop 2018-08-14 14:35:49 -05:00
Taylor Otwell e124fc5f12
Merge pull request #4727 from Advaith3600/patch-1
Changed font to new one
2018-08-14 14:35:18 -05:00
Advaith 1d33fc07bf
Changed font to new one
Updated the font to Nuntio from Raleway
2018-08-14 18:32:21 +05:30
Taylor Otwell 0d5c1c81ff add sponsor 2018-08-13 08:43:48 -05:00
Taylor Otwell e9b72b4879 add sponsor 2018-08-13 08:31:18 -05:00
Taylor Otwell ff99e2fd5c add dump server 2018-08-11 16:20:19 -10:00
Taylor Otwell 90b6165a2a
Merge pull request #4725 from calebporzio/patch-1
Add .phpunit.result.cache to the .gitignore
2018-08-10 11:15:32 -10:00
Caleb Porzio 6b40d49efd
Add .phpunit.result.cache to the .gitignore
PHPUnit version 7.3 adds a new argument `--cache-result` which allows you to do awesome things like re-run test failures using a command like:

`phpunit --cache-result --order-by=defects --stop-on-defect`

The cache file is stored as `.phpunit.result.cache`

I believe PHPUnit 8 will have caching on by default, so this file will start popping up in everyone's project quickly.
2018-08-10 16:52:21 -04:00
Taylor Otwell 78573d6bf0 remove dump server until it is ready for 5.7 2018-08-05 08:14:56 -10:00
Taylor Otwell 28908d83d9 add supported type 2018-08-04 08:52:01 -10:00
Graham Campbell c641edfb02 Merge branch 'master' into develop 2018-08-01 23:09:07 +01:00
Taylor Otwell ff38d4e1a0 flatten resources more 2018-07-31 15:03:51 -05:00
Taylor Otwell 3e43e6b1d0
Merge pull request #4719 from Kramerican/master
Added Webdock.io link to readme
2018-07-31 07:49:35 -05:00
Kramerican 7ff1f264e3
Merge pull request #1 from Kramerican/Kramerican-patch-1
Added Webdock.io to sponsors list
2018-07-31 10:49:21 +02:00
Kramerican 56aa358d68
Added Webdock.io to sponsors list 2018-07-31 10:14:53 +02:00
Taylor Otwell 8512ad3181
Merge pull request #4716 from martin-heralecky/patch-1
Delete trailing whitespace in phpunit.xml
2018-07-27 11:28:48 -05:00
Martin Heralecký b23f77fa60
delete trailing whitespace in phpunit.xml 2018-07-26 23:30:57 +02:00
Taylor Otwell 4334f13e2e Merge branch 'master' into develop 2018-07-19 07:50:18 -05:00
Taylor Otwell 5da2d13b04 compile 2018-07-19 07:50:06 -05:00
Taylor Otwell f619d4f7c2 Merge branch 'develop' of github.com:laravel/laravel into develop 2018-07-19 07:48:59 -05:00
Taylor Otwell bf9836a785 Merge branch 'master' into develop 2018-07-19 07:48:44 -05:00
Taylor Otwell 6646ad7c52 update font and colors 2018-07-19 07:48:31 -05:00
Taylor Otwell fa81e36841
Merge pull request #4703 from thannaske/feature-maintenance-except-routes
[5.6] Adding boilerplate maintenance middleware with excepted URIs array
2018-07-12 10:00:50 -04:00
Tobias 6bd50e79a9 Adding boilerplate maintenance middleware with excepted URIs array 2018-07-12 01:13:44 +02:00
Taylor Otwell 736c5cadf4
Merge pull request #4700 from wuwx/patch-3
a-z order
2018-07-10 09:18:12 -04:00
wuweixin 5fc9adaa3f
a-z order 2018-07-10 14:20:22 +08:00
Taylor Otwell 1088837cf3
Merge pull request #4698 from mpociot/add_dump_server
Add beyondcode/laravel-dump-server as dev dependency
2018-07-09 16:32:01 -04:00
Marcel Pociot 62e6c34bdd Add beyondcode/laravel-dump-server as dev dependency 2018-07-09 21:07:46 +02:00
Taylor Otwell 5c38dee39e fix conflicts 2018-07-03 09:43:52 -05:00
Taylor Otwell b65c8245f7 formatting 2018-07-03 09:39:43 -05:00
Taylor Otwell d4e1b931dc
Merge pull request #4693 from laravel/analysis-8PAgMA
Apply fixes from StyleCI
2018-07-03 09:39:25 -05:00
Taylor Otwell 715c7e101f Apply fixes from StyleCI 2018-07-03 14:39:18 +00:00
Taylor Otwell 3d70f988f6
Merge pull request #4692 from barryvdh/patch-4
[5.7] Add addHttpCookie to VerifyCsrfToken
2018-07-03 09:39:03 -05:00
Barry vd. Heuvel 76af90b50c
Add addHttpCookie to VerifyCsrfToken 2018-07-03 16:37:01 +02:00