aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge pull request #6425 from pinetops/resolver_concurrency_fix"José Valim2012-05-211-68/+19
* Merge pull request #6425 from pinetops/resolver_concurrency_fixAaron Patterson2012-05-211-19/+68
|\
| * More granular locking of the Resolver template cacheTom Clarke2012-05-211-5/+23
| * Make the Resolver template cache threadsafe - closes #6404Tom Clarke2012-05-211-19/+50
* | Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614cJosé Valim2012-05-201-10/+22
* | fix closing tag [ci skip]Vijay Dev2012-05-201-1/+1
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-191-1/+4
|\ \
| * | minor fix wrapper tag documentationFrancesco Rodriguez2012-05-181-1/+1
| * | Minor fix to the wrapper tag documentation, the options hash is the last one,...Avi Tzurel2012-05-191-1/+1
| * | Added wrapper tag documentation to the simple_format methodAvi Tzurel2012-05-191-1/+4
* | | Clarify grouped_options_for_select method API, add changelog entryCarlos Antonio da Silva2012-05-191-14/+13
* | | Merge pull request #6384 from ihid/tidy_text_helpersJeremy Kemper2012-05-181-14/+20
|\ \ \
| * | | Tidied and standardised text_helper implementations.Jeremy Walker2012-05-191-14/+20
* | | | reverting decoupling of NumberHelper from safe_join and adding tests for esca...Andrew Mutz2012-05-181-1/+1
|/ / /
* | | Merge pull request #5020 from KL-7/fix-blank-image_tag-sourceJosé Valim2012-05-171-2/+2
|\ \ \
| * | | Render img tag with empty src if empty string is passed to image_tag.Kirill Lashuk2012-05-181-2/+2
| | |/ | |/|
* / | Add HTML5 input[type="time"] helperAlex Soulim2012-05-184-0/+43
|/ /
* | Removed old text_helper apis for highlight, excerpt and word_wrapJeremy Walker2012-05-171-35/+3
* | Merge pull request #2036 from Bodacious/tag_helper_data_fixRafael Mendonça França2012-05-171-2/+3
|\ \
| * | Fixed tag_helper data-attribute bug with BigDecimalsBodacious2012-05-171-2/+3
| |/
* | Merge pull request #6309 from steveklabnik/fix-2394José Valim2012-05-173-1/+16
|\ \ | |/ |/|
| * Created a Raw handler for templates.Steve Klabnik2012-05-173-1/+16
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-172-5/+7
|\ \
| * | fix word_wrap eg output [ci skip]Vijay Dev2012-05-171-1/+3
| * | Fix code example for word_wrap helper.Hendy Tanata2012-05-171-2/+2
| * | Update action view context docs.Oscar Del Ben2012-05-151-2/+2
* | | Don't need to force size to nilRafael Mendonça França2012-05-164-10/+0
* | | Document the usage of grouped_options_for_select with divider optionRafael Mendonça França2012-05-161-1/+19
* | | Make :prompt work as documentedRafael Mendonça França2012-05-162-3/+9
* | | Test deprecation and fix the documentation of grouped_options_for_selectRafael Mendonça França2012-05-161-1/+4
* | | Merge pull request #5369 from Greenie0506/add_separator_to_grouped_options_fo...Aaron Patterson2012-05-161-2/+17
|\ \ \
| * | | Add separator argument to grouped_options_for_selectGreenie05062012-05-151-2/+17
* | | | Merge pull request #6273 from KensoDev/feature/simple_format_refactoringRafael Mendonça França2012-05-151-9/+19
|\ \ \ \ | |/ / / |/| | |
| * | | Added the wrapper tag option to simple_formatAvi Tzurel2012-05-141-2/+4
| * | | simple_format refactoringAvi Tzurel2012-05-141-9/+17
| | |/ | |/|
* | | Revert "Revert "Remove `:disable_with` in favor of `'data-disable-with'` opti...José Valim2012-05-152-25/+5
* | | Revert "Remove `:disable_with` in favor of `'data-disable-with'` option from ...José Valim2012-05-152-5/+25
| |/ |/|
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-1512-76/+9
|\ \
| * | Removing ==Examples and last blank lines of docs from actionpackFrancesco Rodriguez2012-05-1512-107/+42
| * | mispelling asset_tag_helperAngelo Capilleri2012-05-131-1/+1
* | | Use merge! instead reverse_merge! hereSantiago Pastorino2012-05-141-1/+1
* | | Remove `:disable_with` in favor of `'data-disable-with'` option from `submit_...Carlos Galdino + Rafael Mendonça França2012-05-142-25/+5
| |/ |/|
* | Remove `:mouseover` option from `image_tag` helper.Rafael Mendonça França2012-05-131-12/+0
* | Merge pull request #3237 from sakuro/data-url-schemeRafael Mendonça França2012-05-132-2/+2
* | Remove dependency on safe_join from number helpersCarlos Antonio da Silva2012-05-131-1/+1
* | Merge pull request #6293 from carlosantoniodasilva/render-partial-refactorJosé Valim2012-05-132-38/+37
|\ \
| * | Improve and cleanup a bit partial rendererCarlos Antonio da Silva2012-05-122-38/+37
* | | Do not add `:include_blank` option if prompt is presentRafael Mendonça França2012-05-131-3/+3
* | | Only set `:include_blank` if the value of this options is not presentRafael Mendonça França2012-05-131-1/+1
* | | `:include_blank` should be true if the size option is nilRafael Mendonça França2012-05-131-2/+2