Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-07 13:55:52 +01:00
Code Issues Packages Projects Releases Activity
15,144 Commits 35 Branches 222 Tags
41f1922d23bb2ac3d43b80f2b1fa036a6fbdf820
Commit Graph

108 Commits

Author SHA1 Message Date
Toshi MARUYAMA
1797f7abb0 cleanup: rubocop: fix Layout/AlignArguments in test/unit/lib/redmine/wiki_formatting/macros_test.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@18926 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-06 12:03:58 +00:00
Go MAEDA
19990751a5 Eases the regexp used to determine the start of a code block (#32359). 
Patch by Jens Krämer.


git-svn-id: http://svn.redmine.org/redmine/trunk@18880 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-10-29 21:54:04 +00:00
Toshi MARUYAMA
b7b42e9d76 code cleanup: rubocop: fix Layout/CommentIndentation and Layout/MultilineArrayBraceLayout in test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@18810 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-10-22 11:41:21 +00:00
Toshi MARUYAMA
89e9b05b3d code cleanup: rubocop: fix Layout/CommentIndentation and Layout/MultilineArrayBraceLayout of STR_WITH_PRE in test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@18699 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-10-17 04:15:37 +00:00
Toshi MARUYAMA
1f14386822 code cleanup: rubocop: fix Layout/CommentIndentation and Layout/MultilineArrayBraceLayout of STR_WITHOUT_PRE in test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@18698 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-10-17 04:15:26 +00:00
Go MAEDA
878f4c3455 Add tests for r18383 (#31231). 
Patch by Mizuki ISHIKAWA.


git-svn-id: http://svn.redmine.org/redmine/trunk@18384 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-08-24 07:03:01 +00:00
Go MAEDA
70284ee244 MarkdownFormatterTest#test_should_support_underlined_text is declared as private (#31929). 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@18381 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-08-21 00:31:54 +00:00
Go MAEDA
f5c7a4a420 Convert HTML links to Textile/Markdown links when creating an issue from an email (#31695). 
Patch by Yuichi HARADA.


git-svn-id: http://svn.redmine.org/redmine/trunk@18361 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-08-11 05:01:37 +00:00
Go MAEDA
8d87f23370 Update redcarpet to 3.5.0 (#31847). 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@18353 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-08-05 00:20:00 +00:00
Jean-Philippe Lang
c4a9d4cd4d Issue macro for flexible linking to issues (#29489). 
Patch by Jens Krämer.

git-svn-id: http://svn.redmine.org/redmine/trunk@18297 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-06-20 14:01:50 +00:00
Jean-Philippe Lang
c0a638721c Text may unexpectedly be enclosed in pre tags when an issue is created via HTML email (#31232). 
Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@18268 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-06-20 06:38:19 +00:00
Go MAEDA
adebf4da1d Remove trailing whitespaces from test (#31506). 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@18233 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-06-06 14:53:23 +00:00
Go MAEDA
4082069c75 Update copyright year. 
git-svn-id: http://svn.redmine.org/redmine/trunk@18198 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-05-25 07:36:06 +00:00
Go MAEDA
4f5a3a156c Enable frozen_string_literal for some files under test directory (#26561). 
git-svn-id: http://svn.redmine.org/redmine/trunk@17978 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-03-16 15:03:47 +00:00
Go MAEDA
e70c283a22 Remove unnecessary encoding magic comment (#31034). 
The default script encoding is UTF-8 in Ruby 2.0 or later.

Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@17976 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-03-16 06:26:33 +00:00
Go MAEDA
5861160ffc Add "frozen_string_literal: false" for all files (#26561). 
This will be changed to true in the future.


git-svn-id: http://svn.redmine.org/redmine/trunk@17947 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-03-15 01:32:57 +00:00
Go MAEDA
019b640d81 Reverts r17891 (#30099). 
git-svn-id: http://svn.redmine.org/redmine/trunk@17939 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-03-10 23:37:57 +00:00
Go MAEDA
ef9c879718 Multiple blank lines in pre tags are not preserved in Textile (#30099). 
Patch by Takenori TAKAKI.


git-svn-id: http://svn.redmine.org/redmine/trunk@17891 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-02-20 10:31:30 +00:00
Go MAEDA
7fbcb8c908 Tags start with 'pre' are handled as 'pre' tag in Textile (#8395). 
Patch by Takenori TAKAKI and Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@17636 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-26 04:40:09 +00:00
Go MAEDA
e8243d213d \f or \v character in Textile markup may cause RegexpError exception (#29756). 
Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@17603 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-10-28 11:01:54 +00:00
Jean-Philippe Lang
eb1e6d8c26 Syntax highlighter: replace CodeRay with Rouge (#24681). 
Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@17532 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-09-29 06:57:40 +00:00
Go MAEDA
2cffbf1d45 Fix typo in test name: s/highligth/highlight/ (#29440). 
Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@17477 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-08-26 11:37:13 +00:00
Go MAEDA
26f4b5181f Fix: Textile phrase modifiers break wiki macros (#29247). 
Patch by Stephan Wenzel.


git-svn-id: http://svn.redmine.org/redmine/trunk@17450 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-07-21 00:16:27 +00:00
Jean-Philippe Lang
794a2a0180 Enable and add underline button to the toolbar for Markdown formatting (#28169). 
Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@17385 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-06-16 10:56:52 +00:00
Go MAEDA
00b85dc8d9 Fix: Syntax highlighter does not work if language name is single-quoted (#28469). 
Patch by Mizuki ISHIKAWA.


git-svn-id: http://svn.redmine.org/redmine/trunk@17322 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-05-02 02:27:10 +00:00
Jean-Philippe Lang
040f31d867 Markdown pre-block could derive incorrect wiki sections (#25299). 
Patch by Kiichi Ozaki.

git-svn-id: http://svn.redmine.org/redmine/trunk@17266 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-04-07 07:34:43 +00:00
Go MAEDA
e9fb90856f Move textile footnotes test to TextileFormatterTest (#28207). 
Patch by Mischa The Evil.


git-svn-id: http://svn.redmine.org/redmine/trunk@17222 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-03-02 04:58:52 +00:00
Go MAEDA
8d033d08d0 Add footnotes test for markdown formatter (#28207). 
Patch by Mischa The Evil.


git-svn-id: http://svn.redmine.org/redmine/trunk@17221 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-03-02 04:55:52 +00:00
Go MAEDA
241e4cbb68 Enable lax_spacing for markdown formatting (#28119). 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@17198 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-02-16 05:01:14 +00:00
Go MAEDA
f496402634 Add tests for "height" and "max-height" (#26552). 
git-svn-id: http://svn.redmine.org/redmine/trunk@17175 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-13 00:32:53 +00:00
Go MAEDA
e4142a8338 Allow "max-height", "max-width", "min-height" and "min-width" CSS properties in Textile (#26552). 
Patch by Michael Gerz and Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@17173 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-11 01:32:18 +00:00
Jean-Philippe Lang
85a0e96ad6 Set a default size for macro thumbnails different from the preview thumbnails. 
git-svn-id: http://svn.redmine.org/redmine/trunk@16829 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-19 07:00:27 +00:00
Jean-Philippe Lang
7fd04e1f8d Update copyright. 
git-svn-id: http://svn.redmine.org/redmine/trunk@16685 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-25 08:40:31 +00:00
Jean-Philippe Lang
4f2c5a9945 Filter arbitrary class names and ids in rendered HTML output (#25503). 
* Disallow setting arbitrary classes and ids via Textile syntax
* Only allow valid/supported languages for syntax highlighted code blocks

Patch by Jan Schulz-Hofen.

git-svn-id: http://svn.redmine.org/redmine/trunk@16502 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-06 16:41:52 +00:00
Jean-Philippe Lang
99fa41011f Add kbd to ALLOWED_TAGS (#25503). 
Patch by Jan Schulz-Hofen.

git-svn-id: http://svn.redmine.org/redmine/trunk@16500 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-06 16:34:52 +00:00
Jean-Philippe Lang
af29408e83 Add "Table of contents" heading to toc macro (#23179). 
git-svn-id: http://svn.redmine.org/redmine/trunk@15992 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-11-19 13:50:30 +00:00
Jean-Philippe Lang
ff50094d3e Include url helpers in helper tests. 
git-svn-id: http://svn.redmine.org/redmine/trunk@15686 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-16 16:17:14 +00:00
Jean-Philippe Lang
4c2fcb0865 Fixed that empty Markdown image tag raises en error (#23246). 
git-svn-id: http://svn.redmine.org/redmine/trunk@15607 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-06 18:18:27 +00:00
Jean-Philippe Lang
cda9c63d9c Updates copyright for 2016. 
git-svn-id: http://svn.redmine.org/redmine/trunk@15238 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-03-13 10:30:10 +00:00
Jean-Philippe Lang
cb38ee0e35 Adds a test for #21202 (#6969). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14867 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-11 07:39:09 +00:00
Jean-Philippe Lang
868d949f47 Reverts r14812 (#6969). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14863 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-11 07:34:15 +00:00
Jean-Philippe Lang
c6283d7ce5 Fixed that less-than sign is not escaped by textile formatter (#6969). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14812 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-07 10:20:57 +00:00
Jean-Philippe Lang
49604a3bae Table renders wrong if a trailing space is after | symbol (#18223). 
Patch by Jens Krämer.

git-svn-id: http://svn.redmine.org/redmine/trunk@14611 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-20 11:02:01 +00:00
Jean-Philippe Lang
c88ecf0e93 Markdown formatter not running on rake test. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14317 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-16 18:30:30 +00:00
Jean-Philippe Lang
e911ce7cb4 Remove style tags from html body (#15716). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14315 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-16 18:23:25 +00:00
Jean-Philippe Lang
3ae42cb326 Better handle html-only emails (#16962). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14313 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-15 21:16:42 +00:00
Jean-Philippe Lang
09356f4e67 Can't apply textile modifiers to 1 non-ASCII character (#19995). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14295 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-06 07:15:55 +00:00
Jean-Philippe Lang
000124f44f Copyright update. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13872 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-11 09:09:50 +00:00
Jean-Philippe Lang
ef5ff1630a Textile: ignore invalid lang attribute values (#18501). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13677 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-30 14:55:03 +00:00
Jean-Philippe Lang
2d1866d966 Merged rails-4.1 branch (#14534). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 17:37:16 +00:00