Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 1 | -1/+1 |
| | | | | | | | | | | | | | | 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. | ||||
* | | 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 |
| | | | | |||||
* | | | | update example outputs of some asset helpers | Vijay Dev | 2012-05-12 | 1 | -18/+18 |
| |_|/ |/| | | | | | | | | | | | | | | | | | Changed /images and /fonts to /assets in the examples of image_path, image_tag and font_path helpers [ci skip] | ||||
* | | | Revert "Merge pull request #6142 from spartan-developer/master" | José Valim | 2012-05-12 | 4 | -10/+12 |
| | | | | | | | | | | | | | | | This reverts commit 667d0bdd90ef6e6b691f0cc4cf5535b8da69f248, reversing changes made to 4ae6bab6bb02c9390188a49f9a749400f6a0ac94. | ||||
* | | | Merge pull request #6142 from spartan-developer/master | José Valim | 2012-05-12 | 4 | -12/+10 |
|\ \ \ | | | | | | | | | refactored extracting :size => 'XxY' into an extract_size! method | ||||
| * | | | refactored extracting :size => 'XxY' into an extract_size! method | Nicholas Yianilos | 2012-05-03 | 4 | -12/+10 |
| | | | | |||||
* | | | | Move require to where it's needed | Santiago Pastorino | 2012-05-11 | 1 | -0/+1 |
| |_|/ |/| | | |||||
* | | | fix a couple of formatting issues [ci skip] | Vijay Dev | 2012-05-09 | 1 | -2/+4 |
| | | | |||||
* | | | update some examples in asset tag helper docs [ci skip] | Vijay Dev | 2012-05-09 | 1 | -15/+15 |
| | | | |||||
* | | | remove redundant and stray line [ci skip] | Vijay Dev | 2012-05-09 | 1 | -2/+0 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-08 | 3 | -92/+167 |
|\ \ \ | |||||
| * | | | Fix NumberHelper options wrapping to prevent verbatim blocks being rendered ↵ | Mark J. Titorenko | 2012-05-08 | 1 | -92/+161 |
| | | | | | | | | | | | | | | | | instead of line continuations. While I'm at it, wrap long comment lines consistently. | ||||
| * | | | Add example for image_submit_tag with confirmation. [ci skip] | Edward Tsech | 2012-05-08 | 1 | -0/+3 |
| | | | | |||||
| * | | | Added reference to I18n.localize, as discussed here: | Ernesto Tagwerker | 2012-05-04 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | https://github.com/rails/rails/issues/4027 | ||||
* | | | | Change unless + else into if + else | Shaliko Usubov | 2012-05-06 | 1 | -3/+3 |
| | | | | |||||
* | | | | Fix typo in submit_tag helper documentation | Alex Soulim | 2012-05-06 | 1 | -1/+1 |
| | | | | |||||
* | | | | check checkboxes with array of strings as :checked option | Vasiliy Ermolovich | 2012-05-05 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | fix doc [ci skip] | Vijay Dev | 2012-05-04 | 1 | -1/+1 |
| | | | |||||
* | | | Update documentation for button_to. | Shalva Usubov | 2012-05-04 | 1 | -1/+6 |
|/ / | |||||
* | | Fix example url in text helper | Alexey Vakhov | 2012-05-02 | 1 | -1/+1 |
| | | |||||
* | | Fix form tag with non GET/POST method example | Alexey Vakhov | 2012-05-02 | 1 | -1/+1 |
| | | |||||
* | | Documentation fix in options_for_select helper. Fixed display errors caused ↵ | Rodrigo Pavano | 2012-05-01 | 1 | -9/+26 |
|/ | | | | by mixing Ruby and HTML code inside the same pre tag [ci skip] | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-01 | 1 | -1/+1 |
|\ | |||||
| * | Code-format references to config settings | Mark Rushakoff | 2012-04-27 | 1 | -1/+1 |
| | | |||||
* | | distance_of_time_in_words: Add/tweak comments to understand time intervals ↵ | Elliot Winkler | 2012-04-30 | 1 | -7/+12 |
| | | | | | | | | better | ||||
* | | distance_of_time_in_words: 45-60 days is about 2 months, not about 1 month | Elliot Winkler | 2012-04-30 | 1 | -2/+3 |
| | | |||||
* | | split CDATA end token in cdata_section helper | Sergey Nartimov | 2012-04-30 | 1 | -1/+5 |
| | | |||||
* | | Merge pull request #3726 from JanDupal/fix-date-helper-hidden | José Valim | 2012-04-30 | 1 | -0/+2 |
|\ \ | | | | | | | fix Helpers::DateHelper with :use_hidden - hide separators | ||||
| * | | fix Helpers::DateHelper with :use_hidden - hide separators | Jan Dupal | 2011-11-22 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #6077 from ↵ | José Valim | 2012-04-30 | 1 | -27/+33 |
|\ \ \ | | | | | | | | | | | | | | | | | 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 | 1 | -27/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -0/+16 |
|/ / / |