aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2009-05-1510-23/+46
|\
| * Allow strings to be sent as collection to select.José Valim2009-05-151-0/+2
| * Cleaning up more render testsYehuda Katz + Carl Lerche2009-05-141-1/+1
| * Cherry-pick core extensionsJeremy Kemper2009-05-133-4/+9
| * Implemented redirects and partial rendering in new base.Yehuda Katz + Carl Lerche2009-05-122-12/+25
| * Merge branch 'master' into wip_abstract_controllerYehuda Katz + Carl Lerche2009-05-111-1/+1
| |\
| * | Ported ConditionalGet to new BaseYehuda Katz + Carl Lerche2009-05-111-0/+2
| * | More community code review :)Yehuda Katz2009-05-111-0/+2
| * | Support implicit and explicit content typesYehuda Katz + Carl Lerche2009-05-011-2/+1
| |/
| * Move generic assertions into ActionDispatchJoshua Peek2009-04-301-1/+1
* | Some spelling changes.Evan Farrar2009-05-074-9/+9
* | Merge commit 'mainstream/master'Pratik Naik2009-04-309-218/+135
|\|
| * Deprecate template, session, assigns, and layout accessors on response object...Joshua Peek2009-04-283-4/+5
| * Fixes ActionMailer to work with the ActionView refactoringYehuda Katz + Carl Lerche2009-04-271-151/+1
| * Refactor ActionView::TemplateYehuda Katz + Carl Lerche2009-04-278-189/+257
| * Now that we have a separate internal rails_to_json, use a separate circular r...Jeremy Kemper2009-04-261-2/+2
| * Use javascript_object_forJeremy Kemper2009-04-261-1/+1
| * Only Object to_json alias is needed. Prefer nil options.Jeremy Kemper2009-04-261-2/+0
| * Qualify toplevel constant references since we're in a BasicObjectJeremy Kemper2009-04-261-7/+7
* | fixes an example from the previous commitXavier Noria2009-04-271-2/+2
* | adds timestamps in examples of generated asset paths, and documents this bit ...Xavier Noria2009-04-271-69/+72
* | 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