mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-14 01:35:55 +09:00
finish close/reopen issue
This commit is contained in:
Unknwon committed
1 parent
0ec7d1539b
commit
1fb53067f4
12 files changed
+115
-27
No files matched your search
@@ -409,7 +409,10 @@ issues.commented_at = `commented at <a id="%[1]s" href="#%[1]s">%[2]s</a>`
|
||||
issues.no_content = There is no content yet.
|
||||
issues.close_issue = Close
|
||||
issues.close_comment_issue = Close and comment
|
||||
issues.reopen_issue = Reopen
|
||||
issues.reopen_comment_issue = Reopen and comment
|
||||
issues.create_comment = Comment
|
||||
issues.closed_at = `closed at <a id="%[1]s" href="#%[1]s">%[2]s</a>`
|
||||
issues.label_title = Label name
|
||||
issues.label_color = Label color
|
||||
issues.label_count = %d labels
|
||||
|
||||
+1
-1
@@ -153,7 +153,7 @@ func updateIssuesCommit(u *User, repo *Repository, repoUserName, repoName string
|
||||
|
||||
url := fmt.Sprintf("%s/%s/%s/commit/%s", setting.AppSubUrl, repoUserName, repoName, c.Sha1)
|
||||
message := fmt.Sprintf(`<a href="%s">%s</a>`, url, c.Message)
|
||||
if _, err = CreateComment(u, repo, issue, 0, 0, COMMENT_TYPE_COMMIT, message, nil); err != nil {
|
||||
if _, err = CreateComment(u, repo, issue, 0, 0, COMMENT_TYPE_COMMIT_REF, message, nil); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
+14
-7
@@ -798,7 +798,7 @@ func GetLabelsByIssueID(issueID int64) ([]*Label, error) {
|
||||
}
|
||||
|
||||
func updateLabel(e Engine, l *Label) error {
|
||||
_, err := x.Id(l.ID).AllCols().Update(l)
|
||||
_, err := e.Id(l.ID).AllCols().Update(l)
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -1222,11 +1222,13 @@ const (
|
||||
COMMENT_TYPE_CLOSE
|
||||
|
||||
// References.
|
||||
COMMENT_TYPE_ISSUE
|
||||
// Reference from some commit (not part of a pull request)
|
||||
COMMENT_TYPE_COMMIT
|
||||
// Reference from some pull request
|
||||
COMMENT_TYPE_PULL
|
||||
COMMENT_TYPE_ISSUE_REF
|
||||
// Reference from a commit (not part of a pull request)
|
||||
COMMENT_TYPE_COMMIT_REF
|
||||
// Reference from a comment
|
||||
COMMENT_TYPE_COMMENT_REF
|
||||
// Reference from a pull request
|
||||
COMMENT_TYPE_PULL_REF
|
||||
)
|
||||
|
||||
// Comment represents a comment in commit and issue page.
|
||||
@@ -1245,11 +1247,16 @@ type Comment struct {
|
||||
Attachments []*Attachment `xorm:"-"`
|
||||
}
|
||||
|
||||
// HashTag returns unique hash tag for issue.
|
||||
// HashTag returns unique hash tag for comment.
|
||||
func (c *Comment) HashTag() string {
|
||||
return "issuecomment-" + com.ToStr(c.ID)
|
||||
}
|
||||
|
||||
// EventTag returns unique event hash tag for comment.
|
||||
func (c *Comment) EventTag() string {
|
||||
return "event-" + com.ToStr(c.ID)
|
||||
}
|
||||
|
||||
func (c *Comment) AfterSet(colName string, _ xorm.Cell) {
|
||||
var err error
|
||||
switch colName {
|
||||
|
||||
@@ -112,7 +112,7 @@ func (f *CreateIssueForm) Validate(ctx *macaron.Context, errs binding.Errors) bi
|
||||
|
||||
type CreateCommentForm struct {
|
||||
Content string
|
||||
NewStatus string `binding:"OmitEmpty;In(reopen,close)"`
|
||||
Status string `binding:"OmitEmpty;In(reopen,close)"`
|
||||
Attachments []string
|
||||
}
|
||||
|
||||
|
||||
@@ -127,7 +127,7 @@ func confAppIni() (*asset, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
info := bindataFileInfo{name: "conf/app.ini", size: 9251, mode: os.FileMode(420), modTime: time.Unix(1439306866, 0)}
|
||||
info := bindataFileInfo{name: "conf/app.ini", size: 9251, mode: os.FileMode(420), modTime: time.Unix(1439472139, 0)}
|
||||
a := &asset{bytes: bytes, info: info}
|
||||
return a, nil
|
||||
}
|
||||
@@ -772,7 +772,7 @@ func confLocaleLocale_deDeIni() (*asset, error) {
|
||||
return a, nil
|
||||
}
|
||||
|
||||
var _confLocaleLocale_enUsIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xc4\x7d\x7b\x93\xdb\x48\x8e\xe7\xff\xfc\x14\x6c\x6f\xf8\xec\x8e\x28\xcb\xd1\x3d\x71\x8f\x98\xb0\xdd\x57\x5d\xd5\x7e\xcc\xba\x5c\x5e\x57\x79\xe6\xe6\x1c\x0e\x35\x25\xb2\x24\x4e\x49\xa4\x9a\x8f\x92\x35\x1b\x1b\x71\x5f\xe3\xbe\xde\x7d\x92\x03\x7e\x00\xf2\x41\x52\x65\xf7\xec\xc6\xdd\x3f\x52\x32\x13\xf9\x42\x22\x91\x00\x12\x99\x99\xed\x76\xf3\xbc\x68\x97\xe9\xf3\xf4\x34\xdd\x65\x65\xb5\x29\xda\x36\x6d\x8b\xcd\xcd\x93\x75\xdd\x76\x45\x9e\xbe\x2a\x3b\xfa\x6e\xee\xca\x65\x91\x24\xeb\x7a\x5b\x10\xe8\x6b\xfa\x4b\xf2\xac\x5d\x2f\xea\xac\xc9\x29\xe2\xdc\xc2\x49\xf1\x65\xb7\xa9\x1b\x06\xfa\x45\x42\xc9\xba\xd8\xec\x38\x0f\xfd\x25\x6d\xb9\xaa\xe6\x65\x45\x9f\x57\x14\x4a\xdf\x54\x49\x5b\x2f\xcb\x6c\x33\x0f\x12\x10\x61\xe9\x7f\x4c\x7f\xac\xf2\xf4\xaa\x2b\x76\xe9\xb3\x76\x9b\x6d\x36\x2f\xb2\x16\x59\xba\x22\xcd\x96\xcb\xba\xaf\xba\x67\x4f\x25\x41\x0a\xaf\xfb\xce\x4a\xbf\xec\x3b\x89\xeb\x77\x16\xf5\x71\x97\x34\xc5\xaa\xa4\x8e\x35\x14\xf5\x41\x83\xc9\xbe\x58\xb4\x65\xc7\x8d\xfe\x8b\x84\x92\xbb\xa2\x69\xcb\x9a\xdb\xf3\x67\x09\x25\xbb\x6c\xc5\x00\xef\xe9\x2f\xe9\x8a\xed\x6e\x93\x21\xc3\xb5\x06\x93\x4d\x56\xad\x7a\x81\x79\xab\xc1\x64\xd9\x14\x94\x34\xaf\x8a\x3d\xc5\x9e\xe1\x23\xa5\x8f\xd9\x6c\x96\xf4\x84\xd3\xf9\xae\xa9\x6f\xca\x4d\x31\xcf\xaa\x7c\xbe\x15\xac\x7d\xa4\xf8\x54\xe3\x53\x8a\x4f\x39\x1e\xdd\x28\x72\x42\xd0\x3c\x6b\xb5\x2f\x34\x34\x84\xaf\xac\x4d\x50\x54\x95\x6d\x2d\x37\x07\x93\x62\x9b\x95\x1b\x1e\x84\x27\x1c\xa0\xc6\xb7\xed\xbe\xc6\x50\xbd\xd7\x20\x21\x62\xde\x1d\x76\x05\xf0\xf0\xe4\x9a\x42\xc9\x32\xdb\x75\xcb\x75\xc6\x6d\x95\x50\x42\x40\xbb\x9a\x10\x52\x37\x07\xc0\xd9\x47\x52\x37\xab\xac\x2a\xff\x9e\x75\x82\xa4\xcb\xe0\x33\xd9\x96\x4d\x53\x33\x7e\x2f\x10\x48\xa8\xc7\x73\x2e\x87\x62\xde\x11\x26\x82\x52\x38\x65\x5b\xae\x1a\x41\x25\x27\x5e\xe0\x8b\x4b\xe1\xb4\x9b\xba\xb9\xd5\x84\x97\x1c\x1c\x64\xa5\x46\x68\x6a\x5c\x7f\x56\x11\xf2\x35\xf5\x02\x1f\x11\x40\x9b\x64\xf9\x96\x50\xb9\xcb\xaa\x82\x71\x74\xca\x5f\x84\x17\xfa\x4a\x94\xa6\xe6\x6d\xd1\x75\x65\xb5\x62\x64\x9f\x4a\x54\x7a\xa5\x51\x49\x90\xe6\xe2\x0e\x75\xef\x86\x93\xe2\xff\x4a\x9f\xe9\x7b\xf9\x94\xb4\x20\x13\x12\x5d\x4e\xee\x49\x3b\xbf\x29\x8a\x5c\xfa\xd2\xa6\x2f\x29\x9c\xec\xfa\xcd\x86\xb0\xf6\x5b\x5f\xb4\x1d\x67\x7a\x4f\xdf\xd4\x7f\xf9\x4e\xca\xb6\xa5\x00\x45\xbf\x41\x20\xa1\xa1\xab\x96\xe8\xcc\x19\x02\x49\xf2\xa9\x2d\xb2\x66\xb9\xfe\x9c\xc8\x3f\xda\xca\x01\xa6\xbd\x63\x83\xca\x84\xa4\x44\x24\x35\x58\x05\xc9\xb2\xce\xf9\xe3\x8c\xfe\xa8\xe8\xb2\x6a\x3b\x9a\x71\x9f\x13\x0d\x30\x98\x84\x64\x00\xba\xb2\x03\x16\x34\x12\xd3\xb7\xe5\x11\x4c\x5f\x96\x4d\xdb\x3d\xe9\x4a\x22\xd6\x0f\x7d\x95\x70\xff\x68\xb6\xcd\xf3\x85\x31\xa1\x57\x35\xa1\x08\xd1\x0d\xf5\xef\xe2\x70\xf5\x2f\x6f\x4f\xd2\xf7\xc4\x89\x56\x4d\x41\xe1\x94\xca\xa0\x3f\xca\xf3\x87\x59\x42\xb9\xac\xa6\xf3\xac\xcb\x16\x59\x5b\x78\xb4\x72\xa2\x50\xb7\x4b\x03\x8d\x33\x57\x03\x07\x6b\xbb\xa8\xbf\x53\x33\x84\xca\xd0\x79\xe5\xca\x78\xc7\x93\x8b\xe2\x99\xa9\x21\xf3\xfb\x4d\xc1\xf1\x54\x54\xfa\xe6\xdd\xbb\xcb\xf3\x9f\xd3\xa2\x5a\x95\x55\x91\xee\xcb\x6e\x9d\xf6\xdd\xcd\x7f\x9b\xaf\x8a\xaa\x68\x88\xc7\x2d\xcb\x94\xe6\x54\x43\x94\x90\x12\x61\x4b\xe7\x66\x49\xdb\x6e\x68\xee\x03\xbd\x57\x57\x6f\xd3\x0b\x46\xf1\x2e\xeb\xd6\x68\x48\xb7\x4e\xda\xdf\x36\x8c\x22\x57\xe1\xf5\xba\x48\x41\x65\x00\xaa\x6f\x0c\x1f\x69\xae\x6d\x9c\x25\x45\xd3\xcc\x89\x2d\x75\x87\xb9\x66\xd6\xf2\x86\x90\x52\x04\x91\x4e\x55\x77\xe9\xa2\x48\x91\x67\x96\x24\xd6\x60\xc3\xee\xe9\x6e\xb7\x29\x97\x32\xd7\x5f\x49\x9a\x47\x34\xaf\x20\x8a\xa5\x10\x0e\x88\xb2\xb4\x00\x5d\xc4\x9e\x79\x3e\xa4\x11\x03\x41\xfe\x75\x41\x0c\x70\xdd\xaf\x84\xed\x6d\xea\x3e\xff\x0e\x94\x6a\xad\xf7\x84\x9a\x7e\xa8\xa9\xc1\xc0\x8e\x03\xf0\x55\x9c\x12\xc5\xf1\xa2\xd5\x14\xdb\x9a\xf8\x8a\x23\xf6\x92\x08\x6a\x5f\x52\x22\xf5\xb4\xcd\xee\x68\xbe\x75\x75\xda\xad\xcb\x36\xcd\x89\xd8\x96\x5c\x30\x4d\x8d\x9e\x96\x0b\x21\x0b\x22\x50\x21\x0d\x8b\x8b\xc7\x00\x50\xdb\x9e\xa8\x69\x4d\x85\xf1\x62\xc4\x2b\x27\x15\x39\xd5\x4e\x74\x89\xca\x01\x7d\x13\xe5\xd6\xc4\x95\x99\x6f\x9e\x23\xa0\xdf\x61\xf9\xd4\xaa\xec\xe6\x86\x5a\xd5\x12\x55\xbc\x4e\x97\x9b\x9a\x48\xea\xe3\x87\xb7\x94\x79\xdd\x75\xbb\xf9\xae\x6e\x40\xc6\xd7\xd7\xef\x69\x7a\x34\x9d\x8f\x0d\x70\xcd\x30\x55\xbf\x5d\xd0\xd7\x7e\x5d\x12\x13\xc8\x82\x01\x02\x2a\x36\xbc\xfe\x55\x69\x5d\xcd\x30\x56\x7d\xb3\x19\x0c\x23\x55\x69\x29\x47\x9a\xc7\x4d\x78\xca\x3f\x57\xbe\x95\xe8\x6e\x4b\x42\xc2\x1e\x83\x4a\x5d\x2d\xb0\x0e\x11\x6d\xd5\x3b\x2e\x37\x20\xae\x4b\x8d\xf0\x14\x85\xb5\xcb\xa5\xcb\x0a\x46\xa9\x10\x41\x02\x2e\xbc\xa5\x0e\xeb\x6c\xbe\xba\x20\x34\x60\x4a\x23\xf6\xa6\xa9\xb7\x14\xfb\x92\xfe\x7c\x84\x6f\xfe\x05\x97\x07\x98\x2c\xcf\x89\xcd\xb4\x27\xe9\x87\x97\x67\xe9\x7f\xfe\xc3\x8f\x3f\xce\xd2\x37\x1d\x4f\x08\xa6\x91\xbf\xf1\xd8\x52\x50\x96\x52\x07\x4a\x33\xb7\xa3\xe1\x7f\xc0\x04\xfe\x20\x7d\x86\xd4\xff\x5e\x7c\xc9\x48\x0c\x28\x66\xcb\x7a\xfb\x82\x27\xf7\x36\xeb\x66\x09\xa7\x10\xd5\x28\x39\x5d\x15\x55\x4e\x01\x5d\x90\x35\x2d\xe0\x3a\x9a\x1e\x2c\xcf\x22\x9c\xcc\x97\x75\x75\x53\x36\xdc\xaLine truncated
|
||||
var _confLocaleLocale_enUsIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xc4\x7d\x7b\x93\xdb\x48\x8e\xe7\xff\xfc\x14\x6c\x6f\xf8\xec\x8e\x28\xcb\xd1\x3d\x71\x8f\xe8\xb0\xdd\x57\x5d\xd5\x7e\xcc\xba\x5c\x5e\x57\xb9\xe7\xe6\x1c\x0e\x35\x25\xb2\x24\x8e\x25\x52\xcd\x47\xc9\x9a\x8d\x8d\xb8\xaf\x71\x5f\xef\x3e\xc9\x01\x3f\x00\xf9\x20\xa9\xb2\x3d\xbb\x71\xf7\x8f\x94\xcc\x44\xbe\x90\x48\x00\x89\x44\x66\x66\xbb\xdd\x3c\x2f\xda\x65\xfa\x34\x3d\x4d\x77\x59\x59\x6d\x8a\xb6\x4d\xdb\x62\x73\xf3\x68\x5d\xb7\x5d\x91\xa7\x2f\xca\x8e\xbe\x9b\xdb\x72\x59\x24\xc9\xba\xde\x16\x04\xfa\x92\xfe\x92\x3c\x6b\xd7\x8b\x3a\x6b\x72\x8a\x38\xb7\x70\x52\x7c\xde\x6d\xea\x86\x81\x7e\x95\x50\xb2\x2e\x36\x3b\xce\x43\x7f\x49\x5b\xae\xaa\x79\x59\xd1\xe7\x15\x85\xd2\x57\x55\xd2\xd6\xcb\x32\xdb\xcc\x83\x04\x44\x58\xfa\x4f\xe9\x8f\x55\x9e\x5e\x75\xc5\x2e\x7d\xd2\x6e\xb3\xcd\xe6\x59\xd6\x22\x4b\x57\xa4\xd9\x72\x59\xf7\x55\xf7\xe4\xb1\x24\x48\xe1\x75\xdf\x59\xe9\x97\x7d\x27\x71\xfd\xce\xa2\xde\xef\x92\xa6\x58\x95\xd4\xb1\x86\xa2\xde\x69\x30\xd9\x17\x8b\xb6\xec\xb8\xd1\x7f\x91\x50\x72\x5b\x34\x6d\x59\x73\x7b\x7e\x93\x50\xb2\xcb\x56\x0c\xf0\x96\xfe\x92\xae\xd8\xee\x36\x19\x32\x5c\x6b\x30\xd9\x64\xd5\xaa\x17\x98\xd7\x1a\x4c\x96\x4d\x41\x49\xf3\xaa\xd8\x53\xec\x19\x3e\x52\xfa\x98\xcd\x66\x49\x4f\x38\x9d\xef\x9a\xfa\xa6\xdc\x14\xf3\xac\xca\xe7\x5b\xc1\xda\x7b\x8a\x4f\x35\x3e\xa5\xf8\x94\xe3\xd1\x8d\x22\x27\x04\xcd\xb3\x56\xfb\x42\x43\x43\xf8\xca\xda\x04\x45\x55\xd9\xd6\x72\x73\x30\x29\xb6\x59\xb9\xe1\x41\x78\xc4\x01\x6a\x7c\xdb\xee\x6b\x0c\xd5\x5b\x0d\x12\x22\xe6\xdd\x61\x57\x00\x0f\x8f\xae\x29\x94\x2c\xb3\x5d\xb7\x5c\x67\xdc\x56\x09\x25\x04\xb4\xab\x09\x21\x75\x73\x00\x9c\x7d\x24\x75\xb3\xca\xaa\xf2\xef\x59\x27\x48\xba\x0c\x3e\x93\x6d\xd9\x34\x35\xe3\xf7\x02\x81\x84\x7a\x3c\xe7\x72\x28\xe6\x0d\x61\x22\x28\x85\x53\xb6\xe5\xaa\x11\x54\x72\xe2\x05\xbe\xb8\x14\x4e\xbb\xa9\x9b\x4f\x9a\xf0\x9c\x83\x83\xac\xd4\x08\x4d\x8d\xeb\xcf\x2a\x42\xbe\xa6\x5e\xe0\x23\x02\x68\x93\x2c\xdf\x12\x2a\x77\x59\x55\x30\x8e\x4e\xf9\x8b\xf0\x42\x5f\x89\xd2\xd4\xbc\x2d\xba\xae\xac\x56\x8c\xec\x53\x89\x4a\xaf\x34\x2a\x09\xd2\x5c\xdc\xa1\xee\xdd\x70\x52\xfc\x5f\xe9\x33\x7d\x2b\x9f\x92\x16\x64\x42\xa2\xcb\xc9\x3d\x69\xe7\x37\x45\x91\x4b\x5f\xda\xf4\x39\x85\x93\x5d\xbf\xd9\x10\xd6\xfe\xe8\x8b\xb6\xe3\x4c\x6f\xe9\x9b\xfa\x2f\xdf\x49\xd9\xb6\x14\xa0\xe8\x57\x08\x24\x34\x74\xd5\x12\x9d\x39\x43\x20\x49\x3e\xb4\x45\xd6\x2c\xd7\x1f\x13\xf9\x47\x5b\x39\xc0\xb4\x77\x6c\x50\x99\x90\x94\x88\xa4\x06\xab\x20\x59\xd6\x39\x7f\x9c\xd1\x1f\x15\x5d\x56\x6d\x47\x33\xee\x63\xa2\x01\x06\x93\x90\x0c\x40\x57\x76\xc0\x82\x46\x62\xfa\xb6\x3c\x82\xe9\xf3\xb2\x69\xbb\x47\x5d\x49\xc4\xfa\xae\xaf\x12\xee\x1f\xcd\xb6\x79\xbe\x30\x26\xf4\xa2\x26\x14\x21\xba\xa1\xfe\x5d\x1c\xae\xfe\xe5\xf5\x49\xfa\x96\x38\xd1\xaa\x29\x28\x9c\x52\x19\xf4\x47\x79\xfe\x34\x4b\x28\x97\xd5\x74\x9e\x75\xd9\x22\x6b\x0b\x8f\x56\x4e\x14\xea\x76\x69\xa0\x71\xe6\x6a\xe0\x60\x6d\x17\xf5\x77\x6a\x86\x50\x19\x3a\xaf\x5c\x19\x6f\x78\x72\x51\x3c\x33\x35\x64\x7e\xbb\x29\x38\x9e\x8a\x4a\x5f\xbd\x79\x73\x79\xfe\x4b\x5a\x54\xab\xb2\x2a\xd2\x7d\xd9\xad\xd3\xbe\xbb\xf9\x6f\xf3\x55\x51\x15\x0d\xf1\xb8\x65\x99\xd2\x9c\x6a\x88\x12\x52\x22\x6c\xe9\xdc\x2c\x69\xdb\x0d\xcd\x7d\xa0\xf7\xea\xea\x75\x7a\xc1\x28\xde\x65\xdd\x1a\x0d\xe9\xd6\x49\xfb\xc7\x86\x51\xe4\x2a\xbc\x5e\x17\x29\xa8\x0c\x40\xf5\x8d\xe1\x23\xcd\xb5\x8d\xb3\xa4\x68\x9a\x39\xb1\xa5\xee\x30\xd7\xcc\x5a\xde\x10\x52\x8a\x20\xd2\xa9\xea\x2e\x5d\x14\x29\xf2\xcc\x92\xc4\x1a\x6c\xd8\x3d\xdd\xed\x36\xe5\x52\xe6\xfa\x0b\x49\xf3\x88\x66\x09\xa2\x58\x0a\xe1\x80\x28\x4b\x0b\xd0\x45\xec\x99\xe7\x43\x1a\x31\x10\xe4\x5f\x17\xc4\x00\xd7\xfd\x4a\xd8\xde\xa6\xee\xf3\xef\x40\xa9\xd6\x7a\x4f\xa8\xe9\xbb\x9a\x1a\x0c\xec\x38\x00\x5f\xc5\x29\x51\x1c\x0b\xad\xa6\xd8\xd6\xc4\x57\x1c\xb1\x97\x44\x50\xfb\x92\x12\xa9\xa7\x6d\x76\x4b\xf3\xad\xab\xd3\x6e\x5d\xb6\x69\x4e\xc4\xb6\xe4\x82\x69\x6a\xf4\x24\x2e\x84\x2c\x88\x40\x85\x34\x2c\x2e\x1e\x03\x40\x6d\x7b\xa2\xa6\x35\x15\xc6\xc2\x88\x25\x27\x15\x39\xd5\x4e\x74\x89\xca\x01\x7d\x13\xe5\xd6\xc4\x95\x99\x6f\x9e\x23\xa0\xdf\x61\xf9\xd4\xaa\xec\xe6\x86\x5a\xd5\x12\x55\xbc\x4c\x97\x9b\x9a\x48\xea\xfd\xbb\xd7\x94\x79\xdd\x75\xbb\xf9\xae\x6e\x40\xc6\xd7\xd7\x6f\x69\x7a\x34\x9d\x8f\x0d\x70\xcd\x30\x55\xbf\x5d\xd0\xd7\x7e\x5d\x12\x13\xc8\x82\x01\x02\x2a\x36\x2c\xff\xaa\xb4\xae\x66\x18\xab\xbe\xd9\x0c\x86\x91\xaa\xb4\x94\x23\xcd\xe3\x26\x3c\xe6\x9f\x2b\xdf\x4a\x74\xb7\x25\x25\x61\x8f\x41\xa5\xae\x16\x90\x43\x44\x5b\xf5\x8e\xcb\x0d\x88\xeb\x52\x23\x3c\x45\x41\x76\xb9\x74\x91\x60\x94\x0a\x15\x24\xe0\xc2\x5b\xea\xb0\xce\xe6\xab\x0b\x42\x03\xa6\x34\x62\x6f\x9a\x7a\x4b\xb1\xcf\xe9\xcf\x47\xf8\xe6\x5f\x70\x79\x80\xc9\xf2\x9c\xd8\x4c\x7b\x92\xbe\x7b\x7e\x96\xfe\xe7\x3f\xfd\xf8\xe3\x2c\x7d\xd5\xf1\x84\x60\x1a\xf9\x1b\x8f\x2d\x05\x45\x94\x3a\x50\x9a\xb9\x1d\x0d\xff\x3d\x26\xf0\x7b\xe9\x13\xa4\xfe\xf7\xe2\x73\x46\x6a\x40\x31\x5b\xd6\xdb\x67\x3c\xb9\xb7\x59\x37\x4b\x38\x85\xa8\x46\xc9\xe9\xaa\xa8\x72\x0a\xa8\x40\xd6\xb4\x80\xeb\x68\x7a\x20\x9e\x45\x39\x99\x2f\xeb\xea\xa6\x6c\xb8\x43\xbf\x5Line truncated
|
||||
|
||||
func confLocaleLocale_enUsIniBytes() ([]byte, error) {
|
||||
return bindataRead(
|
||||
@@ -787,7 +787,7 @@ func confLocaleLocale_enUsIni() (*asset, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 37337, mode: os.FileMode(420), modTime: time.Unix(1439452466, 0)}
|
||||
info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 37484, mode: os.FileMode(420), modTime: time.Unix(1439477372, 0)}
|
||||
a := &asset{bytes: bytes, info: info}
|
||||
return a, nil
|
||||
}
|
||||
|
||||
Vendored
+1
-1
@@ -1 +1 @@
|
||||
@font-face{font-family:octicons;src:url(../fonts/octicons.eot?#iefix&v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('embedded-opentype'),url(../fonts/octicons.woff?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('woff'),url(../fonts/octicons.ttf?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('truetype'),url(../fonts/octicons.svg?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6#octicons)format('svg');font-weight:400;font-style:normal}.mega-octicon,.octicon{font:normal normal normal 16px/1 octicons;display:inline-block;text-decoration:none;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mega-octicon{font-size:32px}.octicon-alert:before{content:'\f02d'}.octicon-alignment-align:before{content:'\f08a'}.octicon-alignment-aligned-to:before{content:'\f08e'}.octicon-alignment-unalign:before{content:'\f08b'}.octicon-arrow-down:before{content:'\f03f'}.octicon-arrow-left:before{content:'\f040'}.octicon-arrow-right:before{content:'\f03e'}.octicon-arrow-small-down:before{content:'\f0a0'}.octicon-arrow-small-left:before{content:'\f0a1'}.octicon-arrow-small-right:before{content:'\f071'}.octicon-arrow-small-up:before{content:'\f09f'}.octicon-arrow-up:before{content:'\f03d'}.octicon-beer:before{content:'\f069'}.octicon-book:before{content:'\f007'}.octicon-bookmark:before{content:'\f07b'}.octicon-briefcase:before{content:'\f0d3'}.octicon-broadcast:before{content:'\f048'}.octicon-browser:before{content:'\f0c5'}.octicon-bug:before{content:'\f091'}.octicon-calendar:before{content:'\f068'}.octicon-check:before{content:'\f03a'}.octicon-checklist:before{content:'\f076'}.octicon-chevron-down:before{content:'\f0a3'}.octicon-chevron-left:before{content:'\f0a4'}.octicon-chevron-right:before{content:'\f078'}.octicon-chevron-up:before{content:'\f0a2'}.octicon-circle-slash:before{content:'\f084'}.octicon-circuit-board:before{content:'\f0d6'}.octicon-clippy:before{content:'\f035'}.octicon-clock:before{content:'\f046'}.octicon-cloud-download:before{content:'\f00b'}.octicon-cloud-upload:before{content:'\f00c'}.octicon-code:before{content:'\f05f'}.octicon-color-mode:before{content:'\f065'}.octicon-comment-add:before,.octicon-comment:before{content:'\f02b'}.octicon-comment-discussion:before{content:'\f04f'}.octicon-credit-card:before{content:'\f045'}.octicon-dash:before{content:'\f0ca'}.octicon-dashboard:before{content:'\f07d'}.octicon-database:before{content:'\f096'}.octicon-device-camera:before{content:'\f056'}.octicon-device-camera-video:before{content:'\f057'}.octicon-device-desktop:before{content:'\f27c'}.octicon-device-mobile:before{content:'\f038'}.octicon-diff:before{content:'\f04d'}.octicon-diff-added:before{content:'\f06b'}.octicon-diff-ignored:before{content:'\f099'}.octicon-diff-modified:before{content:'\f06d'}.octicon-diff-removed:before{content:'\f06c'}.octicon-diff-renamed:before{content:'\f06e'}.octicon-ellipsis:before{content:'\f09a'}.octicon-eye-unwatch:before,.octicon-eye-watch:before,.octicon-eye:before{content:'\f04e'}.octicon-file-binary:before{content:'\f094'}.octicon-file-code:before{content:'\f010'}.octicon-file-directory:before{content:'\f016'}.octicon-file-media:before{content:'\f012'}.octicon-file-pdf:before{content:'\f014'}.octicon-file-submodule:before{content:'\f017'}.octicon-file-symlink-directory:before{content:'\f0b1'}.octicon-file-symlink-file:before{content:'\f0b0'}.octicon-file-text:before{content:'\f011'}.octicon-file-zip:before{content:'\f013'}.octicon-flame:before{content:'\f0d2'}.octicon-fold:before{content:'\f0cc'}.octicon-gear:before{content:'\f02f'}.octicon-gift:before{content:'\f042'}.octicon-gist:before{content:'\f00e'}.octicon-gist-secret:before{content:'\f08c'}.octicon-git-branch-create:before,.octicon-git-branch-delete:before,.octicon-git-branch:before{content:'\f020'}.octicon-git-commit:before{content:'\f01f'}.octicon-git-compare:before{content:'\f0ac'}.octicon-git-merge:before{content:'\f023'}.octicon-git-pull-request-abandoned:before,.octicon-git-pull-request:before{content:'\f009'}.octicon-globe:before{content:'\f0b6'}.octicon-graph:before{content:'\f043'}.octicon-heart:before{content:'\2665'}.octicon-history:before{content:'\f07e'}.octicon-home:before{content:'\f08d'}.octicon-horizontal-rule:before{content:'\f070'}.octicon-hourglass:before{content:'\f09e'}.octicon-hubot:before{content:'\f09d'}.octicon-inbox:before{content:'\f0cf'}.octicon-info:before{content:'\f059'}.octicon-issue-closed:before{content:'\f028'}.octicon-issue-opened:before{content:'\f026'}.octicon-issue-reopened:before{content:'\f027'}.octicon-jersey:before{content:'\f019'}.octicon-jump-down:before{content:'\f072'}.octicon-jump-left:before{content:'\f0a5'}.octicon-jump-right:before{content:'\f0a6'}.octicon-jump-up:before{content:'\f073'}.octicon-key:before{content:'\f049'}.octicon-keyboard:before{content:'\f00d'}.octicon-law:before{content:'\f0d8'}.octicon-light-bulb:before{content:'\f000'}.octicoLine truncated
|
||||
@font-face{font-family:octicons;src:url(../fonts/octicons.eot?#iefix&v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('embedded-opentype'),url(../fonts/octicons.woff?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('woff'),url(../fonts/octicons.ttf?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('truetype'),url(../fonts/octicons.svg?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6#octicons)format('svg');font-weight:400;font-style:normal}.mega-octicon,.octicon{font:normal normal normal 16px/1 octicons;display:inline-block;text-decoration:none;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mega-octicon{font-size:32px}.octicon-alert:before{content:'\f02d'}.octicon-alignment-align:before{content:'\f08a'}.octicon-alignment-aligned-to:before{content:'\f08e'}.octicon-alignment-unalign:before{content:'\f08b'}.octicon-arrow-down:before{content:'\f03f'}.octicon-arrow-left:before{content:'\f040'}.octicon-arrow-right:before{content:'\f03e'}.octicon-arrow-small-down:before{content:'\f0a0'}.octicon-arrow-small-left:before{content:'\f0a1'}.octicon-arrow-small-right:before{content:'\f071'}.octicon-arrow-small-up:before{content:'\f09f'}.octicon-arrow-up:before{content:'\f03d'}.octicon-beer:before{content:'\f069'}.octicon-book:before{content:'\f007'}.octicon-bookmark:before{content:'\f07b'}.octicon-briefcase:before{content:'\f0d3'}.octicon-broadcast:before{content:'\f048'}.octicon-browser:before{content:'\f0c5'}.octicon-bug:before{content:'\f091'}.octicon-calendar:before{content:'\f068'}.octicon-check:before{content:'\f03a'}.octicon-checklist:before{content:'\f076'}.octicon-chevron-down:before{content:'\f0a3'}.octicon-chevron-left:before{content:'\f0a4'}.octicon-chevron-right:before{content:'\f078'}.octicon-chevron-up:before{content:'\f0a2'}.octicon-circle-slash:before{content:'\f084'}.octicon-circuit-board:before{content:'\f0d6'}.octicon-clippy:before{content:'\f035'}.octicon-clock:before{content:'\f046'}.octicon-cloud-download:before{content:'\f00b'}.octicon-cloud-upload:before{content:'\f00c'}.octicon-code:before{content:'\f05f'}.octicon-color-mode:before{content:'\f065'}.octicon-comment-add:before,.octicon-comment:before{content:'\f02b'}.octicon-comment-discussion:before{content:'\f04f'}.octicon-credit-card:before{content:'\f045'}.octicon-dash:before{content:'\f0ca'}.octicon-dashboard:before{content:'\f07d'}.octicon-database:before{content:'\f096'}.octicon-device-camera:before{content:'\f056'}.octicon-device-camera-video:before{content:'\f057'}.octicon-device-desktop:before{content:'\f27c'}.octicon-device-mobile:before{content:'\f038'}.octicon-diff:before{content:'\f04d'}.octicon-diff-added:before{content:'\f06b'}.octicon-diff-ignored:before{content:'\f099'}.octicon-diff-modified:before{content:'\f06d'}.octicon-diff-removed:before{content:'\f06c'}.octicon-diff-renamed:before{content:'\f06e'}.octicon-ellipsis:before{content:'\f09a'}.octicon-eye-unwatch:before,.octicon-eye-watch:before,.octicon-eye:before{content:'\f04e'}.octicon-file-binary:before{content:'\f094'}.octicon-file-code:before{content:'\f010'}.octicon-file-directory:before{content:'\f016'}.octicon-file-media:before{content:'\f012'}.octicon-file-pdf:before{content:'\f014'}.octicon-file-submodule:before{content:'\f017'}.octicon-file-symlink-directory:before{content:'\f0b1'}.octicon-file-symlink-file:before{content:'\f0b0'}.octicon-file-text:before{content:'\f011'}.octicon-file-zip:before{content:'\f013'}.octicon-flame:before{content:'\f0d2'}.octicon-fold:before{content:'\f0cc'}.octicon-gear:before{content:'\f02f'}.octicon-gift:before{content:'\f042'}.octicon-gist:before{content:'\f00e'}.octicon-gist-secret:before{content:'\f08c'}.octicon-git-branch-create:before,.octicon-git-branch-delete:before,.octicon-git-branch:before{content:'\f020'}.octicon-git-commit:before{content:'\f01f'}.octicon-git-compare:before{content:'\f0ac'}.octicon-git-merge:before{content:'\f023'}.octicon-git-pull-request-abandoned:before,.octicon-git-pull-request:before{content:'\f009'}.octicon-globe:before{content:'\f0b6'}.octicon-graph:before{content:'\f043'}.octicon-heart:before{content:'\2665'}.octicon-history:before{content:'\f07e'}.octicon-home:before{content:'\f08d'}.octicon-horizontal-rule:before{content:'\f070'}.octicon-hourglass:before{content:'\f09e'}.octicon-hubot:before{content:'\f09d'}.octicon-inbox:before{content:'\f0cf'}.octicon-info:before{content:'\f059'}.octicon-issue-closed:before{content:'\f028'}.octicon-issue-opened:before{content:'\f026'}.octicon-issue-reopened:before{content:'\f027'}.octicon-jersey:before{content:'\f019'}.octicon-jump-down:before{content:'\f072'}.octicon-jump-left:before{content:'\f0a5'}.octicon-jump-right:before{content:'\f0a6'}.octicon-jump-up:before{content:'\f073'}.octicon-key:before{content:'\f049'}.octicon-keyboard:before{content:'\f00d'}.octicon-law:before{content:'\f0d8'}.octicon-light-bulb:before{content:'\f000'}.octicoLine truncated
|
||||
@@ -203,6 +203,22 @@ function initRepository() {
|
||||
});
|
||||
}
|
||||
|
||||
// Issues
|
||||
if ($('.repository.view.issue').length > 0) {
|
||||
var $status_btn = $('#status-button');
|
||||
$('#content').keyup(function () {
|
||||
if ($(this).val().length == 0) {
|
||||
$status_btn.text($status_btn.data('status'))
|
||||
} else {
|
||||
$status_btn.text($status_btn.data('status-and-comment'))
|
||||
}
|
||||
});
|
||||
$status_btn.click(function () {
|
||||
$('#status').val($status_btn.data('status-val'));
|
||||
$('#comment-form').submit();
|
||||
})
|
||||
}
|
||||
|
||||
// Pull request
|
||||
if ($('.repository.compare.pull').length > 0) {
|
||||
var $branch_dropdown = $('.choose.branch .dropdown')
|
||||
|
||||
@@ -74,6 +74,15 @@ img {
|
||||
&.red {
|
||||
color: #d95c5c!important;
|
||||
}
|
||||
&.grey {
|
||||
color: #767676!important;
|
||||
a {
|
||||
color: #444!important;
|
||||
&:hover {
|
||||
color: #000!important;
|
||||
}
|
||||
}
|
||||
}
|
||||
&.right {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
@@ -163,6 +163,19 @@
|
||||
}
|
||||
}
|
||||
.comment-list {
|
||||
&:before {
|
||||
display: block;
|
||||
content: "";
|
||||
position: absolute;
|
||||
margin-top: 12px;
|
||||
margin-bottom: 14px;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
left: 96px;
|
||||
width: 2px;
|
||||
background-color: #f3f3f3;
|
||||
z-index: -1;
|
||||
}
|
||||
.comment {
|
||||
.avatar {
|
||||
width: @comment-avatar-width;
|
||||
@@ -181,13 +194,6 @@
|
||||
max-width: 78%;
|
||||
padding-top: 10px;
|
||||
padding-bottom: 10px;
|
||||
color: #767676;
|
||||
a {
|
||||
color: #444;
|
||||
&:hover {
|
||||
color: #000;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.markdown {
|
||||
@@ -219,6 +225,25 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
.event {
|
||||
position: relative;
|
||||
margin: 15px 0 15px 79px;
|
||||
padding-left: 25px;
|
||||
.octicon {
|
||||
width: 30px;
|
||||
float: left;
|
||||
margin-left: -36px;
|
||||
text-align: center;
|
||||
&.octicon-circle-slash {
|
||||
font-size: 30px;
|
||||
color: #bd2c00;
|
||||
}
|
||||
&.octicon-primitive-dot {
|
||||
font-size: 35px;
|
||||
color: #6cc644;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.ui.segment.metas {
|
||||
margin-top: -3px;
|
||||
|
||||
@@ -720,9 +720,9 @@ func NewComment(ctx *middleware.Context, form auth.CreateCommentForm) {
|
||||
|
||||
// Check if issue owner/poster changes the status of issue.
|
||||
if (ctx.Repo.IsOwner() || issue.IsPoster(ctx.User.Id)) &&
|
||||
(form.NewStatus == "reopen" || form.NewStatus == "close") {
|
||||
(form.Status == "reopen" || form.Status == "close") {
|
||||
issue.Repo = ctx.Repo.Repository
|
||||
if err = issue.ChangeStatus(ctx.User, form.NewStatus == "close"); err != nil {
|
||||
if err = issue.ChangeStatus(ctx.User, form.Status == "close"); err != nil {
|
||||
ctx.Handle(500, "ChangeStatus", err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<a class="item" data-tab="preview" data-url="/api/v1/markdown" data-context="{{.RepoLink}}">{{.i18n.Tr "repo.release.preview"}}</a>
|
||||
</div>
|
||||
<div class="ui bottom attached active tab segment" data-tab="write">
|
||||
<textarea name="content"></textarea>
|
||||
<textarea id="content" name="content"></textarea>
|
||||
</div>
|
||||
<div class="ui bottom attached tab segment markdown" data-tab="preview">
|
||||
{{.i18n.Tr "repo.release.loading"}}
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
</a>
|
||||
<div class="content">
|
||||
<div class="ui top attached header">
|
||||
<span class="text"><a href="{{.Issue.Poster.HomeLink}}">{{.Issue.Poster.Name}}</a> {{.i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe}}</span>
|
||||
<span class="text grey"><a href="{{.Issue.Poster.HomeLink}}">{{.Issue.Poster.Name}}</a> {{.i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe}}</span>
|
||||
<div class="ui right actions">
|
||||
</div>
|
||||
</div>
|
||||
@@ -52,13 +52,16 @@
|
||||
|
||||
{{range .Issue.Comments}}
|
||||
{{ $createdStr:= TimeSince .Created $.Lang }}
|
||||
|
||||
<!-- 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE_REF, 4 = COMMIT_REF, 5 = COMMENT_REF, 6 = PULL_REF -->
|
||||
{{if eq .Type 0}}
|
||||
<div class="comment">
|
||||
<a class="avatar" href="{{.Poster.HomeLink}}">
|
||||
<img src="{{.Poster.AvatarLink}}">
|
||||
</a>
|
||||
<div class="content">
|
||||
<div class="ui top attached header">
|
||||
<span class="text"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}}</span>
|
||||
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}}</span>
|
||||
<div class="ui right actions">
|
||||
</div>
|
||||
</div>
|
||||
@@ -80,6 +83,24 @@
|
||||
{{end}}
|
||||
</div>
|
||||
</div>
|
||||
{{else if eq .Type 1}}
|
||||
<div class="event">
|
||||
<span class="octicon octicon-primitive-dot"></span>
|
||||
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
|
||||
<img src="{{.Poster.AvatarLink}}">
|
||||
</a>
|
||||
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.closed_at" .EventTag $createdStr | Safe}}</span>
|
||||
</div>
|
||||
{{else if eq .Type 2}}
|
||||
<div class="event">
|
||||
<span class="octicon octicon-circle-slash"></span>
|
||||
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
|
||||
<img src="{{.Poster.AvatarLink}}">
|
||||
</a>
|
||||
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.closed_at" .EventTag $createdStr | Safe}}</span>
|
||||
</div>
|
||||
{{end}}
|
||||
|
||||
{{end}}
|
||||
|
||||
<div class="comment form">
|
||||
@@ -87,13 +108,20 @@
|
||||
<img src="{{.SignedUser.AvatarLink}}">
|
||||
</a>
|
||||
<div class="content">
|
||||
<form class="ui segment form" action="{{.Link}}/comments" method="post">
|
||||
<form class="ui segment form" id="comment-form" action="{{.Link}}/comments" method="post">
|
||||
{{template "repo/issue/comment_tab" .}}
|
||||
{{.CsrfTokenHtml}}
|
||||
<input id="status" name="status" type="hidden">
|
||||
<div class="text right">
|
||||
<div class="ui red basic button" data-close="{{.i18n.Tr "repo.issues.close_issue"}}" data-close-and-comment="{{.i18n.Tr "repo.issues.close_comment_issue"}}">
|
||||
{{if .Issue.IsClosed}}
|
||||
<div id="status-button" class="ui green basic button" data-status="{{.i18n.Tr "repo.issues.reopen_issue"}}" data-status-and-comment="{{.i18n.Tr "repo.issues.reopen_comment_issue"}}" data-status-val="reopen">
|
||||
{{.i18n.Tr "repo.issues.reopen_issue"}}
|
||||
</div>
|
||||
{{else}}
|
||||
<div id="status-button" class="ui red basic button" data-status="{{.i18n.Tr "repo.issues.close_issue"}}" data-status-and-comment="{{.i18n.Tr "repo.issues.close_comment_issue"}}" data-status-val="close">
|
||||
{{.i18n.Tr "repo.issues.close_issue"}}
|
||||
</div>
|
||||
{{end}}
|
||||
<button class="ui green button">
|
||||
{{.i18n.Tr "repo.issues.create_comment"}}
|
||||
</button>
|
||||
|
||||
Reference in new issue
Block a user