aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2009-04-239-75/+127
|\
| * * Add pluggable JSON backends with support for the JSON gem. [rick]rick2009-04-232-12/+14
| * Refactor ActionView::PathYehuda Katz + Carl Lerche2009-04-226-63/+111
| * Fix tests on 1.9Jeremy Kemper2009-04-221-0/+2
* | Merge commit 'mainstream/master'Pratik Naik2009-04-231-0/+1
|\|
| * Opt in to DependenciesJeremy Kemper2009-04-221-0/+1
| * Merge docrailslifo2009-04-172-4/+4
* | Replaced TimeZone references by ActiveSupport::TimeZoneJosé Valim2009-04-181-21/+21
* | Merge commit 'mainstream/master'lifo2009-04-1722-604/+633
|\|
| * Make more Template methods public to make ActionMailer tests passCarl Lerche & Yehuda Katz2009-04-161-8/+8
| * Makes rails-dev-boost work againCarl Lerche & Yehuda Katz2009-04-144-106/+110
| * Move all Templates methods not used by other class into private toCarl Lerche & Yehuda Katz2009-04-141-87/+88
| * Resurrecting 1.9 compatibility.Carl Lerche & Yehuda Katz2009-04-131-1/+1
| * Bring abstract_controller up to date with rails/masterCarl Lerche & Yehuda Katz2009-04-1318-156/+563
| |\
| | * Object names with underscore do the wrong lookup in I18n on error_messages_for.José Valim2009-04-051-1/+1
| * | Updated old AC::Base for small changes to AVYehuda Katz and Carl Lerche2009-04-082-2/+3
| * | In the middle of some refactoring... some fails due to changes in AbstractCon...Yehuda Katz and Carl Lerche2009-03-231-0/+9
| * | Add a bunch of tests for various render :action, layout combinationsYehuda Katz2009-03-231-0/+3
| * | Working on being able to render :text with layoutsCarl Lerche2009-03-234-5/+19
| * | AbstractController now supports layouts and renderingYehuda Katz2009-02-271-1/+1
| * | First, very early, AbstractController code. More to comeYehuda Katz2009-02-241-0/+2
| * | Merge commit 'rails/3-0-unstable'Yehuda Katz2009-01-3017-238/+337
| |\ \
| | * | Reorganize ActionController folder structureJoshua Peek2009-01-271-0/+28
| | * | Begin unifying the interface between ActionController and ActionViewYehuda Katz2009-01-2217-235/+310
| * | | Sync 'rails/rails/master'Yehuda Katz2009-01-309-92/+234
| |\ \ \
| * | | | Include process methods in ActionController::TestCase only. No need to alias_...Jeremy Kemper2009-01-091-0/+1
| * | | | Sync 'rails/rails/master'Yehuda Katz2009-01-061-0/+2
| |\ \ \ \
| * | | | | Sync 'rails/rails/master'Yehuda Katz2009-01-051-5/+31
| * | | | | Sync 'rails/rails/master'Yehuda Katz2009-01-022-329/+156
| * | | | | Clean up view path cruft and split path implementations into Template::Path a...Joshua Peek2009-01-015-118/+87
| * | | | | Don't construct object deprecation proxy if unneededJeremy Kemper2009-01-011-4/+3
| * | | | | Sync with rails/rails/master, merge two metaprogramming annotation effortsMichael S. Klishin2008-12-281-3/+7
| |\ \ \ \ \
| * | | | | | Initial work to merge several places with similar logicYehuda Katz2008-12-251-1/+1
* | | | | | | Examples should be preceded with four equal signs.Johan Andersson2009-04-141-1/+1
* | | | | | | Fix typos in date helper rdoc (via Mike Breen)Mike Gunderloy2009-04-081-3/+3
| |_|_|_|_|/ |/| | | | |
* | | | | | Fix template extension parsing. [#2315 state:resolved] [#2284 state:resolved]thedarkone2009-03-241-30/+14
* | | | | | Simplify handling of absolute path templates. [#2276 state:resolved]thedarkone2009-03-242-4/+9
* | | | | | Merge docrailsPratik Naik2009-03-242-17/+24
* | | | | | pluginize concurrent block body partJeremy Kemper2009-03-192-27/+2
* | | | | | Merge branch 'master' into bodypartsJeremy Kemper2009-03-184-5/+5
|\ \ \ \ \ \
| * | | | | | Merge docrailsPratik Naik2009-03-162-3/+3
| * | | | | | ruby 1.9 compat: Pathname doesn't support =~Joshua Peek2009-03-151-1/+1
| * | | | | | allowed render :file to take Pathnames [#2220 state:resolved]misfo2009-03-141-1/+1
* | | | | | | Less ceremonyJeremy Kemper2009-03-134-60/+25
* | | | | | | Simplify parts and testsJeremy Kemper2009-03-133-25/+17
* | | | | | | Example using an edge side include body part to fetch queued rendering resultsJeremy Kemper2009-03-131-13/+0
* | | | | | | Body parts: future rendering, threaded future, queued future, open-uri exampleJeremy Kemper2009-03-135-2/+89
* | | | | | | Merge branch 'master' into bodypartsJeremy Kemper2009-03-131-5/+5
|\| | | | | |
| * | | | | | Change naming to match 2.2 so life is easier on plugin developersJeremy Kemper2009-03-121-5/+5
| * | | | | | Eliminate internal render stack since we only need its head and tailJeremy Kemper2009-03-122-17/+27