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

5090 Commits

Author SHA1 Message Date
Taylor Otwell 26ef471305 Merge branch 'feature/session-store-config' of https://github.com/tomcastleman/laravel into tomcastleman-feature/session-store-config 2016-05-04 09:30:29 -05:00
Taylor Otwell 81aea74578 Merge branch 'master' into develop 2016-05-04 09:30:19 -05:00
Tom Castleman d68d4dc9cd adds configuration for session cache store 2016-05-02 17:27:52 +01:00
Taylor Otwell f8cddc0000 Merge pull request #3770 from tillkruss/patch-2 
Use Bootstrap 3.3
 2016-05-01 22:13:00 -05:00
Till Krüss 382857a8a7 Use Bootstrap 3.3 
Unless there is a reason why not?
 2016-05-01 16:23:09 -07:00
Taylor Otwell b358fe473d spacing 2016-05-01 10:07:37 -05:00
Taylor Otwell 3173f1c072 Merge pull request #3768 from tomcastleman/patch-1 
[5.3] Add config for new Memcached features
 2016-05-01 10:06:47 -05:00
Tom Castleman 9dc2d60336 Add config for new Memcached features 
Adds config for persistent connections, SASL authentication, and custom options
 2016-04-30 14:11:55 +01:00
Sadika Sumanapala 336d80c1f1 Get guest middleware using guestMiddleware() method 
guestMiddleware() defined on ResetsPasswords trait

This change is required to fix issue #13383

Depends on pull request laravel/framework#13384
 2016-04-30 12:39:22 +05:30
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 2c834ad59c Respect PSR-2 2016-04-15 22:49:14 +01:00
Taylor Otwell 70f8bb6e08 Merge pull request #3738 from laravel/backport 
[5.1] Backport various changes
 2016-04-05 09:06:24 -05:00
Graham Campbell a6e0a2d190 Backport the composer script fixes 2016-04-05 11:23:29 +01:00
Graham Campbell 2dd40dfb40 Backport the phpunit fixes 2016-04-05 11:22:53 +01:00
Graham Campbell 3a2cfbc2f4 Backport the better faker default 2016-04-05 11:22:29 +01:00
Graham Campbell 2c446984a1 Backport some env tweaks 2016-04-05 11:22:18 +01: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 94c9db25c3 Merge pull request #3717 from mauri870/5.1 
[5.1] Fix clear-compiled error during composer installation
 2016-03-28 08:16:22 -05:00
Mauri de Souza Nunes 3a555f9214 Fix clear-compiled on composer install 2016-03-28 07:08:48 -03: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