Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-06-20 | 1 | -14/+18 | |
|\ | | | | | | | | | Conflicts: actionpack/lib/abstract_controller/base.rb | |||||
| * | Make text_helpers methods which return valid html to return it as safe and ↵ | Santiago Pastorino | 2010-06-17 | 1 | -6/+14 | |
| | | | | | | | | | | | | | | | | sanitize the input always unless :sanitize => false is set [#4825 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | |||||
| * | truncate() should not try to produce HTML-safe output | Wincent Colaiuta | 2010-06-17 | 1 | -8/+4 | |
| | | | | | | | | | | | | | | | | | | | | As discussed in Lighthouse ticket #4825 and ticket #4878, the truncate() method cannot guarantee safe output for all possible inputs/offsets, so it is best to leave the output unsafe so that it gets escaped when used in a view. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | |||||
* | | Added titles and description. | Rizwan Reza | 2010-06-16 | 1 | -0/+1 | |
| | | ||||||
* | | Fix a bunch of minor spelling mistakes | Evgeniy Dolzhenko | 2010-06-15 | 1 | -1/+1 | |
|\ \ | |/ |/| | ||||||
| * | Fix a bunch of minor spelling mistakes | Evgeniy Dolzhenko | 2010-06-11 | 1 | -1/+1 | |
| | | ||||||
* | | edit pass: the names of Rails components have a space, ie, "Active Record", ↵ | Xavier Noria | 2010-06-14 | 1 | -1/+1 | |
| | | | | | | | | not "ActiveRecord" | |||||
* | | truncate safe method description changes | Neeraj Singh | 2010-06-14 | 1 | -1/+1 | |
| | | ||||||
* | | truncate documentation an examples added for :safe option | Santiago Pastorino | 2010-06-13 | 1 | -0/+10 | |
| | | ||||||
* | | 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> | |||||
* | 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> | |||||
* | 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> | |||||
* | 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 | |||||
* | 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 | |
| | ||||||
* | 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] | |||||
* | adds missing requires for Object#blank? and Object#present? | Xavier Noria | 2010-03-28 | 1 | -0/+1 | |
| | ||||||
* | Merge branch 'master' into docrails | wycats | 2010-03-26 | 1 | -2/+2 | |
|\ | ||||||
| * | Remove some 1.9 warnings (resulting in some fixed bugs). Remaining AM ↵ | wycats | 2010-03-17 | 1 | -1/+1 | |
| | | | | | | | | warnings are in dependencies. | |||||
| * | Some more tweaks on <% %>. | Carlhuda | 2010-03-16 | 1 | -1/+1 | |
| | | | | | | | | * The cache helper is now semantically "mark this region for caching" * As a result, <% x = cache do %> no longer works | |||||
* | | Nitpick: the first value should be odd, second is even. | Ryan Bigg | 2010-02-27 | 1 | -1/+1 | |
| | | ||||||
* | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-02-14 | 1 | -3/+3 | |
|\| | | | | | | | | | | | | | | | Conflicts: railties/README railties/guides/source/active_support_core_extensions.textile railties/guides/source/getting_started.textile railties/lib/generators/rails/app/templates/README | |||||
| * | simple_format returns a safe buffer escaping unsafe input [Santiago Pastorino] | David Heinemeier Hansson | 2010-02-12 | 1 | -1/+1 | |
| | | ||||||
| * | Safely concat the ending tag to simple_format or it will be escaped | David Heinemeier Hansson | 2010-02-12 | 1 | -1/+1 | |
| | | ||||||
| * | Fix pluralization for numbers formatted like '1.00' | Gabriel Mansour | 2010-02-07 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | | revises an example in the rdoc of TextHelper#concat | Xavier Noria | 2010-02-06 | 1 | -1/+1 | |
|/ | ||||||
* | For performance reasons, you can no longer call html_safe! on Strings. ↵ | Yehuda Katz | 2010-01-31 | 1 | -5/+5 | |
| | | | | | | | | | | | | Instead, all Strings are always not html_safe?. Instead, you can get a SafeBuffer from a String by calling #html_safe, which will SafeBuffer.new(self). * Additionally, instead of doing concat("</form>".html_safe), you can do safe_concat("</form>"), which will skip both the flag set, and the flag check. * For the first pass, I converted virtually all #html_safe!s to #html_safe, and the tests pass. A further optimization would be to try to use #safe_concat as much as possible, reducing the performance impact if we know up front that a String is safe. | |||||
* | Merge docrails | Pratik Naik | 2010-01-17 | 1 | -4/+2 | |
| | ||||||
* | adding fix for auto linking to master too | Zach Brock | 2010-01-05 | 1 | -1/+1 | |
| | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
* | Support passing Redcloth options via textilize helper [#2973 state:resolved] | rizwanreza | 2009-08-09 | 1 | -3/+11 | |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | Update truncate documentation / examples to more clearly demonstrate its ↵ | Steve St. Martin | 2009-08-08 | 1 | -8/+10 | |
| | | | | | | | | actual behavior [#3016 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Merge docrails | Pratik Naik | 2009-07-25 | 1 | -2/+2 | |
| | ||||||
* | Truncate helper accepts a :separator for a more legible result [#1807 ↵ | Andy Stewart | 2009-05-18 | 1 | -1/+6 | |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | Ensure auto_link does not ignore multiple trailing punctuations [#2504 ↵ | Lance Ivy | 2009-05-17 | 1 | -6/+7 | |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | Merge docrails | Pratik Naik | 2009-03-24 | 1 | -3/+3 | |
| | ||||||
* | Ensure auto_link doesnt linkify URLs in the middle of a tag [#1523 ↵ | Eugene Pimenov | 2009-03-10 | 1 | -2/+3 | |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | Ruby 1.9 compat: removed redundant nested repeat operator | Joshua Peek | 2009-02-07 | 1 | -1/+1 | |
| | ||||||
* | Using the highlight helper on text with html shouldn't highlight text inside ↵ | Dan Weinand | 2009-01-28 | 1 | -1/+1 | |
| | | | | | | html attributes. [#1302 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | allow options to be passed to email address auto generation | Andrew Kaspick | 2008-12-01 | 1 | -4/+4 | |
| | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1418 state:committed] | |||||
* | Autoload HTML::Document and sanitizers | Jeremy Kemper | 2008-11-23 | 1 | -10/+0 | |
| | ||||||
* | Fixed RedCloth and BlueCloth shouldn't preload. Instead just assume that ↵ | David Heinemeier Hansson | 2008-11-17 | 1 | -81/+69 | |
| | | | | they're available if you want to use textilize and markdown and let autoload require them [DHH] | |||||
* | auto_link helper: add intelligent ending closing bracket handling. add new ↵ | Mislav Marohnić | 2008-11-15 | 1 | -9/+13 | |
| | | | | | | | tests and reorder new ones for readability Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1353 state:committed] | |||||
* | refactor autolink helper. change tests to expect HTML-escaped URLs | Mislav Marohnić | 2008-11-15 | 1 | -26/+20 | |
| | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
* | auto_link view helper was failing on URLs with colons after a query param | Rich Manalang | 2008-11-07 | 1 | -2/+2 | |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1341 state:committed] | |||||
* | Merge with docrails | Pratik Naik | 2008-11-02 | 1 | -5/+5 | |
| | ||||||
* | Remove special 1.9 version of excerpt helper. | Manfred Stienstra | 2008-09-21 | 1 | -45/+45 | |
| | ||||||
* | Change all calls to String#chars to String#mb_chars. Remove a exception for ↵ | Manfred Stienstra | 2008-09-21 | 1 | -87/+41 | |
| | | | | Ruby <= 1.9. | |||||
* | Merge docrails | Pratik Naik | 2008-09-03 | 1 | -1/+1 | |
| |