Commit Graph

3180 Commits

Author SHA1 Message Date
Taylor Otwell 115f59b4ff Merge pull request #1392 from mynameiszanders/patch-1
Update "docs/views/html.md", parse error in example code.
2012-10-26 18:48:43 -07:00
Zander Baldwin a7ea27d0a0 Update "docs/views/html.md", parse error in example code.
The example code for the `HTML::entities()` method in the documentation had unescaped apostrophes (single quotes) in the string passed as the first parameter.
A parse error would have resulted should someone try to use that code.
2012-10-27 01:09:54 +00:00
Taylor Otwell 37cd08faea Merge pull request #1357 from aebersold/master
documentation fix on validators
2012-10-25 06:14:55 -07:00
Jason Lewis e531cd6300 Merge pull request #1348 from matz3/master
Spelling mistake correction in documentation
2012-10-20 07:31:53 -07:00
Jason Lewis e842095fa7 Merge pull request #1351 from everclear/patch-1
link_to_route requires 3 parameters if wildcard values are required
2012-10-20 07:30:27 -07:00
aebersold 7eb5be794c documentation error, wrong date format 2012-10-16 17:55:50 +02:00
everclear 9b63f65408 link_to_route requires 3 parameters if wildcard values are required 2012-10-15 15:50:10 +02:00
matz3 97013cd816 Spelling mistake correction in documentation
Added missing 's' in the word 'is' (Laravel Overview).

Signed-off-by: matz3 <osswaldm94@gmail.com>
2012-10-14 18:48:25 +02:00
Shawn McCool f53f07df4a Update laravel/documentation/database/eloquent.md
minor grammar update in docs
2012-10-03 13:24:05 +03:00
Shawn McCool 00edb1db8c clarified table naming conventions 2012-10-03 12:19:11 +02:00
Taylor Otwell 4d3c68129b Fix version in path file. 2012-09-27 17:55:19 -04:00
Taylor Otwell d1c1fe4446 fix bug in eloquent model and update version. 2012-09-27 17:45:12 -04:00
Taylor Otwell 02cb96a008 fix bug in eloquent model. 2012-09-27 17:44:03 -04:00
Taylor Otwell ae5331b312 Merge branch 'staging' 2012-09-27 09:08:20 -04:00
Taylor Otwell 4de8e2d717 Update change log. 2012-09-27 09:05:29 -04:00
Taylor Otwell b043482905 Improve view errors. 2012-09-26 16:20:56 -04:00
Taylor Otwell 633c2bde83 Pass the path to the filter event. 2012-09-26 11:20:03 -04:00
Taylor Otwell a976c555e6 Added "view.filter" event so we can hook in final filters. 2012-09-26 10:43:34 -04:00
Taylor Otwell 14c6ff1692 Increment version and change log. 2012-09-26 10:13:30 -04:00
Taylor Otwell 3e3ee870ea Merge branch 'develop' of github.com:laravel/laravel into develop 2012-09-26 10:11:46 -04:00
Taylor Otwell d64d6c9092 Fix logging issue when using the laravel.log event. 2012-09-26 10:11:24 -04:00
Taylor Otwell 09500818e0 Merge pull request #1204 from bryantebeek/optimisation/str-class
Performance enhancement for Str Class (see pull request #1180)
2012-09-25 18:37:53 -07:00
Taylor Otwell fc9b0e1636 Merge pull request #1201 from JoostK/fix-1
Fixed a problem with `Eloquent::get_dirty`
2012-09-25 18:37:09 -07:00
Taylor Otwell 4b7dc2e824 Merge pull request #1226 from akuzemchak/bug/language-routes
Fixes language URI routing issue
2012-09-25 18:34:40 -07:00
Taylor Otwell 439f9c8055 Merge pull request #1236 from kuroi/patch-1
Correct broken links in docs
2012-09-25 18:33:48 -07:00
Taylor Otwell dad0bbc688 Merge pull request #1247 from dcelasun/patch-1
Fix a tiny typo
2012-09-25 18:33:14 -07:00
Taylor Otwell 9acf541653 Merge pull request #1255 from joual/develop
Auth token now nulled on logout
2012-09-25 18:32:36 -07:00
Taylor Otwell 5a1741e9d5 Merge pull request #1276 from rk/rk-issue-1261
[#1261] get_key now pulls from $original instead
2012-09-25 18:31:34 -07:00
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
RK f148f6211c Fixing the array_get misspelling. 2012-09-24 10:35:07 -04:00
RK 258169ea00 [#1261] get_key now pulls from $original instead
This is in reference to issue #1261, where Model->get_key() returns
the key from the $attributes instead of from the $original property.
This breaks the functionality of a model with a primary key that may
change, as the SQL generated will be something like:

UPDATE `model` SET `key` = 'new-key' WHERE `key` = 'new-key';

Which won't update the model in the database.
2012-09-24 09:58:20 -04: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
Joel Marcotte 3d51200a88 Auth token now nulled on logout
Signed-off-by: Joel Marcotte <skaner@gmail.com>
2012-09-20 17:54:28 -04:00
Duru Can Celasun 2b787763aa Fix a tiny typo 2012-09-20 10:13:01 +03:00
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
Peter Coles 184b2989e2 Correct correction 2012-09-18 11:59:11 +02:00
Peter Coles 14eebab94a Correct broken links in docs 2012-09-18 05:54:41 +02: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