Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'rails/3-0-unstable' | Yehuda Katz | 2009-01-30 | 1 | -3/+3 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Begin unifying the interface between ActionController and ActionView | Yehuda Katz | 2009-01-22 | 1 | -3/+3 |
| | | |||||
* | | 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> | ||||
* | | Improve i18n support for number_to_human_size helper: | Yaroslav Markin | 2009-01-27 | 1 | -17/+28 |
|/ | | | | | | | | | | | | * 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> | ||||
* | Merge docrails | Pratik Naik | 2009-01-18 | 1 | -50/+74 |
| | |||||
* | 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> | ||||
* | 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] | ||||
* | 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] | ||||
* | 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> | ||||
* | Use I18n for date/time select helpers prompt text [#561 state:resolved] | Sam Oliver | 2008-12-22 | 1 | -6/+2 |
| | | | | 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> | ||||
* | 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 |
| | |||||
* | 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 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-12-03 | 2 | -5/+5 |
|\ | |||||
| * | Ensure ActionMailer doesn't blow up when a two argument proc is set for the ↵ | Tekin Suleyman | 2008-12-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | asset host Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1394 state:committed] | ||||
| * | allow options to be passed to email address auto generation | Andrew Kaspick | 2008-12-01 | 1 | -4/+4 |
| | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1418 state:committed] | ||||
* | | Unnecessary CGI require | Jeremy Kemper | 2008-12-03 | 1 | -1/+0 |
|/ | |||||
* | Make sure #compute_public_path caching allows to return different results ↵ | Sven Fuchs | 2008-11-29 | 1 | -1/+1 |
| | | | | | | for different given sources [#1471 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Added the option to declare an asset_host as an object that responds to call ↵ | David Heinemeier Hansson | 2008-11-27 | 1 | -3/+11 |
| | | | | (see http://github.com/dhh/asset-hosting-with-minimum-ssl for an example) [DHH] | ||||
* | prototype and scripty helpers require json | Joshua Peek | 2008-11-24 | 2 | -0/+2 |
| | |||||
* | prefer autoloaded html scanner | Joshua Peek | 2008-11-24 | 1 | -1/+0 |
| | |||||
* | Autoload HTML::Document and sanitizers | Jeremy Kemper | 2008-11-23 | 2 | -20/+1 |
| | |||||
* | Add i18n for number_to_human_size() helper storage units. Translation key is ↵ | Yaroslav Markin | 2008-11-23 | 1 | -4/+3 |
| | | | | | | | | number.human.storage_units. [#1448 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | need to make sure the asset type is cached with it in Cache.. name is ↵ | Aaron Batalion | 2008-11-19 | 1 | -2/+2 |
| | | | | | | sufficient, not self Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Fixed asset host to not cache objects [#1419 state:resolved] | Aaron Batalion | 2008-11-19 | 1 | -29/+35 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Register 'checked' as an HTML boolean attribute. | Hongli Lai (Phusion) | 2008-11-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | This way, 'tag :foo, :type => "checkbox", :checked => false' would output the expected <input type="checkbox" /> instead of the old <input type="checkbox" checked="false" /> The latter would result in a checkbox that's initially checked. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Remove duplicate distribution of prototype and scriptaculous. | Michael Koziarski | 2008-11-18 | 4 | -7384/+0 |
| | | | | This was previously needed by define_javascript_functions which has been removed for a while. | ||||
* | Remove mention of long-dead define_javascript_functions | Michael Koziarski | 2008-11-18 | 1 | -3/+0 |
| | |||||
* | Update Prototype to 1.6.0.3 and update script.aculo.us to 1.8.2 | Thomas Fuchs | 2008-11-18 | 4 | -520/+628 |
| | |||||
* | use :en as a default locale (in favor of :en-US) | Sven Fuchs | 2008-11-18 | 1 | -1/+1 |
| | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Fixed RedCloth and BlueCloth shouldn't preload. Instead just assume that ↵ | David Heinemeier Hansson | 2008-11-17 | 1 | -81/+69 |
| | | | | they're available if you want to use textilize and markdown and let autoload require them [DHH] | ||||
* | auto_link helper: add intelligent ending closing bracket handling. add new ↵ | Mislav Marohnić | 2008-11-15 | 1 | -9/+13 |
| | | | | | | | tests and reorder new ones for readability Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1353 state:committed] | ||||
* | refactor autolink helper. change tests to expect HTML-escaped URLs | Mislav Marohnić | 2008-11-15 | 1 | -26/+20 |
| | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Tag helper should output an attribute with the value 'false' instead of ↵ | Hongli Lai (Phusion) | 2008-11-13 | 1 | -4/+6 |
| | | | | omitting the attribute, if the associated option is false but not nil. | ||||
* | Check whether last arg is a Hash instead of duck-typing against [] | Jeremy Kemper | 2008-11-07 | 1 | -4/+9 |
| | |||||
* | auto_link view helper was failing on URLs with colons after a query param | Rich Manalang | 2008-11-07 | 1 | -2/+2 |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1341 state:committed] | ||||
* | Fixed that FormTagHelper generates illegal html if name contains e.g. square ↵ | Vladimir Dobriakov | 2008-11-04 | 1 | -4/+10 |
| | | | | | | brackets [#1238 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Fix regression bug that made date_select and datetime_select raise a Null ↵ | Bernardo de Pádua | 2008-11-04 | 1 | -2/+2 |
| | | | | | | Pointer Exception when a nil date/datetime was passed and only month and year were displayed [#1289 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Merge with docrails | Pratik Naik | 2008-11-02 | 1 | -5/+5 |
| | |||||
* | A little less hokus pokus | David Heinemeier Hansson | 2008-10-28 | 1 | -5/+4 |
| | |||||
* | modified current_page? to ignore extra parameters unless specified in options | Erik Andrejko | 2008-10-26 | 1 | -3/+14 |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#805 state:committed] | ||||
* | Fixed bug with asset timestamping when using relative_url_root (Joe ↵ | David Heinemeier Hansson | 2008-10-26 | 1 | -1/+1 |
| | | | | Goldwasser) [#1265 status:committed] | ||||
* | Merge with docrails. Also add a rake task to generate guides in your rails ↵ | Pratik Naik | 2008-10-21 | 1 | -6/+6 |
| | | | | | | | | application : rake doc:guides The rake task will generate guides inside doc/guides directory of your application. Open index.html to browse. |