summaryrefslogtreecommitdiffstats
path: root/lib/redmine/wiki_formatting
Commit message (Collapse)AuthorAgeFilesLines
* Merged r10885 from trunk (#12451).Jean-Philippe Lang2012-12-151-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@11007 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Updated macro documentation.Jean-Philippe Lang2012-08-181-32/+47
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10212 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Validate macro name and options.Jean-Philippe Lang2012-08-181-1/+7
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10211 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Let macros optionally accept a block of text (#3061).Jean-Philippe Lang2012-08-181-6/+43
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10210 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Macros processing overhaul (#3061, #11633).Jean-Philippe Lang2012-08-171-2/+12
| | | | | | | * macro arguments are no longer parsed by text formatters * macro output is escaped unless it's html safe git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10209 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Use the accessor.Jean-Philippe Lang2012-08-081-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10175 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds an option to macro definition to disable arguments parsing (#11578).Jean-Philippe Lang2012-08-081-7/+31
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10174 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged and minified jstoolbar.js and textile.js.Jean-Philippe Lang2012-07-281-2/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10095 e93f8b46-1217-0410-a6f0-8f06a7374b81
* JQuery in, Prototype/Scriptaculous out (#11445).Jean-Philippe Lang2012-07-221-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10068 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds a macro for inserting thumbnails in formatted text (#3510).Jean-Philippe Lang2012-07-161-0/+18
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10013 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed that lines with spaces only before headings break wiki section ↵Jean-Philippe Lang2012-06-111-1/+1
| | | | | | extraction (#11133). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9822 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Copyright update.Jean-Philippe Lang2012-05-053-3/+3
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9636 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Extracted auto_link and auto_mailto to a module.Jean-Philippe Lang2012-03-041-52/+4
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9063 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Allows custom styles in textile formatting using a white list of styles (#2416).Jean-Philippe Lang2012-02-121-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8860 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Missing html_safe.Jean-Philippe Lang2011-12-261-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8389 e93f8b46-1217-0410-a6f0-8f06a7374b81
* ruby1.9: macro must accept 2 arguments.Jean-Philippe Lang2011-12-101-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8168 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed: Wiki section edit escapes pre tags inside pre blocks (#9673).Jean-Philippe Lang2011-11-281-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7976 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed: Wiki section edit escapes code tags inside pre blocks (#9673).Jean-Philippe Lang2011-11-281-1/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7975 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed: Angle brackets within 'pre' blocks are silently replaced by HTML ↵Jean-Philippe Lang2011-11-281-1/+1
| | | | | | entities during wiki section-edit (#9673). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7969 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Wiki: allows single section edit (#2222).Jean-Philippe Lang2011-11-181-0/+63
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7829 e93f8b46-1217-0410-a6f0-8f06a7374b81
* remove trailing white-spaces from lib/redmine/wiki_formatting/macros.rb.Toshi MARUYAMA2011-09-011-15/+15
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6951 e93f8b46-1217-0410-a6f0-8f06a7374b81
* remove trailing white-spaces from ↵Toshi MARUYAMA2011-09-011-15/+15
| | | | | | lib/redmine/wiki_formatting/textile/formatter.rb. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6950 e93f8b46-1217-0410-a6f0-8f06a7374b81
* remove trailing white-spaces from lib/redmine/wiki_formatting/textile/helper.rb.Toshi MARUYAMA2011-09-011-5/+5
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6949 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Escapes wiki help link.Jean-Philippe Lang2011-03-281-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5242 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Prettier wiki syntax help link.Jean-Philippe Lang2011-03-281-5/+3
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5241 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Load scripts and css for wiki formatter toolbar when needed.Jean-Philippe Lang2011-03-281-5/+10
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5239 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Moves jstoolbar script include tags to head.Jean-Philippe Lang2011-03-281-4/+5
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5238 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed: line breaks are ignored in quoted text (#6148).Jean-Philippe Lang2011-03-141-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5133 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Extract headings and TOC parsing from the textile formatter.Jean-Philippe Lang2010-11-062-48/+3
| | | | | | Fixes #2038 and #3707 and will allow to support TOC with other text formatters. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4376 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed: auto links ending with right angle bracket shouldn't include the ↵Jean-Baptiste Barth2010-10-231-1/+1
| | | | | | bracket in the URL. #5652 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4287 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Sanitize image links and handle nils in the toc formatter. #5445Eric Davis2010-06-241-1/+3
| | | | | | Based on contribution by Yuki Kita. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3811 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Display the link name when external links are used in the toc macro. #5445Eric Davis2010-06-191-0/+3
| | | | | | Contributed by Yuki Kita and Jean-Baptiste Barth git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3786 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Escape href attribute in auto links (#5179).Jean-Philippe Lang2010-03-241-2/+4
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3612 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Replace the hardcoded "CodeRay" css class name for highlighted elements.Jean-Philippe Lang2010-03-141-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3585 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Extract CodeRay calls to Redmine::SyntaxHighlighting (#2985).Jean-Philippe Lang2010-03-141-2/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3584 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Do not html escape code that is going to be highlighted (#2985, #3359).Jean-Philippe Lang2010-03-141-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3582 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds a setting to cache textile rendering (off by default).Jean-Philippe Lang2010-02-061-29/+2
| | | | | | | | * it uses ActionController cache store which is MemoryStore by default and can be configured with config.action_controller.cache_store * macro processing was moved out of textile rendering so that it doesn't get cached * no noticeable improvement is expected for small portions of text, so only texts larger than 2KB are cached git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3372 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixes jstoolbar lang files case (#4190).Jean-Philippe Lang2009-11-111-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3025 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed: child_pages macro fails on wiki page history (#4152).Jean-Philippe Lang2009-11-041-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3006 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Rename the wiki toolbar's JavaScript variable, 'toolbar' conflicts withEric Davis2009-10-171-1/+1
| | | | | | the browser's variable. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2927 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Allow line breaks in wiki table cells (#2346).Jean-Philippe Lang2009-07-191-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2824 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed: TOC does not parse wiki page reference links with description (#2601).Jean-Philippe Lang2009-01-291-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2336 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Slight changes to ease Rails 2.2 support.Jean-Philippe Lang2009-01-041-2/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2234 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Do not use compute_public_path.Jean-Philippe Lang2009-01-041-2/+6
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2228 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Disable textile inline styles to prevent XSS attacks (#2377).Jean-Philippe Lang2008-12-281-0/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2192 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Extends child_pages macro to display child pages based on page parameter ↵Jean-Philippe Lang2008-11-221-13/+27
| | | | | | | | (#1975). It can also be called from anywhere now (not only from wiki pages). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2053 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Turn ftps and sftp proto into links (#1514).Jean-Philippe Lang2008-11-111-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2018 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Makes wiki text formatter pluggable.Jean-Philippe Lang2008-10-272-0/+226
| | | | | | Original patch #2025 by Yuki Sonoda slightly edited. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@1955 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds child_pages macro for wiki pages (#528).Jean-Philippe Lang2008-07-261-0/+6
| | | | git-svn-id: http://redmine.rubyforge.org/svn/trunk@1699 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Include macro can include a page of another project wiki using ↵Jean-Philippe Lang2008-04-131-13/+16
| | | | | | !{{include(projectname:Foo)}} (#1052). git-svn-id: http://redmine.rubyforge.org/svn/trunk@1350 e93f8b46-1217-0410-a6f0-8f06a7374b81