aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/base.rb actionpack/lib/action_dispatch/http/mime_type.rb actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_view/base.rb actionpack/lib/action_view/paths.rb actionpack/test/controller/session/cookie_store_test.rb actionpack/test/dispatch/rack_test.rb actionpack/test/dispatch/request_test.rb
| * 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
|\ \
| * | Added grouped_options_for_select helper method for wrapping option tags in ↵Jon Crawford2009-01-291-0/+56
| | | | | | | | | | | | | | | | | | optgroups. [#977 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | Using the highlight helper on text with html shouldn't highlight text inside ↵Dan Weinand2009-01-281-1/+1
| | | | | | | | | | | | | | | | | | html attributes. [#1302 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | Ensure selected option is not ignored for collection_select. [#1037 ↵Daniel Rodríguez Troitiño2009-01-281-1/+2
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | Restore implicit rendering for XHR requests that want a HTML template [#1590 ↵Joshua Peek2009-01-271-0/+3
| | | | | | | | | | | | state:resolved]
| * | Improve i18n support for number_to_human_size helper:Yaroslav Markin2009-01-272-18/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * now using pluralization properly * storage unit translations moved to number.human.storage_units.units * introduced number.human.storage_units.format for languages that do not follow "{{number}} {{unit}}" format (Japanese) NOTE: I18n table changed, you will need to update your translations. [#1634 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * | Fix for failing ActionMailer multipart testsJoshua Peek2009-01-261-2/+2
| | |
| * | Add localized templatesJoshua Peek2009-01-252-15/+47
| |/ | | | | | | | | | | | | | | # Default locale app/views/messages/index.html.erb # I18n.locale is set to :da (Danish) app/views/messages/index.da.html.erb
| * Merge docrailsPratik Naik2009-01-181-50/+74
| |
| * Fix performance regressionJeremy Kemper2009-01-162-2/+6
| |
| * Fix date_select within fields_for with an index [#1666 state:resolved] ↵Josh2009-01-161-5/+5
| | | | | | | | | | | | [Josh, Frederick Cheung] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| * Include process methods in ActionController::TestCase only. No need to ↵Jeremy Kemper2009-01-071-0/+1
| | | | | | | | alias_method_chain :process either.
* | Include process methods in ActionController::TestCase only. No need to ↵Jeremy Kemper2009-01-091-0/+1
| | | | | | | | alias_method_chain :process either.
* | Sync 'rails/rails/master'Yehuda Katz2009-01-061-0/+2
|\|
| * Explicitly require AS::TestCaseJeremy Kemper2009-01-061-0/+2
| |
| * Cache AssetTag timestampsJoshua Peek2009-01-041-5/+31
| |
| * Revert to the good old days when AssetTag didn't cause anyone problemsJoshua Peek2009-01-021-325/+131
| |
| * Added :silence option to BenchmarkHelper#benchmark and turned log_level into ↵David Heinemeier Hansson2009-01-011-4/+25
| | | | | | | | a hash parameter and deprecated the old use [DHH]
| * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2009-01-016-122/+90
| |\
| | * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-12-305-118/+87
| | |\
| | | * Clean up view path cruft and split path implementations into Template::Path ↵Joshua Peek2008-12-295-118/+87
| | | | | | | | | | | | | | | | and Template::EagerPath
| | * | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-12-299-110/+148
| | |\|
| | * | Don't construct object deprecation proxy if unneededJeremy Kemper2008-12-221-4/+3
| | | |
| * | | Fixed the AssetTagHelper cache to use the computed asset host as part of the ↵David Heinemeier Hansson2009-01-011-5/+5
| | |/ | |/| | | | | | | cache key instead of just assuming the its a string [#1299 state:committed]
* | | 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 ↵Joshua Peek2009-01-015-118/+87
| | | | | | | | | | | | and Template::EagerPath
* | | 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
|\| |
| * | Inline code comments for class_eval/module_eval [#1657 state:resolved]Xavier Noria2008-12-281-3/+7
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | Initial work to merge several places with similar logicYehuda Katz2008-12-251-1/+1
|/ /
* | Defining a new method is atomic, no mutex needed.Joshua Peek2008-12-221-8/+2
| |
* | Use I18n for date/time select helpers prompt text [#561 state:resolved]Sam Oliver2008-12-222-6/+9
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | Added prompt options to date helpers [#561 state:resolved]Sam Oliver2008-12-211-0/+79
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | Ensure the template format is always passed to the template finder. Now we ↵Joshua Peek2008-12-215-88/+57
| | | | | | | | can cleanup some nasty stuff.
* | Remove observe_field :on option as prototype no longer supports it [#1088 ↵Frederick Cheung2008-12-211-11/+0
|/ | | | state:resolved]
* Merge docrailsPratik Naik2008-12-192-6/+14
|
* Revert "Auto-load template handlers based on unmatched extensions [#1540 ↵Pratik Naik2008-12-192-27/+8
| | | | | | | | | | state:resolved]" This reverts commit e8c1915416579a3840573ca2c80822d96cb31823. Reasons : - ActionPack tests run very slow - Gem.searcher hanging for long time when extension is nil
* Auto-load template handlers based on unmatched extensions [#1540 state:resolved]Nathan Weizenbaum2008-12-152-8/+27
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Fixed ActionView::TestCase current url context [#1561 state:resolved]Dan Pickett2008-12-151-1/+4
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Add :partial option to assert_template [#1550 state:resolved]mark2008-12-112-5/+20
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Fixed template lookups from outside the rails root [#1557 state:resolved]Joshua Peek2008-12-112-1/+5
|
* Explicitly require ERB Utils extensions from TagHelperJoshua Peek2008-12-091-1/+1
|
* Benchmark.msJeremy Kemper2008-12-091-3/+3
|
* Merge with docrailsPratik Naik2008-12-073-3/+9
|