Merged r12302 from trunk to 2.4-stable (#15391, #15401)

Fix wiki syntax "bold italic".

Contributed by Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12307 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2013-11-19 13:22:50 +00:00
parent cd13c5e6d1
commit 1cf93f6e32
46 changed files with 46 additions and 46 deletions

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>gras</strong></li>
<li><em>_italique_</em></li>
<li><em>*gras italique*</em></li>
<li><em><strong>gras italique</strong></em></li>
<li><ins>sous-ligné</ins></li>
<li><del>barré</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>粗體</strong></li>
<li><em>斜體</em></li>
<li><em>*粗斜體*</em></li>
<li><em><strong>粗斜體</strong></em></li>
<li><ins>底線</ins></li>
<li><del>刪除線</del></li>
</ul>

View File

@ -186,7 +186,7 @@ http://www.redmine.org, someone@foo.bar
<ul>
<li><strong>bold</strong></li>
<li><em>italic</em></li>
<li><em>*bold italic*</em></li>
<li><em><strong>bold italic</strong></em></li>
<li><ins>underline</ins></li>
<li><del>strike-through</del></li>
</ul>