Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | text_helper now escape the unsafe input instead of sanitizing | Santiago Pastorino | 2010-06-11 | 1 | -4/+4 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | adds missing require for having ActiveSupport::InheritableOptions defined | Xavier Noria | 2010-06-11 | 1 | -0/+1 |
| | |||||
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-06-10 | 3 | -105/+15 |
|\ | |||||
| * | Remove punctuate_body! No code in lib was using it and it had no documentation. | José Valim | 2010-06-10 | 1 | -6/+0 |
| | | |||||
| * | class_attribute is not a direct replacement of class_inheritable_*. | José Valim | 2010-06-10 | 1 | -10/+7 |
| | | | | | | | | | | | | If you are setting a hash or an array in class_attribute or you need to freeze it, to ensure people won't modify it in place or you need to dup it on inheritance. | ||||
| * | Removed textilize, textilize_without_paragraph and markdown helpers | Santiago Pastorino | 2010-06-09 | 1 | -83/+0 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Memoize the object returned by _view in ActionView::TestCase::Behavior | David Chelimsky | 2010-06-08 | 1 | -6/+8 |
| | | | | | | | | | | | | [#4799 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Added :locale option explanation for number_to_currency | Slobodan Kovacevic | 2010-06-10 | 1 | -0/+2 |
|/ | |||||
* | Fixed double output from cache in no caching mode | David Heinemeier Hansson | 2010-06-08 | 1 | -14/+14 |
| | |||||
* | Made markdown honor :safe option and handle safe input. Also added tests for ↵ | rohit | 2010-06-08 | 1 | -2/+2 |
| | | | | | | | | markdown. [#4794 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Fixed textilize_without_paragraph and added tests for it. [#4792 state:resolved] | rohit | 2010-06-08 | 1 | -1/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Updating image_tag to support cid:content_id "URLs" | Mikel Lindsaar | 2010-06-07 | 1 | -2/+5 |
| | |||||
* | Fix case when rendering a partial inside RJS with inherited layout [#4786 ↵ | José Valim | 2010-06-07 | 1 | -1/+1 |
| | | | | state:resolved] | ||||
* | Makes text_helper methods sanitize the input if the input is not safe or ↵ | Santiago Pastorino | 2010-06-07 | 1 | -16/+22 |
| | | | | :safe => true option is not provided | ||||
* | content_tag_string shouldn't escape_html if escape param is false | Santiago Pastorino | 2010-06-07 | 1 | -1/+1 |
| | |||||
* | Make AP test suite green once again and speed up performance in layouts ↵ | José Valim | 2010-06-07 | 3 | -31/+37 |
| | | | | lookup for some cases. | ||||
* | Formats should always be an array. | Jeremy Kemper | 2010-06-06 | 1 | -1/+1 |
| | |||||
* | Optimize LookupContext | wycats | 2010-06-04 | 3 | -11/+27 |
| | |||||
* | Changes made while working on upgrading cells to Rails 3 | wycats | 2010-06-02 | 1 | -0/+1 |
| | |||||
* | revises the documentation of String#truncate and the truncate helper | Xavier Noria | 2010-06-02 | 1 | -9/+9 |
| | |||||
* | Extracted String#truncate from TextHelper#truncate [DHH] | David Heinemeier Hansson | 2010-06-01 | 1 | -11/+5 |
| | |||||
* | Base options cant live in lazy loaded helpers as they then wont be available ↵ | David Heinemeier Hansson | 2010-05-31 | 2 | -7/+4 |
| | | | | to set for config | ||||
* | Update template to allow handlers to more cleanly handle encodings (ht: nex3) | wycats | 2010-05-30 | 3 | -65/+65 |
| | |||||
* | 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] | ||||
* | | In AV::TC, move protect_against_forgery? from the test_case to the | David Chelimsky | 2010-05-26 | 1 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | _helper module included in the view. - ensures that protect_against_forgery? is present when a helper included in a partial that is rendered by the template under test calls it (which happens in FormTagHelper#extra_tags_for_form, for example). [#4700 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Support configuration of controller.controller_path on instances of | David Chelimsky | 2010-05-26 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | ActionView::TestCase::TestController without stubs. Just say: @controller.controller_path = "path/i/need/for/this/test" [#4697 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | 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> | ||||
* | | Move AV::TC to AV::TC::Behavior [#4678 state:resolved] | David Chelimsky | 2010-05-24 | 1 | -65/+85 |
| | | | | | | | | | | | | | | | | | | | | | | | | - enables alternative testing frameworks to include AV::TC::Behavior instead of subclassing AV::TC - also added tests and code for: - test view delegates :notice to request.flash - useful since generators generate views that use notice - test case doesn't try to include modules that are actually classes 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 | 3 | -5/+4 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-05-19 | 6 | -74/+293 |
|\ | |||||
| * | Avoid instance variable @output_buffer not initialized | Santiago Pastorino | 2010-05-19 | 1 | -1/+2 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Merge remote branch 'origin/master' | wycats | 2010-05-17 | 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> | ||||
| * | | Make sure encoding changes don't break 1.8 | wycats | 2010-05-17 | 1 | -1/+3 |
| | | | |||||
* | | | 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 | 7 | -38/+96 |
|\ \ \ | | |/ | |/| | |||||
| * | | Moved encoding work in progress to a feature branch. | Jeremy Kemper | 2010-05-16 | 4 | -284/+71 |
| |/ | | | | | | | This reverts commits af0d1a88157942c6e6398dbf73891cff1e152405 and 64d109e3539ad600f58536d3ecabd2f87b67fd1c. | ||||
| * | Significantly improved internal encoding heuristics and support. | wycats | 2010-05-16 | 4 | -35/+234 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Default Encoding.default_internal to UTF-8 * Eliminated the use of file-wide magic comments to coerce code evaluated inside the file * Read templates as BINARY, use default_external or template-wide magic comments inside the Template to set the initial encoding * This means that template handlers in Ruby 1.9 will receive Strings encoded in default_internal (UTF-8 by default) * Create a better Exception for encoding issues, and use it when the template source has bytes that are not compatible with the specified encoding * Allow template handlers to opt-into handling BINARY. If they do so, they need to do some of their own manual encoding work * Added a "Configuration Gotchas" section to the intro Rails Guide instructing users to use UTF-8 for everything * Use config.encoding= in Ruby 1.8, and raise if a value that is an invalid $KCODE value is used Also: * Fixed a few tests that were assert() rather than assert_equal() and were caught by Minitest requiring a String for the message * Fixed a test where an assert_select was misformed, also caught by Minitest being more restrictive * Fixed a test where a Rack response was returning a String rather than an Enumerable | ||||
| * | Initial work to improve the state of encodings for templates | wycats | 2010-05-16 | 2 | -45/+59 |
| | | |||||
| * | Check blocks are not incorrectly detected when compiling erubis templates ↵ | Simon Jefford | 2010-05-16 | 1 | -1/+1 |
| | | | | | | | | | | | | [#4575 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | 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> | ||||
| * | Optimize the code added in fa99de0bd054576336c9 | José Valim | 2010-05-15 | 1 | -9/+19 |
| | | |||||
| * | make sure `as` is set before trying to build an #{as}_counter. [#2804 ↵ | Jeff Kreeftmeijer | 2010-05-15 | 1 | -1/+1 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> |