aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2009-06-015-13/+27
|\
| * fix for IE incompatibility of :disable_with in submit_tagHan Kessels2009-06-011-1/+2
| * Ruby 1.9: ERB template encoding using a magic comment at the top of the fileJeremy Kemper2009-05-282-8/+14
| * Ruby 1.9: flushing the output buffer preserves its encodingJeremy Kemper2009-05-281-3/+10
| * Break up DependencyModule's dual function of providing a "depend_on" DSL and ...Joshua Peek2009-05-281-1/+1
* | a few details here and there in url_helper.rb docsXavier Noria2009-05-241-47/+46
* | Updated examples to use latest config structureLloyd Pick2009-05-241-4/+4
* | Merge commit 'mainstream/master'Pratik Naik2009-05-2413-28/+73
|\|
| * Get controller/render_other_test.rb to pass on new base and fixed a bug in ne...Yehuda Katz + Carl Lerche2009-05-221-1/+2
| * Get controller/layout_test.rb running on new base except for ActionController...Yehuda Katz + Carl Lerche2009-05-222-1/+5
| * Make assertion tests pass with the new basePratik Naik2009-05-221-1/+1
| * Move Safari response-padding fix to Rails2Compatibility. Should be a Rack con...Jeremy Kemper2009-05-211-1/+1
| * Added the :rjs render optionYehuda Katz + Carl Lerche2009-05-213-8/+12
| * Remove some response content type concepts from ActionViewYehuda Katz + Carl Lerche2009-05-216-9/+28
| * Added responds_to to new base.Yehuda Katz + Carl Lerche2009-05-201-1/+6
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-181-1/+6
| |\
| | * Truncate helper accepts a :separator for a more legible result [#1807 state:r...Andy Stewart2009-05-181-1/+6
| * | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-185-9/+17
| |\|
| | * Ensure number_to_human_size does not strip zeros from the end [#1763 state:re...Travis Briggs2009-05-171-1/+6
| | * Ensure auto_link does not ignore multiple trailing punctuations [#2504 state:...Lance Ivy2009-05-171-6/+7
| | * Fix ActionMailer Symbol#to_proc instanceYehuda Katz2009-05-161-1/+1
| * | Active Support dependenciesJeremy Kemper2009-05-141-0/+1
* | | Fixed a typoThomas R. Koll2009-05-241-2/+2
* | | 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