Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6359 from carlosgaldino/add-html5-inputs | Jeremy Kemper | 2012-05-22 | 2 | -0/+178 |
|\ | | | | | Add HTML5 color and date/time inputs | ||||
| * | Add several HTML5 input helpers | Carlos Galdino | 2012-05-21 | 2 | -0/+160 |
| | | | | | | | | | | | | | | | | | | | | | | | | The input types added are: - input[type="month"] - input[type="week"] - input[type="datetime"] - input[type="datetime-local"] | ||||
| * | Add HTML5 input[type="color"] helper | Carlos Galdino | 2012-05-21 | 2 | -0/+18 |
| | | |||||
* | | Fixed typo new_defautls -> new_defaults. | Philip Arndt | 2012-05-23 | 1 | -3/+13 |
| | | | | | | | | | | * Added tests for 'else' case in ActionView::Helpers::TranslationHelper#wrap_translate_defaults * Also updated the testing syntax of translation.html_safe? asserts to provide better output upon failure. | ||||
* | | Revert "Merge pull request #6425 from pinetops/resolver_concurrency_fix" | José Valim | 2012-05-21 | 1 | -4/+4 |
| | | | | | | | | | | This reverts commit 254c04286c5916ae7f91eb6e173b312e7a74e364, reversing changes made to 513a0525c24c2944630acfa465b22cd2f4601adf. | ||||
* | | Merge pull request #6425 from pinetops/resolver_concurrency_fix | Aaron Patterson | 2012-05-21 | 1 | -4/+4 |
|\ \ | |/ |/| | Resolver concurrency fix | ||||
| * | Make the Resolver template cache threadsafe - closes #6404 | Tom Clarke | 2012-05-21 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | The Template cache in the Resolver can be accessed by multiple threads similtaneously in multi-threaded environments. The cache is implemented using a Hash, which isn't threadsafe in all VMs (notably JRuby). This commit extracts the cache to a new Cache class and adds mutexes to prevent concurrent access. | ||||
* | | Clarify grouped_options_for_select method API, add changelog entry | Carlos Antonio da Silva | 2012-05-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Make the method API more clear by explicitly showing the expected arguments. This means that the options cannot be passed as second argument because we are not relying on extract_options! anymore, you are expected to give a selected key or `nil` if you want to pass options, as it is the last argument. Notice that this does not change the current method arguments contract available in 3.2, it just brings back the same functionality with the divider addition. | ||||
* | | Merge pull request #6384 from ihid/tidy_text_helpers | Jeremy Kemper | 2012-05-18 | 1 | -0/+42 |
|\ \ | | | | | | | Tidied and standardised text_helper implementations. | ||||
| * | | Tidied and standardised text_helper implementations. | Jeremy Walker | 2012-05-19 | 1 | -0/+42 |
| | | | |||||
* | | | Fix build: can't convert Regexp to String | kennyj | 2012-05-19 | 1 | -1/+1 |
| | | | |||||
* | | | reverting decoupling of NumberHelper from safe_join and adding tests for ↵ | Andrew Mutz | 2012-05-18 | 1 | -0/+2 |
|/ / | | | | | | | escaping of delimiters and separators | ||||
* | | Merge pull request #5020 from KL-7/fix-blank-image_tag-source | José Valim | 2012-05-17 | 1 | -0/+1 |
|\ \ | | | | | | | Render img tag with empty src if empty string is passed to image_tag. | ||||
| * | | Render img tag with empty src if empty string is passed to image_tag. | Kirill Lashuk | 2012-05-18 | 1 | -0/+1 |
| |/ | |||||
* / | Add HTML5 input[type="time"] helper | Alex Soulim | 2012-05-18 | 2 | -0/+31 |
|/ | |||||
* | Removed old text_helper apis for highlight, excerpt and word_wrap | Jeremy Walker | 2012-05-17 | 1 | -34/+22 |
| | |||||
* | Merge pull request #2036 from Bodacious/tag_helper_data_fix | Rafael Mendonça França | 2012-05-17 | 1 | -2/+2 |
|\ | | | | | TagHelper creates invalid data attributes when value is a BigDecimal | ||||
| * | Fixed tag_helper data-attribute bug with BigDecimals | Bodacious | 2012-05-17 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #6309 from steveklabnik/fix-2394 | José Valim | 2012-05-17 | 4 | -5/+18 |
|\ \ | |/ |/| | Created a Raw handler for templates. | ||||
| * | Created a Raw handler for templates. | Steve Klabnik | 2012-05-17 | 4 | -5/+18 |
| | | | | | | | | Fixes #2394 | ||||
* | | Make :prompt work as documented | Rafael Mendonça França | 2012-05-16 | 1 | -0/+7 |
| | | |||||
* | | Test deprecation and fix the documentation of grouped_options_for_select | Rafael Mendonça França | 2012-05-16 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #5369 from ↵ | Aaron Patterson | 2012-05-16 | 1 | -2/+27 |
|\ \ | | | | | | | | | | | | | Greenie0506/add_separator_to_grouped_options_for_select Add separator option to grouped_options_for_select | ||||
| * | | Add separator argument to grouped_options_for_select | Greenie0506 | 2012-05-15 | 1 | -2/+27 |
| | | | | | | | | | | | | Change prompt to options hash in grouped_options_for_select | ||||
* | | | Merge pull request #6273 from KensoDev/feature/simple_format_refactoring | Rafael Mendonça França | 2012-05-15 | 1 | -0/+8 |
|\ \ \ | |/ / |/| | | Feature/simple format refactoring | ||||
| * | | Added the wrapper tag option to simple_format | Avi Tzurel | 2012-05-14 | 1 | -0/+8 |
| |/ | |||||
* | | Revert "Revert "Remove `:disable_with` in favor of `'data-disable-with'` ↵ | José Valim | 2012-05-15 | 2 | -30/+2 |
| | | | | | | | | | | | | | | | | | | option from `submit_tag`, `button_tag` and `button_to` helpers."" Finally remove `:disable_with` but use `:data => { :disable_with => ... }` in examples to show off a better API (which looks nicer in Ruby 1.9) This reverts commit a5c38a9c087e33d36397afc496be7c8e01b37ef0. | ||||
* | | Revert "Remove `:disable_with` in favor of `'data-disable-with'` option from ↵ | José Valim | 2012-05-15 | 2 | -2/+30 |
| | | | | | | | | | | | | | | | | | | | | `submit_tag`, `button_tag` and `button_to` helpers." `disable_with:` is much easier to type than `"data-disable-with" =>`, and the fact it uses "data-disable-with" => is an implementation concern, it should not affect the public API. This reverts commit 683fc4db00f496e5225928afb4d4e932e0fcdc48. | ||||
* | | Remove `:disable_with` in favor of `'data-disable-with'` option from ↵ | Carlos Galdino + Rafael Mendonça França | 2012-05-14 | 2 | -30/+2 |
|/ | | | | `submit_tag`, `button_tag` and `button_to` helpers. | ||||
* | Remove `:mouseover` option from `image_tag` helper. | Rafael Mendonça França | 2012-05-13 | 1 | -8/+0 |
| | |||||
* | Merge pull request #3237 from sakuro/data-url-scheme | Rafael Mendonça França | 2012-05-13 | 1 | -1/+2 |
| | | | | | | | Support data: url scheme Conflicts: actionpack/lib/action_view/asset_paths.rb | ||||
* | Do not add `:include_blank` option if prompt is present | Rafael Mendonça França | 2012-05-13 | 1 | -0/+7 |
| | |||||
* | Only set `:include_blank` if the value of this options is not present | Rafael Mendonça França | 2012-05-13 | 1 | -0/+6 |
| | |||||
* | `:include_blank` should be true if the size option is nil | Rafael Mendonça França | 2012-05-13 | 1 | -14/+22 |
| | |||||
* | Always include the options :include_blank if the select has a required attribute | angelo giovanni capilleri | 2012-05-13 | 1 | -0/+21 |
| | | | | and display size 1 and not multiple attribute, Fixes #5908 | ||||
* | check checkboxes with array of strings as :checked option | Vasiliy Ermolovich | 2012-05-05 | 1 | -0/+9 |
| | |||||
* | update invalid partial error message as per ↵ | Vijay Dev | 2012-05-04 | 1 | -4/+4 |
| | | | | 04202a3f8d66c0675eac41fbf63309f4be356e81 | ||||
* | distance_of_time_in_words: Add/tweak comments to understand time intervals ↵ | Elliot Winkler | 2012-04-30 | 1 | -11/+20 |
| | | | | better | ||||
* | distance_of_time_in_words: 45-60 days is about 2 months, not about 1 month | Elliot Winkler | 2012-04-30 | 1 | -1/+3 |
| | |||||
* | split CDATA end token in cdata_section helper | Sergey Nartimov | 2012-04-30 | 1 | -0/+5 |
| | |||||
* | Merge pull request #3726 from JanDupal/fix-date-helper-hidden | José Valim | 2012-04-30 | 1 | -0/+32 |
|\ | | | | | fix Helpers::DateHelper with :use_hidden - hide separators | ||||
| * | fix Helpers::DateHelper with :use_hidden - hide separators | Jan Dupal | 2011-11-22 | 1 | -0/+32 |
| | | |||||
* | | Merge pull request #6077 from ↵ | José Valim | 2012-04-30 | 2 | -37/+61 |
|\ \ | | | | | | | | | | | | | dmitriy-kiriyenko/improve_signature_of_time_in_words_helper Replace boolean argument with an options hash. | ||||
| * | | Replace boolean argument with an options hash. | Dmitriy Kiriyenko | 2012-04-30 | 2 | -37/+61 |
| | | | | | | | | | | | | | | | | | | | | | | | | This replaces `include_seconds` argument with an option key `include_seconds => true` in options hash. Also `time_ago_in_words` now passes options hash, including a `locale` key, which makes in compatible with `distance_of_time_in_words`. | ||||
* | | | wrap translate defaults to use translate helper features, closes #1102 | Sergey Nartimov | 2012-04-30 | 1 | -1/+24 |
|/ / | |||||
* | | Remove `button_to_function` and `link_to_function` helpers | Rafael Mendonça França | 2012-04-30 | 1 | -30/+0 |
| | | |||||
* | | Merge pull request #6074 from mark-rushakoff/unused-variables | Jeremy Kemper | 2012-04-29 | 1 | -1/+1 |
|\ \ | | | | | | | Remove some unused variable assignments | ||||
| * | | Remove unused assignment in actionpack date helper test | Mark Rushakoff | 2012-04-29 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #6059 from rafaelfranca/check_box_inverted | José Valim | 2012-04-29 | 1 | -2/+98 |
|\ \ \ | | | | | | | | | Change check_box to work inverting the checked and unchecked value | ||||
| * | | | Change check_box to work inverting the checked and unchecked value | Rafael Mendonça França | 2012-04-29 | 1 | -2/+98 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes: * Boolean with inverted logic * Integer with inverted logic * BigDecimal with inverted logic Fixes #3995 |