Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | More symbols for send and respond_to?. | Clemens Kofler | 2008-09-03 | 1 | -1/+1 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Added TextHelper#current_cycle to return the current cycle for better design ↵ | Ken Collins | 2008-08-27 | 1 | -3/+40 |
| | | | | | | | | options. [#417 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Require missing libraries and check for defined ActionController constant so ↵ | Joshua Peek | 2008-08-26 | 1 | -1/+10 |
| | | | | ActionView can be used standalone | ||||
* | Fixed autolink regexp compatibility for ruby 1.9 [#783 state:resolved] | Stefan Kaes | 2008-08-09 | 1 | -1/+1 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Reapply 'cab168ac' because it was accidentally patched over in '10d9fe4b' | Joshua Peek | 2008-07-29 | 1 | -1/+1 |
| | |||||
* | Refactored TextHelper#truncate, highlight, excerpt, word_wrap and auto_link ↵ | Clemens Kofler | 2008-07-27 | 1 | -58/+148 |
| | | | | | | to accept options hash [#705 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Ruby 1.9: Fixed regexp warning by replacing nested repeat operator + and ? ↵ | Joshua Peek | 2008-07-19 | 1 | -1/+1 |
| | | | | with '*' | ||||
* | Pass caller to concat deprecation warning | Jeremy Kemper | 2008-07-09 | 1 | -1/+1 |
| | |||||
* | Allow single quote (the ' character) in the middle of URL when ↵ | Cheah Chu Yeow | 2008-06-27 | 1 | -1/+1 |
| | | | | | | auto_link-ing. [#471 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Check whether blocks are called from erb using a special __in_erb_template ↵ | Jeremy Kemper | 2008-06-19 | 1 | -5/+1 |
| | | | | variable visible in block binding. | ||||
* | add deprecation for the #concat helper's 2nd argument, which is no longer needed | rick | 2008-06-09 | 1 | -1/+5 |
| | |||||
* | Use output_buffer reader and writer methods exclusively instead of hitting ↵ | Jeremy Kemper | 2008-06-08 | 1 | -2/+2 |
| | | | | the instance variable so others can override the methods. | ||||
* | concat should ignore nil | Jeremy Kemper | 2008-06-06 | 1 | -1/+1 |
| | |||||
* | Don't pass block binding to concat | Jeremy Kemper | 2008-06-02 | 1 | -4/+4 |
| | |||||
* | Try replacing _erbout with @output_buffer | Jeremy Kemper | 2008-06-02 | 1 | -2/+6 |
| | |||||
* | Fix auto_link helper for already linked urls. [#72 state:resolved] | Kevin Glowacz | 2008-05-22 | 1 | -2/+2 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Parentheses should be acceptable characters for auto_link_urls. [#234 ↵ | Adam | 2008-05-22 | 1 | -1/+1 |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | auto_link helper fails to recognize links separated by space. [#72 ↵ | Eugene Pimenov | 2008-05-16 | 1 | -1/+1 |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Don't fallback to just adding "'s" in TextHelper#pluralize, because the ↵ | Joshua Peek | 2008-05-14 | 1 | -68/+59 |
| | | | | Inflector is always loaded. |