Commit Graph

1457 Commits

Author SHA1 Message Date
Taylor Otwell 9d99cfad7e added default to config call to get auth password for backwards compatibility. 2012-06-03 19:53:21 -05:00
Taylor Otwell 8205a21965 Merge pull request #707 from cviebrock/auth-pass-field
Allow password field to be configured for Authentication drivers
2012-06-03 17:51:15 -07:00
Taylor Otwell 84e8892c29 updating change log. 2012-06-03 17:45:08 -05:00
Taylor Otwell ba6590d7b1 cleaning up code. 2012-06-03 17:44:53 -05:00
Taylor Otwell f608157ffc Merge pull request #732 from franzliedke/patch-4
Add a last_query() function to Database connection class.
2012-06-03 15:43:44 -07:00
Taylor Otwell c9a4f5ea2f cast values when comparing. 2012-06-03 17:42:16 -05:00
Taylor Otwell 563568fbfe Merge branch 'staging', remote-tracking branch 'origin' into develop 2012-06-03 17:38:56 -05:00
Taylor Otwell aae8b62d6a Merge pull request #735 from lukemartin/patch-1
Adding third parameter (filename) to upload method.
2012-06-03 15:38:27 -07:00
Taylor Otwell e12b554cbb cleaning up. 2012-06-03 17:37:46 -05:00
Taylor Otwell d9c0dc0c35 Merge branch 'develop' of github.com:laravel/laravel into develop 2012-06-03 17:37:05 -05:00
Taylor Otwell 1ac911f05d Merge branch 'master' of github.com:laravel/laravel into develop 2012-06-03 17:36:16 -05:00
Taylor Otwell 930a3e89e0 Merge pull request #736 from joecwallace/cli-env-management
Check  against host name for CLI commands
2012-06-03 15:35:33 -07:00
Taylor Otwell 1b71a0ed89 Merge pull request #743 from kbanman/response-fix
Render Response objects when casting as string
2012-06-03 15:34:31 -07:00
Taylor Otwell 0bdfea32e7 Merge pull request #747 from kloy/master
Fixing bug in IoC::resolve
2012-06-03 15:33:07 -07:00
Taylor Otwell 3805b69aee Merge pull request #748 from hamuz/patch-1
Use the static "compiled" method
2012-06-03 15:32:45 -07:00
Taylor Otwell 5cb8b9bfe9 Merge pull request #750 from robmeijer/develop
Add a note about registering a named route for a controller action.
2012-06-03 15:32:04 -07:00
Taylor Otwell 4dd82a0de3 update change log. 2012-06-03 17:29:59 -05:00
Taylor Otwell ba4271c999 Merge pull request #752 from AndrewBNZ/master
Fixed typo from previous fix in sqlserver grammar, primary key function.
2012-06-03 15:28:55 -07:00
AndrewBNZ c8466f5766 Fixed typo from previous fix, should be $command->columns not $command->$columns. 2012-06-03 23:51:38 +12:00
Jason Lewis 6d5239bf30 Missed a semi-colon.
Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
2012-06-03 19:47:44 +09:30
Jason Lewis b4db0f1b36 Small change moving array to a variable.
Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
2012-06-03 19:45:49 +09:30
Jason Lewis ab2fcb84ef Possible fix for issue #378.
Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
2012-06-03 19:23:35 +09:30
Rob Meijer dc81e1b7ab Add a note about registering a named route that points to a controller action. 2012-06-02 22:13:09 +01:00
hamuz ea143fd9e1 Use the static "compiled" method 2012-06-02 17:16:59 +03:00
Keith Loy d0afdf7bb2 fixing bug where parameters are not passed in IoC::resolve() 2012-06-01 23:29:43 -05:00
Kelly Banman 338b74c142 Render Responses when cast as string
Signed-off-by: Kelly Banman <kelly.banman@gmail.com>
2012-05-31 16:15:55 -07:00
lukemartin 52bce5596e Adding third parameter (filename) to upload method. 2012-05-30 23:37:48 +02:00
Taylor Otwell e35ec6b390 update change log. 2012-05-30 14:25:27 -05:00
Taylor Otwell 691d68ba54 improve / fix postgres support. 2012-05-30 14:23:27 -05:00
Taylor Otwell 56c6202d28 update change log. 2012-05-30 13:46:41 -05:00
Taylor Otwell 544821bdeb fix eloquent auth driver bug. 2012-05-30 13:46:20 -05:00
Colin Viebrock bb2afdf559 Fix for Fluent ... this should work, I'd think 2012-05-30 11:40:21 -05:00
Franz Liedke b4f07d43f5 Add last_query() helper method to Database class, too.
Signed-off-by: Franz Liedke <franz@develophp.org>
2012-05-30 18:44:48 +03:00
Franz Liedke 98b9898003 Add a last_query() function to Database connection class. 2012-05-30 18:37:55 +03:00
Taylor Otwell 2dd8b242b9 update change log. 2012-05-30 09:02:48 -05:00
Taylor Otwell bc67c667a9 Merge pull request #730 from sparksp/develop-default-https
Generated URLs default to use the current protocol (http or https)
2012-05-30 07:01:28 -07:00
Taylor Otwell cf604d4e79 Merge pull request #689 from crlosmify/html
Method for HTML special characters
2012-05-30 06:58:48 -07:00
Taylor Otwell 4bb2e5f63f Merge pull request #698 from bencorlett/html-lists
Adding support for values in nested lists generated in the HTML class.
2012-05-30 06:58:19 -07:00
Taylor Otwell 79b4279101 update change log. 2012-05-30 08:41:45 -05:00
Taylor Otwell 5f97030ce8 refactored set_format to foromat. 2012-05-30 08:41:03 -05:00
Taylor Otwell c2ad6a8126 Merge pull request #714 from daylerees/feature/error-format
Allow custom global message format.
2012-05-30 06:38:27 -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
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 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
Dayle Rees 3f0adcb5f3 allow global messages format
Signed-off-by: Dayle Rees <thepunkfan@gmail.com>
2012-05-25 18:47:17 +01: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
Joe Wallace 1aabbc38bb Check against host name for CLI commands 2012-05-22 11:04:17 -05: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
Carlos e057193de0 Added function for converting html special characters.
With entities there are problems encoding characters in other languages, for example á, ó, in spanish will become special characters.
2012-05-19 01:21:18 -05:00
Carlos 23a25b9abb Revert "Added a function for handling HTML special characters"
This reverts commit b47fc6476a.
2012-05-19 01:17:53 -05:00
Carlos b47fc6476a Added a function for handling HTML special characters 2012-05-19 01:12:29 -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
Taylor Otwell 641f1d4c14 Merge pull request #615 from awellis13/feature/route-cleanup
Laravel\Route PHPDoc cleanup and removed $uri from Route::parameters().
2012-05-10 06:35:54 -07:00
Taylor Otwell 01894ae4ee Merge pull request #651 from dlpetrie/patch-4
Controller property Bundle ( and some additions )
2012-05-10 06:34:18 -07:00
Taylor Otwell 0ad9c67fa0 Merge pull request #631 from loic-sharma/patch-2
Allow Blade extensions to actually extend Blade
2012-05-10 06:28:58 -07:00
Taylor Otwell 287f2a299f Merge pull request #641 from crynobone/feature/form-select-optgroup
Add support for Form::select with optgroup, solved #526
2012-05-10 06:26:35 -07:00
Daniel Petrie 8a8d331981 Update laravel/routing/controller.php 2012-05-09 17:14:01 -07:00
Daniel Petrie b6cbac56c8 bundle property wasn't being used, so I made use of it as well as adding the controllers name and action being called. 2012-05-09 17:06:04 -07:00
Colin Viebrock 319c450f6f Make Input::only() and Input::except() into array_only() and array_except() helpers.
Signed-off-by: Colin Viebrock <colin@viebrock.ca>
2012-05-09 15:51:16 -05:00
Colin Viebrock be5eaf946c Driver uses Laravel\Crypter
Signed-off-by: Colin Viebrock <colin@viebrock.ca>
2012-05-08 21:17:50 -05:00
crynobone ec9f5f1995 Add support for Form::select with optgroup, solved #526 2012-05-07 20:43:40 +08:00
crynobone 57f94a7829 Validator: During replace :attribute, need to verify Lang::has('key') instead of checking is_null()
Signed-off-by: crynobone <crynobone@gmail.com>
2012-05-06 00:53:33 +08:00
Taylor Otwell 47b6492a7e updated lang::has method. 2012-05-05 11:36:04 -05:00
Loic Sharma d866244225 Moved the extensions compiler to first. 2012-05-05 08:41:22 -05:00
Taylor Otwell 515f5f4009 change matcher function to public. 2012-05-04 14:49:07 -05:00
Daniel Petrie 3d284d2b8a Adding use Closure; to fix namespacing issue. 2012-05-04 12:40:17 -07:00
Taylor Otwell 70d4746159 cleaning up. 2012-05-04 13:38:30 -05:00
Dayle Rees b870807e1a renamed blade::register to blade::extend
Signed-off-by: Dayle Rees <thepunkfan@gmail.com>
2012-05-04 19:02:44 +01:00
Dayle Rees d2de301ede added custom compilers to blade
Signed-off-by: Dayle Rees <thepunkfan@gmail.com>
2012-05-04 18:44:43 +01:00
Taylor Otwell 0824c871fd tweaking wording. 2012-05-04 10:51:16 -05:00
Alexandru Bucur 7f7a0cf035 Added a small example on how to call a function in blade :P 2012-05-04 18:47:51 +03:00
Taylor Otwell c764f76e5b remove extra method call. 2012-05-04 09:13:03 -05:00
Phill Sparks 0baf5ad9b1 Fix View's use of Events so you can actually implement your own things
Signed-off-by: Phill Sparks <me@phills.me.uk>
2012-05-04 14:55:05 +01:00
Taylor Otwell e85ca96e38 Merge pull request #614 from awellis13/feature/trim-sql-for-query
Add trim() to Connection::query()
2012-05-04 06:52:22 -07:00
Taylor Otwell caf0bb7cb2 Fully qualify eloquent class. 2012-05-03 20:22:03 -05:00
Taylor Otwell 50dc9f8663 Use regular array_merge on Input::all(). 2012-05-03 17:32:33 -05:00
Andrew Ellis 100a59c9c4 added trim() for the sql statement 2012-05-03 11:16:32 -06:00
Andrew Ellis fdad58383b cleaned up phpdoc and removed as it is not used 2012-05-03 11:14:33 -06:00
Taylor Otwell e256a66b18 Merge pull request #562 from ProgerXP/patch-lang
Lang::__construct(): turn non-array $replacements into an array
2012-05-03 06:44:34 -07:00
Taylor Otwell c2ed9e3429 return key instead of null when language line isn't found. 2012-05-03 08:42:44 -05:00
Taylor Otwell 74022cfa5a fix typo. 2012-05-03 08:38:43 -05:00
Taylor Otwell 280bc99ed8 add u PCRE modifier to str::words. 2012-05-03 08:37:52 -05:00
Taylor Otwell 4f036cf7dd add spacing to router. 2012-05-03 08:36:32 -05:00
Taylor Otwell 9ca81296d8 Merge pull request #589 from whitman/numeric-routes
Automatically wrap numeric routes in parentheses
2012-05-03 06:36:08 -07:00
Taylor Otwell d0cdfb971d clean up has_file method. 2012-05-03 08:35:02 -05:00
Taylor Otwell 5fa78819eb Merge branch 'develop' of github.com:laravel/laravel into develop 2012-05-03 08:33:04 -05:00
Taylor Otwell 11f08fb737 Merge pull request #590 from Vespakoen/develop
Adding has_file method to the Input class
2012-05-03 06:32:51 -07:00