aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Added the :rjs render optionYehuda Katz + Carl Lerche2009-05-211-0/+2
|
* 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 ↵Andy Stewart2009-05-181-1/+6
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-184-8/+16
|\|
| * Ensure number_to_human_size does not strip zeros from the end [#1763 ↵Travis Briggs2009-05-171-1/+6
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure auto_link does not ignore multiple trailing punctuations [#2504 ↵Lance Ivy2009-05-171-6/+7
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Allow strings to be sent as collection to select.José Valim2009-05-151-0/+2
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Cleaning up more render testsYehuda Katz + Carl Lerche2009-05-141-1/+1
| |
* | Active Support dependenciesJeremy Kemper2009-05-141-0/+1
|/
* Cherry-pick core extensionsJeremy Kemper2009-05-131-4/+5
|
* Now that we have a separate internal rails_to_json, use a separate circular ↵Jeremy Kemper2009-04-261-2/+2
| | | | reference stack instead of sticking it in the options hash
* 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
|
* * Add pluggable JSON backends with support for the JSON gem. [rick]rick2009-04-232-12/+14
| | | | | | | | | | | | | | Example: ActiveSupport::JSON.backend = "JSONGem" All internal Rails JSON encoding is now handled by ActiveSupport::JSON.encode(). Use of #to_json is not recommended, as it may clash with other libraries that overwrite it. However, you can recover Rails specific functionality if you really want to use #to_json. gem 'json' ActiveSupport::JSON.backend = "JSONGem" class ActiveRecord::Base alias to_json rails_to_json end
* Fix tests on 1.9Jeremy Kemper2009-04-221-0/+2
|
* Merge docrailslifo2009-04-172-4/+4
|
* Bring abstract_controller up to date with rails/masterCarl Lerche & Yehuda Katz2009-04-1313-112/+476
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list of commits that could not be applied cleanly or are obviated with the abstract_controller refactor. They all need to be revisited to ensure that fixes made in 2.3 do not reappear in 3.0: 2259ecf368e6a6715966f69216e3ee86bf1a82a7 AR not available * This will be reimplemented with ActionORM or equivalent 06182ea02e92afad579998aa80144588e8865ac3 implicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically 893e9eb99504705419ad6edac14d00e71cef5f12 Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] * We will need to reimplement rails-dev-boost on top of the refactor; the changes here are very implementation specific and cannot be cleanly applied. The following commits are implicated: 199e750d46c04970b5e7684998d09405648ecbd4 3942cb406e1d5db0ac00e03153809cc8dc4cc4db f8ea9f85d4f1e3e6f3b5d895bef6b013aa4b0690 e3b166aab37ddc2fbab030b146eb61713b91bf55 ae9f258e03c9fd5088da12c1c6cd216cc89a01f7 44423126c6f6133a1d9cf1d0832b527e8711d40f 0cb020b4d6d838025859bd60fb8151c8e21b8e84 workaround for picking layouts based on wrong view_paths [#1974 state:resolved] * The specifics of this commit no longer apply. Since it is a two-line commit, we will reimplement this change. 8c5cc66a831aadb159f3daaffa4208064c30af0e make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] * This does not apply at all. It should be trivial to apply the feature to the reimplemented ActionController::Base. 87e8b162463f13bd50d27398f020769460a770e3 fix HTML fallback for explicit templates [#2052 state:resolved] * There were a number of patches related to this that simply compounded each other. Basically none of them apply cleanly, and the underlying issue needs to be revisited. After discussing the underlying problem with Koz, we will defer these fixes for further discussion.
| * Object names with underscore do the wrong lookup in I18n on error_messages_for.José Valim2009-04-051-1/+1
| | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2390 state:committed]
| * Merge docrailsPratik Naik2009-03-242-17/+24
| |
| * Merge branch 'master' into bodypartsJeremy Kemper2009-03-182-3/+3
| |\
| | * Merge docrailsPratik Naik2009-03-162-3/+3
| | |
| * | Introduce flush_output_buffer to append the buffer to the response body then ↵Jeremy Kemper2009-03-131-0/+8
| |/ | | | | | | start a new buffer. Useful for pushing custom parts to the response body without disrupting template rendering.
| * Ensure auto_link doesnt linkify URLs in the middle of a tag [#1523 ↵Eugene Pimenov2009-03-101-2/+3
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fixed number_to_phone to work with 7 digit numbers [#2176 state:resolved]rpheath2009-03-091-1/+3
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Prototype helpers support the onCreate callback.Jeremy Kemper2009-03-081-1/+1
| | | | | | | | [#1074 state:committed]
| * submit_tag with confirmation and disable_with [#660 state:resolved]Lawrence Pit2009-03-071-2/+2
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Ensure Active Record error related view helpers escape the message [#1280 ↵Dan Barry2009-03-071-2/+2
| | | | | | | | | | | | state:resolved] [Inge Jørgensen, Dan Barry] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Pass a custom form builder on to nested fields_for calls. [#2023 ↵Eloy Duran2009-02-271-49/+83
| | | | | | | | | | | | status:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Merge with docrailsPratik Naik2009-02-241-2/+4
| |
| * Updated rdoc to reflect changes to form option helpersTekin Suleyman2009-02-141-11/+61
| | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#837 state:committed]
| * Enhanced form option helpers to add support for disabled option tags and use ↵Tekin Suleyman2009-02-141-4/+31
| | | | | | | | | | | | of anonymous functions for specifying selected and disabled values from collections. Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Stops date select helpers from defaulting the selected date to today if ↵Sam Oliver2009-02-131-1/+1
| | | | | | | | | | | | | | :prompt option has been used Signed-off-by: Michael Koziarski <michael@koziarski.com> [#561 state:resolved]
| * Changed API of NestedAttributes to take an array, or hash with index keys, ↵Lance Ivy2009-02-131-8/+18
| | | | | | | | | | | | | | | | of hashes that have the id on the inside of the attributes hash and updated the FormBuilder to produce such hashes. Also fixed NestedAttributes with composite ids. Signed-off-by: Michael Koziarski <michael@koziarski.com> Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> [#1892 state:committed]
| * Move checkbox hidden field before the actual checkbox so the actual value ↵Joshua Peek2009-02-101-1/+3
| | | | | | | | doesn't get clobbered [#1863 state:resolved]
| * Added partial scoping to TranslationHelper#translate, so if you call ↵David Heinemeier Hansson2009-02-101-1/+19
| | | | | | | | translate('.foo') from the people/index.html.erb template, you'll actually be calling I18n.translate(people.index.foo) [DHH]
| * Ruby 1.9 compat: removed redundant nested repeat operatorJoshua Peek2009-02-071-1/+1
| |
| * Allowing an object to be passed explicitly to a fields_for with ↵Pascal Ehlert2009-02-061-1/+2
| | | | | | | | | | | | | | nested_attributes on one-to-one associations Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1849 state:committed]
| * Eliminate unnecessary File.exist? when correct file extension given [#1879 ↵Andrew White2009-02-051-1/+2
| | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Fix a syntax error in current_page?() that was prevent matches against URL's ↵chris finne2009-02-051-2/+25
| | | | | | | | | | | | with multiple query parameters [#1868 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Remove double parenthesis in docsDavid Heinemeier Hansson2009-02-051-1/+1
| |
| * Add support for nested object forms to ActiveRecord and the helpers in ↵Eloy Duran2009-02-011-9/+187
| | | | | | | | | | | | | | | | ActionPack Signed-Off-By: Michael Koziarski <michael@koziarski.com> [#1202 state:committed]
* | Merge commit 'rails/3-0-unstable'Yehuda Katz2009-01-301-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 ActionViewYehuda Katz2009-01-221-3/+3
| |
* | 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>
* | Improve i18n support for number_to_human_size helper:Yaroslav Markin2009-01-271-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 docrailsPratik Naik2009-01-181-50/+74
|
* 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>