Commit Graph

1308 Commits

Author SHA1 Message Date
Taylor Otwell d6bcc414b1 update change log. 2012-05-30 08:33:32 -05:00
Taylor Otwell 9114d2a033 Merge branch 'master' into staging 2012-05-30 08:28:58 -05:00
Taylor Otwell aa687d039d Merge pull request #725 from kapv89/patch-1
Changed a line which causes "illegal string offset" error to be thrown i...
2012-05-30 06:25:29 -07:00
Taylor Otwell 36247267e8 update change log. 2012-05-30 08:23:19 -05:00
Taylor Otwell d1bb02ab64 fix conflicts. 2012-05-30 08:22:40 -05:00
AndrewBNZ b4b9c1f442 Fixes Laravel issue #727 - updated sqlserver grammar file to fix error in primary key function. 2012-05-30 18:42:22 +12:00
Taylor Otwell 9c1272093b update change log. 2012-05-29 17:07:47 -05:00
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
kapv89 86a5fd0739 Changed a line which causes "illegal string offset" error to be thrown in php5.4 on trying to access $value['tmp_name'] 2012-05-29 14:04:06 +05:30
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 80386977aa Merge pull request #699 from falzhobel/profiler-js-finetune
Profiler js finetune
2012-05-23 06:10:01 -07:00
Phill Sparks 8edd8fcbec Fixed line endings.
Signed-off-by: Phill Sparks <me@phills.me.uk>
2012-05-23 11:21:07 +01:00
Phill Sparks 3e92ee27db Merge pull request #701 from tkaw220/develop
Typo in documentation
2012-05-23 03:03:40 -07:00
Edwin Aw 5bd64f4030 Typo in documentation
Fixed typo in controllers documentation
2012-05-23 17:44:41 +08:00
Guillaume Lambert 5f0e70a2ef fixed a conflict with .hidden class when using twitter bootstrap and made animation smoother
Signed-off-by: Guillaume Lambert <falzhobel@gmail.com>
2012-05-22 23:33:02 -04:00
Guillaume Lambert fa6d0e92a9 added prevent default to anbu events and linted/formatted profiler.js code, profiler config in application back to false
Signed-off-by: Guillaume Lambert <falzhobel@gmail.com>
2012-05-22 23:09:56 -04:00
Guillaume Lambert 7cc4df852b added prevent default to anbu events and linted/formatted profiler.js code
Signed-off-by: Guillaume Lambert <falzhobel@gmail.com>
2012-05-22 23:03:29 -04:00
Dayle Rees cdcca78548 profiler upgrade additions
Signed-off-by: Dayle Rees <thepunkfan@gmail.com>
2012-05-22 17:03:26 +01:00
Taylor Otwell 49944bab96 Increment version. 2012-05-22 09:12:21 -05: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