Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-10-30 01:36:04 +01:00
Code Issues Packages Projects Releases Activity
13,569 Commits 35 Branches 222 Tags
092cadb0ccc6028e277c84ea35c24df59d002b26
Commit Graph

92 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
ca1fbf1ea1 Render all possible inline textile images even if an invalid one exists (#26157). 
Patch by Holger Just.

git-svn-id: http://svn.redmine.org/redmine/trunk@16668 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-17 07:45:08 +00:00
Jean-Philippe Lang
7f4767418b Generate markup for uploaded image dropped into wiki-edit textarea (#26071). 
Patch by Felix Gliesche.

git-svn-id: http://svn.redmine.org/redmine/trunk@16643 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-07 21:01:45 +00:00
Jean-Philippe Lang
f902860955 Link to user in wiki syntax (#4179). 
Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@16636 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-07 20:10:57 +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
ddef0ad7c1 Moves redcloth3.rb to lib/redmine/wiki_formatting/textile. 
git-svn-id: http://svn.redmine.org/redmine/trunk@16358 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-03 17:16:53 +00:00
Jean-Philippe Lang
df5dba5dde Modify circular inclusion test to use page.id instead of page.title (#24869). 
Patch by Michael Esemplare.

git-svn-id: http://svn.redmine.org/redmine/trunk@16227 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-19 18:32:06 +00:00
Jean-Philippe Lang
a4bc898012 Limits the schemes that inline images can use (#22926). 
git-svn-id: http://svn.redmine.org/redmine/trunk@15433 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-01 17:32:35 +00:00
Jean-Philippe Lang
c246ffa184 Limits the schemes that Markdown links can use (#22924). 
git-svn-id: http://svn.redmine.org/redmine/trunk@15431 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-01 16:55:37 +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
11bce09825 Typo "coma" (#20551). 
Patch by budo kaiman.

git-svn-id: http://svn.redmine.org/redmine/trunk@14712 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-10-20 18:26:28 +00:00
Jean-Philippe Lang
dfa69b2eb0 Enables footnote support with Markdown (#16072). 
Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@14628 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-30 18:42:23 +00:00
Jean-Philippe Lang
0a8e4b1628 Don't duplicate tags. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14316 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-16 18:28:28 +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
Toshi MARUYAMA
958d93edbc add markdown wiki syntax help to tool bar (#16373) 
Contributed by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@14191 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-20 12:14:04 +00:00
Toshi MARUYAMA
06ea3e48eb rename textile wiki syntax help files (#16373) 
git-svn-id: http://svn.redmine.org/redmine/trunk@14187 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-20 07:52:57 +00:00
Jean-Philippe Lang
8868ecc624 Don't process macro descriptions with text formatter (#18961). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13955 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-31 14:26:32 +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
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
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
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
Toshi MARUYAMA
0be69b8b04 copy English wiki syntax helps to other languages (#14630) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12096 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-08-08 03:49:00 +00:00
Toshi MARUYAMA
43da3859bc revert r12094 (#14630) 
r12094 lost "svn copy".

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12095 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-08-08 03:46:39 +00:00
Toshi MARUYAMA
e4c13efed7 copy English wiki syntax helps to other languages (#14630) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12094 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-08-08 03:38:50 +00:00
Toshi MARUYAMA
7394aeaa32 move English wiki syntax helps to en sub directory (#14630) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12093 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-08-08 03:38:21 +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
a18f6ffb37 Icon for the textile help link. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11087 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-01-02 07:47:12 +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
34b64d646f Updates macro description (#10789). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10402 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-09-16 15:27:21 +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
a5c4fcc8f0 Updated macro documentation. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10212 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-08-18 12:55:00 +00:00
Jean-Philippe Lang
29d54f5d50 Validate macro name and options. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10211 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-08-18 12:35:14 +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
9553325ee3 Use the accessor. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10175 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-08-08 16:35:25 +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
a7a0d47f2e Merged and minified jstoolbar.js and textile.js. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10095 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-07-28 15:58:54 +00:00
Jean-Philippe Lang
6a2ca5e034 JQuery in, Prototype/Scriptaculous out (#11445). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10068 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-07-22 13:29:26 +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