Commit Graph

4823 Commits

Author SHA1 Message Date
Taylor Otwell da662e40ec working on broadcasting 2016-04-29 22:40:08 -05:00
Taylor Otwell 749528db0c remove unneeded trait 2016-04-28 10:28:26 -05:00
Taylor Otwell e3d2b68c49 Merge branch 'master' into develop 2016-04-27 15:48:59 -05:00
Taylor Otwell 76b8ef7204 remove post install just in case it causes problems 2016-04-27 08:01:12 -05:00
Graham Campbell 020bf231ba Merge branch 'master' into develop 2016-04-27 14:00:46 +01:00
Taylor Otwell eee2a8b7c8 Merge pull request #3763 from vinkla/npm
Add npm scripts
2016-04-27 08:00:19 -05:00
Vincent Klaiber 909f063c28 Add npm scripts 2016-04-27 14:43:47 +02:00
Taylor Otwell d359343ca2 Merge pull request #3760 from tillkruss/patch-1
Switch to `.scss`
2016-04-24 20:16:16 -05:00
Till Krüss cf1c148778 Switch to `.scss` 2016-04-22 19:39:28 -07:00
Graham Campbell b2ca69f318 Merge pull request #3737 from laravel/tweak
Tweaked config
2016-04-05 11:15:13 +01:00
Graham Campbell ce25be19eb Tweaked config 2016-04-05 11:15:06 +01:00
Graham Campbell 9fa63f8ce8 Merge pull request #3733 from jcxm360/patch-1
Update Kernel.php
2016-04-01 22:06:45 +01:00
Juan Martinez 0d8e71cd92 Update Kernel.php 2016-04-01 16:00:36 -05:00
Graham Campbell 933e6c61eb Merge pull request #3730 from laravel/typo
Fixed typo
2016-04-01 20:44:55 +01:00
Graham Campbell 541e66789b Fixed typo 2016-04-01 20:27:17 +01:00
Taylor Otwell 5450b3180f Merge pull request #3725 from laravel/phpunit
Fixed up the phpunit config
2016-04-01 13:25:56 -05:00
Taylor Otwell 72581c0b98 Merge pull request #3723 from JosephSilber/authorize-middleware
Add support for the authorize middleware and AuthorizesRequests trait
2016-04-01 13:19:40 -05:00
Taylor Otwell 32318c385a Merge pull request #3726 from laravel/patch
Bump package versions
2016-03-30 18:50:41 -05:00
Jeffrey Way ae1f392309 Bump package versions 2016-03-30 16:17:01 -04:00
Graham Campbell 28ea52d10b Fixed up the phpunit config 2016-03-30 19:52:07 +01:00
Joseph Silber 39ba051a78 Add support for the authorize middleware and AuthorizesRequests trait 2016-03-30 11:58:14 -04:00
Graham Campbell 0909dc2572 Merge branch 'master' into develop 2016-03-30 13:11:35 +01:00
Taylor Otwell b1b524d78b Merge pull request #3718 from JosephSilber/default-auth-driver
Set the default driver from the Authenticate middleware
2016-03-28 09:08:55 -05:00
Joseph Silber f7d05cbbaa Set the default driver from the Authenticate middleware 2016-03-28 09:48:35 -04:00
Taylor Otwell 3fc105d3d4 Merge pull request #3699 from barryvdh/patch-1
[5.2] Use ComposerScripts
2016-03-25 14:29:48 -05:00
Taylor Otwell 8edf58030e Merge pull request #3709 from MadMikeyB/patch-1
Update .env.example
2016-03-25 07:59:03 -05:00
Michael Burton fb0f915d4b Update .env.example
add DB_CONNECTION as env variable - it is already checked for in config/database.php
2016-03-25 11:53:57 +00:00
Taylor Otwell cd0a902061 Merge pull request #3698 from dakira/master
[5.2] Allow for setting sqlite database via env
2016-03-24 10:06:01 -05:00
Taylor Otwell 1c43882c82 Merge pull request #3701 from laravel/analysis-87anp3
Applied fixes from StyleCI
2016-03-23 17:05:52 -05:00
Taylor Otwell 34d2509e84 Merge pull request #3702 from laravel/analysis-XZl3KP
Applied fixes from StyleCI
2016-03-23 17:05:30 -05:00
Taylor Otwell e316be4cec Applied fixes from StyleCI 2016-03-23 18:05:26 -04:00
Taylor Otwell a77fa359d9 Applied fixes from StyleCI 2016-03-23 18:05:18 -04:00
Taylor Otwell bcc54357bd add to comment 2016-03-23 17:05:17 -05:00
Taylor Otwell 5c30c98db9 just use web group by default 2016-03-23 17:04:42 -05:00
Barry vd. Heuvel 40e5e164a9 Use ComposerScripts
Use ComposerScripts to avoid loading any configuration/compiled files.
2016-03-23 15:27:01 +01:00
Taylor Otwell 1d5e88d0fb update default routes file 2016-03-22 13:49:35 -05:00
Matthias Niess eb7743f577 allow for setting sqlite database via env 2016-03-21 20:58:55 +01:00
Taylor Otwell 4f4d378d6a Merge pull request #3685 from JosephSilber/multi-auth
Allow passing multiple gaurds to the auth middleware
2016-03-21 09:57:14 -05:00
Taylor Otwell e52b1f71d5 fix wording 2016-03-21 09:13:22 -05:00
mzaalan 9d14fe2d7e Set HttpOnly flag 2016-03-21 14:12:38 +02:00
Taylor Otwell 80240e9b9e Merge pull request #3690 from kevinsimard/master
Ignore schedule files
2016-03-18 07:34:09 -05:00
Taylor Otwell a925d6c9fd Merge pull request #3692 from guilhermegonzaga/patch-1
Update of the doc for equals to Model
2016-03-18 07:33:46 -05:00
Guilherme de Oliveira Gonzaga 9234300833 Update of the doc for equals to Model 2016-03-17 17:18:53 -03:00
Joseph Silber 703197e27a Allow passing multiple gaurds to the auth middleware 2016-03-17 10:22:19 -07:00
Kevin Simard 4013369e28 Ignore schedule files 2016-03-17 09:59:23 -04:00
Taylor Otwell 91c6e71677 Merge pull request #3687 from barryvdh/patch-1
Remove pre-update-cmd
2016-03-16 12:21:40 -05:00
Barry vd. Heuvel 4fec844eb9 Remove pre-update-cmd
Can't rely on being able to run php artisan, before updating.
2016-03-16 08:37:44 +01:00
Taylor Otwell 8aa5af7372 Merge branch 'master' into develop 2016-03-06 19:56:49 -06:00
Taylor Otwell a282304f35 Merge remote-tracking branch 'origin/master' 2016-03-06 19:56:40 -06:00
Taylor Otwell d998b5bd03 formatting 2016-03-06 19:56:30 -06:00