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

58 Commits

Author SHA1 Message Date
Jean-Philippe Lang
270b6c4d7e User link syntax (user:login) doesn't work for logins consisting of an email adress (#26443). 
Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@17392 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-06-17 05:45:17 +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
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
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
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
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
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
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
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
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
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
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
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
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
739820141a Extracted auto_link and auto_mailto to a module. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9063 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-04 10:04:46 +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
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
1556481ab1 remove trailing white-spaces from lib/redmine/wiki_formatting/textile/formatter.rb. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6950 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-09-01 02:04:13 +00:00
Toshi MARUYAMA
9be5f2aad6 remove trailing white-spaces from lib/redmine/wiki_formatting/textile/helper.rb. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6949 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-09-01 02:03:23 +00:00
Jean-Philippe Lang
2d3f69f8b1 Escapes wiki help link. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5242 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-03-28 20:16:05 +00:00
Jean-Philippe Lang
f7edfe7652 Prettier wiki syntax help link. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5241 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-03-28 20:12:15 +00:00
Jean-Philippe Lang
bf58ad61e5 Load scripts and css for wiki formatter toolbar when needed. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5239 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-03-28 19:59:35 +00:00
Jean-Philippe Lang
70d765e906 Moves jstoolbar script include tags to head. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5238 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-03-28 19:56:22 +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
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-Baptiste Barth
d642964035 Fixed: auto links ending with right angle bracket shouldn't include the bracket in the URL. #5652 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4287 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-23 22:35:02 +00:00
Eric Davis
6eea3300f8 Sanitize image links and handle nils in the toc formatter. #5445 
Based on contribution by Yuki Kita.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3811 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-06-24 02:35:24 +00:00
Eric Davis
b53de502ab Display the link name when external links are used in the toc macro. #5445 
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
 2010-06-19 21:39:21 +00:00
Jean-Philippe Lang
8cdcf308be Escape href attribute in auto links (#5179). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3612 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-03-24 20:26:22 +00:00
Jean-Philippe Lang
ad487bf7cc Replace the hardcoded "CodeRay" css class name for highlighted elements. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3585 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-03-14 13:22:50 +00:00
Jean-Philippe Lang
c03b4c2e1e Extract CodeRay calls to Redmine::SyntaxHighlighting (#2985). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3584 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-03-14 12:57:08 +00:00
Jean-Philippe Lang
7621463acb Do not html escape code that is going to be highlighted (#2985, #3359). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3582 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-03-14 09:05:58 +00:00
Jean-Philippe Lang
2ad8242ae7 Adds a setting to cache textile rendering (off by default). 
* 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
 2010-02-06 10:40:21 +00:00
Jean-Philippe Lang
b8b8cea288 Fixes jstoolbar lang files case (#4190). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3025 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-11-11 10:55:19 +00:00