core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modules/base: fix markdown mention regex for #826 

- conf/locale: add mew translator profile
This commit is contained in:
Unknwon 2015-02-06 19:15:58 -05:00
parent ddddad9792
commit 0669897226
6 changed files with 86 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf/locale/TRANSLATORS
View File

@ -3,6 +3,7 @@
Akihiro YAGASAKI <yaggytter@momiage.com> Akihiro YAGASAKI <yaggytter@momiage.com>
Christoph Kisfeld <christoph.kisfeld@gmail.com> Christoph Kisfeld <christoph.kisfeld@gmail.com>
Huimin Wang <wanghm2009@hotmail.co.jp>
Thomas Fanninger <gogs.thomas@fanninger.at> Thomas Fanninger <gogs.thomas@fanninger.at>
Łukasz Jan Niemier <lukasz@niemier.pl> Łukasz Jan Niemier <lukasz@niemier.pl>
Lafriks <lafriks@gmail.com> Lafriks <lafriks@gmail.com>

2
gogs.go
View File

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.5.12.0204 Beta" const APP_VER = "0.5.12.0206 Beta"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

2
modules/base/markdown.go
View File

@ -106,7 +106,7 @@ func (options *CustomRender) Image(out *bytes.Buffer, link []byte, title []byte,
} }
var ( var (
MentionPattern = regexp.MustCompile(`(\s@)[0-9a-zA-Z_]{1,}`) MentionPattern = regexp.MustCompile(`((^|\s)@)[0-9a-zA-Z_]{1,}`)
commitPattern = regexp.MustCompile(`(\s|^)https?.*commit/[0-9a-zA-Z]+(#+[0-9a-zA-Z-]*)?`) commitPattern = regexp.MustCompile(`(\s|^)https?.*commit/[0-9a-zA-Z]+(#+[0-9a-zA-Z-]*)?`)
issueFullPattern = regexp.MustCompile(`(\s|^)https?.*issues/[0-9]+(#+[0-9a-zA-Z-]*)?`) issueFullPattern = regexp.MustCompile(`(\s|^)https?.*issues/[0-9]+(#+[0-9a-zA-Z-]*)?`)
issueIndexPattern = regexp.MustCompile(`( |^)#[0-9]+`) issueIndexPattern = regexp.MustCompile(`( |^)#[0-9]+`)

6
public/ng/css/gogs.css
View File

@ -364,6 +364,9 @@ img.avatar-100 {
.markdown table tr:nth-child(2n) { .markdown table tr:nth-child(2n) {
background-color: #F8F8F8; background-color: #F8F8F8;
} }
.markdown p {
margin: 20px 0;
}
.markdown a { .markdown a {
color: #428BCA; color: #428BCA;
} }
@ -448,9 +451,6 @@ img.avatar-100 {
margin: 15px 0; margin: 15px 0;
border-bottom: 2px solid #EEE; border-bottom: 2px solid #EEE;
} }
.markdown p {
margin: 20px 0;
}
.markdown blockquote:last-child, .markdown blockquote:last-child,
.markdown ul:last-child, .markdown ul:last-child,
.markdown ol:last-child, .markdown ol:last-child,

3
public/ng/less/gogs/markdown.less
View File

@ -83,6 +83,9 @@
} }
} }
} }
p {
margin: 20px 0;
}
} }
.markdown a { .markdown a {
color: #428BCA; color: #428BCA;

2
templates/.VERSION
View File

@ -1 +1 @@
0.5.12.0204 Beta 0.5.12.0206 Beta