Commit Graph

1743 Commits

Author SHA1 Message Date
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 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 4eac00a009 Use hash_hmac on cookie hashes. 2012-09-25 16:43:58 -04: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
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
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
Boris Strahija 925e5bed73 Trimming whitespace before doctype tag
When using layouts and sections
2012-09-18 17:22:45 +03: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
Franz Liedke 65d4b2448b Fix closing tag in definition list helper. 2012-09-14 22:21:35 +03: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
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
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
kapil verma 4de8921f2d Fixed The $dots property
So that it doesn't screw up pagination
2012-09-10 12:02:55 +05:30
JoostK 147e0ec656 Implementation of Eloquent tests
Basic Eloquent unit tests.

Lacks database operations, relationship testing and some magic method
calls.
2012-09-10 00:51:02 +02:00
JoostK 5f99c81035 Fixed a problem whith `Eloquent::get_dirty`
When you had a synched Eloquent model (e.g. without changed values) but
one of those values is `null`, then that value would be considered as
dirty. `Eloquent::changed` returns false, but the value is present in
`Eloquent::get_dirty`.

This fix makes sure that a `null` value in `$attributes` is only
present in `get_dirty` when it wasn't at all *set* in `$original`.
2012-09-09 20:52:33 +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 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
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
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
Aaron Kuzemchak 69ebe6d56a Allow Input::json() to return array instead of object 2012-09-05 16:07:20 -04:00
Franz Liedke 8e145e6c11 Make Eloquent auth driver respect a model's custom password getter.
This fixes #1140.
2012-09-04 16:36:17 +03:00
Callum McIntyre c8ee7ca614 Added documentation regarding the newly public timestamp() function
Signed-off-by: Callum McIntyre <mcintyre1994@gmail.com>
2012-09-03 23:23:36 +01:00
Callum McIntyre 0161273010 Added documentation for the touch() function
Signed-off-by: Callum McIntyre <mcintyre1994@gmail.com>
2012-09-03 22:23:58 +01:00
Callum McIntyre 6b73974505 Added new touch function to eloquent, updates timestamps and immediately saves
Signed-off-by: Callum McIntyre <mcintyre1994@gmail.com>
2012-09-03 21:44:16 +01:00
Joost Koehoorn a1c7dde08b Fixed problem with manual running of Artisan tasks
When running an Artisan task from within your application using `Command::run`, it fails when the same task is ran more than once. Every time the task is resolved, its file is included using `require` leading to duplicate class definitions. By using `require_once` this problem is avoided.
2012-09-03 16:42:14 +03:00
kapil verma 2a5d7c3080 Fixed the use of 5.4 array syntax in one place
SO that things dont break for 5.3 peeps
2012-09-02 12:27:06 +05:30
Taylor Otwell 07bec5c043 Merge branch 'master' into staging 2012-09-01 22:16:46 -05:00