Commit Graph

2536 Commits

Author SHA1 Message Date
Taylor Otwell a6ad5c6dee Merge pull request #671 from ErikDubbelboer/docfix
Fix error in comment.
2012-05-16 14:15:23 -07:00
Taylor Otwell 21d8a266e6 Merge pull request #673 from daylerees/patch-2
Blade::extend in changelog.
2012-05-16 14:14:47 -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 d417eb5664 Merge pull request #658 from jkudish/develop
moose are uncountable
2012-05-11 12:19:25 -07: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
Taylor Otwell 4cff0907a0 Merge pull request #669 from awellis13/feature/where_nested-closure-fix
where_nested breaks on empty closures
2012-05-11 12:17:22 -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
Taylor Otwell 94f49c3627 Merge pull request #663 from cviebrock/develop
Fix order of elements for Cookie::put() in Auth driver
2012-05-10 20:07:23 -07: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
Taylor Otwell 492b49a04b Merge pull request #661 from cviebrock/develop
Fix for #660
2012-05-10 14:33:55 -07: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
Joachim Kudish 88908ade02 moose are uncountable 2012-05-10 10:03:54 -07:00
Taylor Otwell df79b47cc9 Merge pull request #656 from cviebrock/array-helpers
Doc change for issue #648
2012-05-10 09:44:12 -07: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 d0edf92e31 Merge pull request #640 from crynobone/feature/remove-prettyprint
Google Pretty Print never loaded, there's no need to include it.
2012-05-10 06:31:49 -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
Taylor Otwell cded744ac9 Merge pull request #648 from cviebrock/array-helpers
add array_except() and array_only(), mimicking Input::except() and Input::only() but for any array
2012-05-10 06:25:51 -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 4d98eaa8d3 Merge remote-tracking branch 'laravel/develop' into array-helpers 2012-05-09 16:07:06 -05:00
Taylor Otwell c0b9de27eb Merge pull request #645 from cviebrock/develop
Auth Driver uses Crypter
2012-05-09 14:04:20 -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 c50646dfe8 Missing </head> close tag 2012-05-08 09:49:36 +08:00
crynobone ec9f5f1995 Add support for Form::select with optgroup, solved #526 2012-05-07 20:43:40 +08:00
crynobone 2f2b0416aa Google Pretty Print never loaded, there's no need to include it. 2012-05-07 19:24:48 +08:00
Taylor Otwell 1f706bd2d1 Merge pull request #633 from crynobone/feature/validator-replace-attr
Validator: During replace :attribute, need to verify Lang::has('key') instead of checking is_null()
2012-05-05 11:40:24 -07: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