Commit Graph

1900 Commits

Author SHA1 Message Date
Taylor Otwell 358e8abde6 Merge pull request #1390 from Anahkiasen/feature/url_language
Add URL::to_language and HTML::link_to_language localization helpers
2013-01-05 12:46:43 -08:00
Taylor Otwell 829fa4edd8 Merge pull request #1399 from HiroKws/correct/document/html
Correct document page of HTML page.
2013-01-05 12:44:39 -08:00
Taylor Otwell c463d2a4ab Merge pull request #1400 from sdbondi/develop
Ref #649 - Added documentation for where_between suite of methods (Ref Pull #1365)
2013-01-05 12:43:54 -08:00
Taylor Otwell b5e5494144 Merge pull request #1410 from franzliedke/patch-56
Make insert_get_id() work with non-auto-incrementing columns.
2013-01-05 12:41:39 -08:00
Taylor Otwell 875cac6c83 Merge branch 'master' into develop 2013-01-05 14:36:48 -06:00
Taylor Otwell 0726fb8e84 Merge pull request #1415 from j20/patch-1
Update laravel/documentation/localization.md
2013-01-05 12:36:27 -08:00
Taylor Otwell f785cb22c9 Merge pull request #1428 from dejangeci/feature/dbtransaction-return
Added return value from PDO::commit
2013-01-05 12:33:17 -08:00
Taylor Otwell 10b8732583 Merge pull request #1434 from franzliedke/patch-59
My take at #1198
2013-01-05 12:28:00 -08:00
Taylor Otwell e1d081bd54 Merge pull request #1501 from JesseObrien/master
Add Response::jsonp() to Response class.
2013-01-05 12:18:14 -08:00
Taylor Otwell e8cd58a9bc Merge pull request #1444 from eddmann/bug/database-connector
Fixed connector options merge bug.
2013-01-05 12:17:11 -08:00
Taylor Otwell 19d56d57c9 Merge pull request #1450 from netputer/master
Use `mb_substr` instead of `sub_str` in order to resolve multi-language problem.
2013-01-05 12:11:36 -08:00
Franz Liedke efdc12ed25 Fix typo. 2013-01-05 21:07:31 +01:00
Taylor Otwell 22107fe944 Merge pull request #1461 from AustinW/master
Minor corrections to the documentation and using Input::json() with Validator
2013-01-05 12:06:53 -08:00
Taylor Otwell 423be0495b Merge branch 'master' into develop 2013-01-05 14:05:21 -06:00
Taylor Otwell 731cec2475 Merge pull request #1465 from ethaizone/patch-1
Update laravel/validator.php
2013-01-05 12:04:59 -08:00
Taylor Otwell 912f4e5e72 Fix forever length. 2013-01-05 14:01:42 -06:00
Taylor Otwell 3bbc809c12 Merge pull request #1479 from Ore4444/patch-1
Update laravel/documentation/views/templating.md
2013-01-05 12:00:14 -08:00
Taylor Otwell 277f1c620b Merge pull request #1483 from josem/develop
Parameter JSON_OPTIONS added to response.php
2013-01-05 11:59:35 -08:00
Taylor Otwell 22c2c3843a Merge pull request #1485 from laravie/feature/auth-events
Add 'laravel.auth: login' and 'laravel.auth: logout' events.
2013-01-05 11:58:57 -08:00
Taylor Otwell 8541ff50ab Merge pull request #1497 from bencorlett/patch-2
Allow forward slash separators in Str::classify()
2013-01-05 11:54:54 -08:00
Taylor Otwell e0dfd7c5d3 Merge pull request #1502 from olivervogel/develop
added lists() method to the fluent documentation
2013-01-05 11:50:51 -08:00
Taylor Otwell 6c3c297c5c Use DS constant. 2013-01-05 13:50:38 -06:00
Taylor Otwell 19b01b1d27 Add on to accepted. 2013-01-05 13:48:39 -06:00
Taylor Otwell 6a69979376 Merge pull request #1526 from TheShiftExchange/blade_e
Automatically apply entities to output using Blade
2013-01-05 11:44:54 -08:00
Taylor Otwell f8dbe4cddd Merge pull request #1530 from tempestim/master
Fix for validate_required_with
2013-01-05 11:44:00 -08:00
Taylor Otwell eb5d68f201 Merge pull request #1531 from jasonlewis/eloquent/bug/find
Allow find to be called anywhere on an Eloquent Model
2013-01-05 11:43:11 -08:00
Taylor Otwell 082fc0b39b Merge pull request #1533 from JoostK/relationship-with
Added ability to call Eloquent::with on a Relationship instance
2013-01-05 11:42:08 -08:00
Taylor Otwell 419367f0a7 Merge pull request #1536 from xsbeats/required_with_validation_message
bugfix: added validation message to language file for required_with
2013-01-05 11:39:55 -08:00
Taylor Otwell 153c2837f3 Update docs. 2013-01-05 13:36:02 -06:00
Taylor Otwell 9bdf02648e Update doc block. 2013-01-05 13:33:20 -06:00
Taylor Otwell 15887af961 Merge branch 'master' into develop 2013-01-05 13:31:48 -06:00
Taylor Otwell ab152200e9 Merge pull request #1545 from bryanwood/master
Adds WinCache caching driver
2013-01-05 11:31:25 -08:00
Taylor Otwell 6ba37d42d8 Fix token bug in eloquent auth driver. 2013-01-05 13:28:55 -06:00
Taylor Otwell 0993552c0a Merge pull request #1554 from theideapeople/patch/doc-rule-arrays
Added documentation for validating arrays.
2013-01-05 11:16:53 -08:00
Taylor Otwell 7b846be4c4 Allow multiple schemas in pgsql. 2013-01-05 13:15:59 -06:00
Taylor Otwell 536a810b07 Merge branch 'develop' of github.com:laravel/laravel into develop 2013-01-05 13:09:21 -06:00
Taylor Otwell cc9929e578 Merge branch 'master' into develop 2013-01-05 13:08:33 -06:00
Taylor Otwell fd1289760f Merge pull request #1560 from DServy/master
Added a more dynamic method for checking dblib (response to ticket #770)
2013-01-05 11:08:08 -08:00
Taylor Otwell 5a89836f5d Merge pull request #1561 from danro/develop
Use $.noConflict in profiler to prevent conflicts in multiple versions of jQuery.
2013-01-05 11:06:49 -08:00
Taylor Otwell 1a33a13a3a Merge branch 'master' into develop 2013-01-05 13:05:06 -06:00
Taylor Otwell 2827c3fc78 Document group_by. 2013-01-05 13:04:22 -06:00
Taylor Otwell 0339a3276b Fix bad doc. 2013-01-05 13:02:58 -06:00
Dan Rogers 4e8b452b66 Use $.noConflict in profiler to allow multiple jQuery versions.
Signed-off-by: Dan Rogers <dan.rogers@bkwld.com>
2013-01-03 15:04:45 -08:00
Jesse O'Brien e854464a21 Added section on Enabling the profiler.
Thanks to @sparksp for pointing it out.
2013-01-03 12:06:26 -05:00
Jesse O'Brien 4d6827ca14 Adding documentation for the Profiler logging and timers.
Simple as that :)
2013-01-03 12:06:26 -05:00
Dan Rogers f4dd93ad67 Allow custom profiler.js path, which makes jQuery dependency optional.
Signed-off-by: Dan Rogers <dan.rogers@bkwld.com>
2013-01-02 17:41:07 -08:00
David Staley 4cea38e0b3 Added in a new method for checking pdo drivers
Added in a more dynamic method for checking whether to use dblib or
sqlsrv drivers for a mssql pdo connection. This is to make local mac
devs work well with windows prod machines.
2013-01-02 10:44:20 -07:00
Ken Stanley 6b18fc2b24 Added documentation for validating arrays. 2012-12-31 09:22:50 -05:00
Bryan Wood 117a4cb843 added wincache cache driver 2012-12-26 13:47:36 +10:00
Jason Walton 19cd539586 added validation message to language file for required_with
Signed-off-by: Jason Walton <jwalton512@gmail.com>
2012-12-19 12:05:51 -07:00