Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix incorrect example for fields_for - without the '=' it will not output ↵ | David Morton | 2012-05-22 | 1 | -1/+1 |
| | | | | anything. | ||||
* | Remove blank trailing comments | Henrik Hodne | 2012-05-20 | 13 | -39/+0 |
| | | | | | | | For future reference, this is the regex I used: ^\s*#\s*\n(?!\s*#). Replace with the first match, and voilà! Note that the regex matches a little bit too much, so you probably want to `git add -i .` and go through every single diff to check if it actually should be changed. | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-19 | 1 | -1/+4 |
|\ | |||||
| * | minor fix wrapper tag documentation | Francesco Rodriguez | 2012-05-18 | 1 | -1/+1 |
| | | |||||
| * | Minor fix to the wrapper tag documentation, the options hash is the last ↵ | Avi Tzurel | 2012-05-19 | 1 | -1/+1 |
| | | | | | | | | one, added blank hash before that in the args list | ||||
| * | Added wrapper tag documentation to the simple_format method | Avi Tzurel | 2012-05-19 | 1 | -1/+4 |
| | | |||||
* | | Clarify grouped_options_for_select method API, add changelog entry | Carlos Antonio da Silva | 2012-05-19 | 1 | -14/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | -14/+20 |
|\ \ | | | | | | | Tidied and standardised text_helper implementations. | ||||
| * | | Tidied and standardised text_helper implementations. | Jeremy Walker | 2012-05-19 | 1 | -14/+20 |
| | | | |||||
* | | | reverting decoupling of NumberHelper from safe_join and adding tests for ↵ | Andrew Mutz | 2012-05-18 | 1 | -1/+1 |
|/ / | | | | | | | escaping of delimiters and separators | ||||
* | | Merge pull request #5020 from KL-7/fix-blank-image_tag-source | José Valim | 2012-05-17 | 1 | -2/+2 |
|\ \ | | | | | | | 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 | -2/+2 |
| | | | |||||
* | | | Add HTML5 input[type="time"] helper | Alex Soulim | 2012-05-18 | 4 | -0/+43 |
|/ / | |||||
* | | Removed old text_helper apis for highlight, excerpt and word_wrap | Jeremy Walker | 2012-05-17 | 1 | -35/+3 |
| | | |||||
* | | Merge pull request #2036 from Bodacious/tag_helper_data_fix | Rafael Mendonça França | 2012-05-17 | 1 | -2/+3 |
|\ \ | | | | | | | TagHelper creates invalid data attributes when value is a BigDecimal | ||||
| * | | Fixed tag_helper data-attribute bug with BigDecimals | Bodacious | 2012-05-17 | 1 | -2/+3 |
| |/ | |||||
* | | Merge pull request #6309 from steveklabnik/fix-2394 | José Valim | 2012-05-17 | 3 | -1/+16 |
|\ \ | |/ |/| | Created a Raw handler for templates. | ||||
| * | Created a Raw handler for templates. | Steve Klabnik | 2012-05-17 | 3 | -1/+16 |
| | | | | | | | | Fixes #2394 | ||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-17 | 2 | -5/+7 |
|\ \ | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/core.rb | ||||
| * | | fix word_wrap eg output [ci skip] | Vijay Dev | 2012-05-17 | 1 | -1/+3 |
| | | | |||||
| * | | Fix code example for word_wrap helper. | Hendy Tanata | 2012-05-17 | 1 | -2/+2 |
| | | | |||||
| * | | Update action view context docs. | Oscar Del Ben | 2012-05-15 | 1 | -2/+2 |
| | | | |||||
* | | | Don't need to force size to nil | Rafael Mendonça França | 2012-05-16 | 4 | -10/+0 |
| | | | |||||
* | | | Document the usage of grouped_options_for_select with divider option | Rafael Mendonça França | 2012-05-16 | 1 | -1/+19 |
| | | | |||||
* | | | Make :prompt work as documented | Rafael Mendonça França | 2012-05-16 | 2 | -3/+9 |
| | | | |||||
* | | | Test deprecation and fix the documentation of grouped_options_for_select | Rafael Mendonça França | 2012-05-16 | 1 | -1/+4 |
| | | | |||||
* | | | Merge pull request #5369 from ↵ | Aaron Patterson | 2012-05-16 | 1 | -2/+17 |
|\ \ \ | | | | | | | | | | | | | | | | | 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/+17 |
| | | | | | | | | | | | | | | | | 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 | -9/+19 |
|\ \ \ \ | |/ / / |/| | | | Feature/simple format refactoring | ||||
| * | | | Added the wrapper tag option to simple_format | Avi Tzurel | 2012-05-14 | 1 | -2/+4 |
| | | | | |||||
| * | | | simple_format refactoring | Avi Tzurel | 2012-05-14 | 1 | -9/+17 |
| | |/ | |/| | | | | | | | | | | using split_paragraphs method and content_tag instead of string concatination | ||||
* | | | Revert "Revert "Remove `:disable_with` in favor of `'data-disable-with'` ↵ | José Valim | 2012-05-15 | 2 | -25/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -5/+25 |
| |/ |/| | | | | | | | | | | | | | | | | | `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. | ||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-15 | 12 | -76/+9 |
|\ \ | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb | ||||
| * | | Removing ==Examples and last blank lines of docs from actionpack | Francesco Rodriguez | 2012-05-15 | 12 | -107/+42 |
| | | | |||||
| * | | mispelling asset_tag_helper | Angelo Capilleri | 2012-05-13 | 1 | -1/+1 |
| | | | |||||
* | | | Use merge! instead reverse_merge! here | Santiago Pastorino | 2012-05-14 | 1 | -1/+1 |
| | | | |||||
* | | | Remove `:disable_with` in favor of `'data-disable-with'` option from ↵ | Carlos Galdino + Rafael Mendonça França | 2012-05-14 | 2 | -25/+5 |
| |/ |/| | | | | | `submit_tag`, `button_tag` and `button_to` helpers. | ||||
* | | Remove `:mouseover` option from `image_tag` helper. | Rafael Mendonça França | 2012-05-13 | 1 | -12/+0 |
| | | |||||
* | | Merge pull request #3237 from sakuro/data-url-scheme | Rafael Mendonça França | 2012-05-13 | 2 | -2/+2 |
| | | | | | | | | | | | | | | Support data: url scheme Conflicts: actionpack/lib/action_view/asset_paths.rb | ||||
* | | Remove dependency on safe_join from number helpers | Carlos Antonio da Silva | 2012-05-13 | 1 | -1/+1 |
| | | | | | | | | Introduced in 0f848dd54911f0e15c5c3aceabf09582cc6eab16. | ||||
* | | Merge pull request #6293 from carlosantoniodasilva/render-partial-refactor | José Valim | 2012-05-13 | 2 | -38/+37 |
|\ \ | | | | | | | Improve and cleanup a bit partial renderer | ||||
| * | | Improve and cleanup a bit partial renderer | Carlos Antonio da Silva | 2012-05-12 | 2 | -38/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove template assignment: there is no need for this assignment, given we are rendering a collection with possibly different templates, and a second call to render (with the same instance) would behave differently if the template is set. * Remove segments array in favor of Array#map * Use local vars whenever possible * Cache local template keys, remove defaults from find_template | ||||
* | | | Do not add `:include_blank` option if prompt is present | Rafael Mendonça França | 2012-05-13 | 1 | -3/+3 |
| | | | |||||
* | | | Only set `:include_blank` if the value of this options is not present | Rafael Mendonça França | 2012-05-13 | 1 | -1/+1 |
| | | | |||||
* | | | `:include_blank` should be true if the size option is nil | Rafael Mendonça França | 2012-05-13 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #6225 from ↵ | Rafael Mendonça França | 2012-05-13 | 1 | -0/+5 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acapilleri/select_with_required_true_include_first_option_blank HTML5 validation error with options_from_collection_for_select Fixes #5908 Conflicts: actionpack/CHANGELOG.md | ||||
| * | | | Always include the options :include_blank if the select has a required attribute | angelo giovanni capilleri | 2012-05-13 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | and display size 1 and not multiple attribute, Fixes #5908 | ||||
* | | | | Merge pull request #6171 from oscardelben/move_token_tag_if_block | Rafael Mendonça França | 2012-05-12 | 1 | -3/+3 |
|\ \ \ \ | |_|/ / |/| | | | Switch token_tag if block | ||||
| * | | | Switch token_tag if block | Oscar Del Ben | 2012-05-05 | 1 | -3/+3 |
| | | | |