Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | 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 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 |
|\ \ | |||||
| * | | Added grouped_options_for_select helper method for wrapping option tags in ↵ | Jon Crawford | 2009-01-29 | 1 | -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 Weinand | 2009-01-28 | 1 | -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ño | 2009-01-28 | 1 | -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 Peek | 2009-01-27 | 1 | -0/+3 |
| | | | | | | | | | | | | state:resolved] | ||||
| * | | Improve i18n support for number_to_human_size helper: | Yaroslav Markin | 2009-01-27 | 2 | -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 tests | Joshua Peek | 2009-01-26 | 1 | -2/+2 |
| | | | |||||
| * | | Add localized templates | Joshua Peek | 2009-01-25 | 2 | -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 docrails | Pratik Naik | 2009-01-18 | 1 | -50/+74 |
| | | |||||
| * | Fix performance regression | Jeremy Kemper | 2009-01-16 | 2 | -2/+6 |
| | | |||||
| * | Fix date_select within fields_for with an index [#1666 state:resolved] ↵ | Josh | 2009-01-16 | 1 | -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 Kemper | 2009-01-07 | 1 | -0/+1 |
| | | | | | | | | alias_method_chain :process either. | ||||
* | | Include process methods in ActionController::TestCase only. No need to ↵ | Jeremy Kemper | 2009-01-09 | 1 | -0/+1 |
| | | | | | | | | alias_method_chain :process either. | ||||
* | | Sync 'rails/rails/master' | Yehuda Katz | 2009-01-06 | 1 | -0/+2 |
|\| | |||||
| * | Explicitly require AS::TestCase | Jeremy Kemper | 2009-01-06 | 1 | -0/+2 |
| | | |||||
| * | Cache AssetTag timestamps | Joshua Peek | 2009-01-04 | 1 | -5/+31 |
| | | |||||
| * | Revert to the good old days when AssetTag didn't cause anyone problems | Joshua Peek | 2009-01-02 | 1 | -325/+131 |
| | | |||||
| * | Added :silence option to BenchmarkHelper#benchmark and turned log_level into ↵ | David Heinemeier Hansson | 2009-01-01 | 1 | -4/+25 |
| | | | | | | | | a hash parameter and deprecated the old use [DHH] | ||||
| * | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2009-01-01 | 6 | -122/+90 |
| |\ | |||||
| | * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-12-30 | 5 | -118/+87 |
| | |\ | |||||
| | | * | Clean up view path cruft and split path implementations into Template::Path ↵ | Joshua Peek | 2008-12-29 | 5 | -118/+87 |
| | | | | | | | | | | | | | | | | and Template::EagerPath | ||||
| | * | | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-12-29 | 9 | -110/+148 |
| | |\| | |||||
| | * | | Don't construct object deprecation proxy if unneeded | Jeremy Kemper | 2008-12-22 | 1 | -4/+3 |
| | | | | |||||
| * | | | Fixed the AssetTagHelper cache to use the computed asset host as part of the ↵ | David Heinemeier Hansson | 2009-01-01 | 1 | -5/+5 |
| | |/ | |/| | | | | | | | cache key instead of just assuming the its a string [#1299 state:committed] | ||||
* | | | 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 ↵ | Joshua Peek | 2009-01-01 | 5 | -118/+87 |
| | | | | | | | | | | | | and Template::EagerPath | ||||
* | | | 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 |
|\| | | |||||
| * | | Inline code comments for class_eval/module_eval [#1657 state:resolved] | Xavier Noria | 2008-12-28 | 1 | -3/+7 |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | | Initial work to merge several places with similar logic | Yehuda Katz | 2008-12-25 | 1 | -1/+1 |
|/ / | |||||
* | | Defining a new method is atomic, no mutex needed. | Joshua Peek | 2008-12-22 | 1 | -8/+2 |
| | | |||||
* | | Use I18n for date/time select helpers prompt text [#561 state:resolved] | Sam Oliver | 2008-12-22 | 2 | -6/+9 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | Added prompt options to date helpers [#561 state:resolved] | Sam Oliver | 2008-12-21 | 1 | -0/+79 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | Ensure the template format is always passed to the template finder. Now we ↵ | Joshua Peek | 2008-12-21 | 5 | -88/+57 |
| | | | | | | | | can cleanup some nasty stuff. | ||||
* | | Remove observe_field :on option as prototype no longer supports it [#1088 ↵ | Frederick Cheung | 2008-12-21 | 1 | -11/+0 |
|/ | | | | state:resolved] | ||||
* | Merge docrails | Pratik Naik | 2008-12-19 | 2 | -6/+14 |
| | |||||
* | Revert "Auto-load template handlers based on unmatched extensions [#1540 ↵ | Pratik Naik | 2008-12-19 | 2 | -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 Weizenbaum | 2008-12-15 | 2 | -8/+27 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Fixed ActionView::TestCase current url context [#1561 state:resolved] | Dan Pickett | 2008-12-15 | 1 | -1/+4 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Add :partial option to assert_template [#1550 state:resolved] | mark | 2008-12-11 | 2 | -5/+20 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Fixed template lookups from outside the rails root [#1557 state:resolved] | Joshua Peek | 2008-12-11 | 2 | -1/+5 |
| | |||||
* | Explicitly require ERB Utils extensions from TagHelper | Joshua Peek | 2008-12-09 | 1 | -1/+1 |
| | |||||
* | Benchmark.ms | Jeremy Kemper | 2008-12-09 | 1 | -3/+3 |
| | |||||
* | Merge with docrails | Pratik Naik | 2008-12-07 | 3 | -3/+9 |
| |