Commit Graph

3477 Commits

Author SHA1 Message Date
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
Jakobud e67ddd86dd Added output from String documentation examples. 2012-09-24 14:02:50 -06: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
Mohammad Sadeghi 9d28938d55 . 2012-09-24 16:42:09 +03:30
Mohammad Sadeghi 7647c3fcba added 'u' flag for preg_match to match UTF-8 URIs. 2012-09-24 16:39:28 +03:30
Mohammad Sadeghi 9df9a5df04 segment pattern to match a single segment, also matches UTF-8 segments. 2012-09-24 16:15:11 +03:30
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
Franz Liedke de53feb07e Fix validation tests one more time. 2012-09-21 13:11:54 +02:00
Franz Liedke f77041ced9 Add another test with quotes around the validation rule's parameter. 2012-09-21 12:31:49 +02:00
vtalbot 8931369665 Add task bundle:uninstall, bundle:unpublish, migrate:rollback bundle, migrate:reset bundle. 2012-09-20 22:15:29 -04:00
Vincent Talbot 6c55f9cf54 Merge pull request #2 from laravel/develop
Develop
2012-09-20 18:18:03 -07:00
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
Patrick Romowicz 966e8462c9 Update laravel/database/connection.php 2012-09-17 21:49:17 +03:00
Patrick Romowicz 5f9a26bae3 Undefined namespace Grammars 2012-09-17 21:42:47 +03:00
Patrick Romowicz 034c63b39d add use Closure; 2012-09-17 21:34:13 +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
Franz Liedke b1e4cf9d29 Use Request helper to determine whether we're in CLI mode. 2012-09-17 18:42:25 +03: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
Aaron Kuzemchak 581fcc5c47 Cleaner regex
Signed-off-by: Aaron Kuzemchak <aaron@kuzemchak.net>
2012-09-15 20:48:18 -04:00
Aaron Kuzemchak 03acf9ca50 Fixes language URI routing issue
Signed-off-by: Aaron Kuzemchak <aaron@kuzemchak.net>
2012-09-15 18:57:29 -04: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
arisk 752161cae3 Setting the exception code in the constructor 2012-09-14 16:47:55 +07:00
arisk e541cf9ebd Added PDO error code 2012-09-14 11:16:46 +07:00
Franz Liedke d051994e2c Fix CLI mode detection for some shared hosts. 2012-09-12 14:56:46 +03:00
Franz Liedke fedc9fc45e Fix hardcoded "id" column in Eloquent auth driver. 2012-09-12 14:48:07 +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
Bryan te Beek 01ba355787 Optimize Str-helper (see pull request #1180)
Signed-off-by: Bryan te Beek <bryantebeek@gmail.com>
2012-09-10 21:11:20 +02:00