Commit Graph

1292 Commits

Author SHA1 Message Date
Taylor Otwell c062418ee1 fixing conflicts. 2012-05-29 17:06:11 -05:00
Taylor Otwell 012663ddbb fix conflicts. 2012-05-29 17:02:39 -05:00
Taylor Otwell 69d9257a50 Return value of cookie. 2012-05-29 17:00:23 -05:00
Shawn McCool 11c67a56cc added eloquent model detection to eloquent auth driver 2012-05-28 11:31:21 +02:00
Shawn McCool 22f99bce1f Merge branch 'hotfix/auth_login_eloquent_driver' into develop 2012-05-28 10:47:54 +02:00
Shawn McCool 495ff1b197 eloquent model detection moved to eloquent driver 2012-05-28 10:44:22 +02:00
Shawn McCool 278dbf7a1d Merge branch 'fix-auth' into develop 2012-05-27 20:29:38 +02:00
Shawn McCool 3c43f5fac4 updated auth::login to use get_key() 2012-05-27 20:29:00 +02:00
Phill Sparks 548e73ac94 Merge pull request #715 from daylerees/feature/overide-core-tasks
Allow overloading of core tasks.
2012-05-27 03:18:43 -07:00
Shawn McCool 23f469ae53 Merge pull request #716 from daylerees/feature/forelse-fix
Fix for @forelse only matching $vars.
2012-05-26 04:57:36 -07:00
Dayle Rees ffa9c7997a added ability to pass eloquent model to Auth::login()
Signed-off-by: Dayle Rees <thepunkfan@gmail.com>
2012-05-26 13:19:12 +02:00
Dayle Rees 992a5f74ca fix for forelse only matching $vars
Signed-off-by: Dayle Rees <thepunkfan@gmail.com>
2012-05-25 20:34:13 +01:00
Dayle Rees f58b9dea7f allow for overriding core tasks
Signed-off-by: Dayle Rees <thepunkfan@gmail.com>
2012-05-25 19:05:34 +01:00
Phill Sparks 8edd8fcbec Fixed line endings.
Signed-off-by: Phill Sparks <me@phills.me.uk>
2012-05-23 11:21:07 +01:00
Taylor Otwell 91c64b38a7 updated change log. 2012-05-22 08:32:23 -05:00
Taylor Otwell 2ea35398c3 Merge branch 'develop' into staging 2012-05-22 08:29:22 -05:00
Kelly Banman e46d9c5b6d Fix capitalization regression in Request::server()
Signed-off-by: Kelly Banman <kelly.banman@gmail.com>
2012-05-21 23:56:48 -07:00
Taylor Otwell 98535868ac Merge branch 'develop' into staging 2012-05-21 11:06:35 -05:00
Taylor Otwell 5ba802d473 Update environment documentation. 2012-05-21 11:05:59 -05:00
Taylor Otwell e7a40c0caf Updating event docs. 2012-05-21 11:02:43 -05:00
Taylor Otwell a7959ebc3d Updating docs. 2012-05-21 10:57:23 -05:00
Taylor Otwell e7ee6865b1 Updating docs. 2012-05-21 10:55:08 -05:00
Taylor Otwell 0f0c291ffb updating docs for merge and replace input methods. 2012-05-21 10:53:28 -05:00
Taylor Otwell 7d1102dd6e Updated authentication offline docs. 2012-05-21 10:48:15 -05:00
Taylor Otwell 5c03938e3b Merge branch 'develop' into staging 2012-05-21 10:35:55 -05:00
Loic Sharma 4ea27c9daf Fixed minor spelling mistakes 2012-05-17 23:03:42 -05:00
Taylor Otwell a6ad5c6dee Merge pull request #671 from ErikDubbelboer/docfix
Fix error in comment.
2012-05-16 14:15:23 -07:00
Dayle Rees 70b64f1928 forgot to add blade::extend() to this 2012-05-14 14:11:56 +02:00
Erik Dubbelboer 11b9f52239 fix error in comment
Signed-off-by: Erik Dubbelboer <erik@dubbelboer.com>
2012-05-12 18:28:45 +02:00
Taylor Otwell a303d66ae0 Fix bug in events. 2012-05-11 15:32:28 -05:00
Taylor Otwell 135b6d5132 Merge pull request #664 from franzliedke/patch-3
Remove more unneeded Closure references
2012-05-11 12:18:15 -07:00
Andrew Ellis 8e12e7a819 where_nested no longer breaks on closures that don't actually set anything 2012-05-11 13:11:02 -06:00
Taylor Otwell b097b6c682 Fix to_array() in eloquent model. 2012-05-11 13:22:04 -05:00
Taylor Otwell f8fe7843ab tweak event queue. 2012-05-11 10:30:23 -05:00
Taylor Otwell 314f25bd28 fixing conflicts. 2012-05-11 08:49:17 -05:00
Taylor Otwell ef6076b2ce added event queues. 2012-05-11 08:48:31 -05:00
Franz Liedke df9c223ed6 Remove obsolete class import in request.php. 2012-05-11 12:30:45 +03:00
Franz Liedke 6a58e98316 Remove obsolete class import in file.php. 2012-05-11 12:29:18 +03:00
Franz Liedke 5097e9053b Remove obsolete class import in cookie.php. 2012-05-11 12:28:52 +03:00
Franz Liedke b40e13a892 Remove obsolete namespace import in config.php. 2012-05-11 12:28:12 +03:00
Franz Liedke 83f7847ccd Remove obsolete namespace import in session/payload.php. 2012-05-11 12:27:38 +03:00
Franz Liedke 09cb38fc67 Fix PHPDoc referring to Closure class. 2012-05-11 12:23:25 +03:00
Franz Liedke f6bad1e809 Remove obsolete namespace import in driver.php. 2012-05-11 12:21:43 +03:00
Franz Liedke bf172272da Remove obsolete code. 2012-05-11 12:20:18 +03:00
Colin Viebrock 97de6ef1d7 Order of elements for Cookie::put() was wrong
Signed-off-by: Colin Viebrock <colin@viebrock.ca>
2012-05-10 22:04:56 -05:00
Colin Viebrock 5637a29fa3 Add Cookie::forever constant, fixes #660
Signed-off-by: Colin Viebrock <colin@viebrock.ca>
2012-05-10 16:32:07 -05:00
Colin Viebrock a1cca24e8a Doc change for issue #648 2012-05-10 11:41:29 -05:00
Taylor Otwell af9f875ee3 Remote unneeded properties. 2012-05-10 11:37:30 -05:00
Taylor Otwell 5fcf57a27d Updated change log. 2012-05-10 08:45:12 -05:00
Taylor Otwell 21a51b7cf9 Add controller and controller_action to route. 2012-05-10 08:44:43 -05:00