Commit Graph

54 Commits

Author SHA1 Message Date
Jean-Philippe Lang 01aa2db0af Merged r12899 (#16077).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12919 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-23 08:10:31 +00:00
Toshi MARUYAMA 2fc8ede093 Rails4: replace hard-coded html with class at Redmine::WikiFormatting::MacrosTest
See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12876 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-13 05:40:09 +00:00
Toshi MARUYAMA 35cc911192 update copyright year (#15977)
Contributed by Daniel Felix.

git-svn-id: http://svn.redmine.org/redmine/trunk@12736 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-29 22:45:39 +00:00
Toshi MARUYAMA c97986aa52 remove unneeded including ApplicationHelper from helper tests
git-svn-id: http://svn.redmine.org/redmine/trunk@12463 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-26 04:27:21 +00:00
Jean-Philippe Lang a657a12450 Don't load redcarpet with JRuby.
git-svn-id: http://svn.redmine.org/redmine/trunk@12453 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-23 17:07:51 +00:00
Jean-Philippe Lang 471e01ca50 Adds experimental support for Markdown formatting with redcarpet (#15520).
git-svn-id: http://svn.redmine.org/redmine/trunk@12452 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-23 13:05:10 +00:00
Jean-Philippe Lang 3578cf4d9a Replaced acronym with abbr tags (#15191).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12235 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-26 07:15:08 +00:00
Jean-Philippe Lang b3d80d50a3 Fixed that ordered/unordered lists inside table cell are mangled (#14038).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11845 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-05-14 16:29:59 +00:00
Jean-Philippe Lang e396a0eebe Copyright for 2013 (#12788).
Patch by Daniel Felix.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11169 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-12 09:29:31 +00:00
Jean-Philippe Lang 956239fc85 Fixed: Cannot edit a wiki section which title starts with a tab (#12799).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11159 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-10 22:05:22 +00:00
Jean-Philippe Lang 582dcf4b36 Fixed that macros with uppercase letters can not be called (#12744).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11126 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-05 23:11:35 +00:00
Jean-Philippe Lang 14e56006a1 Fixed that #extract_macro_options should not be greedy (#12451).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10885 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-27 19:59:33 +00:00
Jean-Philippe Lang d29fa4735b Adds a macro for inserting collapsed text (#12167).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10680 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-20 14:49:32 +00:00
Jean-Philippe Lang 747e4ecd3a Adds a "depth" option to the child_pages macro (#10789).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10401 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-16 15:24:35 +00:00
Jean-Philippe Lang 8b72710d7e Fixed: New multi-line macros regexp is too eager (#11736).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10276 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-02 10:24:56 +00:00
Jean-Philippe Lang fc3a09e49a Let macros optionally accept a block of text (#3061).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10210 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-18 08:25:22 +00:00
Jean-Philippe Lang 73aece0baf Macros processing overhaul (#3061, #11633).
* 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
2012-08-17 14:46:55 +00:00
Jean-Philippe Lang b907398788 Slight change to the macro regexp.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10178 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-08 18:54:01 +00:00
Jean-Philippe Lang e2d6f0af4e Adds an option to macro definition to disable arguments parsing (#11578).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10174 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-08 16:28:33 +00:00
Jean-Philippe Lang 537be80be2 Adds a macro for inserting thumbnails in formatted text (#3510).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10013 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-16 17:15:40 +00:00
Jean-Philippe Lang 965ef33192 Fixed that lines with spaces only before headings break wiki section extraction (#11133).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9822 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-11 17:51:14 +00:00
Jean-Philippe Lang ba5a052c8c Copyright update.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9636 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-05 12:56:53 +00:00
Jean-Philippe Lang 5e57a1a9d9 Merged rails-3.2 branch.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-25 17:17:49 +00:00
Jean-Philippe Lang 2cc294aa27 Fixed that textile nested lists are not properly closed in output (#10642).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9430 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-18 12:00:54 +00:00
Jean-Philippe Lang 37575f27fe Do not recognize invalid textile attributes.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8902 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-17 22:31:01 +00:00
Jean-Philippe Lang 0ede069d2c Allows custom styles in textile formatting using a white list of styles (#2416).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8860 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-12 14:00:43 +00:00
Jean-Philippe Lang b1bb26b1e0 ruby1.9: macro must accept 2 arguments.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8168 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-10 13:55:47 +00:00
Jean-Philippe Lang ee5d3ab19b Adds a test for child_pages macro failure.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8055 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-03 15:32:46 +00:00
Jean-Philippe Lang 036c3a56b4 Adds a test for macro registration.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8054 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-03 15:29:51 +00:00
Jean-Philippe Lang 30bc5873e0 Adds a test for macro_list wiki macro.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8053 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-03 15:25:02 +00:00
Jean-Philippe Lang d66c8faa9b Fixed: Wiki section edit escapes pre tags inside pre blocks (#9673).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7976 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-28 22:08:15 +00:00
Jean-Philippe Lang c5cabfe106 Fixed: Wiki section edit escapes code tags inside pre blocks (#9673).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7975 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-28 21:45:02 +00:00
Jean-Philippe Lang 9f15517095 Fixed: Angle brackets within 'pre' blocks are silently replaced by HTML entities during wiki section-edit (#9673).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7969 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-28 17:56:50 +00:00
Jean-Philippe Lang 6fc245327c Wiki: allows single section edit (#2222).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7829 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-18 16:25:00 +00:00
Toshi MARUYAMA e300188982 add unit test of escaping image urls (#9245)
Contributed by Holger Just.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7707 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-02 07:35:51 +00:00
Toshi MARUYAMA 69b8497ab8 remove trailing white-spaces from test/unit/lib/redmine/wiki_formatting/macros_test.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6789 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-08-30 07:54:23 +00:00
Toshi MARUYAMA 5e99c18073 remove trailing white-spaces from test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6759 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-08-30 05:05:23 +00:00
Toshi MARUYAMA 6208302840 use ActionView::TestCase instead of HelperTestCase at test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb.
ActionView::Helpers::ActiveRecordHelper at test/helper_testcase.rb
does not exist on Rails 3.0.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6116 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-22 04:02:27 +00:00
Toshi MARUYAMA 0df011ecee use ActionView::TestCase instead of HelperTestCase at test/unit/lib/redmine/wiki_formatting/macros_test.rb.
ActionView::Helpers::ActiveRecordHelper at test/helper_testcase.rb
does not exist on Rails 3.0.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6115 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-22 04:01:45 +00:00
Jean-Philippe Lang 6f5ffce799 Fixed: line breaks are ignored in quoted text (#6148).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5133 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-14 20:35:36 +00:00
Jean-Philippe Lang 208d2d4090 Moved text formatting tests from application_helper tests to formatter tests.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5132 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-14 20:29:06 +00:00
Jean-Philippe Lang 7db930f1b4 Fixed: Wiki headings containing backslash followed by a digit are not displayed correctly (#7846).
Contributed by Etienne Massip.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5100 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-12 18:28:30 +00:00
Jean-Baptiste Barth 17f86d964f Use absolute paths in test/**/* requires for Ruby 1.9.2 compatibility. #4050
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4509 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-12 23:24:34 +00:00
Jean-Philippe Lang 024ff96ee2 Extract headings and TOC parsing from the textile formatter.
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
2010-11-06 17:47:27 +00:00
Jean-Philippe Lang f79a6f701a Makes textile formatter accept 2 letters acronym (#6591).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4374 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-06 13:29:23 +00:00
Jean-Philippe Lang 533590c29c Fixed: Double-dash results in strikethrough text (#5122).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3605 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-20 12:54:23 +00:00
Jean-Philippe Lang c312b8b058 More detailed failures message.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3570 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-12 15:22:05 +00:00
Jean-Philippe Lang 4d19007fd1 Fixes a test failure.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3569 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-12 15:19:49 +00:00
Jean-Philippe Lang 7adf05810a Refactors textile formatting tests.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3568 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-12 15:17:53 +00:00
Jean-Philippe Lang 054ff0db8e Fixed: inline code with less-then/greater-than produces @lt; and @gt; (#1416).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3567 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-12 15:12:23 +00:00