Commit Graph

3141 Commits

Author SHA1 Message Date
Taylor Otwell c2a255c788 Merge branch 'develop' into staging 2012-09-25 20:24:50 -04:00
Taylor Otwell 9e0ff85b24 Merge branch 'master' of github.com:laravel/laravel into staging 2012-09-25 20:24:48 -04:00
Taylor Otwell 4eac00a009 Use hash_hmac on cookie hashes. 2012-09-25 16:43:58 -04:00
Taylor Otwell 064309c0ce Merge branch 'cookies' into develop 2012-09-25 08:44:53 -05:00
Taylor Otwell 04f22f086d Update change log. 2012-09-25 08:42:03 -05:00
Taylor Otwell ad313198df working on cookie fingerprinting. 2012-09-25 08:40:48 -05:00
Taylor Otwell 110966bd6a working on cookie fingerprinting. 2012-09-25 08:40:29 -05:00
Jason Lewis 9fae4dc8d7 Merge branch 'master' into develop 2012-09-24 01:01:53 +09:30
Jason Lewis 8c580d17fb You can only pass the ID of a user, not an object.
Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
2012-09-24 01:01:14 +09:30
Shawn McCool 33b5f6377c Update laravel/documentation/routing.md
Added a warning about using Controller::detect() for routing.
2012-09-19 18:13:31 +03:00
Dayle Rees 0dc124d342 Merge pull request #1210 from franzliedke/patch-44
Definition list support (#1202)
2012-09-19 06:29:31 -07:00
Dayle Rees 99d710a820 Merge pull request #1242 from bstrahija/patch-1
Trimming whitespace before doctype tag
2012-09-19 06:21:32 -07:00
Boris Strahija 925e5bed73 Trimming whitespace before doctype tag
When using layouts and sections
2012-09-18 17:22:45 +03:00
Taylor Otwell 4f7dd1c8a4 Merge pull request #1233 from franzliedke/patch-51
GitHub contribution guidelines
2012-09-17 11:07:41 -07:00
Franz Liedke 2d13b3d504 Add a CONTRIBUTING.md file for GitHub. 2012-09-17 18:58:24 +02:00
Dayle Rees b30ee488d0 Merge pull request #1225 from decola977/patch-2
Update application/language/de/validation.php
2012-09-17 01:52:43 -07:00
decola977 1474491d62 Update application/language/de/validation.php 2012-09-15 21:36:34 +03:00
Franz Liedke 65d4b2448b Fix closing tag in definition list helper. 2012-09-14 22:21:35 +03:00
Dayle Rees 8fea602969 Merge pull request #1222 from dcelasun/patch-1
Fix a tiny typo
2012-09-14 03:30:10 -07:00
Duru Can Celasun 1ee55a3b38 Fix a tiny typo
s/encourage/encouraged
2012-09-14 13:28:02 +03:00
Franz Liedke 5942771ce9 Add documentation for definition list helper. 2012-09-12 14:42:20 +03:00
Franz Liedke c7763a23bd Add definition list helper to HTML class. 2012-09-12 14:40:55 +03:00
Dayle Rees 38562d5007 Merge pull request #1160 from kapv89/patch-2
Updated Paginator to fit better with bootstrap 2.1
2012-09-11 03:20:44 -07:00
Dayle Rees 705cd6a907 Merge pull request #1203 from xsbeats/bugfix/pluralizer_uncountable
Added 'traffic' and 'chassis' as uncountable words to feed pluralizer
2012-09-11 01:25:41 -07:00
kapil verma b63b0c0829 Updated Documentation for Bootstrap-y Pagination
The Docs now show bootstrap style Pagination
2012-09-11 08:09:30 +05:30
kapil verma 85cab82f37 Fixed 2 stupid bugs for better markup
Thats it .. pulling on the docs now
2012-09-11 07:48:01 +05:30
Jason Walton adc23dc964 Added traffic and chassis as uncountable words to properly feed pluralizer
Signed-off-by: Jason Walton <jwalton512@gmail.com>
2012-09-10 11:25:08 -07:00
Dayle Rees a5bb035e4c Merge pull request #1165 from JoostK/develop
Problem with manual running of Artisan tasks
2012-09-10 03:37:24 -07:00
Dayle Rees 666db87137 Merge pull request #1169 from mcintyre94/minor/add-touch-eloquent
Added new touch function to eloquent, updates timestamps and immediately saves
2012-09-10 03:30:32 -07:00
Dayle Rees f004ddcea7 Merge pull request #1189 from kapv89/patch-5
Turn profiler off using runtime Config
2012-09-10 03:23:36 -07:00
Dayle Rees a121e8f520 Merge pull request #1196 from freezestart/master
Fixed readme.md wrong symbol
2012-09-10 03:19:54 -07:00
kapil verma 4de8921f2d Fixed The $dots property
So that it doesn't screw up pagination
2012-09-10 12:02:55 +05:30
Jason Lewis fab4fda1f2 Merge pull request #1200 from bryantebeek/language/nl
Improved/added Dutch (nl_NL) translations
2012-09-09 20:51:34 -07:00
Jason Lewis ca94296343 Merge pull request #1197 from CreativityKills/bug/artisan-bundle-provider
Bug/artisan bundle provider
2012-09-09 20:46:23 -07:00
Bryan te Beek b438fe819e A few small fixes to Dutch translation (nl_NL)
Signed-off-by: Bryan te Beek <bryantebeek@gmail.com>
2012-09-09 18:05:04 +02:00
Bryan te Beek fde0d1128a Added/fixed Dutch Translation (nl_NL)
Signed-off-by: Bryan te Beek <bryantebeek@gmail.com>
2012-09-09 16:34:39 +02:00
Neo Ighodaro f0a2ffef2b The bundle variable is not defined anywhere in the method scope.
Signed-off-by: Neo Ighodaro <thecreativityteam@yahoo.com>
2012-09-09 09:09:41 +01:00
Neo Ighodaro f7cdb76f36 The bundle variable is not defined anywhere in the method scope. 2012-09-09 09:08:55 +01:00
Jason Lewis 8004d48256 Merge pull request #1171 from flaviozantut/ptLang
Added Portuguese Language
2012-09-08 19:12:42 -07:00
freezestart fdeb06e54c fixed readme.md wrong symbol
Signed-off-by: freezestart <freezestart@gmail.com>
2012-09-08 21:13:56 +08:00
Jason Lewis afbae10345 Merge pull request #1175 from franzliedke/patch-42
Fix #1140: Auth / Eloquent / Custom password getter
2012-09-07 23:49:11 -07:00
Jason Lewis 56f665bf6d Merge pull request #1193 from franzliedke/patch-43
Delete phpunit.xml when unit testing
2012-09-07 23:41:08 -07:00
Jason Lewis 1c1281318c Merge pull request #1166 from RoumenMe/translation
Updated Bulgarian translation
2012-09-07 23:33:08 -07:00
Franz Liedke 9348046d0e Fix dynamically generated phpunit.xml file not being deleted automatically in the test runner. 2012-09-07 14:32:37 +02:00
Franz Liedke 7e11bb7431 Delete phpunit.xml file.
Looks like that was committed accidentally.
2012-09-07 14:32:12 +02:00
kapil verma c1bcfec3d2 Turn profiler off using runtime Config
just added a check in Profiler's render method to also look at Config::get('application.profiler') as laravel allows changing config during runtime. This allows turning off profiler for certain actions
2012-09-06 04:42:58 +05:30
Taylor Otwell 96f428f83c Merge pull request #1186 from akuzemchak/feature/json
Allow Input::json() to return array instead of object
2012-09-05 13:11:43 -07:00
Aaron Kuzemchak 69ebe6d56a Allow Input::json() to return array instead of object 2012-09-05 16:07:20 -04:00
Dayle Rees 2b1d8e6c83 Merge pull request #1179 from lollypopgr/ellang
Changed the folder name from "gr" to "el"
2012-09-04 11:02:28 -07:00
George Drakakis deac7b36a4 Changed the folder name from "gr" to "el"
Signed-off-by: George Drakakis <lolly@lollypop.gr>
2012-09-04 20:20:08 +03:00