Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mislav/auto_link' | Michael Koziarski | 2010-05-29 | 1 | -12/+21 |
|\ | |||||
| * | avoid auto_linking already linked emails; more robust detection of linked URLs | Mislav Marohnić | 2010-05-24 | 1 | -9/+18 |
| | | | | | | | | | | | | | | | | | | | | References #1523 [#1862 state:resolved] [#3591 state:resolved] Add test that shows how link text can contain HTML if needed: the trick is using block form in combination with `raw`. Let link text be automatically HTML-escaped [#2017 state:resolved] | ||||
| * | auto_link: support arbitrary URI schemes like "ftp:" and "file:" | Mislav Marohnić | 2010-05-24 | 1 | -3/+3 |
| | | | | | | | | | | | | recognizes all URI scheme allowed characters, such as colon and period. [#3494 state:resolved] | ||||
* | | i18n: t() handles single keys returning an Array, also | Jeremy Kemper | 2010-05-24 | 1 | -2/+5 |
| | | |||||
* | | HTML safety: fix textarea with nil content | Jeremy Kemper | 2010-05-24 | 1 | -1/+1 |
| | | |||||
* | | translate method doesn't support arrays anymore and is optimized to be used ↵ | Santiago Pastorino | 2010-05-24 | 1 | -18/+10 |
| | | | | | | | | | | | | with strings or symbols Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Revert "translation method for arrays on TranslationHelper module returns an ↵ | Santiago Pastorino | 2010-05-24 | 1 | -25/+25 |
| | | | | | | | | | | | | | | | | array where values for keys of the form (.|_)html keys are html_safe" This reverts commit 05c95b5c5815c0b3ae55fda7a897922b7f3ec2c7. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | translation method for arrays on TranslationHelper module returns an array ↵ | Santiago Pastorino | 2010-05-24 | 1 | -25/+25 |
|/ | | | | | | | | where values for keys of the form (.|_)html keys are html_safe [#4675] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | refactor evals and adds some __FILE__ and __LINE__ | Santiago Pastorino | 2010-05-20 | 2 | -4/+3 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-05-19 | 1 | -2/+5 |
|\ | |||||
| * | Added default currency values to NumberHelper and pass them to I18n.translate | Santiago Pastorino | 2010-05-17 | 1 | -2/+5 |
| | | | | | | | | | | | | [#4604 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | fix documentation typo | Marius Nuennerich | 2010-05-18 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | Merge branch 'master' of git://github.com/rails/rails | Rizwan Reza | 2010-05-17 | 4 | -26/+74 |
|\| | |||||
| * | added support for html attributes in options_for_select [#2165] | pleax | 2010-05-16 | 1 | -2/+25 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Sending :id => nil to form helpers now properly omits the "id" html element ↵ | Jeff Dean | 2010-05-15 | 1 | -5/+11 |
| | | | | | | | | | | | | [#4559 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Accept :alt => nil on image_tag [#4558 state:resolved] | Marc-Andre Lafortune | 2010-05-15 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Improve previous patch a bit [#3645 state:resolved] | José Valim | 2010-05-15 | 2 | -9/+6 |
| | | |||||
| * | Let label helpers accept blocks. | Stephen Celis | 2010-05-15 | 2 | -18/+40 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Added extra documentation for content_for helper | Jeroen van Dijk | 2010-05-15 | 1 | -6/+25 |
|/ | |||||
* | Favor %{} in all code instead of (deprecated) {{}} as interpolation syntax ↵ | Lawrence Pit | 2010-05-03 | 1 | -1/+1 |
| | | | | | | for I18n Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Speed up I18n helpers in views and add entry to CHANGELOG. | José Valim | 2010-05-01 | 1 | -7/+3 |
| | |||||
* | Use %{} syntax in I18n (faster) instead of {{}}. | José Valim | 2010-05-01 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' of github.com:rails/rails | wycats | 2010-04-30 | 2 | -45/+34 |
|\ | |||||
| * | removing the extra assignment statement [#4432 state:resolved] | Neeraj Singh | 2010-04-30 | 1 | -1/+0 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Fix form builder and form helpers inconsistencies [#4432 state:resolved] | Neeraj Singh | 2010-04-29 | 1 | -43/+33 |
| | | | | | | | | | | | | | | | | * datetime_select and select_datetime should be consistent as much as possible * date_select and select_date should be consistent as much as possible * time_select and select_time should be consistent as much as possible Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Fix prototype grep depending on JSON encoding regexp as JavaScript regexp | Jeremy Kemper | 2010-04-27 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:rails/rails | wycats | 2010-04-26 | 2 | -2/+2 |
|\| | |||||
| * | Rename fieldWithErrors style to field_with_errors. Remove unused alert style. | Jeremy Kemper | 2010-04-24 | 1 | -1/+1 |
| | | |||||
| * | HWIA symbolize_keys now returns a hash so no need to do this anymore | Santiago Pastorino | 2010-04-22 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Allow :remote => false to be passed to link_to | Nicolas Sanguinetti | 2010-04-22 | 1 | -3/+1 |
|/ | | | | | | | And add tests for `button_to` and `form_tag` which currently behave as expected, so we avoid a regression. Signed-off-by: wycats <wycats@gmail.com> | ||||
* | url_for now works with HashWithIndifferentAccess ht jay [#4391 state:committed] | Santiago Pastorino | 2010-04-21 | 1 | -1/+1 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Merge remote branch 'spastorino/master' | Carl Lerche | 2010-04-18 | 1 | -1/+1 |
|\ | |||||
| * | perform_caching should be accessed through the controller here | Santiago Pastorino | 2010-04-17 | 1 | -1/+1 |
| | | |||||
* | | mail_to with :encode => :javascript now outputs safe html | Sam Elliott | 2010-04-16 | 1 | -1/+1 |
|/ | | | | Signed-off-by: Carl Lerche <carllerche@mac.com> | ||||
* | Mark the result of grouped_options_for_select as HTML safe [#4322 ↵ | Kieran Pilkington | 2010-04-16 | 1 | -1/+1 |
| | | | | | | state:committed] Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | Make perform_caching work again, with the tests passing and backward compatible | Santiago Pastorino and Carl Lerche | 2010-04-15 | 1 | -1/+1 |
| | |||||
* | Make use of config.perform_caching | Santiago Pastorino | 2010-04-14 | 1 | -1/+1 |
| | |||||
* | Changed translate helper so that it doesn’t mark every translation as safe ↵ | Craig Davey | 2010-04-13 | 1 | -3/+23 |
| | | | | | | HTML. Only keys with a "_html" suffix and keys named "html" are considered to be safe HTML. All other translations are left untouched. Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Fix a typo in the documentation. [#4318 state:resolved] | Craig R Webster | 2010-04-12 | 1 | -1/+1 |
| | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Let capture handle the yielding. | José Valim | 2010-04-12 | 1 | -4/+1 |
| | |||||
* | fields_for returns block result when outside ERB | Ryan Bates | 2010-04-11 | 1 | -1/+1 |
| | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | your beloved typo only spotted in github diff no matter how careful you were ↵ | Xavier Noria | 2010-04-11 | 1 | -1/+1 |
| | | | | before pushing | ||||
* | second pass to the intro rdoc of form_helper.rb | Xavier Noria | 2010-04-11 | 1 | -13/+55 |
| | |||||
* | removes some duplication in previous edit | Xavier Noria | 2010-04-10 | 1 | -5/+0 |
| | |||||
* | makes a pass to the intro rdoc of form_helper.rb, will revise form_for tomorrow | Xavier Noria | 2010-04-10 | 1 | -74/+38 |
| | |||||
* | form_for :as rubydoc and tidy up a bit the form_for doc | Santiago Pastorino | 2010-04-10 | 1 | -32/+19 |
| | |||||
* | Move verification to a plugin as well: http://github.com/rails/verification.git | José Valim | 2010-04-10 | 1 | -2/+2 |
| | |||||
* | Remove input, form, error_messages_for and error_message_on from the ↵ | José Valim | 2010-04-10 | 2 | -273/+20 |
| | | | | framework. If you think you will miss them, feel free to use the dynamic_form plugin available at http://github.com/rails/dynamic_form | ||||
* | fix stack trace lines on class_eval | Santiago Pastorino | 2010-04-09 | 1 | -2/+2 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | image_path -> path_to_image in a couple of places, plus motivation for ↵ | Xavier Noria | 2010-04-09 | 2 | -11/+14 |
| | | | | path_to_image in rdoc |