| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge commit 'mainstream/master' | Pratik Naik | 2009-04-23 | 9 | -75/+127 |
|\ |
|
| * | * Add pluggable JSON backends with support for the JSON gem. [rick] | rick | 2009-04-23 | 2 | -12/+14 |
| * | Refactor ActionView::Path | Yehuda Katz + Carl Lerche | 2009-04-22 | 6 | -63/+111 |
| * | Fix tests on 1.9 | Jeremy Kemper | 2009-04-22 | 1 | -0/+2 |
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-04-23 | 1 | -0/+1 |
|\| |
|
| * | Opt in to Dependencies | Jeremy Kemper | 2009-04-22 | 1 | -0/+1 |
| * | Merge docrails | lifo | 2009-04-17 | 2 | -4/+4 |
* | | Replaced TimeZone references by ActiveSupport::TimeZone | José Valim | 2009-04-18 | 1 | -21/+21 |
* | | Merge commit 'mainstream/master' | lifo | 2009-04-17 | 22 | -604/+633 |
|\| |
|
| * | Make more Template methods public to make ActionMailer tests pass | Carl Lerche & Yehuda Katz | 2009-04-16 | 1 | -8/+8 |
| * | Makes rails-dev-boost work again | Carl Lerche & Yehuda Katz | 2009-04-14 | 4 | -106/+110 |
| * | Move all Templates methods not used by other class into private to | Carl Lerche & Yehuda Katz | 2009-04-14 | 1 | -87/+88 |
| * | Resurrecting 1.9 compatibility. | Carl Lerche & Yehuda Katz | 2009-04-13 | 1 | -1/+1 |
| * | Bring abstract_controller up to date with rails/master | Carl Lerche & Yehuda Katz | 2009-04-13 | 18 | -156/+563 |
| |\ |
|
| | * | Object names with underscore do the wrong lookup in I18n on error_messages_for. | José Valim | 2009-04-05 | 1 | -1/+1 |
| * | | Updated old AC::Base for small changes to AV | Yehuda Katz and Carl Lerche | 2009-04-08 | 2 | -2/+3 |
| * | | In the middle of some refactoring... some fails due to changes in AbstractCon... | Yehuda Katz and Carl Lerche | 2009-03-23 | 1 | -0/+9 |
| * | | Add a bunch of tests for various render :action, layout combinations | Yehuda Katz | 2009-03-23 | 1 | -0/+3 |
| * | | Working on being able to render :text with layouts | Carl Lerche | 2009-03-23 | 4 | -5/+19 |
| * | | AbstractController now supports layouts and rendering | Yehuda Katz | 2009-02-27 | 1 | -1/+1 |
| * | | First, very early, AbstractController code. More to come | Yehuda Katz | 2009-02-24 | 1 | -0/+2 |
| * | | Merge commit 'rails/3-0-unstable' | Yehuda Katz | 2009-01-30 | 17 | -238/+337 |
| |\ \ |
|
| | * | | Reorganize ActionController folder structure | Joshua Peek | 2009-01-27 | 1 | -0/+28 |
| | * | | Begin unifying the interface between ActionController and ActionView | Yehuda Katz | 2009-01-22 | 17 | -235/+310 |
| * | | | Sync 'rails/rails/master' | Yehuda Katz | 2009-01-30 | 9 | -92/+234 |
| |\ \ \ |
|
| * | | | | Include process methods in ActionController::TestCase only. No need to alias_... | Jeremy Kemper | 2009-01-09 | 1 | -0/+1 |
| * | | | | Sync 'rails/rails/master' | Yehuda Katz | 2009-01-06 | 1 | -0/+2 |
| |\ \ \ \ |
|
| * | | | | | Sync 'rails/rails/master' | Yehuda Katz | 2009-01-05 | 1 | -5/+31 |
| * | | | | | Sync 'rails/rails/master' | Yehuda Katz | 2009-01-02 | 2 | -329/+156 |
| * | | | | | Clean up view path cruft and split path implementations into Template::Path a... | Joshua Peek | 2009-01-01 | 5 | -118/+87 |
| * | | | | | Don't construct object deprecation proxy if unneeded | Jeremy Kemper | 2009-01-01 | 1 | -4/+3 |
| * | | | | | Sync with rails/rails/master, merge two metaprogramming annotation efforts | Michael S. Klishin | 2008-12-28 | 1 | -3/+7 |
| |\ \ \ \ \ |
|
| * | | | | | | Initial work to merge several places with similar logic | Yehuda Katz | 2008-12-25 | 1 | -1/+1 |
* | | | | | | | Examples should be preceded with four equal signs. | Johan Andersson | 2009-04-14 | 1 | -1/+1 |
* | | | | | | | Fix typos in date helper rdoc (via Mike Breen) | Mike Gunderloy | 2009-04-08 | 1 | -3/+3 |
| |_|_|_|_|/
|/| | | | | |
|
* | | | | | | Fix template extension parsing. [#2315 state:resolved] [#2284 state:resolved] | thedarkone | 2009-03-24 | 1 | -30/+14 |
* | | | | | | Simplify handling of absolute path templates. [#2276 state:resolved] | thedarkone | 2009-03-24 | 2 | -4/+9 |
* | | | | | | Merge docrails | Pratik Naik | 2009-03-24 | 2 | -17/+24 |
* | | | | | | pluginize concurrent block body part | Jeremy Kemper | 2009-03-19 | 2 | -27/+2 |
* | | | | | | Merge branch 'master' into bodyparts | Jeremy Kemper | 2009-03-18 | 4 | -5/+5 |
|\ \ \ \ \ \ |
|
| * | | | | | | Merge docrails | Pratik Naik | 2009-03-16 | 2 | -3/+3 |
| * | | | | | | ruby 1.9 compat: Pathname doesn't support =~ | Joshua Peek | 2009-03-15 | 1 | -1/+1 |
| * | | | | | | allowed render :file to take Pathnames [#2220 state:resolved] | misfo | 2009-03-14 | 1 | -1/+1 |
* | | | | | | | Less ceremony | Jeremy Kemper | 2009-03-13 | 4 | -60/+25 |
* | | | | | | | Simplify parts and tests | Jeremy Kemper | 2009-03-13 | 3 | -25/+17 |
* | | | | | | | Example using an edge side include body part to fetch queued rendering results | Jeremy Kemper | 2009-03-13 | 1 | -13/+0 |
* | | | | | | | Body parts: future rendering, threaded future, queued future, open-uri example | Jeremy Kemper | 2009-03-13 | 5 | -2/+89 |
* | | | | | | | Merge branch 'master' into bodyparts | Jeremy Kemper | 2009-03-13 | 1 | -5/+5 |
|\| | | | | | |
|
| * | | | | | | Change naming to match 2.2 so life is easier on plugin developers | Jeremy Kemper | 2009-03-12 | 1 | -5/+5 |
| * | | | | | | Eliminate internal render stack since we only need its head and tail | Jeremy Kemper | 2009-03-12 | 2 | -17/+27 |