Commit Graph

3452 Commits

Author SHA1 Message Date
Shawn McCool 00edb1db8c clarified table naming conventions 2012-10-03 12:19:11 +02:00
Taylor Otwell 4f8a6724b0 Merge pull request #1305 from nmalcolm/develop
Fixes XSS vulnerability in Profiler
2012-10-02 17:22:11 -07:00
Nathan Malcolm 2d5cc12b7b Fixes XSS vulnerability in Profiler 2012-10-03 00:53:20 +01:00
Daniel Bøndergaard 54397e1bf2 Fixed wrong return type in phpdoc
Signed-off-by: Daniel Bøndergaard <db@helmstmt.com>
2012-09-28 10:10:35 +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
Vincent Talbot c55a8f49dd Update laravel/cli/tasks/migrate/migrator.php 2012-09-27 11:57:34 -03:00
Vincent Talbot a5c5d70bd6 Merge pull request #5 from laravel/develop
Develop
2012-09-27 06:44:30 -07: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
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