Commit Graph

2661 Commits

Author SHA1 Message Date
Taylor Otwell
db6206218a Merge pull request #722 from syntaqx/readme-cleanup
readme cleanup and overall better'ness
2012-05-30 06:36:46 -07:00
Taylor Otwell
67583790d4 Merge pull request #723 from syntaqx/htaccess
htaccess documentation and symlink usage
2012-05-30 06:35:13 -07:00
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
Taylor Otwell
c1de1d61d8 Merge pull request #728 from AndrewBNZ/master
Fix in sqlserver grammar primary key function
2012-05-30 06:20:13 -07:00
Phill Sparks
6151886860 Generated URLs default to use the current protocol (http or https)
Signed-off-by: Phill Sparks <phill@bulbstudios.com>
2012-05-30 13:14:16 +01: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
d21713f35f increment version. 2012-05-29 17:08:30 -05: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
0f5ffdfb56 fix conflicts. 2012-05-29 17:05:19 -05:00
Taylor Otwell
1a17e35461 messing with auth driver problem. 2012-05-29 17:04:47 -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
syntaqx
9ec4c866bd added htaccess documentation and symlinks
Signed-off-by: syntaqx <syntaqx@gmail.com>
2012-05-28 18:39:26 -06:00
syntaqx
5dc7d81654 readme cleanup and overall better'ness
Signed-off-by: syntaqx <syntaqx@gmail.com>
2012-05-28 18:29:51 -06:00
Shawn McCool
4389e5fa46 Merge branch 'feature/eloquent_model_detection' into staging 2012-05-28 11:31:45 +02: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
988dae2488 Merge branch 'fix-auth' into staging 2012-05-27 20:29:33 +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
Shawn McCool
ed16bebcb1 Merge branch 'staging' into develop 2012-05-26 13:18:12 +02:00
Shawn McCool
1005051738 commit new-line 2012-05-26 13:18:00 +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
Dayle Rees
3f0adcb5f3 allow global messages format
Signed-off-by: Dayle Rees <thepunkfan@gmail.com>
2012-05-25 18:47:17 +01:00
Phill Sparks
639d64c584 Merge pull request #711 from benjam-es/patch-1
Changed .gitignore in session to ignore all contents
2012-05-25 01:48:07 -07:00
Ben James
ee4a1871b2 Changed .gitignore in session to ignore all contents
Signed-off-by: Ben James <in@benjam.es>
2012-05-25 09:45:46 +01:00
Taylor Otwell
34919aff71 Merge pull request #709 from daylerees/patch-3
Authenticator Alias
2012-05-24 06:37:46 -07:00
Dayle Rees
4abd56e695 added alias Authenticator for Laravel\Auth\Drivers\Driver 2012-05-24 15:34:34 +02:00
Colin Viebrock
62afdf3f2c Allow password field to be configured.
Signed-off-by: Colin Viebrock <colin@viebrock.ca>
2012-05-23 22:47:18 -05: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
Ben Corlett
af2bf68a29 Adding support for values in nested lists generated in the HTML class.
Signed-off-by: Ben Corlett <bencorlett@me.com>
2012-05-23 12:25:26 +10:00
Taylor Otwell
63b1636d13 Merge pull request #695 from daylerees/profiler-upgrade
profiler upgrade additions
2012-05-22 09:09:28 -07:00
Joe Wallace
1aabbc38bb Check against host name for CLI commands 2012-05-22 11:04:17 -05:00