Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-08 22:36:02 +01:00
Code Issues Packages Projects Releases Activity
13,581 Commits 35 Branches 222 Tags
d0b10af3ffbe5f88ea7e512d66a4f58c14684d21
Commit Graph

77 Commits

Author SHA1 Message Date
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
Jean-Philippe Lang
c4484a40c0 Use relative URL for thumbnails according to :only_path option (#18119). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13451 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-18 10:14:17 +00:00
Jean-Philippe Lang
b12be8025d Include host in macro generated thumbnails urls (#16989). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13218 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-05 10:13:08 +00:00
Jean-Philippe Lang
bcc5ac38f3 Crash in markdown formatter causes ruby process to end (#16781). 
Patch by Jens Krämer.

git-svn-id: http://svn.redmine.org/redmine/trunk@13122 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-02 06:57:29 +00:00
Jean-Philippe Lang
d197203d79 Set Redcarpet :no_intra_emphasis to true (#16669). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13105 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-04-26 07:02:45 +00:00
Jean-Philippe Lang
e8057d41bb Fixed that collapse macro with headings breaks the table of contents (#16077). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12899 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-15 10:55:29 +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