Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mainstream/master' | Pratik Naik | 2008-08-14 | 40 | -679/+1143 |
|\ | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/request.rb actionpack/lib/action_controller/resources.rb | ||||
| * | TestRequest#recycle! uses unmemoize_all to reset cached request method, ↵ | Jeremy Kemper | 2008-08-13 | 1 | -3/+3 |
| | | | | | | | | accepts, etc. | ||||
| * | Fix rendering partials at the top level [#795 state:resolved] | Joshua Peek | 2008-08-13 | 4 | -1/+21 |
| | | |||||
| * | Refactor Filter predicate methods to use inheritance. [#815 state:resolved] | Josh Susser | 2008-08-13 | 1 | -3/+16 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Set asset-cached file ctime and mtime to the max mtime of the combined ↵ | Jeremy Kemper | 2008-08-12 | 2 | -1/+7 |
| | | | | | | | | files. Allows for consistent ETag generation without having a shared filesystem. | ||||
| * | Merge branch 'conditional-get' | Jeremy Kemper | 2008-08-12 | 15 | -300/+323 |
| |\ | |||||
| | * | Update changelog for conditional GET utility methods | Jeremy Kemper | 2008-08-12 | 1 | -2/+8 |
| | | | |||||
| | * | Update tests for request memoization | Jeremy Kemper | 2008-08-08 | 9 | -121/+146 |
| | | | |||||
| | * | Don't shadow host method | Jeremy Kemper | 2008-08-08 | 1 | -1/+1 |
| | | | |||||
| | * | Simplifying usage of ETags and Last-Modified and conditional GET requests | Jeremy Kemper | 2008-08-07 | 7 | -135/+169 |
| | | | |||||
| | * | Inherit these from AbstractRequest instead | Jeremy Kemper | 2008-08-07 | 1 | -46/+4 |
| | | | |||||
| * | | Fixed autolink regexp compatibility for ruby 1.9 [#783 state:resolved] | Stefan Kaes | 2008-08-09 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | | Added tests for partial collection counters [#766 state:resolved] | Cameron Yule | 2008-08-09 | 3 | -4/+18 |
| | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | | mail_to should use decodeURIcomponent instead of unescape to be utf friendly. | miloops | 2008-08-08 | 2 | -5/+9 |
| | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | | dryed up resources; fixed small formatting issue in resources rdoc | James Rosen | 2008-08-08 | 1 | -25/+25 |
| |/ | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Refactor DateHelper to use DateTimeSelector presenter pattern | Clemens Kofler | 2008-08-07 | 3 | -259/+638 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Tidy up ActionMailer rendering logic to take advantage of view path cache ↵ | Joshua Peek | 2008-08-06 | 3 | -27/+21 |
| | | | | | | | | instead of using file system lookups | ||||
| * | Be more careful about deducing action_methods | Jeremy Kemper | 2008-08-06 | 1 | -6/+10 |
| | | |||||
| * | MemoryStore is the only "unsafe" store. Make it threadsafe by default. | Joshua Peek | 2008-08-06 | 1 | -1/+1 |
| | | |||||
| * | Strip newlines from cookie session data | Jeremy Kemper | 2008-08-05 | 1 | -1/+1 |
| | | |||||
| * | Ensure public superclass methods don't shadow public controller methods. ↵ | Jeremy Kemper | 2008-08-05 | 1 | -3/+3 |
| | | | | | | | | Case in point, ruby-debug's Kernel#start shadowing a controller's start action. | ||||
| * | Make assert_template failure message more friendly | Jeffrey Hardy | 2008-08-05 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Fixed i18n bulk translate issues in NumberHelper | Clemens Kofler | 2008-08-04 | 2 | -38/+44 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Expose Routing::Segment::SAFE_PCHAR list of path characters that don't need ↵ | Jeremy Kemper | 2008-08-04 | 1 | -1/+2 |
| | | | | | | | | escaping | ||||
* | | Fixes file_field_tag docs by taking out deprecated end_form_tag and makes ↵ | Tieg Zaharia | 2008-08-13 | 1 | -2/+2 |
| | | | | | | | | form_tag evaluated instead of output | ||||
* | | Fix reference to incorrect block variable in :cache_path example for ↵ | Cheah Chu Yeow | 2008-08-12 | 1 | -2/+2 |
| | | | | | | | | caches_action. | ||||
* | | Typo in comment. | Henrik N | 2008-08-07 | 1 | -1/+1 |
| | | |||||
* | | Added missing opening double quote to doc example in prototype helper. | miloops | 2008-08-06 | 1 | -1/+1 |
| | | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2008-08-03 | 36 | -525/+635 |
|\| | |||||
| * | Ensure mailer view path is loaded when it's assigned. Path#[] raises if it ↵ | Jeremy Kemper | 2008-07-31 | 1 | -0/+2 |
| | | | | | | | | isn't loaded. | ||||
| * | List available actions in UnknownAction exception message | Jeremy Kemper | 2008-07-31 | 1 | -1/+1 |
| | | |||||
| * | Use "/usr/bin/env ruby" instead of "/usr/local/bin/ruby" | Tarmo Tänav | 2008-07-31 | 1 | -7/+7 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Fix file permissions | Tarmo Tänav | 2008-07-31 | 11 | -0/+0 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | In javascript helpers option[:type] = :synchronous should work as described ↵ | miloops | 2008-07-31 | 2 | -1/+7 |
| | | | | | | | | | | | | in docs. Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Prototype helpers should generate Element.insert instead of Insertion.new, ↵ | miloops | 2008-07-30 | 3 | -22/+28 |
| | | | | | | | | which has been deprecated in Prototype 1.6. | ||||
| * | Reapply 'cab168ac' because it was accidentally patched over in '10d9fe4b' | Joshua Peek | 2008-07-29 | 1 | -1/+1 |
| | | |||||
| * | Updated NumberHelper: Full i18n support (except number_to_phone), ↵ | Clemens Kofler | 2008-07-29 | 4 | -96/+219 |
| | | | | | | | | | | | | consolidated API (almost all methods now support :precision, :delimiter and :separator). Added deprecation notices for old API. Added tests for new options [#716 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Fix that label_tag doesn't take a symbol for a name. [#719 state:resolved] | Jan De Poorter | 2008-07-29 | 2 | -1/+7 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Remove send! usage, relic of reverted 1.9 behavior | Jeremy Kemper | 2008-07-28 | 1 | -1/+1 |
| | | |||||
| * | Added back ActionController::Base.allow_concurrency flag and moved lock down ↵ | Joshua Peek | 2008-07-28 | 3 | -12/+23 |
| | | | | | | | | to controller processing. | ||||
| * | Prepare Route#generate and Route#recognize early. Also refactor segments a ↵ | Joshua Peek | 2008-07-28 | 8 | -298/+259 |
| | | | | | | | | bit to try to make immutable. | ||||
| * | Routing whitespace cleanup | Joshua Peek | 2008-07-28 | 10 | -89/+84 |
| | | |||||
* | | revised conventions, fixed an example, escaped autolinked words, and other ↵ | Xavier Noria | 2008-07-29 | 1 | -36/+41 |
| | | | | | | | | assorted details in request.rb | ||||
* | | escaping otherwise autolinked "resource(s)" in resource.rb and assorted ↵ | Xavier Noria | 2008-07-28 | 1 | -30/+30 |
|/ | | | | minor touches | ||||
* | Merge docrails changes | Pratik Naik | 2008-07-28 | 5 | -31/+203 |
| | |||||
* | Refactored TextHelper#truncate, highlight, excerpt, word_wrap and auto_link ↵ | Clemens Kofler | 2008-07-27 | 3 | -68/+191 |
| | | | | | | to accept options hash [#705 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | error_message_on takes an options hash instead of ordered parameters [#704 ↵ | Clemens Kofler | 2008-07-27 | 3 | -40/+58 |
| | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | ActionController::Base.relative_url_root falls back to ↵ | Joshua Peek | 2008-07-24 | 1 | -1/+6 |
| | | | | ENV['RAILS_RELATIVE_URL_ROOT'] | ||||
* | AbstractRequest.relative_url_root is no longer automatically configured by a ↵ | Joshua Peek | 2008-07-24 | 11 | -219/+161 |
| | | | | HTTP header. It can now be set in your configuration environment with config.action_controller.relative_url_root | ||||
* | Fixed bc5896e, and added test case for the caching bug it originally introduced. | Joshua Peek | 2008-07-23 | 4 | -6/+13 |
| |