From 92987951861f877857b4b5ab5bfb57d19e3b6dc7 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Sat, 26 Aug 2017 18:58:35 +0200 Subject: [PATCH 001/276] Init: * Added models * Added UI * Added Routes Signed-off-by: kolaente --- models/issue_dependency_add.go | 79 +++++++++++++++++++ routers/repo/issue_dependency_add.go | 38 +++++++++ routers/routes/routes.go | 1 + .../repo/issue/view_content/sidebar.tmpl | 37 +++++++++ 4 files changed, 155 insertions(+) create mode 100644 models/issue_dependency_add.go create mode 100644 routers/repo/issue_dependency_add.go diff --git a/models/issue_dependency_add.go b/models/issue_dependency_add.go new file mode 100644 index 000000000000..04db222eee85 --- /dev/null +++ b/models/issue_dependency_add.go @@ -0,0 +1,79 @@ +// Copyright 2017 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package models + +import ( + "time" +) + +// IssueDependency is connection request for receiving issue notification. +type IssueDependency struct { + ID int64 `xorm:"pk autoincr"` + UserID int64 `xorm:"UNIQUE(watch) NOT NULL"` + IssueID int64 `xorm:"UNIQUE(watch) NOT NULL"` + DependencyID int64 `xorm:"UNIQUE(watch) NOT NULL"` + Created time.Time `xorm:"-"` + CreatedUnix int64 `xorm:"NOT NULL"` + Updated time.Time `xorm:"-"` + UpdatedUnix int64 `xorm:"NOT NULL"` +} + +// BeforeInsert is invoked from XORM before inserting an object of this type. +func (iw *IssueDependency) BeforeInsert() { + var ( + t = time.Now() + u = t.Unix() + ) + iw.Created = t + iw.CreatedUnix = u + iw.Updated = t + iw.UpdatedUnix = u +} + +// BeforeUpdate is invoked from XORM before updating an object of this type. +func (iw *IssueDependency) BeforeUpdate() { + var ( + t = time.Now() + u = t.Unix() + ) + iw.Updated = t + iw.UpdatedUnix = u +} + +// CreateOrUpdateIssueDependency sets or updates a dependency for an issue +func CreateOrUpdateIssueDependency(userID, issueID int64, dep int64) error { + id, exists, err := getIssueWatch(x, userID, issueID) + if err != nil { + return err + } + + if !exists { + id = &IssueWatch{ + UserID: userID, + IssueID: issueID, + IsWatching: isWatching, + } + + if _, err := x.Insert(iw); err != nil { + return err + } + } else { + iw.IsWatching = isWatching + + if _, err := x.Id(iw.ID).Cols("is_watching", "updated_unix").Update(iw); err != nil { + return err + } + } + return nil +} + +// +func getIssueDep(e Engine, issueID int64) (Dependencies []*IssueDependency, err error) { + id = new(IssueDependency) + err = e. + Where("issue_id = ?", issueID). + Find(&Dependencies) + return +} diff --git a/routers/repo/issue_dependency_add.go b/routers/repo/issue_dependency_add.go new file mode 100644 index 000000000000..384d04aca64b --- /dev/null +++ b/routers/repo/issue_dependency_add.go @@ -0,0 +1,38 @@ +// Copyright 2017 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package repo + +import ( + "fmt" + "net/http" + "strconv" + + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" +) + +// IssueWatch sets issue watching +func AddDependency(c *context.Context) { + dep, err := strconv.ParseInt(c.Req.PostForm.Get("newDependency"), 10, 64) + if err != nil { + c.Handle(http.StatusInternalServerError, "issue ID is not int", err) + return + } + + issueIndex := c.ParamsInt64("index") + issue, err := models.GetIssueByIndex(c.Repo.Repository.ID, issueIndex) + if err != nil { + c.Handle(http.StatusInternalServerError, "GetIssueByIndex", err) + return + } + + if err := models.CreateOrUpdateIssueDependency(c.User.ID, issue.ID, dep); err != nil { + c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueWatch", err) + return + } + + url := fmt.Sprintf("%s/issues/%d", c.Repo.RepoLink, issueIndex) + c.Redirect(url, http.StatusSeeOther) +} diff --git a/routers/routes/routes.go b/routers/routes/routes.go index a7a759538f16..8bd5221ba36e 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -467,6 +467,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/content", repo.UpdateIssueContent) m.Post("/watch", repo.IssueWatch) m.Combo("/comments").Post(bindIgnErr(auth.CreateCommentForm{}), repo.NewComment) + m.Post("/addDependency", repo.AddDependency) }) m.Post("/labels", repo.UpdateIssueLabel, reqRepoWriter) diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index cfb6f183b4bf..607446645165 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -121,5 +121,42 @@ {{end}} + +
+ +
+ Dependencies +
+ This issue currently doesn't have any dependencies. +
+
+ +
+
+ + + + +
+
+ Add new Dependency +
+
+
+
+ +
+
+
+
+
+ Cancel +
+
+ Add + +
From 0a4925fb1738b711337af85d6dedde090a016714 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Sat, 26 Aug 2017 22:37:52 +0200 Subject: [PATCH 002/276] Added create new issue method Signed-off-by: Konrad --- models/issue_dependency_add.go | 40 ++++++++++--------- public/js/index.js | 13 +++++- routers/repo/issue_dependency_add.go | 5 ++- routers/routes/routes.go | 2 +- .../repo/issue/view_content/sidebar.tmpl | 1 + 5 files changed, 38 insertions(+), 23 deletions(-) diff --git a/models/issue_dependency_add.go b/models/issue_dependency_add.go index 04db222eee85..5200d57b5d47 100644 --- a/models/issue_dependency_add.go +++ b/models/issue_dependency_add.go @@ -6,6 +6,7 @@ package models import ( "time" + "fmt" ) // IssueDependency is connection request for receiving issue notification. @@ -13,7 +14,7 @@ type IssueDependency struct { ID int64 `xorm:"pk autoincr"` UserID int64 `xorm:"UNIQUE(watch) NOT NULL"` IssueID int64 `xorm:"UNIQUE(watch) NOT NULL"` - DependencyID int64 `xorm:"UNIQUE(watch) NOT NULL"` + DependencyID int64 `xorm:"UNIQUE(watch) NOT NULL"` Created time.Time `xorm:"-"` CreatedUnix int64 `xorm:"NOT NULL"` Updated time.Time `xorm:"-"` @@ -43,37 +44,38 @@ func (iw *IssueDependency) BeforeUpdate() { } // CreateOrUpdateIssueDependency sets or updates a dependency for an issue -func CreateOrUpdateIssueDependency(userID, issueID int64, dep int64) error { - id, exists, err := getIssueWatch(x, userID, issueID) +func CreateOrUpdateIssueDependency(userID, issueID int64, depID int64) error { + err := x.Sync(new(IssueDependency)) + if err != nil { + return err + } + + exists, err := issueDepExists(x, issueID, depID) if err != nil { return err } if !exists { - id = &IssueWatch{ - UserID: userID, - IssueID: issueID, - IsWatching: isWatching, - } + newId := new(IssueDependency) + newId.UserID = userID + newId.IssueID = issueID + newId.DependencyID = depID - if _, err := x.Insert(iw); err != nil { + if _, err := x.Insert(newId); err != nil { return err } } else { - iw.IsWatching = isWatching - - if _, err := x.Id(iw.ID).Cols("is_watching", "updated_unix").Update(iw); err != nil { - return err - } + fmt.Println("Dependency exists") + // TODO: Should display a message on issue page } return nil } // -func getIssueDep(e Engine, issueID int64) (Dependencies []*IssueDependency, err error) { - id = new(IssueDependency) - err = e. - Where("issue_id = ?", issueID). - Find(&Dependencies) +func issueDepExists(e Engine, issueID int64, depID int64) (exists bool, err error) { + var Dependencies = IssueDependency{IssueID: issueID, DependencyID: depID} + + //err = e.Where("issue_id = ?", issueID).Where("dependency_id = ?", depID).Find(&Dependencies) + exists, err = e.Get(&Dependencies) return } diff --git a/public/js/index.js b/public/js/index.js index d79b94b92c7b..4d94354b1164 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1474,7 +1474,7 @@ $(document).ready(function () { var $this = $(this); var filter = ""; if ($this.attr("id")) { - filter += "#"+$this.attr("id") + filter += "#"+$this.attr("id") } $('.delete.modal'+filter).modal({ closable: false, @@ -1715,3 +1715,14 @@ function initDashboardSearch() { } }); } + +function showAddDependencyModal() { + $('.tiny.modal') + .modal({ + duration: 200, + onApprove: function() { + $('#addDependencyForm').submit(); + } + }).modal('show') + ; +} diff --git a/routers/repo/issue_dependency_add.go b/routers/repo/issue_dependency_add.go index 384d04aca64b..3ebf20285d22 100644 --- a/routers/repo/issue_dependency_add.go +++ b/routers/repo/issue_dependency_add.go @@ -17,7 +17,7 @@ import ( func AddDependency(c *context.Context) { dep, err := strconv.ParseInt(c.Req.PostForm.Get("newDependency"), 10, 64) if err != nil { - c.Handle(http.StatusInternalServerError, "issue ID is not int", err) + c.Handle(http.StatusBadRequest, "issue ID is not int", err) return } @@ -29,7 +29,8 @@ func AddDependency(c *context.Context) { } if err := models.CreateOrUpdateIssueDependency(c.User.ID, issue.ID, dep); err != nil { - c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueWatch", err) + c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueDependency", err) + fmt.Println("updateerr") return } diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 8bd5221ba36e..77cf7ff936cf 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -466,8 +466,8 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/title", repo.UpdateIssueTitle) m.Post("/content", repo.UpdateIssueContent) m.Post("/watch", repo.IssueWatch) - m.Combo("/comments").Post(bindIgnErr(auth.CreateCommentForm{}), repo.NewComment) m.Post("/addDependency", repo.AddDependency) + m.Combo("/comments").Post(bindIgnErr(auth.CreateCommentForm{}), repo.NewComment) }) m.Post("/labels", repo.UpdateIssueLabel, reqRepoWriter) diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 607446645165..d01ee97c91be 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -145,6 +145,7 @@
+ {{$.CsrfTokenHtml}}
From cf7e99fc4c398ec322c08ddf269b72bb177a0a0d Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Sun, 27 Aug 2017 20:23:16 +0200 Subject: [PATCH 003/276] Added basic functionality: * Add new dependecy * Show dependencies Signed-off-by: Konrad --- conf/app.ini | 2 +- models/issue_comment.go | 2 + models/issue_dependency_add.go | 45 ++++++++++----- models/repo.go | 50 +++++++++++++++++ options/locale/locale_en-US.ini | 7 +++ routers/repo/issue.go | 4 ++ routers/repo/issue_dependency_add.go | 8 ++- .../repo/issue/view_content/comments.tmpl | 10 ++++ .../repo/issue/view_content/sidebar.tmpl | 56 ++++++++++++++++--- 9 files changed, 159 insertions(+), 25 deletions(-) diff --git a/conf/app.ini b/conf/app.ini index e704067b3633..a73390a5a5fd 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -379,7 +379,7 @@ MODE = console ; Buffer length of channel, keep it as it is if you don't know what it is. BUFFER_LEN = 10000 ; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Trace" -LEVEL = Trace +LEVEL = Debug ; For "console" mode only [log.console] diff --git a/models/issue_comment.go b/models/issue_comment.go index 753e79b3d358..ea2210c2e3b4 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -52,6 +52,8 @@ const ( CommentTypeChangeTitle // Delete Branch CommentTypeDeleteBranch + // Dependency added + CommentTypeAddedDependency ) // CommentTag defines comment tag type diff --git a/models/issue_dependency_add.go b/models/issue_dependency_add.go index 5200d57b5d47..702a0a795916 100644 --- a/models/issue_dependency_add.go +++ b/models/issue_dependency_add.go @@ -6,7 +6,6 @@ package models import ( "time" - "fmt" ) // IssueDependency is connection request for receiving issue notification. @@ -43,18 +42,20 @@ func (iw *IssueDependency) BeforeUpdate() { iw.UpdatedUnix = u } -// CreateOrUpdateIssueDependency sets or updates a dependency for an issue -func CreateOrUpdateIssueDependency(userID, issueID int64, depID int64) error { - err := x.Sync(new(IssueDependency)) +// CreateOrUpdateIssueDependency creates a new dependency for an issue +func CreateOrUpdateIssueDependency(userID, issueID int64, depID int64) (err error, exists bool) { + err = x.Sync(new(IssueDependency)) if err != nil { - return err + return err, exists } - exists, err := issueDepExists(x, issueID, depID) + // Check if it aleready exists + exists, err = issueDepExists(x, issueID, depID) if err != nil { - return err + return err, exists } + // If it not exists, create it, otherwise show an error message if !exists { newId := new(IssueDependency) newId.UserID = userID @@ -62,20 +63,36 @@ func CreateOrUpdateIssueDependency(userID, issueID int64, depID int64) error { newId.DependencyID = depID if _, err := x.Insert(newId); err != nil { - return err + return err, exists + } + + // Add comment referencing to the stopwatch + comment := &Comment{ + IssueID: issueID, + PosterID: userID, + Type: CommentTypeAddedDependency, + } + + if _, err := x.Insert(comment); err != nil { + return err, exists } - } else { - fmt.Println("Dependency exists") - // TODO: Should display a message on issue page } - return nil + return nil, exists } -// +// Check if the dependency already exists func issueDepExists(e Engine, issueID int64, depID int64) (exists bool, err error) { var Dependencies = IssueDependency{IssueID: issueID, DependencyID: depID} - //err = e.Where("issue_id = ?", issueID).Where("dependency_id = ?", depID).Find(&Dependencies) exists, err = e.Get(&Dependencies) + + // Check for dependencies the other way around + // Otherwise two issues could block each other which would result in none of them could be closed. + if !exists { + Dependencies.IssueID = depID + Dependencies.DependencyID = issueID + exists, err = e.Get(&Dependencies) + } + return } diff --git a/models/repo.go b/models/repo.go index 60c89836c01b..b89201877f9d 100644 --- a/models/repo.go +++ b/models/repo.go @@ -666,6 +666,40 @@ func (repo *Repository) CanEnableEditor() bool { return !repo.IsMirror } +func (repo *Repository) BlockedByDependencies(issueID int64) (_ []*Issue, err error) { + + issueDeps, err := repo.getBlockedByDependencies(x, issueID) + var issueDepsFull = make([]*Issue, 0) + + for _, issueDep := range issueDeps{ + issueDetails, _ := getIssueByID(x, issueDep.DependencyID) + issueDepsFull = append(issueDepsFull, issueDetails) + } + + if err != nil { + return + } + + return issueDepsFull, nil +} + +func (repo *Repository) BlockingDependencies(issueID int64) (_ []*Issue, err error) { + + issueDeps, err := repo.getBlockingDependencies(x, issueID) + var issueDepsFull = make([]*Issue, 0) + + for _, issueDep := range issueDeps{ + issueDetails, _ := getIssueByID(x, issueDep.IssueID) + issueDepsFull = append(issueDepsFull, issueDetails) + } + + if err != nil { + return + } + + return issueDepsFull, nil +} + // NextIssueIndex returns the next issue index // FIXME: should have a mutex to prevent producing same index for two issues that are created // closely enough. @@ -2367,3 +2401,19 @@ func (repo *Repository) CreateNewBranch(doer *User, oldBranchName, branchName st return nil } + +// Get Blocked By Dependencies, aka all issues this issue is blocked by. +func (repo *Repository) getBlockedByDependencies(e Engine, issueID int64) (_ []IssueDependency, err error) { + var dependencies []IssueDependency + err = e.Where("issue_id = ?", issueID).Find(&dependencies) // + + return dependencies, err +} + +// Get Blocking Dependencies, aka all issues this issue blocks. +func (repo *Repository) getBlockingDependencies(e Engine, issueID int64) (_ []IssueDependency, err error) { + var dependencies []IssueDependency + err = e.Where("dependency_id = ?", issueID).Find(&dependencies) + + return dependencies, err +} diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 7fee0c2a994d..8bdb9227c3ac 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -693,6 +693,13 @@ issues.attachment.open_tab = `Click to see "%s" in a new tab` issues.attachment.download = `Click to download "%s"` issues.subscribe = Subscribe issues.unsubscribe = Unsubscribe +issues.dependency.title = Dependencies +issues.dependency.no_dependencies = This issue currently doesn't have any dependencies. +issues.dependency.add = Add +issues.dependency.cancel = Cancel +issues.dependency.add_header = Add New Dependency +issues.dependency.issue_number = Issuenumber +issues.dependency.added_dependency = `%[2]s added a new dependency %[3]s` pulls.desc = Pulls management your code review and merge requests pulls.new = New Pull Request diff --git a/routers/repo/issue.go b/routers/repo/issue.go index e4ed10d98068..4e15deb12a9f 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -665,6 +665,10 @@ func ViewIssue(ctx *context.Context) { ctx.Data["IsPullBranchDeletable"] = canDelete && pull.HeadRepo != nil && git.IsBranchExist(pull.HeadRepo.RepoPath(), pull.HeadBranch) } + // Get Dependencies + ctx.Data["BlockedByDependencies"], err = repo.BlockedByDependencies(issue.ID) + ctx.Data["BlockingDependencies"], err = repo.BlockingDependencies(issue.ID) + ctx.Data["Participants"] = participants ctx.Data["NumParticipants"] = len(participants) ctx.Data["Issue"] = issue diff --git a/routers/repo/issue_dependency_add.go b/routers/repo/issue_dependency_add.go index 3ebf20285d22..03c4b3db4623 100644 --- a/routers/repo/issue_dependency_add.go +++ b/routers/repo/issue_dependency_add.go @@ -28,12 +28,16 @@ func AddDependency(c *context.Context) { return } - if err := models.CreateOrUpdateIssueDependency(c.User.ID, issue.ID, dep); err != nil { + err, exists := models.CreateOrUpdateIssueDependency(c.User.ID, issue.ID, dep); + if err != nil { c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueDependency", err) - fmt.Println("updateerr") return } + if exists { + c.Flash.Error("Dependency already exists!") + } + url := fmt.Sprintf("%s/issues/%d", c.Repo.RepoLink, issueIndex) c.Redirect(url, http.StatusSeeOther) } diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index c1b4e7f59960..a4318766e8b2 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -140,5 +140,15 @@ {{.Poster.Name}} {{$.i18n.Tr "repo.issues.delete_branch_at" .CommitSHA $createdStr | Safe}} + {{else if eq .Type 12}} +
+ +
+ + + + + {{$.i18n.Tr "repo.issues.dependency.added_dependency" .Poster.HomeLink .Poster.Name $createdStr | Safe}} + {{end}} {{end}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index d01ee97c91be..99a90013d0ba 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -125,13 +125,53 @@
- Dependencies -
- This issue currently doesn't have any dependencies. + {{.i18n.Tr "repo.issues.dependency.title"}} +
+ This issue is blocked by: +
+ {{range .BlockedByDependencies}} +
+
+ {{if .IsClosed}} +
+ +
+ {{else}} +
+ +
+ {{end}} +
+
#{{.Index}}
+ {{.Title}} +
+ {{end}} +
+ +
+ This issue blocks the following issues: + {{range .BlockingDependencies}} +
+
+ {{if .IsClosed}} +
+ +
+ {{else}} +
+ +
+ {{end}} +
+
#{{.Index}}
+ {{.Title}} +
+ {{end}} +

{{.i18n.Tr "repo.issues.dependency.no_dependencies"}}

@@ -141,22 +181,22 @@
- Add new Dependency + {{.i18n.Tr "repo.issues.dependency.add_header"}}
{{$.CsrfTokenHtml}}
- +
- Cancel + {{.i18n.Tr "repo.issues.dependency.cancel"}}
- Add + {{.i18n.Tr "repo.issues.dependency.add"}}
From b2cb173199a012040d60527397f855abbd6273f3 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Sun, 27 Aug 2017 20:32:57 +0200 Subject: [PATCH 004/276] Fixed creating a new dependency when the other issue didn't exists Signed-off-by: Konrad --- models/issue_dependency_add.go | 46 ++++++++++++++++------------ routers/repo/issue_dependency_add.go | 6 +++- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/models/issue_dependency_add.go b/models/issue_dependency_add.go index 702a0a795916..631959f98b9b 100644 --- a/models/issue_dependency_add.go +++ b/models/issue_dependency_add.go @@ -42,42 +42,48 @@ func (iw *IssueDependency) BeforeUpdate() { iw.UpdatedUnix = u } -// CreateOrUpdateIssueDependency creates a new dependency for an issue -func CreateOrUpdateIssueDependency(userID, issueID int64, depID int64) (err error, exists bool) { +// CreateIssueDependency creates a new dependency for an issue +func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exists bool, depExists bool) { err = x.Sync(new(IssueDependency)) if err != nil { - return err, exists + return err, exists, false } // Check if it aleready exists exists, err = issueDepExists(x, issueID, depID) if err != nil { - return err, exists + return err, exists, false } // If it not exists, create it, otherwise show an error message if !exists { - newId := new(IssueDependency) - newId.UserID = userID - newId.IssueID = issueID - newId.DependencyID = depID + // Check if the other issue exists + var issue = Issue{} + issueExists, err := x.Id(depID).Get(&issue) + if issueExists { + newId := new(IssueDependency) + newId.UserID = userID + newId.IssueID = issueID + newId.DependencyID = depID - if _, err := x.Insert(newId); err != nil { - return err, exists - } + if _, err := x.Insert(newId); err != nil { + return err, exists, false + } - // Add comment referencing to the stopwatch - comment := &Comment{ - IssueID: issueID, - PosterID: userID, - Type: CommentTypeAddedDependency, - } + // Add comment referencing the new dependency + comment := &Comment{ + IssueID: issueID, + PosterID: userID, + Type: CommentTypeAddedDependency, + } - if _, err := x.Insert(comment); err != nil { - return err, exists + if _, err := x.Insert(comment); err != nil { + return err, exists, false + } } + return err, exists, true } - return nil, exists + return nil, exists, false } // Check if the dependency already exists diff --git a/routers/repo/issue_dependency_add.go b/routers/repo/issue_dependency_add.go index 03c4b3db4623..bf886d3f6513 100644 --- a/routers/repo/issue_dependency_add.go +++ b/routers/repo/issue_dependency_add.go @@ -28,12 +28,16 @@ func AddDependency(c *context.Context) { return } - err, exists := models.CreateOrUpdateIssueDependency(c.User.ID, issue.ID, dep); + err, exists, depExists := models.CreateIssueDependency(c.User.ID, issue.ID, dep); if err != nil { c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueDependency", err) return } + if depExists { + c.Flash.Error("Dependend issue does not exist!") + } + if exists { c.Flash.Error("Dependency already exists!") } From 3c1afe4e759803b0e64bb48353096e2d153e7fc1 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Sun, 27 Aug 2017 20:45:08 +0200 Subject: [PATCH 005/276] UI improvements Signed-off-by: Konrad --- public/js/index.js | 2 +- templates/repo/issue/view_content/sidebar.tmpl | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/public/js/index.js b/public/js/index.js index 4d94354b1164..d4c3afa2007b 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1717,7 +1717,7 @@ function initDashboardSearch() { } function showAddDependencyModal() { - $('.tiny.modal') + $('.mini.modal') .modal({ duration: 200, onApprove: function() { diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 99a90013d0ba..afb737aa9d04 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -127,6 +127,7 @@
{{.i18n.Tr "repo.issues.dependency.title"}}
+ {{if .BlockedByDependencies}} This issue is blocked by:
{{range .BlockedByDependencies}} @@ -147,7 +148,9 @@
{{end}}
+ {{end}} + {{if .BlockingDependencies}}
This issue blocks the following issues: {{range .BlockingDependencies}} @@ -167,8 +170,12 @@ {{.Title}}
{{end}} -

{{.i18n.Tr "repo.issues.dependency.no_dependencies"}}

+ {{end}} + + {{if (and (not .BlockedByDependencies) (not .BlockingDependencies))}} +

{{.i18n.Tr "repo.issues.dependency.no_dependencies"}}

+ {{end}}
-
+
{{.i18n.Tr "repo.issues.dependency.add_header"}}
From 0a1e57a99523ca1c5fb15293461bd9ca6460d507 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Sun, 27 Aug 2017 21:30:28 +0200 Subject: [PATCH 006/276] Added UI to delete a dependency Signed-off-by: Konrad --- public/js/index.js | 16 ++++++++- .../repo/issue/view_content/sidebar.tmpl | 36 +++++++++++++++++-- 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/public/js/index.js b/public/js/index.js index d4c3afa2007b..1783d5cc6c3a 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1717,7 +1717,7 @@ function initDashboardSearch() { } function showAddDependencyModal() { - $('.mini.modal') + $('.add-dependency') .modal({ duration: 200, onApprove: function() { @@ -1726,3 +1726,17 @@ function showAddDependencyModal() { }).modal('show') ; } + +function deleteDependencyModal(id, type) { + $('.remove-dependency') + .modal({ + closable: false, + duration: 200, + onApprove: function() { + $('#removeDependencyID').val(id); + $('#dependencyType').val(type); + $('#removeDependencyForm').submit(); + } + }).modal('show') + ; +} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index afb737aa9d04..51f5bb01414e 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -133,6 +133,9 @@ {{range .BlockedByDependencies}}
+ + + {{if .IsClosed}}
@@ -156,8 +159,11 @@ {{range .BlockingDependencies}}
+ + + {{if .IsClosed}} -
+
{{else}} @@ -186,7 +192,7 @@
-
+
{{.i18n.Tr "repo.issues.dependency.add_header"}}
@@ -208,3 +214,29 @@
+ + +
+
+ + Remove Dependency +
+
+
+ {{$.CsrfTokenHtml}} + + +
+

This will remove the dependency to this issue. Are you sure? You cannot undo this!

+
+
+
+ + Cancel +
+
+ + Delete +
+
+
From ab4d5b2126dcd2a9d156baaeaa8bafceaa58d7ca Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Tue, 29 Aug 2017 17:10:40 +0200 Subject: [PATCH 007/276] Added delete Dependency function + Improved Event Comments Signed-off-by: Konrad --- conf/app.ini | 4 +- models/issue_comment.go | 2 + ..._dependency_add.go => issue_dependency.go} | 69 +++++++++++++++++++ options/locale/locale_en-US.ini | 1 + routers/repo/issue_dependency_add.go | 2 +- routers/repo/issue_dependency_remove.go | 52 ++++++++++++++ routers/routes/routes.go | 1 + .../repo/issue/view_content/comments.tmpl | 30 ++++++-- .../repo/issue/view_content/sidebar.tmpl | 4 +- 9 files changed, 155 insertions(+), 10 deletions(-) rename models/{issue_dependency_add.go => issue_dependency.go} (64%) create mode 100644 routers/repo/issue_dependency_remove.go diff --git a/conf/app.ini b/conf/app.ini index a73390a5a5fd..3333434230fa 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -23,6 +23,8 @@ PULL_REQUEST_QUEUE_LENGTH = 1000 PREFERRED_LICENSES = Apache License 2.0,MIT License ; Disable ability to interact with repositories by HTTP protocol DISABLE_HTTP_GIT = false +; Force ssh:// clone url instead of scp-style uri when default SSH port is used +USE_COMPAT_SSH_URI = false [repository.editor] ; List of file extensions that should have line wraps in the CodeMirror editor @@ -379,7 +381,7 @@ MODE = console ; Buffer length of channel, keep it as it is if you don't know what it is. BUFFER_LEN = 10000 ; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Trace" -LEVEL = Debug +LEVEL = Trace ; For "console" mode only [log.console] diff --git a/models/issue_comment.go b/models/issue_comment.go index ea2210c2e3b4..86253b068365 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -54,6 +54,8 @@ const ( CommentTypeDeleteBranch // Dependency added CommentTypeAddedDependency + //Dependency removed + CommentTypeRemovedDependency ) // CommentTag defines comment tag type diff --git a/models/issue_dependency_add.go b/models/issue_dependency.go similarity index 64% rename from models/issue_dependency_add.go rename to models/issue_dependency.go index 631959f98b9b..95a4517b4e0e 100644 --- a/models/issue_dependency_add.go +++ b/models/issue_dependency.go @@ -6,6 +6,7 @@ package models import ( "time" + "strconv" ) // IssueDependency is connection request for receiving issue notification. @@ -43,6 +44,7 @@ func (iw *IssueDependency) BeforeUpdate() { } // CreateIssueDependency creates a new dependency for an issue +// TODO: prevent issues having itself as dependency func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exists bool, depExists bool) { err = x.Sync(new(IssueDependency)) if err != nil { @@ -75,6 +77,17 @@ func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exist IssueID: issueID, PosterID: userID, Type: CommentTypeAddedDependency, + Content: strconv.FormatInt(depID, 10), + } + + if _, err := x.Insert(comment); err != nil { + return err, exists, false + } + comment = &Comment{ + IssueID: depID, + PosterID: userID, + Type: CommentTypeAddedDependency, + Content: strconv.FormatInt(issueID, 10), } if _, err := x.Insert(comment); err != nil { @@ -86,6 +99,62 @@ func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exist return nil, exists, false } +// Removes a dependency from an issue +func RemoveIssueDependency(userID, issueID int64, depID int64, depType int64) (err error) { + err = x.Sync(new(IssueDependency)) + if err != nil { + return err + } + + // Check if it exists + exists, err := issueDepExists(x, issueID, depID) + if err != nil { + return err + } + + // If it exists, remove it, otherwise show an error message + if exists { + + if depType == 1{ + _, err := x.Delete(&IssueDependency{IssueID: issueID, DependencyID: depID}) + if err != nil { + return err + } + } + + if depType == 2{ + _, err := x.Delete(&IssueDependency{IssueID: depID, DependencyID: issueID}) + if err != nil { + return err + } + } + + // Add comment referencing the removed dependency + comment := &Comment{ + IssueID: issueID, + PosterID: userID, + Type: CommentTypeRemovedDependency, + Content: strconv.FormatInt(depID, 10), + } + + if _, err := x.Insert(comment); err != nil { + return err + } + + comment = &Comment{ + IssueID: depID, + PosterID: userID, + Type: CommentTypeRemovedDependency, + Content: strconv.FormatInt(issueID, 10), + } + + if _, err := x.Insert(comment); err != nil { + return err + } + } + return nil +} + // Check if the dependency already exists func issueDepExists(e Engine, issueID int64, depID int64) (exists bool, err error) { var Dependencies = IssueDependency{IssueID: issueID, DependencyID: depID} diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 8bdb9227c3ac..5e59e1fcbc3d 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -700,6 +700,7 @@ issues.dependency.cancel = Cancel issues.dependency.add_header = Add New Dependency issues.dependency.issue_number = Issuenumber issues.dependency.added_dependency = `%[2]s added a new dependency %[3]s` +issues.dependency.removed_dependency = `%[2]s removed a dependency %[3]s` pulls.desc = Pulls management your code review and merge requests pulls.new = New Pull Request diff --git a/routers/repo/issue_dependency_add.go b/routers/repo/issue_dependency_add.go index bf886d3f6513..ceb672356874 100644 --- a/routers/repo/issue_dependency_add.go +++ b/routers/repo/issue_dependency_add.go @@ -34,7 +34,7 @@ func AddDependency(c *context.Context) { return } - if depExists { + if !depExists { c.Flash.Error("Dependend issue does not exist!") } diff --git a/routers/repo/issue_dependency_remove.go b/routers/repo/issue_dependency_remove.go new file mode 100644 index 000000000000..a12ed63da6a2 --- /dev/null +++ b/routers/repo/issue_dependency_remove.go @@ -0,0 +1,52 @@ +// Copyright 2017 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package repo + +import ( + "fmt" + "net/http" + "strconv" + + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" +) + +// IssueWatch sets issue watching +func RemoveDependency(c *context.Context) { + dep, err := strconv.ParseInt(c.Req.PostForm.Get("removeDependencyID"), 10, 64) + if err != nil { + c.Handle(http.StatusBadRequest, "issue ID is not int", err) + return + } + + issueIndex := c.ParamsInt64("index") + issue, err := models.GetIssueByIndex(c.Repo.Repository.ID, issueIndex) + if err != nil { + c.Handle(http.StatusInternalServerError, "GetIssueByIndex", err) + return + } + + // Dependency Type + // Types: 1 = blockedBy, 2 = blocking + depType, err := strconv.ParseInt(c.Req.PostForm.Get("dependencyType"), 10, 64) + if err != nil { + c.Handle(http.StatusInternalServerError, "GetDependecyType", err) + return + } + + if depType != 1 && depType != 2{ + c.Handle(http.StatusBadRequest, "GetDependecyType", nil) + return + } + + err = models.RemoveIssueDependency(c.User.ID, issue.ID, dep, depType) + if err != nil { + c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueDependency", err) + return + } + + url := fmt.Sprintf("%s/issues/%d", c.Repo.RepoLink, issueIndex) + c.Redirect(url, http.StatusSeeOther) +} diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 77cf7ff936cf..be80184deb8e 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -467,6 +467,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/content", repo.UpdateIssueContent) m.Post("/watch", repo.IssueWatch) m.Post("/addDependency", repo.AddDependency) + m.Post("/removeDependency", repo.RemoveDependency) m.Combo("/comments").Post(bindIgnErr(auth.CreateCommentForm{}), repo.NewComment) }) diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index a4318766e8b2..1397963dba92 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -143,12 +143,30 @@ {{else if eq .Type 12}}
+ + + + + {{$.i18n.Tr "repo.issues.dependency.added_dependency" .Poster.HomeLink .Poster.Name $createdStr | Safe}} + +
+ + {{.Content}} +
+
+ {{else if eq .Type 13}} +
+ + + + + + {{$.i18n.Tr "repo.issues.dependency.removed_dependency" .Poster.HomeLink .Poster.Name $createdStr | Safe}} + +
+ + {{.Content}}  +
- - - - - {{$.i18n.Tr "repo.issues.dependency.added_dependency" .Poster.HomeLink .Poster.Name $createdStr | Safe}} - {{end}} {{end}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 51f5bb01414e..1b768baecc65 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -133,7 +133,7 @@ {{range .BlockedByDependencies}}
- + {{if .IsClosed}} @@ -159,7 +159,7 @@ {{range .BlockingDependencies}}
- + {{if .IsClosed}} From 1583a20f18fd8a619c37e554c6a215dad086022b Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Tue, 29 Aug 2017 17:16:54 +0200 Subject: [PATCH 008/276] Added method to prevent making an issue dependent on itself Signed-off-by: Konrad --- models/issue_dependency.go | 1 - routers/repo/issue_dependency_add.go | 30 +++++++++++++++++----------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/models/issue_dependency.go b/models/issue_dependency.go index 95a4517b4e0e..d59d5b22b1f5 100644 --- a/models/issue_dependency.go +++ b/models/issue_dependency.go @@ -44,7 +44,6 @@ func (iw *IssueDependency) BeforeUpdate() { } // CreateIssueDependency creates a new dependency for an issue -// TODO: prevent issues having itself as dependency func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exists bool, depExists bool) { err = x.Sync(new(IssueDependency)) if err != nil { diff --git a/routers/repo/issue_dependency_add.go b/routers/repo/issue_dependency_add.go index ceb672356874..05f25f850e46 100644 --- a/routers/repo/issue_dependency_add.go +++ b/routers/repo/issue_dependency_add.go @@ -28,18 +28,24 @@ func AddDependency(c *context.Context) { return } - err, exists, depExists := models.CreateIssueDependency(c.User.ID, issue.ID, dep); - if err != nil { - c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueDependency", err) - return - } - - if !depExists { - c.Flash.Error("Dependend issue does not exist!") - } - - if exists { - c.Flash.Error("Dependency already exists!") + // Check if issue and dependency is the same + if dep == issueIndex{ + c.Flash.Error("You cannot make an issue depend on itself!") + } else { + + err, exists, depExists := models.CreateIssueDependency(c.User.ID, issue.ID, dep); + if err != nil { + c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueDependency", err) + return + } + + if !depExists { + c.Flash.Error("Dependend issue does not exist!") + } + + if exists { + c.Flash.Error("Dependency already exists!") + } } url := fmt.Sprintf("%s/issues/%d", c.Repo.RepoLink, issueIndex) From 707551785f444d159c8676c49374d9b7704d6f58 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Tue, 29 Aug 2017 18:26:59 +0200 Subject: [PATCH 009/276] Improved Comments Signed-off-by: Konrad --- models/issue_comment.go | 1 + models/issue_dependency.go | 20 ++++++++++++++----- .../repo/issue/view_content/comments.tmpl | 12 +++++++---- .../repo/issue/view_content/sidebar.tmpl | 4 ++-- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/models/issue_comment.go b/models/issue_comment.go index 86253b068365..36f5646a205f 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -88,6 +88,7 @@ type Comment struct { OldAssignee *User `xorm:"-"` OldTitle string NewTitle string + DependentIssue int64 CommitID int64 Line int64 diff --git a/models/issue_dependency.go b/models/issue_dependency.go index d59d5b22b1f5..3379c9d667f3 100644 --- a/models/issue_dependency.go +++ b/models/issue_dependency.go @@ -6,7 +6,6 @@ package models import ( "time" - "strconv" ) // IssueDependency is connection request for receiving issue notification. @@ -76,17 +75,22 @@ func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exist IssueID: issueID, PosterID: userID, Type: CommentTypeAddedDependency, - Content: strconv.FormatInt(depID, 10), + Content: issue.Title, + DependentIssue: depID, } if _, err := x.Insert(comment); err != nil { return err, exists, false } + + var depIssue = Issue{} + _, err = x.Id(issueID).Get(&depIssue) comment = &Comment{ IssueID: depID, PosterID: userID, Type: CommentTypeAddedDependency, - Content: strconv.FormatInt(issueID, 10), + Content: depIssue.Title, + DependentIssue: issueID, } if _, err := x.Insert(comment); err != nil { @@ -129,22 +133,28 @@ func RemoveIssueDependency(userID, issueID int64, depID int64, depType int64) (e } // Add comment referencing the removed dependency + var issue = Issue{} + _, err = x.Id(depID).Get(&issue) comment := &Comment{ IssueID: issueID, PosterID: userID, Type: CommentTypeRemovedDependency, - Content: strconv.FormatInt(depID, 10), + Content: issue.Title, + DependentIssue: depID, } if _, err := x.Insert(comment); err != nil { return err } + var depIssue = Issue{} + _, err = x.Id(issueID).Get(&depIssue) comment = &Comment{ IssueID: depID, PosterID: userID, Type: CommentTypeRemovedDependency, - Content: strconv.FormatInt(issueID, 10), + Content: depIssue.Title, + DependentIssue: issueID, } if _, err := x.Insert(comment); err != nil { diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 1397963dba92..59dda9a57fb3 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -150,8 +150,10 @@ {{$.i18n.Tr "repo.issues.dependency.added_dependency" .Poster.HomeLink .Poster.Name $createdStr | Safe}}
- - {{.Content}} + + + #{{.DependentIssue}} {{.Content}} +
{{else if eq .Type 13}} @@ -164,8 +166,10 @@ {{$.i18n.Tr "repo.issues.dependency.removed_dependency" .Poster.HomeLink .Poster.Name $createdStr | Safe}}
- - {{.Content}}  + + + #{{.DependentIssue}} {{.Content}} +
{{end}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 1b768baecc65..5daa83453f9a 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -128,7 +128,7 @@ {{.i18n.Tr "repo.issues.dependency.title"}}
{{if .BlockedByDependencies}} - This issue is blocked by: + Closing this issue is blocked by:
{{range .BlockedByDependencies}}
@@ -155,7 +155,7 @@ {{if .BlockingDependencies}}
- This issue blocks the following issues: + This issue blocks closing of the following issues: {{range .BlockingDependencies}}
From 5927e13e532609ec26d2ec92dfaf900d983f3e17 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Tue, 29 Aug 2017 20:28:18 +0200 Subject: [PATCH 010/276] Implemented not closing an issue if it has blocking dependencies Signed-off-by: Konrad --- models/issue_dependency.go | 20 ++++++++++++++++++++ routers/repo/issue.go | 12 ++++++++++++ 2 files changed, 32 insertions(+) diff --git a/models/issue_dependency.go b/models/issue_dependency.go index 3379c9d667f3..29d9741f5eee 100644 --- a/models/issue_dependency.go +++ b/models/issue_dependency.go @@ -180,3 +180,23 @@ func issueDepExists(e Engine, issueID int64, depID int64) (exists bool, err erro return } + +// check if issue can be closed +func IssueNoDependenciesLeft(issueID int64) bool{ + + var issueDeps []IssueDependency + err := x.Where("issue_id = ?", issueID).Find(&issueDeps) + + for _, issueDep := range issueDeps{ + issueDetails, _ := getIssueByID(x, issueDep.DependencyID) + if !issueDetails.IsClosed { + return false + } + } + + if err != nil { + return false + } + + return true +} diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 4e15deb12a9f..ff51b6aaaa41 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -868,6 +868,18 @@ func NewComment(ctx *context.Context, form auth.CreateCommentForm) { (form.Status == "reopen" || form.Status == "close") && !(issue.IsPull && issue.PullRequest.HasMerged) { + // Check for open dependencies + if form.Status == "close"{ + + canbeClosed := models.IssueNoDependenciesLeft(issue.ID) + + if !canbeClosed { + ctx.Flash.Error("You need to close all issues blocking this issue!") + ctx.Redirect(fmt.Sprintf("%s/issues/%d", ctx.Repo.RepoLink, issue.Index)) + return + } + } + // Duplication and conflict check should apply to reopen pull request. var pr *models.PullRequest From 875cd3ca582831d130eb7a1601284bf5e94bd28c Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Tue, 29 Aug 2017 20:40:00 +0200 Subject: [PATCH 011/276] Implemented not closing an issue via commit message if it has blocking dependencies Signed-off-by: Konrad --- models/action.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/models/action.go b/models/action.go index 852bb66d2816..573ae0a54a96 100644 --- a/models/action.go +++ b/models/action.go @@ -477,8 +477,13 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) err continue } - if err = issue.ChangeStatus(doer, repo, true); err != nil { - return err + // Check for dependencies, if there aren't any, close it + canbeClosed := IssueNoDependenciesLeft(issue.ID) + + if canbeClosed { + if err = issue.ChangeStatus(doer, repo, true); err != nil { + return err + } } } From a9607ed7206ab24bbde4e062d42833816f0187a2 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Tue, 29 Aug 2017 22:32:29 +0200 Subject: [PATCH 012/276] Implemented Dependencies for pull requests. Signed-off-by: Konrad --- routers/repo/issue.go | 9 +++++++-- routers/repo/pull.go | 8 ++++++++ templates/repo/issue/view_content/sidebar.tmpl | 16 ++++++++++++++-- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/routers/repo/issue.go b/routers/repo/issue.go index ff51b6aaaa41..d280717abc3e 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -874,8 +874,13 @@ func NewComment(ctx *context.Context, form auth.CreateCommentForm) { canbeClosed := models.IssueNoDependenciesLeft(issue.ID) if !canbeClosed { - ctx.Flash.Error("You need to close all issues blocking this issue!") - ctx.Redirect(fmt.Sprintf("%s/issues/%d", ctx.Repo.RepoLink, issue.Index)) + if issue.IsPull{ + ctx.Flash.Error("You need to close all issues blocking this pull request before you can merge it!") + ctx.Redirect(fmt.Sprintf("%s/pulls/%d", ctx.Repo.RepoLink, issue.Index)) + } else { + ctx.Flash.Error("You need to close all issues blocking this issue before you can close it!") + ctx.Redirect(fmt.Sprintf("%s/issues/%d", ctx.Repo.RepoLink, issue.Index)) + } return } } diff --git a/routers/repo/pull.go b/routers/repo/pull.go index ad4a01ec9468..7b329640355a 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -428,6 +428,14 @@ func MergePullRequest(ctx *context.Context) { pr.Issue = issue pr.Issue.Repo = ctx.Repo.Repository + canbeClosed := models.IssueNoDependenciesLeft(issue.ID) + + if !canbeClosed { + ctx.Flash.Error("You need to close all issues blocking this pull request before you can merge it!") + ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pr.Index)) + return + } + if err = pr.Merge(ctx.User, ctx.Repo.GitRepo); err != nil { ctx.Handle(500, "Merge", err) return diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 5daa83453f9a..27f17c314f83 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -128,7 +128,13 @@ {{.i18n.Tr "repo.issues.dependency.title"}}
{{if .BlockedByDependencies}} - Closing this issue is blocked by: + + {{if .Issue.IsPull}} + Closing this pull request is blocked by: + {{else}} + Closing this issue is blocked by: + {{end}} +
{{range .BlockedByDependencies}}
@@ -155,7 +161,13 @@ {{if .BlockingDependencies}}
- This issue blocks closing of the following issues: + + {{if .Issue.IsPull}} + This pull request blocks closing of the following issues: + {{else}} + This issue blocks closing of the following issues: + {{end}} + {{range .BlockingDependencies}}
From 24514ba1c4f31070010f34213e75b83b0012b8b6 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 3 Sep 2017 19:49:51 +0200 Subject: [PATCH 013/276] Started implementation of setting Signed-off-by: Konrad --- models/unit.go | 2 ++ modules/auth/repo_form.go | 1 + routers/repo/setting.go | 10 ++++++++++ templates/repo/settings/options.tmpl | 6 ++++++ 4 files changed, 19 insertions(+) diff --git a/models/unit.go b/models/unit.go index a14edcec0c1e..db15100c5812 100644 --- a/models/unit.go +++ b/models/unit.go @@ -16,6 +16,7 @@ const ( UnitTypeWiki // 5 Wiki UnitTypeExternalWiki // 6 ExternalWiki UnitTypeExternalTracker // 7 ExternalTracker + UnitTypeIssueDependencies // 8 Issue Dependencies ) var ( @@ -28,6 +29,7 @@ var ( UnitTypeWiki, UnitTypeExternalWiki, UnitTypeExternalTracker, + UnitTypeIssueDependencies, } // defaultRepoUnits contains the default unit types diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go index 58dcf468ef6e..32f5f773d1ec 100644 --- a/modules/auth/repo_form.go +++ b/modules/auth/repo_form.go @@ -104,6 +104,7 @@ type RepoSettingForm struct { TrackerURLFormat string TrackerIssueStyle string EnablePulls bool + EnableIssueDependencies bool } // Validate validates the fields diff --git a/routers/repo/setting.go b/routers/repo/setting.go index a50c6a6e2270..0b7fdb5b968e 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -16,6 +16,7 @@ import ( "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" + "fmt" ) const ( @@ -215,6 +216,15 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) { }) } + if form.EnableIssueDependencies{ + units = append(units, models.RepoUnit{ + RepoID: repo.ID, + Type: models.UnitTypeIssueDependencies, + Index: int(models.UnitTypeIssueDependencies), + Config: new(models.UnitConfig), + }) + } + if err := models.UpdateRepositoryUnits(repo, units); err != nil { ctx.Handle(500, "UpdateRepositoryUnits", err) return diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 8a7ea218bc9b..d230bb30f384 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -138,6 +138,12 @@
+
+
+ + +
+
From 4cb857fe0dca332fa5e116bd7b591e66752e6436 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 3 Sep 2017 21:51:22 +0200 Subject: [PATCH 014/276] Implemented Basic Setting of Issue Dependencies Signed-off-by: Konrad --- models/repo.go | 2 ++ models/repo_unit.go | 2 +- models/unit.go | 9 +++++++++ modules/context/repo.go | 1 + routers/repo/setting.go | 1 - templates/repo/settings/options.tmpl | 2 +- 6 files changed, 14 insertions(+), 3 deletions(-) diff --git a/models/repo.go b/models/repo.go index b89201877f9d..0701d33c1571 100644 --- a/models/repo.go +++ b/models/repo.go @@ -406,6 +406,7 @@ func (repo *Repository) UnitEnabled(tp UnitType) bool { return true } } + return false } @@ -666,6 +667,7 @@ func (repo *Repository) CanEnableEditor() bool { return !repo.IsMirror } +// Find all Dependencies an issue is blocked by func (repo *Repository) BlockedByDependencies(issueID int64) (_ []*Issue, err error) { issueDeps, err := repo.getBlockedByDependencies(x, issueID) diff --git a/models/repo_unit.go b/models/repo_unit.go index 2256ff7ef60a..b2dbdd159166 100644 --- a/models/repo_unit.go +++ b/models/repo_unit.go @@ -75,7 +75,7 @@ func (r *RepoUnit) BeforeSet(colName string, val xorm.Cell) { switch colName { case "type": switch UnitType(Cell2Int64(val)) { - case UnitTypeCode, UnitTypeIssues, UnitTypePullRequests, UnitTypeReleases, + case UnitTypeCode, UnitTypeIssues, UnitTypePullRequests, UnitTypeReleases, UnitTypeIssueDependencies, UnitTypeWiki: r.Config = new(UnitConfig) case UnitTypeExternalWiki: diff --git a/models/unit.go b/models/unit.go index db15100c5812..7dc348a58fe9 100644 --- a/models/unit.go +++ b/models/unit.go @@ -120,6 +120,14 @@ var ( 4, } + UnitIssueDependencies = Unit{ + UnitTypeIssueDependencies, + "repo.issue_dependency", + "/issues", + "repo.issue_dependency.desc", + 5, + } + // Units contains all the units Units = map[UnitType]Unit{ UnitTypeCode: UnitCode, @@ -129,5 +137,6 @@ var ( UnitTypeReleases: UnitReleases, UnitTypeWiki: UnitWiki, UnitTypeExternalWiki: UnitExternalWiki, + UnitTypeIssueDependencies: UnitIssueDependencies, } ) diff --git a/modules/context/repo.go b/modules/context/repo.go index 897cd3ca1a5b..52e0b5db9568 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -549,5 +549,6 @@ func UnitTypes() macaron.Handler { ctx.Data["UnitTypeWiki"] = models.UnitTypeWiki ctx.Data["UnitTypeExternalWiki"] = models.UnitTypeExternalWiki ctx.Data["UnitTypeExternalTracker"] = models.UnitTypeExternalTracker + ctx.Data["UnitTypeIssueDependencies"] = models.UnitTypeIssueDependencies } } diff --git a/routers/repo/setting.go b/routers/repo/setting.go index 0b7fdb5b968e..c014ce83ff9d 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -16,7 +16,6 @@ import ( "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" - "fmt" ) const ( diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index d230bb30f384..8b55ea455d05 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -140,7 +140,7 @@
- +
From 8c8a244c3493abc0b508f5fdb9448cc3429a91ea Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Mon, 4 Sep 2017 22:30:22 +0200 Subject: [PATCH 015/276] Started implementation of comments Signed-off-by: Konrad --- models/issue_comment.go | 30 +++++++- models/issue_dependency.go | 96 ++++++++++++++++--------- routers/repo/issue_dependency_add.go | 4 +- routers/repo/issue_dependency_remove.go | 1 + 4 files changed, 94 insertions(+), 37 deletions(-) diff --git a/models/issue_comment.go b/models/issue_comment.go index 36f5646a205f..1f0a2022fa79 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -322,8 +322,18 @@ func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err Content: opts.Content, OldTitle: opts.OldTitle, NewTitle: opts.NewTitle, + DependentIssue: opts.DependentIssue, } - if _, err = e.Insert(comment); err != nil { + + //fmt.Println(comment) + + // TODO: WHY ISNT THIS INSERTED?????? + // It seems to be inserted, but isnt. (Doesn't return an error, raw pasting + // the sql query in a database console does work). But after the function + // is called, there is no entry in the database. At least for type 12 and 13. + + _, err = e.Insert(comment) + if err != nil { return nil, err } @@ -495,6 +505,23 @@ func createDeleteBranchComment(e *xorm.Session, doer *User, repo *Repository, is }) } +// Creates issue dependency comment +func createIssueDependencyComment(e *xorm.Session, doer *User, repo *Repository, issue *Issue, dependantIssue int64, added bool) (*Comment, error) { + cType := CommentTypeAddedDependency + if !added { + cType = CommentTypeRemovedDependency + } + + return createComment(e, &CreateCommentOptions{ + Type: cType, + Doer: doer, + Repo: repo, + Issue: issue, + DependentIssue: dependantIssue, + Content: issue.Title, + }) +} + // CreateCommentOptions defines options for creating comment type CreateCommentOptions struct { Type CommentType @@ -514,6 +541,7 @@ type CreateCommentOptions struct { LineNum int64 Content string Attachments []string // UUIDs of attachments + DependentIssue int64 } // CreateComment creates comment of issue or commit. diff --git a/models/issue_dependency.go b/models/issue_dependency.go index 29d9741f5eee..8ab4a4938bb0 100644 --- a/models/issue_dependency.go +++ b/models/issue_dependency.go @@ -44,6 +44,13 @@ func (iw *IssueDependency) BeforeUpdate() { // CreateIssueDependency creates a new dependency for an issue func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exists bool, depExists bool) { + sess := x.NewSession() + defer sess.Close() + if err = sess.Begin(); err != nil { + return err, false, false + } + + // TODO: Move this to the appropriate place err = x.Sync(new(IssueDependency)) if err != nil { return err, exists, false @@ -60,6 +67,7 @@ func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exist // Check if the other issue exists var issue = Issue{} issueExists, err := x.Id(depID).Get(&issue) + if issueExists { newId := new(IssueDependency) newId.UserID = userID @@ -70,30 +78,40 @@ func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exist return err, exists, false } + user, err := getUserByID(x, userID) + if err != nil { + return err, exists, false + } + // Add comment referencing the new dependency - comment := &Comment{ - IssueID: issueID, - PosterID: userID, - Type: CommentTypeAddedDependency, - Content: issue.Title, - DependentIssue: depID, + + repo, err := getRepositoryByID(x, issue.RepoID) + + if err != nil { + return err, exists, false } - if _, err := x.Insert(comment); err != nil { + + _, err = createIssueDependencyComment(sess, user, repo, &issue, depID, true) + + if err != nil { return err, exists, false } - var depIssue = Issue{} - _, err = x.Id(issueID).Get(&depIssue) - comment = &Comment{ - IssueID: depID, - PosterID: userID, - Type: CommentTypeAddedDependency, - Content: depIssue.Title, - DependentIssue: issueID, + // Create a new comment for the dependent issue + depIssue, err := getIssueByID(x, issueID) + if err != nil { + return err, exists, false } - if _, err := x.Insert(comment); err != nil { + repo, err = getRepositoryByID(x, depIssue.RepoID) + if err != nil { + return err, exists, false + } + + _, err = createIssueDependencyComment(sess, user, repo, depIssue, issueID, true) + + if err != nil { return err, exists, false } } @@ -104,6 +122,13 @@ func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exist // Removes a dependency from an issue func RemoveIssueDependency(userID, issueID int64, depID int64, depType int64) (err error) { + sess := x.NewSession() + defer sess.Close() + if err = sess.Begin(); err != nil { + return err + } + + // TODO: Same as above err = x.Sync(new(IssueDependency)) if err != nil { return err @@ -133,31 +158,34 @@ func RemoveIssueDependency(userID, issueID int64, depID int64, depType int64) (e } // Add comment referencing the removed dependency - var issue = Issue{} - _, err = x.Id(depID).Get(&issue) - comment := &Comment{ - IssueID: issueID, - PosterID: userID, - Type: CommentTypeRemovedDependency, - Content: issue.Title, - DependentIssue: depID, + issue, err := getIssueByID(x, depID) + + if err != nil { + return err } - if _, err := x.Insert(comment); err != nil { + user, _ := getUserByID(x, userID) + + repo, _ := getRepositoryByID(x, issue.RepoID) + + _, err = createIssueDependencyComment(sess, user, repo, issue, depID, false) + + if err != nil { return err } - var depIssue = Issue{} - _, err = x.Id(issueID).Get(&depIssue) - comment = &Comment{ - IssueID: depID, - PosterID: userID, - Type: CommentTypeRemovedDependency, - Content: depIssue.Title, - DependentIssue: issueID, + // Create a new comment for the dependent issue + depIssue, err := getIssueByID(x, issueID) + + if err != nil { + return err } - if _, err := x.Insert(comment); err != nil { + repo, _ = getRepositoryByID(x, depIssue.RepoID) + + _, err = createIssueDependencyComment(sess, user, repo, depIssue, issueID, false) + + if err != nil { return err } } diff --git a/routers/repo/issue_dependency_add.go b/routers/repo/issue_dependency_add.go index 05f25f850e46..3facf63bd0ba 100644 --- a/routers/repo/issue_dependency_add.go +++ b/routers/repo/issue_dependency_add.go @@ -13,7 +13,7 @@ import ( "code.gitea.io/gitea/modules/context" ) -// IssueWatch sets issue watching +// Adds new dependencies func AddDependency(c *context.Context) { dep, err := strconv.ParseInt(c.Req.PostForm.Get("newDependency"), 10, 64) if err != nil { @@ -33,7 +33,7 @@ func AddDependency(c *context.Context) { c.Flash.Error("You cannot make an issue depend on itself!") } else { - err, exists, depExists := models.CreateIssueDependency(c.User.ID, issue.ID, dep); + err, exists, depExists := models.CreateIssueDependency(c.User.ID, issue.ID, dep) if err != nil { c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueDependency", err) return diff --git a/routers/repo/issue_dependency_remove.go b/routers/repo/issue_dependency_remove.go index a12ed63da6a2..7abe925e6b4e 100644 --- a/routers/repo/issue_dependency_remove.go +++ b/routers/repo/issue_dependency_remove.go @@ -43,6 +43,7 @@ func RemoveDependency(c *context.Context) { err = models.RemoveIssueDependency(c.User.ID, issue.ID, dep, depType) if err != nil { + panic(err) c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueDependency", err) return } From d9c67292b83865b633c25c2782b9e2e0535298c9 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Mon, 4 Sep 2017 22:39:37 +0200 Subject: [PATCH 016/276] Fixed comments Signed-off-by: Konrad --- models/issue_dependency.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/models/issue_dependency.go b/models/issue_dependency.go index 8ab4a4938bb0..bd230ffd580e 100644 --- a/models/issue_dependency.go +++ b/models/issue_dependency.go @@ -45,10 +45,6 @@ func (iw *IssueDependency) BeforeUpdate() { // CreateIssueDependency creates a new dependency for an issue func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exists bool, depExists bool) { sess := x.NewSession() - defer sess.Close() - if err = sess.Begin(); err != nil { - return err, false, false - } // TODO: Move this to the appropriate place err = x.Sync(new(IssueDependency)) @@ -123,10 +119,6 @@ func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exist // Removes a dependency from an issue func RemoveIssueDependency(userID, issueID int64, depID int64, depType int64) (err error) { sess := x.NewSession() - defer sess.Close() - if err = sess.Begin(); err != nil { - return err - } // TODO: Same as above err = x.Sync(new(IssueDependency)) From ad0fcd4dc5bfff6fd0e1f57465b25e0036febc1e Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Mon, 4 Sep 2017 23:32:34 +0200 Subject: [PATCH 017/276] Beautify @JonasFranzDEV Signed-off-by: Konrad --- models/issue_comment.go | 10 +- models/issue_dependency.go | 118 ++++++------------ routers/repo/issue_dependency_add.go | 13 +- routers/repo/issue_dependency_remove.go | 12 +- .../repo/issue/view_content/comments.tmpl | 7 +- 5 files changed, 65 insertions(+), 95 deletions(-) diff --git a/models/issue_comment.go b/models/issue_comment.go index 1f0a2022fa79..3bcb1569434d 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -88,7 +88,8 @@ type Comment struct { OldAssignee *User `xorm:"-"` OldTitle string NewTitle string - DependentIssue int64 + DependentIssueID int64 + DependentIssue *Issue `xorm:"-"` CommitID int64 Line int64 @@ -323,6 +324,7 @@ func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err OldTitle: opts.OldTitle, NewTitle: opts.NewTitle, DependentIssue: opts.DependentIssue, + DependentIssueID: opts.DependentIssue.ID, } //fmt.Println(comment) @@ -506,7 +508,7 @@ func createDeleteBranchComment(e *xorm.Session, doer *User, repo *Repository, is } // Creates issue dependency comment -func createIssueDependencyComment(e *xorm.Session, doer *User, repo *Repository, issue *Issue, dependantIssue int64, added bool) (*Comment, error) { +func createIssueDependencyComment(e *xorm.Session, doer *User, issue *Issue, dependantIssue *Issue, added bool) (*Comment, error) { cType := CommentTypeAddedDependency if !added { cType = CommentTypeRemovedDependency @@ -515,7 +517,7 @@ func createIssueDependencyComment(e *xorm.Session, doer *User, repo *Repository, return createComment(e, &CreateCommentOptions{ Type: cType, Doer: doer, - Repo: repo, + Repo: issue.Repo, Issue: issue, DependentIssue: dependantIssue, Content: issue.Title, @@ -529,6 +531,7 @@ type CreateCommentOptions struct { Repo *Repository Issue *Issue Label *Label + DependentIssue *Issue OldMilestoneID int64 MilestoneID int64 @@ -541,7 +544,6 @@ type CreateCommentOptions struct { LineNum int64 Content string Attachments []string // UUIDs of attachments - DependentIssue int64 } // CreateComment creates comment of issue or commit. diff --git a/models/issue_dependency.go b/models/issue_dependency.go index bd230ffd580e..0947f607f0bd 100644 --- a/models/issue_dependency.go +++ b/models/issue_dependency.go @@ -10,14 +10,14 @@ import ( // IssueDependency is connection request for receiving issue notification. type IssueDependency struct { - ID int64 `xorm:"pk autoincr"` - UserID int64 `xorm:"UNIQUE(watch) NOT NULL"` - IssueID int64 `xorm:"UNIQUE(watch) NOT NULL"` + ID int64 `xorm:"pk autoincr"` + UserID int64 `xorm:"UNIQUE(watch) NOT NULL"` + IssueID int64 `xorm:"UNIQUE(watch) NOT NULL"` DependencyID int64 `xorm:"UNIQUE(watch) NOT NULL"` - Created time.Time `xorm:"-"` - CreatedUnix int64 `xorm:"NOT NULL"` - Updated time.Time `xorm:"-"` - UpdatedUnix int64 `xorm:"NOT NULL"` + Created time.Time `xorm:"-"` + CreatedUnix int64 `xorm:"NOT NULL"` + Updated time.Time `xorm:"-"` + UpdatedUnix int64 `xorm:"NOT NULL"` } // BeforeInsert is invoked from XORM before inserting an object of this type. @@ -43,7 +43,7 @@ func (iw *IssueDependency) BeforeUpdate() { } // CreateIssueDependency creates a new dependency for an issue -func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exists bool, depExists bool) { +func CreateIssueDependency(user *User, issue, dep *Issue) (err error, exists bool, depExists bool) { sess := x.NewSession() // TODO: Move this to the appropriate place @@ -53,71 +53,41 @@ func CreateIssueDependency(userID, issueID int64, depID int64) (err error, exist } // Check if it aleready exists - exists, err = issueDepExists(x, issueID, depID) + exists, err = issueDepExists(x, issue.ID, dep.ID) if err != nil { return err, exists, false } // If it not exists, create it, otherwise show an error message if !exists { - // Check if the other issue exists - var issue = Issue{} - issueExists, err := x.Id(depID).Get(&issue) - - if issueExists { - newId := new(IssueDependency) - newId.UserID = userID - newId.IssueID = issueID - newId.DependencyID = depID - - if _, err := x.Insert(newId); err != nil { - return err, exists, false - } - - user, err := getUserByID(x, userID) - if err != nil { - return err, exists, false - } - - // Add comment referencing the new dependency - - repo, err := getRepositoryByID(x, issue.RepoID) - - if err != nil { - return err, exists, false - } - + newId := new(IssueDependency) + newId.UserID = user.ID + newId.IssueID = issue.ID + newId.DependencyID = dep.ID - _, err = createIssueDependencyComment(sess, user, repo, &issue, depID, true) + if _, err := x.Insert(newId); err != nil { + return err, exists, false + } - if err != nil { - return err, exists, false - } + // Add comment referencing the new dependency + _, err = createIssueDependencyComment(sess, user, issue, dep, true) - // Create a new comment for the dependent issue - depIssue, err := getIssueByID(x, issueID) - if err != nil { - return err, exists, false - } - - repo, err = getRepositoryByID(x, depIssue.RepoID) - if err != nil { - return err, exists, false - } + if err != nil { + return err, exists, false + } - _, err = createIssueDependencyComment(sess, user, repo, depIssue, issueID, true) + // Create a new comment for the dependent issue + _, err = createIssueDependencyComment(sess, user, dep, issue, true) - if err != nil { - return err, exists, false - } + if err != nil { + return err, exists, false } - return err, exists, true } return nil, exists, false } // Removes a dependency from an issue -func RemoveIssueDependency(userID, issueID int64, depID int64, depType int64) (err error) { +func RemoveIssueDependency(user *User, issue *Issue, dep *Issue, depType int64) (err error) { sess := x.NewSession() // TODO: Same as above @@ -127,7 +97,7 @@ func RemoveIssueDependency(userID, issueID int64, depID int64, depType int64) (e } // Check if it exists - exists, err := issueDepExists(x, issueID, depID) + exists, err := issueDepExists(x, issue.ID, dep.ID) if err != nil { return err } @@ -135,47 +105,29 @@ func RemoveIssueDependency(userID, issueID int64, depID int64, depType int64) (e // If it exists, remove it, otherwise show an error message if exists { - if depType == 1{ - _, err := x.Delete(&IssueDependency{IssueID: issueID, DependencyID: depID}) + if depType == 1 { + _, err := x.Delete(&IssueDependency{IssueID: issue.ID, DependencyID: dep.ID}) if err != nil { return err } } - if depType == 2{ - _, err := x.Delete(&IssueDependency{IssueID: depID, DependencyID: issueID}) + if depType == 2 { + _, err := x.Delete(&IssueDependency{IssueID: dep.ID, DependencyID: issue.ID}) if err != nil { return err } } // Add comment referencing the removed dependency - issue, err := getIssueByID(x, depID) - - if err != nil { - return err - } - - user, _ := getUserByID(x, userID) - - repo, _ := getRepositoryByID(x, issue.RepoID) - - _, err = createIssueDependencyComment(sess, user, repo, issue, depID, false) + _, err = createIssueDependencyComment(sess, user, issue, dep, false) if err != nil { return err } // Create a new comment for the dependent issue - depIssue, err := getIssueByID(x, issueID) - - if err != nil { - return err - } - - repo, _ = getRepositoryByID(x, depIssue.RepoID) - - _, err = createIssueDependencyComment(sess, user, repo, depIssue, issueID, false) + _, err = createIssueDependencyComment(sess, user, dep, issue, false) if err != nil { return err @@ -202,12 +154,12 @@ func issueDepExists(e Engine, issueID int64, depID int64) (exists bool, err erro } // check if issue can be closed -func IssueNoDependenciesLeft(issueID int64) bool{ +func IssueNoDependenciesLeft(issueID int64) bool { var issueDeps []IssueDependency err := x.Where("issue_id = ?", issueID).Find(&issueDeps) - for _, issueDep := range issueDeps{ + for _, issueDep := range issueDeps { issueDetails, _ := getIssueByID(x, issueDep.DependencyID) if !issueDetails.IsClosed { return false diff --git a/routers/repo/issue_dependency_add.go b/routers/repo/issue_dependency_add.go index 3facf63bd0ba..8d4bf6b99574 100644 --- a/routers/repo/issue_dependency_add.go +++ b/routers/repo/issue_dependency_add.go @@ -15,7 +15,7 @@ import ( // Adds new dependencies func AddDependency(c *context.Context) { - dep, err := strconv.ParseInt(c.Req.PostForm.Get("newDependency"), 10, 64) + depID, err := strconv.ParseInt(c.Req.PostForm.Get("newDependency"), 10, 64) if err != nil { c.Handle(http.StatusBadRequest, "issue ID is not int", err) return @@ -28,12 +28,19 @@ func AddDependency(c *context.Context) { return } + // Dependency + dep, err := models.GetIssueByID(depID) + if err != nil { + c.Handle(http.StatusInternalServerError, "GetIssueByID", err) + return + } + // Check if issue and dependency is the same - if dep == issueIndex{ + if dep.Index == issueIndex{ c.Flash.Error("You cannot make an issue depend on itself!") } else { - err, exists, depExists := models.CreateIssueDependency(c.User.ID, issue.ID, dep) + err, exists, depExists := models.CreateIssueDependency(c.User, issue, dep) if err != nil { c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueDependency", err) return diff --git a/routers/repo/issue_dependency_remove.go b/routers/repo/issue_dependency_remove.go index 7abe925e6b4e..2885673c843f 100644 --- a/routers/repo/issue_dependency_remove.go +++ b/routers/repo/issue_dependency_remove.go @@ -15,7 +15,7 @@ import ( // IssueWatch sets issue watching func RemoveDependency(c *context.Context) { - dep, err := strconv.ParseInt(c.Req.PostForm.Get("removeDependencyID"), 10, 64) + depID, err := strconv.ParseInt(c.Req.PostForm.Get("removeDependencyID"), 10, 64) if err != nil { c.Handle(http.StatusBadRequest, "issue ID is not int", err) return @@ -41,9 +41,15 @@ func RemoveDependency(c *context.Context) { return } - err = models.RemoveIssueDependency(c.User.ID, issue.ID, dep, depType) + // Dependency + dep, err := models.GetIssueByID(depID) + if err != nil { + c.Handle(http.StatusInternalServerError, "GetIssueByID", err) + return + } + + err = models.RemoveIssueDependency(c.User, issue, dep, depType) if err != nil { - panic(err) c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueDependency", err) return } diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 59dda9a57fb3..ff30fc5362b9 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -152,7 +152,10 @@
- #{{.DependentIssue}} {{.Content}} + + + + #{{.DependentIssueID}} {{.Content}}
@@ -168,7 +171,7 @@
- #{{.DependentIssue}} {{.Content}} + #{{.DependentIssueID}} {{.Content}}
From 4d992e7c90b0b77ff9d0560b2106da9988439eb1 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Tue, 5 Sep 2017 18:55:09 +0200 Subject: [PATCH 018/276] Fixed issue comment title bug Signed-off-by: Konrad --- models/issue_comment.go | 2 +- models/issue_dependency.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/models/issue_comment.go b/models/issue_comment.go index 3bcb1569434d..fa63c702f56e 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -520,7 +520,7 @@ func createIssueDependencyComment(e *xorm.Session, doer *User, issue *Issue, dep Repo: issue.Repo, Issue: issue, DependentIssue: dependantIssue, - Content: issue.Title, + Content: dependantIssue.Title, }) } diff --git a/models/issue_dependency.go b/models/issue_dependency.go index 0947f607f0bd..c338220133a6 100644 --- a/models/issue_dependency.go +++ b/models/issue_dependency.go @@ -83,7 +83,7 @@ func CreateIssueDependency(user *User, issue, dep *Issue) (err error, exists boo return err, exists, false } } - return nil, exists, false + return nil, exists, true } // Removes a dependency from an issue From 26b283f3c474dc7881badcd7c49efbd1cc3f9a87 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Tue, 5 Sep 2017 19:10:15 +0200 Subject: [PATCH 019/276] Fixed showing correct index in issue comment Signed-off-by: Konrad --- models/issue_comment.go | 12 ++++++++++++ routers/repo/issue.go | 6 ++++++ templates/repo/issue/view_content/comments.tmpl | 4 ++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/models/issue_comment.go b/models/issue_comment.go index fa63c702f56e..e7b3677952d2 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -279,6 +279,18 @@ func (c *Comment) LoadAssignees() error { return nil } +// Load Dependent Issue Details +func (c *Comment) LoadDepIssueDetails() error { + var err error + if c.DependentIssueID > 0 { + c.DependentIssue, err = getIssueByID(x, c.DependentIssueID) + if err != nil { + return err + } + } + return nil +} + // MailParticipants sends new comment emails to repository watchers // and mentioned people. func (c *Comment) MailParticipants(e Engine, opType ActionType, issue *Issue) (err error) { diff --git a/routers/repo/issue.go b/routers/repo/issue.go index d280717abc3e..3f509880b18b 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -27,6 +27,7 @@ import ( "code.gitea.io/gitea/modules/notification" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" + "net/http" ) const ( @@ -641,6 +642,11 @@ func ViewIssue(ctx *context.Context) { ctx.Handle(500, "LoadAssignees", err) return } + } else if comment.Type == models.CommentTypeRemovedDependency || comment.Type == models.CommentTypeAddedDependency{ + if err = comment.LoadDepIssueDetails(); err != nil{ + ctx.Handle(http.StatusInternalServerError, "LoadDepIssueDetails", err) + return + } } } diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index ff30fc5362b9..52dafe17c554 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -155,7 +155,7 @@ - #{{.DependentIssueID}} {{.Content}} + #{{.DependentIssue.Index}} {{.Content}}
@@ -171,7 +171,7 @@
- #{{.DependentIssueID}} {{.Content}} + #{{.DependentIssue.Index}} {{.Content}}
From 956697a0e90c5e5a2a6fda57175edcdac5c769f2 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Tue, 5 Sep 2017 19:14:07 +0200 Subject: [PATCH 020/276] removed TODO Signed-off-by: Konrad --- templates/repo/issue/view_content/comments.tmpl | 3 --- 1 file changed, 3 deletions(-) diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 52dafe17c554..5877f39361ed 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -152,9 +152,6 @@
- - - #{{.DependentIssue.Index}} {{.Content}}
From 2a87cd9a061c4395ecb3341cda0ee135219f6ab6 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Sat, 9 Sep 2017 13:46:46 +0200 Subject: [PATCH 021/276] Fully implemented Repo setting to enable/disable Issue Dependencies Signed-off-by: Konrad --- models/repo_unit.go | 5 +++++ routers/repo/issue.go | 1 + routers/repo/issue_dependency_add.go | 9 +++++++++ templates/repo/issue/view_content/sidebar.tmpl | 2 ++ 4 files changed, 17 insertions(+) diff --git a/models/repo_unit.go b/models/repo_unit.go index b2dbdd159166..ba3bf24216d9 100644 --- a/models/repo_unit.go +++ b/models/repo_unit.go @@ -131,6 +131,11 @@ func (r *RepoUnit) ExternalTrackerConfig() *ExternalTrackerConfig { return r.Config.(*ExternalTrackerConfig) } +// IssueDependenciesConfig returns config for UnitTypeIssueDependencies +func (r *RepoUnit) IssueDependenciesConfig() *UnitConfig{ + return r.Config.(*UnitConfig) +} + func getUnitsByRepoID(e Engine, repoID int64) (units []*RepoUnit, err error) { return units, e.Where("repo_id = ?", repoID).Find(&units) } diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 3f509880b18b..3038e418cd85 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -672,6 +672,7 @@ func ViewIssue(ctx *context.Context) { } // Get Dependencies + ctx.Data["IssueDependenciesEnabled"] = repo.UnitEnabled(models.UnitTypeIssueDependencies) ctx.Data["BlockedByDependencies"], err = repo.BlockedByDependencies(issue.ID) ctx.Data["BlockingDependencies"], err = repo.BlockingDependencies(issue.ID) diff --git a/routers/repo/issue_dependency_add.go b/routers/repo/issue_dependency_add.go index 8d4bf6b99574..43f7c0a85ed2 100644 --- a/routers/repo/issue_dependency_add.go +++ b/routers/repo/issue_dependency_add.go @@ -15,6 +15,9 @@ import ( // Adds new dependencies func AddDependency(c *context.Context) { + + // TODO: should should an issue only have dependencies in it's own repo? + depID, err := strconv.ParseInt(c.Req.PostForm.Get("newDependency"), 10, 64) if err != nil { c.Handle(http.StatusBadRequest, "issue ID is not int", err) @@ -28,6 +31,12 @@ func AddDependency(c *context.Context) { return } + // Check if the Repo is allowed to have dependencies + if !c.Repo.Repository.UnitEnabled(models.UnitTypeIssueDependencies) { + c.Handle(404, "MustEnableIssueDependencies", nil) + return + } + // Dependency dep, err := models.GetIssueByID(depID) if err != nil { diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 27f17c314f83..deaa0ffa6288 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -122,6 +122,7 @@
{{end}} + {{if .IssueDependenciesEnabled}}
@@ -252,3 +253,4 @@
+{{end}} From 0c9203d12b8c0891895380b682961cd30f6abc82 Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Sat, 9 Sep 2017 14:09:44 +0200 Subject: [PATCH 022/276] Implemented repo settings check on autoclose Signed-off-by: Konrad --- models/action.go | 2 +- models/issue_comment.go | 15 +++++++-------- models/issue_dependency.go | 15 +++++++++++++-- routers/repo/issue.go | 2 +- routers/repo/pull.go | 2 +- 5 files changed, 23 insertions(+), 13 deletions(-) diff --git a/models/action.go b/models/action.go index 573ae0a54a96..492381627673 100644 --- a/models/action.go +++ b/models/action.go @@ -478,7 +478,7 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) err } // Check for dependencies, if there aren't any, close it - canbeClosed := IssueNoDependenciesLeft(issue.ID) + canbeClosed := IssueNoDependenciesLeft(issue) if canbeClosed { if err = issue.ChangeStatus(doer, repo, true); err != nil { diff --git a/models/issue_comment.go b/models/issue_comment.go index e7b3677952d2..019fa588349e 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -319,6 +319,12 @@ func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err if opts.Label != nil { LabelID = opts.Label.ID } + + var depId int64 = 0 + if opts.DependentIssue != nil { + depId = opts.DependentIssue.ID + } + comment := &Comment{ Type: opts.Type, PosterID: opts.Doer.ID, @@ -336,16 +342,9 @@ func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err OldTitle: opts.OldTitle, NewTitle: opts.NewTitle, DependentIssue: opts.DependentIssue, - DependentIssueID: opts.DependentIssue.ID, + DependentIssueID: depId, } - //fmt.Println(comment) - - // TODO: WHY ISNT THIS INSERTED?????? - // It seems to be inserted, but isnt. (Doesn't return an error, raw pasting - // the sql query in a database console does work). But after the function - // is called, there is no entry in the database. At least for type 12 and 13. - _, err = e.Insert(comment) if err != nil { return nil, err diff --git a/models/issue_dependency.go b/models/issue_dependency.go index c338220133a6..8025145656a3 100644 --- a/models/issue_dependency.go +++ b/models/issue_dependency.go @@ -154,10 +154,21 @@ func issueDepExists(e Engine, issueID int64, depID int64) (exists bool, err erro } // check if issue can be closed -func IssueNoDependenciesLeft(issueID int64) bool { +func IssueNoDependenciesLeft(issue *Issue) bool { + + // Check if the Repo is allowed to have dependencies, if not return true (= issue can be closed) + // Otherwise check for all open dependencies + r, err := getRepositoryByID(x, issue.RepoID) + if err != nil { + return false + } + + if !r.UnitEnabled(UnitTypeIssueDependencies) { + return true + } var issueDeps []IssueDependency - err := x.Where("issue_id = ?", issueID).Find(&issueDeps) + err = x.Where("issue_id = ?", issue.ID).Find(&issueDeps) for _, issueDep := range issueDeps { issueDetails, _ := getIssueByID(x, issueDep.DependencyID) diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 3038e418cd85..22223e557239 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -878,7 +878,7 @@ func NewComment(ctx *context.Context, form auth.CreateCommentForm) { // Check for open dependencies if form.Status == "close"{ - canbeClosed := models.IssueNoDependenciesLeft(issue.ID) + canbeClosed := models.IssueNoDependenciesLeft(issue) if !canbeClosed { if issue.IsPull{ diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 7b329640355a..8617fedce2d8 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -428,7 +428,7 @@ func MergePullRequest(ctx *context.Context) { pr.Issue = issue pr.Issue.Repo = ctx.Repo.Repository - canbeClosed := models.IssueNoDependenciesLeft(issue.ID) + canbeClosed := models.IssueNoDependenciesLeft(issue) if !canbeClosed { ctx.Flash.Error("You need to close all issues blocking this pull request before you can merge it!") From 50bc8435d1041516359b45b14821a89d56d9bd1f Mon Sep 17 00:00:00 2001 From: Konrad Langenberg Date: Sat, 9 Sep 2017 14:38:51 +0200 Subject: [PATCH 023/276] Moved languagestrings to ini Signed-off-by: Konrad --- options/locale/locale_en-US.ini | 17 ++++++++++++++--- routers/repo/issue_dependency_add.go | 6 +++--- templates/repo/issue/view_content/sidebar.tmpl | 16 ++++++++-------- templates/repo/settings/options.tmpl | 2 +- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 5e59e1fcbc3d..a4c3f2f5cfca 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -488,14 +488,14 @@ migrate.clone_local_path = or local server path migrate.permission_denied = You are not allowed to import local repositories. migrate.invalid_local_path = Invalid local path, it does not exist or not a directory. migrate.failed = Migration failed: %v -migrate.lfs_mirror_unsupported = Mirroring LFS objects is not supported - use 'git lfs fetch --all' and 'git lfs push --all' instead. +migrate.lfs_mirror_unsupported = Mirroring LFS objects is not supported - use 'git?lfs?fetch?--all' and 'git?lfs?push?--all' instead. mirror_from = mirror of forked_from = forked from fork_from_self = You cannot fork a repository you already own! copy_link = Copy copy_link_success = Copied! -copy_link_error = Press ⌘-C or Ctrl-C to copy +copy_link_error = Press ?-C or Ctrl-C to copy copied = Copied OK unwatch = Unwatch watch = Watch @@ -697,10 +697,21 @@ issues.dependency.title = Dependencies issues.dependency.no_dependencies = This issue currently doesn't have any dependencies. issues.dependency.add = Add issues.dependency.cancel = Cancel +issues.dependency.remove = Remove issues.dependency.add_header = Add New Dependency issues.dependency.issue_number = Issuenumber issues.dependency.added_dependency = `%[2]s added a new dependency %[3]s` issues.dependency.removed_dependency = `%[2]s removed a dependency %[3]s` +issues.dependency.issue_closing_blockedby = Closing this pull request is blocked by +issues.dependency.pr_closing_blockedby = Closing this issue is blocked by +issues.dependency.issue_close_blocks = This issue blocks closing of the following issues +issues.dependency.pr_close_blocks = This pull request blocks closing of the following issues +issues.dependency.remove_header = Remove Dependency +issues.dependency.remove_text = This will remove the dependency to this issue. Are you sure? You cannot undo this! +issues.dependency.setting = Issues can have dependencies +issues.dependency.add_error_same_issue = You cannot make an issue depend on itself! +issues.dependency.add_error_dep_not_exist = Dependend issue does not exist! +issues.dependency.add_error_dep_exists = Dependency already exists! pulls.desc = Pulls management your code review and merge requests pulls.new = New Pull Request @@ -1233,7 +1244,7 @@ auths.tip.github = Register a new OAuth application on https://github.com/settin auths.tip.gitlab = Register a new application on https://gitlab.com/profile/applications auths.tip.google_plus = Obtain OAuth2 client credentials from the Google API console (https://console.developers.google.com/) auths.tip.openid_connect = Use the OpenID Connect Discovery URL (/.well-known/openid-configuration) to specify the endpoints -auths.tip.twitter = Go to https://dev.twitter.com/apps , create an application and ensure that the “Allow this application to be used to Sign in with Twitter†option is enabled. +auths.tip.twitter = Go to https://dev.twitter.com/apps , create an application and ensure that the ?Allow this application to be used to Sign in with Twitter? option is enabled. auths.edit = Edit Authentication Settings auths.activated = This authentication is activated auths.new_success = The authentication '%s' has been added. diff --git a/routers/repo/issue_dependency_add.go b/routers/repo/issue_dependency_add.go index 43f7c0a85ed2..f4ce3c299d46 100644 --- a/routers/repo/issue_dependency_add.go +++ b/routers/repo/issue_dependency_add.go @@ -46,7 +46,7 @@ func AddDependency(c *context.Context) { // Check if issue and dependency is the same if dep.Index == issueIndex{ - c.Flash.Error("You cannot make an issue depend on itself!") + c.Flash.Error(c.Tr("issues.dependency.add_error_same_issue")) } else { err, exists, depExists := models.CreateIssueDependency(c.User, issue, dep) @@ -56,11 +56,11 @@ func AddDependency(c *context.Context) { } if !depExists { - c.Flash.Error("Dependend issue does not exist!") + c.Flash.Error(c.Tr("add_error_dep_not_exist")) } if exists { - c.Flash.Error("Dependency already exists!") + c.Flash.Error(c.Tr("add_error_dep_exists")) } } diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index deaa0ffa6288..cce5c781c508 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -131,9 +131,9 @@ {{if .BlockedByDependencies}} {{if .Issue.IsPull}} - Closing this pull request is blocked by: + {{.i18n.Tr "repo.issues.dependency.issue_closing_blockedby"}}: {{else}} - Closing this issue is blocked by: + {{.i18n.Tr "repo.issues.dependency.pr_closing_blockedby"}}: {{end}}
@@ -164,9 +164,9 @@
{{if .Issue.IsPull}} - This pull request blocks closing of the following issues: + {{.i18n.Tr "repo.issues.dependency.pr_close_blocks"}}: {{else}} - This issue blocks closing of the following issues: + {{.i18n.Tr "repo.issues.dependency.issue_close_blocks"}}: {{end}} {{range .BlockingDependencies}} @@ -232,7 +232,7 @@
- Remove Dependency + {{.i18n.Tr "repo.issues.dependency.remove_header"}}
@@ -240,16 +240,16 @@
-

This will remove the dependency to this issue. Are you sure? You cannot undo this!

+

{{.i18n.Tr "repo.issues.dependency.remove_text"}}

- Cancel + {{.i18n.Tr "repo.issues.dependency.cancel"}}
- Delete + {{.i18n.Tr "repo.issues.dependency.remove"}}
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 8b55ea455d05..a57378f28763 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -141,7 +141,7 @@
- +
From 67f66d6bb5236fd789df5ab294f0cf51b8a47435 Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 12 Sep 2017 14:19:12 +0200 Subject: [PATCH 024/276] Resolved Conflicts Signed-off-by: Konrad --- .changelog.yml | 44 + .drone.yml | 96 +- .drone.yml.sig | 1 - .gitignore | 4 +- CHANGELOG.md | 9 + CONTRIBUTING.md | 170 +- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.rpi | 2 +- Makefile | 80 +- README.md | 25 +- cmd/admin.go | 2 +- conf/app.ini | 8 + integrations/api_gpg_keys_test.go | 260 +++ integrations/api_issue_label_test.go | 5 +- integrations/explore_repos_test.go | 17 + .../user2/repo1.git/HEAD | 0 .../user2/repo1.git/config | 0 .../user2/repo1.git/description | 0 .../repo1.git/hooks/applypatch-msg.sample | 0 .../user2/repo1.git/hooks/commit-msg.sample | 0 .../user2/repo1.git/hooks/post-receive | 0 .../repo1.git/hooks/post-receive.d/gitea | 0 .../user2/repo1.git/hooks/post-update.sample | 0 .../repo1.git/hooks/pre-applypatch.sample | 0 .../user2/repo1.git/hooks/pre-commit.sample | 0 .../user2/repo1.git/hooks/pre-push.sample | 0 .../user2/repo1.git/hooks/pre-rebase.sample | 0 .../user2/repo1.git/hooks/pre-receive | 0 .../user2/repo1.git/hooks/pre-receive.d/gitea | 0 .../repo1.git/hooks/prepare-commit-msg.sample | 0 .../user2/repo1.git/hooks/update | 0 .../user2/repo1.git/hooks/update.d/gitea | 0 .../user2/repo1.git/hooks/update.sample | 0 .../user2/repo1.git/info/exclude | 0 .../user2/repo1.git/info/refs | 0 .../2a/2f1d4670728a2e10049e345bd7a276468beab6 | Bin .../4b/4851ad51df6a7d9f25c979345979eaeb5b349f | Bin .../65/f1bf27bc3bf70f64657658635e66094edbcb4d | Bin .../user2/repo1.git/objects/info/packs | 0 .../user2/repo1.git/refs/heads/DefaultBranch | 0 .../user2/repo1.git/refs/heads/develop | 0 .../user2/repo1.git/refs/heads/feature/1 | 0 .../user2/repo1.git/refs/heads/master | 0 .../user2/repo15.git/HEAD | 0 .../user2/repo15.git/config | 0 .../user2/repo15.git/description | 0 .../repo15.git/hooks/applypatch-msg.sample | 0 .../user2/repo15.git/hooks/commit-msg.sample | 0 .../user2/repo15.git/hooks/post-receive | 0 .../repo15.git/hooks/post-receive.d/gitea | 0 .../user2/repo15.git/hooks/post-update.sample | 0 .../repo15.git/hooks/pre-applypatch.sample | 0 .../user2/repo15.git/hooks/pre-commit.sample | 0 .../user2/repo15.git/hooks/pre-push.sample | 0 .../user2/repo15.git/hooks/pre-rebase.sample | 0 .../user2/repo15.git/hooks/pre-receive | 0 .../repo15.git/hooks/pre-receive.d/gitea | 0 .../hooks/prepare-commit-msg.sample | 0 .../user2/repo15.git/hooks/update | 0 .../user2/repo15.git/hooks/update.d/gitea | 0 .../user2/repo15.git/hooks/update.sample | 0 .../user2/repo15.git/info/exclude | 0 .../user2/repo16.git}/HEAD | 0 .../user2/repo16.git/config | 4 + .../user2/repo16.git}/description | 0 .../repo16.git}/hooks/applypatch-msg.sample | 0 .../user2/repo16.git}/hooks/commit-msg.sample | 0 .../repo16.git}/hooks/post-update.sample | 0 .../repo16.git}/hooks/pre-applypatch.sample | 0 .../user2/repo16.git}/hooks/pre-commit.sample | 0 .../user2/repo16.git}/hooks/pre-push.sample | 0 .../user2/repo16.git/hooks/pre-rebase.sample | 169 ++ .../repo16.git}/hooks/pre-receive.sample | 0 .../hooks/prepare-commit-msg.sample | 0 .../user2/repo16.git}/hooks/update.sample | 0 .../user2/repo16.git}/info/exclude | 0 .../0c/3d59dea27b97aa3cb66072745d7a2c51a7a8b1 | Bin 0 -> 54 bytes .../24/f83a471f77579fea57bac7255d6e64e70fce1c | Bin 0 -> 54 bytes .../27/566bd5738fc8b4e3fef3c5e72cce608537bd95 | Bin 0 -> 575 bytes .../3b/2b54fe3d9a8279d5b926124dccdf279b8eff2f | 1 + .../45/8121ce9a6b855c9733bae62093caf3f39685de | Bin 0 -> 26 bytes .../50/99b81332712fe655e34e8dd63574f503f61811 | 2 + .../69/554a64c1e6030f051e5c3f94bfbd773cd6a324 | Bin 0 -> 158 bytes .../a4/3476a501516e065c5a82f05fd58fd319598bc1 | Bin 0 -> 57 bytes .../e9/4083fcdf1f10c545e9253a23c5e44a2ff68aac | Bin 0 -> 524 bytes .../f2/7c2b2b03dcab38beaf89b0ab4ff61f6de63441 | Bin 0 -> 522 bytes .../f9/0451c72ef61a7645293d17b47be7a8e983da57 | Bin 0 -> 27 bytes .../user2/repo16.git/refs/heads/good-sign | 1 + .../refs/heads/good-sign-not-yet-validated | 1 + .../user2/repo16.git/refs/heads/master | 1 + .../user2/repo16.git/refs/heads/not-signed | 1 + .../user3/repo3.git/HEAD | 1 + .../user3/repo3.git/config | 0 .../user3/repo3.git/description | 1 + .../repo3.git/hooks/applypatch-msg.sample | 15 + .../user3/repo3.git/hooks/commit-msg.sample | 24 + .../user3/repo3.git/hooks/post-receive | 0 .../repo3.git/hooks/post-receive.d/gitea | 0 .../user3/repo3.git/hooks/post-update.sample | 8 + .../repo3.git/hooks/pre-applypatch.sample | 14 + .../user3/repo3.git/hooks/pre-commit.sample | 49 + .../user3/repo3.git/hooks/pre-push.sample | 53 + .../user3/repo3.git/hooks/pre-rebase.sample | 0 .../user3/repo3.git/hooks/pre-receive | 0 .../user3/repo3.git/hooks/pre-receive.d/gitea | 0 .../user3/repo3.git/hooks/pre-receive.sample | 24 + .../repo3.git/hooks/prepare-commit-msg.sample | 36 + .../user3/repo3.git/hooks/update | 0 .../user3/repo3.git/hooks/update.d/gitea | 0 .../user3/repo3.git/hooks/update.sample | 128 ++ .../user3/repo3.git/info/exclude | 6 + .../20/ade30d25e0ecaeec84e7f542a8456900858240 | Bin .../27/74debeea6dc742cc4971a92db0e08b95b60588 | Bin .../2a/47ca4b614a9f5a43abbd5ad851a54a616ffee6 | Bin .../2f/9b22fd3159a43b7b4e5dd806fcd544edf8716f | Bin .../d5/6a3073c1dbb7b15963110a049d50cdb5db99fc | Bin .../user3/repo3.git/refs/heads/master | 0 integrations/html_helper.go | 10 + integrations/integration_test.go | 22 +- integrations/links_test.go | 130 ++ integrations/mysql.ini | 11 +- integrations/pgsql.ini | 12 +- integrations/pull_create_test.go | 2 +- integrations/setting_test.go | 70 + integrations/signin_test.go | 60 + integrations/sqlite.ini | 14 +- integrations/timetracking_test.go | 78 + models/action.go | 24 +- models/action_test.go | 46 +- models/admin_test.go | 12 +- models/error.go | 64 +- models/fixtures/comment.yml | 3 + models/fixtures/gpg_key.yml | 1 + models/fixtures/issue.yml | 13 + models/fixtures/repo_unit.yml | 4 +- models/fixtures/repository.yml | 14 +- models/fixtures/stopwatch.yml | 11 + models/fixtures/tracked_time.yml | 34 + models/fixtures/user.yml | 2 +- models/gpg_key.go | 36 +- models/gpg_key_test.go | 5 +- models/issue.go | 11 +- models/issue_comment.go | 11 +- models/issue_label_test.go | 12 +- models/issue_mail.go | 22 +- models/issue_stopwatch.go | 170 ++ models/issue_stopwatch_test.go | 70 + models/issue_tracked_time.go | 117 ++ models/issue_tracked_time_test.go | 103 + models/migrations/migrations.go | 2 + models/migrations/v15.go | 1 + models/migrations/v16.go | 8 +- models/migrations/v39.go | 65 + models/models.go | 4 +- models/notification_test.go | 7 +- models/org_test.go | 100 +- models/pull_test.go | 14 +- models/repo.go | 71 +- models/repo_editor.go | 107 +- models/repo_issue.go | 34 + models/repo_list.go | 94 +- models/repo_list_test.go | 10 +- models/repo_test.go | 11 +- models/repo_unit.go | 31 +- models/star_test.go | 17 +- models/status_test.go | 3 +- models/token_test.go | 18 +- models/update.go | 19 +- models/update_test.go | 20 +- models/user.go | 47 +- models/user_mail_test.go | 16 +- models/user_openid_test.go | 20 +- models/webhook.go | 183 +- models/webhook_discord.go | 283 +++ models/webhook_slack.go | 26 + models/webhook_test.go | 38 +- modules/auth/repo_form.go | 37 +- modules/auth/user_form.go | 3 + modules/context/api.go | 4 + modules/context/repo.go | 28 +- modules/mailer/mailer.go | 3 +- modules/markdown/markdown.go | 54 +- modules/markdown/markdown_test.go | 78 +- modules/setting/setting.go | 39 +- modules/templates/helper.go | 9 + options/locale/locale_bg-BG.ini | 7 +- options/locale/locale_cs-CZ.ini | 7 +- options/locale/locale_de-DE.ini | 107 +- options/locale/locale_en-US.ini | 41 +- options/locale/locale_es-ES.ini | 7 +- options/locale/locale_fi-FI.ini | 6 +- options/locale/locale_fr-FR.ini | 57 +- options/locale/locale_hu-HU.ini | 50 +- options/locale/locale_it-IT.ini | 5 +- options/locale/locale_ja-JP.ini | 4 +- options/locale/locale_ko-KR.ini | 7 +- options/locale/locale_lt-LT.ini | 1 + options/locale/locale_lv-LV.ini | 34 +- options/locale/locale_nb-NO.ini | 1 + options/locale/locale_nl-NL.ini | 7 +- options/locale/locale_pl-PL.ini | 7 +- options/locale/locale_pt-BR.ini | 76 +- options/locale/locale_ru-RU.ini | 63 +- options/locale/locale_sr-SP.ini | 7 +- options/locale/locale_sv-SE.ini | 8 +- options/locale/locale_tr-TR.ini | 7 +- options/locale/locale_zh-CN.ini | 18 +- options/locale/locale_zh-HK.ini | 7 +- options/locale/locale_zh-TW.ini | 377 +++- public/assets/librejs/librejs.html | 84 - public/css/github.min.css | 1 - public/css/index.css | 28 +- public/img/discord.png | Bin 0 -> 1559 bytes public/js/index.js | 186 +- public/less/_base.less | 14 + public/less/_repository.less | 20 +- public/swagger.v1.json | 1832 +++++++++++++++-- public/vendor/VERSIONS | 60 + public/vendor/assets/font-awesome/LICENSE | 97 + public/vendor/assets/font-awesome/css/LICENSE | 7 + .../font-awesome}/css/font-awesome.min.css | 0 .../font-awesome}/fonts/FontAwesome.otf | Bin .../vendor/assets/font-awesome/fonts/LICENSE | 97 + .../fonts/fontawesome-webfont.eot | Bin .../fonts/fontawesome-webfont.svg | 0 .../fonts/fontawesome-webfont.ttf | Bin .../fonts/fontawesome-webfont.woff | Bin .../fonts/fontawesome-webfont.woff2 | Bin public/vendor/assets/octicons/LICENSE | 21 + .../assets/octicons}/octicons.eot | Bin .../assets/octicons}/octicons.min.css | 0 .../assets/octicons}/octicons.svg | 0 .../assets/octicons}/octicons.ttf | Bin .../assets/octicons}/octicons.woff | Bin .../assets/octicons}/octicons.woff2 | Bin .../assets/swagger-ui/favicon-16x16.png | Bin .../assets/swagger-ui/favicon-32x32.png | Bin .../{ => vendor}/assets/swagger-ui/index.html | 0 .../assets/swagger-ui/oauth2-redirect.html | 0 .../assets/swagger-ui/swagger-ui-bundle.js | 0 .../swagger-ui/swagger-ui-bundle.js.map | 0 .../swagger-ui-standalone-preset.js | 0 .../swagger-ui-standalone-preset.js.map | 0 .../assets/swagger-ui/swagger-ui.css | 0 .../assets/swagger-ui/swagger-ui.css.map | 0 .../assets/swagger-ui/swagger-ui.js | 0 .../assets/swagger-ui/swagger-ui.js.map | 0 public/vendor/librejs.html | 136 ++ public/vendor/plugins/autolink/LICENSE | 21 + .../plugins/autolink}/autolink.js | 2 +- public/vendor/plugins/clipboard/LICENSE | 18 + .../plugins/clipboard/clipboard.min.js} | 0 .../plugins/codemirror}/.gitattributes | 0 .../plugins/codemirror}/.gitignore | 0 .../plugins/codemirror}/.npmignore | 0 .../plugins/codemirror}/.travis.yml | 0 public/vendor/plugins/codemirror/LICENSE | 21 + .../codemirror}/addon/mode/loadmode.js | 0 .../codemirror}/addon/mode/multiplex.js | 0 .../codemirror}/addon/mode/multiplex_test.js | 0 .../plugins/codemirror}/addon/mode/overlay.js | 0 .../plugins/codemirror}/addon/mode/simple.js | 0 .../plugins/codemirror}/mode/apl/apl.js | 0 .../plugins/codemirror}/mode/apl/index.html | 0 .../codemirror}/mode/asciiarmor/asciiarmor.js | 0 .../codemirror}/mode/asciiarmor/index.html | 0 .../plugins/codemirror}/mode/asn.1/asn.1.js | 0 .../plugins/codemirror}/mode/asn.1/index.html | 0 .../codemirror}/mode/asterisk/asterisk.js | 0 .../codemirror}/mode/asterisk/index.html | 0 .../codemirror}/mode/brainfuck/brainfuck.js | 0 .../codemirror}/mode/brainfuck/index.html | 0 .../plugins/codemirror}/mode/clike/clike.js | 0 .../plugins/codemirror}/mode/clike/index.html | 0 .../plugins/codemirror}/mode/clike/scala.html | 0 .../plugins/codemirror}/mode/clike/test.js | 0 .../codemirror}/mode/clojure/clojure.js | 0 .../codemirror}/mode/clojure/index.html | 0 .../plugins/codemirror}/mode/cmake/cmake.js | 0 .../plugins/codemirror}/mode/cmake/index.html | 0 .../plugins/codemirror}/mode/cobol/cobol.js | 0 .../plugins/codemirror}/mode/cobol/index.html | 0 .../mode/coffeescript/coffeescript.js | 0 .../codemirror}/mode/coffeescript/index.html | 0 .../codemirror}/mode/commonlisp/commonlisp.js | 0 .../codemirror}/mode/commonlisp/index.html | 0 .../codemirror}/mode/crystal/crystal.js | 0 .../codemirror}/mode/crystal/index.html | 0 .../plugins/codemirror}/mode/css/css.js | 0 .../plugins/codemirror}/mode/css/gss.html | 0 .../plugins/codemirror}/mode/css/gss_test.js | 0 .../plugins/codemirror}/mode/css/index.html | 0 .../plugins/codemirror}/mode/css/less.html | 0 .../plugins/codemirror}/mode/css/less_test.js | 0 .../plugins/codemirror}/mode/css/scss.html | 0 .../plugins/codemirror}/mode/css/scss_test.js | 0 .../plugins/codemirror}/mode/css/test.js | 0 .../plugins/codemirror}/mode/cypher/cypher.js | 0 .../codemirror}/mode/cypher/index.html | 0 .../plugins/codemirror}/mode/d/d.js | 0 .../plugins/codemirror}/mode/d/index.html | 0 .../plugins/codemirror}/mode/dart/dart.js | 0 .../plugins/codemirror}/mode/dart/index.html | 0 .../plugins/codemirror}/mode/diff/diff.js | 0 .../plugins/codemirror}/mode/diff/index.html | 0 .../plugins/codemirror}/mode/django/django.js | 0 .../codemirror}/mode/django/index.html | 0 .../codemirror}/mode/dockerfile/dockerfile.js | 0 .../codemirror}/mode/dockerfile/index.html | 0 .../plugins/codemirror}/mode/dtd/dtd.js | 0 .../plugins/codemirror}/mode/dtd/index.html | 0 .../plugins/codemirror}/mode/dylan/dylan.js | 0 .../plugins/codemirror}/mode/dylan/index.html | 0 .../plugins/codemirror}/mode/dylan/test.js | 0 .../plugins/codemirror}/mode/ebnf/ebnf.js | 0 .../plugins/codemirror}/mode/ebnf/index.html | 0 .../plugins/codemirror}/mode/ecl/ecl.js | 0 .../plugins/codemirror}/mode/ecl/index.html | 0 .../plugins/codemirror}/mode/eiffel/eiffel.js | 0 .../codemirror}/mode/eiffel/index.html | 0 .../plugins/codemirror}/mode/elm/elm.js | 0 .../plugins/codemirror}/mode/elm/index.html | 0 .../plugins/codemirror}/mode/erlang/erlang.js | 0 .../codemirror}/mode/erlang/index.html | 0 .../plugins/codemirror}/mode/factor/factor.js | 0 .../codemirror}/mode/factor/index.html | 0 .../plugins/codemirror}/mode/fcl/fcl.js | 0 .../plugins/codemirror}/mode/fcl/index.html | 0 .../plugins/codemirror}/mode/forth/forth.js | 0 .../plugins/codemirror}/mode/forth/index.html | 0 .../codemirror}/mode/fortran/fortran.js | 0 .../codemirror}/mode/fortran/index.html | 0 .../plugins/codemirror}/mode/gas/gas.js | 0 .../plugins/codemirror}/mode/gas/index.html | 0 .../plugins/codemirror}/mode/gfm/gfm.js | 0 .../plugins/codemirror}/mode/gfm/index.html | 0 .../plugins/codemirror}/mode/gfm/test.js | 0 .../codemirror}/mode/gherkin/gherkin.js | 0 .../codemirror}/mode/gherkin/index.html | 0 .../plugins/codemirror}/mode/go/go.js | 0 .../plugins/codemirror}/mode/go/index.html | 0 .../plugins/codemirror}/mode/groovy/groovy.js | 0 .../codemirror}/mode/groovy/index.html | 0 .../plugins/codemirror}/mode/haml/haml.js | 0 .../plugins/codemirror}/mode/haml/index.html | 0 .../plugins/codemirror}/mode/haml/test.js | 0 .../codemirror}/mode/handlebars/handlebars.js | 0 .../codemirror}/mode/handlebars/index.html | 0 .../mode/haskell-literate/haskell-literate.js | 0 .../mode/haskell-literate/index.html | 0 .../codemirror}/mode/haskell/haskell.js | 0 .../codemirror}/mode/haskell/index.html | 0 .../plugins/codemirror}/mode/haxe/haxe.js | 0 .../plugins/codemirror}/mode/haxe/index.html | 0 .../mode/htmlembedded/htmlembedded.js | 0 .../codemirror}/mode/htmlembedded/index.html | 0 .../codemirror}/mode/htmlmixed/htmlmixed.js | 0 .../codemirror}/mode/htmlmixed/index.html | 0 .../plugins/codemirror}/mode/http/http.js | 0 .../plugins/codemirror}/mode/http/index.html | 0 .../plugins/codemirror}/mode/idl/idl.js | 0 .../plugins/codemirror}/mode/idl/index.html | 0 .../plugins/codemirror}/mode/index.html | 0 .../plugins/codemirror}/mode/jade/index.html | 0 .../plugins/codemirror}/mode/jade/jade.js | 0 .../codemirror}/mode/javascript/index.html | 0 .../codemirror}/mode/javascript/javascript.js | 0 .../codemirror}/mode/javascript/json-ld.html | 0 .../codemirror}/mode/javascript/test.js | 0 .../mode/javascript/typescript.html | 0 .../codemirror}/mode/jinja2/index.html | 0 .../plugins/codemirror}/mode/jinja2/jinja2.js | 0 .../plugins/codemirror}/mode/jsx/index.html | 0 .../plugins/codemirror}/mode/jsx/jsx.js | 0 .../plugins/codemirror}/mode/jsx/test.js | 0 .../plugins/codemirror}/mode/julia/index.html | 0 .../plugins/codemirror}/mode/julia/julia.js | 0 .../codemirror}/mode/livescript/index.html | 0 .../codemirror}/mode/livescript/livescript.js | 0 .../plugins/codemirror}/mode/lua/index.html | 0 .../plugins/codemirror}/mode/lua/lua.js | 0 .../codemirror}/mode/markdown/index.html | 0 .../codemirror}/mode/markdown/markdown.js | 0 .../plugins/codemirror}/mode/markdown/test.js | 0 .../codemirror}/mode/mathematica/index.html | 0 .../mode/mathematica/mathematica.js | 0 .../plugins/codemirror}/mode/mbox/index.html | 0 .../plugins/codemirror}/mode/mbox/mbox.js | 0 .../plugins/codemirror}/mode/meta.js | 0 .../plugins/codemirror}/mode/mirc/index.html | 0 .../plugins/codemirror}/mode/mirc/mirc.js | 0 .../codemirror}/mode/mllike/index.html | 0 .../plugins/codemirror}/mode/mllike/mllike.js | 0 .../codemirror}/mode/modelica/index.html | 0 .../codemirror}/mode/modelica/modelica.js | 0 .../codemirror}/mode/mscgen/index.html | 0 .../plugins/codemirror}/mode/mscgen/mscgen.js | 0 .../codemirror}/mode/mscgen/mscgen_test.js | 0 .../codemirror}/mode/mscgen/msgenny_test.js | 0 .../codemirror}/mode/mscgen/xu_test.js | 0 .../plugins/codemirror}/mode/mumps/index.html | 0 .../plugins/codemirror}/mode/mumps/mumps.js | 0 .../plugins/codemirror}/mode/nginx/index.html | 0 .../plugins/codemirror}/mode/nginx/nginx.js | 0 .../plugins/codemirror}/mode/nsis/index.html | 0 .../plugins/codemirror}/mode/nsis/nsis.js | 0 .../codemirror}/mode/ntriples/index.html | 0 .../codemirror}/mode/ntriples/ntriples.js | 0 .../codemirror}/mode/octave/index.html | 0 .../plugins/codemirror}/mode/octave/octave.js | 0 .../plugins/codemirror}/mode/oz/index.html | 0 .../plugins/codemirror}/mode/oz/oz.js | 0 .../codemirror}/mode/pascal/index.html | 0 .../plugins/codemirror}/mode/pascal/pascal.js | 0 .../plugins/codemirror}/mode/pegjs/index.html | 0 .../plugins/codemirror}/mode/pegjs/pegjs.js | 0 .../plugins/codemirror}/mode/perl/index.html | 0 .../plugins/codemirror}/mode/perl/perl.js | 0 .../plugins/codemirror}/mode/php/index.html | 0 .../plugins/codemirror}/mode/php/php.js | 0 .../plugins/codemirror}/mode/php/test.js | 0 .../plugins/codemirror}/mode/pig/index.html | 0 .../plugins/codemirror}/mode/pig/pig.js | 0 .../codemirror}/mode/powershell/index.html | 0 .../codemirror}/mode/powershell/powershell.js | 0 .../codemirror}/mode/powershell/test.js | 0 .../codemirror}/mode/properties/index.html | 0 .../codemirror}/mode/properties/properties.js | 0 .../codemirror}/mode/protobuf/index.html | 0 .../codemirror}/mode/protobuf/protobuf.js | 0 .../codemirror}/mode/puppet/index.html | 0 .../plugins/codemirror}/mode/puppet/puppet.js | 0 .../codemirror}/mode/python/index.html | 0 .../plugins/codemirror}/mode/python/python.js | 0 .../plugins/codemirror}/mode/python/test.js | 0 .../plugins/codemirror}/mode/q/index.html | 0 .../plugins/codemirror}/mode/q/q.js | 0 .../plugins/codemirror}/mode/r/index.html | 0 .../plugins/codemirror}/mode/r/r.js | 0 .../codemirror}/mode/rpm/changes/index.html | 0 .../plugins/codemirror}/mode/rpm/index.html | 0 .../plugins/codemirror}/mode/rpm/rpm.js | 0 .../plugins/codemirror}/mode/rst/index.html | 0 .../plugins/codemirror}/mode/rst/rst.js | 0 .../plugins/codemirror}/mode/ruby/index.html | 0 .../plugins/codemirror}/mode/ruby/ruby.js | 0 .../plugins/codemirror}/mode/ruby/test.js | 0 .../plugins/codemirror}/mode/rust/index.html | 0 .../plugins/codemirror}/mode/rust/rust.js | 0 .../plugins/codemirror}/mode/rust/test.js | 0 .../plugins/codemirror}/mode/sas/index.html | 0 .../plugins/codemirror}/mode/sas/sas.js | 0 .../plugins/codemirror}/mode/sass/index.html | 0 .../plugins/codemirror}/mode/sass/sass.js | 0 .../codemirror}/mode/scheme/index.html | 0 .../plugins/codemirror}/mode/scheme/scheme.js | 0 .../plugins/codemirror}/mode/shell/index.html | 0 .../plugins/codemirror}/mode/shell/shell.js | 0 .../plugins/codemirror}/mode/shell/test.js | 0 .../plugins/codemirror}/mode/sieve/index.html | 0 .../plugins/codemirror}/mode/sieve/sieve.js | 0 .../plugins/codemirror}/mode/slim/index.html | 0 .../plugins/codemirror}/mode/slim/slim.js | 0 .../plugins/codemirror}/mode/slim/test.js | 0 .../codemirror}/mode/smalltalk/index.html | 0 .../codemirror}/mode/smalltalk/smalltalk.js | 0 .../codemirror}/mode/smarty/index.html | 0 .../plugins/codemirror}/mode/smarty/smarty.js | 0 .../plugins/codemirror}/mode/solr/index.html | 0 .../plugins/codemirror}/mode/solr/solr.js | 0 .../plugins/codemirror}/mode/soy/index.html | 0 .../plugins/codemirror}/mode/soy/soy.js | 0 .../codemirror}/mode/sparql/index.html | 0 .../plugins/codemirror}/mode/sparql/sparql.js | 0 .../codemirror}/mode/spreadsheet/index.html | 0 .../mode/spreadsheet/spreadsheet.js | 0 .../plugins/codemirror}/mode/sql/index.html | 0 .../plugins/codemirror}/mode/sql/sql.js | 0 .../plugins/codemirror}/mode/stex/index.html | 0 .../plugins/codemirror}/mode/stex/stex.js | 0 .../plugins/codemirror}/mode/stex/test.js | 0 .../codemirror}/mode/stylus/index.html | 0 .../plugins/codemirror}/mode/stylus/stylus.js | 0 .../plugins/codemirror}/mode/swift/index.html | 0 .../plugins/codemirror}/mode/swift/swift.js | 0 .../plugins/codemirror}/mode/tcl/index.html | 0 .../plugins/codemirror}/mode/tcl/tcl.js | 0 .../codemirror}/mode/textile/index.html | 0 .../plugins/codemirror}/mode/textile/test.js | 0 .../codemirror}/mode/textile/textile.js | 0 .../codemirror}/mode/tiddlywiki/index.html | 0 .../mode/tiddlywiki/tiddlywiki.css | 0 .../codemirror}/mode/tiddlywiki/tiddlywiki.js | 0 .../plugins/codemirror}/mode/tiki/index.html | 0 .../plugins/codemirror}/mode/tiki/tiki.css | 0 .../plugins/codemirror}/mode/tiki/tiki.js | 0 .../plugins/codemirror}/mode/toml/index.html | 0 .../plugins/codemirror}/mode/toml/toml.js | 0 .../codemirror}/mode/tornado/index.html | 0 .../codemirror}/mode/tornado/tornado.js | 0 .../plugins/codemirror}/mode/troff/index.html | 0 .../plugins/codemirror}/mode/troff/troff.js | 0 .../codemirror}/mode/ttcn-cfg/index.html | 0 .../codemirror}/mode/ttcn-cfg/ttcn-cfg.js | 0 .../plugins/codemirror}/mode/ttcn/index.html | 0 .../plugins/codemirror}/mode/ttcn/ttcn.js | 0 .../codemirror}/mode/turtle/index.html | 0 .../plugins/codemirror}/mode/turtle/turtle.js | 0 .../plugins/codemirror}/mode/twig/index.html | 0 .../plugins/codemirror}/mode/twig/twig.js | 0 .../plugins/codemirror}/mode/vb/index.html | 0 .../plugins/codemirror}/mode/vb/vb.js | 0 .../codemirror}/mode/vbscript/index.html | 0 .../codemirror}/mode/vbscript/vbscript.js | 0 .../codemirror}/mode/velocity/index.html | 0 .../codemirror}/mode/velocity/velocity.js | 0 .../codemirror}/mode/verilog/index.html | 0 .../plugins/codemirror}/mode/verilog/test.js | 0 .../codemirror}/mode/verilog/verilog.js | 0 .../plugins/codemirror}/mode/vhdl/index.html | 0 .../plugins/codemirror}/mode/vhdl/vhdl.js | 0 .../plugins/codemirror}/mode/vue/index.html | 0 .../plugins/codemirror}/mode/vue/vue.js | 0 .../codemirror}/mode/webidl/index.html | 0 .../plugins/codemirror}/mode/webidl/webidl.js | 0 .../plugins/codemirror}/mode/xml/index.html | 0 .../plugins/codemirror}/mode/xml/test.js | 0 .../plugins/codemirror}/mode/xml/xml.js | 0 .../codemirror}/mode/xquery/index.html | 0 .../plugins/codemirror}/mode/xquery/test.js | 0 .../plugins/codemirror}/mode/xquery/xquery.js | 0 .../plugins/codemirror}/mode/yacas/index.html | 0 .../plugins/codemirror}/mode/yacas/yacas.js | 0 .../mode/yaml-frontmatter/index.html | 0 .../mode/yaml-frontmatter/yaml-frontmatter.js | 0 .../plugins/codemirror}/mode/yaml/index.html | 0 .../plugins/codemirror}/mode/yaml/yaml.js | 0 .../plugins/codemirror}/mode/z80/index.html | 0 .../plugins/codemirror}/mode/z80/z80.js | 0 public/vendor/plugins/cssrelpreload/LICENSE | 21 + .../cssrelpreload}/cssrelpreload.min.js | 0 .../plugins/cssrelpreload}/loadCSS.min.js | 0 public/vendor/plugins/dropzone/LICENSE | 20 + .../plugins/dropzone}/dropzone.css | 0 .../plugins/dropzone}/dropzone.js | 0 public/vendor/plugins/emojify/LICENSE | 8 + .../plugins/emojify/emojify.min.js} | 0 .../plugins/emojify/images}/+1.png | Bin .../plugins/emojify/images}/-1.png | Bin .../plugins/emojify/images}/100.png | Bin .../plugins/emojify/images}/1234.png | Bin .../plugins/emojify/images}/8ball.png | Bin .../plugins/emojify/images}/a.png | Bin .../plugins/emojify/images}/ab.png | Bin .../plugins/emojify/images}/abc.png | Bin .../plugins/emojify/images}/abcd.png | Bin .../plugins/emojify/images}/accept.png | Bin .../emojify/images}/aerial_tramway.png | Bin .../plugins/emojify/images}/airplane.png | Bin .../plugins/emojify/images}/alarm_clock.png | Bin .../plugins/emojify/images}/alien.png | Bin .../plugins/emojify/images}/ambulance.png | Bin .../plugins/emojify/images}/anchor.png | Bin .../plugins/emojify/images}/angel.png | Bin .../plugins/emojify/images}/anger.png | Bin .../plugins/emojify/images}/angry.png | Bin .../plugins/emojify/images}/anguished.png | Bin .../plugins/emojify/images}/ant.png | Bin .../plugins/emojify/images}/apple.png | Bin .../plugins/emojify/images}/aquarius.png | Bin .../plugins/emojify/images}/aries.png | Bin .../emojify/images}/arrow_backward.png | Bin .../emojify/images}/arrow_double_down.png | Bin .../emojify/images}/arrow_double_up.png | Bin .../plugins/emojify/images}/arrow_down.png | Bin .../emojify/images}/arrow_down_small.png | Bin .../plugins/emojify/images}/arrow_forward.png | Bin .../emojify/images}/arrow_heading_down.png | Bin .../emojify/images}/arrow_heading_up.png | Bin .../plugins/emojify/images}/arrow_left.png | Bin .../emojify/images}/arrow_lower_left.png | Bin .../emojify/images}/arrow_lower_right.png | Bin .../plugins/emojify/images}/arrow_right.png | Bin .../emojify/images}/arrow_right_hook.png | Bin .../plugins/emojify/images}/arrow_up.png | Bin .../plugins/emojify/images}/arrow_up_down.png | Bin .../emojify/images}/arrow_up_small.png | Bin .../emojify/images}/arrow_upper_left.png | Bin .../emojify/images}/arrow_upper_right.png | Bin .../emojify/images}/arrows_clockwise.png | Bin .../images}/arrows_counterclockwise.png | Bin .../plugins/emojify/images}/art.png | Bin .../emojify/images}/articulated_lorry.png | Bin .../plugins/emojify/images}/astonished.png | Bin .../plugins/emojify/images}/atm.png | Bin .../plugins/emojify/images}/b.png | Bin .../plugins/emojify/images}/baby.png | Bin .../plugins/emojify/images}/baby_bottle.png | Bin .../plugins/emojify/images}/baby_chick.png | Bin .../plugins/emojify/images}/baby_symbol.png | Bin .../plugins/emojify/images}/back.png | Bin .../plugins/emojify/images}/baggage_claim.png | Bin .../plugins/emojify/images}/balloon.png | Bin .../emojify/images}/ballot_box_with_check.png | Bin .../plugins/emojify/images}/bamboo.png | Bin .../plugins/emojify/images}/banana.png | Bin .../plugins/emojify/images}/bangbang.png | Bin .../plugins/emojify/images}/bank.png | Bin .../plugins/emojify/images}/bar_chart.png | Bin .../plugins/emojify/images}/barber.png | Bin .../plugins/emojify/images}/baseball.png | Bin .../plugins/emojify/images}/basketball.png | Bin .../plugins/emojify/images}/bath.png | Bin .../plugins/emojify/images}/bathtub.png | Bin .../plugins/emojify/images}/battery.png | Bin .../plugins/emojify/images}/bear.png | Bin .../plugins/emojify/images}/bee.png | Bin .../plugins/emojify/images}/beer.png | Bin .../plugins/emojify/images}/beers.png | Bin .../plugins/emojify/images}/beetle.png | Bin .../plugins/emojify/images}/beginner.png | Bin .../plugins/emojify/images}/bell.png | Bin .../plugins/emojify/images}/bento.png | Bin .../plugins/emojify/images}/bicyclist.png | Bin .../plugins/emojify/images}/bike.png | Bin .../plugins/emojify/images}/bikini.png | Bin .../plugins/emojify/images}/bird.png | Bin .../plugins/emojify/images}/birthday.png | Bin .../plugins/emojify/images}/black_circle.png | Bin .../plugins/emojify/images}/black_joker.png | Bin .../images}/black_medium_small_square.png | Bin .../emojify/images}/black_medium_square.png | Bin .../plugins/emojify/images}/black_nib.png | Bin .../emojify/images}/black_small_square.png | Bin .../plugins/emojify/images}/black_square.png | Bin .../emojify/images}/black_square_button.png | Bin .../plugins/emojify/images}/blossom.png | Bin .../plugins/emojify/images}/blowfish.png | Bin .../plugins/emojify/images}/blue_book.png | Bin .../plugins/emojify/images}/blue_car.png | Bin .../plugins/emojify/images}/blue_heart.png | Bin .../plugins/emojify/images}/blush.png | Bin .../plugins/emojify/images}/boar.png | Bin .../plugins/emojify/images}/boat.png | Bin .../plugins/emojify/images}/bomb.png | Bin .../plugins/emojify/images}/book.png | Bin .../plugins/emojify/images}/bookmark.png | Bin .../plugins/emojify/images}/bookmark_tabs.png | Bin .../plugins/emojify/images}/books.png | Bin .../plugins/emojify/images}/boom.png | Bin .../plugins/emojify/images}/boot.png | Bin .../plugins/emojify/images}/bouquet.png | Bin .../plugins/emojify/images}/bow.png | Bin .../plugins/emojify/images}/bowling.png | Bin .../plugins/emojify/images}/bowtie.png | Bin .../plugins/emojify/images}/boy.png | Bin .../plugins/emojify/images}/bread.png | Bin .../emojify/images}/bride_with_veil.png | Bin .../emojify/images}/bridge_at_night.png | Bin .../plugins/emojify/images}/briefcase.png | Bin .../plugins/emojify/images}/broken_heart.png | Bin .../plugins/emojify/images}/bug.png | Bin .../plugins/emojify/images}/bulb.png | Bin .../emojify/images}/bullettrain_front.png | Bin .../emojify/images}/bullettrain_side.png | Bin .../plugins/emojify/images}/bus.png | Bin .../plugins/emojify/images}/busstop.png | Bin .../emojify/images}/bust_in_silhouette.png | Bin .../emojify/images}/busts_in_silhouette.png | Bin .../plugins/emojify/images}/cactus.png | Bin .../plugins/emojify/images}/cake.png | Bin .../plugins/emojify/images}/calendar.png | Bin .../plugins/emojify/images}/calling.png | Bin .../plugins/emojify/images}/camel.png | Bin .../plugins/emojify/images}/camera.png | Bin .../plugins/emojify/images}/cancer.png | Bin .../plugins/emojify/images}/candy.png | Bin .../plugins/emojify/images}/capital_abcd.png | Bin .../plugins/emojify/images}/capricorn.png | Bin .../plugins/emojify/images}/car.png | Bin .../plugins/emojify/images}/card_index.png | Bin .../emojify/images}/carousel_horse.png | Bin .../plugins/emojify/images}/cat.png | Bin .../plugins/emojify/images}/cat2.png | Bin .../plugins/emojify/images}/cd.png | Bin .../plugins/emojify/images}/chart.png | Bin .../images}/chart_with_downwards_trend.png | Bin .../images}/chart_with_upwards_trend.png | Bin .../emojify/images}/checkered_flag.png | Bin .../plugins/emojify/images}/cherries.png | Bin .../emojify/images}/cherry_blossom.png | Bin .../plugins/emojify/images}/chestnut.png | Bin .../plugins/emojify/images}/chicken.png | Bin .../emojify/images}/children_crossing.png | Bin .../plugins/emojify/images}/chocolate_bar.png | Bin .../emojify/images}/christmas_tree.png | Bin .../plugins/emojify/images}/church.png | Bin .../plugins/emojify/images}/cinema.png | Bin .../plugins/emojify/images}/circus_tent.png | Bin .../plugins/emojify/images}/city_sunrise.png | Bin .../plugins/emojify/images}/city_sunset.png | Bin .../plugins/emojify/images}/cl.png | Bin .../plugins/emojify/images}/clap.png | Bin .../plugins/emojify/images}/clapper.png | Bin .../plugins/emojify/images}/clipboard.png | Bin .../plugins/emojify/images}/clock1.png | Bin .../plugins/emojify/images}/clock10.png | Bin .../plugins/emojify/images}/clock1030.png | Bin .../plugins/emojify/images}/clock11.png | Bin .../plugins/emojify/images}/clock1130.png | Bin .../plugins/emojify/images}/clock12.png | Bin .../plugins/emojify/images}/clock1230.png | Bin .../plugins/emojify/images}/clock130.png | Bin .../plugins/emojify/images}/clock2.png | Bin .../plugins/emojify/images}/clock230.png | Bin .../plugins/emojify/images}/clock3.png | Bin .../plugins/emojify/images}/clock330.png | Bin .../plugins/emojify/images}/clock4.png | Bin .../plugins/emojify/images}/clock430.png | Bin .../plugins/emojify/images}/clock5.png | Bin .../plugins/emojify/images}/clock530.png | Bin .../plugins/emojify/images}/clock6.png | Bin .../plugins/emojify/images}/clock630.png | Bin .../plugins/emojify/images}/clock7.png | Bin .../plugins/emojify/images}/clock730.png | Bin .../plugins/emojify/images}/clock8.png | Bin .../plugins/emojify/images}/clock830.png | Bin .../plugins/emojify/images}/clock9.png | Bin .../plugins/emojify/images}/clock930.png | Bin .../plugins/emojify/images}/closed_book.png | Bin .../emojify/images}/closed_lock_with_key.png | Bin .../emojify/images}/closed_umbrella.png | Bin .../plugins/emojify/images}/cloud.png | Bin .../plugins/emojify/images}/clubs.png | Bin .../plugins/emojify/images}/cn.png | Bin .../plugins/emojify/images}/cocktail.png | Bin .../plugins/emojify/images}/coffee.png | Bin .../plugins/emojify/images}/cold_sweat.png | Bin .../plugins/emojify/images}/collision.png | Bin .../plugins/emojify/images}/computer.png | Bin .../plugins/emojify/images}/confetti_ball.png | Bin .../plugins/emojify/images}/confounded.png | Bin .../plugins/emojify/images}/confused.png | Bin .../emojify/images}/congratulations.png | Bin .../plugins/emojify/images}/construction.png | Bin .../emojify/images}/construction_worker.png | Bin .../emojify/images}/convenience_store.png | Bin .../plugins/emojify/images}/cookie.png | Bin .../plugins/emojify/images}/cool.png | Bin .../plugins/emojify/images}/cop.png | Bin .../plugins/emojify/images}/copyright.png | Bin .../plugins/emojify/images}/corn.png | Bin .../plugins/emojify/images}/couple.png | Bin .../emojify/images}/couple_with_heart.png | Bin .../plugins/emojify/images}/couplekiss.png | Bin .../plugins/emojify/images}/cow.png | Bin .../plugins/emojify/images}/cow2.png | Bin .../plugins/emojify/images}/credit_card.png | Bin .../plugins/emojify/images}/crescent_moon.png | Bin .../plugins/emojify/images}/crocodile.png | Bin .../plugins/emojify/images}/crossed_flags.png | Bin .../plugins/emojify/images}/crown.png | Bin .../plugins/emojify/images}/cry.png | Bin .../emojify/images}/crying_cat_face.png | Bin .../plugins/emojify/images}/crystal_ball.png | Bin .../plugins/emojify/images}/cupid.png | Bin .../plugins/emojify/images}/curly_loop.png | Bin .../emojify/images}/currency_exchange.png | Bin .../plugins/emojify/images}/curry.png | Bin .../plugins/emojify/images}/custard.png | Bin .../plugins/emojify/images}/customs.png | Bin .../plugins/emojify/images}/cyclone.png | Bin .../plugins/emojify/images}/dancer.png | Bin .../plugins/emojify/images}/dancers.png | Bin .../plugins/emojify/images}/dango.png | Bin .../plugins/emojify/images}/dart.png | Bin .../plugins/emojify/images}/dash.png | Bin .../plugins/emojify/images}/date.png | Bin .../plugins/emojify/images}/de.png | Bin .../emojify/images}/deciduous_tree.png | Bin .../emojify/images}/department_store.png | Bin .../diamond_shape_with_a_dot_inside.png | Bin .../plugins/emojify/images}/diamonds.png | Bin .../plugins/emojify/images}/disappointed.png | Bin .../emojify/images}/disappointed_relieved.png | Bin .../plugins/emojify/images}/dizzy.png | Bin .../plugins/emojify/images}/dizzy_face.png | Bin .../plugins/emojify/images}/do_not_litter.png | Bin .../plugins/emojify/images}/dog.png | Bin .../plugins/emojify/images}/dog2.png | Bin .../plugins/emojify/images}/dollar.png | Bin .../plugins/emojify/images}/dolls.png | Bin .../plugins/emojify/images}/dolphin.png | Bin .../plugins/emojify/images}/donut.png | Bin .../plugins/emojify/images}/door.png | Bin .../plugins/emojify/images}/doughnut.png | Bin .../plugins/emojify/images}/dragon.png | Bin .../plugins/emojify/images}/dragon_face.png | Bin .../plugins/emojify/images}/dress.png | Bin .../emojify/images}/dromedary_camel.png | Bin .../plugins/emojify/images}/droplet.png | Bin .../plugins/emojify/images}/dvd.png | Bin .../plugins/emojify/images}/e-mail.png | Bin .../plugins/emojify/images}/ear.png | Bin .../plugins/emojify/images}/ear_of_rice.png | Bin .../plugins/emojify/images}/earth_africa.png | Bin .../emojify/images}/earth_americas.png | Bin .../plugins/emojify/images}/earth_asia.png | Bin .../plugins/emojify/images}/egg.png | Bin .../plugins/emojify/images}/eggplant.png | Bin .../plugins/emojify/images}/eight.png | Bin .../images}/eight_pointed_black_star.png | Bin .../emojify/images}/eight_spoked_asterisk.png | Bin .../plugins/emojify/images}/electric_plug.png | Bin .../plugins/emojify/images}/elephant.png | Bin .../plugins/emojify/images}/email.png | Bin .../plugins/emojify/images}/end.png | Bin .../plugins/emojify/images}/envelope.png | Bin .../plugins/emojify/images}/es.png | Bin .../plugins/emojify/images}/euro.png | Bin .../emojify/images}/european_castle.png | Bin .../emojify/images}/european_post_office.png | Bin .../emojify/images}/evergreen_tree.png | Bin .../plugins/emojify/images}/exclamation.png | Bin .../emojify/images}/expressionless.png | Bin .../plugins/emojify/images}/eyeglasses.png | Bin .../plugins/emojify/images}/eyes.png | Bin .../plugins/emojify/images}/facepunch.png | Bin .../plugins/emojify/images}/factory.png | Bin .../plugins/emojify/images}/fallen_leaf.png | Bin .../plugins/emojify/images}/family.png | Bin .../plugins/emojify/images}/fast_forward.png | Bin .../plugins/emojify/images}/fax.png | Bin .../plugins/emojify/images}/fearful.png | Bin .../plugins/emojify/images}/feelsgood.png | Bin .../plugins/emojify/images}/feet.png | Bin .../plugins/emojify/images}/ferris_wheel.png | Bin .../plugins/emojify/images}/file_folder.png | Bin .../plugins/emojify/images}/finnadie.png | Bin .../plugins/emojify/images}/fire.png | Bin .../plugins/emojify/images}/fire_engine.png | Bin .../plugins/emojify/images}/fireworks.png | Bin .../emojify/images}/first_quarter_moon.png | Bin .../images}/first_quarter_moon_with_face.png | Bin .../plugins/emojify/images}/fish.png | Bin .../plugins/emojify/images}/fish_cake.png | Bin .../emojify/images}/fishing_pole_and_fish.png | Bin .../plugins/emojify/images}/fist.png | Bin .../plugins/emojify/images}/five.png | Bin .../plugins/emojify/images}/flags.png | Bin .../plugins/emojify/images}/flashlight.png | Bin .../plugins/emojify/images}/floppy_disk.png | Bin .../emojify/images}/flower_playing_cards.png | Bin .../plugins/emojify/images}/flushed.png | Bin .../plugins/emojify/images}/foggy.png | Bin .../plugins/emojify/images}/football.png | Bin .../emojify/images}/fork_and_knife.png | Bin .../plugins/emojify/images}/fountain.png | Bin .../plugins/emojify/images}/four.png | Bin .../emojify/images}/four_leaf_clover.png | Bin .../plugins/emojify/images}/fr.png | Bin .../plugins/emojify/images}/free.png | Bin .../plugins/emojify/images}/fried_shrimp.png | Bin .../plugins/emojify/images}/fries.png | Bin .../plugins/emojify/images}/frog.png | Bin .../plugins/emojify/images}/frowning.png | Bin .../plugins/emojify/images}/fu.png | Bin .../plugins/emojify/images}/fuelpump.png | Bin .../plugins/emojify/images}/full_moon.png | Bin .../emojify/images}/full_moon_with_face.png | Bin .../plugins/emojify/images}/game_die.png | Bin .../plugins/emojify/images}/gb.png | Bin .../plugins/emojify/images}/gem.png | Bin .../plugins/emojify/images}/gemini.png | Bin .../plugins/emojify/images}/ghost.png | Bin .../plugins/emojify/images}/gift.png | Bin .../plugins/emojify/images}/gift_heart.png | Bin .../plugins/emojify/images}/girl.png | Bin .../emojify/images}/globe_with_meridians.png | Bin .../plugins/emojify/images}/goat.png | Bin .../plugins/emojify/images}/goberserk.png | Bin .../plugins/emojify/images}/godmode.png | Bin .../plugins/emojify/images}/golf.png | Bin .../plugins/emojify/images}/grapes.png | Bin .../plugins/emojify/images}/green_apple.png | Bin .../plugins/emojify/images}/green_book.png | Bin .../plugins/emojify/images}/green_heart.png | Bin .../emojify/images}/grey_exclamation.png | Bin .../plugins/emojify/images}/grey_question.png | Bin .../plugins/emojify/images}/grimacing.png | Bin .../plugins/emojify/images}/grin.png | Bin .../plugins/emojify/images}/grinning.png | Bin .../plugins/emojify/images}/guardsman.png | Bin .../plugins/emojify/images}/guitar.png | Bin .../plugins/emojify/images}/gun.png | Bin .../plugins/emojify/images}/haircut.png | Bin .../plugins/emojify/images}/hamburger.png | Bin .../plugins/emojify/images}/hammer.png | Bin .../plugins/emojify/images}/hamster.png | Bin .../plugins/emojify/images}/hand.png | Bin .../plugins/emojify/images}/handbag.png | Bin .../plugins/emojify/images}/hankey.png | Bin .../plugins/emojify/images}/hash.png | Bin .../plugins/emojify/images}/hatched_chick.png | Bin .../emojify/images}/hatching_chick.png | Bin .../plugins/emojify/images}/headphones.png | Bin .../plugins/emojify/images}/hear_no_evil.png | Bin .../plugins/emojify/images}/heart.png | Bin .../emojify/images}/heart_decoration.png | Bin .../plugins/emojify/images}/heart_eyes.png | Bin .../emojify/images}/heart_eyes_cat.png | Bin .../plugins/emojify/images}/heartbeat.png | Bin .../plugins/emojify/images}/heartpulse.png | Bin .../plugins/emojify/images}/hearts.png | Bin .../emojify/images}/heavy_check_mark.png | Bin .../emojify/images}/heavy_division_sign.png | Bin .../emojify/images}/heavy_dollar_sign.png | Bin .../images}/heavy_exclamation_mark.png | Bin .../emojify/images}/heavy_minus_sign.png | Bin .../images}/heavy_multiplication_x.png | Bin .../emojify/images}/heavy_plus_sign.png | Bin .../plugins/emojify/images}/helicopter.png | Bin .../plugins/emojify/images}/herb.png | Bin .../plugins/emojify/images}/hibiscus.png | Bin .../emojify/images}/high_brightness.png | Bin .../plugins/emojify/images}/high_heel.png | Bin .../plugins/emojify/images}/hocho.png | Bin .../plugins/emojify/images}/honey_pot.png | Bin .../plugins/emojify/images}/honeybee.png | Bin .../plugins/emojify/images}/horse.png | Bin .../plugins/emojify/images}/horse_racing.png | Bin .../plugins/emojify/images}/hospital.png | Bin .../plugins/emojify/images}/hotel.png | Bin .../plugins/emojify/images}/hotsprings.png | Bin .../plugins/emojify/images}/hourglass.png | Bin .../images}/hourglass_flowing_sand.png | Bin .../plugins/emojify/images}/house.png | Bin .../emojify/images}/house_with_garden.png | Bin .../plugins/emojify/images}/hurtrealbad.png | Bin .../plugins/emojify/images}/hushed.png | Bin .../plugins/emojify/images}/ice_cream.png | Bin .../plugins/emojify/images}/icecream.png | Bin .../plugins/emojify/images}/id.png | Bin .../emojify/images}/ideograph_advantage.png | Bin .../plugins/emojify/images}/imp.png | Bin .../plugins/emojify/images}/inbox_tray.png | Bin .../emojify/images}/incoming_envelope.png | Bin .../images}/information_desk_person.png | Bin .../emojify/images}/information_source.png | Bin .../plugins/emojify/images}/innocent.png | Bin .../plugins/emojify/images}/interrobang.png | Bin .../plugins/emojify/images}/iphone.png | Bin .../plugins/emojify/images}/it.png | Bin .../emojify/images}/izakaya_lantern.png | Bin .../emojify/images}/jack_o_lantern.png | Bin .../plugins/emojify/images}/japan.png | Bin .../emojify/images}/japanese_castle.png | Bin .../emojify/images}/japanese_goblin.png | Bin .../plugins/emojify/images}/japanese_ogre.png | Bin .../plugins/emojify/images}/jeans.png | Bin .../plugins/emojify/images}/joy.png | Bin .../plugins/emojify/images}/joy_cat.png | Bin .../plugins/emojify/images}/jp.png | Bin .../plugins/emojify/images}/key.png | Bin .../plugins/emojify/images}/keycap_ten.png | Bin .../plugins/emojify/images}/kimono.png | Bin .../plugins/emojify/images}/kiss.png | Bin .../plugins/emojify/images}/kissing.png | Bin .../plugins/emojify/images}/kissing_cat.png | Bin .../emojify/images}/kissing_closed_eyes.png | Bin .../plugins/emojify/images}/kissing_face.png | Bin .../plugins/emojify/images}/kissing_heart.png | Bin .../emojify/images}/kissing_smiling_eyes.png | Bin .../plugins/emojify/images}/koala.png | Bin .../plugins/emojify/images}/koko.png | Bin .../plugins/emojify/images}/kr.png | Bin .../emojify/images}/large_blue_circle.png | Bin .../emojify/images}/large_blue_diamond.png | Bin .../emojify/images}/large_orange_diamond.png | Bin .../emojify/images}/last_quarter_moon.png | Bin .../images}/last_quarter_moon_with_face.png | Bin .../plugins/emojify/images}/laughing.png | Bin .../plugins/emojify/images}/leaves.png | Bin .../plugins/emojify/images}/ledger.png | Bin .../plugins/emojify/images}/left_luggage.png | Bin .../emojify/images}/left_right_arrow.png | Bin .../images}/leftwards_arrow_with_hook.png | Bin .../plugins/emojify/images}/lemon.png | Bin .../plugins/emojify/images}/leo.png | Bin .../plugins/emojify/images}/leopard.png | Bin .../plugins/emojify/images}/libra.png | Bin .../plugins/emojify/images}/light_rail.png | Bin .../plugins/emojify/images}/link.png | Bin .../plugins/emojify/images}/lips.png | Bin .../plugins/emojify/images}/lipstick.png | Bin .../plugins/emojify/images}/lock.png | Bin .../emojify/images}/lock_with_ink_pen.png | Bin .../plugins/emojify/images}/lollipop.png | Bin .../plugins/emojify/images}/loop.png | Bin .../plugins/emojify/images}/loudspeaker.png | Bin .../plugins/emojify/images}/love_hotel.png | Bin .../plugins/emojify/images}/love_letter.png | Bin .../emojify/images}/low_brightness.png | Bin .../plugins/emojify/images}/m.png | Bin .../plugins/emojify/images}/mag.png | Bin .../plugins/emojify/images}/mag_right.png | Bin .../plugins/emojify/images}/mahjong.png | Bin .../plugins/emojify/images}/mailbox.png | Bin .../emojify/images}/mailbox_closed.png | Bin .../emojify/images}/mailbox_with_mail.png | Bin .../emojify/images}/mailbox_with_no_mail.png | Bin .../plugins/emojify/images}/man.png | Bin .../emojify/images}/man_with_gua_pi_mao.png | Bin .../emojify/images}/man_with_turban.png | Bin .../plugins/emojify/images}/mans_shoe.png | Bin .../plugins/emojify/images}/maple_leaf.png | Bin .../plugins/emojify/images}/mask.png | Bin .../plugins/emojify/images}/massage.png | Bin .../plugins/emojify/images}/meat_on_bone.png | Bin .../plugins/emojify/images}/mega.png | Bin .../plugins/emojify/images}/melon.png | Bin .../plugins/emojify/images}/memo.png | Bin .../plugins/emojify/images}/mens.png | Bin .../plugins/emojify/images}/metal.png | Bin .../plugins/emojify/images}/metro.png | Bin .../plugins/emojify/images}/microphone.png | Bin .../plugins/emojify/images}/microscope.png | Bin .../plugins/emojify/images}/milky_way.png | Bin .../plugins/emojify/images}/minibus.png | Bin .../plugins/emojify/images}/minidisc.png | Bin .../emojify/images}/mobile_phone_off.png | Bin .../emojify/images}/money_with_wings.png | Bin .../plugins/emojify/images}/moneybag.png | Bin .../plugins/emojify/images}/monkey.png | Bin .../plugins/emojify/images}/monkey_face.png | Bin .../plugins/emojify/images}/monorail.png | Bin .../plugins/emojify/images}/mortar_board.png | Bin .../plugins/emojify/images}/mount_fuji.png | Bin .../emojify/images}/mountain_bicyclist.png | Bin .../emojify/images}/mountain_cableway.png | Bin .../emojify/images}/mountain_railway.png | Bin .../plugins/emojify/images}/mouse.png | Bin .../plugins/emojify/images}/mouse2.png | Bin .../plugins/emojify/images}/movie_camera.png | Bin .../plugins/emojify/images}/moyai.png | Bin .../plugins/emojify/images}/muscle.png | Bin .../plugins/emojify/images}/mushroom.png | Bin .../emojify/images}/musical_keyboard.png | Bin .../plugins/emojify/images}/musical_note.png | Bin .../plugins/emojify/images}/musical_score.png | Bin .../plugins/emojify/images}/mute.png | Bin .../plugins/emojify/images}/nail_care.png | Bin .../plugins/emojify/images}/name_badge.png | Bin .../plugins/emojify/images}/neckbeard.png | Bin .../plugins/emojify/images}/necktie.png | Bin .../images}/negative_squared_cross_mark.png | Bin .../plugins/emojify/images}/neutral_face.png | Bin .../plugins/emojify/images}/new.png | Bin .../plugins/emojify/images}/new_moon.png | Bin .../emojify/images}/new_moon_with_face.png | Bin .../plugins/emojify/images}/newspaper.png | Bin .../plugins/emojify/images}/ng.png | Bin .../plugins/emojify/images}/nine.png | Bin .../plugins/emojify/images}/no_bell.png | Bin .../plugins/emojify/images}/no_bicycles.png | Bin .../plugins/emojify/images}/no_entry.png | Bin .../plugins/emojify/images}/no_entry_sign.png | Bin .../plugins/emojify/images}/no_good.png | Bin .../emojify/images}/no_mobile_phones.png | Bin .../plugins/emojify/images}/no_mouth.png | Bin .../emojify/images}/no_pedestrians.png | Bin .../plugins/emojify/images}/no_smoking.png | Bin .../emojify/images}/non-potable_water.png | Bin .../plugins/emojify/images}/nose.png | Bin .../plugins/emojify/images}/notebook.png | Bin .../notebook_with_decorative_cover.png | Bin .../plugins/emojify/images}/notes.png | Bin .../plugins/emojify/images}/nut_and_bolt.png | Bin .../plugins/emojify/images}/o.png | Bin .../plugins/emojify/images}/o2.png | Bin .../plugins/emojify/images}/ocean.png | Bin .../plugins/emojify/images}/octocat.png | Bin .../plugins/emojify/images}/octopus.png | Bin .../plugins/emojify/images}/oden.png | Bin .../plugins/emojify/images}/office.png | Bin .../plugins/emojify/images}/ok.png | Bin .../plugins/emojify/images}/ok_hand.png | Bin .../plugins/emojify/images}/ok_woman.png | Bin .../plugins/emojify/images}/older_man.png | Bin .../plugins/emojify/images}/older_woman.png | Bin .../plugins/emojify/images}/on.png | Bin .../emojify/images}/oncoming_automobile.png | Bin .../plugins/emojify/images}/oncoming_bus.png | Bin .../emojify/images}/oncoming_police_car.png | Bin .../plugins/emojify/images}/oncoming_taxi.png | Bin .../plugins/emojify/images}/one.png | Bin .../emojify/images}/open_file_folder.png | Bin .../plugins/emojify/images}/open_hands.png | Bin .../plugins/emojify/images}/open_mouth.png | Bin .../plugins/emojify/images}/ophiuchus.png | Bin .../plugins/emojify/images}/orange_book.png | Bin .../plugins/emojify/images}/outbox_tray.png | Bin .../plugins/emojify/images}/ox.png | Bin .../plugins/emojify/images}/package.png | Bin .../emojify/images}/page_facing_up.png | Bin .../emojify/images}/page_with_curl.png | Bin .../plugins/emojify/images}/pager.png | Bin .../plugins/emojify/images}/palm_tree.png | Bin .../plugins/emojify/images}/panda_face.png | Bin .../plugins/emojify/images}/paperclip.png | Bin .../plugins/emojify/images}/parking.png | Bin .../emojify/images}/part_alternation_mark.png | Bin .../plugins/emojify/images}/partly_sunny.png | Bin .../emojify/images}/passport_control.png | Bin .../plugins/emojify/images}/paw_prints.png | Bin .../plugins/emojify/images}/peach.png | Bin .../plugins/emojify/images}/pear.png | Bin .../plugins/emojify/images}/pencil.png | Bin .../plugins/emojify/images}/pencil2.png | Bin .../plugins/emojify/images}/penguin.png | Bin .../plugins/emojify/images}/pensive.png | Bin .../emojify/images}/performing_arts.png | Bin .../plugins/emojify/images}/persevere.png | Bin .../emojify/images}/person_frowning.png | Bin .../images}/person_with_blond_hair.png | Bin .../images}/person_with_pouting_face.png | Bin .../plugins/emojify/images}/phone.png | Bin .../plugins/emojify/images}/pig.png | Bin .../plugins/emojify/images}/pig2.png | Bin .../plugins/emojify/images}/pig_nose.png | Bin .../plugins/emojify/images}/pill.png | Bin .../plugins/emojify/images}/pineapple.png | Bin .../plugins/emojify/images}/pisces.png | Bin .../plugins/emojify/images}/pizza.png | Bin .../plugins/emojify/images}/plus1.png | Bin .../plugins/emojify/images}/point_down.png | Bin .../plugins/emojify/images}/point_left.png | Bin .../plugins/emojify/images}/point_right.png | Bin .../plugins/emojify/images}/point_up.png | Bin .../plugins/emojify/images}/point_up_2.png | Bin .../plugins/emojify/images}/police_car.png | Bin .../plugins/emojify/images}/poodle.png | Bin .../plugins/emojify/images}/poop.png | Bin .../plugins/emojify/images}/post_office.png | Bin .../plugins/emojify/images}/postal_horn.png | Bin .../plugins/emojify/images}/postbox.png | Bin .../plugins/emojify/images}/potable_water.png | Bin .../plugins/emojify/images}/pouch.png | Bin .../plugins/emojify/images}/poultry_leg.png | Bin .../plugins/emojify/images}/pound.png | Bin .../plugins/emojify/images}/pouting_cat.png | Bin .../plugins/emojify/images}/pray.png | Bin .../plugins/emojify/images}/princess.png | Bin .../plugins/emojify/images}/punch.png | Bin .../plugins/emojify/images}/purple_heart.png | Bin .../plugins/emojify/images}/purse.png | Bin .../plugins/emojify/images}/pushpin.png | Bin .../images}/put_litter_in_its_place.png | Bin .../plugins/emojify/images}/question.png | Bin .../plugins/emojify/images}/rabbit.png | Bin .../plugins/emojify/images}/rabbit2.png | Bin .../plugins/emojify/images}/racehorse.png | Bin .../plugins/emojify/images}/radio.png | Bin .../plugins/emojify/images}/radio_button.png | Bin .../plugins/emojify/images}/rage.png | Bin .../plugins/emojify/images}/rage1.png | Bin .../plugins/emojify/images}/rage2.png | Bin .../plugins/emojify/images}/rage3.png | Bin .../plugins/emojify/images}/rage4.png | Bin .../plugins/emojify/images}/railway_car.png | Bin .../plugins/emojify/images}/rainbow.png | Bin .../plugins/emojify/images}/raised_hand.png | Bin .../plugins/emojify/images}/raised_hands.png | Bin .../plugins/emojify/images}/raising_hand.png | Bin .../plugins/emojify/images}/ram.png | Bin .../plugins/emojify/images}/ramen.png | Bin .../plugins/emojify/images}/rat.png | Bin .../plugins/emojify/images}/recycle.png | Bin .../plugins/emojify/images}/red_car.png | Bin .../plugins/emojify/images}/red_circle.png | Bin .../plugins/emojify/images}/registered.png | Bin .../plugins/emojify/images}/relaxed.png | Bin .../plugins/emojify/images}/relieved.png | Bin .../plugins/emojify/images}/repeat.png | Bin .../plugins/emojify/images}/repeat_one.png | Bin .../plugins/emojify/images}/restroom.png | Bin .../emojify/images}/revolving_hearts.png | Bin .../plugins/emojify/images}/rewind.png | Bin .../plugins/emojify/images}/ribbon.png | Bin .../plugins/emojify/images}/rice.png | Bin .../plugins/emojify/images}/rice_ball.png | Bin .../plugins/emojify/images}/rice_cracker.png | Bin .../plugins/emojify/images}/rice_scene.png | Bin .../plugins/emojify/images}/ring.png | Bin .../plugins/emojify/images}/rocket.png | Bin .../emojify/images}/roller_coaster.png | Bin .../plugins/emojify/images}/rooster.png | Bin .../plugins/emojify/images}/rose.png | Bin .../emojify/images}/rotating_light.png | Bin .../plugins/emojify/images}/round_pushpin.png | Bin .../plugins/emojify/images}/rowboat.png | Bin .../plugins/emojify/images}/ru.png | Bin .../emojify/images}/rugby_football.png | Bin .../plugins/emojify/images}/runner.png | Bin .../plugins/emojify/images}/running.png | Bin .../images}/running_shirt_with_sash.png | Bin .../plugins/emojify/images}/sa.png | Bin .../plugins/emojify/images}/sagittarius.png | Bin .../plugins/emojify/images}/sailboat.png | Bin .../plugins/emojify/images}/sake.png | Bin .../plugins/emojify/images}/sandal.png | Bin .../plugins/emojify/images}/santa.png | Bin .../plugins/emojify/images}/satellite.png | Bin .../plugins/emojify/images}/satisfied.png | Bin .../plugins/emojify/images}/saxophone.png | Bin .../plugins/emojify/images}/school.png | Bin .../emojify/images}/school_satchel.png | Bin .../plugins/emojify/images}/scissors.png | Bin .../plugins/emojify/images}/scorpius.png | Bin .../plugins/emojify/images}/scream.png | Bin .../plugins/emojify/images}/scream_cat.png | Bin .../plugins/emojify/images}/scroll.png | Bin .../plugins/emojify/images}/seat.png | Bin .../plugins/emojify/images}/secret.png | Bin .../plugins/emojify/images}/see_no_evil.png | Bin .../plugins/emojify/images}/seedling.png | Bin .../plugins/emojify/images}/seven.png | Bin .../plugins/emojify/images}/shaved_ice.png | Bin .../plugins/emojify/images}/sheep.png | Bin .../plugins/emojify/images}/shell.png | Bin .../plugins/emojify/images}/ship.png | Bin .../plugins/emojify/images}/shipit.png | Bin .../plugins/emojify/images}/shirt.png | Bin .../plugins/emojify/images}/shit.png | Bin .../plugins/emojify/images}/shoe.png | Bin .../plugins/emojify/images}/shower.png | Bin .../emojify/images}/signal_strength.png | Bin .../plugins/emojify/images}/six.png | Bin .../emojify/images}/six_pointed_star.png | Bin .../plugins/emojify/images}/ski.png | Bin .../plugins/emojify/images}/skull.png | Bin .../plugins/emojify/images}/sleeping.png | Bin .../plugins/emojify/images}/sleepy.png | Bin .../plugins/emojify/images}/slot_machine.png | Bin .../emojify/images}/small_blue_diamond.png | Bin .../emojify/images}/small_orange_diamond.png | Bin .../emojify/images}/small_red_triangle.png | Bin .../images}/small_red_triangle_down.png | Bin .../plugins/emojify/images}/smile.png | Bin .../plugins/emojify/images}/smile_cat.png | Bin .../plugins/emojify/images}/smiley.png | Bin .../plugins/emojify/images}/smiley_cat.png | Bin .../plugins/emojify/images}/smiling_imp.png | Bin .../plugins/emojify/images}/smirk.png | Bin .../plugins/emojify/images}/smirk_cat.png | Bin .../plugins/emojify/images}/smoking.png | Bin .../plugins/emojify/images}/snail.png | Bin .../plugins/emojify/images}/snake.png | Bin .../plugins/emojify/images}/snowboarder.png | Bin .../plugins/emojify/images}/snowflake.png | Bin .../plugins/emojify/images}/snowman.png | Bin .../plugins/emojify/images}/sob.png | Bin .../plugins/emojify/images}/soccer.png | Bin .../plugins/emojify/images}/soon.png | Bin .../plugins/emojify/images}/sos.png | Bin .../plugins/emojify/images}/sound.png | Bin .../plugins/emojify/images}/space_invader.png | Bin .../plugins/emojify/images}/spades.png | Bin .../plugins/emojify/images}/spaghetti.png | Bin .../plugins/emojify/images}/sparkle.png | Bin .../plugins/emojify/images}/sparkler.png | Bin .../plugins/emojify/images}/sparkles.png | Bin .../emojify/images}/sparkling_heart.png | Bin .../plugins/emojify/images}/speak_no_evil.png | Bin .../plugins/emojify/images}/speaker.png | Bin .../emojify/images}/speech_balloon.png | Bin .../plugins/emojify/images}/speedboat.png | Bin .../plugins/emojify/images}/squirrel.png | Bin .../plugins/emojify/images}/star.png | Bin .../plugins/emojify/images}/star2.png | Bin .../plugins/emojify/images}/stars.png | Bin .../plugins/emojify/images}/station.png | Bin .../emojify/images}/statue_of_liberty.png | Bin .../emojify/images}/steam_locomotive.png | Bin .../plugins/emojify/images}/stew.png | Bin .../emojify/images}/straight_ruler.png | Bin .../plugins/emojify/images}/strawberry.png | Bin .../emojify/images}/stuck_out_tongue.png | Bin .../images}/stuck_out_tongue_closed_eyes.png | Bin .../images}/stuck_out_tongue_winking_eye.png | Bin .../plugins/emojify/images}/sun_with_face.png | Bin .../plugins/emojify/images}/sunflower.png | Bin .../plugins/emojify/images}/sunglasses.png | Bin .../plugins/emojify/images}/sunny.png | Bin .../plugins/emojify/images}/sunrise.png | Bin .../images}/sunrise_over_mountains.png | Bin .../plugins/emojify/images}/surfer.png | Bin .../plugins/emojify/images}/sushi.png | Bin .../plugins/emojify/images}/suspect.png | Bin .../emojify/images}/suspension_railway.png | Bin .../plugins/emojify/images}/sweat.png | Bin .../plugins/emojify/images}/sweat_drops.png | Bin .../plugins/emojify/images}/sweat_smile.png | Bin .../plugins/emojify/images}/sweet_potato.png | Bin .../plugins/emojify/images}/swimmer.png | Bin .../plugins/emojify/images}/symbols.png | Bin .../plugins/emojify/images}/syringe.png | Bin .../plugins/emojify/images}/tada.png | Bin .../plugins/emojify/images}/tanabata_tree.png | Bin .../plugins/emojify/images}/tangerine.png | Bin .../plugins/emojify/images}/taurus.png | Bin .../plugins/emojify/images}/taxi.png | Bin .../plugins/emojify/images}/tea.png | Bin .../plugins/emojify/images}/telephone.png | Bin .../emojify/images}/telephone_receiver.png | Bin .../plugins/emojify/images}/telescope.png | Bin .../plugins/emojify/images}/tennis.png | Bin .../plugins/emojify/images}/tent.png | Bin .../emojify/images}/thought_balloon.png | Bin .../plugins/emojify/images}/three.png | Bin .../plugins/emojify/images}/thumbsdown.png | Bin .../plugins/emojify/images}/thumbsup.png | Bin .../plugins/emojify/images}/ticket.png | Bin .../plugins/emojify/images}/tiger.png | Bin .../plugins/emojify/images}/tiger2.png | Bin .../plugins/emojify/images}/tired_face.png | Bin .../plugins/emojify/images}/tm.png | Bin .../plugins/emojify/images}/toilet.png | Bin .../plugins/emojify/images}/tokyo_tower.png | Bin .../plugins/emojify/images}/tomato.png | Bin .../plugins/emojify/images}/tongue.png | Bin .../plugins/emojify/images}/top.png | Bin .../plugins/emojify/images}/tophat.png | Bin .../plugins/emojify/images}/tractor.png | Bin .../plugins/emojify/images}/traffic_light.png | Bin .../plugins/emojify/images}/train.png | Bin .../plugins/emojify/images}/train2.png | Bin .../plugins/emojify/images}/tram.png | Bin .../images}/triangular_flag_on_post.png | Bin .../emojify/images}/triangular_ruler.png | Bin .../plugins/emojify/images}/trident.png | Bin .../plugins/emojify/images}/triumph.png | Bin .../plugins/emojify/images}/trolleybus.png | Bin .../plugins/emojify/images}/trollface.png | Bin .../plugins/emojify/images}/trophy.png | Bin .../emojify/images}/tropical_drink.png | Bin .../plugins/emojify/images}/tropical_fish.png | Bin .../plugins/emojify/images}/truck.png | Bin .../plugins/emojify/images}/trumpet.png | Bin .../plugins/emojify/images}/tshirt.png | Bin .../plugins/emojify/images}/tulip.png | Bin .../plugins/emojify/images}/turtle.png | Bin .../plugins/emojify/images}/tv.png | Bin .../images}/twisted_rightwards_arrows.png | Bin .../plugins/emojify/images}/two.png | Bin .../plugins/emojify/images}/two_hearts.png | Bin .../emojify/images}/two_men_holding_hands.png | Bin .../images}/two_women_holding_hands.png | Bin .../plugins/emojify/images}/u5272.png | Bin .../plugins/emojify/images}/u5408.png | Bin .../plugins/emojify/images}/u55b6.png | Bin .../plugins/emojify/images}/u6307.png | Bin .../plugins/emojify/images}/u6708.png | Bin .../plugins/emojify/images}/u6709.png | Bin .../plugins/emojify/images}/u6e80.png | Bin .../plugins/emojify/images}/u7121.png | Bin .../plugins/emojify/images}/u7533.png | Bin .../plugins/emojify/images}/u7981.png | Bin .../plugins/emojify/images}/u7a7a.png | Bin .../plugins/emojify/images}/uk.png | Bin .../plugins/emojify/images}/umbrella.png | Bin .../plugins/emojify/images}/unamused.png | Bin .../plugins/emojify/images}/underage.png | Bin .../plugins/emojify/images}/unlock.png | Bin .../plugins/emojify/images}/up.png | Bin .../plugins/emojify/images}/us.png | Bin .../plugins/emojify/images}/v.png | Bin .../images}/vertical_traffic_light.png | Bin .../plugins/emojify/images}/vhs.png | Bin .../emojify/images}/vibration_mode.png | Bin .../plugins/emojify/images}/video_camera.png | Bin .../plugins/emojify/images}/video_game.png | Bin .../plugins/emojify/images}/violin.png | Bin .../plugins/emojify/images}/virgo.png | Bin .../plugins/emojify/images}/volcano.png | Bin .../plugins/emojify/images}/vs.png | Bin .../plugins/emojify/images}/walking.png | Bin .../emojify/images}/waning_crescent_moon.png | Bin .../emojify/images}/waning_gibbous_moon.png | Bin .../plugins/emojify/images}/warning.png | Bin .../plugins/emojify/images}/watch.png | Bin .../plugins/emojify/images}/water_buffalo.png | Bin .../plugins/emojify/images}/watermelon.png | Bin .../plugins/emojify/images}/wave.png | Bin .../plugins/emojify/images}/wavy_dash.png | Bin .../emojify/images}/waxing_crescent_moon.png | Bin .../emojify/images}/waxing_gibbous_moon.png | Bin .../plugins/emojify/images}/wc.png | Bin .../plugins/emojify/images}/weary.png | Bin .../plugins/emojify/images}/wedding.png | Bin .../plugins/emojify/images}/whale.png | Bin .../plugins/emojify/images}/whale2.png | Bin .../plugins/emojify/images}/wheelchair.png | Bin .../emojify/images}/white_check_mark.png | Bin .../plugins/emojify/images}/white_circle.png | Bin .../plugins/emojify/images}/white_flower.png | Bin .../emojify/images}/white_large_square.png | Bin .../images}/white_medium_small_square.png | Bin .../emojify/images}/white_medium_square.png | Bin .../emojify/images}/white_small_square.png | Bin .../emojify/images}/white_square_button.png | Bin .../plugins/emojify/images}/wind_chime.png | Bin .../plugins/emojify/images}/wine_glass.png | Bin .../plugins/emojify/images}/wink.png | Bin .../plugins/emojify/images}/wolf.png | Bin .../plugins/emojify/images}/woman.png | Bin .../emojify/images}/womans_clothes.png | Bin .../plugins/emojify/images}/womans_hat.png | Bin .../plugins/emojify/images}/womens.png | Bin .../plugins/emojify/images}/worried.png | Bin .../plugins/emojify/images}/wrench.png | Bin .../plugins/emojify/images}/x.png | Bin .../plugins/emojify/images}/yellow_heart.png | Bin .../plugins/emojify/images}/yen.png | Bin .../plugins/emojify/images}/yum.png | Bin .../plugins/emojify/images}/zap.png | Bin .../plugins/emojify/images}/zero.png | Bin .../plugins/emojify/images}/zzz.png | Bin public/vendor/plugins/gitgraph/LICENSE | 24 + .../plugins/gitgraph}/gitgraph.css | 0 .../plugins/gitgraph}/gitgraph.js | 4 +- public/vendor/plugins/highlight/LICENSE | 25 + .../plugins/highlight}/default.css | 0 .../plugins/highlight}/github.css | 0 .../plugins/highlight}/highlight.pack.js | 0 .../vendor/plugins/jquery.areyousure/LICENSE | 18 + .../jquery.areyousure}/jquery.are-you-sure.js | 0 .../plugins/jquery.datetimepicker/LICENSE | 19 + .../jquery.datetimepicker.css | 0 .../jquery.datetimepicker.js | 0 .../vendor/plugins/jquery.minicolors/LICENSE | 18 + .../jquery.minicolors}/jquery.minicolors.css | 0 .../jquery.minicolors.min.js | 0 .../jquery.minicolors}/jquery.minicolors.png | Bin public/vendor/plugins/jquery/LICENSE | 18 + .../plugins/jquery/jquery.min.js} | 0 .../plugins/pdfjs}/LICENSE | 0 .../plugins/pdfjs}/build/pdf.js | 0 .../plugins/pdfjs}/build/pdf.worker.js | 0 .../plugins/pdfjs}/web/compatibility.js | 0 .../plugins/pdfjs}/web/debugger.js | 0 .../pdfjs}/web/images/annotation-check.svg | 0 .../pdfjs}/web/images/annotation-comment.svg | 0 .../pdfjs}/web/images/annotation-help.svg | 0 .../pdfjs}/web/images/annotation-insert.svg | 0 .../pdfjs}/web/images/annotation-key.svg | 0 .../web/images/annotation-newparagraph.svg | 0 .../pdfjs}/web/images/annotation-noicon.svg | 0 .../pdfjs}/web/images/annotation-note.svg | 0 .../web/images/annotation-paragraph.svg | 0 .../web/images/findbarButton-next-rtl.png | Bin .../web/images/findbarButton-next-rtl@2x.png | Bin .../pdfjs}/web/images/findbarButton-next.png | Bin .../web/images/findbarButton-next@2x.png | Bin .../web/images/findbarButton-previous-rtl.png | Bin .../images/findbarButton-previous-rtl@2x.png | Bin .../web/images/findbarButton-previous.png | Bin .../web/images/findbarButton-previous@2x.png | Bin .../plugins/pdfjs}/web/images/grab.cur | Bin .../plugins/pdfjs}/web/images/grabbing.cur | Bin .../pdfjs}/web/images/loading-icon.gif | Bin .../pdfjs}/web/images/loading-small.png | Bin .../pdfjs}/web/images/loading-small@2x.png | Bin ...ondaryToolbarButton-documentProperties.png | Bin ...aryToolbarButton-documentProperties@2x.png | Bin .../secondaryToolbarButton-firstPage.png | Bin .../secondaryToolbarButton-firstPage@2x.png | Bin .../secondaryToolbarButton-handTool.png | Bin .../secondaryToolbarButton-handTool@2x.png | Bin .../secondaryToolbarButton-lastPage.png | Bin .../secondaryToolbarButton-lastPage@2x.png | Bin .../secondaryToolbarButton-rotateCcw.png | Bin .../secondaryToolbarButton-rotateCcw@2x.png | Bin .../secondaryToolbarButton-rotateCw.png | Bin .../secondaryToolbarButton-rotateCw@2x.png | Bin .../plugins/pdfjs}/web/images/shadow.png | Bin .../plugins/pdfjs}/web/images/texture.png | Bin .../web/images/toolbarButton-bookmark.png | Bin .../web/images/toolbarButton-bookmark@2x.png | Bin .../web/images/toolbarButton-download.png | Bin .../web/images/toolbarButton-download@2x.png | Bin .../web/images/toolbarButton-menuArrows.png | Bin .../images/toolbarButton-menuArrows@2x.png | Bin .../web/images/toolbarButton-openFile.png | Bin .../web/images/toolbarButton-openFile@2x.png | Bin .../web/images/toolbarButton-pageDown-rtl.png | Bin .../images/toolbarButton-pageDown-rtl@2x.png | Bin .../web/images/toolbarButton-pageDown.png | Bin .../web/images/toolbarButton-pageDown@2x.png | Bin .../web/images/toolbarButton-pageUp-rtl.png | Bin .../images/toolbarButton-pageUp-rtl@2x.png | Bin .../web/images/toolbarButton-pageUp.png | Bin .../web/images/toolbarButton-pageUp@2x.png | Bin .../images/toolbarButton-presentationMode.png | Bin .../toolbarButton-presentationMode@2x.png | Bin .../pdfjs}/web/images/toolbarButton-print.png | Bin .../web/images/toolbarButton-print@2x.png | Bin .../web/images/toolbarButton-search.png | Bin .../web/images/toolbarButton-search@2x.png | Bin ...olbarButton-secondaryToolbarToggle-rtl.png | Bin ...arButton-secondaryToolbarToggle-rtl@2x.png | Bin .../toolbarButton-secondaryToolbarToggle.png | Bin ...oolbarButton-secondaryToolbarToggle@2x.png | Bin .../toolbarButton-sidebarToggle-rtl.png | Bin .../toolbarButton-sidebarToggle-rtl@2x.png | Bin .../images/toolbarButton-sidebarToggle.png | Bin .../images/toolbarButton-sidebarToggle@2x.png | Bin .../images/toolbarButton-viewAttachments.png | Bin .../toolbarButton-viewAttachments@2x.png | Bin .../images/toolbarButton-viewOutline-rtl.png | Bin .../toolbarButton-viewOutline-rtl@2x.png | Bin .../web/images/toolbarButton-viewOutline.png | Bin .../images/toolbarButton-viewOutline@2x.png | Bin .../images/toolbarButton-viewThumbnail.png | Bin .../images/toolbarButton-viewThumbnail@2x.png | Bin .../web/images/toolbarButton-zoomIn.png | Bin .../web/images/toolbarButton-zoomIn@2x.png | Bin .../web/images/toolbarButton-zoomOut.png | Bin .../web/images/toolbarButton-zoomOut@2x.png | Bin .../web/images/treeitem-collapsed-rtl.png | Bin .../web/images/treeitem-collapsed-rtl@2x.png | Bin .../pdfjs}/web/images/treeitem-collapsed.png | Bin .../web/images/treeitem-collapsed@2x.png | Bin .../pdfjs}/web/images/treeitem-expanded.png | Bin .../web/images/treeitem-expanded@2x.png | Bin .../plugins/pdfjs}/web/viewer.css | 0 .../plugins/pdfjs}/web/viewer.html | 0 .../plugins/pdfjs}/web/viewer.js | 0 public/vendor/plugins/semantic/LICENSE | 18 + .../plugins/semantic/semantic.min.css} | 0 .../plugins/semantic/semantic.min.js} | 0 .../themes/basic/assets/fonts/icons.eot | Bin .../themes/basic/assets/fonts/icons.svg | 0 .../themes/basic/assets/fonts/icons.ttf | Bin .../themes/basic/assets/fonts/icons.woff | Bin .../themes/default/assets/fonts/icons.eot | Bin .../themes/default/assets/fonts/icons.otf | Bin .../themes/default/assets/fonts/icons.svg | 0 .../themes/default/assets/fonts/icons.ttf | Bin .../themes/default/assets/fonts/icons.woff | Bin .../themes/default/assets/fonts/icons.woff2 | Bin .../themes/default/assets/images/flags.png | Bin .../github/assets/fonts/octicons-local.ttf | Bin .../themes/github/assets/fonts/octicons.svg | 0 .../themes/github/assets/fonts/octicons.ttf | Bin .../themes/github/assets/fonts/octicons.woff | Bin public/vendor/plugins/simplemde/LICENSE | 21 + .../plugins/simplemde}/simplemde.min.css | 0 .../plugins/simplemde}/simplemde.min.js | 0 public/vendor/plugins/vue/LICENSE | 21 + .../libs => vendor/plugins/vue}/vue.min.js | 0 routers/admin/admin.go | 2 +- routers/admin/repos.go | 2 +- routers/api/v1/admin/org.go | 15 +- routers/api/v1/admin/repo.go | 15 +- routers/api/v1/admin/user.go | 57 +- routers/api/v1/api.go | 33 + routers/api/v1/misc/markdown.go | 4 +- routers/api/v1/misc/markdown_test.go | 2 +- routers/api/v1/misc/version.go | 2 +- routers/api/v1/org/hook.go | 56 + routers/api/v1/org/member.go | 66 + routers/api/v1/org/org.go | 2 +- routers/api/v1/repo/fork.go | 6 +- routers/api/v1/repo/hook.go | 14 +- routers/api/v1/repo/issue_tracked_time.go | 158 ++ routers/api/v1/repo/repo.go | 47 +- routers/api/v1/user/app.go | 4 +- routers/api/v1/user/follower.go | 16 +- routers/api/v1/user/gpg_key.go | 10 +- routers/api/v1/user/key.go | 10 +- routers/api/v1/user/repo.go | 6 +- routers/api/v1/user/star.go | 10 +- routers/api/v1/user/user.go | 6 +- routers/api/v1/user/watch.go | 10 +- routers/home.go | 24 +- routers/init.go | 1 + routers/install.go | 6 + routers/private/push_update.go | 15 +- routers/repo/issue.go | 49 +- routers/repo/issue_stopwatch.go | 50 + routers/repo/issue_timetrack.go | 50 + routers/repo/pull.go | 2 +- routers/repo/repo.go | 8 +- routers/repo/setting.go | 7 +- routers/repo/webhook.go | 123 +- routers/routes/routes.go | 73 +- routers/user/auth.go | 20 +- routers/user/auth_openid.go | 12 +- routers/user/home.go | 54 +- routers/user/profile.go | 23 +- routers/user/setting.go | 10 +- templates/admin/config.tmpl | 4 + templates/admin/user/edit.tmpl | 2 +- templates/base/footer.tmpl | 42 +- templates/base/head.tmpl | 61 +- templates/explore/repo_list.tmpl | 2 +- templates/install.tmpl | 18 + templates/org/settings/hook_new.tmpl | 1 + templates/repo/branch_dropdown.tmpl | 2 +- templates/repo/diff/box.tmpl | 14 +- templates/repo/header.tmpl | 4 +- templates/repo/home.tmpl | 25 +- .../repo/issue/branch_selector_field.tmpl | 43 + templates/repo/issue/list.tmpl | 3 + templates/repo/issue/new_form.tmpl | 2 + .../repo/issue/view_content/comments.tmpl | 76 +- .../repo/issue/view_content/sidebar.tmpl | 103 +- templates/repo/settings/hook_discord.tmpl | 19 + templates/repo/settings/hook_gitea.tmpl | 2 +- templates/repo/settings/hook_gogs.tmpl | 2 +- templates/repo/settings/hook_list.tmpl | 3 + templates/repo/settings/hook_new.tmpl | 3 + templates/repo/settings/hook_settings.tmpl | 10 + templates/repo/settings/options.tmpl | 19 +- templates/repo/view_file.tmpl | 2 +- templates/swagger.tmpl | 10 +- templates/user/dashboard/dashboard.tmpl | 166 +- templates/user/profile.tmpl | 2 +- vendor/code.gitea.io/sdk/gitea/admin_user.go | 59 +- vendor/code.gitea.io/sdk/gitea/fork.go | 2 + vendor/code.gitea.io/sdk/gitea/hook.go | 28 +- .../sdk/gitea/issue_tracked_time.go | 69 + vendor/code.gitea.io/sdk/gitea/org.go | 15 +- vendor/code.gitea.io/sdk/gitea/repo.go | 23 +- vendor/code.gitea.io/sdk/gitea/repo_key.go | 2 +- vendor/code.gitea.io/sdk/gitea/status.go | 2 +- vendor/code.gitea.io/sdk/gitea/user_app.go | 2 +- vendor/code.gitea.io/sdk/gitea/user_gpgkey.go | 2 +- vendor/github.com/go-xorm/core/column.go | 5 +- vendor/github.com/go-xorm/core/dialect.go | 3 + vendor/github.com/go-xorm/core/rows.go | 12 + vendor/github.com/go-xorm/core/table.go | 1 + vendor/github.com/go-xorm/xorm/README.md | 63 +- vendor/github.com/go-xorm/xorm/README_CN.md | 60 +- .../xorm/{lru_cacher.go => cache_lru.go} | 0 ...{memory_store.go => cache_memory_store.go} | 0 vendor/github.com/go-xorm/xorm/circle.yml | 8 +- .../github.com/go-xorm/xorm/dialect_mssql.go | 23 +- .../github.com/go-xorm/xorm/dialect_mysql.go | 14 +- .../go-xorm/xorm/dialect_sqlite3.go | 18 +- vendor/github.com/go-xorm/xorm/doc.go | 11 +- vendor/github.com/go-xorm/xorm/engine.go | 269 +-- vendor/github.com/go-xorm/xorm/engine_cond.go | 230 +++ .../github.com/go-xorm/xorm/engine_maxlife.go | 14 + vendor/github.com/go-xorm/xorm/helpers.go | 235 +-- .../github.com/go-xorm/xorm/helpler_time.go | 21 + vendor/github.com/go-xorm/xorm/rows.go | 32 +- vendor/github.com/go-xorm/xorm/session.go | 163 +- .../github.com/go-xorm/xorm/session_cols.go | 24 +- .../github.com/go-xorm/xorm/session_cond.go | 18 +- .../go-xorm/xorm/session_convert.go | 108 +- .../github.com/go-xorm/xorm/session_delete.go | 64 +- .../github.com/go-xorm/xorm/session_exist.go | 87 + .../github.com/go-xorm/xorm/session_find.go | 139 +- vendor/github.com/go-xorm/xorm/session_get.go | 106 +- .../github.com/go-xorm/xorm/session_insert.go | 156 +- vendor/github.com/go-xorm/xorm/session_raw.go | 203 +- .../github.com/go-xorm/xorm/session_schema.go | 228 +- .../github.com/go-xorm/xorm/session_stats.go | 118 ++ vendor/github.com/go-xorm/xorm/session_sum.go | 137 -- vendor/github.com/go-xorm/xorm/session_tx.go | 24 +- .../github.com/go-xorm/xorm/session_update.go | 154 +- vendor/github.com/go-xorm/xorm/statement.go | 343 +-- vendor/github.com/go-xorm/xorm/tag.go | 9 + vendor/github.com/go-xorm/xorm/test_mssql.sh | 1 + .../github.com/go-xorm/xorm/test_mymysql.sh | 1 + vendor/github.com/go-xorm/xorm/test_mysql.sh | 1 + .../github.com/go-xorm/xorm/test_postgres.sh | 1 + vendor/github.com/go-xorm/xorm/test_sqlite.sh | 1 + vendor/github.com/go-xorm/xorm/xorm.go | 13 +- vendor/gopkg.in/ini.v1/ini.go | 4 +- vendor/vendor.json | 29 +- 1684 files changed, 9914 insertions(+), 2916 deletions(-) create mode 100644 .changelog.yml delete mode 100644 .drone.yml.sig create mode 100644 integrations/api_gpg_keys_test.go create mode 100644 integrations/explore_repos_test.go rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/HEAD (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/config (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/description (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/hooks/applypatch-msg.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/hooks/commit-msg.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/hooks/post-receive (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/hooks/post-receive.d/gitea (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/hooks/post-update.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/hooks/pre-applypatch.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/hooks/pre-commit.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/hooks/pre-push.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/hooks/pre-rebase.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/hooks/pre-receive (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/hooks/pre-receive.d/gitea (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/hooks/prepare-commit-msg.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/hooks/update (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/hooks/update.d/gitea (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/hooks/update.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/info/exclude (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/info/refs (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/objects/2a/2f1d4670728a2e10049e345bd7a276468beab6 (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/objects/4b/4851ad51df6a7d9f25c979345979eaeb5b349f (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/objects/65/f1bf27bc3bf70f64657658635e66094edbcb4d (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/objects/info/packs (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/refs/heads/DefaultBranch (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/refs/heads/develop (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/refs/heads/feature/1 (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo1.git/refs/heads/master (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo15.git/HEAD (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo15.git/config (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo15.git/description (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo15.git/hooks/applypatch-msg.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo15.git/hooks/commit-msg.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo15.git/hooks/post-receive (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo15.git/hooks/post-receive.d/gitea (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo15.git/hooks/post-update.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo15.git/hooks/pre-applypatch.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo15.git/hooks/pre-commit.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo15.git/hooks/pre-push.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo15.git/hooks/pre-rebase.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo15.git/hooks/pre-receive (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo15.git/hooks/pre-receive.d/gitea (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo15.git/hooks/prepare-commit-msg.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo15.git/hooks/update (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo15.git/hooks/update.d/gitea (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo15.git/hooks/update.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user2/repo15.git/info/exclude (100%) rename integrations/{gitea-integration-meta/gitea-repositories/user3/repo3.git => gitea-repositories-meta/user2/repo16.git}/HEAD (100%) create mode 100644 integrations/gitea-repositories-meta/user2/repo16.git/config rename integrations/{gitea-integration-meta/gitea-repositories/user3/repo3.git => gitea-repositories-meta/user2/repo16.git}/description (100%) rename integrations/{gitea-integration-meta/gitea-repositories/user3/repo3.git => gitea-repositories-meta/user2/repo16.git}/hooks/applypatch-msg.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories/user3/repo3.git => gitea-repositories-meta/user2/repo16.git}/hooks/commit-msg.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories/user3/repo3.git => gitea-repositories-meta/user2/repo16.git}/hooks/post-update.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories/user3/repo3.git => gitea-repositories-meta/user2/repo16.git}/hooks/pre-applypatch.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories/user3/repo3.git => gitea-repositories-meta/user2/repo16.git}/hooks/pre-commit.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories/user3/repo3.git => gitea-repositories-meta/user2/repo16.git}/hooks/pre-push.sample (100%) create mode 100755 integrations/gitea-repositories-meta/user2/repo16.git/hooks/pre-rebase.sample rename integrations/{gitea-integration-meta/gitea-repositories/user3/repo3.git => gitea-repositories-meta/user2/repo16.git}/hooks/pre-receive.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories/user3/repo3.git => gitea-repositories-meta/user2/repo16.git}/hooks/prepare-commit-msg.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories/user3/repo3.git => gitea-repositories-meta/user2/repo16.git}/hooks/update.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories/user3/repo3.git => gitea-repositories-meta/user2/repo16.git}/info/exclude (100%) create mode 100644 integrations/gitea-repositories-meta/user2/repo16.git/objects/0c/3d59dea27b97aa3cb66072745d7a2c51a7a8b1 create mode 100644 integrations/gitea-repositories-meta/user2/repo16.git/objects/24/f83a471f77579fea57bac7255d6e64e70fce1c create mode 100644 integrations/gitea-repositories-meta/user2/repo16.git/objects/27/566bd5738fc8b4e3fef3c5e72cce608537bd95 create mode 100644 integrations/gitea-repositories-meta/user2/repo16.git/objects/3b/2b54fe3d9a8279d5b926124dccdf279b8eff2f create mode 100644 integrations/gitea-repositories-meta/user2/repo16.git/objects/45/8121ce9a6b855c9733bae62093caf3f39685de create mode 100644 integrations/gitea-repositories-meta/user2/repo16.git/objects/50/99b81332712fe655e34e8dd63574f503f61811 create mode 100644 integrations/gitea-repositories-meta/user2/repo16.git/objects/69/554a64c1e6030f051e5c3f94bfbd773cd6a324 create mode 100644 integrations/gitea-repositories-meta/user2/repo16.git/objects/a4/3476a501516e065c5a82f05fd58fd319598bc1 create mode 100644 integrations/gitea-repositories-meta/user2/repo16.git/objects/e9/4083fcdf1f10c545e9253a23c5e44a2ff68aac create mode 100644 integrations/gitea-repositories-meta/user2/repo16.git/objects/f2/7c2b2b03dcab38beaf89b0ab4ff61f6de63441 create mode 100644 integrations/gitea-repositories-meta/user2/repo16.git/objects/f9/0451c72ef61a7645293d17b47be7a8e983da57 create mode 100644 integrations/gitea-repositories-meta/user2/repo16.git/refs/heads/good-sign create mode 100644 integrations/gitea-repositories-meta/user2/repo16.git/refs/heads/good-sign-not-yet-validated create mode 100644 integrations/gitea-repositories-meta/user2/repo16.git/refs/heads/master create mode 100644 integrations/gitea-repositories-meta/user2/repo16.git/refs/heads/not-signed create mode 100644 integrations/gitea-repositories-meta/user3/repo3.git/HEAD rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user3/repo3.git/config (100%) create mode 100644 integrations/gitea-repositories-meta/user3/repo3.git/description create mode 100755 integrations/gitea-repositories-meta/user3/repo3.git/hooks/applypatch-msg.sample create mode 100755 integrations/gitea-repositories-meta/user3/repo3.git/hooks/commit-msg.sample rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user3/repo3.git/hooks/post-receive (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user3/repo3.git/hooks/post-receive.d/gitea (100%) create mode 100755 integrations/gitea-repositories-meta/user3/repo3.git/hooks/post-update.sample create mode 100755 integrations/gitea-repositories-meta/user3/repo3.git/hooks/pre-applypatch.sample create mode 100755 integrations/gitea-repositories-meta/user3/repo3.git/hooks/pre-commit.sample create mode 100755 integrations/gitea-repositories-meta/user3/repo3.git/hooks/pre-push.sample rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user3/repo3.git/hooks/pre-rebase.sample (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user3/repo3.git/hooks/pre-receive (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user3/repo3.git/hooks/pre-receive.d/gitea (100%) create mode 100755 integrations/gitea-repositories-meta/user3/repo3.git/hooks/pre-receive.sample create mode 100755 integrations/gitea-repositories-meta/user3/repo3.git/hooks/prepare-commit-msg.sample rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user3/repo3.git/hooks/update (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user3/repo3.git/hooks/update.d/gitea (100%) create mode 100755 integrations/gitea-repositories-meta/user3/repo3.git/hooks/update.sample create mode 100644 integrations/gitea-repositories-meta/user3/repo3.git/info/exclude rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user3/repo3.git/objects/20/ade30d25e0ecaeec84e7f542a8456900858240 (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user3/repo3.git/objects/27/74debeea6dc742cc4971a92db0e08b95b60588 (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user3/repo3.git/objects/2a/47ca4b614a9f5a43abbd5ad851a54a616ffee6 (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user3/repo3.git/objects/2f/9b22fd3159a43b7b4e5dd806fcd544edf8716f (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user3/repo3.git/objects/d5/6a3073c1dbb7b15963110a049d50cdb5db99fc (100%) rename integrations/{gitea-integration-meta/gitea-repositories => gitea-repositories-meta}/user3/repo3.git/refs/heads/master (100%) create mode 100644 integrations/links_test.go create mode 100644 integrations/setting_test.go create mode 100644 integrations/signin_test.go create mode 100644 integrations/timetracking_test.go create mode 100644 models/fixtures/gpg_key.yml create mode 100644 models/fixtures/stopwatch.yml create mode 100644 models/fixtures/tracked_time.yml create mode 100644 models/issue_stopwatch.go create mode 100644 models/issue_stopwatch_test.go create mode 100644 models/issue_tracked_time.go create mode 100644 models/issue_tracked_time_test.go create mode 100644 models/migrations/v39.go create mode 100644 models/repo_issue.go create mode 100644 models/webhook_discord.go delete mode 100644 public/assets/librejs/librejs.html delete mode 100644 public/css/github.min.css create mode 100644 public/img/discord.png create mode 100644 public/vendor/VERSIONS create mode 100644 public/vendor/assets/font-awesome/LICENSE create mode 100644 public/vendor/assets/font-awesome/css/LICENSE rename public/{assets/font-awesome-4.6.3 => vendor/assets/font-awesome}/css/font-awesome.min.css (100%) rename public/{assets/font-awesome-4.6.3 => vendor/assets/font-awesome}/fonts/FontAwesome.otf (100%) create mode 100644 public/vendor/assets/font-awesome/fonts/LICENSE rename public/{assets/font-awesome-4.6.3 => vendor/assets/font-awesome}/fonts/fontawesome-webfont.eot (100%) rename public/{assets/font-awesome-4.6.3 => vendor/assets/font-awesome}/fonts/fontawesome-webfont.svg (100%) rename public/{assets/font-awesome-4.6.3 => vendor/assets/font-awesome}/fonts/fontawesome-webfont.ttf (100%) rename public/{assets/font-awesome-4.6.3 => vendor/assets/font-awesome}/fonts/fontawesome-webfont.woff (100%) rename public/{assets/font-awesome-4.6.3 => vendor/assets/font-awesome}/fonts/fontawesome-webfont.woff2 (100%) create mode 100644 public/vendor/assets/octicons/LICENSE rename public/{assets/octicons-4.3.0 => vendor/assets/octicons}/octicons.eot (100%) rename public/{assets/octicons-4.3.0 => vendor/assets/octicons}/octicons.min.css (100%) rename public/{assets/octicons-4.3.0 => vendor/assets/octicons}/octicons.svg (100%) rename public/{assets/octicons-4.3.0 => vendor/assets/octicons}/octicons.ttf (100%) rename public/{assets/octicons-4.3.0 => vendor/assets/octicons}/octicons.woff (100%) rename public/{assets/octicons-4.3.0 => vendor/assets/octicons}/octicons.woff2 (100%) rename public/{ => vendor}/assets/swagger-ui/favicon-16x16.png (100%) rename public/{ => vendor}/assets/swagger-ui/favicon-32x32.png (100%) rename public/{ => vendor}/assets/swagger-ui/index.html (100%) rename public/{ => vendor}/assets/swagger-ui/oauth2-redirect.html (100%) rename public/{ => vendor}/assets/swagger-ui/swagger-ui-bundle.js (100%) rename public/{ => vendor}/assets/swagger-ui/swagger-ui-bundle.js.map (100%) rename public/{ => vendor}/assets/swagger-ui/swagger-ui-standalone-preset.js (100%) rename public/{ => vendor}/assets/swagger-ui/swagger-ui-standalone-preset.js.map (100%) rename public/{ => vendor}/assets/swagger-ui/swagger-ui.css (100%) rename public/{ => vendor}/assets/swagger-ui/swagger-ui.css.map (100%) rename public/{ => vendor}/assets/swagger-ui/swagger-ui.js (100%) rename public/{ => vendor}/assets/swagger-ui/swagger-ui.js.map (100%) create mode 100644 public/vendor/librejs.html create mode 100644 public/vendor/plugins/autolink/LICENSE rename public/{js/libs => vendor/plugins/autolink}/autolink.js (95%) create mode 100644 public/vendor/plugins/clipboard/LICENSE rename public/{js/libs/clipboard-1.5.9.min.js => vendor/plugins/clipboard/clipboard.min.js} (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/.gitattributes (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/.gitignore (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/.npmignore (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/.travis.yml (100%) create mode 100644 public/vendor/plugins/codemirror/LICENSE rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/addon/mode/loadmode.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/addon/mode/multiplex.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/addon/mode/multiplex_test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/addon/mode/overlay.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/addon/mode/simple.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/apl/apl.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/apl/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/asciiarmor/asciiarmor.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/asciiarmor/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/asn.1/asn.1.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/asn.1/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/asterisk/asterisk.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/asterisk/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/brainfuck/brainfuck.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/brainfuck/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/clike/clike.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/clike/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/clike/scala.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/clike/test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/clojure/clojure.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/clojure/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/cmake/cmake.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/cmake/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/cobol/cobol.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/cobol/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/coffeescript/coffeescript.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/coffeescript/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/commonlisp/commonlisp.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/commonlisp/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/crystal/crystal.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/crystal/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/css/css.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/css/gss.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/css/gss_test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/css/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/css/less.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/css/less_test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/css/scss.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/css/scss_test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/css/test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/cypher/cypher.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/cypher/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/d/d.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/d/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/dart/dart.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/dart/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/diff/diff.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/diff/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/django/django.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/django/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/dockerfile/dockerfile.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/dockerfile/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/dtd/dtd.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/dtd/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/dylan/dylan.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/dylan/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/dylan/test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/ebnf/ebnf.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/ebnf/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/ecl/ecl.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/ecl/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/eiffel/eiffel.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/eiffel/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/elm/elm.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/elm/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/erlang/erlang.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/erlang/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/factor/factor.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/factor/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/fcl/fcl.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/fcl/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/forth/forth.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/forth/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/fortran/fortran.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/fortran/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/gas/gas.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/gas/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/gfm/gfm.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/gfm/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/gfm/test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/gherkin/gherkin.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/gherkin/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/go/go.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/go/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/groovy/groovy.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/groovy/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/haml/haml.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/haml/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/haml/test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/handlebars/handlebars.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/handlebars/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/haskell-literate/haskell-literate.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/haskell-literate/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/haskell/haskell.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/haskell/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/haxe/haxe.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/haxe/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/htmlembedded/htmlembedded.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/htmlembedded/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/htmlmixed/htmlmixed.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/htmlmixed/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/http/http.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/http/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/idl/idl.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/idl/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/jade/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/jade/jade.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/javascript/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/javascript/javascript.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/javascript/json-ld.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/javascript/test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/javascript/typescript.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/jinja2/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/jinja2/jinja2.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/jsx/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/jsx/jsx.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/jsx/test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/julia/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/julia/julia.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/livescript/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/livescript/livescript.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/lua/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/lua/lua.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/markdown/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/markdown/markdown.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/markdown/test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/mathematica/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/mathematica/mathematica.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/mbox/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/mbox/mbox.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/meta.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/mirc/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/mirc/mirc.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/mllike/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/mllike/mllike.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/modelica/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/modelica/modelica.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/mscgen/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/mscgen/mscgen.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/mscgen/mscgen_test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/mscgen/msgenny_test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/mscgen/xu_test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/mumps/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/mumps/mumps.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/nginx/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/nginx/nginx.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/nsis/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/nsis/nsis.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/ntriples/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/ntriples/ntriples.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/octave/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/octave/octave.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/oz/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/oz/oz.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/pascal/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/pascal/pascal.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/pegjs/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/pegjs/pegjs.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/perl/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/perl/perl.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/php/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/php/php.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/php/test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/pig/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/pig/pig.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/powershell/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/powershell/powershell.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/powershell/test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/properties/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/properties/properties.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/protobuf/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/protobuf/protobuf.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/puppet/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/puppet/puppet.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/python/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/python/python.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/python/test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/q/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/q/q.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/r/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/r/r.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/rpm/changes/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/rpm/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/rpm/rpm.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/rst/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/rst/rst.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/ruby/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/ruby/ruby.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/ruby/test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/rust/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/rust/rust.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/rust/test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/sas/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/sas/sas.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/sass/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/sass/sass.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/scheme/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/scheme/scheme.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/shell/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/shell/shell.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/shell/test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/sieve/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/sieve/sieve.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/slim/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/slim/slim.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/slim/test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/smalltalk/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/smalltalk/smalltalk.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/smarty/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/smarty/smarty.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/solr/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/solr/solr.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/soy/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/soy/soy.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/sparql/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/sparql/sparql.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/spreadsheet/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/spreadsheet/spreadsheet.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/sql/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/sql/sql.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/stex/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/stex/stex.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/stex/test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/stylus/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/stylus/stylus.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/swift/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/swift/swift.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/tcl/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/tcl/tcl.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/textile/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/textile/test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/textile/textile.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/tiddlywiki/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/tiddlywiki/tiddlywiki.css (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/tiddlywiki/tiddlywiki.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/tiki/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/tiki/tiki.css (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/tiki/tiki.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/toml/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/toml/toml.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/tornado/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/tornado/tornado.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/troff/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/troff/troff.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/ttcn-cfg/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/ttcn-cfg/ttcn-cfg.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/ttcn/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/ttcn/ttcn.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/turtle/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/turtle/turtle.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/twig/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/twig/twig.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/vb/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/vb/vb.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/vbscript/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/vbscript/vbscript.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/velocity/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/velocity/velocity.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/verilog/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/verilog/test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/verilog/verilog.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/vhdl/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/vhdl/vhdl.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/vue/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/vue/vue.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/webidl/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/webidl/webidl.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/xml/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/xml/test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/xml/xml.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/xquery/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/xquery/test.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/xquery/xquery.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/yacas/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/yacas/yacas.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/yaml-frontmatter/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/yaml-frontmatter/yaml-frontmatter.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/yaml/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/yaml/yaml.js (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/z80/index.html (100%) rename public/{plugins/codemirror-5.17.0 => vendor/plugins/codemirror}/mode/z80/z80.js (100%) create mode 100644 public/vendor/plugins/cssrelpreload/LICENSE rename public/{js/libs => vendor/plugins/cssrelpreload}/cssrelpreload.min.js (100%) rename public/{js/libs => vendor/plugins/cssrelpreload}/loadCSS.min.js (100%) create mode 100644 public/vendor/plugins/dropzone/LICENSE rename public/{plugins/dropzone-4.2.0 => vendor/plugins/dropzone}/dropzone.css (100%) rename public/{plugins/dropzone-4.2.0 => vendor/plugins/dropzone}/dropzone.js (100%) create mode 100644 public/vendor/plugins/emojify/LICENSE rename public/{js/libs/emojify-1.1.0.min.js => vendor/plugins/emojify/emojify.min.js} (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/+1.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/-1.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/100.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/1234.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/8ball.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/a.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ab.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/abc.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/abcd.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/accept.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/aerial_tramway.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/airplane.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/alarm_clock.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/alien.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ambulance.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/anchor.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/angel.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/anger.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/angry.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/anguished.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ant.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/apple.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/aquarius.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/aries.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/arrow_backward.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/arrow_double_down.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/arrow_double_up.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/arrow_down.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/arrow_down_small.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/arrow_forward.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/arrow_heading_down.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/arrow_heading_up.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/arrow_left.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/arrow_lower_left.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/arrow_lower_right.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/arrow_right.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/arrow_right_hook.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/arrow_up.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/arrow_up_down.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/arrow_up_small.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/arrow_upper_left.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/arrow_upper_right.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/arrows_clockwise.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/arrows_counterclockwise.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/art.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/articulated_lorry.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/astonished.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/atm.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/b.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/baby.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/baby_bottle.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/baby_chick.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/baby_symbol.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/back.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/baggage_claim.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/balloon.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ballot_box_with_check.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bamboo.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/banana.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bangbang.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bank.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bar_chart.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/barber.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/baseball.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/basketball.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bath.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bathtub.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/battery.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bear.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bee.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/beer.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/beers.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/beetle.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/beginner.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bell.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bento.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bicyclist.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bike.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bikini.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bird.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/birthday.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/black_circle.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/black_joker.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/black_medium_small_square.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/black_medium_square.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/black_nib.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/black_small_square.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/black_square.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/black_square_button.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/blossom.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/blowfish.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/blue_book.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/blue_car.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/blue_heart.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/blush.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/boar.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/boat.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bomb.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/book.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bookmark.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bookmark_tabs.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/books.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/boom.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/boot.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bouquet.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bow.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bowling.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bowtie.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/boy.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bread.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bride_with_veil.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bridge_at_night.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/briefcase.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/broken_heart.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bug.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bulb.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bullettrain_front.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bullettrain_side.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bus.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/busstop.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/bust_in_silhouette.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/busts_in_silhouette.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/cactus.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/cake.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/calendar.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/calling.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/camel.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/camera.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/cancer.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/candy.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/capital_abcd.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/capricorn.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/car.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/card_index.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/carousel_horse.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/cat.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/cat2.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/cd.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/chart.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/chart_with_downwards_trend.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/chart_with_upwards_trend.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/checkered_flag.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/cherries.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/cherry_blossom.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/chestnut.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/chicken.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/children_crossing.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/chocolate_bar.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/christmas_tree.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/church.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/cinema.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/circus_tent.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/city_sunrise.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/city_sunset.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/cl.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clap.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clapper.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clipboard.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock1.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock10.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock1030.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock11.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock1130.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock12.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock1230.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock130.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock2.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock230.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock3.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock330.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock4.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock430.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock5.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock530.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock6.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock630.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock7.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock730.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock8.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock830.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock9.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clock930.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/closed_book.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/closed_lock_with_key.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/closed_umbrella.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/cloud.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/clubs.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/cn.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/cocktail.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/coffee.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/cold_sweat.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/collision.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/computer.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/confetti_ball.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/confounded.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/confused.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/congratulations.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/construction.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/construction_worker.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/convenience_store.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/cookie.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/cool.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/cop.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/copyright.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/corn.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/couple.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/couple_with_heart.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/couplekiss.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/cow.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/cow2.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/credit_card.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/crescent_moon.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/crocodile.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/crossed_flags.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/crown.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/cry.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/crying_cat_face.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/crystal_ball.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/cupid.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/curly_loop.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/currency_exchange.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/curry.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/custard.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/customs.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/cyclone.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/dancer.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/dancers.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/dango.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/dart.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/dash.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/date.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/de.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/deciduous_tree.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/department_store.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/diamond_shape_with_a_dot_inside.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/diamonds.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/disappointed.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/disappointed_relieved.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/dizzy.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/dizzy_face.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/do_not_litter.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/dog.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/dog2.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/dollar.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/dolls.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/dolphin.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/donut.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/door.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/doughnut.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/dragon.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/dragon_face.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/dress.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/dromedary_camel.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/droplet.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/dvd.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/e-mail.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ear.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ear_of_rice.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/earth_africa.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/earth_americas.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/earth_asia.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/egg.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/eggplant.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/eight.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/eight_pointed_black_star.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/eight_spoked_asterisk.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/electric_plug.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/elephant.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/email.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/end.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/envelope.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/es.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/euro.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/european_castle.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/european_post_office.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/evergreen_tree.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/exclamation.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/expressionless.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/eyeglasses.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/eyes.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/facepunch.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/factory.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/fallen_leaf.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/family.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/fast_forward.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/fax.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/fearful.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/feelsgood.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/feet.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ferris_wheel.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/file_folder.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/finnadie.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/fire.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/fire_engine.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/fireworks.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/first_quarter_moon.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/first_quarter_moon_with_face.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/fish.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/fish_cake.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/fishing_pole_and_fish.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/fist.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/five.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/flags.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/flashlight.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/floppy_disk.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/flower_playing_cards.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/flushed.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/foggy.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/football.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/fork_and_knife.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/fountain.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/four.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/four_leaf_clover.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/fr.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/free.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/fried_shrimp.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/fries.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/frog.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/frowning.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/fu.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/fuelpump.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/full_moon.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/full_moon_with_face.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/game_die.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/gb.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/gem.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/gemini.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ghost.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/gift.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/gift_heart.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/girl.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/globe_with_meridians.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/goat.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/goberserk.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/godmode.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/golf.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/grapes.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/green_apple.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/green_book.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/green_heart.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/grey_exclamation.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/grey_question.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/grimacing.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/grin.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/grinning.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/guardsman.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/guitar.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/gun.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/haircut.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/hamburger.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/hammer.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/hamster.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/hand.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/handbag.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/hankey.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/hash.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/hatched_chick.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/hatching_chick.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/headphones.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/hear_no_evil.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/heart.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/heart_decoration.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/heart_eyes.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/heart_eyes_cat.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/heartbeat.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/heartpulse.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/hearts.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/heavy_check_mark.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/heavy_division_sign.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/heavy_dollar_sign.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/heavy_exclamation_mark.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/heavy_minus_sign.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/heavy_multiplication_x.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/heavy_plus_sign.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/helicopter.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/herb.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/hibiscus.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/high_brightness.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/high_heel.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/hocho.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/honey_pot.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/honeybee.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/horse.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/horse_racing.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/hospital.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/hotel.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/hotsprings.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/hourglass.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/hourglass_flowing_sand.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/house.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/house_with_garden.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/hurtrealbad.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/hushed.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ice_cream.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/icecream.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/id.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ideograph_advantage.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/imp.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/inbox_tray.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/incoming_envelope.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/information_desk_person.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/information_source.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/innocent.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/interrobang.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/iphone.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/it.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/izakaya_lantern.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/jack_o_lantern.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/japan.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/japanese_castle.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/japanese_goblin.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/japanese_ogre.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/jeans.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/joy.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/joy_cat.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/jp.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/key.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/keycap_ten.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/kimono.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/kiss.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/kissing.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/kissing_cat.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/kissing_closed_eyes.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/kissing_face.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/kissing_heart.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/kissing_smiling_eyes.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/koala.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/koko.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/kr.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/large_blue_circle.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/large_blue_diamond.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/large_orange_diamond.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/last_quarter_moon.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/last_quarter_moon_with_face.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/laughing.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/leaves.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ledger.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/left_luggage.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/left_right_arrow.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/leftwards_arrow_with_hook.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/lemon.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/leo.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/leopard.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/libra.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/light_rail.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/link.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/lips.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/lipstick.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/lock.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/lock_with_ink_pen.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/lollipop.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/loop.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/loudspeaker.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/love_hotel.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/love_letter.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/low_brightness.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/m.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/mag.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/mag_right.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/mahjong.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/mailbox.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/mailbox_closed.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/mailbox_with_mail.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/mailbox_with_no_mail.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/man.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/man_with_gua_pi_mao.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/man_with_turban.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/mans_shoe.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/maple_leaf.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/mask.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/massage.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/meat_on_bone.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/mega.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/melon.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/memo.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/mens.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/metal.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/metro.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/microphone.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/microscope.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/milky_way.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/minibus.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/minidisc.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/mobile_phone_off.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/money_with_wings.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/moneybag.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/monkey.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/monkey_face.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/monorail.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/mortar_board.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/mount_fuji.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/mountain_bicyclist.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/mountain_cableway.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/mountain_railway.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/mouse.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/mouse2.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/movie_camera.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/moyai.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/muscle.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/mushroom.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/musical_keyboard.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/musical_note.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/musical_score.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/mute.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/nail_care.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/name_badge.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/neckbeard.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/necktie.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/negative_squared_cross_mark.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/neutral_face.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/new.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/new_moon.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/new_moon_with_face.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/newspaper.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ng.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/nine.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/no_bell.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/no_bicycles.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/no_entry.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/no_entry_sign.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/no_good.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/no_mobile_phones.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/no_mouth.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/no_pedestrians.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/no_smoking.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/non-potable_water.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/nose.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/notebook.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/notebook_with_decorative_cover.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/notes.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/nut_and_bolt.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/o.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/o2.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ocean.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/octocat.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/octopus.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/oden.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/office.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ok.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ok_hand.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ok_woman.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/older_man.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/older_woman.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/on.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/oncoming_automobile.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/oncoming_bus.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/oncoming_police_car.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/oncoming_taxi.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/one.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/open_file_folder.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/open_hands.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/open_mouth.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ophiuchus.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/orange_book.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/outbox_tray.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ox.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/package.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/page_facing_up.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/page_with_curl.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/pager.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/palm_tree.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/panda_face.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/paperclip.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/parking.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/part_alternation_mark.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/partly_sunny.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/passport_control.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/paw_prints.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/peach.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/pear.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/pencil.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/pencil2.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/penguin.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/pensive.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/performing_arts.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/persevere.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/person_frowning.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/person_with_blond_hair.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/person_with_pouting_face.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/phone.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/pig.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/pig2.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/pig_nose.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/pill.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/pineapple.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/pisces.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/pizza.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/plus1.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/point_down.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/point_left.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/point_right.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/point_up.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/point_up_2.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/police_car.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/poodle.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/poop.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/post_office.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/postal_horn.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/postbox.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/potable_water.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/pouch.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/poultry_leg.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/pound.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/pouting_cat.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/pray.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/princess.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/punch.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/purple_heart.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/purse.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/pushpin.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/put_litter_in_its_place.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/question.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/rabbit.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/rabbit2.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/racehorse.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/radio.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/radio_button.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/rage.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/rage1.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/rage2.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/rage3.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/rage4.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/railway_car.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/rainbow.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/raised_hand.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/raised_hands.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/raising_hand.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ram.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ramen.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/rat.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/recycle.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/red_car.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/red_circle.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/registered.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/relaxed.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/relieved.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/repeat.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/repeat_one.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/restroom.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/revolving_hearts.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/rewind.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ribbon.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/rice.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/rice_ball.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/rice_cracker.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/rice_scene.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ring.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/rocket.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/roller_coaster.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/rooster.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/rose.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/rotating_light.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/round_pushpin.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/rowboat.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ru.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/rugby_football.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/runner.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/running.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/running_shirt_with_sash.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sa.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sagittarius.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sailboat.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sake.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sandal.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/santa.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/satellite.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/satisfied.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/saxophone.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/school.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/school_satchel.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/scissors.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/scorpius.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/scream.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/scream_cat.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/scroll.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/seat.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/secret.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/see_no_evil.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/seedling.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/seven.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/shaved_ice.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sheep.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/shell.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ship.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/shipit.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/shirt.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/shit.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/shoe.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/shower.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/signal_strength.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/six.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/six_pointed_star.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ski.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/skull.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sleeping.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sleepy.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/slot_machine.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/small_blue_diamond.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/small_orange_diamond.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/small_red_triangle.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/small_red_triangle_down.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/smile.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/smile_cat.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/smiley.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/smiley_cat.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/smiling_imp.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/smirk.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/smirk_cat.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/smoking.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/snail.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/snake.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/snowboarder.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/snowflake.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/snowman.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sob.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/soccer.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/soon.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sos.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sound.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/space_invader.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/spades.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/spaghetti.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sparkle.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sparkler.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sparkles.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sparkling_heart.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/speak_no_evil.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/speaker.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/speech_balloon.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/speedboat.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/squirrel.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/star.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/star2.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/stars.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/station.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/statue_of_liberty.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/steam_locomotive.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/stew.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/straight_ruler.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/strawberry.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/stuck_out_tongue.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/stuck_out_tongue_closed_eyes.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/stuck_out_tongue_winking_eye.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sun_with_face.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sunflower.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sunglasses.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sunny.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sunrise.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sunrise_over_mountains.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/surfer.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sushi.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/suspect.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/suspension_railway.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sweat.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sweat_drops.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sweat_smile.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/sweet_potato.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/swimmer.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/symbols.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/syringe.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/tada.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/tanabata_tree.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/tangerine.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/taurus.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/taxi.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/tea.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/telephone.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/telephone_receiver.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/telescope.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/tennis.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/tent.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/thought_balloon.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/three.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/thumbsdown.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/thumbsup.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/ticket.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/tiger.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/tiger2.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/tired_face.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/tm.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/toilet.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/tokyo_tower.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/tomato.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/tongue.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/top.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/tophat.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/tractor.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/traffic_light.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/train.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/train2.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/tram.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/triangular_flag_on_post.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/triangular_ruler.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/trident.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/triumph.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/trolleybus.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/trollface.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/trophy.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/tropical_drink.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/tropical_fish.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/truck.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/trumpet.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/tshirt.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/tulip.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/turtle.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/tv.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/twisted_rightwards_arrows.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/two.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/two_hearts.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/two_men_holding_hands.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/two_women_holding_hands.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/u5272.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/u5408.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/u55b6.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/u6307.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/u6708.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/u6709.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/u6e80.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/u7121.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/u7533.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/u7981.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/u7a7a.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/uk.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/umbrella.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/unamused.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/underage.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/unlock.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/up.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/us.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/v.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/vertical_traffic_light.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/vhs.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/vibration_mode.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/video_camera.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/video_game.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/violin.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/virgo.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/volcano.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/vs.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/walking.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/waning_crescent_moon.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/waning_gibbous_moon.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/warning.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/watch.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/water_buffalo.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/watermelon.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/wave.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/wavy_dash.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/waxing_crescent_moon.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/waxing_gibbous_moon.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/wc.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/weary.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/wedding.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/whale.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/whale2.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/wheelchair.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/white_check_mark.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/white_circle.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/white_flower.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/white_large_square.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/white_medium_small_square.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/white_medium_square.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/white_small_square.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/white_square_button.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/wind_chime.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/wine_glass.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/wink.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/wolf.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/woman.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/womans_clothes.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/womans_hat.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/womens.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/worried.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/wrench.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/x.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/yellow_heart.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/yen.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/yum.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/zap.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/zero.png (100%) rename public/{img/emoji => vendor/plugins/emojify/images}/zzz.png (100%) create mode 100644 public/vendor/plugins/gitgraph/LICENSE rename public/{css => vendor/plugins/gitgraph}/gitgraph.css (100%) rename public/{js/libs => vendor/plugins/gitgraph}/gitgraph.js (98%) create mode 100644 public/vendor/plugins/highlight/LICENSE rename public/{plugins/highlight-9.11.0 => vendor/plugins/highlight}/default.css (100%) rename public/{plugins/highlight-9.11.0 => vendor/plugins/highlight}/github.css (100%) rename public/{plugins/highlight-9.11.0 => vendor/plugins/highlight}/highlight.pack.js (100%) create mode 100644 public/vendor/plugins/jquery.areyousure/LICENSE rename public/{js/libs => vendor/plugins/jquery.areyousure}/jquery.are-you-sure.js (100%) create mode 100644 public/vendor/plugins/jquery.datetimepicker/LICENSE rename public/{plugins/jquery.datetimepicker-2.4.5 => vendor/plugins/jquery.datetimepicker}/jquery.datetimepicker.css (100%) rename public/{plugins/jquery.datetimepicker-2.4.5 => vendor/plugins/jquery.datetimepicker}/jquery.datetimepicker.js (100%) create mode 100644 public/vendor/plugins/jquery.minicolors/LICENSE rename public/{plugins/jquery.minicolors-2.2.3 => vendor/plugins/jquery.minicolors}/jquery.minicolors.css (100%) rename public/{plugins/jquery.minicolors-2.2.3 => vendor/plugins/jquery.minicolors}/jquery.minicolors.min.js (100%) rename public/{plugins/jquery.minicolors-2.2.3 => vendor/plugins/jquery.minicolors}/jquery.minicolors.png (100%) create mode 100644 public/vendor/plugins/jquery/LICENSE rename public/{js/jquery-1.11.3.min.js => vendor/plugins/jquery/jquery.min.js} (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/LICENSE (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/build/pdf.js (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/build/pdf.worker.js (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/compatibility.js (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/debugger.js (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/annotation-check.svg (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/annotation-comment.svg (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/annotation-help.svg (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/annotation-insert.svg (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/annotation-key.svg (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/annotation-newparagraph.svg (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/annotation-noicon.svg (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/annotation-note.svg (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/annotation-paragraph.svg (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/findbarButton-next-rtl.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/findbarButton-next-rtl@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/findbarButton-next.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/findbarButton-next@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/findbarButton-previous-rtl.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/findbarButton-previous-rtl@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/findbarButton-previous.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/findbarButton-previous@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/grab.cur (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/grabbing.cur (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/loading-icon.gif (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/loading-small.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/loading-small@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/secondaryToolbarButton-documentProperties.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/secondaryToolbarButton-documentProperties@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/secondaryToolbarButton-firstPage.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/secondaryToolbarButton-firstPage@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/secondaryToolbarButton-handTool.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/secondaryToolbarButton-handTool@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/secondaryToolbarButton-lastPage.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/secondaryToolbarButton-lastPage@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/secondaryToolbarButton-rotateCcw.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/secondaryToolbarButton-rotateCcw@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/secondaryToolbarButton-rotateCw.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/secondaryToolbarButton-rotateCw@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/shadow.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/texture.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-bookmark.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-bookmark@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-download.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-download@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-menuArrows.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-menuArrows@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-openFile.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-openFile@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-pageDown-rtl.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-pageDown-rtl@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-pageDown.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-pageDown@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-pageUp-rtl.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-pageUp-rtl@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-pageUp.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-pageUp@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-presentationMode.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-presentationMode@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-print.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-print@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-search.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-search@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-secondaryToolbarToggle-rtl.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-secondaryToolbarToggle-rtl@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-secondaryToolbarToggle.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-secondaryToolbarToggle@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-sidebarToggle-rtl.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-sidebarToggle-rtl@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-sidebarToggle.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-sidebarToggle@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-viewAttachments.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-viewAttachments@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-viewOutline-rtl.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-viewOutline-rtl@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-viewOutline.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-viewOutline@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-viewThumbnail.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-viewThumbnail@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-zoomIn.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-zoomIn@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-zoomOut.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/toolbarButton-zoomOut@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/treeitem-collapsed-rtl.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/treeitem-collapsed-rtl@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/treeitem-collapsed.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/treeitem-collapsed@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/treeitem-expanded.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/images/treeitem-expanded@2x.png (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/viewer.css (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/viewer.html (100%) rename public/{plugins/pdfjs-1.4.20 => vendor/plugins/pdfjs}/web/viewer.js (100%) create mode 100644 public/vendor/plugins/semantic/LICENSE rename public/{css/semantic-2.2.1.min.css => vendor/plugins/semantic/semantic.min.css} (100%) rename public/{js/semantic-2.2.1.min.js => vendor/plugins/semantic/semantic.min.js} (100%) rename public/{css => vendor/plugins/semantic}/themes/basic/assets/fonts/icons.eot (100%) rename public/{css => vendor/plugins/semantic}/themes/basic/assets/fonts/icons.svg (100%) rename public/{css => vendor/plugins/semantic}/themes/basic/assets/fonts/icons.ttf (100%) rename public/{css => vendor/plugins/semantic}/themes/basic/assets/fonts/icons.woff (100%) rename public/{css => vendor/plugins/semantic}/themes/default/assets/fonts/icons.eot (100%) rename public/{css => vendor/plugins/semantic}/themes/default/assets/fonts/icons.otf (100%) rename public/{css => vendor/plugins/semantic}/themes/default/assets/fonts/icons.svg (100%) rename public/{css => vendor/plugins/semantic}/themes/default/assets/fonts/icons.ttf (100%) rename public/{css => vendor/plugins/semantic}/themes/default/assets/fonts/icons.woff (100%) rename public/{css => vendor/plugins/semantic}/themes/default/assets/fonts/icons.woff2 (100%) rename public/{css => vendor/plugins/semantic}/themes/default/assets/images/flags.png (100%) rename public/{css => vendor/plugins/semantic}/themes/github/assets/fonts/octicons-local.ttf (100%) rename public/{css => vendor/plugins/semantic}/themes/github/assets/fonts/octicons.svg (100%) rename public/{css => vendor/plugins/semantic}/themes/github/assets/fonts/octicons.ttf (100%) rename public/{css => vendor/plugins/semantic}/themes/github/assets/fonts/octicons.woff (100%) create mode 100644 public/vendor/plugins/simplemde/LICENSE rename public/{plugins/simplemde-1.10.1 => vendor/plugins/simplemde}/simplemde.min.css (100%) rename public/{plugins/simplemde-1.10.1 => vendor/plugins/simplemde}/simplemde.min.js (100%) create mode 100644 public/vendor/plugins/vue/LICENSE rename public/{js/libs => vendor/plugins/vue}/vue.min.js (100%) create mode 100644 routers/api/v1/repo/issue_tracked_time.go create mode 100644 routers/repo/issue_stopwatch.go create mode 100644 routers/repo/issue_timetrack.go create mode 100644 templates/repo/issue/branch_selector_field.tmpl create mode 100644 templates/repo/settings/hook_discord.tmpl create mode 100644 vendor/code.gitea.io/sdk/gitea/issue_tracked_time.go rename vendor/github.com/go-xorm/xorm/{lru_cacher.go => cache_lru.go} (100%) rename vendor/github.com/go-xorm/xorm/{memory_store.go => cache_memory_store.go} (100%) create mode 100644 vendor/github.com/go-xorm/xorm/engine_cond.go create mode 100644 vendor/github.com/go-xorm/xorm/engine_maxlife.go create mode 100644 vendor/github.com/go-xorm/xorm/helpler_time.go create mode 100644 vendor/github.com/go-xorm/xorm/session_exist.go create mode 100644 vendor/github.com/go-xorm/xorm/session_stats.go delete mode 100644 vendor/github.com/go-xorm/xorm/session_sum.go create mode 100755 vendor/github.com/go-xorm/xorm/test_mssql.sh create mode 100755 vendor/github.com/go-xorm/xorm/test_mymysql.sh create mode 100755 vendor/github.com/go-xorm/xorm/test_mysql.sh create mode 100755 vendor/github.com/go-xorm/xorm/test_postgres.sh create mode 100755 vendor/github.com/go-xorm/xorm/test_sqlite.sh diff --git a/.changelog.yml b/.changelog.yml new file mode 100644 index 000000000000..3bcb30904646 --- /dev/null +++ b/.changelog.yml @@ -0,0 +1,44 @@ +repo: go-gitea/gitea +groups: + - + name: BREAKING + labels: + - kind/breaking + - + name: FEATURE + labels: + - kind/feature + - + name: BUGFIXES + labels: + - kind/bug + - + name: ENHANCEMENT + labels: + - kind/enhancement + - kind/refactor + - kind/ui + - + name: SECURITY + labels: + - kind/security + - + name: TESTING + labels: + - kind/testing + - + name: TRANSLATION + labels: + - kind/translation + - + name: BUILD + labels: + - kind/build + - kind/lint + - + name: DOCS + labels: + - kind/docs + - + name: MISC + default: true \ No newline at end of file diff --git a/.drone.yml b/.drone.yml index 156cf95f5e9d..81283d0bb43d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,12 +2,13 @@ workspace: base: /srv/app path: src/code.gitea.io/gitea -pipeline: - clone: - image: plugins/git +clone: + git: + image: plugins/git:1 depth: 50 tags: true +pipeline: build: image: webhippie/golang:edge pull: true @@ -15,7 +16,6 @@ pipeline: TAGS: bindata sqlite GOPATH: /srv/app commands: - - apk -U add openssh-client - make clean - make generate - make vet @@ -30,43 +30,32 @@ pipeline: test: image: webhippie/golang:edge pull: true + group: test environment: TAGS: bindata sqlite GOPATH: /srv/app commands: - - apk -U add openssh-client - make test - when: - event: [ tag, pull_request ] - - test-coverage: - image: webhippie/golang:edge - pull: true - environment: - TAGS: bindata sqlite - GOPATH: /srv/app - commands: - - apk -U add openssh-client - - go get github.com/wadey/gocovmerge - - make test-coverage - when: - event: [ push ] - branch: master - - test-sqlite: - image: webhippie/golang:edge - pull: true - environment: - TAGS: bindata - GOPATH: /srv/app - commands: - - echo "Needs to be fixed" # make test-sqlite when: event: [ push, tag, pull_request ] + # Commented until db locking have been resolved! + # test-sqlite: + # image: webhippie/golang:edge + # pull: true + # group: test + # environment: + # TAGS: bindata + # GOPATH: /srv/app + # commands: + # - make test-sqlite + # when: + # event: [ push, tag, pull_request ] + test-mysql: image: webhippie/golang:edge pull: true + group: test environment: TAGS: bindata GOPATH: /srv/app @@ -78,6 +67,7 @@ pipeline: test-pgsql: image: webhippie/golang:edge pull: true + group: test environment: TAGS: bindata GOPATH: /srv/app @@ -86,6 +76,12 @@ pipeline: when: event: [ push, tag, pull_request ] + # coverage: + # image: plugins/coverage:latest + # pull: true + # secrets: [ github_token ] + # server: https://coverage.gitea.io + static: image: karalabe/xgo-latest:latest pull: true @@ -97,16 +93,10 @@ pipeline: when: event: [ push, tag ] - # coverage: - # image: plugins/coverage - # server: https://coverage.gitea.io - # when: - # event: [ push ] - # branch: master - docker: - image: plugins/docker + image: plugins/docker:17.05 pull: true + secrets: [ docker_username, docker_password ] repo: gitea/gitea tags: [ '${DRONE_TAG##v}' ] when: @@ -114,8 +104,9 @@ pipeline: branch: [ refs/tags/* ] docker: - image: plugins/docker + image: plugins/docker:17.05 pull: true + secrets: [ docker_username, docker_password ] repo: gitea/gitea tags: [ '${DRONE_BRANCH##release/v}' ] when: @@ -123,8 +114,9 @@ pipeline: branch: [ release/* ] docker: - image: plugins/docker + image: plugins/docker:17.05 pull: true + secrets: [ docker_username, docker_password ] repo: gitea/gitea tags: [ 'latest' ] when: @@ -132,7 +124,10 @@ pipeline: branch: [ master ] release: - image: plugins/s3 + image: plugins/s3:1 + pull: true + secrets: [ s3_access_key, s3_secret_key ] + endpoint: https://storage.gitea.io path_style: true strip_prefix: dist/release/ source: dist/release/* @@ -142,7 +137,10 @@ pipeline: branch: [ refs/tags/* ] release: - image: plugins/s3 + image: plugins/s3:1 + pull: true + secrets: [ s3_access_key, s3_secret_key ] + endpoint: https://storage.gitea.io path_style: true strip_prefix: dist/release/ source: dist/release/* @@ -152,7 +150,10 @@ pipeline: branch: [ release/* ] release: - image: plugins/s3 + image: plugins/s3:1 + pull: true + secrets: [ s3_access_key, s3_secret_key ] + endpoint: https://storage.gitea.io path_style: true strip_prefix: dist/release/ source: dist/release/* @@ -162,7 +163,8 @@ pipeline: branch: [ master ] github: - image: plugins/github-release + image: plugins/github-release:1 + pull: true files: - dist/release/* when: @@ -170,9 +172,9 @@ pipeline: branch: [ refs/tags/* ] discord: - image: appleboy/drone-discord:0.0.4 - webhook_id: ${WEBHOOK_ID} - webhook_token: ${WEBHOOK_TOKEN} + image: appleboy/drone-discord:1.0.0 + pull: true + secrets: [ discord_webhook_id, discord_webhook_token ] when: event: [ push, tag, pull_request ] status: [ changed, failure ] diff --git a/.drone.yml.sig b/.drone.yml.sig deleted file mode 100644 index 348724c54926..000000000000 --- a/.drone.yml.sig +++ /dev/null @@ -1 +0,0 @@ -eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIGJhc2U6IC9zcnYvYXBwCiAgcGF0aDogc3JjL2NvZGUuZ2l0ZWEuaW8vZ2l0ZWEKCnBpcGVsaW5lOgogIGNsb25lOgogICAgaW1hZ2U6IHBsdWdpbnMvZ2l0CiAgICBkZXB0aDogNTAKICAgIHRhZ3M6IHRydWUKCiAgYnVpbGQ6CiAgICBpbWFnZTogd2ViaGlwcGllL2dvbGFuZzplZGdlCiAgICBwdWxsOiB0cnVlCiAgICBlbnZpcm9ubWVudDoKICAgICAgVEFHUzogYmluZGF0YSBzcWxpdGUKICAgICAgR09QQVRIOiAvc3J2L2FwcAogICAgY29tbWFuZHM6CiAgICAgIC0gYXBrIC1VIGFkZCBvcGVuc3NoLWNsaWVudAogICAgICAtIG1ha2UgY2xlYW4KICAgICAgLSBtYWtlIGdlbmVyYXRlCiAgICAgIC0gbWFrZSB2ZXQKICAgICAgLSBtYWtlIGxpbnQKICAgICAgLSBtYWtlIHN0eWxlc2hlZXRzLWNoZWNrCiAgICAgIC0gbWFrZSBtaXNzcGVsbC1jaGVjawogICAgICAtIG1ha2UgdGVzdC12ZW5kb3IKICAgICAgLSBtYWtlIGJ1aWxkCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoLCB0YWcsIHB1bGxfcmVxdWVzdCBdCgogIHRlc3Q6CiAgICBpbWFnZTogd2ViaGlwcGllL2dvbGFuZzplZGdlCiAgICBwdWxsOiB0cnVlCiAgICBlbnZpcm9ubWVudDoKICAgICAgVEFHUzogYmluZGF0YSBzcWxpdGUKICAgICAgR09QQVRIOiAvc3J2L2FwcAogICAgY29tbWFuZHM6CiAgICAgIC0gYXBrIC1VIGFkZCBvcGVuc3NoLWNsaWVudAogICAgICAtIG1ha2UgdGVzdAogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgdGFnLCBwdWxsX3JlcXVlc3QgXQoKICB0ZXN0LWNvdmVyYWdlOgogICAgaW1hZ2U6IHdlYmhpcHBpZS9nb2xhbmc6ZWRnZQogICAgcHVsbDogdHJ1ZQogICAgZW52aXJvbm1lbnQ6CiAgICAgIFRBR1M6IGJpbmRhdGEgc3FsaXRlCiAgICAgIEdPUEFUSDogL3Nydi9hcHAKICAgIGNvbW1hbmRzOgogICAgICAtIGFwayAtVSBhZGQgb3BlbnNzaC1jbGllbnQKICAgICAgLSBnbyBnZXQgZ2l0aHViLmNvbS93YWRleS9nb2Nvdm1lcmdlCiAgICAgIC0gbWFrZSB0ZXN0LWNvdmVyYWdlCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoIF0KICAgICAgYnJhbmNoOiBtYXN0ZXIKCiAgdGVzdC1zcWxpdGU6CiAgICBpbWFnZTogd2ViaGlwcGllL2dvbGFuZzplZGdlCiAgICBwdWxsOiB0cnVlCiAgICBlbnZpcm9ubWVudDoKICAgICAgVEFHUzogYmluZGF0YQogICAgICBHT1BBVEg6IC9zcnYvYXBwCiAgICBjb21tYW5kczoKICAgICAgLSBlY2hvICJOZWVkcyB0byBiZSBmaXhlZCIgIyBtYWtlIHRlc3Qtc3FsaXRlCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoLCB0YWcsIHB1bGxfcmVxdWVzdCBdCgogIHRlc3QtbXlzcWw6CiAgICBpbWFnZTogd2ViaGlwcGllL2dvbGFuZzplZGdlCiAgICBwdWxsOiB0cnVlCiAgICBlbnZpcm9ubWVudDoKICAgICAgVEFHUzogYmluZGF0YQogICAgICBHT1BBVEg6IC9zcnYvYXBwCiAgICBjb21tYW5kczoKICAgICAgLSBtYWtlIHRlc3QtbXlzcWwKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2gsIHRhZywgcHVsbF9yZXF1ZXN0IF0KCiAgdGVzdC1wZ3NxbDoKICAgIGltYWdlOiB3ZWJoaXBwaWUvZ29sYW5nOmVkZ2UKICAgIHB1bGw6IHRydWUKICAgIGVudmlyb25tZW50OgogICAgICBUQUdTOiBiaW5kYXRhCiAgICAgIEdPUEFUSDogL3Nydi9hcHAKICAgIGNvbW1hbmRzOgogICAgICAtIG1ha2UgdGVzdC1wZ3NxbAogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCwgdGFnLCBwdWxsX3JlcXVlc3QgXQoKICBzdGF0aWM6CiAgICBpbWFnZToga2FyYWxhYmUveGdvLWxhdGVzdDpsYXRlc3QKICAgIHB1bGw6IHRydWUKICAgIGVudmlyb25tZW50OgogICAgICBUQUdTOiBiaW5kYXRhIHNxbGl0ZQogICAgICBHT1BBVEg6IC9zcnYvYXBwCiAgICBjb21tYW5kczoKICAgICAgLSBtYWtlIHJlbGVhc2UKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2gsIHRhZyBdCgogICMgY292ZXJhZ2U6CiAgIyAgIGltYWdlOiBwbHVnaW5zL2NvdmVyYWdlCiAgIyAgIHNlcnZlcjogaHR0cHM6Ly9jb3ZlcmFnZS5naXRlYS5pbwogICMgICB3aGVuOgogICMgICAgIGV2ZW50OiBbIHB1c2ggXQogICMgICAgIGJyYW5jaDogbWFzdGVyCgogIGRvY2tlcjoKICAgIGltYWdlOiBwbHVnaW5zL2RvY2tlcgogICAgcHVsbDogdHJ1ZQogICAgcmVwbzogZ2l0ZWEvZ2l0ZWEKICAgIHRhZ3M6IFsgJyR7RFJPTkVfVEFHIyN2fScgXQogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgdGFnIF0KICAgICAgYnJhbmNoOiBbIHJlZnMvdGFncy8qIF0KCiAgZG9ja2VyOgogICAgaW1hZ2U6IHBsdWdpbnMvZG9ja2VyCiAgICBwdWxsOiB0cnVlCiAgICByZXBvOiBnaXRlYS9naXRlYQogICAgdGFnczogWyAnJHtEUk9ORV9CUkFOQ0gjI3JlbGVhc2Uvdn0nIF0KICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2ggXQogICAgICBicmFuY2g6IFsgcmVsZWFzZS8qIF0KCiAgZG9ja2VyOgogICAgaW1hZ2U6IHBsdWdpbnMvZG9ja2VyCiAgICBwdWxsOiB0cnVlCiAgICByZXBvOiBnaXRlYS9naXRlYQogICAgdGFnczogWyAnbGF0ZXN0JyBdCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoIF0KICAgICAgYnJhbmNoOiBbIG1hc3RlciBdCgogIHJlbGVhc2U6CiAgICBpbWFnZTogcGx1Z2lucy9zMwogICAgcGF0aF9zdHlsZTogdHJ1ZQogICAgc3RyaXBfcHJlZml4OiBkaXN0L3JlbGVhc2UvCiAgICBzb3VyY2U6IGRpc3QvcmVsZWFzZS8qCiAgICB0YXJnZXQ6IC9naXRlYS8ke0RST05FX1RBRyMjdn0KICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHRhZyBdCiAgICAgIGJyYW5jaDogWyByZWZzL3RhZ3MvKiBdCgogIHJlbGVhc2U6CiAgICBpbWFnZTogcGx1Z2lucy9zMwogICAgcGF0aF9zdHlsZTogdHJ1ZQogICAgc3RyaXBfcHJlZml4OiBkaXN0L3JlbGVhc2UvCiAgICBzb3VyY2U6IGRpc3QvcmVsZWFzZS8qCiAgICB0YXJnZXQ6IC9naXRlYS8ke0RST05FX0JSQU5DSCMjcmVsZWFzZS92fQogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCBdCiAgICAgIGJyYW5jaDogWyByZWxlYXNlLyogXQoKICByZWxlYXNlOgogICAgaW1hZ2U6IHBsdWdpbnMvczMKICAgIHBhdGhfc3R5bGU6IHRydWUKICAgIHN0cmlwX3ByZWZpeDogZGlzdC9yZWxlYXNlLwogICAgc291cmNlOiBkaXN0L3JlbGVhc2UvKgogICAgdGFyZ2V0OiAvZ2l0ZWEvbWFzdGVyCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoIF0KICAgICAgYnJhbmNoOiBbIG1hc3RlciBdCgogIGdpdGh1YjoKICAgIGltYWdlOiBwbHVnaW5zL2dpdGh1Yi1yZWxlYXNlCiAgICBmaWxlczoKICAgICAgLSBkaXN0L3JlbGVhc2UvKgogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgdGFnIF0KICAgICAgYnJhbmNoOiBbIHJlZnMvdGFncy8qIF0KCiAgZGlzY29yZDoKICAgIGltYWdlOiBhcHBsZWJveS9kcm9uZS1kaXNjb3JkOjAuMC40CiAgICB3ZWJob29rX2lkOiAke1dFQkhPT0tfSUR9CiAgICB3ZWJob29rX3Rva2VuOiAke1dFQkhPT0tfVE9LRU59CiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoLCB0YWcsIHB1bGxfcmVxdWVzdCBdCiAgICAgIHN0YXR1czogWyBjaGFuZ2VkLCBmYWlsdXJlIF0KCnNlcnZpY2VzOgogIG15c3FsOgogICAgaW1hZ2U6IG15c3FsOjUuNwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gTVlTUUxfREFUQUJBU0U9dGVzdAogICAgICAtIE1ZU1FMX0FMTE9XX0VNUFRZX1BBU1NXT1JEPXllcwogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCwgdGFnLCBwdWxsX3JlcXVlc3QgXQoKICBwZ3NxbDoKICAgIGltYWdlOiBwb3N0Z3Jlczo5LjUKICAgIGVudmlyb25tZW50OgogICAgICAtIFBPU1RHUkVTX0RCPXRlc3QKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2gsIHRhZywgcHVsbF9yZXF1ZXN0IF0K.YjokR0t3vMOWmF63boAMgPNYjVeJ0ymcGEUIM7nynxU \ No newline at end of file diff --git a/.gitignore b/.gitignore index 87d5327ae75b..e3274c5057b7 100644 --- a/.gitignore +++ b/.gitignore @@ -45,4 +45,6 @@ _testmain.go /indexers /log /public/img/avatar -/integrations/gitea-integration +/integrations/gitea-integration-mysql +/integrations/gitea-integration-pgsql +/integrations/gitea-integration-sqlite diff --git a/CHANGELOG.md b/CHANGELOG.md index 596bd050e651..102323390f76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,15 @@ * Password reset URL changed from `/user/forget_password` to `/user/forgot_password` * SSH keys management URL changed from `/user/settings/ssh` to `/user/settings/keys` +## [1.1.4](https://github.com/go-gitea/gitea/releases/tag/v1.1.4) - 2017-09-04 + +* BUGFIXES + * Fix rendering of external links (#2292) (#2315) + * Fix deleted milestone bug (#1942) (#2300) + * fix 500 error when view an issue which's milestone deleted (#2297) (#2299) + * Fix SHA1 hash linking (#2143) (#2293) + * back port from #1709 (#2291) + ## [1.1.3](https://github.com/go-gitea/gitea/releases/tag/v1.1.3) - 2017-08-03 * BUGFIXES diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2699d1880ffb..e58d8e30702d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,6 +8,7 @@ - [Discuss your design](#discuss-your-design) - [Testing redux](#testing-redux) - [Vendoring](#vendoring) + - [Translation](#translation) - [Code review](#code-review) - [Styleguide](#styleguide) - [Sign your work](#sign-your-work) @@ -19,47 +20,100 @@ ## Introduction -This document explains how to contribute changes to the Gitea project. It assumes you have followed the [installation instructions](https://docs.gitea.io/en-us/). Sensitive security-related issues should be reported to [security@gitea.io](mailto:security@gitea.io). +This document explains how to contribute changes to the Gitea project. +It assumes you have followed the +[installation instructions](https://docs.gitea.io/en-us/). +Sensitive security-related issues should be reported to +[security@gitea.io](mailto:security@gitea.io). ## Bug reports -Please search the issues on the issue tracker with a variety of keywords to ensure your bug is not already reported. +Please search the issues on the issue tracker with a variety of keywords +to ensure your bug is not already reported. -If unique, [open an issue](https://github.com/go-gitea/gitea/issues/new) and answer the questions so we can understand and reproduce the problematic behavior. +If unique, [open an issue](https://github.com/go-gitea/gitea/issues/new) +and answer the questions so we can understand and reproduce the +problematic behavior. -To show us that the issue you are having is in Gitea itself, please write clear, concise instructions so we can reproduce the behavior (even if it seems obvious). The more detailed and specific you are, the faster we can fix the issue. Check out [How to Report Bugs Effectively](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html). +To show us that the issue you are having is in Gitea itself, please +write clear, concise instructions so we can reproduce the behavior +(even if it seems obvious). The more detailed and specific you are, +the faster we can fix the issue. Check out [How to Report Bugs +Effectively](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html). -Please be kind, remember that Gitea comes at no cost to you, and you're getting free help. +Please be kind, remember that Gitea comes at no cost to you, and you're +getting free help. ## Discuss your design -The project welcomes submissions but please let everyone know what you're working on if you want to change or add something to the Gitea repositories. +The project welcomes submissions but please let everyone know what +you're working on if you want to change or add something to the Gitea +repositories. -Before starting to write something new for the Gitea project, please [file an issue](https://github.com/go-gitea/gitea/issues/new). Significant changes must go through the [change proposal process](https://github.com/go-gitea/proposals) before they can be accepted. +Before starting to write something new for the Gitea project, please [file +an issue](https://github.com/go-gitea/gitea/issues/new). Significant +changes must go through the [change proposal +process](https://github.com/go-gitea/proposals) before they can be +accepted. -This process gives everyone a chance to validate the design, helps prevent duplication of effort, and ensures that the idea fits inside the goals for the project and tools. It also checks that the design is sound before code is written; the code review tool is not the place for high-level discussions. +This process gives everyone a chance to validate the design, helps +prevent duplication of effort, and ensures that the idea fits inside +the goals for the project and tools. It also checks that the design is +sound before code is written; the code review tool is not the place for +high-level discussions. ## Testing redux -Before sending code out for review, run all the tests for the whole tree to make sure the changes don't break other usage and keep the compatibility on upgrade. To make sure you are running the test suite exactly like we do, you should install the CLI for [Drone CI](https://github.com/drone/drone), as we are using the server for continous testing, following [these instructions](http://readme.drone.io/usage/getting-started-cli). After that you can simply call `drone exec` within your working directory and it will try to run the test suite locally. +Before sending code out for review, run all the tests for the +whole tree to make sure the changes don't break other usage +and keep the compatibility on upgrade. To make sure you are +running the test suite exactly like we do, you should install +the CLI for [Drone CI](https://github.com/drone/drone), as +we are using the server for continous testing, following [these +instructions](http://readme.drone.io/usage/getting-started-cli). After +that you can simply call `drone exec` within your working directory and +it will try to run the test suite locally. ## Vendoring -We keep a cached copy of dependencies within the `vendor/` directory, managing updates via [govendor](http://github.com/kardianos/govendor). +We keep a cached copy of dependencies within the `vendor/` directory, +managing updates via [govendor](http://github.com/kardianos/govendor). -Pull requests should only include `vendor/` updates if they are part of the same change, be it a bugfix or a feature addition. +Pull requests should only include `vendor/` updates if they are part of +the same change, be it a bugfix or a feature addition. -The `vendor/` update needs to be justified as part of the PR description, and must be verified by the reviewers and/or merger to always reference an existing upstream commit. +The `vendor/` update needs to be justified as part of the PR description, +and must be verified by the reviewers and/or merger to always reference +an existing upstream commit. + +## Translation + +We do all translation work inside [Crowdin](https://crowdin.com/project/gitea). +The only translation that is maintained in this git repository is +[`en_US.ini`](https://github.com/go-gitea/gitea/blob/master/options/locale/locale_en-US.ini) +and is synced regularily to Crowdin. Once a translation has reached +A SATISFACTORY PERCENTAGE it will be synced back into this repo and +included in the next released version. ## Code review -Changes to Gitea must be reviewed before they are accepted, no matter who makes the change even if it is an owner or a maintainer. We use GitHub's pull request workflow to do that and we also use [LGTM](http://lgtm.co) to ensure every PR is reviewed by at least 2 maintainers. +Changes to Gitea must be reviewed before they are accepted, no matter who +makes the change even if it is an owner or a maintainer. We use GitHub's +pull request workflow to do that and we also use [LGTM](http://lgtm.co) +to ensure every PR is reviewed by at least 2 maintainers. -Please try to make your pull request easy to review for us. Please read the "[How to get faster PR reviews](https://github.com/kubernetes/community/blob/master/contributors/devel/faster_reviews.md)" guide, it has lots of useful tips for any project you may want to contribute. Some of the key points: +Please try to make your pull request easy to review for us. +Please read the [How to get faster PR reviews](https://github.com/kubernetes/community/blob/master/contributors/devel/faster_reviews.md) guide, +it has lots of useful tips for any project you may want to contribute. +Some of the key points: -* Make small pull requests. The smaller, the faster to review and the more likely it will be merged soon. -* Don't make changes unrelated to your PR. Maybe there are typos on some comments, maybe refactoring would be welcome on a function... but if that is not related to your PR, please make *another* PR for that. -* Split big pull requests into multiple small ones. An incremental change will be faster to review than a huge PR. +* Make small pull requests. The smaller, the faster to review and the + more likely it will be merged soon. +* Don't make changes unrelated to your PR. Maybe there are typos on + some comments, maybe refactoring would be welcome on a function... but + if that is not related to your PR, please make *another* PR for that. +* Split big pull requests into multiple small ones. An incremental change + will be faster to review than a huge PR. ## Styleguide @@ -82,35 +136,82 @@ import ( ## Sign your work -The sign-off is a simple line at the end of the explanation for the patch. Your signature certifies that you wrote the patch or otherwise have the right to pass it on as an open-source patch. The rules are pretty simple: If you can certify [DCO](DCO), then you just add a line to every git commit message: +The sign-off is a simple line at the end of the explanation for the +patch. Your signature certifies that you wrote the patch or otherwise +have the right to pass it on as an open-source patch. The rules are +pretty simple: If you can certify [DCO](DCO), then you just add a line +to every git commit message: ``` Signed-off-by: Joe Smith ``` -Please use your real name, we really dislike pseudonyms or anonymous contributions. We are in the open-source world without secrets. If you set your `user.name` and `user.email` git configs, you can sign your commit automatically with `git commit -s`. +Please use your real name, we really dislike pseudonyms or anonymous +contributions. We are in the open-source world without secrets. If you +set your `user.name` and `user.email` git configs, you can sign your +commit automatically with `git commit -s`. ## Release Cycle -We adopted a release schedule to streamline the process of working on, finishing, and issuing releases. The overall goal is to make a major release every two months, which breaks down into one month of general development followed by one month of testing and polishing known as the release freeze. A release is maintained by issuing minor releases to only correct critical problems such as crashes or security issues. All the feature pull requests should be merged in the first month of one release period. - -The current release cycle is aligned to start on December 25 to February 24, next is February 25 to April 24, and etc. On this cycle, we also maybe publish the previous release minor version. For example, the current release version is v1.1, but we maybe also publish v1.0.2. When we publish v1.2, then we will stop publish v1.0.3. +We adopted a release schedule to streamline the process of working +on, finishing, and issuing releases. The overall goal is to make a +minor release every two months, which breaks down into one month of +general development followed by one month of testing and polishing +known as the release freeze. All the feature pull requests should be +merged in the first month of one release period and during the frozen +period a corresponding release branch is open for fix backported from +master. Release candidate are made along this period for user testing to +obtain a final version that is maintained in this branch. A release is +maintained by issuing patch releases to only correct critical problems +such as crashes or security issues. + +The current release cycle is aligned to start on December 25 to February +24, next is February 25 to April 24, and etc. On this cycle, we also +maybe publish the previous release minor version. For example, the +current release version is v1.1, but we maybe also publish v1.0.2. When +we publish v1.2, then we will stop publish v1.0.3. ## Maintainers -To make sure every PR is checked, we have [team maintainers](MAINTAINERS). Every PR **MUST** be reviewed by at least two maintainers (or owners) before it can get merged. A maintainer should be a contributor of Gitea (or Gogs) and contributed at least 4 accepted PRs. A contributor should apply as a maintainer in the [Discord](https://discord.gg/NsatcWJ) #develop channel. The owners or the team maintainers may invite the contributor. A maintainer should spend some time on code reviews. If a maintainer has no time to do that, they should apply to leave the maintainers team and we will give them the honor of being a member of the [advisors team](https://github.com/orgs/go-gitea/teams/advisors). Of course, if an advisor has time to code review, we will gladly welcome them back to the maintainers team. If a maintainer is inactive for more than 3 months and forgets to leave the maintainers team, the owners may move him or her from the maintainers team to the advisors team. +To make sure every PR is checked, we have [team +maintainers](MAINTAINERS). Every PR **MUST** be reviewed by at least +two maintainers (or owners) before it can get merged. A maintainer +should be a contributor of Gitea (or Gogs) and contributed at least +4 accepted PRs. A contributor should apply as a maintainer in the +[Discord](https://discord.gg/NsatcWJ) #develop channel. The owners +or the team maintainers may invite the contributor. A maintainer +should spend some time on code reviews. If a maintainer has no +time to do that, they should apply to leave the maintainers team +and we will give them the honor of being a member of the [advisors +team](https://github.com/orgs/go-gitea/teams/advisors). Of course, if +an advisor has time to code review, we will gladly welcome them back +to the maintainers team. If a maintainer is inactive for more than 3 +months and forgets to leave the maintainers team, the owners may move +him or her from the maintainers team to the advisors team. ## Owners -Since Gitea is a pure community organization without any company support, to keep the development healthy we will elect three owners every year. All contributors may vote to elect up to three candidates, one of which will be the main owner, and the other two the assistant owners. When the new owners have been elected, the old owners will give up ownership to the newly elected owners. If an owner is unable to do so, the other owners will assist in ceding ownership to the newly elected owners. +Since Gitea is a pure community organization without any company support, +to keep the development healthy we will elect three owners every year. All +contributors may vote to elect up to three candidates, one of which will +be the main owner, and the other two the assistant owners. When the new +owners have been elected, the old owners will give up ownership to the +newly elected owners. If an owner is unable to do so, the other owners +will assist in ceding ownership to the newly elected owners. -After the election, the new owners should proactively agree with our [CONTRIBUTING](CONTRIBUTING.md) requirements in the [Discord](https://discord.gg/NsatcWJ) #general channel. Below are the words to speak: +After the election, the new owners should proactively agree +with our [CONTRIBUTING](CONTRIBUTING.md) requirements in the +[Discord](https://discord.gg/NsatcWJ) #general channel. Below are the +words to speak: ``` -I'm honored to having been elected an owner of Gitea, I agree with [CONTRIBUTING](CONTRIBUTING.md). I will spend part of my time on Gitea and lead the development of Gitea. +I'm honored to having been elected an owner of Gitea, I agree with +[CONTRIBUTING](CONTRIBUTING.md). I will spend part of my time on Gitea +and lead the development of Gitea. ``` -To honor the past owners, here's the history of the owners and the time they served: +To honor the past owners, here's the history of the owners and the time +they served: * 2016-11-04 ~ 2017-12-31 * [Lunny Xiao](https://github.com/lunny) @@ -119,9 +220,16 @@ To honor the past owners, here's the history of the owners and the time they ser ## Versions -Gitea has the `master` branch as a tip branch and has version branches such as `v0.9`. `v0.9` is a release branch and we will tag `v0.9.0` for binary download. If `v0.9.0` has bugs, we will accept pull requests on the `v0.9` branch and publish a `v0.9.1` tag, after bringing the bug fix also to the master branch. +Gitea has the `master` branch as a tip branch and has version branches +such as `release/v0.9`. `release/v0.9` is a release branch and we will +tag `v0.9.0` for binary download. If `v0.9.0` has bugs, we will accept +pull requests on the `release/v0.9` branch and publish a `v0.9.1` tag, +after bringing the bug fix also to the master branch. -Since the `master` branch is a tip version, if you wish to use Gitea in production, please download the latest release tag version. All the branches will be protected via GitHub, all the PRs to every branch must be reviewed by two maintainers and must pass the automatic tests. +Since the `master` branch is a tip version, if you wish to use Gitea +in production, please download the latest release tag version. All the +branches will be protected via GitHub, all the PRs to every branch must +be reviewed by two maintainers and must pass the automatic tests. ## Copyright @@ -133,4 +241,6 @@ Code that you contribute should use the standard copyright header: // license that can be found in the LICENSE file. ``` -Files in the repository contain copyright from the year they are added to the year they are last changed. If the copyright author is changed, just paste the header below the old one. +Files in the repository contain copyright from the year they are added +to the year they are last changed. If the copyright author is changed, +just paste the header below the old one. diff --git a/Dockerfile b/Dockerfile index cc9ec311be59..a063f2e10a19 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ RUN addgroup \ -u 1000 \ -G git \ git && \ - echo "git:$(date +%s | sha256sum | base64 | head -c 32)" | chpasswd + echo "git:$(dd if=/dev/urandom bs=24 count=1 status=none | base64)" | chpasswd ENV USER git ENV GITEA_CUSTOM /data/gitea diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 9f91ae90b63f..a9dc3adc19e8 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -23,7 +23,7 @@ RUN addgroup \ -u 1000 \ -G git \ git && \ - echo "git:$(date +%s | sha256sum | base64 | head -c 32)" | chpasswd + echo "git:$(dd if=/dev/urandom bs=24 count=1 status=none | base64)" | chpasswd ENV USER git ENV GITEA_CUSTOM /data/gitea diff --git a/Dockerfile.rpi b/Dockerfile.rpi index 8ecfd19a1e50..373b8025af97 100644 --- a/Dockerfile.rpi +++ b/Dockerfile.rpi @@ -24,7 +24,7 @@ RUN addgroup \ -u 1000 \ -G git \ git && \ - echo "git:$(date +%s | sha256sum | base64 | head -c 32)" | chpasswd + echo "git:$(dd if=/dev/urandom bs=24 count=1 status=none | base64)" | chpasswd ENV USER git ENV GITEA_CUSTOM /data/gitea diff --git a/Makefile b/Makefile index 6b2877c72699..76cb85fdb170 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ DIST := dist IMPORT := code.gitea.io/gitea +GO ?= go SED_INPLACE := sed -i ifeq ($(OS), Windows_NT) @@ -24,7 +25,7 @@ EXTRA_GOFLAGS ?= LDFLAGS := -X "main.Version=$(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')" -X "main.Tags=$(TAGS)" -PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations,$(shell go list ./... | grep -v /vendor/)) +PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations,$(shell $(GO) list ./... | grep -v /vendor/)) SOURCES ?= $(shell find . -name "*.go" -type f) TAGS ?= @@ -52,11 +53,11 @@ all: build .PHONY: clean clean: - go clean -i ./... - rm -rf $(EXECUTABLE) $(DIST) $(BINDATA) + $(GO) clean -i ./... + rm -rf $(EXECUTABLE) $(DIST) $(BINDATA) integrations*.test integrations/gitea-integration-pgsql/ integrations/gitea-integration-mysql/ integrations/gitea-integration-sqlite/ required-gofmt-version: - @go version | grep -q '\(1.7\|1.8\)' || { echo "We require go version 1.7 or 1.8 to format code" >&2 && exit 1; } + @$(GO) version | grep -q '\(1.7\|1.8\)' || { echo "We require go version 1.7 or 1.8 to format code" >&2 && exit 1; } .PHONY: fmt fmt: required-gofmt-version @@ -64,19 +65,19 @@ fmt: required-gofmt-version .PHONY: vet vet: - go vet $(PACKAGES) + $(GO) vet $(PACKAGES) .PHONY: generate generate: @hash go-bindata > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - go get -u github.com/jteeuwen/go-bindata/...; \ + $(GO) get -u github.com/jteeuwen/go-bindata/...; \ fi - go generate $(PACKAGES) + $(GO) generate $(PACKAGES) .PHONY: generate-swagger generate-swagger: @hash swagger > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - go get -u github.com/go-swagger/go-swagger/cmd/swagger; \ + $(GO) get -u github.com/go-swagger/go-swagger/cmd/swagger; \ fi swagger generate spec -o ./public/swagger.v1.json $(SED_INPLACE) "s;\".ref\": \"#/definitions/GPGKey\";\"type\": \"object\";g" ./public/swagger.v1.json @@ -85,28 +86,28 @@ generate-swagger: .PHONY: errcheck errcheck: @hash errcheck > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - go get -u github.com/kisielk/errcheck; \ + $(GO) get -u github.com/kisielk/errcheck; \ fi errcheck $(PACKAGES) .PHONY: lint lint: @hash golint > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - go get -u github.com/golang/lint/golint; \ + $(GO) get -u github.com/golang/lint/golint; \ fi for PKG in $(PACKAGES); do golint -set_exit_status $$PKG || exit 1; done; .PHONY: misspell-check misspell-check: @hash misspell > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - go get -u github.com/client9/misspell/cmd/misspell; \ + $(GO) get -u github.com/client9/misspell/cmd/misspell; \ fi misspell -error -i unknwon $(GOFILES) .PHONY: misspell misspell: @hash misspell > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - go get -u github.com/client9/misspell/cmd/misspell; \ + $(GO) get -u github.com/client9/misspell/cmd/misspell; \ fi misspell -w -i unknwon $(GOFILES) @@ -122,12 +123,12 @@ fmt-check: required-gofmt-version .PHONY: test test: fmt-check - go test $(PACKAGES) + $(GO) test $(PACKAGES) -.PHONY: test-coverage -test-coverage: unit-test-coverage integration-test-coverage +.PHONY: coverage +coverage: unit-test-coverage integration-test-coverage @hash gocovmerge > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - go get -u github.com/wadey/gocovmerge; \ + $(GO) get -u github.com/wadey/gocovmerge; \ fi for PKG in $(PACKAGES); do\ touch $$GOPATH/src/$$PKG/coverage.out;\ @@ -139,12 +140,12 @@ test-coverage: unit-test-coverage integration-test-coverage .PHONY: unit-test-coverage unit-test-coverage: - for PKG in $(PACKAGES); do go test -cover -coverprofile $$GOPATH/src/$$PKG/coverage.out $$PKG || exit 1; done; + for PKG in $(PACKAGES); do $(GO) test -cover -coverprofile $$GOPATH/src/$$PKG/coverage.out $$PKG || exit 1; done; .PHONY: test-vendor test-vendor: @hash govendor > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - go get -u github.com/kardianos/govendor; \ + $(GO) get -u github.com/kardianos/govendor; \ fi govendor list +unused | tee "$(TMPDIR)/wc-gitea-unused" [ $$(cat "$(TMPDIR)/wc-gitea-unused" | wc -l) -eq 0 ] || echo "Warning: /!\\ Some vendor are not used /!\\" @@ -159,12 +160,12 @@ test-sqlite: integrations.sqlite.test GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test .PHONY: test-mysql -test-mysql: integrations.test - GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.test +test-mysql: integrations.mysql.test + GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test .PHONY: test-pgsql -test-pgsql: integrations.test - GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.test +test-pgsql: integrations.pgsql.test + GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test .PHONY: bench-sqlite @@ -172,39 +173,42 @@ bench-sqlite: integrations.sqlite.test GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test -test.bench . .PHONY: bench-mysql -bench-mysql: integrations.test - GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.test -test.bench . +bench-mysql: integrations.mysql.test + GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test -test.bench . .PHONY: bench-pgsql -bench-pgsql: integrations.test - GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.test -test.bench . +bench-pgsql: integrations.pgsql.test + GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test -test.bench . .PHONY: integration-test-coverage integration-test-coverage: integrations.cover.test GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.cover.test -test.coverprofile=integration.coverage.out -integrations.test: $(SOURCES) - go test -c code.gitea.io/gitea/integrations +integrations.mysql.test: $(SOURCES) + $(GO) test -c code.gitea.io/gitea/integrations -o integrations.mysql.test + +integrations.pgsql.test: $(SOURCES) + $(GO) test -c code.gitea.io/gitea/integrations -o integrations.pgsql.test integrations.sqlite.test: $(SOURCES) - go test -c code.gitea.io/gitea/integrations -o integrations.sqlite.test -tags 'sqlite' + $(GO) test -c code.gitea.io/gitea/integrations -o integrations.sqlite.test -tags 'sqlite' integrations.cover.test: $(SOURCES) - go test -c code.gitea.io/gitea/integrations -coverpkg $(shell echo $(PACKAGES) | tr ' ' ',') -o integrations.cover.test + $(GO) test -c code.gitea.io/gitea/integrations -coverpkg $(shell echo $(PACKAGES) | tr ' ' ',') -o integrations.cover.test .PHONY: check check: test .PHONY: install install: $(wildcard *.go) - go install -v -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' + $(GO) install -v -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' .PHONY: build build: $(EXECUTABLE) $(EXECUTABLE): $(SOURCES) - go build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@ + $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@ .PHONY: docker docker: @@ -221,7 +225,7 @@ release-dirs: .PHONY: release-windows release-windows: @hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - go get -u github.com/karalabe/xgo; \ + $(GO) get -u github.com/karalabe/xgo; \ fi xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out gitea-$(VERSION) . ifeq ($(CI),drone) @@ -231,7 +235,7 @@ endif .PHONY: release-linux release-linux: @hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - go get -u github.com/karalabe/xgo; \ + $(GO) get -u github.com/karalabe/xgo; \ fi xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'linux/*' -out gitea-$(VERSION) . ifeq ($(CI),drone) @@ -241,7 +245,7 @@ endif .PHONY: release-darwin release-darwin: @hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - go get -u github.com/karalabe/xgo; \ + $(GO) get -u github.com/karalabe/xgo; \ fi xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin/*' -out gitea-$(VERSION) . ifeq ($(CI),drone) @@ -278,15 +282,15 @@ stylesheets: public/css/index.css .IGNORE: public/css/index.css public/css/index.css: $(STYLESHEETS) @which lessc > /dev/null; if [ $$? -ne 0 ]; then \ - go get -u github.com/kib357/less-go/lessc; \ + $(GO) get -u github.com/kib357/less-go/lessc; \ fi lessc -i $< -o $@ .PHONY: swagger-ui swagger-ui: - rm -Rf public/assets/swagger-ui + rm -Rf public/vendor/assets/swagger-ui git clone --depth=10 -b v3.0.7 --single-branch https://github.com/swagger-api/swagger-ui.git $(TMPDIR)/swagger-ui - mv $(TMPDIR)/swagger-ui/dist public/assets/swagger-ui + mv $(TMPDIR)/swagger-ui/dist public/vendor/assets/swagger-ui rm -Rf $(TMPDIR)/swagger-ui $(SED_INPLACE) "s;http://petstore.swagger.io/v2/swagger.json;../../swagger.v1.json;g" public/assets/swagger-ui/index.html diff --git a/README.md b/README.md index c223bad001c0..0c92b9648daf 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,8 @@ # Gitea - Git with a cup of tea [![Build Status](https://drone.gitea.io/api/badges/go-gitea/gitea/status.svg)](https://drone.gitea.io/go-gitea/gitea) -[![Join the chat at https://img.shields.io/discord/322538954119184384.svg](https://img.shields.io/discord/322538954119184384.svg)](https://discord.gg/NsatcWJ) +[![Join the Discord chat at https://discord.gg/NsatcWJ](https://img.shields.io/discord/322538954119184384.svg)](https://discord.gg/NsatcWJ) +[![Join the Matrix chat at https://matrix.to/#/#gitea:matrix.org](https://img.shields.io/badge/matrix-%23gitea%3Amatrix.org-7bc9a4.svg)](https://matrix.to/#/#gitea:matrix.org) [![](https://images.microbadger.com/badges/image/gitea/gitea.svg)](https://microbadger.com/images/gitea/gitea "Get your own image badge on microbadger.com") [![Coverage Status](https://coverage.gitea.io/badges/go-gitea/gitea/coverage.svg)](https://coverage.gitea.io/go-gitea/gitea) [![Go Report Card](https://goreportcard.com/badge/code.gitea.io/gitea)](https://goreportcard.com/report/code.gitea.io/gitea) @@ -18,7 +19,16 @@ ## Purpose -The goal of this project is to make the easiest, fastest, and most painless way of setting up a self-hosted Git service. Using Go, this can be done with an independent binary distribution across **all platforms** which Go supports, including Linux, macOS, and Windows on x86, amd64, ARM and PowerPC architectures. Want to try it before doing anything else? Do it [with the online demo](https://try.gitea.io/)! This project has been [forked](https://blog.gitea.io/2016/12/welcome-to-gitea/) from [Gogs](https://gogs.io). +The goal of this project is to make the easiest, fastest, and most +painless way of setting up a self-hosted Git service. +Using Go, this can be done with an independent binary distribution across +**all platforms** which Go supports, including Linux, macOS, and Windows +on x86, amd64, ARM and PowerPC architectures. +Want to try it before doing anything else? +Do it [with the online demo](https://try.gitea.io/)! +This project has been +[forked](https://blog.gitea.io/2016/12/welcome-to-gitea/) from +[Gogs](https://gogs.io). ## Notes @@ -28,7 +38,12 @@ The goal of this project is to make the easiest, fastest, and most painless way ## Docs -For more information and instructions about how to install Gitea please look at our [documentation](https://docs.gitea.io/en-us/). If you cannot find some specific information, then head over to our [Discord](https://discord.gg/NsatcWJ) server to chat with us or use the [forum](https://discourse.gitea.io/). +For more information and instructions about how to install Gitea +please look at our [documentation](https://docs.gitea.io/en-us/). +If you cannot find some specific information, then head over to +our [Discord server](https://discord.gg/NsatcWJ) +or [Matrix room](https://matrix.to/#/#gitea:matrix.org) to chat with us +or use the [forum](https://discourse.gitea.io/). ## Contributing @@ -42,4 +57,6 @@ Fork -> Patch -> Push -> Pull Request ## License -This project is licensed under the MIT License. See the [LICENSE](https://github.com/go-gitea/gitea/blob/master/LICENSE) file for the full license text. +This project is licensed under the MIT License. +See the [LICENSE](https://github.com/go-gitea/gitea/blob/master/LICENSE) file +for the full license text. diff --git a/cmd/admin.go b/cmd/admin.go index aec1b8dad45f..928bc1ebba46 100644 --- a/cmd/admin.go +++ b/cmd/admin.go @@ -103,7 +103,7 @@ func runChangePassword(c *cli.Context) error { return fmt.Errorf("%v", err) } user.EncodePasswd() - if err := models.UpdateUser(user); err != nil { + if err := models.UpdateUserCols(user, "passwd", "salt"); err != nil { return fmt.Errorf("%v", err) } diff --git a/conf/app.ini b/conf/app.ini index 3333434230fa..9674b815c981 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -206,6 +206,8 @@ REVERSE_PROXY_AUTHENTICATION_USER = X-WEBAUTH-USER MIN_PASSWORD_LENGTH = 6 ; True when users are allowed to import local server paths IMPORT_LOCAL_PATHS = false +; Prevent all users (including admin) from creating custom git hooks +DISABLE_GIT_HOOKS = false [openid] ; @@ -265,6 +267,12 @@ DEFAULT_KEEP_EMAIL_PRIVATE = false ; Default value for AllowCreateOrganization ; New user will have rights set to create organizations depending on this setting DEFAULT_ALLOW_CREATE_ORGANIZATION = true +; Default value for EnableTimetracking +; Repositories will use timetracking by default depending on this setting +DEFAULT_ENABLE_TIMETRACKING = true +; Default value for AllowOnlyContributorsToTrackTime +; Only users with write permissions could track time if this is true +DEFAULT_ALLOW_ONLY_CONTRIBUTORS_TO_TRACK_TIME = true ; Default value for the domain part of the user's email address in the git log ; if he has set KeepEmailPrivate true. The user's email replaced with a ; concatenation of the user name in lower case, "@" and NO_REPLY_ADDRESS. diff --git a/integrations/api_gpg_keys_test.go b/integrations/api_gpg_keys_test.go new file mode 100644 index 000000000000..51dc7843c0c7 --- /dev/null +++ b/integrations/api_gpg_keys_test.go @@ -0,0 +1,260 @@ +// Copyright 2017 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package integrations + +import ( + "net/http" + "strconv" + "testing" + + "github.com/stretchr/testify/assert" + + api "code.gitea.io/sdk/gitea" +) + +func TestGPGKeys(t *testing.T) { + prepareTestEnv(t) + session := loginUser(t, "user2") + + tt := []struct { + name string + reqBuilder func(testing.TB, *http.Request, int) *TestResponse + results []int + }{ + {name: "NoLogin", reqBuilder: MakeRequest, + results: []int{http.StatusUnauthorized, http.StatusUnauthorized, http.StatusUnauthorized, http.StatusUnauthorized, http.StatusUnauthorized, http.StatusUnauthorized, http.StatusUnauthorized, http.StatusUnauthorized}, + }, + {name: "LoggedAsUser2", reqBuilder: session.MakeRequest, + results: []int{http.StatusOK, http.StatusOK, http.StatusNotFound, http.StatusNoContent, http.StatusInternalServerError, http.StatusInternalServerError, http.StatusCreated, http.StatusCreated}}, + } + + for _, tc := range tt { + + //Basic test on result code + t.Run(tc.name, func(t *testing.T) { + t.Run("ViewOwnGPGKeys", func(t *testing.T) { + testViewOwnGPGKeys(t, tc.reqBuilder, tc.results[0]) + }) + t.Run("ViewGPGKeys", func(t *testing.T) { + testViewGPGKeys(t, tc.reqBuilder, tc.results[1]) + }) + t.Run("GetGPGKey", func(t *testing.T) { + testGetGPGKey(t, tc.reqBuilder, tc.results[2]) + }) + t.Run("DeleteGPGKey", func(t *testing.T) { + testDeleteGPGKey(t, tc.reqBuilder, tc.results[3]) + }) + + t.Run("CreateInvalidGPGKey", func(t *testing.T) { + testCreateInvalidGPGKey(t, tc.reqBuilder, tc.results[4]) + }) + t.Run("CreateNoneRegistredEmailGPGKey", func(t *testing.T) { + testCreateNoneRegistredEmailGPGKey(t, tc.reqBuilder, tc.results[5]) + }) + t.Run("CreateValidGPGKey", func(t *testing.T) { + testCreateValidGPGKey(t, tc.reqBuilder, tc.results[6]) + }) + t.Run("CreateValidSecondaryEmailGPGKey", func(t *testing.T) { + testCreateValidSecondaryEmailGPGKey(t, tc.reqBuilder, tc.results[7]) + }) + }) + } + + //Check state after basic add + t.Run("CheckState", func(t *testing.T) { + + var keys []*api.GPGKey + + req := NewRequest(t, "GET", "/api/v1/user/gpg_keys") //GET all keys + resp := session.MakeRequest(t, req, http.StatusOK) + DecodeJSON(t, resp, &keys) + + primaryKey1 := keys[0] //Primary key 1 + assert.EqualValues(t, "38EA3BCED732982C", primaryKey1.KeyID) + assert.EqualValues(t, 1, len(primaryKey1.Emails)) + assert.EqualValues(t, "user2@example.com", primaryKey1.Emails[0].Email) + assert.EqualValues(t, true, primaryKey1.Emails[0].Verified) + + subKey := primaryKey1.SubsKey[0] //Subkey of 38EA3BCED732982C + assert.EqualValues(t, "70D7C694D17D03AD", subKey.KeyID) + assert.EqualValues(t, 0, len(subKey.Emails)) + + primaryKey2 := keys[1] //Primary key 2 + assert.EqualValues(t, "FABF39739FE1E927", primaryKey2.KeyID) + assert.EqualValues(t, 1, len(primaryKey2.Emails)) + assert.EqualValues(t, "user21@example.com", primaryKey2.Emails[0].Email) + assert.EqualValues(t, false, primaryKey2.Emails[0].Verified) + + var key api.GPGKey + req = NewRequest(t, "GET", "/api/v1/user/gpg_keys/"+strconv.FormatInt(primaryKey1.ID, 10)) //Primary key 1 + resp = session.MakeRequest(t, req, http.StatusOK) + DecodeJSON(t, resp, &key) + assert.EqualValues(t, "38EA3BCED732982C", key.KeyID) + assert.EqualValues(t, 1, len(key.Emails)) + assert.EqualValues(t, "user2@example.com", key.Emails[0].Email) + assert.EqualValues(t, true, key.Emails[0].Verified) + + req = NewRequest(t, "GET", "/api/v1/user/gpg_keys/"+strconv.FormatInt(subKey.ID, 10)) //Subkey of 38EA3BCED732982C + resp = session.MakeRequest(t, req, http.StatusOK) + DecodeJSON(t, resp, &key) + assert.EqualValues(t, "70D7C694D17D03AD", key.KeyID) + assert.EqualValues(t, 0, len(key.Emails)) + + req = NewRequest(t, "GET", "/api/v1/user/gpg_keys/"+strconv.FormatInt(primaryKey2.ID, 10)) //Primary key 2 + resp = session.MakeRequest(t, req, http.StatusOK) + DecodeJSON(t, resp, &key) + assert.EqualValues(t, "FABF39739FE1E927", key.KeyID) + assert.EqualValues(t, 1, len(key.Emails)) + assert.EqualValues(t, "user21@example.com", key.Emails[0].Email) + assert.EqualValues(t, false, key.Emails[0].Verified) + + }) + + //Check state after basic add + t.Run("CheckCommits", func(t *testing.T) { + t.Run("NotSigned", func(t *testing.T) { + var branch api.Branch + req := NewRequest(t, "GET", "/api/v1/repos/user2/repo16/branches/not-signed") + resp := session.MakeRequest(t, req, http.StatusOK) + DecodeJSON(t, resp, &branch) + assert.EqualValues(t, false, branch.Commit.Verification.Verified) + }) + + t.Run("SignedWithNotValidatedEmail", func(t *testing.T) { + var branch api.Branch + req := NewRequest(t, "GET", "/api/v1/repos/user2/repo16/branches/good-sign-not-yet-validated") + resp := session.MakeRequest(t, req, http.StatusOK) + DecodeJSON(t, resp, &branch) + assert.EqualValues(t, false, branch.Commit.Verification.Verified) + }) + + t.Run("SignedWithValidEmail", func(t *testing.T) { + var branch api.Branch + req := NewRequest(t, "GET", "/api/v1/repos/user2/repo16/branches/good-sign") + resp := session.MakeRequest(t, req, http.StatusOK) + DecodeJSON(t, resp, &branch) + assert.EqualValues(t, true, branch.Commit.Verification.Verified) + }) + }) +} + +func testViewOwnGPGKeys(t *testing.T, reqBuilder func(testing.TB, *http.Request, int) *TestResponse, expected int) { + req := NewRequest(t, "GET", "/api/v1/user/gpg_keys") + reqBuilder(t, req, expected) +} + +func testViewGPGKeys(t *testing.T, reqBuilder func(testing.TB, *http.Request, int) *TestResponse, expected int) { + req := NewRequest(t, "GET", "/api/v1/users/user2/gpg_keys") + reqBuilder(t, req, expected) +} + +func testGetGPGKey(t *testing.T, reqBuilder func(testing.TB, *http.Request, int) *TestResponse, expected int) { + req := NewRequest(t, "GET", "/api/v1/user/gpg_keys/1") + reqBuilder(t, req, expected) +} + +func testDeleteGPGKey(t *testing.T, reqBuilder func(testing.TB, *http.Request, int) *TestResponse, expected int) { + req := NewRequest(t, "DELETE", "/api/v1/user/gpg_keys/1") + reqBuilder(t, req, expected) +} + +func testCreateGPGKey(t *testing.T, reqBuilder func(testing.TB, *http.Request, int) *TestResponse, expected int, publicKey string) { + req := NewRequestWithJSON(t, "POST", "/api/v1/user/gpg_keys", api.CreateGPGKeyOption{ + ArmoredKey: publicKey, + }) + reqBuilder(t, req, expected) +} + +func testCreateInvalidGPGKey(t *testing.T, reqBuilder func(testing.TB, *http.Request, int) *TestResponse, expected int) { + testCreateGPGKey(t, reqBuilder, expected, "invalid_key") +} + +func testCreateNoneRegistredEmailGPGKey(t *testing.T, reqBuilder func(testing.TB, *http.Request, int) *TestResponse, expected int) { + testCreateGPGKey(t, reqBuilder, expected, `-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBFmGUygBCACjCNbKvMGgp0fd5vyFW9olE1CLCSyyF9gQN2hSuzmZLuAZF2Kh +dCMCG2T1UwzUB/yWUFWJ2BtCwSjuaRv+cGohqEy6bhEBV90peGA33lHfjx7wP25O +7moAphDOTZtDj1AZfCh/PTcJut8Lc0eRDMhNyp/bYtO7SHNT1Hr6rrCV/xEtSAvR +3b148/tmIBiSadaLwc558KU3ucjnW5RVGins3AjBZ+TuT4XXVH/oeLSeXPSJ5rt1 +rHwaseslMqZ4AbvwFLx5qn1OC9rEQv/F548QsA8m0IntLjoPon+6wcubA9Gra21c +Fp6aRYl9x7fiqXDLg8i3s2nKdV7+e6as6Tp9ABEBAAG0FG5vdGtub3duQGV4YW1w +bGUuY29tiQEcBBABAgAGBQJZhlMoAAoJEC8+pvYULDtte/wH/2JNrhmHwDY+hMj0 +batIK4HICnkKxjIgbha80P2Ao08NkzSge58fsxiKDFYAQjHui+ZAw4dq79Ax9AOO +Iv2GS9+DUfWhrb6RF+vNuJldFzcI0rTW/z2q+XGKrUCwN3khJY5XngHfQQrdBtMK +qsoUXz/5B8g422RTbo/SdPsyYAV6HeLLeV3rdgjI1fpaW0seZKHeTXQb/HvNeuPg +qz+XV1g6Gdqa1RjDOaX7A8elVKxrYq3LBtc93FW+grBde8n7JL0zPM3DY+vJ0IJZ +INx/MmBfmtCq05FqNclvU+sj2R3N1JJOtBOjZrJHQbJhzoILou8AkxeX1A+q9OAz +1geiY5E= +=TkP3 +-----END PGP PUBLIC KEY BLOCK-----`) +} + +func testCreateValidGPGKey(t *testing.T, reqBuilder func(testing.TB, *http.Request, int) *TestResponse, expected int) { + //User2 //primary & activated + testCreateGPGKey(t, reqBuilder, expected, `-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBFmGVsMBCACuxgZ7W7rI9xN08Y4M7B8yx/6/I4Slm94+wXf8YNRvAyqj30dW +VJhyBcnfNRDLKSQp5o/hhfDkCgdqBjLa1PnHlGS3PXJc0hP/FyYPD2BFvNMPpCYS +eu3T1qKSNXm6X0XOWD2LIrdiDC8HaI9FqZVMI/srMK2CF8XCL2m67W1FuoPlWzod +5ORy0IZB7spoF0xihmcgnEGElRmdo5w/vkGH8U7Zyn9Eb57UVFeafgeskf4wqB23 +BjbMdW2YaB+yzMRwYgOnD5lnBD4uqSmvjaV9C0kxn7x+oJkkiRV8/z1cNcO+BaeQ +Akh/yTTeTzYGSc/ZOqCX1O+NOPgSeixVlqenABEBAAG0GVVzZXIyIDx1c2VyMkBl +eGFtcGxlLmNvbT6JAVQEEwEIAD4WIQRXgbSh0TtGbgRd7XI46jvO1zKYLAUCWYZW +wwIbAwUJA8JnAAULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgAAKCRA46jvO1zKYLF/e +B/91wm2KLMIQBZBA9WA2/+9rQWTo9EqgYrXN60rEzX3cYJWXZiE4DrKR1oWDGNLi +KXOCW62snvJldolBqq0ZqaKvPKzl0Y5TRqbYEc9AjUSqgRin1b+G2DevLGT4ibq+ +7ocQvz0XkASEUAgHahp0Ubiiib1521WwT/duL+AG8Gg0+DK09RfV3eX5/EOkQCKv +8cutqgsd2Smz40A8wXuJkRcipZBtrB/GkUaZ/eJdwEeSYZjEA9GWF61LJT2stvRN +HCk7C3z3pVEek1PluiFs/4VN8BG8yDzW4c0tLty4Fj3VwPqwIbB5AJbquVfhQCb4 +Eep2lm3Lc9b1OwO5N3coPJkouQENBFmGVsMBCADAGba2L6NCOE1i3WIP6CPzbdOo +N3gdTfTgccAx9fNeon9jor+3tgEjlo9/6cXiRoksOV6W4wFab/ZwWgwN6JO4CGvZ +Wi7EQwMMMp1E36YTojKQJrcA9UvMnTHulqQQ88F5E845DhzFQM3erv42QZZMBAX3 +kXCgy1GNFocl6tLUvJdEqs+VcJGGANMpmzE4WLa8KhSYnxipwuQ62JBy9R+cHyKT +OARk8znRqSu5bT3LtlrZ/HXu+6Oy4+2uCdNzZIh5J5tPS7CPA6ptl88iGVBte/CJ +7cjgJWSQqeYp2Y5QvsWAivkQ4Ww9plHbbwV0A2eaHsjjWzlUl3HoJ/snMOhBABEB +AAGJATwEGAEIACYWIQRXgbSh0TtGbgRd7XI46jvO1zKYLAUCWYZWwwIbDAUJA8Jn +AAAKCRA46jvO1zKYLBwLCACQOpeRVrwIKVaWcPMYjVHHJsGscaLKpgpARAUgbiG6 +Cbc2WI8Sm3fRwrY0VAfN+u9QwrtvxANcyB3vTgTzw7FimfhOimxiTSO8HQCfjDZF +Xly8rq+Fua7+ClWUpy21IekW41VvZYjH2sL6EVP+UcEOaGAyN53XfhaRVZPhNtZN +NKAE9N5EG3rbsZ33LzJj40rEKlzFSseAAPft8qA3IXjzFBx+PQXHMpNCagL79he6 +lqockTJ+oPmta4CF/J0U5LUr1tOZXheL3TP6m8d08gDrtn0YuGOPk87i9sJz+jR9 +uy6MA3VSB99SK9ducGmE1Jv8mcziREroz2TEGr0zPs6h +=J59D +-----END PGP PUBLIC KEY BLOCK-----`) +} + +func testCreateValidSecondaryEmailGPGKey(t *testing.T, reqBuilder func(testing.TB, *http.Request, int) *TestResponse, expected int) { + //User2 //secondary and not activated + testCreateGPGKey(t, reqBuilder, expected, `-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBFmGWN4BCAC18V4tVGO65VLCV7p14FuXJlUtZ5CuYMvgEkcOqrvRaBSW9ao4 +PGESOhJpfWpnW3QgJniYndLzPpsmdHEclEER6aZjiNgReWPOjHD5tykWocZAJqXD +eY1ym59gvVMLcfbV2yQsyR2hbJlc+dJsl16tigSEe3nwxZSw2IsW92pgEzT9JNUr +Q+mC8dw4dqY0tYmFazYUGNxufUc/twgQT/Or1aNs0az5Q6Jft4rrTRsh/S7We0VB +COKGkdcQyYgAls7HJBuPjQRi6DM9VhgBSHLAgSLyaUcZvhZBJr8Qe/q4PP3/kYDJ +wm4RMnjOLz2pFZPgtRqgcAwpmFtLrACbEB3JABEBAAG0GlVzZXIyIDx1c2VyMjFA +ZXhhbXBsZS5jb20+iQFUBBMBCAA+FiEEPOLHOjPSO42DWM57+r85c5/h6ScFAlmG +WN4CGwMFCQPCZwAFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQ+r85c5/h6Sfx +Lgf/dq64NBV8+X9an3seaLxePRviva48e4K67/wV/JxtXNO5Z/DhMGz5kHXCsG9D +CXuWYO8ehlTjEnMZ6qqdDnY+H6bQsb2OS5oPn4RwpPXslAjEKtojPAr0dDsMS2DB +dUuIm1AoOnewOVO0OFRf1EqX1bivxnN0FVMcO0m8AczfnKDaGb0y/qg/Y9JAsKqp +j5pZNMWUkntRtGySeJ4CVJMmkVKJAHsa1Qj6MKdFeid4h4y94cBJ4ZdyBxNdpQOx +ydf0doicovfeqGNO4oWzsGP4RBK2CqGPCUT+EFl20jPvMkKwOjxgqc8p0z3b2UT9 ++9bnmCGHgF/fW1HJ3iKmfFPqnLkBDQRZhljeAQgA5AirU/NJGgm19ZJYFOiHftjS +azbrPxGeD3cSqmvDPIMc1DNZGfQV5D4EVumnVbQBtL6xHFoGKz9KisUMbe4a/X2J +S8JmIphQWG0vMJX1DaZIzr2gT71MnPD7JMGsSUCh5dIKpTNTZX4w+oGPGOu0/UlL +x0448AryKwp30J2p6D4GeI0nb03n35S2lTOpnHDn1wj7Jl/8LS2fdFOdNaNHXSZe +twdSwJKhyBEiScgeHBDyKqo8zWkYoSb9eA2HiYlbVaiNtp24KP1mIEpiUdrRjWno +zauYSZGHZlOFMgF4dKWuetPiuH9m7UYZGKyMLfQ9vYFb+xcPh2bLCQHJ1OEmMQAR +AQABiQE8BBgBCAAmFiEEPOLHOjPSO42DWM57+r85c5/h6ScFAlmGWN4CGwwFCQPC +ZwAACgkQ+r85c5/h6Sfjfwf+O4WEjRdvPJLxNy7mfAGoAqDMHIwyH/tVzYgyVhnG +h/+cfRxJbGc3rpjYdr8dmvghzjEAout8uibPWaIqs63RCAPGPqgWLfxNO5c8+y8V +LZMVOTV26l2olkkdBWAuhLqKTNh6TiQva03yhOgHWj4XDvFfxICWPFXVd6t5ELpD +iApGu1OAj8JfhmzbG03Yzx+Ku7bWDxMonx3V/IDEu5LS5zrboHYDKCA53bXXghoi +Aceqql+PKrDwEjoY4bptwMHLmcjGjdCQ//Qx1neho7nZcS7xjTucY8gQuulwCyXF +y6wM+wMz8dunIG9gw4+Re6c4Rz9tX1kzxLrU7Pl21tMqfg== +=0N/9 +-----END PGP PUBLIC KEY BLOCK-----`) +} diff --git a/integrations/api_issue_label_test.go b/integrations/api_issue_label_test.go index 195ec24ca8b2..1bfaa4303e2f 100644 --- a/integrations/api_issue_label_test.go +++ b/integrations/api_issue_label_test.go @@ -54,8 +54,9 @@ func TestAPIReplaceIssueLabels(t *testing.T) { resp := session.MakeRequest(t, req, http.StatusOK) var apiLabels []*api.Label DecodeJSON(t, resp, &apiLabels) - assert.Len(t, apiLabels, 1) - assert.EqualValues(t, label.ID, apiLabels[0].ID) + if assert.Len(t, apiLabels, 1) { + assert.EqualValues(t, label.ID, apiLabels[0].ID) + } models.AssertCount(t, &models.IssueLabel{IssueID: issue.ID}, 1) models.AssertExistsAndLoadBean(t, &models.IssueLabel{IssueID: issue.ID, LabelID: label.ID}) diff --git a/integrations/explore_repos_test.go b/integrations/explore_repos_test.go new file mode 100644 index 000000000000..7408f0630282 --- /dev/null +++ b/integrations/explore_repos_test.go @@ -0,0 +1,17 @@ +// Copyright 2017 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package integrations + +import ( + "net/http" + "testing" +) + +func TestExploreRepos(t *testing.T) { + prepareTestEnv(t) + + req := NewRequest(t, "GET", "/explore/repos") + MakeRequest(t, req, http.StatusOK) +} diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/HEAD b/integrations/gitea-repositories-meta/user2/repo1.git/HEAD similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/HEAD rename to integrations/gitea-repositories-meta/user2/repo1.git/HEAD diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/config b/integrations/gitea-repositories-meta/user2/repo1.git/config similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/config rename to integrations/gitea-repositories-meta/user2/repo1.git/config diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/description b/integrations/gitea-repositories-meta/user2/repo1.git/description similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/description rename to integrations/gitea-repositories-meta/user2/repo1.git/description diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/applypatch-msg.sample b/integrations/gitea-repositories-meta/user2/repo1.git/hooks/applypatch-msg.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/applypatch-msg.sample rename to integrations/gitea-repositories-meta/user2/repo1.git/hooks/applypatch-msg.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/commit-msg.sample b/integrations/gitea-repositories-meta/user2/repo1.git/hooks/commit-msg.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/commit-msg.sample rename to integrations/gitea-repositories-meta/user2/repo1.git/hooks/commit-msg.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/post-receive b/integrations/gitea-repositories-meta/user2/repo1.git/hooks/post-receive similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/post-receive rename to integrations/gitea-repositories-meta/user2/repo1.git/hooks/post-receive diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/post-receive.d/gitea b/integrations/gitea-repositories-meta/user2/repo1.git/hooks/post-receive.d/gitea similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/post-receive.d/gitea rename to integrations/gitea-repositories-meta/user2/repo1.git/hooks/post-receive.d/gitea diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/post-update.sample b/integrations/gitea-repositories-meta/user2/repo1.git/hooks/post-update.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/post-update.sample rename to integrations/gitea-repositories-meta/user2/repo1.git/hooks/post-update.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-applypatch.sample b/integrations/gitea-repositories-meta/user2/repo1.git/hooks/pre-applypatch.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-applypatch.sample rename to integrations/gitea-repositories-meta/user2/repo1.git/hooks/pre-applypatch.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-commit.sample b/integrations/gitea-repositories-meta/user2/repo1.git/hooks/pre-commit.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-commit.sample rename to integrations/gitea-repositories-meta/user2/repo1.git/hooks/pre-commit.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-push.sample b/integrations/gitea-repositories-meta/user2/repo1.git/hooks/pre-push.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-push.sample rename to integrations/gitea-repositories-meta/user2/repo1.git/hooks/pre-push.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-rebase.sample b/integrations/gitea-repositories-meta/user2/repo1.git/hooks/pre-rebase.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-rebase.sample rename to integrations/gitea-repositories-meta/user2/repo1.git/hooks/pre-rebase.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-receive b/integrations/gitea-repositories-meta/user2/repo1.git/hooks/pre-receive similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-receive rename to integrations/gitea-repositories-meta/user2/repo1.git/hooks/pre-receive diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-receive.d/gitea b/integrations/gitea-repositories-meta/user2/repo1.git/hooks/pre-receive.d/gitea similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-receive.d/gitea rename to integrations/gitea-repositories-meta/user2/repo1.git/hooks/pre-receive.d/gitea diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/prepare-commit-msg.sample b/integrations/gitea-repositories-meta/user2/repo1.git/hooks/prepare-commit-msg.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/prepare-commit-msg.sample rename to integrations/gitea-repositories-meta/user2/repo1.git/hooks/prepare-commit-msg.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/update b/integrations/gitea-repositories-meta/user2/repo1.git/hooks/update similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/update rename to integrations/gitea-repositories-meta/user2/repo1.git/hooks/update diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/update.d/gitea b/integrations/gitea-repositories-meta/user2/repo1.git/hooks/update.d/gitea similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/update.d/gitea rename to integrations/gitea-repositories-meta/user2/repo1.git/hooks/update.d/gitea diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/update.sample b/integrations/gitea-repositories-meta/user2/repo1.git/hooks/update.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/update.sample rename to integrations/gitea-repositories-meta/user2/repo1.git/hooks/update.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/info/exclude b/integrations/gitea-repositories-meta/user2/repo1.git/info/exclude similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/info/exclude rename to integrations/gitea-repositories-meta/user2/repo1.git/info/exclude diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/info/refs b/integrations/gitea-repositories-meta/user2/repo1.git/info/refs similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/info/refs rename to integrations/gitea-repositories-meta/user2/repo1.git/info/refs diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/objects/2a/2f1d4670728a2e10049e345bd7a276468beab6 b/integrations/gitea-repositories-meta/user2/repo1.git/objects/2a/2f1d4670728a2e10049e345bd7a276468beab6 similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/objects/2a/2f1d4670728a2e10049e345bd7a276468beab6 rename to integrations/gitea-repositories-meta/user2/repo1.git/objects/2a/2f1d4670728a2e10049e345bd7a276468beab6 diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/objects/4b/4851ad51df6a7d9f25c979345979eaeb5b349f b/integrations/gitea-repositories-meta/user2/repo1.git/objects/4b/4851ad51df6a7d9f25c979345979eaeb5b349f similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/objects/4b/4851ad51df6a7d9f25c979345979eaeb5b349f rename to integrations/gitea-repositories-meta/user2/repo1.git/objects/4b/4851ad51df6a7d9f25c979345979eaeb5b349f diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/objects/65/f1bf27bc3bf70f64657658635e66094edbcb4d b/integrations/gitea-repositories-meta/user2/repo1.git/objects/65/f1bf27bc3bf70f64657658635e66094edbcb4d similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/objects/65/f1bf27bc3bf70f64657658635e66094edbcb4d rename to integrations/gitea-repositories-meta/user2/repo1.git/objects/65/f1bf27bc3bf70f64657658635e66094edbcb4d diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/objects/info/packs b/integrations/gitea-repositories-meta/user2/repo1.git/objects/info/packs similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/objects/info/packs rename to integrations/gitea-repositories-meta/user2/repo1.git/objects/info/packs diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/refs/heads/DefaultBranch b/integrations/gitea-repositories-meta/user2/repo1.git/refs/heads/DefaultBranch similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/refs/heads/DefaultBranch rename to integrations/gitea-repositories-meta/user2/repo1.git/refs/heads/DefaultBranch diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/refs/heads/develop b/integrations/gitea-repositories-meta/user2/repo1.git/refs/heads/develop similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/refs/heads/develop rename to integrations/gitea-repositories-meta/user2/repo1.git/refs/heads/develop diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/refs/heads/feature/1 b/integrations/gitea-repositories-meta/user2/repo1.git/refs/heads/feature/1 similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/refs/heads/feature/1 rename to integrations/gitea-repositories-meta/user2/repo1.git/refs/heads/feature/1 diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/refs/heads/master b/integrations/gitea-repositories-meta/user2/repo1.git/refs/heads/master similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/refs/heads/master rename to integrations/gitea-repositories-meta/user2/repo1.git/refs/heads/master diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/HEAD b/integrations/gitea-repositories-meta/user2/repo15.git/HEAD similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/HEAD rename to integrations/gitea-repositories-meta/user2/repo15.git/HEAD diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/config b/integrations/gitea-repositories-meta/user2/repo15.git/config similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/config rename to integrations/gitea-repositories-meta/user2/repo15.git/config diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/description b/integrations/gitea-repositories-meta/user2/repo15.git/description similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/description rename to integrations/gitea-repositories-meta/user2/repo15.git/description diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/applypatch-msg.sample b/integrations/gitea-repositories-meta/user2/repo15.git/hooks/applypatch-msg.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/applypatch-msg.sample rename to integrations/gitea-repositories-meta/user2/repo15.git/hooks/applypatch-msg.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/commit-msg.sample b/integrations/gitea-repositories-meta/user2/repo15.git/hooks/commit-msg.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/commit-msg.sample rename to integrations/gitea-repositories-meta/user2/repo15.git/hooks/commit-msg.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/post-receive b/integrations/gitea-repositories-meta/user2/repo15.git/hooks/post-receive similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/post-receive rename to integrations/gitea-repositories-meta/user2/repo15.git/hooks/post-receive diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/post-receive.d/gitea b/integrations/gitea-repositories-meta/user2/repo15.git/hooks/post-receive.d/gitea similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/post-receive.d/gitea rename to integrations/gitea-repositories-meta/user2/repo15.git/hooks/post-receive.d/gitea diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/post-update.sample b/integrations/gitea-repositories-meta/user2/repo15.git/hooks/post-update.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/post-update.sample rename to integrations/gitea-repositories-meta/user2/repo15.git/hooks/post-update.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/pre-applypatch.sample b/integrations/gitea-repositories-meta/user2/repo15.git/hooks/pre-applypatch.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/pre-applypatch.sample rename to integrations/gitea-repositories-meta/user2/repo15.git/hooks/pre-applypatch.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/pre-commit.sample b/integrations/gitea-repositories-meta/user2/repo15.git/hooks/pre-commit.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/pre-commit.sample rename to integrations/gitea-repositories-meta/user2/repo15.git/hooks/pre-commit.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/pre-push.sample b/integrations/gitea-repositories-meta/user2/repo15.git/hooks/pre-push.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/pre-push.sample rename to integrations/gitea-repositories-meta/user2/repo15.git/hooks/pre-push.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/pre-rebase.sample b/integrations/gitea-repositories-meta/user2/repo15.git/hooks/pre-rebase.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/pre-rebase.sample rename to integrations/gitea-repositories-meta/user2/repo15.git/hooks/pre-rebase.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/pre-receive b/integrations/gitea-repositories-meta/user2/repo15.git/hooks/pre-receive similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/pre-receive rename to integrations/gitea-repositories-meta/user2/repo15.git/hooks/pre-receive diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/pre-receive.d/gitea b/integrations/gitea-repositories-meta/user2/repo15.git/hooks/pre-receive.d/gitea similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/pre-receive.d/gitea rename to integrations/gitea-repositories-meta/user2/repo15.git/hooks/pre-receive.d/gitea diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/prepare-commit-msg.sample b/integrations/gitea-repositories-meta/user2/repo15.git/hooks/prepare-commit-msg.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/prepare-commit-msg.sample rename to integrations/gitea-repositories-meta/user2/repo15.git/hooks/prepare-commit-msg.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/update b/integrations/gitea-repositories-meta/user2/repo15.git/hooks/update similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/update rename to integrations/gitea-repositories-meta/user2/repo15.git/hooks/update diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/update.d/gitea b/integrations/gitea-repositories-meta/user2/repo15.git/hooks/update.d/gitea similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/update.d/gitea rename to integrations/gitea-repositories-meta/user2/repo15.git/hooks/update.d/gitea diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/update.sample b/integrations/gitea-repositories-meta/user2/repo15.git/hooks/update.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/hooks/update.sample rename to integrations/gitea-repositories-meta/user2/repo15.git/hooks/update.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/info/exclude b/integrations/gitea-repositories-meta/user2/repo15.git/info/exclude similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user2/repo15.git/info/exclude rename to integrations/gitea-repositories-meta/user2/repo15.git/info/exclude diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/HEAD b/integrations/gitea-repositories-meta/user2/repo16.git/HEAD similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/HEAD rename to integrations/gitea-repositories-meta/user2/repo16.git/HEAD diff --git a/integrations/gitea-repositories-meta/user2/repo16.git/config b/integrations/gitea-repositories-meta/user2/repo16.git/config new file mode 100644 index 000000000000..07d359d07cf1 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo16.git/config @@ -0,0 +1,4 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/description b/integrations/gitea-repositories-meta/user2/repo16.git/description similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/description rename to integrations/gitea-repositories-meta/user2/repo16.git/description diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/applypatch-msg.sample b/integrations/gitea-repositories-meta/user2/repo16.git/hooks/applypatch-msg.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/applypatch-msg.sample rename to integrations/gitea-repositories-meta/user2/repo16.git/hooks/applypatch-msg.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/commit-msg.sample b/integrations/gitea-repositories-meta/user2/repo16.git/hooks/commit-msg.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/commit-msg.sample rename to integrations/gitea-repositories-meta/user2/repo16.git/hooks/commit-msg.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/post-update.sample b/integrations/gitea-repositories-meta/user2/repo16.git/hooks/post-update.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/post-update.sample rename to integrations/gitea-repositories-meta/user2/repo16.git/hooks/post-update.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/pre-applypatch.sample b/integrations/gitea-repositories-meta/user2/repo16.git/hooks/pre-applypatch.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/pre-applypatch.sample rename to integrations/gitea-repositories-meta/user2/repo16.git/hooks/pre-applypatch.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/pre-commit.sample b/integrations/gitea-repositories-meta/user2/repo16.git/hooks/pre-commit.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/pre-commit.sample rename to integrations/gitea-repositories-meta/user2/repo16.git/hooks/pre-commit.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/pre-push.sample b/integrations/gitea-repositories-meta/user2/repo16.git/hooks/pre-push.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/pre-push.sample rename to integrations/gitea-repositories-meta/user2/repo16.git/hooks/pre-push.sample diff --git a/integrations/gitea-repositories-meta/user2/repo16.git/hooks/pre-rebase.sample b/integrations/gitea-repositories-meta/user2/repo16.git/hooks/pre-rebase.sample new file mode 100755 index 000000000000..9773ed4cb298 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo16.git/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up-to-date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +exit 0 + +################################################################ + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/pre-receive.sample b/integrations/gitea-repositories-meta/user2/repo16.git/hooks/pre-receive.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/pre-receive.sample rename to integrations/gitea-repositories-meta/user2/repo16.git/hooks/pre-receive.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/prepare-commit-msg.sample b/integrations/gitea-repositories-meta/user2/repo16.git/hooks/prepare-commit-msg.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/prepare-commit-msg.sample rename to integrations/gitea-repositories-meta/user2/repo16.git/hooks/prepare-commit-msg.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/update.sample b/integrations/gitea-repositories-meta/user2/repo16.git/hooks/update.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/update.sample rename to integrations/gitea-repositories-meta/user2/repo16.git/hooks/update.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/info/exclude b/integrations/gitea-repositories-meta/user2/repo16.git/info/exclude similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/info/exclude rename to integrations/gitea-repositories-meta/user2/repo16.git/info/exclude diff --git a/integrations/gitea-repositories-meta/user2/repo16.git/objects/0c/3d59dea27b97aa3cb66072745d7a2c51a7a8b1 b/integrations/gitea-repositories-meta/user2/repo16.git/objects/0c/3d59dea27b97aa3cb66072745d7a2c51a7a8b1 new file mode 100644 index 0000000000000000000000000000000000000000..e62f09ac5f190dd6f4768eca2a5bab42b1b4fb79 GIT binary patch literal 54 zcmb3j9GZ(>1ih>f}SZqu|~AJ?UGP4=(-XS4RJ K9E0CYp$Gu#L=;E> literal 0 HcmV?d00001 diff --git a/integrations/gitea-repositories-meta/user2/repo16.git/objects/24/f83a471f77579fea57bac7255d6e64e70fce1c b/integrations/gitea-repositories-meta/user2/repo16.git/objects/24/f83a471f77579fea57bac7255d6e64e70fce1c new file mode 100644 index 0000000000000000000000000000000000000000..2558be67ee7ff2c944e868565d1ece9378276f16 GIT binary patch literal 54 zcmV-60LlM&0V^p=O;s>9XD~D{Ff%bxC`wIC$xYSEO=0-S5_nwin^c*rrmgsv>gOw7 MHs1;d07dE$-5<9WwEzGB literal 0 HcmV?d00001 diff --git a/integrations/gitea-repositories-meta/user2/repo16.git/objects/27/566bd5738fc8b4e3fef3c5e72cce608537bd95 b/integrations/gitea-repositories-meta/user2/repo16.git/objects/27/566bd5738fc8b4e3fef3c5e72cce608537bd95 new file mode 100644 index 0000000000000000000000000000000000000000..6042481f4e9127be6666f4d97ab78a5b7df04c6e GIT binary patch literal 575 zcmV-F0>J%v0hN+VlbS#ffOF7K=AvW)KB=IDq);!)7bD zT+)~B`ntNStG-UkqR2QfH0=v-CtK_*mD zLvI{t(sV?!qCi82jOv<36_uKV=!#~jOp_F*%cd*~QOnO|1CDpvK=7meNb)cGh>9ww zFG*Sa1hOVUNrg~RfjCx@Fw*fhPXBKzt6~nuDn{rSdL8b!7dlKDX}IUXLmAgn7}#qiu>1UG=F?6UK*Xg5CcblYBa2y2 zdx3(zdq-Jq)K0vpVipdiB7kRGA-Wb&ggN(~g_8L+g481yCtVSKMszbLX!PRXEWX z)*8PzyN;6>Ir}!;;DVGfcGt6=&B`?F^9x6P&)xQ!;m2`waZPB@5;uR3FUz1SO(eyc z7^YKpslER7RRFKI2V4lBR`JIAms24vO9DpsH%h?g?|`p;#?RnZaxhR1x+u>`#K$%* NqAdR={042l?Z;9^8wdaZ literal 0 HcmV?d00001 diff --git a/integrations/gitea-repositories-meta/user2/repo16.git/objects/3b/2b54fe3d9a8279d5b926124dccdf279b8eff2f b/integrations/gitea-repositories-meta/user2/repo16.git/objects/3b/2b54fe3d9a8279d5b926124dccdf279b8eff2f new file mode 100644 index 000000000000..13de5951f11e --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo16.git/objects/3b/2b54fe3d9a8279d5b926124dccdf279b8eff2f @@ -0,0 +1 @@ +x+)JMU06g040031Q(JMLÉMÕËMaXbR¶”10-&ªéCüÕþË’‘Ý=À, \ No newline at end of file diff --git a/integrations/gitea-repositories-meta/user2/repo16.git/objects/45/8121ce9a6b855c9733bae62093caf3f39685de b/integrations/gitea-repositories-meta/user2/repo16.git/objects/45/8121ce9a6b855c9733bae62093caf3f39685de new file mode 100644 index 0000000000000000000000000000000000000000..7db2d33de16b23de695e12f201aee6c49e1c7983 GIT binary patch literal 26 icmb8M~P!%PM|z7bF0svZTeC~CDn zyENJ#`pPVgE5SyGx*!5hg(F~!ga#mc_Kr~%VohR+E6+nj@IGZg8w!Qw*cL99fYA`K zR{<=hJb{RNf3#KJHeQW9@87ucJJ#jJCu;Q~H7KK;v1*dXK}w8vT3WJu4?Pf;k&OwUu$D9640T>cX(uEkgt z@axBzw)+~u$c-R=bpvCYZ0z40Kme=Qewc<~E)9b^m2F4i+6&JS4i#kWeN~?gb2V3m zQp34p)Qxxb3S(JZ;=dd~4W9<<{WJ@gcwErQJ!wJDq*ZqICtYm&dZgCfO?Un@`S|T%r2Ct5 zz87v{3$=dOd#SQE0X#f%Dyl2?)|VU$=}>#KdMC?@5S^scYm0?KOE1@^wVh)+dcx_Q zsG1h-iv4hi_n906XcLA9vK}*y)coNqT9EX@ilAbHdh2mRRc3SE?q=0-y=g1|ARiMJ zNQr_1=h|-&1~ACngf9%%tmLw*u)K}inLIZm!45qgdy+ZUi%_tw<+TkBUOL6j91x=3 zjmOsIoooQSiM61I_G%0uvJ)efwGIR!=6QTTM< OG73Md1AYOeztJY^#s$Ct literal 0 HcmV?d00001 diff --git a/integrations/gitea-repositories-meta/user2/repo16.git/objects/f2/7c2b2b03dcab38beaf89b0ab4ff61f6de63441 b/integrations/gitea-repositories-meta/user2/repo16.git/objects/f2/7c2b2b03dcab38beaf89b0ab4ff61f6de63441 new file mode 100644 index 0000000000000000000000000000000000000000..7cb8b91898e9baed0332b8736fcb96c57faeecc2 GIT binary patch literal 522 zcmV+l0`>iP0fmyylA1siMzijx=)ILl15ImHCY2Ui21FDUVcY?Y4F6+`1NiiDGRZDg zxtn|IRDE?9=S$kU&O4|P^-Cwx6iSK0@tmiTOyW6-A|;76O(HT;F(;9nU=)#P79$Yd zy4O}f|C$OJe!qRJpXm_QZ&ms&Y3m;lVM&%$8A%9E9+w0j^zo`o{~OX&Ow>Q2>@BXvrFvF+e>s4)KE4T>(U#n-`OY2>TAmWkb&j!DD3tVN^1L0^Vv`Q8U)sei zn_Q~?-8i3{Lg_Ny1<;r##TYF+r7hMN-0vuw$-pUpVtbU(_Kt6w-G+Da+9E?l}Y za(WboS$atDO{xG4PURrN>(ts?ZBERWPIkq?47ji>cBO&GBMbEV-p7eoVyCI literal 0 HcmV?d00001 diff --git a/integrations/gitea-repositories-meta/user2/repo16.git/refs/heads/good-sign b/integrations/gitea-repositories-meta/user2/repo16.git/refs/heads/good-sign new file mode 100644 index 000000000000..4750a7643207 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo16.git/refs/heads/good-sign @@ -0,0 +1 @@ +f27c2b2b03dcab38beaf89b0ab4ff61f6de63441 diff --git a/integrations/gitea-repositories-meta/user2/repo16.git/refs/heads/good-sign-not-yet-validated b/integrations/gitea-repositories-meta/user2/repo16.git/refs/heads/good-sign-not-yet-validated new file mode 100644 index 000000000000..f68025f5b80f --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo16.git/refs/heads/good-sign-not-yet-validated @@ -0,0 +1 @@ +27566bd5738fc8b4e3fef3c5e72cce608537bd95 diff --git a/integrations/gitea-repositories-meta/user2/repo16.git/refs/heads/master b/integrations/gitea-repositories-meta/user2/repo16.git/refs/heads/master new file mode 100644 index 000000000000..65f9a9f714ba --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo16.git/refs/heads/master @@ -0,0 +1 @@ +69554a64c1e6030f051e5c3f94bfbd773cd6a324 diff --git a/integrations/gitea-repositories-meta/user2/repo16.git/refs/heads/not-signed b/integrations/gitea-repositories-meta/user2/repo16.git/refs/heads/not-signed new file mode 100644 index 000000000000..65f9a9f714ba --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo16.git/refs/heads/not-signed @@ -0,0 +1 @@ +69554a64c1e6030f051e5c3f94bfbd773cd6a324 diff --git a/integrations/gitea-repositories-meta/user3/repo3.git/HEAD b/integrations/gitea-repositories-meta/user3/repo3.git/HEAD new file mode 100644 index 000000000000..cb089cd89a7d --- /dev/null +++ b/integrations/gitea-repositories-meta/user3/repo3.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/config b/integrations/gitea-repositories-meta/user3/repo3.git/config similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/config rename to integrations/gitea-repositories-meta/user3/repo3.git/config diff --git a/integrations/gitea-repositories-meta/user3/repo3.git/description b/integrations/gitea-repositories-meta/user3/repo3.git/description new file mode 100644 index 000000000000..498b267a8c78 --- /dev/null +++ b/integrations/gitea-repositories-meta/user3/repo3.git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/integrations/gitea-repositories-meta/user3/repo3.git/hooks/applypatch-msg.sample b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/applypatch-msg.sample new file mode 100755 index 000000000000..a5d7b84a6734 --- /dev/null +++ b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/integrations/gitea-repositories-meta/user3/repo3.git/hooks/commit-msg.sample b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/commit-msg.sample new file mode 100755 index 000000000000..b58d1184a9d4 --- /dev/null +++ b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/post-receive b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/post-receive similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/post-receive rename to integrations/gitea-repositories-meta/user3/repo3.git/hooks/post-receive diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/post-receive.d/gitea b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/post-receive.d/gitea similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/post-receive.d/gitea rename to integrations/gitea-repositories-meta/user3/repo3.git/hooks/post-receive.d/gitea diff --git a/integrations/gitea-repositories-meta/user3/repo3.git/hooks/post-update.sample b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/post-update.sample new file mode 100755 index 000000000000..ec17ec1939b7 --- /dev/null +++ b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/integrations/gitea-repositories-meta/user3/repo3.git/hooks/pre-applypatch.sample b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/pre-applypatch.sample new file mode 100755 index 000000000000..4142082bcb93 --- /dev/null +++ b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/integrations/gitea-repositories-meta/user3/repo3.git/hooks/pre-commit.sample b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/pre-commit.sample new file mode 100755 index 000000000000..68d62d5446d9 --- /dev/null +++ b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/integrations/gitea-repositories-meta/user3/repo3.git/hooks/pre-push.sample b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/pre-push.sample new file mode 100755 index 000000000000..6187dbf4390f --- /dev/null +++ b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +z40=0000000000000000000000000000000000000000 + +while read local_ref local_sha remote_ref remote_sha +do + if [ "$local_sha" = $z40 ] + then + # Handle delete + : + else + if [ "$remote_sha" = $z40 ] + then + # New branch, examine all commits + range="$local_sha" + else + # Update to existing branch, examine new commits + range="$remote_sha..$local_sha" + fi + + # Check for WIP commit + commit=`git rev-list -n 1 --grep '^WIP' "$range"` + if [ -n "$commit" ] + then + echo >&2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/pre-rebase.sample b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/pre-rebase.sample similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/pre-rebase.sample rename to integrations/gitea-repositories-meta/user3/repo3.git/hooks/pre-rebase.sample diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/pre-receive b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/pre-receive similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/pre-receive rename to integrations/gitea-repositories-meta/user3/repo3.git/hooks/pre-receive diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/pre-receive.d/gitea b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/pre-receive.d/gitea similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/pre-receive.d/gitea rename to integrations/gitea-repositories-meta/user3/repo3.git/hooks/pre-receive.d/gitea diff --git a/integrations/gitea-repositories-meta/user3/repo3.git/hooks/pre-receive.sample b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/pre-receive.sample new file mode 100755 index 000000000000..a1fd29ec1482 --- /dev/null +++ b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/pre-receive.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/integrations/gitea-repositories-meta/user3/repo3.git/hooks/prepare-commit-msg.sample b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/prepare-commit-msg.sample new file mode 100755 index 000000000000..f093a02ec499 --- /dev/null +++ b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/prepare-commit-msg.sample @@ -0,0 +1,36 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first comments out the +# "Conflicts:" part of a merge commit. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +case "$2,$3" in + merge,) + /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; + +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$1" ;; + + *) ;; +esac + +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/update b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/update similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/update rename to integrations/gitea-repositories-meta/user3/repo3.git/hooks/update diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/update.d/gitea b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/update.d/gitea similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/hooks/update.d/gitea rename to integrations/gitea-repositories-meta/user3/repo3.git/hooks/update.d/gitea diff --git a/integrations/gitea-repositories-meta/user3/repo3.git/hooks/update.sample b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/update.sample new file mode 100755 index 000000000000..80ba94135cc3 --- /dev/null +++ b/integrations/gitea-repositories-meta/user3/repo3.git/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to block unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero="0000000000000000000000000000000000000000" +if [ "$newrev" = "$zero" ]; then + newrev_type=delete +else + newrev_type=$(git cat-file -t $newrev) +fi + +case "$refname","$newrev_type" in + refs/tags/*,commit) + # un-annotated tag + short_refname=${refname##refs/tags/} + if [ "$allowunannotated" != "true" ]; then + echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/integrations/gitea-repositories-meta/user3/repo3.git/info/exclude b/integrations/gitea-repositories-meta/user3/repo3.git/info/exclude new file mode 100644 index 000000000000..a5196d1be8fb --- /dev/null +++ b/integrations/gitea-repositories-meta/user3/repo3.git/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/objects/20/ade30d25e0ecaeec84e7f542a8456900858240 b/integrations/gitea-repositories-meta/user3/repo3.git/objects/20/ade30d25e0ecaeec84e7f542a8456900858240 similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/objects/20/ade30d25e0ecaeec84e7f542a8456900858240 rename to integrations/gitea-repositories-meta/user3/repo3.git/objects/20/ade30d25e0ecaeec84e7f542a8456900858240 diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/objects/27/74debeea6dc742cc4971a92db0e08b95b60588 b/integrations/gitea-repositories-meta/user3/repo3.git/objects/27/74debeea6dc742cc4971a92db0e08b95b60588 similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/objects/27/74debeea6dc742cc4971a92db0e08b95b60588 rename to integrations/gitea-repositories-meta/user3/repo3.git/objects/27/74debeea6dc742cc4971a92db0e08b95b60588 diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/objects/2a/47ca4b614a9f5a43abbd5ad851a54a616ffee6 b/integrations/gitea-repositories-meta/user3/repo3.git/objects/2a/47ca4b614a9f5a43abbd5ad851a54a616ffee6 similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/objects/2a/47ca4b614a9f5a43abbd5ad851a54a616ffee6 rename to integrations/gitea-repositories-meta/user3/repo3.git/objects/2a/47ca4b614a9f5a43abbd5ad851a54a616ffee6 diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/objects/2f/9b22fd3159a43b7b4e5dd806fcd544edf8716f b/integrations/gitea-repositories-meta/user3/repo3.git/objects/2f/9b22fd3159a43b7b4e5dd806fcd544edf8716f similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/objects/2f/9b22fd3159a43b7b4e5dd806fcd544edf8716f rename to integrations/gitea-repositories-meta/user3/repo3.git/objects/2f/9b22fd3159a43b7b4e5dd806fcd544edf8716f diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/objects/d5/6a3073c1dbb7b15963110a049d50cdb5db99fc b/integrations/gitea-repositories-meta/user3/repo3.git/objects/d5/6a3073c1dbb7b15963110a049d50cdb5db99fc similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/objects/d5/6a3073c1dbb7b15963110a049d50cdb5db99fc rename to integrations/gitea-repositories-meta/user3/repo3.git/objects/d5/6a3073c1dbb7b15963110a049d50cdb5db99fc diff --git a/integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/refs/heads/master b/integrations/gitea-repositories-meta/user3/repo3.git/refs/heads/master similarity index 100% rename from integrations/gitea-integration-meta/gitea-repositories/user3/repo3.git/refs/heads/master rename to integrations/gitea-repositories-meta/user3/repo3.git/refs/heads/master diff --git a/integrations/html_helper.go b/integrations/html_helper.go index 43e75db30d18..c181a25b5769 100644 --- a/integrations/html_helper.go +++ b/integrations/html_helper.go @@ -40,3 +40,13 @@ func (doc *HTMLDoc) GetInputValueByName(name string) string { func (doc *HTMLDoc) GetCSRF() string { return doc.GetInputValueByName("_csrf") } + +// AssertElement check if element by selector exists or does not exist depending on checkExists +func (doc *HTMLDoc) AssertElement(t testing.TB, selector string, checkExists bool) { + sel := doc.doc.Find(selector) + if checkExists { + assert.Equal(t, 1, sel.Length()) + } else { + assert.Equal(t, 0, sel.Length()) + } +} diff --git a/integrations/integration_test.go b/integrations/integration_test.go index 83c73ec6620d..d43f3977b83c 100644 --- a/integrations/integration_test.go +++ b/integrations/integration_test.go @@ -118,8 +118,8 @@ func initIntegrationTest() { func prepareTestEnv(t testing.TB) { assert.NoError(t, models.LoadFixtures()) - assert.NoError(t, os.RemoveAll("integrations/gitea-integration")) - assert.NoError(t, com.CopyDir("integrations/gitea-integration-meta", "integrations/gitea-integration")) + assert.NoError(t, os.RemoveAll(setting.RepoRootPath)) + assert.NoError(t, com.CopyDir("integrations/gitea-repositories-meta", setting.RepoRootPath)) } type TestSession struct { @@ -160,6 +160,13 @@ const userPassword = "password" var loginSessionCache = make(map[string]*TestSession, 10) +func emptyTestSession(t testing.TB) *TestSession { + jar, err := cookiejar.New(nil) + assert.NoError(t, err) + + return &TestSession{jar: jar} +} + func loginUser(t testing.TB, userName string) *TestSession { if session, ok := loginSessionCache[userName]; ok { return session @@ -185,13 +192,13 @@ func loginUserWithPassword(t testing.TB, userName, password string) *TestSession ch.Add("Cookie", strings.Join(resp.Headers["Set-Cookie"], ";")) cr := http.Request{Header: ch} - jar, err := cookiejar.New(nil) - assert.NoError(t, err) + session := emptyTestSession(t) + baseURL, err := url.Parse(setting.AppURL) assert.NoError(t, err) - jar.SetCookies(baseURL, cr.Cookies()) + session.jar.SetCookies(baseURL, cr.Cookies()) - return &TestSession{jar: jar} + return session } type TestResponseWriter struct { @@ -261,7 +268,8 @@ func MakeRequest(t testing.TB, req *http.Request, expectedStatus int) *TestRespo } mac.ServeHTTP(respWriter, req) if expectedStatus != NoExpectedStatus { - assert.EqualValues(t, expectedStatus, respWriter.HeaderCode) + assert.EqualValues(t, expectedStatus, respWriter.HeaderCode, + "Request URL: %s", req.URL.String()) } return &TestResponse{ HeaderCode: respWriter.HeaderCode, diff --git a/integrations/links_test.go b/integrations/links_test.go new file mode 100644 index 000000000000..bab147bdd9b1 --- /dev/null +++ b/integrations/links_test.go @@ -0,0 +1,130 @@ +// Copyright 2017 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package integrations + +import ( + "fmt" + "net/http" + "testing" + + api "code.gitea.io/sdk/gitea" +) + +func TestLinksNoLogin(t *testing.T) { + prepareTestEnv(t) + + var links = []string{ + "/explore/repos", + "/explore/repos?q=test&tab=", + "/explore/users", + "/explore/users?q=test&tab=", + "/explore/organizations", + "/explore/organizations?q=test&tab=", + "/", + "/user/sign_up", + "/user/login", + "/user/forgot_password", + "/swagger", + // TODO: follow this page and test every link + "/vendor/librejs.html", + } + + for _, link := range links { + req := NewRequest(t, "GET", link) + MakeRequest(t, req, http.StatusOK) + } +} + +func testLinksAsUser(userName string, t *testing.T) { + var links = []string{ + "/explore/repos", + "/explore/repos?q=test&tab=", + "/explore/users", + "/explore/users?q=test&tab=", + "/explore/organizations", + "/explore/organizations?q=test&tab=", + "/", + "/user/forgot_password", + "/swagger", + "/issues", + "/issues?type=your_repositories&repo=0&sort=&state=open", + "/issues?type=assigned&repo=0&sort=&state=open", + "/issues?type=created_by&repo=0&sort=&state=open", + "/issues?type=your_repositories&repo=0&sort=&state=closed", + "/issues?type=assigned&repo=0&sort=&state=closed", + "/issues?type=created_by&repo=0&sort=&state=closed", + "/pulls", + "/pulls?type=your_repositories&repo=0&sort=&state=open", + "/pulls?type=assigned&repo=0&sort=&state=open", + "/pulls?type=created_by&repo=0&sort=&state=open", + "/pulls?type=your_repositories&repo=0&sort=&state=closed", + "/pulls?type=assigned&repo=0&sort=&state=closed", + "/pulls?type=created_by&repo=0&sort=&state=closed", + "/notifications", + "/repo/create", + "/repo/migrate", + "/org/create", + "/user2", + "/user2?tab=stars", + "/user2?tab=activity", + "/user/settings", + "/user/settings/avatar", + "/user/settings/password", + "/user/settings/email", + "/user/settings/keys", + "/user/settings/applications", + "/user/settings/two_factor", + "/user/settings/account_link", + "/user/settings/organization", + "/user/settings/delete", + } + + session := loginUser(t, userName) + for _, link := range links { + req := NewRequest(t, "GET", link) + session.MakeRequest(t, req, http.StatusOK) + } + + reqAPI := NewRequestf(t, "GET", "/api/v1/users/%s/repos", userName) + respAPI := MakeRequest(t, reqAPI, http.StatusOK) + + var apiRepos []api.Repository + DecodeJSON(t, respAPI, &apiRepos) + + var repoLinks = []string{ + "", + "/issues", + "/pulls", + "/commits/master", + "/graph", + "/settings", + "/settings/collaboration", + "/settings/branches", + "/settings/hooks", + // FIXME: below links should return 200 but 404 ?? + //"/settings/hooks/git", + //"/settings/hooks/git/pre-receive", + //"/settings/hooks/git/update", + //"/settings/hooks/git/post-receive", + "/settings/keys", + "/releases", + "/releases/new", + //"/wiki/_pages", + "/wiki/_new", + } + + for _, repo := range apiRepos { + for _, link := range repoLinks { + req := NewRequest(t, "GET", fmt.Sprintf("/%s/%s%s", userName, repo.Name, link)) + session.MakeRequest(t, req, http.StatusOK) + } + } +} + +func TestLinksLogin(t *testing.T) { + prepareTestEnv(t) + + testLinksAsUser("user2", t) +} diff --git a/integrations/mysql.ini b/integrations/mysql.ini index 2818e2bf36ff..9d3d6dfce27b 100644 --- a/integrations/mysql.ini +++ b/integrations/mysql.ini @@ -3,7 +3,7 @@ RUN_MODE = prod [database] DB_TYPE = mysql -HOST = 127.0.0.1:3306 +HOST = mysql:3306 NAME = testgitea USER = root PASSWD = @@ -11,12 +11,15 @@ SSL_MODE = disable PATH = data/gitea.db [repository] -ROOT = integrations/gitea-integration/gitea-repositories +ROOT = integrations/gitea-integration-mysql/gitea-repositories + +[repository.local] +LOCAL_COPY_PATH = tmp/local-repo-mysql [server] SSH_DOMAIN = localhost -HTTP_PORT = 3000 -ROOT_URL = http://localhost:3000/ +HTTP_PORT = 3001 +ROOT_URL = http://localhost:3001/ DISABLE_SSH = false SSH_PORT = 22 LFS_START_SERVER = false diff --git a/integrations/pgsql.ini b/integrations/pgsql.ini index 43a7cc78c133..859e3250c1ba 100644 --- a/integrations/pgsql.ini +++ b/integrations/pgsql.ini @@ -3,7 +3,7 @@ RUN_MODE = prod [database] DB_TYPE = postgres -HOST = 127.0.0.1:5432 +HOST = pgsql:5432 NAME = testgitea USER = postgres PASSWD = postgres @@ -11,12 +11,15 @@ SSL_MODE = disable PATH = data/gitea.db [repository] -ROOT = integrations/gitea-integration/gitea-repositories +ROOT = integrations/gitea-integration-pgsql/gitea-repositories + +[repository.local] +LOCAL_COPY_PATH = tmp/local-repo-pgsql [server] SSH_DOMAIN = localhost -HTTP_PORT = 3000 -ROOT_URL = http://localhost:3000/ +HTTP_PORT = 3002 +ROOT_URL = http://localhost:3002/ DISABLE_SSH = false SSH_PORT = 22 LFS_START_SERVER = false @@ -55,3 +58,4 @@ LEVEL = Debug [security] INSTALL_LOCK = true SECRET_KEY = 9pCviYTWSb +INTERNAL_TOKEN = test diff --git a/integrations/pull_create_test.go b/integrations/pull_create_test.go index ee7a92ce2c55..7db1ce1ecfd0 100644 --- a/integrations/pull_create_test.go +++ b/integrations/pull_create_test.go @@ -19,7 +19,7 @@ func testPullCreate(t *testing.T, session *TestSession, user, repo, branch strin // Click the little green button to create a pull htmlDoc := NewHTMLParser(t, resp.Body) - link, exists := htmlDoc.doc.Find("button.ui.green.small.button").Parent().Attr("href") + link, exists := htmlDoc.doc.Find("button.ui.green.tiny.compact.button").Parent().Attr("href") assert.True(t, exists, "The template has changed") if branch != "master" { link = strings.Replace(link, ":master", ":"+branch, 1) diff --git a/integrations/setting_test.go b/integrations/setting_test.go new file mode 100644 index 000000000000..a8d1f01e8f9c --- /dev/null +++ b/integrations/setting_test.go @@ -0,0 +1,70 @@ +// Copyright 2017 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package integrations + +import ( + "net/http" + "testing" + + "code.gitea.io/gitea/modules/setting" + + "github.com/stretchr/testify/assert" +) + +func TestSettingShowUserEmailExplore(t *testing.T) { + prepareTestEnv(t) + + showUserEmail := setting.UI.ShowUserEmail + setting.UI.ShowUserEmail = true + + session := loginUser(t, "user2") + req := NewRequest(t, "GET", "/explore/users") + resp := session.MakeRequest(t, req, http.StatusOK) + htmlDoc := NewHTMLParser(t, resp.Body) + assert.Contains(t, + htmlDoc.doc.Find(".ui.user.list").Text(), + "user2@example.com", + ) + + setting.UI.ShowUserEmail = false + + req = NewRequest(t, "GET", "/explore/users") + resp = session.MakeRequest(t, req, http.StatusOK) + htmlDoc = NewHTMLParser(t, resp.Body) + assert.NotContains(t, + htmlDoc.doc.Find(".ui.user.list").Text(), + "user2@example.com", + ) + + setting.UI.ShowUserEmail = showUserEmail +} + +func TestSettingShowUserEmailProfile(t *testing.T) { + prepareTestEnv(t) + + showUserEmail := setting.UI.ShowUserEmail + setting.UI.ShowUserEmail = true + + session := loginUser(t, "user2") + req := NewRequest(t, "GET", "/user2") + resp := session.MakeRequest(t, req, http.StatusOK) + htmlDoc := NewHTMLParser(t, resp.Body) + assert.Contains(t, + htmlDoc.doc.Find(".user.profile").Text(), + "user2@example.com", + ) + + setting.UI.ShowUserEmail = false + + req = NewRequest(t, "GET", "/user2") + resp = session.MakeRequest(t, req, http.StatusOK) + htmlDoc = NewHTMLParser(t, resp.Body) + assert.NotContains(t, + htmlDoc.doc.Find(".user.profile").Text(), + "user2@example.com", + ) + + setting.UI.ShowUserEmail = showUserEmail +} diff --git a/integrations/signin_test.go b/integrations/signin_test.go new file mode 100644 index 000000000000..9eab5b5f03da --- /dev/null +++ b/integrations/signin_test.go @@ -0,0 +1,60 @@ +// Copyright 2017 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package integrations + +import ( + "net/http" + "strings" + "testing" + + "code.gitea.io/gitea/models" + + "github.com/Unknwon/i18n" + "github.com/stretchr/testify/assert" +) + +func testLoginFailed(t *testing.T, username, password, message string) { + session := emptyTestSession(t) + req := NewRequestWithValues(t, "POST", "/user/login", map[string]string{ + "_csrf": GetCSRF(t, session, "/user/login"), + "user_name": username, + "password": password, + }) + resp := session.MakeRequest(t, req, http.StatusOK) + + htmlDoc := NewHTMLParser(t, resp.Body) + resultMsg := htmlDoc.doc.Find(".ui.message>p").Text() + + assert.EqualValues(t, message, resultMsg) +} + +func TestSignin(t *testing.T) { + prepareTestEnv(t) + + user := models.AssertExistsAndLoadBean(t, &models.User{ID: 2}).(*models.User) + + // add new user with user2's email + user.Name = "testuser" + user.LowerName = strings.ToLower(user.Name) + user.ID = 0 + models.AssertSuccessfulInsert(t, user) + + samples := []struct { + username string + password string + message string + }{ + {username: "wrongUsername", password: "wrongPassword", message: i18n.Tr("en", "form.username_password_incorrect")}, + {username: "wrongUsername", password: "password", message: i18n.Tr("en", "form.username_password_incorrect")}, + {username: "user15", password: "wrongPassword", message: i18n.Tr("en", "form.username_password_incorrect")}, + {username: "user1@example.com", password: "wrongPassword", message: i18n.Tr("en", "form.username_password_incorrect")}, + // test for duplicate email + {username: "user2@example.com", password: "password", message: i18n.Tr("en", "form.email_been_used")}, + } + + for _, s := range samples { + testLoginFailed(t, s.username, s.password, s.message) + } +} diff --git a/integrations/sqlite.ini b/integrations/sqlite.ini index c771507a765a..ae431a0ac33a 100644 --- a/integrations/sqlite.ini +++ b/integrations/sqlite.ini @@ -3,20 +3,18 @@ RUN_MODE = prod [database] DB_TYPE = sqlite3 -HOST = 127.0.0.1:3306 -NAME = testgitea -USER = gitea -PASSWD = -SSL_MODE = disable PATH = :memory: [repository] -ROOT = integrations/gitea-integration/gitea-repositories +ROOT = integrations/gitea-integration-sqlite/gitea-repositories + +[repository.local] +LOCAL_COPY_PATH = tmp/local-repo-sqlite [server] SSH_DOMAIN = localhost -HTTP_PORT = 3000 -ROOT_URL = http://localhost:3000/ +HTTP_PORT = 3003 +ROOT_URL = http://localhost:3003/ DISABLE_SSH = false SSH_PORT = 22 LFS_START_SERVER = false diff --git a/integrations/timetracking_test.go b/integrations/timetracking_test.go new file mode 100644 index 000000000000..534bb4d61375 --- /dev/null +++ b/integrations/timetracking_test.go @@ -0,0 +1,78 @@ +// Copyright 2017 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package integrations + +import ( + "net/http" + "path" + "testing" + "time" + + "github.com/stretchr/testify/assert" +) + +func TestViewTimetrackingControls(t *testing.T) { + prepareTestEnv(t) + session := loginUser(t, "user2") + testViewTimetrackingControls(t, session, "user2", "repo1", "1", true) + //user2/repo1 +} + +func TestNotViewTimetrackingControls(t *testing.T) { + prepareTestEnv(t) + session := loginUser(t, "user5") + testViewTimetrackingControls(t, session, "user2", "repo1", "1", false) + //user2/repo1 +} +func TestViewTimetrackingControlsDisabled(t *testing.T) { + prepareTestEnv(t) + session := loginUser(t, "user2") + testViewTimetrackingControls(t, session, "user3", "repo3", "1", false) +} + +func testViewTimetrackingControls(t *testing.T, session *TestSession, user, repo, issue string, canTrackTime bool) { + req := NewRequest(t, "GET", path.Join(user, repo, "issues", issue)) + resp := session.MakeRequest(t, req, http.StatusOK) + + htmlDoc := NewHTMLParser(t, resp.Body) + + htmlDoc.AssertElement(t, ".timetrack .start-add .start", canTrackTime) + htmlDoc.AssertElement(t, ".timetrack .start-add .add-time", canTrackTime) + + req = NewRequestWithValues(t, "POST", path.Join(user, repo, "issues", issue, "times", "stopwatch", "toggle"), map[string]string{ + "_csrf": htmlDoc.GetCSRF(), + }) + if canTrackTime { + resp = session.MakeRequest(t, req, http.StatusSeeOther) + + req = NewRequest(t, "GET", RedirectURL(t, resp)) + resp = session.MakeRequest(t, req, http.StatusOK) + htmlDoc = NewHTMLParser(t, resp.Body) + + events := htmlDoc.doc.Find(".event > span.text") + assert.Contains(t, events.Last().Text(), "started working") + + htmlDoc.AssertElement(t, ".timetrack .stop-cancel .stop", true) + htmlDoc.AssertElement(t, ".timetrack .stop-cancel .cancel", true) + + // Sleep for 1 second to not get wrong order for stopping timer + time.Sleep(time.Second) + + req = NewRequestWithValues(t, "POST", path.Join(user, repo, "issues", issue, "times", "stopwatch", "toggle"), map[string]string{ + "_csrf": htmlDoc.GetCSRF(), + }) + resp = session.MakeRequest(t, req, http.StatusSeeOther) + + req = NewRequest(t, "GET", RedirectURL(t, resp)) + resp = session.MakeRequest(t, req, http.StatusOK) + htmlDoc = NewHTMLParser(t, resp.Body) + + events = htmlDoc.doc.Find(".event > span.text") + assert.Contains(t, events.Last().Text(), "stopped working") + htmlDoc.AssertElement(t, ".event .detail .octicon-clock", true) + } else { + session.MakeRequest(t, req, http.StatusNotFound) + } +} diff --git a/models/action.go b/models/action.go index 492381627673..c1429d193a11 100644 --- a/models/action.go +++ b/models/action.go @@ -15,6 +15,7 @@ import ( "unicode" "github.com/Unknwon/com" + "github.com/go-xorm/builder" "github.com/go-xorm/xorm" "code.gitea.io/git" @@ -721,6 +722,8 @@ type GetFeedsOptions struct { // GetFeeds returns actions according to the provided options func GetFeeds(opts GetFeedsOptions) ([]*Action, error) { + cond := builder.NewCond() + var repoIDs []int64 if opts.RequestedUser.IsOrganization() { env, err := opts.RequestedUser.AccessibleReposEnv(opts.RequestingUserID) @@ -730,26 +733,23 @@ func GetFeeds(opts GetFeedsOptions) ([]*Action, error) { if repoIDs, err = env.RepoIDs(1, opts.RequestedUser.NumRepos); err != nil { return nil, fmt.Errorf("GetUserRepositories: %v", err) } + + cond = cond.And(builder.In("repo_id", repoIDs)) } - actions := make([]*Action, 0, 20) - sess := x.Limit(20). - Desc("id"). - Where("user_id = ?", opts.RequestedUser.ID) + cond = cond.And(builder.Eq{"user_id": opts.RequestedUser.ID}) + if opts.OnlyPerformedBy { - sess.And("act_user_id = ?", opts.RequestedUser.ID) + cond = cond.And(builder.Eq{"act_user_id": opts.RequestedUser.ID}) } if !opts.IncludePrivate { - sess.And("is_private = ?", false) - } - if opts.RequestedUser.IsOrganization() { - sess.In("repo_id", repoIDs) + cond = cond.And(builder.Eq{"is_private": false}) } if !opts.IncludeDeleted { - sess.And("is_deleted = ?", false) - + cond = cond.And(builder.Eq{"is_deleted": false}) } - return actions, sess.Find(&actions) + actions := make([]*Action, 0, 20) + return actions, x.Limit(20).Desc("id").Where(cond).Find(&actions) } diff --git a/models/action_test.go b/models/action_test.go index 431469e73236..cecc83f86ba4 100644 --- a/models/action_test.go +++ b/models/action_test.go @@ -103,22 +103,23 @@ func TestPushCommits_ToAPIPayloadCommits(t *testing.T) { pushCommits.Len = len(pushCommits.Commits) payloadCommits := pushCommits.ToAPIPayloadCommits("/username/reponame") - assert.Len(t, payloadCommits, 2) - assert.Equal(t, "abcdef1", payloadCommits[0].ID) - assert.Equal(t, "message1", payloadCommits[0].Message) - assert.Equal(t, "/username/reponame/commit/abcdef1", payloadCommits[0].URL) - assert.Equal(t, "User Two", payloadCommits[0].Committer.Name) - assert.Equal(t, "user2", payloadCommits[0].Committer.UserName) - assert.Equal(t, "User Four", payloadCommits[0].Author.Name) - assert.Equal(t, "user4", payloadCommits[0].Author.UserName) - - assert.Equal(t, "abcdef2", payloadCommits[1].ID) - assert.Equal(t, "message2", payloadCommits[1].Message) - assert.Equal(t, "/username/reponame/commit/abcdef2", payloadCommits[1].URL) - assert.Equal(t, "User Two", payloadCommits[1].Committer.Name) - assert.Equal(t, "user2", payloadCommits[1].Committer.UserName) - assert.Equal(t, "User Two", payloadCommits[1].Author.Name) - assert.Equal(t, "user2", payloadCommits[1].Author.UserName) + if assert.Len(t, payloadCommits, 2) { + assert.Equal(t, "abcdef1", payloadCommits[0].ID) + assert.Equal(t, "message1", payloadCommits[0].Message) + assert.Equal(t, "/username/reponame/commit/abcdef1", payloadCommits[0].URL) + assert.Equal(t, "User Two", payloadCommits[0].Committer.Name) + assert.Equal(t, "user2", payloadCommits[0].Committer.UserName) + assert.Equal(t, "User Four", payloadCommits[0].Author.Name) + assert.Equal(t, "user4", payloadCommits[0].Author.UserName) + + assert.Equal(t, "abcdef2", payloadCommits[1].ID) + assert.Equal(t, "message2", payloadCommits[1].Message) + assert.Equal(t, "/username/reponame/commit/abcdef2", payloadCommits[1].URL) + assert.Equal(t, "User Two", payloadCommits[1].Committer.Name) + assert.Equal(t, "user2", payloadCommits[1].Committer.UserName) + assert.Equal(t, "User Two", payloadCommits[1].Author.Name) + assert.Equal(t, "user2", payloadCommits[1].Author.UserName) + } } func TestPushCommits_AvatarLink(t *testing.T) { @@ -313,9 +314,10 @@ func TestGetFeeds(t *testing.T) { IncludeDeleted: true, }) assert.NoError(t, err) - assert.Len(t, actions, 1) - assert.EqualValues(t, 1, actions[0].ID) - assert.EqualValues(t, user.ID, actions[0].UserID) + if assert.Len(t, actions, 1) { + assert.EqualValues(t, 1, actions[0].ID) + assert.EqualValues(t, user.ID, actions[0].UserID) + } actions, err = GetFeeds(GetFeedsOptions{ RequestedUser: user, @@ -342,8 +344,10 @@ func TestGetFeeds2(t *testing.T) { }) assert.NoError(t, err) assert.Len(t, actions, 1) - assert.EqualValues(t, 2, actions[0].ID) - assert.EqualValues(t, org.ID, actions[0].UserID) + if assert.Len(t, actions, 1) { + assert.EqualValues(t, 2, actions[0].ID) + assert.EqualValues(t, org.ID, actions[0].UserID) + } actions, err = GetFeeds(GetFeedsOptions{ RequestedUser: org, diff --git a/models/admin_test.go b/models/admin_test.go index 7fb8f1d0a0ec..b4383cb2d313 100644 --- a/models/admin_test.go +++ b/models/admin_test.go @@ -54,14 +54,16 @@ func TestNotices(t *testing.T) { notices, err := Notices(1, 2) assert.NoError(t, err) - assert.Len(t, notices, 2) - assert.Equal(t, int64(3), notices[0].ID) - assert.Equal(t, int64(2), notices[1].ID) + if assert.Len(t, notices, 2) { + assert.Equal(t, int64(3), notices[0].ID) + assert.Equal(t, int64(2), notices[1].ID) + } notices, err = Notices(2, 2) assert.NoError(t, err) - assert.Len(t, notices, 1) - assert.Equal(t, int64(1), notices[0].ID) + if assert.Len(t, notices, 1) { + assert.Equal(t, int64(1), notices[0].ID) + } } func TestDeleteNotice(t *testing.T) { diff --git a/models/error.go b/models/error.go index 74551ad8f799..37505e8aa510 100644 --- a/models/error.go +++ b/models/error.go @@ -4,9 +4,7 @@ package models -import ( - "fmt" -) +import "fmt" // ErrNameReserved represents a "reserved name" error. type ErrNameReserved struct { @@ -260,19 +258,19 @@ func (err ErrKeyNameAlreadyUsed) Error() string { return fmt.Sprintf("public key already exists [owner_id: %d, name: %s]", err.OwnerID, err.Name) } -// ErrGPGEmailNotFound represents a "ErrGPGEmailNotFound" kind of error. -type ErrGPGEmailNotFound struct { - Email string +// ErrGPGNoEmailFound represents a "ErrGPGNoEmailFound" kind of error. +type ErrGPGNoEmailFound struct { + FailedEmails []string } -// IsErrGPGEmailNotFound checks if an error is a ErrGPGEmailNotFound. -func IsErrGPGEmailNotFound(err error) bool { - _, ok := err.(ErrGPGEmailNotFound) +// IsErrGPGNoEmailFound checks if an error is a ErrGPGNoEmailFound. +func IsErrGPGNoEmailFound(err error) bool { + _, ok := err.(ErrGPGNoEmailFound) return ok } -func (err ErrGPGEmailNotFound) Error() string { - return fmt.Sprintf("failed to found email or is not confirmed : %s", err.Email) +func (err ErrGPGNoEmailFound) Error() string { + return fmt.Sprintf("none of the emails attached to the GPG key could be found: %v", err.FailedEmails) } // ErrGPGKeyParsing represents a "ErrGPGKeyParsing" kind of error. @@ -770,6 +768,50 @@ func (err ErrCommentNotExist) Error() string { return fmt.Sprintf("comment does not exist [id: %d, issue_id: %d]", err.ID, err.IssueID) } +// _________ __ __ .__ +// / _____// |_ ____ ________ _ _______ _/ |_ ____ | |__ +// \_____ \\ __\/ _ \\____ \ \/ \/ /\__ \\ __\/ ___\| | \ +// / \| | ( <_> ) |_> > / / __ \| | \ \___| Y \ +// /_______ /|__| \____/| __/ \/\_/ (____ /__| \___ >___| / +// \/ |__| \/ \/ \/ + +// ErrStopwatchNotExist represents a "Stopwatch Not Exist" kind of error. +type ErrStopwatchNotExist struct { + ID int64 +} + +// IsErrStopwatchNotExist checks if an error is a ErrStopwatchNotExist. +func IsErrStopwatchNotExist(err error) bool { + _, ok := err.(ErrStopwatchNotExist) + return ok +} + +func (err ErrStopwatchNotExist) Error() string { + return fmt.Sprintf("stopwatch does not exist [id: %d]", err.ID) +} + +// ___________ __ .______________.__ +// \__ ___/___________ ____ | | __ ____ __| _/\__ ___/|__| _____ ____ +// | | \_ __ \__ \ _/ ___\| |/ // __ \ / __ | | | | |/ \_/ __ \ +// | | | | \// __ \\ \___| <\ ___// /_/ | | | | | Y Y \ ___/ +// |____| |__| (____ /\___ >__|_ \\___ >____ | |____| |__|__|_| /\___ > +// \/ \/ \/ \/ \/ \/ \/ + +// ErrTrackedTimeNotExist represents a "TrackedTime Not Exist" kind of error. +type ErrTrackedTimeNotExist struct { + ID int64 +} + +// IsErrTrackedTimeNotExist checks if an error is a ErrTrackedTimeNotExist. +func IsErrTrackedTimeNotExist(err error) bool { + _, ok := err.(ErrTrackedTimeNotExist) + return ok +} + +func (err ErrTrackedTimeNotExist) Error() string { + return fmt.Sprintf("tracked time does not exist [id: %d]", err.ID) +} + // .____ ___. .__ // | | _____ \_ |__ ____ | | // | | \__ \ | __ \_/ __ \| | diff --git a/models/fixtures/comment.yml b/models/fixtures/comment.yml index 3292bb4848e8..34df02d28c06 100644 --- a/models/fixtures/comment.yml +++ b/models/fixtures/comment.yml @@ -5,15 +5,18 @@ issue_id: 1 # in repo_id 1 label_id: 1 content: "1" + created_unix: 946684810 - id: 2 type: 0 # comment poster_id: 3 # user not watching (see watch.yml) issue_id: 1 # in repo_id 1 content: "good work!" + created_unix: 946684811 - id: 3 type: 0 # comment poster_id: 5 # user not watching (see watch.yml) issue_id: 1 # in repo_id 1 content: "meh..." + created_unix: 946684812 diff --git a/models/fixtures/gpg_key.yml b/models/fixtures/gpg_key.yml new file mode 100644 index 000000000000..ca780a73aa0c --- /dev/null +++ b/models/fixtures/gpg_key.yml @@ -0,0 +1 @@ +[] # empty diff --git a/models/fixtures/issue.yml b/models/fixtures/issue.yml index 7bbbab26febb..b80ada1ba407 100644 --- a/models/fixtures/issue.yml +++ b/models/fixtures/issue.yml @@ -57,3 +57,16 @@ content: content5 is_closed: true is_pull: false +- + id: 6 + repo_id: 3 + index: 1 + poster_id: 1 + assignee_id: 1 + name: issue6 + content: content6 + is_closed: false + is_pull: false + num_comments: 0 + created_unix: 946684800 + updated_unix: 978307200 diff --git a/models/fixtures/repo_unit.yml b/models/fixtures/repo_unit.yml index 02daa48277b6..57cf35e19889 100644 --- a/models/fixtures/repo_unit.yml +++ b/models/fixtures/repo_unit.yml @@ -11,7 +11,7 @@ repo_id: 1 type: 2 index: 1 - config: "{}" + config: "{\"EnableTimetracker\":true,\"AllowOnlyContributorsToTrackTime\":true}" created_unix: 946684810 - @@ -51,7 +51,7 @@ repo_id: 3 type: 2 index: 1 - config: "{}" + config: "{\"EnableTimetracker\":false,\"AllowOnlyContributorsToTrackTime\":false}" created_unix: 946684810 - diff --git a/models/fixtures/repository.yml b/models/fixtures/repository.yml index b10b85cf246c..3409ba8113f6 100644 --- a/models/fixtures/repository.yml +++ b/models/fixtures/repository.yml @@ -29,7 +29,7 @@ lower_name: repo3 name: repo3 is_private: true - num_issues: 0 + num_issues: 1 num_closed_issues: 0 num_pulls: 0 num_closed_pulls: 0 @@ -176,3 +176,15 @@ lower_name: repo15 name: repo15 is_bare: true + +- + id: 16 + owner_id: 2 + lower_name: repo16 + name: repo16 + is_private: true + num_issues: 0 + num_closed_issues: 0 + num_pulls: 0 + num_closed_pulls: 0 + num_watches: 0 diff --git a/models/fixtures/stopwatch.yml b/models/fixtures/stopwatch.yml new file mode 100644 index 000000000000..397a8214d457 --- /dev/null +++ b/models/fixtures/stopwatch.yml @@ -0,0 +1,11 @@ +- + id: 1 + user_id: 1 + issue_id: 1 + created_unix: 1500988502 + +- + id: 2 + user_id: 2 + issue_id: 2 + created_unix: 1500988502 diff --git a/models/fixtures/tracked_time.yml b/models/fixtures/tracked_time.yml new file mode 100644 index 000000000000..06a71c5ad99d --- /dev/null +++ b/models/fixtures/tracked_time.yml @@ -0,0 +1,34 @@ +- + id: 1 + user_id: 1 + issue_id: 1 + time: 400 + created_unix: 946684800 + +- + id: 2 + user_id: 2 + issue_id: 2 + time: 3661 + created_unix: 946684801 + +- + id: 3 + user_id: 2 + issue_id: 2 + time: 1 + created_unix: 946684802 + +- + id: 4 + user_id: -1 + issue_id: 4 + time: 1 + created_unix: 946684802 + +- + id: 5 + user_id: 2 + issue_id: 5 + time: 1 + created_unix: 946684802 diff --git a/models/fixtures/user.yml b/models/fixtures/user.yml index b3e7864a6d4f..abd72b116810 100644 --- a/models/fixtures/user.yml +++ b/models/fixtures/user.yml @@ -26,7 +26,7 @@ is_admin: false avatar: avatar2 avatar_email: user2@example.com - num_repos: 3 + num_repos: 4 num_stars: 2 num_followers: 2 num_following: 1 diff --git a/models/gpg_key.go b/models/gpg_key.go index 8d105110022e..70dd4fbda0c3 100644 --- a/models/gpg_key.go +++ b/models/gpg_key.go @@ -208,21 +208,27 @@ func parseGPGKey(ownerID int64, e *openpgp.Entity) (*GPGKey, error) { if err != nil { return nil, err } - emails := make([]*EmailAddress, len(e.Identities)) - n := 0 + + emails := make([]*EmailAddress, 0, len(e.Identities)) for _, ident := range e.Identities { email := strings.ToLower(strings.TrimSpace(ident.UserId.Email)) for _, e := range userEmails { - if e.Email == email && e.IsActivated { - emails[n] = e + if e.Email == email { + emails = append(emails, e) break } } - if emails[n] == nil { - return nil, ErrGPGEmailNotFound{ident.UserId.Email} + } + + //In the case no email as been found + if len(emails) == 0 { + failedEmails := make([]string, 0, len(e.Identities)) + for _, ident := range e.Identities { + failedEmails = append(failedEmails, ident.UserId.Email) } - n++ + return nil, ErrGPGNoEmailFound{failedEmails} } + content, err := base64EncPubKey(pubkey) if err != nil { return nil, err @@ -380,8 +386,8 @@ func ParseCommitWithSignature(c *git.Commit) *CommitVerification { } //Find Committer account - committer, err := GetUserByEmail(c.Committer.Email) - if err != nil { //Skipping not user for commiter + committer, err := GetUserByEmail(c.Committer.Email) //This find the user by primary email or activated email so commit will not be valid if email is not + if err != nil { //Skipping not user for commiter log.Error(3, "NoCommitterAccount: %v", err) return &CommitVerification{ Verified: false, @@ -399,6 +405,18 @@ func ParseCommitWithSignature(c *git.Commit) *CommitVerification { } for _, k := range keys { + //Pre-check (& optimization) that emails attached to key can be attached to the commiter email and can validate + canValidate := false + for _, e := range k.Emails { + if e.IsActivated && e.Email == c.Committer.Email { + canValidate = true + break + } + } + if !canValidate { + continue //Skip this key + } + //Generating hash of commit hash, err := populateHash(sig.Hash, []byte(c.Signature.Payload)) if err != nil { //Skipping ailed to generate hash diff --git a/models/gpg_key_test.go b/models/gpg_key_test.go index 687e0cd5945f..6b34b10760b5 100644 --- a/models/gpg_key_test.go +++ b/models/gpg_key_test.go @@ -219,6 +219,7 @@ Q0KHb+QcycSgbDx0ZAvdIacuKvBBcbxrsmFUI4LR+oIup0G9gUc0roPvr014jYQL key, err := AddGPGKey(1, testEmailWithUpperCaseLetters) assert.NoError(t, err) - assert.Len(t, key.Emails, 1) - assert.Equal(t, "user1@example.com", key.Emails[0].Email) + if assert.Len(t, key.Emails, 1) { + assert.Equal(t, "user1@example.com", key.Emails[0].Email) + } } diff --git a/models/issue.go b/models/issue.go index 709ebc35f9fd..8723dda9134c 100644 --- a/models/issue.go +++ b/models/issue.go @@ -49,6 +49,7 @@ type Issue struct { IsPull bool `xorm:"INDEX"` // Indicates whether is a pull request or not. PullRequest *PullRequest `xorm:"-"` NumComments int + Ref string Deadline time.Time `xorm:"-"` DeadlineUnix int64 `xorm:"INDEX"` @@ -176,7 +177,7 @@ func (issue *Issue) loadAttributes(e Engine) (err error) { if issue.Milestone == nil && issue.MilestoneID > 0 { issue.Milestone, err = getMilestoneByRepoID(e, issue.RepoID, issue.MilestoneID) - if err != nil { + if err != nil && !IsErrMilestoneNotExist(err) { return fmt.Errorf("getMilestoneByRepoID [repo_id: %d, milestone_id: %d]: %v", issue.RepoID, issue.MilestoneID, err) } } @@ -1205,8 +1206,12 @@ func Issues(opts *IssuesOptions) ([]*Issue, error) { // GetParticipantsByIssueID returns all users who are participated in comments of an issue. func GetParticipantsByIssueID(issueID int64) ([]*User, error) { + return getParticipantsByIssueID(x, issueID) +} + +func getParticipantsByIssueID(e Engine, issueID int64) ([]*User, error) { userIDs := make([]int64, 0, 5) - if err := x.Table("comment").Cols("poster_id"). + if err := e.Table("comment").Cols("poster_id"). Where("issue_id = ?", issueID). And("type = ?", CommentTypeComment). Distinct("poster_id"). @@ -1218,7 +1223,7 @@ func GetParticipantsByIssueID(issueID int64) ([]*User, error) { } users := make([]*User, 0, len(userIDs)) - return users, x.In("id", userIDs).Find(&users) + return users, e.In("id", userIDs).Find(&users) } // UpdateIssueMentions extracts mentioned people from content and diff --git a/models/issue_comment.go b/models/issue_comment.go index 019fa588349e..d7755d0de94f 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -52,6 +52,14 @@ const ( CommentTypeChangeTitle // Delete Branch CommentTypeDeleteBranch + // Start a stopwatch for time tracking + CommentTypeStartTracking + // Stop a stopwatch for time tracking + CommentTypeStopTracking + // Add time manual for time tracking + CommentTypeAddTimeManual + // Cancel a stopwatch for time tracking + CommentTypeCancelTracking // Dependency added CommentTypeAddedDependency //Dependency removed @@ -307,7 +315,7 @@ func (c *Comment) MailParticipants(e Engine, opType ActionType, issue *Issue) (e case ActionReopenIssue: issue.Content = fmt.Sprintf("Reopened #%d", issue.Index) } - if err = mailIssueCommentToParticipants(issue, c.Poster, c, mentions); err != nil { + if err = mailIssueCommentToParticipants(e, issue, c.Poster, c, mentions); err != nil { log.Error(4, "mailIssueCommentToParticipants: %v", err) } @@ -718,7 +726,6 @@ func DeleteComment(comment *Comment) error { return err } } - if _, err := sess.Where("comment_id = ?", comment.ID).Cols("is_deleted").Update(&Action{IsDeleted: true}); err != nil { return err } diff --git a/models/issue_label_test.go b/models/issue_label_test.go index 33630cd90170..aef3f70c035f 100644 --- a/models/issue_label_test.go +++ b/models/issue_label_test.go @@ -98,9 +98,10 @@ func TestGetLabelsInRepoByIDs(t *testing.T) { assert.NoError(t, PrepareTestDatabase()) labels, err := GetLabelsInRepoByIDs(1, []int64{1, 2, NonexistentID}) assert.NoError(t, err) - assert.Len(t, labels, 2) - assert.EqualValues(t, 1, labels[0].ID) - assert.EqualValues(t, 2, labels[1].ID) + if assert.Len(t, labels, 2) { + assert.EqualValues(t, 1, labels[0].ID) + assert.EqualValues(t, 2, labels[1].ID) + } } func TestGetLabelsByRepoID(t *testing.T) { @@ -123,8 +124,9 @@ func TestGetLabelsByIssueID(t *testing.T) { assert.NoError(t, PrepareTestDatabase()) labels, err := GetLabelsByIssueID(1) assert.NoError(t, err) - assert.Len(t, labels, 1) - assert.EqualValues(t, 1, labels[0].ID) + if assert.Len(t, labels, 1) { + assert.EqualValues(t, 1, labels[0].ID) + } labels, err = GetLabelsByIssueID(NonexistentID) assert.NoError(t, err) diff --git a/models/issue_mail.go b/models/issue_mail.go index b9e1a69fc240..9e604a50f1b9 100644 --- a/models/issue_mail.go +++ b/models/issue_mail.go @@ -22,18 +22,18 @@ func (issue *Issue) mailSubject() string { // This function sends two list of emails: // 1. Repository watchers and users who are participated in comments. // 2. Users who are not in 1. but get mentioned in current issue/comment. -func mailIssueCommentToParticipants(issue *Issue, doer *User, comment *Comment, mentions []string) error { +func mailIssueCommentToParticipants(e Engine, issue *Issue, doer *User, comment *Comment, mentions []string) error { if !setting.Service.EnableNotifyMail { return nil } - watchers, err := GetWatchers(issue.RepoID) + watchers, err := getWatchers(e, issue.RepoID) if err != nil { - return fmt.Errorf("GetWatchers [repo_id: %d]: %v", issue.RepoID, err) + return fmt.Errorf("getWatchers [repo_id: %d]: %v", issue.RepoID, err) } - participants, err := GetParticipantsByIssueID(issue.ID) + participants, err := getParticipantsByIssueID(e, issue.ID) if err != nil { - return fmt.Errorf("GetParticipantsByIssueID [issue_id: %d]: %v", issue.ID, err) + return fmt.Errorf("getParticipantsByIssueID [issue_id: %d]: %v", issue.ID, err) } // In case the issue poster is not watching the repository, @@ -54,7 +54,7 @@ func mailIssueCommentToParticipants(issue *Issue, doer *User, comment *Comment, continue } - to, err := GetUserByID(watchers[i].UserID) + to, err := getUserByID(e, watchers[i].UserID) if err != nil { return fmt.Errorf("GetUserByID [%d]: %v", watchers[i].UserID, err) } @@ -88,7 +88,7 @@ func mailIssueCommentToParticipants(issue *Issue, doer *User, comment *Comment, tos = append(tos, mentions[i]) } - SendIssueMentionMail(issue, doer, comment, GetUserEmailsByNames(tos)) + SendIssueMentionMail(issue, doer, comment, getUserEmailsByNames(e, tos)) return nil } @@ -96,12 +96,16 @@ func mailIssueCommentToParticipants(issue *Issue, doer *User, comment *Comment, // MailParticipants sends new issue thread created emails to repository watchers // and mentioned people. func (issue *Issue) MailParticipants() (err error) { + return issue.mailParticipants(x) +} + +func (issue *Issue) mailParticipants(e Engine) (err error) { mentions := markdown.FindAllMentions(issue.Content) - if err = UpdateIssueMentions(x, issue.ID, mentions); err != nil { + if err = UpdateIssueMentions(e, issue.ID, mentions); err != nil { return fmt.Errorf("UpdateIssueMentions [%d]: %v", issue.ID, err) } - if err = mailIssueCommentToParticipants(issue, issue.Poster, nil, mentions); err != nil { + if err = mailIssueCommentToParticipants(e, issue, issue.Poster, nil, mentions); err != nil { log.Error(4, "mailIssueCommentToParticipants: %v", err) } diff --git a/models/issue_stopwatch.go b/models/issue_stopwatch.go new file mode 100644 index 000000000000..3b5b4d57f37e --- /dev/null +++ b/models/issue_stopwatch.go @@ -0,0 +1,170 @@ +// Copyright 2017 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package models + +import ( + "fmt" + "time" + + "github.com/go-xorm/xorm" +) + +// Stopwatch represents a stopwatch for time tracking. +type Stopwatch struct { + ID int64 `xorm:"pk autoincr"` + IssueID int64 `xorm:"INDEX"` + UserID int64 `xorm:"INDEX"` + Created time.Time `xorm:"-"` + CreatedUnix int64 +} + +// BeforeInsert will be invoked by XORM before inserting a record +// representing this object. +func (s *Stopwatch) BeforeInsert() { + s.CreatedUnix = time.Now().Unix() +} + +// AfterSet is invoked from XORM after setting the value of a field of this object. +func (s *Stopwatch) AfterSet(colName string, _ xorm.Cell) { + switch colName { + + case "created_unix": + s.Created = time.Unix(s.CreatedUnix, 0).Local() + } +} + +func getStopwatch(e Engine, userID, issueID int64) (sw *Stopwatch, exists bool, err error) { + sw = new(Stopwatch) + exists, err = e. + Where("user_id = ?", userID). + And("issue_id = ?", issueID). + Get(sw) + return +} + +// StopwatchExists returns true if the stopwatch exists +func StopwatchExists(userID int64, issueID int64) bool { + _, exists, _ := getStopwatch(x, userID, issueID) + return exists +} + +// HasUserStopwatch returns true if the user has a stopwatch +func HasUserStopwatch(userID int64) (exists bool, sw *Stopwatch, err error) { + sw = new(Stopwatch) + exists, err = x. + Where("user_id = ?", userID). + Get(sw) + return +} + +// CreateOrStopIssueStopwatch will create or remove a stopwatch and will log it into issue's timeline. +func CreateOrStopIssueStopwatch(user *User, issue *Issue) error { + sw, exists, err := getStopwatch(x, user.ID, issue.ID) + if err != nil { + return err + } + if exists { + // Create tracked time out of the time difference between start date and actual date + timediff := time.Now().Unix() - sw.CreatedUnix + + // Create TrackedTime + tt := &TrackedTime{ + Created: time.Now(), + IssueID: issue.ID, + UserID: user.ID, + Time: timediff, + } + + if _, err := x.Insert(tt); err != nil { + return err + } + + if _, err := CreateComment(&CreateCommentOptions{ + Doer: user, + Issue: issue, + Repo: issue.Repo, + Content: secToTime(timediff), + Type: CommentTypeStopTracking, + }); err != nil { + return err + } + if _, err := x.Delete(sw); err != nil { + return err + } + } else { + // Create stopwatch + sw = &Stopwatch{ + UserID: user.ID, + IssueID: issue.ID, + Created: time.Now(), + } + + if _, err := x.Insert(sw); err != nil { + return err + } + + if _, err := CreateComment(&CreateCommentOptions{ + Doer: user, + Issue: issue, + Repo: issue.Repo, + Type: CommentTypeStartTracking, + }); err != nil { + return err + } + } + return nil +} + +// CancelStopwatch removes the given stopwatch and logs it into issue's timeline. +func CancelStopwatch(user *User, issue *Issue) error { + sw, exists, err := getStopwatch(x, user.ID, issue.ID) + if err != nil { + return err + } + + if exists { + if _, err := x.Delete(sw); err != nil { + return err + } + + if _, err := CreateComment(&CreateCommentOptions{ + Doer: user, + Issue: issue, + Repo: issue.Repo, + Type: CommentTypeCancelTracking, + }); err != nil { + return err + } + } + return nil +} + +func secToTime(duration int64) string { + seconds := duration % 60 + minutes := (duration / (60)) % 60 + hours := duration / (60 * 60) + + var hrs string + + if hours > 0 { + hrs = fmt.Sprintf("%dh", hours) + } + if minutes > 0 { + if hours == 0 { + hrs = fmt.Sprintf("%dmin", minutes) + } else { + hrs = fmt.Sprintf("%s %dmin", hrs, minutes) + } + } + if seconds > 0 { + if hours == 0 && minutes == 0 { + hrs = fmt.Sprintf("%ds", seconds) + } else { + hrs = fmt.Sprintf("%s %ds", hrs, seconds) + } + } + + return hrs +} diff --git a/models/issue_stopwatch_test.go b/models/issue_stopwatch_test.go new file mode 100644 index 000000000000..9875066e537c --- /dev/null +++ b/models/issue_stopwatch_test.go @@ -0,0 +1,70 @@ +package models + +import ( + "testing" + "time" + + "github.com/stretchr/testify/assert" +) + +func TestCancelStopwatch(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + + user1, err := GetUserByID(1) + assert.NoError(t, err) + + issue1, err := GetIssueByID(1) + assert.NoError(t, err) + issue2, err := GetIssueByID(2) + assert.NoError(t, err) + + err = CancelStopwatch(user1, issue1) + assert.NoError(t, err) + AssertNotExistsBean(t, &Stopwatch{UserID: user1.ID, IssueID: issue1.ID}) + + _ = AssertExistsAndLoadBean(t, &Comment{Type: CommentTypeCancelTracking, PosterID: user1.ID, IssueID: issue1.ID}) + + assert.Nil(t, CancelStopwatch(user1, issue2)) +} + +func TestStopwatchExists(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + + assert.True(t, StopwatchExists(1, 1)) + assert.False(t, StopwatchExists(1, 2)) +} + +func TestHasUserStopwatch(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + + exists, sw, err := HasUserStopwatch(1) + assert.NoError(t, err) + assert.True(t, exists) + assert.Equal(t, int64(1), sw.ID) + + exists, _, err = HasUserStopwatch(3) + assert.NoError(t, err) + assert.False(t, exists) +} + +func TestCreateOrStopIssueStopwatch(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + + user2, err := GetUserByID(2) + assert.NoError(t, err) + user3, err := GetUserByID(3) + assert.NoError(t, err) + + issue1, err := GetIssueByID(1) + assert.NoError(t, err) + issue2, err := GetIssueByID(2) + assert.NoError(t, err) + + assert.NoError(t, CreateOrStopIssueStopwatch(user3, issue1)) + sw := AssertExistsAndLoadBean(t, &Stopwatch{UserID: 3, IssueID: 1}).(*Stopwatch) + assert.Equal(t, true, sw.Created.Before(time.Now())) + + assert.NoError(t, CreateOrStopIssueStopwatch(user2, issue2)) + AssertNotExistsBean(t, &Stopwatch{UserID: 2, IssueID: 2}) + AssertExistsAndLoadBean(t, &TrackedTime{UserID: 2, IssueID: 2}) +} diff --git a/models/issue_tracked_time.go b/models/issue_tracked_time.go new file mode 100644 index 000000000000..33914dbb1fae --- /dev/null +++ b/models/issue_tracked_time.go @@ -0,0 +1,117 @@ +// Copyright 2017 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package models + +import ( + "time" + + "github.com/go-xorm/builder" + "github.com/go-xorm/xorm" +) + +// TrackedTime represents a time that was spent for a specific issue. +type TrackedTime struct { + ID int64 `xorm:"pk autoincr" json:"id"` + IssueID int64 `xorm:"INDEX" json:"issue_id"` + UserID int64 `xorm:"INDEX" json:"user_id"` + Created time.Time `xorm:"-" json:"created"` + CreatedUnix int64 `json:"-"` + Time int64 `json:"time"` +} + +// BeforeInsert will be invoked by XORM before inserting a record +// representing this object. +func (t *TrackedTime) BeforeInsert() { + t.CreatedUnix = time.Now().Unix() +} + +// AfterSet is invoked from XORM after setting the value of a field of this object. +func (t *TrackedTime) AfterSet(colName string, _ xorm.Cell) { + switch colName { + case "created_unix": + t.Created = time.Unix(t.CreatedUnix, 0).Local() + } +} + +// FindTrackedTimesOptions represent the filters for tracked times. If an ID is 0 it will be ignored. +type FindTrackedTimesOptions struct { + IssueID int64 + UserID int64 + RepositoryID int64 +} + +// ToCond will convert each condition into a xorm-Cond +func (opts *FindTrackedTimesOptions) ToCond() builder.Cond { + cond := builder.NewCond() + if opts.IssueID != 0 { + cond = cond.And(builder.Eq{"issue_id": opts.IssueID}) + } + if opts.UserID != 0 { + cond = cond.And(builder.Eq{"user_id": opts.UserID}) + } + if opts.RepositoryID != 0 { + cond = cond.And(builder.Eq{"issue.repo_id": opts.RepositoryID}) + } + return cond +} + +// GetTrackedTimes returns all tracked times that fit to the given options. +func GetTrackedTimes(options FindTrackedTimesOptions) (trackedTimes []*TrackedTime, err error) { + if options.RepositoryID > 0 { + err = x.Join("INNER", "issue", "issue.id = tracked_time.issue_id").Where(options.ToCond()).Find(&trackedTimes) + return + } + err = x.Where(options.ToCond()).Find(&trackedTimes) + return +} + +// AddTime will add the given time (in seconds) to the issue +func AddTime(user *User, issue *Issue, time int64) (*TrackedTime, error) { + tt := &TrackedTime{ + IssueID: issue.ID, + UserID: user.ID, + Time: time, + } + if _, err := x.Insert(tt); err != nil { + return nil, err + } + if _, err := CreateComment(&CreateCommentOptions{ + Issue: issue, + Repo: issue.Repo, + Doer: user, + Content: secToTime(time), + Type: CommentTypeAddTimeManual, + }); err != nil { + return nil, err + } + return tt, nil +} + +// TotalTimes returns the spent time for each user by an issue +func TotalTimes(options FindTrackedTimesOptions) (map[*User]string, error) { + trackedTimes, err := GetTrackedTimes(options) + if err != nil { + return nil, err + } + //Adding total time per user ID + totalTimesByUser := make(map[int64]int64) + for _, t := range trackedTimes { + totalTimesByUser[t.UserID] += t.Time + } + + totalTimes := make(map[*User]string) + //Fetching User and making time human readable + for userID, total := range totalTimesByUser { + user, err := GetUserByID(userID) + if err != nil { + if IsErrUserNotExist(err) { + continue + } + return nil, err + } + totalTimes[user] = secToTime(total) + } + return totalTimes, nil +} diff --git a/models/issue_tracked_time_test.go b/models/issue_tracked_time_test.go new file mode 100644 index 000000000000..130e8f33e244 --- /dev/null +++ b/models/issue_tracked_time_test.go @@ -0,0 +1,103 @@ +package models + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestAddTime(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + + user3, err := GetUserByID(3) + assert.NoError(t, err) + + issue1, err := GetIssueByID(1) + assert.NoError(t, err) + + //3661 = 1h 1min 1s + trackedTime, err := AddTime(user3, issue1, 3661) + assert.NoError(t, err) + assert.Equal(t, int64(3), trackedTime.UserID) + assert.Equal(t, int64(1), trackedTime.IssueID) + assert.Equal(t, int64(3661), trackedTime.Time) + + tt := AssertExistsAndLoadBean(t, &TrackedTime{UserID: 3, IssueID: 1}).(*TrackedTime) + assert.Equal(t, tt.Time, int64(3661)) + + comment := AssertExistsAndLoadBean(t, &Comment{Type: CommentTypeAddTimeManual, PosterID: 3, IssueID: 1}).(*Comment) + assert.Equal(t, comment.Content, "1h 1min 1s") +} + +func TestGetTrackedTimes(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + + // by Issue + times, err := GetTrackedTimes(FindTrackedTimesOptions{IssueID: 1}) + assert.NoError(t, err) + assert.Len(t, times, 1) + assert.Equal(t, times[0].Time, int64(400)) + + times, err = GetTrackedTimes(FindTrackedTimesOptions{IssueID: -1}) + assert.NoError(t, err) + assert.Len(t, times, 0) + + // by User + times, err = GetTrackedTimes(FindTrackedTimesOptions{UserID: 1}) + assert.NoError(t, err) + assert.Len(t, times, 1) + assert.Equal(t, times[0].Time, int64(400)) + + times, err = GetTrackedTimes(FindTrackedTimesOptions{UserID: 3}) + assert.NoError(t, err) + assert.Len(t, times, 0) + + // by Repo + times, err = GetTrackedTimes(FindTrackedTimesOptions{RepositoryID: 2}) + assert.NoError(t, err) + assert.Len(t, times, 1) + assert.Equal(t, times[0].Time, int64(1)) + issue, err := GetIssueByID(times[0].IssueID) + assert.NoError(t, err) + assert.Equal(t, issue.RepoID, int64(2)) + + times, err = GetTrackedTimes(FindTrackedTimesOptions{RepositoryID: 1}) + assert.NoError(t, err) + assert.Len(t, times, 4) + + times, err = GetTrackedTimes(FindTrackedTimesOptions{RepositoryID: 10}) + assert.NoError(t, err) + assert.Len(t, times, 0) +} + +func TestTotalTimes(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + + total, err := TotalTimes(FindTrackedTimesOptions{IssueID: 1}) + assert.NoError(t, err) + assert.Len(t, total, 1) + for user, time := range total { + assert.Equal(t, int64(1), user.ID) + assert.Equal(t, "6min 40s", time) + } + + total, err = TotalTimes(FindTrackedTimesOptions{IssueID: 2}) + assert.NoError(t, err) + assert.Len(t, total, 1) + for user, time := range total { + assert.Equal(t, int64(2), user.ID) + assert.Equal(t, "1h 1min 2s", time) + } + + total, err = TotalTimes(FindTrackedTimesOptions{IssueID: 5}) + assert.NoError(t, err) + assert.Len(t, total, 1) + for user, time := range total { + assert.Equal(t, int64(2), user.ID) + assert.Equal(t, "1s", time) + } + + total, err = TotalTimes(FindTrackedTimesOptions{IssueID: 4}) + assert.NoError(t, err) + assert.Len(t, total, 0) +} diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 75ef8f6c5857..a796c6d6af73 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -126,6 +126,8 @@ var migrations = []Migration{ NewMigration("unescape user full names", unescapeUserFullNames), // v38 -> v39 NewMigration("remove commits and settings unit types", removeCommitsUnitType), + // v39 -> v40 + NewMigration("adds time tracking and stopwatches", addTimetracking), } // Migrate database to current version diff --git a/models/migrations/v15.go b/models/migrations/v15.go index 90fc22c6d3cd..e29067c98002 100644 --- a/models/migrations/v15.go +++ b/models/migrations/v15.go @@ -12,6 +12,7 @@ import ( // UserV15 describes the added field for User type UserV15 struct { + KeepEmailPrivate bool AllowCreateOrganization bool } diff --git a/models/migrations/v16.go b/models/migrations/v16.go index 9cd4ef4da26c..2a6d71de41cd 100644 --- a/models/migrations/v16.go +++ b/models/migrations/v16.go @@ -19,9 +19,9 @@ type RepoUnit struct { RepoID int64 `xorm:"INDEX(s)"` Type int `xorm:"INDEX(s)"` Index int - Config map[string]string `xorm:"JSON"` - CreatedUnix int64 `xorm:"INDEX CREATED"` - Created time.Time `xorm:"-"` + Config map[string]interface{} `xorm:"JSON"` + CreatedUnix int64 `xorm:"INDEX CREATED"` + Created time.Time `xorm:"-"` } // Enumerate all the unit types @@ -95,7 +95,7 @@ func addUnitsToTables(x *xorm.Engine) error { continue } - var config = make(map[string]string) + var config = make(map[string]interface{}) switch i { case V16UnitTypeExternalTracker: config["ExternalTrackerURL"] = repo.ExternalTrackerURL diff --git a/models/migrations/v39.go b/models/migrations/v39.go new file mode 100644 index 000000000000..a536cd9d6260 --- /dev/null +++ b/models/migrations/v39.go @@ -0,0 +1,65 @@ +// Copyright 2017 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package migrations + +import ( + "fmt" + "time" + + "code.gitea.io/gitea/modules/setting" + + "github.com/go-xorm/xorm" +) + +// Stopwatch see models/issue_stopwatch.go +type Stopwatch struct { + ID int64 `xorm:"pk autoincr"` + IssueID int64 `xorm:"INDEX"` + UserID int64 `xorm:"INDEX"` + Created time.Time `xorm:"-"` + CreatedUnix int64 +} + +// TrackedTime see models/issue_tracked_time.go +type TrackedTime struct { + ID int64 `xorm:"pk autoincr" json:"id"` + IssueID int64 `xorm:"INDEX" json:"issue_id"` + UserID int64 `xorm:"INDEX" json:"user_id"` + Created time.Time `xorm:"-" json:"created"` + CreatedUnix int64 `json:"-"` + Time int64 `json:"time"` +} + +func addTimetracking(x *xorm.Engine) error { + if err := x.Sync2(new(Stopwatch)); err != nil { + return fmt.Errorf("Sync2: %v", err) + } + if err := x.Sync2(new(TrackedTime)); err != nil { + return fmt.Errorf("Sync2: %v", err) + } + //Updating existing issue units + var units []*RepoUnit + x.Where("type = ?", V16UnitTypeIssues).Find(&units) + for _, unit := range units { + if unit.Config == nil { + unit.Config = make(map[string]interface{}) + } + changes := false + if _, ok := unit.Config["EnableTimetracker"]; !ok { + unit.Config["EnableTimetracker"] = setting.Service.DefaultEnableTimetracking + changes = true + } + if _, ok := unit.Config["AllowOnlyContributorsToTrackTime"]; !ok { + unit.Config["AllowOnlyContributorsToTrackTime"] = setting.Service.DefaultAllowOnlyContributorsToTrackTime + changes = true + } + if changes { + if _, err := x.Id(unit.ID).Cols("config").Update(unit); err != nil { + return err + } + } + } + return nil +} diff --git a/models/models.go b/models/models.go index 1688a636497c..0bcb3674dad7 100644 --- a/models/models.go +++ b/models/models.go @@ -31,7 +31,7 @@ import ( // Engine represents a xorm engine or session. type Engine interface { Table(tableNameOrBean interface{}) *xorm.Session - Count(interface{}) (int64, error) + Count(...interface{}) (int64, error) Decr(column string, arg ...interface{}) *xorm.Session Delete(interface{}) (int64, error) Exec(string, ...interface{}) (sql.Result, error) @@ -112,6 +112,8 @@ func init() { new(UserOpenID), new(IssueWatch), new(CommitStatus), + new(Stopwatch), + new(TrackedTime), ) gonicNames := []string{"SSL", "UID"} diff --git a/models/notification_test.go b/models/notification_test.go index 57d686a47486..2166afa2a623 100644 --- a/models/notification_test.go +++ b/models/notification_test.go @@ -29,9 +29,10 @@ func TestNotificationsForUser(t *testing.T) { statuses := []NotificationStatus{NotificationStatusRead, NotificationStatusUnread} notfs, err := NotificationsForUser(user, statuses, 1, 10) assert.NoError(t, err) - assert.Len(t, notfs, 1) - assert.EqualValues(t, 2, notfs[0].ID) - assert.EqualValues(t, user.ID, notfs[0].UserID) + if assert.Len(t, notfs, 1) { + assert.EqualValues(t, 2, notfs[0].ID) + assert.EqualValues(t, user.ID, notfs[0].UserID) + } } func TestNotification_GetRepo(t *testing.T) { diff --git a/models/org_test.go b/models/org_test.go index 801088c2e21b..07da2d56af90 100644 --- a/models/org_test.go +++ b/models/org_test.go @@ -68,18 +68,20 @@ func TestUser_GetTeams(t *testing.T) { assert.NoError(t, PrepareTestDatabase()) org := AssertExistsAndLoadBean(t, &User{ID: 3}).(*User) assert.NoError(t, org.GetTeams()) - assert.Len(t, org.Teams, 2) - assert.Equal(t, int64(1), org.Teams[0].ID) - assert.Equal(t, int64(2), org.Teams[1].ID) + if assert.Len(t, org.Teams, 2) { + assert.Equal(t, int64(1), org.Teams[0].ID) + assert.Equal(t, int64(2), org.Teams[1].ID) + } } func TestUser_GetMembers(t *testing.T) { assert.NoError(t, PrepareTestDatabase()) org := AssertExistsAndLoadBean(t, &User{ID: 3}).(*User) assert.NoError(t, org.GetMembers()) - assert.Len(t, org.Members, 2) - assert.Equal(t, int64(2), org.Members[0].ID) - assert.Equal(t, int64(4), org.Members[1].ID) + if assert.Len(t, org.Members, 2) { + assert.Equal(t, int64(2), org.Members[0].ID) + assert.Equal(t, int64(4), org.Members[1].ID) + } } func TestUser_AddMember(t *testing.T) { @@ -240,9 +242,10 @@ func TestOrganizations(t *testing.T) { testSuccess := func(opts *SearchUserOptions, expectedOrgIDs []int64) { orgs, err := Organizations(opts) assert.NoError(t, err) - assert.Len(t, orgs, len(expectedOrgIDs)) - for i, expectedOrgID := range expectedOrgIDs { - assert.EqualValues(t, expectedOrgID, orgs[i].ID) + if assert.Len(t, orgs, len(expectedOrgIDs)) { + for i, expectedOrgID := range expectedOrgIDs { + assert.EqualValues(t, expectedOrgID, orgs[i].ID) + } } } testSuccess(&SearchUserOptions{OrderBy: "id ASC", Page: 1, PageSize: 2}, @@ -307,8 +310,9 @@ func TestGetOrgsByUserID(t *testing.T) { orgs, err := GetOrgsByUserID(4, true) assert.NoError(t, err) - assert.Len(t, orgs, 1) - assert.EqualValues(t, 3, orgs[0].ID) + if assert.Len(t, orgs, 1) { + assert.EqualValues(t, 3, orgs[0].ID) + } orgs, err = GetOrgsByUserID(4, false) assert.NoError(t, err) @@ -320,8 +324,9 @@ func TestGetOwnedOrgsByUserID(t *testing.T) { orgs, err := GetOwnedOrgsByUserID(2) assert.NoError(t, err) - assert.Len(t, orgs, 1) - assert.EqualValues(t, 3, orgs[0].ID) + if assert.Len(t, orgs, 1) { + assert.EqualValues(t, 3, orgs[0].ID) + } orgs, err = GetOwnedOrgsByUserID(4) assert.NoError(t, err) @@ -333,9 +338,10 @@ func TestGetOwnedOrgsByUserIDDesc(t *testing.T) { orgs, err := GetOwnedOrgsByUserIDDesc(5, "id") assert.NoError(t, err) - assert.Len(t, orgs, 2) - assert.EqualValues(t, 7, orgs[0].ID) - assert.EqualValues(t, 6, orgs[1].ID) + if assert.Len(t, orgs, 2) { + assert.EqualValues(t, 7, orgs[0].ID) + assert.EqualValues(t, 6, orgs[1].ID) + } orgs, err = GetOwnedOrgsByUserIDDesc(4, "id") assert.NoError(t, err) @@ -347,21 +353,22 @@ func TestGetOrgUsersByUserID(t *testing.T) { orgUsers, err := GetOrgUsersByUserID(5, true) assert.NoError(t, err) - assert.Len(t, orgUsers, 2) - assert.Equal(t, OrgUser{ - ID: orgUsers[0].ID, - OrgID: 6, - UID: 5, - IsOwner: true, - IsPublic: true, - NumTeams: 1}, *orgUsers[0]) - assert.Equal(t, OrgUser{ - ID: orgUsers[1].ID, - OrgID: 7, - UID: 5, - IsOwner: true, - IsPublic: false, - NumTeams: 1}, *orgUsers[1]) + if assert.Len(t, orgUsers, 2) { + assert.Equal(t, OrgUser{ + ID: orgUsers[0].ID, + OrgID: 6, + UID: 5, + IsOwner: true, + IsPublic: true, + NumTeams: 1}, *orgUsers[0]) + assert.Equal(t, OrgUser{ + ID: orgUsers[1].ID, + OrgID: 7, + UID: 5, + IsOwner: true, + IsPublic: false, + NumTeams: 1}, *orgUsers[1]) + } publicOrgUsers, err := GetOrgUsersByUserID(5, false) assert.NoError(t, err) @@ -378,21 +385,22 @@ func TestGetOrgUsersByOrgID(t *testing.T) { orgUsers, err := GetOrgUsersByOrgID(3) assert.NoError(t, err) - assert.Len(t, orgUsers, 2) - assert.Equal(t, OrgUser{ - ID: orgUsers[0].ID, - OrgID: 3, - UID: 2, - IsOwner: true, - IsPublic: true, - NumTeams: 1}, *orgUsers[0]) - assert.Equal(t, OrgUser{ - ID: orgUsers[1].ID, - OrgID: 3, - UID: 4, - IsOwner: false, - IsPublic: false, - NumTeams: 0}, *orgUsers[1]) + if assert.Len(t, orgUsers, 2) { + assert.Equal(t, OrgUser{ + ID: orgUsers[0].ID, + OrgID: 3, + UID: 2, + IsOwner: true, + IsPublic: true, + NumTeams: 1}, *orgUsers[0]) + assert.Equal(t, OrgUser{ + ID: orgUsers[1].ID, + OrgID: 3, + UID: 4, + IsOwner: false, + IsPublic: false, + NumTeams: 0}, *orgUsers[1]) + } orgUsers, err = GetOrgUsersByOrgID(NonexistentID) assert.NoError(t, err) diff --git a/models/pull_test.go b/models/pull_test.go index 86c71f565884..c8eb033aa51a 100644 --- a/models/pull_test.go +++ b/models/pull_test.go @@ -65,9 +65,10 @@ func TestPullRequestsNewest(t *testing.T) { }) assert.NoError(t, err) assert.Equal(t, int64(2), count) - assert.Len(t, prs, 2) - assert.Equal(t, int64(2), prs[0].ID) - assert.Equal(t, int64(1), prs[1].ID) + if assert.Len(t, prs, 2) { + assert.Equal(t, int64(2), prs[0].ID) + assert.Equal(t, int64(1), prs[1].ID) + } } func TestPullRequestsOldest(t *testing.T) { @@ -80,9 +81,10 @@ func TestPullRequestsOldest(t *testing.T) { }) assert.NoError(t, err) assert.Equal(t, int64(2), count) - assert.Len(t, prs, 2) - assert.Equal(t, int64(1), prs[0].ID) - assert.Equal(t, int64(2), prs[1].ID) + if assert.Len(t, prs, 2) { + assert.Equal(t, int64(1), prs[0].ID) + assert.Equal(t, int64(2), prs[1].ID) + } } func TestGetUnmergedPullRequest(t *testing.T) { diff --git a/models/repo.go b/models/repo.go index 0701d33c1571..7da788361935 100644 --- a/models/repo.go +++ b/models/repo.go @@ -1,4 +1,5 @@ // Copyright 2014 The Gogs Authors. All rights reserved. +// Copyright 2017 The Gitea Authors. All rights reserved. // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. @@ -31,8 +32,8 @@ import ( "github.com/Unknwon/cae/zip" "github.com/Unknwon/com" "github.com/go-xorm/xorm" - version "github.com/mcuadros/go-version" - ini "gopkg.in/ini.v1" + "github.com/mcuadros/go-version" + "gopkg.in/ini.v1" ) const ( @@ -193,7 +194,7 @@ type Repository struct { NumMilestones int `xorm:"NOT NULL DEFAULT 0"` NumClosedMilestones int `xorm:"NOT NULL DEFAULT 0"` NumOpenMilestones int `xorm:"-"` - NumTags int `xorm:"-"` + NumReleases int `xorm:"-"` IsPrivate bool `xorm:"INDEX"` IsBare bool `xorm:"INDEX"` @@ -827,6 +828,8 @@ func (repo *Repository) cloneLink(isWiki bool) *CloneLink { cl := new(CloneLink) if setting.SSH.Port != 22 { cl.SSH = fmt.Sprintf("ssh://%s@%s:%d/%s/%s.git", setting.RunUser, setting.SSH.Domain, setting.SSH.Port, repo.Owner.Name, repoName) + } else if setting.Repository.UseCompatSSHURI { + cl.SSH = fmt.Sprintf("ssh://%s@%s/%s/%s.git", setting.RunUser, setting.SSH.Domain, repo.Owner.Name, repoName) } else { cl.SSH = fmt.Sprintf("%s@%s:%s/%s.git", setting.RunUser, setting.SSH.Domain, repo.Owner.Name, repoName) } @@ -868,8 +871,8 @@ func wikiRemoteURL(remote string) string { } // MigrateRepository migrates a existing repository from other project hosting. -func MigrateRepository(u *User, opts MigrateRepoOptions) (*Repository, error) { - repo, err := CreateRepository(u, CreateRepoOptions{ +func MigrateRepository(doer, u *User, opts MigrateRepoOptions) (*Repository, error) { + repo, err := CreateRepository(doer, u, CreateRepoOptions{ Name: opts.Name, Description: opts.Description, IsPrivate: opts.IsPrivate, @@ -1235,7 +1238,7 @@ func IsUsableRepoName(name string) error { return isUsableName(reservedRepoNames, reservedRepoPatterns, name) } -func createRepository(e *xorm.Session, u *User, repo *Repository) (err error) { +func createRepository(e *xorm.Session, doer, u *User, repo *Repository) (err error) { if err = IsUsableRepoName(repo.Name); err != nil { return err } @@ -1257,11 +1260,21 @@ func createRepository(e *xorm.Session, u *User, repo *Repository) (err error) { // insert units for repo var units = make([]RepoUnit, 0, len(defaultRepoUnits)) for i, tp := range defaultRepoUnits { - units = append(units, RepoUnit{ - RepoID: repo.ID, - Type: tp, - Index: i, - }) + if tp == UnitTypeIssues { + units = append(units, RepoUnit{ + RepoID: repo.ID, + Type: tp, + Index: i, + Config: &IssuesConfig{EnableTimetracker: setting.Service.DefaultEnableTimetracking, AllowOnlyContributorsToTrackTime: setting.Service.DefaultAllowOnlyContributorsToTrackTime}, + }) + } else { + units = append(units, RepoUnit{ + RepoID: repo.ID, + Type: tp, + Index: i, + }) + } + } if _, err = e.Insert(&units); err != nil { @@ -1282,7 +1295,15 @@ func createRepository(e *xorm.Session, u *User, repo *Repository) (err error) { return fmt.Errorf("getOwnerTeam: %v", err) } else if err = t.addRepository(e, repo); err != nil { return fmt.Errorf("addRepository: %v", err) + } else if err = prepareWebhooks(e, repo, HookEventRepository, &api.RepositoryPayload{ + Action: api.HookRepoCreated, + Repository: repo.APIFormat(AccessModeOwner), + Organization: u.APIFormat(), + Sender: doer.APIFormat(), + }); err != nil { + return fmt.Errorf("prepareWebhooks: %v", err) } + go HookQueue.Add(repo.ID) } else { // Organization automatically called this in addRepository method. if err = repo.recalculateAccesses(e); err != nil { @@ -1299,8 +1320,8 @@ func createRepository(e *xorm.Session, u *User, repo *Repository) (err error) { return nil } -// CreateRepository creates a repository for given user or organization. -func CreateRepository(u *User, opts CreateRepoOptions) (_ *Repository, err error) { +// CreateRepository creates a repository for the user/organization u. +func CreateRepository(doer, u *User, opts CreateRepoOptions) (_ *Repository, err error) { if !u.CanCreateRepo() { return nil, ErrReachLimitOfRepo{u.MaxRepoCreation} } @@ -1320,7 +1341,7 @@ func CreateRepository(u *User, opts CreateRepoOptions) (_ *Repository, err error return nil, err } - if err = createRepository(sess, u, repo); err != nil { + if err = createRepository(sess, doer, u, repo); err != nil { return nil, err } @@ -1656,7 +1677,7 @@ func UpdateRepositoryUnits(repo *Repository, units []RepoUnit) (err error) { } // DeleteRepository deletes a repository for a user or organization. -func DeleteRepository(uid, repoID int64) error { +func DeleteRepository(doer *User, uid, repoID int64) error { // In case is a organization. org, err := GetUserByID(uid) if err != nil { @@ -1814,6 +1835,18 @@ func DeleteRepository(uid, repoID int64) error { return fmt.Errorf("Commit: %v", err) } + if org.IsOrganization() { + if err = PrepareWebhooks(repo, HookEventRepository, &api.RepositoryPayload{ + Action: api.HookRepoDeleted, + Repository: repo.APIFormat(AccessModeOwner), + Organization: org.APIFormat(), + Sender: doer.APIFormat(), + }); err != nil { + return err + } + go HookQueue.Add(repo.ID) + } + return nil } @@ -2007,7 +2040,7 @@ func gatherMissingRepoRecords() ([]*Repository, error) { } // DeleteMissingRepositories deletes all repository records that lost Git files. -func DeleteMissingRepositories() error { +func DeleteMissingRepositories(doer *User) error { repos, err := gatherMissingRepoRecords() if err != nil { return fmt.Errorf("gatherMissingRepoRecords: %v", err) @@ -2019,7 +2052,7 @@ func DeleteMissingRepositories() error { for _, repo := range repos { log.Trace("Deleting %d/%d...", repo.OwnerID, repo.ID) - if err := DeleteRepository(repo.OwnerID, repo.ID); err != nil { + if err := DeleteRepository(doer, repo.OwnerID, repo.ID); err != nil { if err2 := CreateRepositoryNotice(fmt.Sprintf("DeleteRepository [%d]: %v", repo.ID, err)); err2 != nil { return fmt.Errorf("CreateRepositoryNotice: %v", err) } @@ -2259,7 +2292,7 @@ func HasForkedRepo(ownerID, repoID int64) (*Repository, bool) { } // ForkRepository forks a repository -func ForkRepository(u *User, oldRepo *Repository, name, desc string) (_ *Repository, err error) { +func ForkRepository(doer, u *User, oldRepo *Repository, name, desc string) (_ *Repository, err error) { forkedRepo, err := oldRepo.GetUserFork(u.ID) if err != nil { return nil, err @@ -2289,7 +2322,7 @@ func ForkRepository(u *User, oldRepo *Repository, name, desc string) (_ *Reposit return nil, err } - if err = createRepository(sess, u, repo); err != nil { + if err = createRepository(sess, doer, u, repo); err != nil { return nil, err } diff --git a/models/repo_editor.go b/models/repo_editor.go index 720e07162589..692fe8c51b1b 100644 --- a/models/repo_editor.go +++ b/models/repo_editor.go @@ -155,27 +155,29 @@ func (repo *Repository) UpdateRepoFile(doer *User, opts UpdateRepoFileOptions) ( } // Simulate push event. - pushCommits := &PushCommits{ - Len: 1, - Commits: []*PushCommit{CommitToPushCommit(commit)}, - } oldCommitID := opts.LastCommitID if opts.NewBranch != opts.OldBranch { oldCommitID = git.EmptySHA } - if err := CommitRepoAction(CommitRepoActionOptions{ - PusherName: doer.Name, - RepoOwnerID: repo.MustOwner().ID, - RepoName: repo.Name, - RefFullName: git.BranchPrefix + opts.NewBranch, - OldCommitID: oldCommitID, - NewCommitID: commit.ID.String(), - Commits: pushCommits, - }); err != nil { - log.Error(4, "CommitRepoAction: %v", err) - return nil - } + if err = repo.GetOwner(); err != nil { + return fmt.Errorf("GetOwner: %v", err) + } + err = PushUpdate( + opts.NewBranch, + PushUpdateOptions{ + PusherID: doer.ID, + PusherName: doer.Name, + RepoUserName: repo.Owner.Name, + RepoName: repo.Name, + RefFullName: git.BranchPrefix + opts.NewBranch, + OldCommitID: oldCommitID, + NewCommitID: commit.ID.String(), + }, + ) + if err != nil { + return fmt.Errorf("PushUpdate: %v", err) + } return nil } @@ -295,23 +297,29 @@ func (repo *Repository) DeleteRepoFile(doer *User, opts DeleteRepoFileOptions) ( } // Simulate push event. - pushCommits := &PushCommits{ - Len: 1, - Commits: []*PushCommit{CommitToPushCommit(commit)}, - } - if err := CommitRepoAction(CommitRepoActionOptions{ - PusherName: doer.Name, - RepoOwnerID: repo.MustOwner().ID, - RepoName: repo.Name, - RefFullName: git.BranchPrefix + opts.NewBranch, - OldCommitID: opts.LastCommitID, - NewCommitID: commit.ID.String(), - Commits: pushCommits, - }); err != nil { - log.Error(4, "CommitRepoAction: %v", err) - return nil + oldCommitID := opts.LastCommitID + if opts.NewBranch != opts.OldBranch { + oldCommitID = git.EmptySHA } + if err = repo.GetOwner(); err != nil { + return fmt.Errorf("GetOwner: %v", err) + } + err = PushUpdate( + opts.NewBranch, + PushUpdateOptions{ + PusherID: doer.ID, + PusherName: doer.Name, + RepoUserName: repo.Owner.Name, + RepoName: repo.Name, + RefFullName: git.BranchPrefix + opts.NewBranch, + OldCommitID: oldCommitID, + NewCommitID: commit.ID.String(), + }, + ) + if err != nil { + return fmt.Errorf("PushUpdate: %v", err) + } return nil } @@ -534,21 +542,28 @@ func (repo *Repository) UploadRepoFiles(doer *User, opts UploadRepoFileOptions) } // Simulate push event. - pushCommits := &PushCommits{ - Len: 1, - Commits: []*PushCommit{CommitToPushCommit(commit)}, - } - if err := CommitRepoAction(CommitRepoActionOptions{ - PusherName: doer.Name, - RepoOwnerID: repo.MustOwner().ID, - RepoName: repo.Name, - RefFullName: git.BranchPrefix + opts.NewBranch, - OldCommitID: opts.LastCommitID, - NewCommitID: commit.ID.String(), - Commits: pushCommits, - }); err != nil { - log.Error(4, "CommitRepoAction: %v", err) - return nil + oldCommitID := opts.LastCommitID + if opts.NewBranch != opts.OldBranch { + oldCommitID = git.EmptySHA + } + + if err = repo.GetOwner(); err != nil { + return fmt.Errorf("GetOwner: %v", err) + } + err = PushUpdate( + opts.NewBranch, + PushUpdateOptions{ + PusherID: doer.ID, + PusherName: doer.Name, + RepoUserName: repo.Owner.Name, + RepoName: repo.Name, + RefFullName: git.BranchPrefix + opts.NewBranch, + OldCommitID: oldCommitID, + NewCommitID: commit.ID.String(), + }, + ) + if err != nil { + return fmt.Errorf("PushUpdate: %v", err) } return DeleteUploads(uploads...) diff --git a/models/repo_issue.go b/models/repo_issue.go new file mode 100644 index 000000000000..10356d2c982e --- /dev/null +++ b/models/repo_issue.go @@ -0,0 +1,34 @@ +// Copyright 2017 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package models + +import "code.gitea.io/gitea/modules/setting" + +// ___________.__ ___________ __ +// \__ ___/|__| _____ ___\__ ___/___________ ____ | | __ ___________ +// | | | |/ \_/ __ \| | \_ __ \__ \ _/ ___\| |/ // __ \_ __ \ +// | | | | Y Y \ ___/| | | | \// __ \\ \___| <\ ___/| | \/ +// |____| |__|__|_| /\___ >____| |__| (____ /\___ >__|_ \\___ >__| +// \/ \/ \/ \/ \/ \/ + +// IsTimetrackerEnabled returns whether or not the timetracker is enabled. It returns the default value from config if an error occurs. +func (repo *Repository) IsTimetrackerEnabled() bool { + var u *RepoUnit + var err error + if u, err = repo.GetUnit(UnitTypeIssues); err != nil { + return setting.Service.DefaultEnableTimetracking + } + return u.IssuesConfig().EnableTimetracker +} + +// AllowOnlyContributorsToTrackTime returns value of IssuesConfig or the default value +func (repo *Repository) AllowOnlyContributorsToTrackTime() bool { + var u *RepoUnit + var err error + if u, err = repo.GetUnit(UnitTypeIssues); err != nil { + return setting.Service.DefaultAllowOnlyContributorsToTrackTime + } + return u.IssuesConfig().AllowOnlyContributorsToTrackTime +} diff --git a/models/repo_list.go b/models/repo_list.go index 2158cfe676a5..15e6144d0636 100644 --- a/models/repo_list.go +++ b/models/repo_list.go @@ -9,7 +9,6 @@ import ( "strings" "github.com/go-xorm/builder" - "github.com/go-xorm/xorm" ) // RepositoryList contains a list of repositories @@ -98,13 +97,14 @@ type SearchRepoOptions struct { // Owner in we search search // // in: query - OwnerID int64 `json:"uid"` - Searcher *User `json:"-"` //ID of the person who's seeking - OrderBy string `json:"-"` - Private bool `json:"-"` // Include private repositories in results - Starred bool `json:"-"` - Page int `json:"-"` - IsProfile bool `json:"-"` + OwnerID int64 `json:"uid"` + Searcher *User `json:"-"` //ID of the person who's seeking + OrderBy string `json:"-"` + Private bool `json:"-"` // Include private repositories in results + Collaborate bool `json:"-"` // Include collaborative repositories + Starred bool `json:"-"` + Page int `json:"-"` + IsProfile bool `json:"-"` // Limit of result // // maximum: setting.ExplorePagingNum @@ -115,69 +115,73 @@ type SearchRepoOptions struct { // SearchRepositoryByName takes keyword and part of repository name to search, // it returns results in given range and number of total results. func SearchRepositoryByName(opts *SearchRepoOptions) (repos RepositoryList, count int64, err error) { - var ( - sess *xorm.Session - cond = builder.NewCond() - ) - - opts.Keyword = strings.ToLower(opts.Keyword) - + var cond = builder.NewCond() if opts.Page <= 0 { opts.Page = 1 } - repos = make([]*Repository, 0, opts.PageSize) - + var starJoin bool if opts.Starred && opts.OwnerID > 0 { cond = builder.Eq{ "star.uid": opts.OwnerID, } + starJoin = true + } + + opts.Keyword = strings.ToLower(opts.Keyword) + if opts.Keyword != "" { + cond = cond.And(builder.Like{"lower_name", opts.Keyword}) } - cond = cond.And(builder.Like{"lower_name", opts.Keyword}) // Append conditions if !opts.Starred && opts.OwnerID > 0 { - cond = cond.And(builder.Eq{"owner_id": opts.OwnerID}) + var searcherReposCond builder.Cond = builder.Eq{"owner_id": opts.OwnerID} + if opts.Searcher != nil { + var ownerIds []int64 + + ownerIds = append(ownerIds, opts.Searcher.ID) + err = opts.Searcher.GetOrganizations(true) + + if err != nil { + return nil, 0, fmt.Errorf("Organization: %v", err) + } + + for _, org := range opts.Searcher.Orgs { + ownerIds = append(ownerIds, org.ID) + } + + searcherReposCond = searcherReposCond.Or(builder.In("owner_id", ownerIds)) + if opts.Collaborate { + searcherReposCond = searcherReposCond.Or(builder.Expr("id IN (SELECT repo_id FROM `access` WHERE access.user_id = ? AND owner_id != ?)", + opts.Searcher.ID, opts.Searcher.ID)) + } + } + cond = cond.And(searcherReposCond) } + if !opts.Private { cond = cond.And(builder.Eq{"is_private": false}) } - if opts.Searcher != nil { - var ownerIds []int64 - - ownerIds = append(ownerIds, opts.Searcher.ID) - err = opts.Searcher.GetOrganizations(true) - - if err != nil { - return nil, 0, fmt.Errorf("Organization: %v", err) - } - - for _, org := range opts.Searcher.Orgs { - ownerIds = append(ownerIds, org.ID) - } - - cond = cond.Or(builder.And(builder.Like{"lower_name", opts.Keyword}, builder.In("owner_id", ownerIds))) - } - if len(opts.OrderBy) == 0 { opts.OrderBy = "name ASC" } - if opts.Starred && opts.OwnerID > 0 { - sess = x. - Join("INNER", "star", "star.repo_id = repository.id"). - Where(cond) - count, err = x. + sess := x.NewSession() + defer sess.Close() + + if starJoin { + count, err = sess. Join("INNER", "star", "star.repo_id = repository.id"). Where(cond). Count(new(Repository)) if err != nil { return nil, 0, fmt.Errorf("Count: %v", err) } + + sess.Join("INNER", "star", "star.repo_id = repository.id") } else { - sess = x.Where(cond) - count, err = x. + count, err = sess. Where(cond). Count(new(Repository)) if err != nil { @@ -185,7 +189,9 @@ func SearchRepositoryByName(opts *SearchRepoOptions) (repos RepositoryList, coun } } + repos = make([]*Repository, 0, opts.PageSize) if err = sess. + Where(cond). Limit(opts.PageSize, (opts.Page-1)*opts.PageSize). OrderBy(opts.OrderBy). Find(&repos); err != nil { @@ -193,7 +199,7 @@ func SearchRepositoryByName(opts *SearchRepoOptions) (repos RepositoryList, coun } if !opts.IsProfile { - if err = repos.loadAttributes(x); err != nil { + if err = repos.loadAttributes(sess); err != nil { return nil, 0, fmt.Errorf("LoadAttributes: %v", err) } } diff --git a/models/repo_list_test.go b/models/repo_list_test.go index 1fbfa935e9e4..8ac0d804892d 100644 --- a/models/repo_list_test.go +++ b/models/repo_list_test.go @@ -23,7 +23,9 @@ func TestSearchRepositoryByName(t *testing.T) { assert.NotNil(t, repos) assert.NoError(t, err) - assert.Equal(t, "test_repo_12", repos[0].Name) + if assert.Len(t, repos, 1) { + assert.Equal(t, "test_repo_12", repos[0].Name) + } assert.Equal(t, int64(1), count) repos, count, err = SearchRepositoryByName(&SearchRepoOptions{ @@ -42,18 +44,22 @@ func TestSearchRepositoryByName(t *testing.T) { Keyword: "repo_13", Page: 1, PageSize: 10, + Private: true, Searcher: &User{ID: 14}, }) assert.NotNil(t, repos) assert.NoError(t, err) - assert.Equal(t, "test_repo_13", repos[0].Name) + if assert.Len(t, repos, 1) { + assert.Equal(t, "test_repo_13", repos[0].Name) + } assert.Equal(t, int64(1), count) repos, count, err = SearchRepositoryByName(&SearchRepoOptions{ Keyword: "test_repo", Page: 1, PageSize: 10, + Private: true, Searcher: &User{ID: 14}, }) diff --git a/models/repo_test.go b/models/repo_test.go index 4b6fd440aaa9..c1eb4e2a79f7 100644 --- a/models/repo_test.go +++ b/models/repo_test.go @@ -118,13 +118,12 @@ func TestGetUserFork(t *testing.T) { func TestForkRepository(t *testing.T) { assert.NoError(t, PrepareTestDatabase()) - // User13 has repo 11 forked from repo10 - repo, err := GetRepositoryByID(10) - assert.NoError(t, err) - assert.NotNil(t, repo) + // user 13 has already forked repo10 + user := AssertExistsAndLoadBean(t, &User{ID: 13}).(*User) + repo := AssertExistsAndLoadBean(t, &Repository{ID: 10}).(*Repository) - repo, err = ForkRepository(&User{ID: 13}, repo, "test", "test") - assert.Nil(t, repo) + fork, err := ForkRepository(user, user, repo, "test", "test") + assert.Nil(t, fork) assert.Error(t, err) assert.True(t, IsErrRepoAlreadyExist(err)) } diff --git a/models/repo_unit.go b/models/repo_unit.go index ba3bf24216d9..b543a3921e2f 100644 --- a/models/repo_unit.go +++ b/models/repo_unit.go @@ -70,18 +70,35 @@ func (cfg *ExternalTrackerConfig) ToDB() ([]byte, error) { return json.Marshal(cfg) } +// IssuesConfig describes issues config +type IssuesConfig struct { + EnableTimetracker bool + AllowOnlyContributorsToTrackTime bool +} + +// FromDB fills up a IssuesConfig from serialized format. +func (cfg *IssuesConfig) FromDB(bs []byte) error { + return json.Unmarshal(bs, &cfg) +} + +// ToDB exports a IssuesConfig to a serialized format. +func (cfg *IssuesConfig) ToDB() ([]byte, error) { + return json.Marshal(cfg) +} + // BeforeSet is invoked from XORM before setting the value of a field of this object. func (r *RepoUnit) BeforeSet(colName string, val xorm.Cell) { switch colName { case "type": switch UnitType(Cell2Int64(val)) { - case UnitTypeCode, UnitTypeIssues, UnitTypePullRequests, UnitTypeReleases, UnitTypeIssueDependencies, - UnitTypeWiki: + case UnitTypeCode, UnitTypePullRequests, UnitTypeReleases, UnitTypeIssueDependencies, UnitTypeWiki: r.Config = new(UnitConfig) case UnitTypeExternalWiki: r.Config = new(ExternalWikiConfig) case UnitTypeExternalTracker: r.Config = new(ExternalTrackerConfig) + case UnitTypeIssues: + r.Config = new(IssuesConfig) default: panic("unrecognized repo unit type: " + com.ToStr(*val)) } @@ -106,11 +123,6 @@ func (r *RepoUnit) CodeConfig() *UnitConfig { return r.Config.(*UnitConfig) } -// IssuesConfig returns config for UnitTypeIssues -func (r *RepoUnit) IssuesConfig() *UnitConfig { - return r.Config.(*UnitConfig) -} - // PullRequestsConfig returns config for UnitTypePullRequests func (r *RepoUnit) PullRequestsConfig() *UnitConfig { return r.Config.(*UnitConfig) @@ -126,6 +138,11 @@ func (r *RepoUnit) ExternalWikiConfig() *ExternalWikiConfig { return r.Config.(*ExternalWikiConfig) } +// IssuesConfig returns config for UnitTypeIssues +func (r *RepoUnit) IssuesConfig() *IssuesConfig { + return r.Config.(*IssuesConfig) +} + // ExternalTrackerConfig returns config for UnitTypeExternalTracker func (r *RepoUnit) ExternalTrackerConfig() *ExternalTrackerConfig { return r.Config.(*ExternalTrackerConfig) diff --git a/models/star_test.go b/models/star_test.go index 714f5df5cd2b..55b4a1cfacdb 100644 --- a/models/star_test.go +++ b/models/star_test.go @@ -35,8 +35,9 @@ func TestRepository_GetStargazers(t *testing.T) { repo := AssertExistsAndLoadBean(t, &Repository{ID: 4}).(*Repository) gazers, err := repo.GetStargazers(0) assert.NoError(t, err) - assert.Len(t, gazers, 1) - assert.Equal(t, int64(2), gazers[0].ID) + if assert.Len(t, gazers, 1) { + assert.Equal(t, int64(2), gazers[0].ID) + } } func TestRepository_GetStargazers2(t *testing.T) { @@ -55,14 +56,16 @@ func TestUser_GetStarredRepos(t *testing.T) { user := AssertExistsAndLoadBean(t, &User{ID: 2}).(*User) starred, err := user.GetStarredRepos(false, 1, 10, "") assert.NoError(t, err) - assert.Len(t, starred, 1) - assert.Equal(t, int64(4), starred[0].ID) + if assert.Len(t, starred, 1) { + assert.Equal(t, int64(4), starred[0].ID) + } starred, err = user.GetStarredRepos(true, 1, 10, "") assert.NoError(t, err) - assert.Len(t, starred, 2) - assert.Equal(t, int64(2), starred[0].ID) - assert.Equal(t, int64(4), starred[1].ID) + if assert.Len(t, starred, 2) { + assert.Equal(t, int64(2), starred[0].ID) + assert.Equal(t, int64(4), starred[1].ID) + } } func TestUser_GetStarredRepos2(t *testing.T) { diff --git a/models/status_test.go b/models/status_test.go index 5585fb1dccec..78d2370f9d09 100644 --- a/models/status_test.go +++ b/models/status_test.go @@ -19,8 +19,7 @@ func TestGetCommitStatuses(t *testing.T) { statuses, err := GetCommitStatuses(repo1, sha1, 0) assert.NoError(t, err) - if assert.Equal(t, 5, len(statuses), "Expected to get 5 statuses") { - + if assert.Len(t, statuses, 5) { assert.Equal(t, statuses[0].Context, "ci/awesomeness") assert.Equal(t, statuses[0].State, CommitStatusPending) diff --git a/models/token_test.go b/models/token_test.go index 9674be126a30..540bd40deb7f 100644 --- a/models/token_test.go +++ b/models/token_test.go @@ -48,17 +48,19 @@ func TestListAccessTokens(t *testing.T) { assert.NoError(t, PrepareTestDatabase()) tokens, err := ListAccessTokens(1) assert.NoError(t, err) - assert.Len(t, tokens, 2) - assert.Equal(t, int64(1), tokens[0].UID) - assert.Equal(t, int64(1), tokens[1].UID) - assert.Contains(t, []string{tokens[0].Name, tokens[1].Name}, "Token A") - assert.Contains(t, []string{tokens[0].Name, tokens[1].Name}, "Token B") + if assert.Len(t, tokens, 2) { + assert.Equal(t, int64(1), tokens[0].UID) + assert.Equal(t, int64(1), tokens[1].UID) + assert.Contains(t, []string{tokens[0].Name, tokens[1].Name}, "Token A") + assert.Contains(t, []string{tokens[0].Name, tokens[1].Name}, "Token B") + } tokens, err = ListAccessTokens(2) assert.NoError(t, err) - assert.Len(t, tokens, 1) - assert.Equal(t, int64(2), tokens[0].UID) - assert.Equal(t, "Token A", tokens[0].Name) + if assert.Len(t, tokens, 1) { + assert.Equal(t, int64(2), tokens[0].UID) + assert.Equal(t, "Token A", tokens[0].Name) + } tokens, err = ListAccessTokens(100) assert.NoError(t, err) diff --git a/models/update.go b/models/update.go index cd22189f6afc..e6cbba64a5b6 100644 --- a/models/update.go +++ b/models/update.go @@ -64,7 +64,24 @@ type PushUpdateOptions struct { // PushUpdate must be called for any push actions in order to // generates necessary push action history feeds. -func PushUpdate(opts PushUpdateOptions) (repo *Repository, err error) { +func PushUpdate(branch string, opt PushUpdateOptions) error { + repo, err := pushUpdate(opt) + if err != nil { + return err + } + + pusher, err := GetUserByID(opt.PusherID) + if err != nil { + return err + } + + log.Trace("TriggerTask '%s/%s' by %s", repo.Name, branch, pusher.Name) + + go AddTestPullRequestTask(pusher, repo.ID, branch, true) + return nil +} + +func pushUpdate(opts PushUpdateOptions) (repo *Repository, err error) { isNewRef := opts.OldCommitID == git.EmptySHA isDelRef := opts.NewCommitID == git.EmptySHA if isNewRef && isDelRef { diff --git a/models/update_test.go b/models/update_test.go index ae95a9641b14..45451ee437a3 100644 --- a/models/update_test.go +++ b/models/update_test.go @@ -70,17 +70,17 @@ func TestListToPushCommits(t *testing.T) { pushCommits := ListToPushCommits(l) assert.Equal(t, 2, pushCommits.Len) - assert.Equal(t, 2, len(pushCommits.Commits)) + if assert.Len(t, pushCommits.Commits, 2) { + assert.Equal(t, "Message1", pushCommits.Commits[0].Message) + assert.Equal(t, hexString1, pushCommits.Commits[0].Sha1) + assert.Equal(t, "example@example.com", pushCommits.Commits[0].AuthorEmail) + assert.Equal(t, now, pushCommits.Commits[0].Timestamp) - assert.Equal(t, "Message1", pushCommits.Commits[0].Message) - assert.Equal(t, hexString1, pushCommits.Commits[0].Sha1) - assert.Equal(t, "example@example.com", pushCommits.Commits[0].AuthorEmail) - assert.Equal(t, now, pushCommits.Commits[0].Timestamp) - - assert.Equal(t, "Message2", pushCommits.Commits[1].Message) - assert.Equal(t, hexString2, pushCommits.Commits[1].Sha1) - assert.Equal(t, "example@example.com", pushCommits.Commits[1].AuthorEmail) - assert.Equal(t, now, pushCommits.Commits[1].Timestamp) + assert.Equal(t, "Message2", pushCommits.Commits[1].Message) + assert.Equal(t, hexString2, pushCommits.Commits[1].Sha1) + assert.Equal(t, "example@example.com", pushCommits.Commits[1].AuthorEmail) + assert.Equal(t, now, pushCommits.Commits[1].Timestamp) + } } // TODO TestPushUpdate diff --git a/models/user.go b/models/user.go index 7c523f82663b..1e2502ebc0ce 100644 --- a/models/user.go +++ b/models/user.go @@ -157,7 +157,7 @@ func (u *User) SetLastLogin() { // UpdateDiffViewStyle updates the users diff view style func (u *User) UpdateDiffViewStyle(style string) error { u.DiffViewStyle = style - return UpdateUser(u) + return UpdateUserCols(u, "diff_view_style") } // AfterSet is invoked from XORM after setting the value of a field of this object. @@ -237,7 +237,7 @@ func (u *User) CanCreateOrganization() bool { // CanEditGitHook returns true if user can edit Git hooks. func (u *User) CanEditGitHook() bool { - return u.IsAdmin || u.AllowGitHook + return !setting.DisableGitHooks && (u.IsAdmin || u.AllowGitHook) } // CanImportLocal returns true if user can migrate repository by local path. @@ -860,7 +860,9 @@ func updateUser(e Engine, u *User) error { if len(u.AvatarEmail) == 0 { u.AvatarEmail = u.Email } - u.Avatar = base.HashEmail(u.AvatarEmail) + if len(u.AvatarEmail) > 0 { + u.Avatar = base.HashEmail(u.AvatarEmail) + } } u.LowerName = strings.ToLower(u.Name) @@ -877,6 +879,29 @@ func UpdateUser(u *User) error { return updateUser(x, u) } +// UpdateUserCols update user according special columns +func UpdateUserCols(u *User, cols ...string) error { + // Organization does not need email + u.Email = strings.ToLower(u.Email) + if !u.IsOrganization() { + if len(u.AvatarEmail) == 0 { + u.AvatarEmail = u.Email + } + if len(u.AvatarEmail) > 0 { + u.Avatar = base.HashEmail(u.AvatarEmail) + } + } + + u.LowerName = strings.ToLower(u.Name) + u.Location = base.TruncateString(u.Location, 255) + u.Website = base.TruncateString(u.Website, 255) + u.Description = base.TruncateString(u.Description, 255) + + cols = append(cols, "updated_unix") + _, err := x.Id(u.ID).Cols(cols...).Update(u) + return err +} + // UpdateUserSetting updates user's settings. func UpdateUserSetting(u *User) error { if !u.IsOrganization() { @@ -1119,11 +1144,15 @@ func GetAssigneeByID(repo *Repository, userID int64) (*User, error) { // GetUserByName returns user by given name. func GetUserByName(name string) (*User, error) { + return getUserByName(x, name) +} + +func getUserByName(e Engine, name string) (*User, error) { if len(name) == 0 { return nil, ErrUserNotExist{0, name, 0} } u := &User{LowerName: strings.ToLower(name)} - has, err := x.Get(u) + has, err := e.Get(u) if err != nil { return nil, err } else if !has { @@ -1134,9 +1163,13 @@ func GetUserByName(name string) (*User, error) { // GetUserEmailsByNames returns a list of e-mails corresponds to names. func GetUserEmailsByNames(names []string) []string { + return getUserEmailsByNames(x, names) +} + +func getUserEmailsByNames(e Engine, names []string) []string { mails := make([]string, 0, len(names)) for _, name := range names { - u, err := GetUserByName(name) + u, err := getUserByName(e, name) if err != nil { continue } @@ -1418,7 +1451,7 @@ func SyncExternalUsers() { } usr.IsActive = true - err = UpdateUser(usr) + err = UpdateUserCols(usr, "full_name", "email", "is_admin", "is_active") if err != nil { log.Error(4, "SyncExternalUsers[%s]: Error updating user %s: %v", s.Name, usr.Name, err) } @@ -1440,7 +1473,7 @@ func SyncExternalUsers() { log.Trace("SyncExternalUsers[%s]: Deactivating user %s", s.Name, usr.Name) usr.IsActive = false - err = UpdateUser(&usr) + err = UpdateUserCols(&usr, "is_active") if err != nil { log.Error(4, "SyncExternalUsers[%s]: Error deactivating user %s: %v", s.Name, usr.Name, err) } diff --git a/models/user_mail_test.go b/models/user_mail_test.go index 4c0b6804d628..3352194e1fdc 100644 --- a/models/user_mail_test.go +++ b/models/user_mail_test.go @@ -14,15 +14,17 @@ func TestGetEmailAddresses(t *testing.T) { assert.NoError(t, PrepareTestDatabase()) emails, _ := GetEmailAddresses(int64(1)) - assert.Len(t, emails, 3) - assert.False(t, emails[0].IsPrimary) - assert.True(t, emails[2].IsActivated) - assert.True(t, emails[2].IsPrimary) + if assert.Len(t, emails, 3) { + assert.False(t, emails[0].IsPrimary) + assert.True(t, emails[2].IsActivated) + assert.True(t, emails[2].IsPrimary) + } emails, _ = GetEmailAddresses(int64(2)) - assert.Len(t, emails, 2) - assert.True(t, emails[0].IsPrimary) - assert.True(t, emails[0].IsActivated) + if assert.Len(t, emails, 2) { + assert.True(t, emails[0].IsPrimary) + assert.True(t, emails[0].IsActivated) + } } func TestIsEmailUsed(t *testing.T) { diff --git a/models/user_openid_test.go b/models/user_openid_test.go index e4734cc4284a..711f92b9ffe6 100644 --- a/models/user_openid_test.go +++ b/models/user_openid_test.go @@ -14,8 +14,7 @@ func TestGetUserOpenIDs(t *testing.T) { assert.NoError(t, PrepareTestDatabase()) oids, err := GetUserOpenIDs(int64(1)) - if assert.NoError(t, err) { - assert.Len(t, oids, 2) + if assert.NoError(t, err) && assert.Len(t, oids, 2) { assert.Equal(t, oids[0].URI, "https://user1.domain1.tld/") assert.False(t, oids[0].Show) assert.Equal(t, oids[1].URI, "http://user1.domain2.tld/") @@ -23,8 +22,7 @@ func TestGetUserOpenIDs(t *testing.T) { } oids, err = GetUserOpenIDs(int64(2)) - if assert.NoError(t, err) { - assert.Len(t, oids, 1) + if assert.NoError(t, err) && assert.Len(t, oids, 1) { assert.Equal(t, oids[0].URI, "https://domain1.tld/user2/") assert.True(t, oids[0].Show) } @@ -52,10 +50,9 @@ func TestGetUserByOpenID(t *testing.T) { func TestToggleUserOpenIDVisibility(t *testing.T) { assert.NoError(t, PrepareTestDatabase()) oids, err := GetUserOpenIDs(int64(2)) - if !assert.NoError(t, err) { + if !assert.NoError(t, err) || !assert.Len(t, oids, 1) { return } - assert.Len(t, oids, 1) assert.True(t, oids[0].Show) err = ToggleUserOpenIDVisibility(oids[0].ID) @@ -64,10 +61,10 @@ func TestToggleUserOpenIDVisibility(t *testing.T) { } oids, err = GetUserOpenIDs(int64(2)) - if assert.NoError(t, err) { - assert.Len(t, oids, 1) - assert.False(t, oids[0].Show) + if !assert.NoError(t, err) || !assert.Len(t, oids, 1) { + return } + assert.False(t, oids[0].Show) err = ToggleUserOpenIDVisibility(oids[0].ID) if !assert.NoError(t, err) { return @@ -77,6 +74,7 @@ func TestToggleUserOpenIDVisibility(t *testing.T) { if !assert.NoError(t, err) { return } - assert.Len(t, oids, 1) - assert.True(t, oids[0].Show) + if assert.Len(t, oids, 1) { + assert.True(t, oids[0].Show) + } } diff --git a/models/webhook.go b/models/webhook.go index b7e687a4616f..fa0c498f33cf 100644 --- a/models/webhook.go +++ b/models/webhook.go @@ -13,15 +13,14 @@ import ( "strings" "time" - "github.com/go-xorm/xorm" - gouuid "github.com/satori/go.uuid" - - api "code.gitea.io/sdk/gitea" - "code.gitea.io/gitea/modules/httplib" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/sync" + api "code.gitea.io/sdk/gitea" + + "github.com/go-xorm/xorm" + gouuid "github.com/satori/go.uuid" ) // HookQueue is a global queue of web hooks @@ -69,6 +68,7 @@ type HookEvents struct { Create bool `json:"create"` Push bool `json:"push"` PullRequest bool `json:"pull_request"` + Repository bool `json:"repository"` } // HookEvent represents events that will delivery hook. @@ -150,6 +150,15 @@ func (w *Webhook) GetSlackHook() *SlackMeta { return s } +// GetDiscordHook returns discord metadata +func (w *Webhook) GetDiscordHook() *DiscordMeta { + s := &DiscordMeta{} + if err := json.Unmarshal([]byte(w.Meta), s); err != nil { + log.Error(4, "webhook.GetDiscordHook(%d): %v", w.ID, err) + } + return s +} + // History returns history of webhook by given conditions. func (w *Webhook) History(page int) ([]*HookTask, error) { return HookTasks(w.ID, page) @@ -180,6 +189,12 @@ func (w *Webhook) HasPullRequestEvent() bool { (w.ChooseEvents && w.HookEvents.PullRequest) } +// HasRepositoryEvent returns if hook enabled repository event. +func (w *Webhook) HasRepositoryEvent() bool { + return w.SendEverything || + (w.ChooseEvents && w.HookEvents.Repository) +} + // EventsArray returns an array of hook events func (w *Webhook) EventsArray() []string { events := make([]string, 0, 3) @@ -213,6 +228,13 @@ func getWebhook(bean *Webhook) (*Webhook, error) { return bean, nil } +// GetWebhookByID returns webhook of repository by given ID. +func GetWebhookByID(id int64) (*Webhook, error) { + return getWebhook(&Webhook{ + ID: id, + }) +} + // GetWebhookByRepoID returns webhook of repository by given ID. func GetWebhookByRepoID(repoID, id int64) (*Webhook, error) { return getWebhook(&Webhook{ @@ -231,8 +253,12 @@ func GetWebhookByOrgID(orgID, id int64) (*Webhook, error) { // GetActiveWebhooksByRepoID returns all active webhooks of repository. func GetActiveWebhooksByRepoID(repoID int64) ([]*Webhook, error) { + return getActiveWebhooksByRepoID(x, repoID) +} + +func getActiveWebhooksByRepoID(e Engine, repoID int64) ([]*Webhook, error) { webhooks := make([]*Webhook, 0, 5) - return webhooks, x.Where("is_active=?", true). + return webhooks, e.Where("is_active=?", true). Find(&webhooks, &Webhook{RepoID: repoID}) } @@ -244,7 +270,11 @@ func GetWebhooksByRepoID(repoID int64) ([]*Webhook, error) { // GetActiveWebhooksByOrgID returns all active webhooks for an organization. func GetActiveWebhooksByOrgID(orgID int64) (ws []*Webhook, err error) { - err = x. + return getActiveWebhooksByOrgID(x, orgID) +} + +func getActiveWebhooksByOrgID(e Engine, orgID int64) (ws []*Webhook, err error) { + err = e. Where("org_id=?", orgID). And("is_active=?", true). Find(&ws) @@ -263,6 +293,12 @@ func UpdateWebhook(w *Webhook) error { return err } +// UpdateWebhookLastStatus updates last status of webhook. +func UpdateWebhookLastStatus(w *Webhook) error { + _, err := x.ID(w.ID).Cols("last_status").Update(w) + return err +} + // deleteWebhook uses argument bean as query condition, // ID must be specified and do not assign unnecessary fields. func deleteWebhook(bean *Webhook) (err error) { @@ -314,12 +350,14 @@ const ( GOGS HookTaskType = iota + 1 SLACK GITEA + DISCORD ) var hookTaskTypes = map[string]HookTaskType{ - "gitea": GITEA, - "gogs": GOGS, - "slack": SLACK, + "gitea": GITEA, + "gogs": GOGS, + "slack": SLACK, + "discord": DISCORD, } // ToHookTaskType returns HookTaskType by given name. @@ -336,6 +374,8 @@ func (t HookTaskType) Name() string { return "gogs" case SLACK: return "slack" + case DISCORD: + return "discord" } return "" } @@ -354,6 +394,7 @@ const ( HookEventCreate HookEventType = "create" HookEventPush HookEventType = "push" HookEventPullRequest HookEventType = "pull_request" + HookEventRepository HookEventType = "repository" ) // HookRequest represents hook task request information. @@ -454,13 +495,17 @@ func HookTasks(hookID int64, page int) ([]*HookTask, error) { // CreateHookTask creates a new hook task, // it handles conversion from Payload to PayloadContent. func CreateHookTask(t *HookTask) error { + return createHookTask(x, t) +} + +func createHookTask(e Engine, t *HookTask) error { data, err := t.Payloader.JSONPayload() if err != nil { return err } t.UUID = gouuid.NewV4().String() t.PayloadContent = string(data) - _, err = x.Insert(t) + _, err = e.Insert(t) return err } @@ -470,17 +515,80 @@ func UpdateHookTask(t *HookTask) error { return err } +// PrepareWebhook adds special webhook to task queue for given payload. +func PrepareWebhook(w *Webhook, repo *Repository, event HookEventType, p api.Payloader) error { + return prepareWebhook(x, w, repo, event, p) +} + +func prepareWebhook(e Engine, w *Webhook, repo *Repository, event HookEventType, p api.Payloader) error { + switch event { + case HookEventCreate: + if !w.HasCreateEvent() { + return nil + } + case HookEventPush: + if !w.HasPushEvent() { + return nil + } + case HookEventPullRequest: + if !w.HasPullRequestEvent() { + return nil + } + case HookEventRepository: + if !w.HasRepositoryEvent() { + return nil + } + } + + var payloader api.Payloader + var err error + // Use separate objects so modifications won't be made on payload on non-Gogs/Gitea type hooks. + switch w.HookTaskType { + case SLACK: + payloader, err = GetSlackPayload(p, event, w.Meta) + if err != nil { + return fmt.Errorf("GetSlackPayload: %v", err) + } + case DISCORD: + payloader, err = GetDiscordPayload(p, event, w.Meta) + if err != nil { + return fmt.Errorf("GetDiscordPayload: %v", err) + } + default: + p.SetSecret(w.Secret) + payloader = p + } + + if err = createHookTask(e, &HookTask{ + RepoID: repo.ID, + HookID: w.ID, + Type: w.HookTaskType, + URL: w.URL, + Payloader: payloader, + ContentType: w.ContentType, + EventType: event, + IsSSL: w.IsSSL, + }); err != nil { + return fmt.Errorf("CreateHookTask: %v", err) + } + return nil +} + // PrepareWebhooks adds new webhooks to task queue for given payload. func PrepareWebhooks(repo *Repository, event HookEventType, p api.Payloader) error { - ws, err := GetActiveWebhooksByRepoID(repo.ID) + return prepareWebhooks(x, repo, event, p) +} + +func prepareWebhooks(e Engine, repo *Repository, event HookEventType, p api.Payloader) error { + ws, err := getActiveWebhooksByRepoID(e, repo.ID) if err != nil { return fmt.Errorf("GetActiveWebhooksByRepoID: %v", err) } // check if repo belongs to org and append additional webhooks - if repo.MustOwner().IsOrganization() { + if repo.mustOwner(e).IsOrganization() { // get hooks for org - orgHooks, err := GetActiveWebhooksByOrgID(repo.OwnerID) + orgHooks, err := getActiveWebhooksByOrgID(e, repo.OwnerID) if err != nil { return fmt.Errorf("GetActiveWebhooksByOrgID: %v", err) } @@ -491,46 +599,9 @@ func PrepareWebhooks(repo *Repository, event HookEventType, p api.Payloader) err return nil } - var payloader api.Payloader for _, w := range ws { - switch event { - case HookEventCreate: - if !w.HasCreateEvent() { - continue - } - case HookEventPush: - if !w.HasPushEvent() { - continue - } - case HookEventPullRequest: - if !w.HasPullRequestEvent() { - continue - } - } - - // Use separate objects so modifications won't be made on payload on non-Gogs/Gitea type hooks. - switch w.HookTaskType { - case SLACK: - payloader, err = GetSlackPayload(p, event, w.Meta) - if err != nil { - return fmt.Errorf("GetSlackPayload: %v", err) - } - default: - p.SetSecret(w.Secret) - payloader = p - } - - if err = CreateHookTask(&HookTask{ - RepoID: repo.ID, - HookID: w.ID, - Type: w.HookTaskType, - URL: w.URL, - Payloader: payloader, - ContentType: w.ContentType, - EventType: event, - IsSSL: w.IsSSL, - }); err != nil { - return fmt.Errorf("CreateHookTask: %v", err) + if err = prepareWebhook(e, w, repo, event, p); err != nil { + return err } } return nil @@ -577,7 +648,7 @@ func (t *HookTask) deliver() { } // Update webhook last delivery status. - w, err := GetWebhookByRepoID(t.RepoID, t.HookID) + w, err := GetWebhookByID(t.HookID) if err != nil { log.Error(5, "GetWebhookByID: %v", err) return @@ -587,8 +658,8 @@ func (t *HookTask) deliver() { } else { w.LastStatus = HookStatusFail } - if err = UpdateWebhook(w); err != nil { - log.Error(5, "UpdateWebhook: %v", err) + if err = UpdateWebhookLastStatus(w); err != nil { + log.Error(5, "UpdateWebhookLastStatus: %v", err) return } }() diff --git a/models/webhook_discord.go b/models/webhook_discord.go new file mode 100644 index 000000000000..631c8174e97d --- /dev/null +++ b/models/webhook_discord.go @@ -0,0 +1,283 @@ +package models + +import ( + "encoding/json" + "errors" + "fmt" + "strconv" + "strings" + + "code.gitea.io/git" + "code.gitea.io/gitea/modules/setting" + api "code.gitea.io/sdk/gitea" +) + +type ( + // DiscordEmbedFooter for Embed Footer Structure. + DiscordEmbedFooter struct { + Text string `json:"text"` + } + + // DiscordEmbedAuthor for Embed Author Structure + DiscordEmbedAuthor struct { + Name string `json:"name"` + URL string `json:"url"` + IconURL string `json:"icon_url"` + } + + // DiscordEmbedField for Embed Field Structure + DiscordEmbedField struct { + Name string `json:"name"` + Value string `json:"value"` + } + + // DiscordEmbed is for Embed Structure + DiscordEmbed struct { + Title string `json:"title"` + Description string `json:"description"` + URL string `json:"url"` + Color int `json:"color"` + Footer DiscordEmbedFooter `json:"footer"` + Author DiscordEmbedAuthor `json:"author"` + Fields []DiscordEmbedField `json:"fields"` + } + + // DiscordPayload represents + DiscordPayload struct { + Wait bool `json:"wait"` + Content string `json:"content"` + Username string `json:"username"` + AvatarURL string `json:"avatar_url"` + TTS bool `json:"tts"` + Embeds []DiscordEmbed `json:"embeds"` + } + + // DiscordMeta contains the discord metadata + DiscordMeta struct { + Username string `json:"username"` + IconURL string `json:"icon_url"` + } +) + +func color(clr string) int { + if clr != "" { + clr = strings.TrimLeft(clr, "#") + if s, err := strconv.ParseInt(clr, 16, 32); err == nil { + return int(s) + } + } + + return 0 +} + +var ( + successColor = color("1ac600") + warnColor = color("ffd930") + failedColor = color("ff3232") +) + +// SetSecret sets the discord secret +func (p *DiscordPayload) SetSecret(_ string) {} + +// JSONPayload Marshals the DiscordPayload to json +func (p *DiscordPayload) JSONPayload() ([]byte, error) { + data, err := json.MarshalIndent(p, "", " ") + if err != nil { + return []byte{}, err + } + return data, nil +} + +func getDiscordCreatePayload(p *api.CreatePayload, meta *DiscordMeta) (*DiscordPayload, error) { + // created tag/branch + refName := git.RefEndName(p.Ref) + title := fmt.Sprintf("[%s] %s %s created", p.Repo.FullName, p.RefType, refName) + + return &DiscordPayload{ + Username: meta.Username, + AvatarURL: meta.IconURL, + Embeds: []DiscordEmbed{ + { + Title: title, + URL: p.Repo.HTMLURL + "/src/" + refName, + Color: successColor, + Author: DiscordEmbedAuthor{ + Name: p.Sender.UserName, + URL: setting.AppURL + p.Sender.UserName, + IconURL: p.Sender.AvatarURL, + }, + }, + }, + }, nil +} + +func getDiscordPushPayload(p *api.PushPayload, meta *DiscordMeta) (*DiscordPayload, error) { + var ( + branchName = git.RefEndName(p.Ref) + commitDesc string + ) + + var titleLink string + if len(p.Commits) == 1 { + commitDesc = "1 new commit" + titleLink = p.Commits[0].URL + } else { + commitDesc = fmt.Sprintf("%d new commits", len(p.Commits)) + titleLink = p.CompareURL + } + if titleLink == "" { + titleLink = p.Repo.HTMLURL + "/src/" + branchName + } + + title := fmt.Sprintf("[%s:%s] %s", p.Repo.FullName, branchName, commitDesc) + + var text string + // for each commit, generate attachment text + for i, commit := range p.Commits { + text += fmt.Sprintf("[%s](%s) %s - %s", commit.ID[:7], commit.URL, + strings.TrimRight(commit.Message, "\r\n"), commit.Author.Name) + // add linebreak to each commit but the last + if i < len(p.Commits)-1 { + text += "\n" + } + } + + return &DiscordPayload{ + Username: meta.Username, + AvatarURL: meta.IconURL, + Embeds: []DiscordEmbed{ + { + Title: title, + Description: text, + URL: titleLink, + Color: successColor, + Author: DiscordEmbedAuthor{ + Name: p.Sender.UserName, + URL: setting.AppURL + p.Sender.UserName, + IconURL: p.Sender.AvatarURL, + }, + }, + }, + }, nil +} + +func getDiscordPullRequestPayload(p *api.PullRequestPayload, meta *DiscordMeta) (*DiscordPayload, error) { + var text, title string + var color int + switch p.Action { + case api.HookIssueOpened: + title = fmt.Sprintf("[%s] Pull request opened: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title) + text = p.PullRequest.Body + color = warnColor + case api.HookIssueClosed: + if p.PullRequest.HasMerged { + title = fmt.Sprintf("[%s] Pull request merged: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title) + color = successColor + } else { + title = fmt.Sprintf("[%s] Pull request closed: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title) + color = failedColor + } + text = p.PullRequest.Body + case api.HookIssueReOpened: + title = fmt.Sprintf("[%s] Pull request re-opened: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title) + text = p.PullRequest.Body + color = warnColor + case api.HookIssueEdited: + title = fmt.Sprintf("[%s] Pull request edited: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title) + text = p.PullRequest.Body + color = warnColor + case api.HookIssueAssigned: + title = fmt.Sprintf("[%s] Pull request assigned to %s: #%d %s", p.Repository.FullName, + p.PullRequest.Assignee.UserName, p.Index, p.PullRequest.Title) + text = p.PullRequest.Body + color = successColor + case api.HookIssueUnassigned: + title = fmt.Sprintf("[%s] Pull request unassigned: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title) + text = p.PullRequest.Body + color = warnColor + case api.HookIssueLabelUpdated: + title = fmt.Sprintf("[%s] Pull request labels updated: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title) + text = p.PullRequest.Body + color = warnColor + case api.HookIssueLabelCleared: + title = fmt.Sprintf("[%s] Pull request labels cleared: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title) + text = p.PullRequest.Body + color = warnColor + case api.HookIssueSynchronized: + title = fmt.Sprintf("[%s] Pull request synchronized: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title) + text = p.PullRequest.Body + color = warnColor + } + + return &DiscordPayload{ + Username: meta.Username, + AvatarURL: meta.IconURL, + Embeds: []DiscordEmbed{ + { + Title: title, + Description: text, + URL: p.PullRequest.HTMLURL, + Color: color, + Author: DiscordEmbedAuthor{ + Name: p.Sender.UserName, + URL: setting.AppURL + p.Sender.UserName, + IconURL: p.Sender.AvatarURL, + }, + }, + }, + }, nil +} + +func getDiscordRepositoryPayload(p *api.RepositoryPayload, meta *DiscordMeta) (*DiscordPayload, error) { + var title, url string + var color int + switch p.Action { + case api.HookRepoCreated: + title = fmt.Sprintf("[%s] Repository created", p.Repository.FullName) + url = p.Repository.HTMLURL + color = successColor + case api.HookRepoDeleted: + title = fmt.Sprintf("[%s] Repository deleted", p.Repository.FullName) + color = warnColor + } + + return &DiscordPayload{ + Username: meta.Username, + AvatarURL: meta.IconURL, + Embeds: []DiscordEmbed{ + { + Title: title, + URL: url, + Color: color, + Author: DiscordEmbedAuthor{ + Name: p.Sender.UserName, + URL: setting.AppURL + p.Sender.UserName, + IconURL: p.Sender.AvatarURL, + }, + }, + }, + }, nil +} + +// GetDiscordPayload converts a discord webhook into a DiscordPayload +func GetDiscordPayload(p api.Payloader, event HookEventType, meta string) (*DiscordPayload, error) { + s := new(DiscordPayload) + + discord := &DiscordMeta{} + if err := json.Unmarshal([]byte(meta), &discord); err != nil { + return s, errors.New("GetDiscordPayload meta json:" + err.Error()) + } + + switch event { + case HookEventCreate: + return getDiscordCreatePayload(p.(*api.CreatePayload), discord) + case HookEventPush: + return getDiscordPushPayload(p.(*api.PushPayload), discord) + case HookEventPullRequest: + return getDiscordPullRequestPayload(p.(*api.PullRequestPayload), discord) + case HookEventRepository: + return getDiscordRepositoryPayload(p.(*api.RepositoryPayload), discord) + } + + return s, nil +} diff --git a/models/webhook_slack.go b/models/webhook_slack.go index b297fefd668a..ca43cfd42741 100644 --- a/models/webhook_slack.go +++ b/models/webhook_slack.go @@ -189,6 +189,30 @@ func getSlackPullRequestPayload(p *api.PullRequestPayload, slack *SlackMeta) (*S }, nil } +func getSlackRepositoryPayload(p *api.RepositoryPayload, slack *SlackMeta) (*SlackPayload, error) { + senderLink := SlackLinkFormatter(setting.AppURL+p.Sender.UserName, p.Sender.UserName) + var text, title, attachmentText string + switch p.Action { + case api.HookRepoCreated: + text = fmt.Sprintf("[%s] Repository created by %s", p.Repository.FullName, senderLink) + title = p.Repository.HTMLURL + case api.HookRepoDeleted: + text = fmt.Sprintf("[%s] Repository deleted by %s", p.Repository.FullName, senderLink) + } + + return &SlackPayload{ + Channel: slack.Channel, + Text: text, + Username: slack.Username, + IconURL: slack.IconURL, + Attachments: []SlackAttachment{{ + Color: slack.Color, + Title: title, + Text: attachmentText, + }}, + }, nil +} + // GetSlackPayload converts a slack webhook into a SlackPayload func GetSlackPayload(p api.Payloader, event HookEventType, meta string) (*SlackPayload, error) { s := new(SlackPayload) @@ -205,6 +229,8 @@ func GetSlackPayload(p api.Payloader, event HookEventType, meta string) (*SlackP return getSlackPushPayload(p.(*api.PushPayload), slack) case HookEventPullRequest: return getSlackPullRequestPayload(p.(*api.PullRequestPayload), slack) + case HookEventRepository: + return getSlackRepositoryPayload(p.(*api.RepositoryPayload), slack) } return s, nil diff --git a/models/webhook_test.go b/models/webhook_test.go index a637a16999c8..eeae7efbcbcd 100644 --- a/models/webhook_test.go +++ b/models/webhook_test.go @@ -41,8 +41,9 @@ func TestWebhook_History(t *testing.T) { webhook := AssertExistsAndLoadBean(t, &Webhook{ID: 1}).(*Webhook) tasks, err := webhook.History(0) assert.NoError(t, err) - assert.Len(t, tasks, 1) - assert.Equal(t, int64(1), tasks[0].ID) + if assert.Len(t, tasks, 1) { + assert.Equal(t, int64(1), tasks[0].ID) + } webhook = AssertExistsAndLoadBean(t, &Webhook{ID: 2}).(*Webhook) tasks, err = webhook.History(0) @@ -123,36 +124,40 @@ func TestGetActiveWebhooksByRepoID(t *testing.T) { assert.NoError(t, PrepareTestDatabase()) hooks, err := GetActiveWebhooksByRepoID(1) assert.NoError(t, err) - assert.Len(t, hooks, 1) - assert.Equal(t, int64(1), hooks[0].ID) - assert.True(t, hooks[0].IsActive) + if assert.Len(t, hooks, 1) { + assert.Equal(t, int64(1), hooks[0].ID) + assert.True(t, hooks[0].IsActive) + } } func TestGetWebhooksByRepoID(t *testing.T) { assert.NoError(t, PrepareTestDatabase()) hooks, err := GetWebhooksByRepoID(1) assert.NoError(t, err) - assert.Len(t, hooks, 2) - assert.Equal(t, int64(1), hooks[0].ID) - assert.Equal(t, int64(2), hooks[1].ID) + if assert.Len(t, hooks, 2) { + assert.Equal(t, int64(1), hooks[0].ID) + assert.Equal(t, int64(2), hooks[1].ID) + } } func TestGetActiveWebhooksByOrgID(t *testing.T) { assert.NoError(t, PrepareTestDatabase()) hooks, err := GetActiveWebhooksByOrgID(3) assert.NoError(t, err) - assert.Len(t, hooks, 1) - assert.Equal(t, int64(3), hooks[0].ID) - assert.True(t, hooks[0].IsActive) + if assert.Len(t, hooks, 1) { + assert.Equal(t, int64(3), hooks[0].ID) + assert.True(t, hooks[0].IsActive) + } } func TestGetWebhooksByOrgID(t *testing.T) { assert.NoError(t, PrepareTestDatabase()) hooks, err := GetWebhooksByOrgID(3) assert.NoError(t, err) - assert.Len(t, hooks, 1) - assert.Equal(t, int64(3), hooks[0].ID) - assert.True(t, hooks[0].IsActive) + if assert.Len(t, hooks, 1) { + assert.Equal(t, int64(3), hooks[0].ID) + assert.True(t, hooks[0].IsActive) + } } @@ -211,8 +216,9 @@ func TestHookTasks(t *testing.T) { assert.NoError(t, PrepareTestDatabase()) hookTasks, err := HookTasks(1, 1) assert.NoError(t, err) - assert.Len(t, hookTasks, 1) - assert.Equal(t, int64(1), hookTasks[0].ID) + if assert.Len(t, hookTasks, 1) { + assert.Equal(t, int64(1), hookTasks[0].ID) + } hookTasks, err = HookTasks(NonexistentID, 1) assert.NoError(t, err) diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go index 32f5f773d1ec..bb1548caebf0 100644 --- a/modules/auth/repo_form.go +++ b/modules/auth/repo_form.go @@ -12,7 +12,7 @@ import ( "code.gitea.io/gitea/models" "github.com/Unknwon/com" "github.com/go-macaron/binding" - macaron "gopkg.in/macaron.v1" + "gopkg.in/macaron.v1" ) // _______________________________________ _________.______________________ _______________.___. @@ -105,6 +105,8 @@ type RepoSettingForm struct { TrackerIssueStyle string EnablePulls bool EnableIssueDependencies bool + EnableTimetracker bool + AllowOnlyContributorsToTrackTime bool } // Validate validates the fields @@ -125,6 +127,7 @@ type WebhookForm struct { Create bool Push bool PullRequest bool + Repository bool Active bool } @@ -184,6 +187,19 @@ func (f *NewSlackHookForm) Validate(ctx *macaron.Context, errs binding.Errors) b return validate(errs, ctx.Data, f, ctx.Locale) } +// NewDiscordHookForm form for creating discord hook +type NewDiscordHookForm struct { + PayloadURL string `binding:"Required;ValidUrl"` + Username string + IconURL string + WebhookForm +} + +// Validate validates the fields +func (f *NewDiscordHookForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors { + return validate(errs, ctx.Data, f, ctx.Locale) +} + // .___ // | | ______ ________ __ ____ // | |/ ___// ___/ | \_/ __ \ @@ -195,6 +211,7 @@ func (f *NewSlackHookForm) Validate(ctx *macaron.Context, errs binding.Errors) b type CreateIssueForm struct { Title string `binding:"Required;MaxSize(255)"` LabelIDs string `form:"label_ids"` + Ref string `form:"ref"` MilestoneID int64 AssigneeID int64 Content string @@ -409,3 +426,21 @@ type DeleteRepoFileForm struct { func (f *DeleteRepoFileForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors { return validate(errs, ctx.Data, f, ctx.Locale) } + +// ___________.__ ___________ __ +// \__ ___/|__| _____ ____ \__ ___/___________ ____ | | __ ___________ +// | | | |/ \_/ __ \ | | \_ __ \__ \ _/ ___\| |/ // __ \_ __ \ +// | | | | Y Y \ ___/ | | | | \// __ \\ \___| <\ ___/| | \/ +// |____| |__|__|_| /\___ > |____| |__| (____ /\___ >__|_ \\___ >__| +// \/ \/ \/ \/ \/ \/ + +// AddTimeManuallyForm form that adds spent time manually. +type AddTimeManuallyForm struct { + Hours int `binding:"Range(0,1000)"` + Minutes int `binding:"Range(0,1000)"` +} + +// Validate validates the fields +func (f *AddTimeManuallyForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors { + return validate(errs, ctx.Data, f, ctx.Locale) +} diff --git a/modules/auth/user_form.go b/modules/auth/user_form.go index 4f7b80f59037..ab0bb1e7dd72 100644 --- a/modules/auth/user_form.go +++ b/modules/auth/user_form.go @@ -41,11 +41,14 @@ type InstallForm struct { OfflineMode bool DisableGravatar bool EnableFederatedAvatar bool + EnableOpenIDSignIn bool + EnableOpenIDSignUp bool DisableRegistration bool EnableCaptcha bool RequireSignInView bool DefaultKeepEmailPrivate bool DefaultAllowCreateOrganization bool + DefaultEnableTimetracking bool NoReplyAddress string AdminName string `binding:"OmitEmpty;AlphaDashDot;MaxSize(30)" locale:"install.admin_name"` diff --git a/modules/context/api.go b/modules/context/api.go index 7264214f370a..0bf4307726e8 100644 --- a/modules/context/api.go +++ b/modules/context/api.go @@ -51,6 +51,10 @@ type APIForbiddenError struct { // swagger:response notFound type APINotFound struct{} +//APIRedirect is a redirect response +// swagger:response redirect +type APIRedirect struct{} + // Error responses error message to client with given message. // If status is 500, also it prints error to log. func (ctx *APIContext) Error(status int, title string, obj interface{}) { diff --git a/modules/context/repo.go b/modules/context/repo.go index 52e0b5db9568..be65eb362bbc 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -1,4 +1,5 @@ // Copyright 2014 The Gogs Authors. All rights reserved. +// Copyright 2017 The Gitea Authors. All rights reserved. // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. @@ -14,8 +15,8 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/setting" "github.com/Unknwon/com" - editorconfig "gopkg.in/editorconfig/editorconfig-core-go.v1" - macaron "gopkg.in/macaron.v1" + "gopkg.in/editorconfig/editorconfig-core-go.v1" + "gopkg.in/macaron.v1" ) // PullRequest contains informations to make a pull request @@ -85,6 +86,15 @@ func (r *Repository) CanCommitToBranch() (bool, error) { return r.CanEnableEditor() && !protectedBranch, nil } +// CanUseTimetracker returns whether or not a user can use the timetracker. +func (r *Repository) CanUseTimetracker(issue *models.Issue, user *models.User) bool { + // Checking for following: + // 1. Is timetracker enabled + // 2. Is the user a contributor, admin, poster or assignee and do the repository policies require this? + return r.Repository.IsTimetrackerEnabled() && (!r.Repository.AllowOnlyContributorsToTrackTime() || + r.IsWriter() || issue.IsPoster(user.ID) || issue.AssigneeID == user.ID) +} + // GetEditorconfig returns the .editorconfig definition if found in the // HEAD of the default repo branch. func (r *Repository) GetEditorconfig() (*editorconfig.Editorconfig, error) { @@ -184,7 +194,7 @@ func RepoAssignment() macaron.Handler { earlyResponseForGoGetMeta(ctx) return } - ctx.Handle(404, "GetUserByName", err) + ctx.Handle(404, "GetUserByName", nil) } else { ctx.Handle(500, "GetUserByName", err) } @@ -206,7 +216,7 @@ func RepoAssignment() macaron.Handler { earlyResponseForGoGetMeta(ctx) return } - ctx.Handle(404, "GetRepositoryByName", err) + ctx.Handle(404, "GetRepositoryByName", nil) } else { ctx.Handle(500, "LookupRepoRedirect", err) } @@ -275,7 +285,15 @@ func RepoAssignment() macaron.Handler { return } ctx.Data["Tags"] = tags - ctx.Repo.Repository.NumTags = len(tags) + + count, err := models.GetReleaseCountByRepoID(ctx.Repo.Repository.ID, models.FindReleasesOptions{ + IncludeDrafts: false, + }) + if err != nil { + ctx.Handle(500, "GetReleaseCountByRepoID", err) + return + } + ctx.Repo.Repository.NumReleases = int(count) ctx.Data["Title"] = owner.Name + "/" + repo.Name ctx.Data["Repository"] = repo diff --git a/modules/mailer/mailer.go b/modules/mailer/mailer.go index 1f173e6b9098..5b28f92c475d 100644 --- a/modules/mailer/mailer.go +++ b/modules/mailer/mailer.go @@ -16,6 +16,7 @@ import ( "strings" "time" + "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" @@ -41,7 +42,7 @@ func NewMessageFrom(to []string, from, subject, body string) *Message { plainBody, err := html2text.FromString(body) if err != nil || setting.MailService.SendAsPlainText { - if strings.Contains(body[:100], "") { + if strings.Contains(base.TruncateString(body, 100), "") { log.Warn("Mail contains HTML but configured to send as plain text.") } msg.SetBody("text/plain", plainBody) diff --git a/modules/markdown/markdown.go b/modules/markdown/markdown.go index 898df59292f2..ed673f2056c2 100644 --- a/modules/markdown/markdown.go +++ b/modules/markdown/markdown.go @@ -69,12 +69,29 @@ var ( // AnySHA1Pattern allows to split url containing SHA into parts AnySHA1Pattern = regexp.MustCompile(`(http\S*)://(\S+)/(\S+)/(\S+)/(\S+)/([0-9a-f]{40})(?:/?([^#\s]+)?(?:#(\S+))?)?`) - // IssueFullPattern allows to split issue (and pull) URLs into parts - IssueFullPattern = regexp.MustCompile(`(?:^|\s|\()(http\S*)://((?:[^\s/]+/)+)((?:\w{1,10}-)?[1-9][0-9]*)([\?|#]\S+.(\S+)?)?\b`) - validLinksPattern = regexp.MustCompile(`^[a-z][\w-]+://`) ) +// regexp for full links to issues/pulls +var issueFullPattern *regexp.Regexp + +// InitMarkdown initialize regexps for markdown parsing +func InitMarkdown() { + getIssueFullPattern() +} + +func getIssueFullPattern() *regexp.Regexp { + if issueFullPattern == nil { + appURL := setting.AppURL + if len(appURL) > 0 && appURL[len(appURL)-1] != '/' { + appURL += "/" + } + issueFullPattern = regexp.MustCompile(appURL + + `\w+/\w+/(?:issues|pulls)/((?:\w{1,10}-)?[1-9][0-9]*)([\?|#]\S+.(\S+)?)?\b`) + } + return issueFullPattern +} + // isLink reports whether link fits valid format. func isLink(link []byte) bool { return validLinksPattern.Match(link) @@ -323,32 +340,17 @@ func renderFullSha1Pattern(rawBytes []byte, urlPrefix string) []byte { return rawBytes } -// renderFullIssuePattern renders issues-like URLs -func renderFullIssuePattern(rawBytes []byte, urlPrefix string) []byte { - ms := IssueFullPattern.FindAllSubmatch(rawBytes, -1) +// RenderFullIssuePattern renders issues-like URLs +func RenderFullIssuePattern(rawBytes []byte) []byte { + ms := getIssueFullPattern().FindAllSubmatch(rawBytes, -1) for _, m := range ms { all := m[0] - protocol := string(m[1]) - paths := bytes.Split(m[2], []byte("/")) - paths = paths[:len(paths)-1] - if bytes.HasPrefix(paths[0], []byte("gist.")) { - continue - } - path := protocol + "://" + string(m[2]) - id := string(m[3]) - path = URLJoin(path, id) - var comment []byte - if len(m) > 3 { - comment = m[4] - } - urlSuffix := "" + id := string(m[1]) text := "#" + id - if comment != nil { - urlSuffix += string(comment) - text += " " - } + // TODO if m[2] is not nil, then link is to a comment, + // and we should indicate that in the text somehow rawBytes = bytes.Replace(rawBytes, all, []byte(fmt.Sprintf( - `%s`, path, urlSuffix, text)), -1) + `%s`, string(all), text)), -1) } return rawBytes } @@ -550,12 +552,12 @@ func RenderSpecialLink(rawBytes []byte, urlPrefix string, metas map[string]strin []byte(fmt.Sprintf(`%s`, URLJoin(setting.AppURL, string(m[1:])), m)), -1) } + rawBytes = RenderFullIssuePattern(rawBytes) rawBytes = RenderShortLinks(rawBytes, urlPrefix, false, isWikiMarkdown) rawBytes = RenderIssueIndexPattern(rawBytes, urlPrefix, metas) rawBytes = RenderCrossReferenceIssueIndexPattern(rawBytes, urlPrefix, metas) rawBytes = renderFullSha1Pattern(rawBytes, urlPrefix) rawBytes = renderSha1CurrentPattern(rawBytes, urlPrefix) - rawBytes = renderFullIssuePattern(rawBytes, urlPrefix) return rawBytes } diff --git a/modules/markdown/markdown_test.go b/modules/markdown/markdown_test.go index cfe9c5421a76..4506a29b1eb3 100644 --- a/modules/markdown/markdown_test.go +++ b/modules/markdown/markdown_test.go @@ -209,13 +209,15 @@ func TestRender_AutoLink(t *testing.T) { numericIssueLink(URLJoin(setting.AppSubURL, "issues"), 3333)) // render external issue URLs - tmp := "http://1111/2222/ssss-issues/3333?param=blah&blahh=333" - test(tmp, "#3333 ") - test("http://test.com/issues/33333", numericIssueLink("http://test.com/issues", 33333)) - test("https://issues/333", numericIssueLink("https://issues", 333)) + for _, externalURL := range []string{ + "http://1111/2222/ssss-issues/3333?param=blah&blahh=333", + "http://test.com/issues/33333", + "https://issues/333"} { + test(externalURL, externalURL) + } // render valid commit URLs - tmp = URLJoin(AppSubURL, "commit", "d8a994ef243349f321568f9e36d5c3f444b99cae") + tmp := URLJoin(AppSubURL, "commit", "d8a994ef243349f321568f9e36d5c3f444b99cae") test(tmp, "d8a994ef24") tmp += "#diff-2" test(tmp, "d8a994ef24 (diff-2)") @@ -368,6 +370,22 @@ func TestRender_CrossReferences(t *testing.T) { `

gogits/gogs#12345

`) } +func TestRender_FullIssueURLs(t *testing.T) { + setting.AppURL = AppURL + setting.AppSubURL = AppSubURL + + test := func(input, expected string) { + result := RenderFullIssuePattern([]byte(input)) + assert.Equal(t, expected, string(result)) + } + test("Here is a link https://git.osgeo.org/gogs/postgis/postgis/pulls/6", + "Here is a link https://git.osgeo.org/gogs/postgis/postgis/pulls/6") + test("Look here http://localhost:3000/person/repo/issues/4", + `Look here #4`) + test("http://localhost:3000/person/repo/issues/4#issuecomment-1234", + `#4`) +} + func TestRegExp_MentionPattern(t *testing.T) { trueTestCases := []string{ "@Unknwon", @@ -558,50 +576,6 @@ func TestRegExp_AnySHA1Pattern(t *testing.T) { } } -func TestRegExp_IssueFullPattern(t *testing.T) { - testCases := map[string][]string{ - "https://github.com/gogits/gogs/pull/3244": { - "https", - "github.com/gogits/gogs/pull/", - "3244", - "", - "", - }, - "https://github.com/gogits/gogs/issues/3247#issuecomment-231517079": { - "https", - "github.com/gogits/gogs/issues/", - "3247", - "#issuecomment-231517079", - "", - }, - "https://try.gogs.io/gogs/gogs/issues/4#issue-685": { - "https", - "try.gogs.io/gogs/gogs/issues/", - "4", - "#issue-685", - "", - }, - "https://youtrack.jetbrains.com/issue/JT-36485": { - "https", - "youtrack.jetbrains.com/issue/", - "JT-36485", - "", - "", - }, - "https://youtrack.jetbrains.com/issue/JT-36485#comment=27-1508676": { - "https", - "youtrack.jetbrains.com/issue/", - "JT-36485", - "#comment=27-1508676", - "", - }, - } - - for k, v := range testCases { - assert.Equal(t, IssueFullPattern.FindStringSubmatch(k)[1:], v) - } -} - func TestMisc_IsMarkdownFile(t *testing.T) { setting.Markdown.FileExtensions = []string{".md", ".markdown", ".mdown", ".mkd"} trueTestCases := []string{ @@ -645,7 +619,7 @@ var sameCases = []string{ Ideas and codes -- Bezier widget (by @r-lyeh) https://github.com/ocornut/imgui/issues/786 +- Bezier widget (by @r-lyeh) ` + AppURL + `ocornut/imgui/issues/786 - Node graph editors https://github.com/ocornut/imgui/issues/306 - [[Memory Editor|memory_editor_example]] - [[Plot var helper|plot_var_example]]`, @@ -681,8 +655,8 @@ func testAnswers(baseURLContent, baseURLImages string) []string {

Ideas and codes

diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 8cd9fa608600..721dd0f0f75c 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -34,7 +34,7 @@ import ( "github.com/go-macaron/session" _ "github.com/go-macaron/session/redis" // redis plugin for store session "github.com/go-xorm/core" - ini "gopkg.in/ini.v1" + "gopkg.in/ini.v1" "strk.kbt.io/projects/go/libravatar" ) @@ -124,6 +124,7 @@ var ( ReverseProxyAuthUser string MinPasswordLength int ImportLocalPaths bool + DisableGitHooks bool // Database settings UseSQLite3 bool @@ -161,6 +162,7 @@ var ( PullRequestQueueLength int PreferredLicenses []string DisableHTTPGit bool + UseCompatSSHURI bool // Repository editor settings Editor struct { @@ -189,6 +191,7 @@ var ( PullRequestQueueLength: 1000, PreferredLicenses: []string{"Apache License 2.0,MIT License"}, DisableHTTPGit: false, + UseCompatSSHURI: false, // Repository editor settings Editor: struct { @@ -815,6 +818,7 @@ func NewContext() { ReverseProxyAuthUser = sec.Key("REVERSE_PROXY_AUTHENTICATION_USER").MustString("X-WEBAUTH-USER") MinPasswordLength = sec.Key("MIN_PASSWORD_LENGTH").MustInt(6) ImportLocalPaths = sec.Key("IMPORT_LOCAL_PATHS").MustBool(false) + DisableGitHooks = sec.Key("DISABLE_GIT_HOOKS").MustBool(false) InternalToken = sec.Key("INTERNAL_TOKEN").String() if len(InternalToken) == 0 { secretBytes := make([]byte, 32) @@ -903,6 +907,7 @@ func NewContext() { // Determine and create root git repository path. sec = Cfg.Section("repository") Repository.DisableHTTPGit = sec.Key("DISABLE_HTTP_GIT").MustBool() + Repository.UseCompatSSHURI = sec.Key("USE_COMPAT_SSH_URI").MustBool() Repository.MaxCreationLimit = sec.Key("MAX_CREATION_LIMIT").MustInt(-1) RepoRootPath = sec.Key("ROOT").MustString(path.Join(homeDir, "gitea-repositories")) forcePathSeparator(RepoRootPath) @@ -1013,19 +1018,21 @@ func NewContext() { // Service settings var Service struct { - ActiveCodeLives int - ResetPwdCodeLives int - RegisterEmailConfirm bool - DisableRegistration bool - ShowRegistrationButton bool - RequireSignInView bool - EnableNotifyMail bool - EnableReverseProxyAuth bool - EnableReverseProxyAutoRegister bool - EnableCaptcha bool - DefaultKeepEmailPrivate bool - DefaultAllowCreateOrganization bool - NoReplyAddress string + ActiveCodeLives int + ResetPwdCodeLives int + RegisterEmailConfirm bool + DisableRegistration bool + ShowRegistrationButton bool + RequireSignInView bool + EnableNotifyMail bool + EnableReverseProxyAuth bool + EnableReverseProxyAutoRegister bool + EnableCaptcha bool + DefaultKeepEmailPrivate bool + DefaultAllowCreateOrganization bool + DefaultEnableTimetracking bool + DefaultAllowOnlyContributorsToTrackTime bool + NoReplyAddress string // OpenID settings EnableOpenIDSignIn bool @@ -1046,6 +1053,8 @@ func newService() { Service.EnableCaptcha = sec.Key("ENABLE_CAPTCHA").MustBool() Service.DefaultKeepEmailPrivate = sec.Key("DEFAULT_KEEP_EMAIL_PRIVATE").MustBool() Service.DefaultAllowCreateOrganization = sec.Key("DEFAULT_ALLOW_CREATE_ORGANIZATION").MustBool(true) + Service.DefaultEnableTimetracking = sec.Key("DEFAULT_ENABLE_TIMETRACKING").MustBool(true) + Service.DefaultAllowOnlyContributorsToTrackTime = sec.Key("DEFAULT_ALLOW_ONLY_CONTRIBUTORS_TO_TRACK_TIME").MustBool(true) Service.NoReplyAddress = sec.Key("NO_REPLY_ADDRESS").MustString("noreply.example.org") sec = Cfg.Section("openid") @@ -1364,7 +1373,7 @@ func newWebhookService() { Webhook.QueueLength = sec.Key("QUEUE_LENGTH").MustInt(1000) Webhook.DeliverTimeout = sec.Key("DELIVER_TIMEOUT").MustInt(5) Webhook.SkipTLSVerify = sec.Key("SKIP_TLS_VERIFY").MustBool() - Webhook.Types = []string{"gitea", "gogs", "slack"} + Webhook.Types = []string{"gitea", "gogs", "slack", "discord"} Webhook.PagingNum = sec.Key("PAGING_NUM").MustInt(10) } diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 235b6495471b..5ac0f6ee54e4 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -66,6 +66,7 @@ func NewFuncMap() []template.FuncMap { }, "AvatarLink": base.AvatarLink, "Safe": Safe, + "SafeJS": SafeJS, "Sanitize": bluemonday.UGCPolicy().Sanitize, "Str2html": Str2html, "TimeSince": base.TimeSince, @@ -154,6 +155,9 @@ func NewFuncMap() []template.FuncMap { } return out.String() }, + "DisableGitHooks": func() bool { + return setting.DisableGitHooks + }, }} } @@ -162,6 +166,11 @@ func Safe(raw string) template.HTML { return template.HTML(raw) } +// SafeJS renders raw as JS +func SafeJS(raw string) template.JS { + return template.JS(raw) +} + // Str2html render Markdown text to HTML func Str2html(raw string) template.HTML { return template.HTML(markdown.Sanitize(raw)) diff --git a/options/locale/locale_bg-BG.ini b/options/locale/locale_bg-BG.ini index 2c325f4d70c3..594533b348ec 100644 --- a/options/locale/locale_bg-BG.ini +++ b/options/locale/locale_bg-BG.ini @@ -36,6 +36,7 @@ settings=ÐаÑтройки your_profile=ВашиÑÑ‚ профил your_settings=Вашите наÑтройки + activities=ÐктивноÑти pull_requests=ЗаÑвки за Ñливане issues=Задачи @@ -553,7 +554,6 @@ settings.wiki_delete_notices_1=- Това ще изтрие и ще деакти settings.delete=Изтрий това хранилище settings.delete_desc=След като изтриете хранилището, нÑма връщане назад. МолÑ, бъдете Ñигурни. settings.delete_notices_1=- Тази Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ ÐЕ МОЖЕ да бъде отменена в поÑледÑтвие. -settings.delete_notices_fork_1=- Ð’Ñички Ñ€Ð°Ð·ÐºÐ»Ð¾Ð½ÐµÐ½Ð¸Ñ Ñ‰Ðµ Ñтанат незавиÑими Ñлед изтриването. settings.transfer_owner=Ðов притежател settings.make_transfer=Прехвърли settings.confirm_delete=Потвърди изтриването @@ -640,7 +640,6 @@ release.ahead=%d ревизии на %s Ñлед тази ве release.source_code=Изходен код release.tag_name=Име на маркера release.target=Цел -release.tag_helper=Изберете ÑъщеÑтвуващ маркер или Ñъздайте нов маркер по време на публикуване. release.title=Заглавие release.content=Съдържание release.write=Редактор @@ -689,7 +688,6 @@ settings.delete_account=Изтриване на тази Ð¾Ñ€Ð³Ð°Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ settings.delete_prompt=ОрганизациÑта ще бъде изтрита и операциÑта ÐЕ МОЖЕ да бъде отменена в поÑледÑтвие! settings.confirm_delete_account=Потвърди изтриването settings.delete_org_title=Изтрий организациÑта -settings.hooks_desc=Добави уеб-куки, които ще бъдат използвани от вÑички хранилища в тази организациÑ. members.membership_visibility=ВидимоÑÑ‚: members.public=Публични @@ -718,7 +716,6 @@ teams.update_settings=Запази наÑтройките teams.delete_team=Изтриване на този екип teams.add_team_member=Добави учаÑтник в екипа teams.delete_team_title=Изтрий екипа -teams.delete_team_desc=Тъй като този екип ще бъдат изтрит, учаÑтниците му може да загубÑÑ‚ доÑтъп до нÑкои хранилища. Желаете ли да продължите? teams.read_permission_desc=Този екип предоÑÑ‚Ð°Ð²Ñ Ð´Ð¾Ñтъп за четене: учаÑтниците могат да разглеждат и клонират хранилищата на този екип. teams.write_permission_desc=Този екип предоÑÑ‚Ð°Ð²Ñ Ð´Ð¾Ñтъп за пиÑане: учаÑтниците могат да четат от и да предават към хранилищата на този екип. teams.admin_permission_desc=Този екип предоÑÑ‚Ð°Ð²Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑтраторÑки доÑтъп: учаÑтниците могат да четат от, да предават към и да Ð´Ð¾Ð±Ð°Ð²Ñ Ð½Ð¾Ð²Ð¸ Ñътрудници към хранилищата на този екип. @@ -838,7 +835,6 @@ auths.smtp_auth=SMTP удоÑтоверÑване auths.smtphost=SMTP Ñървър auths.smtpport=SMTP порт auths.allowed_domains=Разрешени домейни -auths.allowed_domains_helper=ОÑтавете празно за да не Ñе ограничават домейните. За множеÑтво домейни използвайте Ð·Ð°Ð¿ÐµÑ‚Ð°Ñ Ð·Ð° разделител. auths.enable_tls=Включи TLS криптиране auths.skip_tls_verify=ПропуÑни проверка на TLS Ñертификат auths.pam_service_name=Име на PAM уÑлуга @@ -864,7 +860,6 @@ config.reverse_auth_user=ПотребителÑко име при обратно config.ssh_config=SSH ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ config.ssh_enabled=Ðктивен -config.ssh_start_builtin_server=Стартирай вграден Ñървър config.ssh_domain=Домейн config.ssh_port=Порт config.ssh_listen_port=Порт за Ñлушане diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini index 1a0d11a4d6eb..bfcf37a8d6a7 100644 --- a/options/locale/locale_cs-CZ.ini +++ b/options/locale/locale_cs-CZ.ini @@ -37,6 +37,7 @@ settings=Nastavení your_profile=Váš profil your_settings=VaÅ¡e nastavení + activities=Aktivity pull_requests=Požadavek na natažení issues=Úkoly @@ -553,7 +554,6 @@ settings.wiki_delete_notices_1=- Toto smaže a vypne Wiki pro %s settings.delete=Smazat tento repositář settings.delete_desc=Jakmile smažete repositář, není možné se vrátit. BuÄte si, prosím, jist. settings.delete_notices_1=- Tuto operaci nelze zvrátit. -settings.delete_notices_fork_1=- Po smazání se vÅ¡echny forky se stanou nezávislé. settings.transfer_owner=Nový vlastník settings.make_transfer=PÅ™edat settings.confirm_delete=Potvrdit smazání @@ -641,7 +641,6 @@ release.ahead=%d revizí do vÄ›tve %s od tohoto vydání release.source_code=Zdrojový kód release.tag_name=Název znaÄky release.target=Cíl -release.tag_helper=Vyberte existující znaÄku nebo vytvoÅ™te novou znaÄku pÅ™i vydání. release.title=Název release.content=Obsah release.write=Zapsat @@ -690,7 +689,6 @@ settings.delete_account=Smazat tuto organizaci settings.delete_prompt=Organizace bude trvale smazána a tato zmÄ›na nemůže být vrácena! settings.confirm_delete_account=Potvrdit smazání settings.delete_org_title=Smazání organizace -settings.hooks_desc=PÅ™idejte webového háÄky, které budou spouÅ¡tÄ›ny nad vÅ¡emi repositáři této organizace. members.membership_visibility=Viditelnost Älenství: members.public=VeÅ™ejný @@ -719,7 +717,6 @@ teams.update_settings=Upravit nastavení teams.delete_team=Smazat tento tým teams.add_team_member=PÅ™idat Älena týmu teams.delete_team_title=Smazání týmu -teams.delete_team_desc=Jelikož bude tento tým smazán, jeho Älenové mohou ztratit přístup do nÄ›kterých repositářů. Chcete pokraÄovat? teams.read_permission_desc=ÄŒlenství v tom týmu poskytuje právo Ätení: Älenové mohou Äíst z a vytvářet klony repositářů týmu. teams.write_permission_desc=ÄŒlenství v tom týmu poskytuje právo zápisu: Älenové mohou Äíst z a nahrávat do repositářů týmu. teams.admin_permission_desc=ÄŒlenství v tom týmu poskytuje právo správce: Älenové mohou Äíst z, nahrávat do a pÅ™idávat spolupracovníky do repositářů týmu. @@ -838,7 +835,6 @@ auths.smtp_auth=Typ ověření SMTP auths.smtphost=Server SMTP auths.smtpport=Port SMTP auths.allowed_domains=Povolené domény -auths.allowed_domains_helper=Zanechte prázdné, pokud nechcete omezit jakékoliv domény. Domény musí být od sebe oddÄ›leny Äárkou ','. auths.enable_tls=Povolit Å¡ifrování TLS auths.skip_tls_verify=PÅ™eskoÄit ověření TLS auths.pam_service_name=Název služby PAM @@ -864,7 +860,6 @@ config.reverse_auth_user=Uživatel obráceného ověření config.ssh_config=Nastavení SSH config.ssh_enabled=Zapnutý -config.ssh_start_builtin_server=Spustit vestavÄ›ný server config.ssh_domain=Doména config.ssh_listen_port=Port pro naslouchání config.ssh_root_path=KoÅ™enová cesta diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index 937f1a8cebe3..3e56c09af607 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -5,7 +5,7 @@ dashboard=Ãœbersicht explore=Erkunden help=Hilfe sign_in=Anmelden -sign_in_with=Einloggen mit +sign_in_with=Anmelden mit sign_out=Abmelden sign_up=Registrieren link_account=Account verbinden @@ -46,6 +46,12 @@ your_profile=Profil your_starred=Deine Favoriten your_settings=Einstellungen +all=Alle +sources=Quellen +mirrors=Mirrors +collaborative=Kollaborativ +forks=Forks + activities=Aktivitäten pull_requests=Pull-Requests issues=Issues @@ -251,6 +257,7 @@ username_been_taken=Benutzername ist bereits vergeben. repo_name_been_taken=Dieser Repository-Name wird schon verwendet. org_name_been_taken=Name der Organisation wird bereits verwendet. team_name_been_taken=Teamname ist bereits vorhanden. +team_no_units_error=Das Team muss mindestens eine Einheit aktiviert haben. email_been_used=E-Mail-Adresse wird bereits verwendet. openid_been_used=OpenID-Adresse "%s" wurde bereits verwendet. username_password_incorrect=Falscher Benutzername oder Passwort. @@ -303,7 +310,7 @@ uid=Uid public_profile=Öffentliches Profil profile_desc=Deine E-Mail-Adresse ist öffentlich einsehbar und dient dazu, dir Benachrichtigungen bezüglich deines Kontos sowie Aktivitäten auf der Webseite zukommen zu lassen. -password_username_disabled=Nutzer die nicht von Gitea verwaltet sind, können ihren Benutzernamen nicht ändern. Bitte kontaktiere den Gitea-Administrator für mehr Details. +password_username_disabled=Nutzer, die nicht von Gitea verwaltet sind, können ihren Benutzernamen nicht ändern. Bitte kontaktiere den Gitea-Administrator für mehr Details. full_name=Vollständiger Name website=Webseite location=Standort @@ -351,7 +358,7 @@ add_openid=OpenID-URI hinzufügen add_email_confirmation_sent=Eine neue Bestätigungs-E-Mail wurde an '%s' gesendet. Kontrolliere dein Postfach innerhalb der nächsten %s, um die Verifizierung abzuschließen. add_email_success=Dein neue E-Mail-Adresse wurde erfolgreich hinzugefügt. add_openid_success=Deine neue OpenID-Adresse wurde erfolgreich hinzugefügt. -keep_email_private=Private E-Mail-Adressen +keep_email_private=E-Mail-Adresse nicht veröffentlichen keep_email_private_popup=Deine E-Mail-Adresse wird vor anderen Benutzern versteckt, wenn diese Option gesetzt ist. openid_desc=Mit deinen OpenID-Adressen kannst du die Authentifizierung an einen provider deiner Wahl delegieren @@ -491,6 +498,7 @@ migrate.lfs_mirror_unsupported=Spiegelung von LFS-Objekten wird nicht unterstüt mirror_from=Mirror von forked_from=geforkt von +fork_from_self=Du kannst kein Repository forken, das dir gehört! copy_link=Kopieren copy_link_success=Kopiert! copy_link_error=Drücke ⌘-C oder Strg-C zum Kopieren @@ -510,6 +518,7 @@ push_exist_repo=Bestehendes Repository via Kommandozeile pushen bare_message=Diese Repository hat noch keinen Inhalt. code=Code +code.desc=Code ist der Speicherort des Codes branch=Branch tree=Struktur filter_branch_and_tag=Nach Branch oder Tag filtern @@ -580,6 +589,8 @@ commits.message=Nachricht commits.date=Datum commits.older=Älter commits.newer=Neuer +commits.signed_by=Signiert von +commits.gpg_key_id=GPG Schlüssel ID ext_issues=Ext Issues ext_issues.desc=Externe Issues zu einer externen Website zuweisen @@ -689,6 +700,7 @@ issues.attachment.download=`Klicken um "%s" herunterzuladen` issues.subscribe=Abonnieren issues.unsubscribe=Abbestellen +pulls.desc=Pull-Requests helfen dir deinen Code zu überprüfen und neuen Code mit der Codebasis zusammenzuführen pulls.new=Neuer Pull-Request pulls.compare_changes=Änderungen vergleichen pulls.compare_changes_desc=Zwei Branches vergleichen und einen Pull-Request für die Änderungen erstellen. @@ -713,6 +725,7 @@ pulls.can_auto_merge_desc=Dieser Pull-Request kann automatisch zusammengeführt pulls.cannot_auto_merge_desc=Dieser Pull-Request kann nicht automatisch zusammengeführt werden, da es Konflikte gibt. pulls.cannot_auto_merge_helper=Bitte manuell zusammenführen, um die Konflikte zu lösen. pulls.merge_pull_request=Pull-Request zusammenführen +pulls.open_unmerged_pull_exists=`Du kannst diesen Pull-Request nicht wieder öffnen, da bereits ein offener Pull-Request (#%d) aus dem selben Repository mit den gleichen Merge-Informationen existiert und auf das Zusammenführen wartet.` milestones.new=Neuer Meilenstein milestones.open_tab=%d offen @@ -730,6 +743,7 @@ milestones.clear=Feld leeren milestones.invalid_due_date_format=Format des Fälligkeitsdatums ist ungültig. Es muss das Format 'JJJJ-MM-TT' haben. milestones.create_success=Meilenstein '%s' wurde erfolgreich erstellt! milestones.edit=Meilenstein bearbeiten +milestones.edit_subheader=Verwende eine aussagekräftige Beschreibung für Meilensteine, um Missverständnisse zu vermeiden. milestones.cancel=Abbrechen milestones.modify=Meilenstein ändern milestones.edit_success=Änderungen des Meilensteins '%s' wurden erfolgreich gespeichert! @@ -825,6 +839,7 @@ settings.deletion_success=Das Repository würde gelöscht. settings.update_settings_success=Repository Einstellungen wurden aktualisiert. settings.transfer_owner=Neuer Besitzer settings.make_transfer=Transfer starten +settings.transfer_succeed=Repository-Eigentum wurde übertragen. settings.confirm_delete=Löschen settings.add_collaborator=Mitarbeiter hinzufügen settings.add_collaborator_success=Neuer Mitarbeiter wurde hinzugefügt. @@ -892,6 +907,7 @@ settings.key_been_used=Deploy-Schlüssel wurde verwendet. settings.key_name_used=Ein Deploy-Schlüssel mit diesem Namen existiert bereits. settings.add_key_success=Der Deploy-Schlüssel '%s' wurde erfolgreich hinzugefügt! settings.deploy_key_deletion=Deploy-Schlüssel löschen +settings.deploy_key_deletion_desc=Durch das Löschen dieses Keys wird ein Zugriff damit nicht mehr möglich sein. Fortfahren? settings.deploy_key_deletion_success=Der Deploy-Schlüssel wurde erfolgreich gelöscht! settings.branches=Branches settings.protected_branch=Branch-Schutz @@ -912,6 +928,7 @@ settings.no_protected_branch=Es gibt keine geschützten Branches diff.browse_source=Quellcode durchsuchen diff.parent=Ursprung diff.commit=Commit +diff.data_not_available=Keine Diff-Daten verfügbar diff.show_diff_stats=Diff-Statistik anzeigen diff.show_split_view=Geteilte Ansicht diff.show_unified_view=Gesamtansicht @@ -921,6 +938,7 @@ diff.view_file=Datei anzeigen diff.file_suppressed=Datei-Diff unterdrückt, da er zu groß ist diff.too_many_files=Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden. +releases.desc=Unter Releases kannst du die Versionen deines Projekts verwalten release.releases=Releases release.new_release=Neues Release release.draft=Entwurf @@ -933,7 +951,7 @@ release.new_subheader=Veröffentliche Versionen um Projektversionen zu verfolgen release.edit_subheader=Ein ausführliche Changelog kann helfen, Benutzer verstehen, was sich geändert hat. release.tag_name=Tag-Name release.target=Ziel -release.tag_helper=Wähle einen existierenden Tag, oder erstelle einen neuen Tag bei der Veröffentlichung. +release.tag_helper=Wähle einen existierenden oder erstelle einen neuen Tag. release.title=Titel release.content=Inhalt release.write=Schreiben @@ -947,12 +965,17 @@ release.save_draft=Entwurf speichern release.edit_release=Release bearbeiten release.delete_release=Dieses Release löschen release.deletion=Release löschen +release.deletion_desc=Beim Löschen dieses Releases wird das entsprechende Git-Tag gelöscht. Möchtest du fortfahren? +release.deletion_success=Das Release wurde gelöscht. release.tag_name_already_exist=Ein Release mit diesem Tag existiert bereits. release.tag_name_invalid=Tag-Name ist nicht gültig. release.downloads=Downloads branch.delete=Branch %s löschen +branch.delete_desc=Das Löschen eines Branches kann nicht Rückgängig gemacht werden. branch.delete_notices_1=- Diese Operation kann nicht rückgängig gemacht werden. +branch.delete_notices_2=- Diese Operation wird permanent alle Inhalte des Branches %s löschen. +branch.deletion_success=%s wurde gelöscht. branch.deletion_failed=Branch %s konnte nicht gelöscht werden. branch.delete_branch_has_new_commits=%s kann nicht gelöscht weden, da es ungemergte Commits gibt. @@ -971,7 +994,10 @@ create_new_team=Neues Team erstellen org_desc=Beschreibung team_name=Teamname team_desc=Beschreibung +team_name_helper=Unter diesem Namen kannst du in Diskussionen auf das Team verweisen. team_desc_helper=Wofür ist dieses Team da? +team_permission_desc=Welche Berechtigungsstufe soll das Team haben? +team_unit_desc=Auf welche Bestandteile sollte dieses Team Zugriff haben? form.name_reserved=Organisationsname '%s' ist bereits vergeben. form.name_pattern_not_allowed=Organisationsnamen der Form '%s' sind nicht erlaubt. @@ -983,11 +1009,15 @@ settings.full_name=Vollständiger Name settings.website=Webseite settings.location=Standort settings.update_settings=Einstellungen speichern +settings.update_setting_success=Organisationseinstellungen wurden aktualisiert. +settings.change_orgname_prompt=Diese Änderung wird die Links zur Organisation ändern. +settings.update_avatar_success=Der Organisationsavatar wurde aktualisiert. settings.delete=Organisation löschen settings.delete_account=Diese Organisation löschen settings.delete_prompt=Die Organisation wird dauerhaft gelöscht. Dies kann NICHT rückgängig gemacht werden! settings.confirm_delete_account=Löschen settings.delete_org_title=Organisation löschen +settings.delete_org_desc=Diese Organisation wird dauerhaft gelöscht. Möchtest du fortfahren? settings.hooks_desc=Webhooks hinzufügen, die für alle Repositories dieser Organisation ausgelöst werden. members.membership_visibility=Sichtbarkeit der Mitgliedschaft: @@ -1020,6 +1050,7 @@ teams.delete_team=Dieses Team löschen teams.add_team_member=Teammitglied hinzufügen teams.delete_team_title=Team löschen teams.delete_team_desc=Mitglieder dieses Teams verlieren möglicherweise ihren Zugang zu einigen Repositories, wenn dieses Team gelöscht wird. Möchtest du fortfahren? +teams.delete_team_success=Das Team wurde gelöscht. teams.read_permission_desc=Dieses Team hat Lesezugriff: Mitglieder können Team-Repositories einsehen und klonen. teams.write_permission_desc=Dieses Team hat Schreibzugriff: Mitglieder können Team-Repositories einsehen und darauf pushen. teams.admin_permission_desc=Dieses Team hat Adminzugriff: Mitglieder dieses Teams können pullen, pushen und Mitarbeiter zu Team-Repositories hinzufügen. @@ -1049,14 +1080,24 @@ dashboard.statistic_info=Gitea Datenbank hat %d Benutzer, %d Organ dashboard.operation_name=Name der Operation dashboard.operation_switch=Wechseln dashboard.operation_run=Ausführen +dashboard.clean_unbind_oauth=Nicht verbundene OAuths Verbindungen löschen +dashboard.clean_unbind_oauth_success=Alle unverbundene OAuth-Verbindungen wurden gelöscht. dashboard.delete_inactivate_accounts=Deaktivierte Konten löschen +dashboard.delete_inactivate_accounts_success=Alle deaktivierten Konten wurden erfolgreich gelöscht. dashboard.delete_repo_archives=Alle Repository-Archive löschen -dashboard.delete_missing_repos=Alle Repositorys löschen, welche ihre zugehörigen Git-Dateien verloren haben +dashboard.delete_repo_archives_success=Alle Repository-Archive wurden gelöscht. +dashboard.delete_missing_repos=Alle Repository-Datensätze mit verlorenen gegangenen Git-Dateien löschen +dashboard.delete_missing_repos_success=Alle Repository-Datensätze mit verlorenen Git-Dateien wurden erfolgreich gelöscht. dashboard.git_gc_repos=Garbage Collection auf allen Repositories ausführen +dashboard.git_gc_repos_success=Alle Repositories haben garbage collection erfolgreich beendet. dashboard.resync_all_sshkeys=Datei '.ssh/Authorized_keys' neuschreiben (für Gitea SSH-Schlüssel) dashboard.resync_all_sshkeys_success=Alle öffentlichen Keys wurden erfolgreich neu geschrieben. dashboard.resync_all_hooks=Synchronisiere pre-receive, update und post-receive Hooks für alle Repositories. +dashboard.resync_all_hooks_success=Pre-receive, update und post-receive Hooks aller Repositories wurden erfolgreich synchronisiert. dashboard.reinit_missing_repos=Alle Git-Repositories für welche Einträge existieren neu einlesen +dashboard.reinit_missing_repos_success=Alle verlorenen Git-Repositories mit existierenden Einträgen wurden erfolgreich aktualisiert. +dashboard.sync_external_users=Externe Benutzerdaten synchronisieren +dashboard.sync_external_users_started=Externe Benutzer Synchronisation gestartet dashboard.server_uptime=Server-Uptime dashboard.current_goroutine=Aktuelle Goroutines dashboard.current_memory_usage=Aktuelle Speichernutzung @@ -1087,6 +1128,7 @@ dashboard.total_gc_pause=Gesamte GC-Pause dashboard.last_gc_pause=Letzte GC-Pause dashboard.gc_times=Anzahl GC +users.user_manage_panel=Benutzerverwaltung users.new_account=Neues Konto erstellen users.name=Name users.activated=Aktiviert @@ -1096,26 +1138,35 @@ users.created=Erstellt am users.last_login=Letzte Anmeldung users.never_login=Niemals eingeloggt users.send_register_notify=Bei der Registrierung eine Benachrichtigung an den Benutzer senden +users.new_success=Der Account '%s' wurde erfolgreich erstellt. users.edit=Bearbeiten users.auth_source=Authentifizierungsquelle users.local=Lokal users.auth_login_name=Anmeldename zur Authentifizierung users.password_helper=Leer lassen um es unverändert zu lassen. +users.update_profile_success=Kontoprofil wurde erfolgreich aktualisiert. users.edit_account=Konto bearbeiten users.max_repo_creation=Maximale Anzahl erstellbarer Repositories users.max_repo_creation_desc=(Auf -1 setzen, um das globale Standardlimit zu verwenden) users.is_activated=Dieses Konto hat die Aktivierung abgeschlossen -users.prohibit_login=Der Anmeldevorgang für dieses Konto wurde verweigert +users.prohibit_login=Diesem Konto den Login verweigern users.is_admin=Dieses Konto hat Administratorrechte users.allow_git_hook=Dieses Konto ist berechtigt, Git-Hooks zu erstellen users.allow_import_local=Dieses Konto ist berechtigt, lokale Repositories zu importieren +users.allow_create_organization=Mit diesem Konto ist das Erstellen von Organisationen erlaubt users.update_profile=Konto aktualisieren users.delete_account=Dieses Konto löschen +users.still_own_repo=Dieses Konto besitzt noch Repositories. Diese müssen zuerst gelöscht oder übertragen werden. +users.still_has_org=Dieses Konto ist noch Mitglied von mindestens einer Organisation. Du musst alle Organisationen erst verlassen oder löschen. +users.deletion_success=Das Konto wurde erfolgreich gelöscht. +orgs.org_manage_panel=Organisationsverwaltung orgs.name=Name orgs.teams=Teams orgs.members=Mitglieder +orgs.new_orga=Organisation erstellen +repos.repo_manage_panel=Repositoryverwaltung repos.owner=Besitzer repos.name=Name repos.private=Privat @@ -1124,10 +1175,12 @@ repos.stars=Favoriten repos.issues=Issues repos.size=Größe +auths.auth_manage_panel=Authentifizierung auths.new=Neue Quelle hinzufügen auths.name=Name auths.type=Typ auths.enabled=Aktiviert +auths.syncenabled=Benutzersynchronisation aktivieren auths.updated=Aktualisiert auths.auth_type=Authentifizierungstyp auths.auth_name=Authentifizierungsname @@ -1137,6 +1190,7 @@ auths.host=Host auths.port=Port auths.bind_dn=DN binden auths.bind_password=Passwort binden +auths.bind_password_helper=Achtung: Das Passwort wird im Klartext gespeichert. Benutze kein Konto mit hoher Berechtigungsstufe. auths.user_base=Basis für Benutzersuche auths.user_dn=Benutzer DN auths.attribute_username=Attribut Benutzername @@ -1152,16 +1206,40 @@ auths.smtp_auth=SMTP-Authentifizierung auths.smtphost=SMTP-Host auths.smtpport=SMTP-Port auths.allowed_domains=Erlaubte Domains -auths.allowed_domains_helper=Leer lassen für keine Einschränkungen. Mehrere Domains können durch Komma "," getrennt werden. +auths.allowed_domains_helper=Leer lassen um alle Domains zu erlauben. Mehrere Domains können durch Komma "," getrennt werden. auths.enable_tls=TLS-Verschlüsselung aktivieren auths.skip_tls_verify=TLS-Prüfung überspringen auths.pam_service_name=PAM Dienstname +auths.oauth2_provider=OAuth2 Anbieter auths.oauth2_clientID=Client-ID (Schlüssel) auths.oauth2_clientSecret=Client-Secret +auths.openIdConnectAutoDiscoveryURL=OpenID Connect Auto Discovery URL +auths.oauth2_use_custom_url=Benutzerdefinierte URLs anstelle von Standard-URLs verwenden +auths.oauth2_tokenURL=Token-URL +auths.oauth2_authURL=Authorisier-URL +auths.oauth2_profileURL=Profil-URL +auths.oauth2_emailURL=E-Mail-URL auths.enable_auto_register=Automatische Registrierung aktivieren auths.tips=Tipps +auths.tips.oauth2.general=OAuth2 Authentifizierung +auths.tips.oauth2.general.tip=Beim Registrieren einer neuen OAuth2 Authentifizierung sollte die callback/weiterleitungs-URL /user/oauth2//callback sein +auths.tip.oauth2_provider=OAuth2 Anbieter +auths.tip.bitbucket=Registriere einen neuen OAuth consumer unter https://bitbucket.org/account/user//oauth-consumers/new und füge die Berechtigung "Account"-"Read" hinzu +auths.tip.dropbox=Erstelle unter https://www.dropbox.com/developers/apps eine neue App +auths.tip.facebook=Registriere unter https://developers.facebook.com/apps eine neue App und füge das Produkt "Facebook Login" hinzu +auths.tip.github=Registriere unter https://github.com/settings/applications/new eine neue OAuth Anwendung +auths.tip.gitlab=Registriere unter https://gitlab.com/profile/applications eine neue Anwendung +auths.tip.google_plus=Du erhälst die OAuth2 Client Zugangsdaten in der Google API Console (https://console.developers.google.com) +auths.tip.openid_connect=Benutze die OpenID Connect Discovery URL (/.well-known/openid-configuration), um den Endpunkt zu spezifizieren +auths.tip.twitter=Gehe auf https://dev.twitter.com/apps, erstelle eine Anwendung und stelle sicher, dass die Option “Allow this application to be used to Sign in with Twitter†aktiviert ist. +auths.edit=Authentifizierungseinstellungen bearbeiten auths.activated=Diese Authentifizierung ist aktiv +auths.new_success=Die Authentifizierung "%s" wurde hinzugefügt. +auths.update_success=Die Authentifizierungseinstellungen wurden aktualisiert. +auths.update=Authentifizierungseinstellungen aktualisieren auths.delete=Diese Authentifizierungsquelle löschen +auths.delete_auth_title=Authentifizierungsquelle löschen +auths.delete_auth_desc=Diese Authentifizierung wird gelöscht. Möchtest du fortfahren? auths.still_in_used=Diese Authentifizierung wird noch von einigen Benutzern verwendet. Bitte lösche diese Benutzer oder ändere deren Anmeldetyp. auths.deletion_success=Authentifizierung wurde erfolgreich gelöscht! auths.login_source_exist=Login-Quelle '%s' ist bereits vorhanden. @@ -1217,12 +1295,15 @@ config.mail_notify=E-Mail-Benachrichtigung config.disable_key_size_check=Prüfung der Mindestschlüssellänge deaktiveren config.enable_captcha=Captcha aktivieren config.active_code_lives=Aktivierungscode Lebensdauer +config.reset_password_code_lives=Ablaufdatum des Passworts zurücksetzen config.default_keep_email_private=Standard-Wert für "Private E-Mail-Adressen +config.default_allow_create_organization=Standardmäßige Erlaubnis eine Organisation zu erstellen config.no_reply_address=No-Reply Adresse config.webhook_config=Webhook-Konfiguration config.queue_length=Warteschlangenlänge config.deliver_timeout=Zeitlimit für Zustellung +config.skip_tls_verify=Ãœberspringe die Ãœberprüfung des TLS-Zertifikats config.mailer_config=Mailer-Konfiguration config.mailer_enabled=Aktiviert @@ -1231,6 +1312,7 @@ config.mailer_name=Name config.mailer_host=Host config.mailer_user=Benutzer config.send_test_mail=Test-E-Mail senden +config.test_mail_failed=Das Senden der Test-E-Mail an '%s' ist fehlgeschlagen: %v config.test_mail_sent=Test-E-Mail wurde an '%s' gesendet. config.oauth_config=OAuth-Konfiguration @@ -1283,6 +1365,7 @@ monitor.start=Startzeit monitor.execute_time=Ausführungszeit notices.system_notice_list=Systemmitteilungen +notices.view_detail_header=Meldungsdetails ansehen notices.actions=Aktionen notices.select_all=Alles auswählen notices.deselect_all=Alles abwählen @@ -1293,6 +1376,7 @@ notices.type=Typ notices.type_1=Repository notices.desc=Beschreibung notices.op=Aktion +notices.delete_success=Diese Systemmeldung wurde gelöscht. [action] create_repo=hat das Repository %s erstellt @@ -1308,11 +1392,13 @@ comment_issue=`hat Issue %s#%[2]s kommentiert` merge_pull_request=`hat Pull-Request %s#%[2]s zuammengeführt` transfer_repo=hat Repository %s transferiert an %s push_tag=hat Tag %[2]s auf %[3]s gepusht +compare_commits=Vergleiche %d Commits [tool] ago=vor %s from_now=in %s now=jetzt +future=Zukunft 1s=1 Sekunde 1m=1 Minute 1h=1 Stunde @@ -1331,6 +1417,7 @@ raw_seconds=Sekunden raw_minutes=Minuten [dropzone] +default_message=Zum Hochladen hier klicken oder Datei hier ablegen. invalid_input_type=Dateien dieses Dateityps können nicht hochgeladen werden. file_too_big=Dateigröße ({{filesize}} MB) überschreitet die Maximalgröße ({{maxFilesize}} MB). remove_file=Datei entfernen @@ -1338,7 +1425,7 @@ remove_file=Datei entfernen [notification] notifications=Nachrichten unread=Ungelesen -read=Lesen +read=Gelesen no_unread=Du hast momentan keine ungelesenen Benachrichtigungen. no_read=Du hast momentan keine gelesenen Benachrichtigungen. pin=Benachrichtigung pinnen @@ -1348,8 +1435,12 @@ mark_as_unread=Als ungelesen markieren [gpg] error.extract_sign=Die Signatur konnte nicht extrahiert werden error.generate_hash=Es konnte kein Hash vom Commit generiert werden +error.no_committer_account=Es ist kein Account mit dieser Commiter-Email verbunden error.no_gpg_keys_found=Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden error.not_signed_commit=Kein signierter Commit +error.failed_retrieval_gpg_keys=Fehler beim Abrufen eines Keys des Commiter-Accounts [units] +error.no_unit_allowed_repo=Es konnte kein Bestandteil in dieser Repository gefunden werden auf den der Zugriff erlaubt ist +error.unit_not_allowed=Du bist nicht berechtigt diesen Repository-Bestandteil zu benutzen diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index a4c3f2f5cfca..c56a895a79c2 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -46,6 +46,12 @@ your_profile = Your Profile your_starred = Your Starred your_settings = Your Settings +all = All +sources = Sources +mirrors = Mirrors +collaborative = Collaborative +forks = Forks + activities = Activities pull_requests = Pull Requests issues = Issues @@ -110,6 +116,10 @@ federated_avatar_lookup = Enable Federated Avatars Lookup federated_avatar_lookup_popup = Enable federated avatar lookup using Libravatar. disable_registration = Disable Self-registration disable_registration_popup = Disable user self-registration, only admin can create accounts. +openid_signin = Enable OpenID Sign-In +openid_signin_popup = Enable user login via OpenID +openid_signup = Enable OpenID Self-registration +openid_signup_popup = Enable OpenID based Self-registration enable_captcha = Enable Captcha enable_captcha_popup = Require a CAPTCHA for user self-registration. require_sign_in_view = Enable Require Sign In to View Pages @@ -134,6 +144,8 @@ default_keep_email_private = Default Value for Keep Email Private default_keep_email_private_popup = This is the default value for the visibility of the user's email address. If set to true the email address of all new users will be hidden until the user changes his setting. default_allow_create_organization = Default permission value for new users to create organizations default_allow_create_organization_popup = This is default permission value that will be assigned for new users. If set to true new users will be allowed to create Organizations. +default_enable_timetracking = Enable time tracking by default +default_enable_timetracking_popup = Repositories will have time tracking enabled by default depending on this setting no_reply_address = No-reply Address no_reply_address_helper = Domain for the user's email address in git logs if he keeps his email address private. E.g. user 'joe' and 'noreply.example.org' will be 'joe@noreply.example.org' @@ -368,7 +380,7 @@ add_new_gpg_key = Add GPG Key ssh_key_been_used = This public key has already been used. ssh_key_name_used = A public key with same name already exists. gpg_key_id_used = A public GPG key with same id already exists. -gpg_key_email_not_found = The email attached to the GPG key couldn't be found or is not confirmed yet: %s +gpg_no_key_email_found = None of the emails attached to the GPG key could be found. subkeys = Subkeys key_id = Key ID key_name = Key Name @@ -602,6 +614,7 @@ issues.new.closed_milestone = Closed Milestones issues.new.assignee = Assignee issues.new.clear_assignee = Clear assignee issues.new.no_assignee = No assignee +issues.no_ref = No Branch/Tag Specified issues.create = Create Issue issues.new_label = New Label issues.new_label_placeholder = Label name... @@ -712,6 +725,23 @@ issues.dependency.setting = Issues can have dependencies issues.dependency.add_error_same_issue = You cannot make an issue depend on itself! issues.dependency.add_error_dep_not_exist = Dependend issue does not exist! issues.dependency.add_error_dep_exists = Dependency already exists! +issues.tracker = Time tracker +issues.start_tracking_short = Start +issues.start_tracking = Start time tracking +issues.start_tracking_history = `started working %s` +issues.tracking_already_started = `You have already started time tracking on this issue!` +issues.stop_tracking = Stop +issues.stop_tracking_history = `stopped working %s` +issues.add_time = Add time manually +issues.add_time_short = Add +issues.add_time_cancel = Cancel +issues.add_time_history = `added spent time %s` +issues.add_time_hours = Hours +issues.add_time_minutes = Minutes +issues.add_time_sum_to_small = No time was entered +issues.cancel_tracking = Cancel +issues.cancel_tracking_history = `cancelled time tracking %s` +issues.time_spent_total = Total time spent pulls.desc = Pulls management your code review and merge requests pulls.new = New Pull Request @@ -826,6 +856,8 @@ settings.tracker_issue_style = External Issue Tracker Naming Style: settings.tracker_issue_style.numeric = Numeric settings.tracker_issue_style.alphanumeric = Alphanumeric settings.tracker_url_format_desc = You can use placeholder {user} {repo} {index} for user name, repository name and issue index. +settings.enable_timetracker = Enable time tracker +settings.allow_only_contributors_to_track_time = Allow only contributors to track time settings.pulls_desc = Enable pull requests to accept public contributions settings.danger_zone = Danger Zone settings.new_owner_has_same_repo = The new owner already has a repository with same name. Please choose another name. @@ -887,6 +919,8 @@ settings.content_type = Content Type settings.secret = Secret settings.slack_username = Username settings.slack_icon_url = Icon URL +settings.discord_username = Username +settings.discord_icon_url = Icon URL settings.slack_color = Color settings.event_desc = When should this webhook be triggered? settings.event_push_only = Just the push event. @@ -898,6 +932,8 @@ settings.event_pull_request = Pull Request settings.event_pull_request_desc = Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized. settings.event_push = Push settings.event_push_desc = Git push to a repository +settings.event_repository = Repository +settings.event_repository_desc = Repository created or deleted settings.active = Active settings.active_helper = Information about the event which triggered the hook will be sent as well. settings.add_hook_success = New webhook has been added. @@ -910,6 +946,7 @@ settings.add_slack_hook_desc = Add Slack integration to your re settings.slack_token = Token settings.slack_domain = Domain settings.slack_channel = Channel +settings.add_discord_hook_desc = Add Discord integration to your repository. settings.deploy_keys = Deploy Keys settings.add_deploy_key = Add Deploy Key settings.deploy_key_desc = Deploy keys have read-only access. They are not the same as personal account SSH keys. @@ -1311,6 +1348,8 @@ config.active_code_lives = Active Code Lives config.reset_password_code_lives = Reset Password Code Expiry Time config.default_keep_email_private = Default Value for Keep Email Private config.default_allow_create_organization = Default permission to create organizations +config.default_enable_timetracking = Enable time tracking by default +config.default_allow_only_contributors_to_track_time = Allow only contributors to track time by default config.no_reply_address = No-reply Address config.webhook_config = Webhook Configuration diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini index 6f84dc9ffb8a..eb910b39a64e 100644 --- a/options/locale/locale_es-ES.ini +++ b/options/locale/locale_es-ES.ini @@ -41,6 +41,7 @@ your_profile=Tu perfil your_starred=Tus favoritos your_settings=Tu configuración + activities=Actividad issues=Incidencias @@ -580,7 +581,6 @@ settings.wiki_delete_notices_1=- Esto eliminará y deshabilitará la wiki para % settings.delete=Eliminar este repositorio settings.delete_desc=Una vez has eliminado un repositorio, no hay vuelta atrás. Por favor, asegúrate de que es lo que quieres. settings.delete_notices_1=- Esta operación NO PUEDE revertirse. -settings.delete_notices_fork_1=- Todos los forks se convertirán en independientes tras el borrado. settings.transfer_owner=Nuevo Propietario settings.make_transfer=Transferir settings.confirm_delete=Confirmar eliminación @@ -663,7 +663,6 @@ release.ahead=%d commits en %s desde esta release release.source_code=Código Fuente release.tag_name=Nombre de la etiqueta release.target=Destino -release.tag_helper=Escoge una etiqueta o crea una nueva al publicar. release.title=Título release.content=Contenido release.write=Escribir @@ -714,7 +713,6 @@ settings.delete_account=Eliminar esta organización settings.delete_prompt=Esta operación eliminará esta organización de manera permanente, y ¡NO PUEDE deshacerse! settings.confirm_delete_account=Confirmar eliminación settings.delete_org_title=Eliminación de la organización -settings.hooks_desc=Añadir webhooks que serán ejecutados para todos los repositorios de esta organización. members.membership_visibility=Visibilidad de Membresía: members.public=Público @@ -743,7 +741,6 @@ teams.update_settings=Actualizar configuración teams.delete_team=Eliminar este equipo teams.add_team_member=Añadir miembro al equipo teams.delete_team_title=Eliminar equipo -teams.delete_team_desc=Este equipo va a ser eliminado, ¿seguro que quieres continuar? Los miembros de este equipo pueden perder acceso a algunos repositorios. teams.read_permission_desc=Este equipo tiene permisos de Lectura: sus miembros pueden ver y clonar los repositorios del equipo. teams.write_permission_desc=Este equipo tiene permisos de Escritura: sus miembros pueden leer y hacer push a los repositorios del equipo. teams.admin_permission_desc=Este equipo tiene permisos de Administración: sus miembros pueden leer, hacer push y añadir colaboradores a los repositorios del equipo. @@ -862,7 +859,6 @@ auths.admin_filter=Filtro de aministrador auths.smtp_auth=Tipo de autenticación SMTP auths.smtpport=Puerto SMTP auths.allowed_domains=Dominios Permitidos -auths.allowed_domains_helper=Deje el campo vacío si no desea restringir ningún dominio. Para restringir más de uno, separe los dominios con una coma ','. auths.enable_tls=Habilitar cifrado TLS auths.skip_tls_verify=Omitir la verificación TLS auths.pam_service_name=Nombre del Servicio PAM @@ -889,7 +885,6 @@ config.reverse_auth_user=Autenticación Inversa de Usuario config.ssh_config=Configuración SSH config.ssh_enabled=Habilitado -config.ssh_start_builtin_server=Iniciar servidor integrado config.ssh_domain=Dominio config.ssh_port=Puerto config.ssh_listen_port=Puerto de escucha diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini index bc59a82f06bd..8733e55b0f47 100644 --- a/options/locale/locale_fi-FI.ini +++ b/options/locale/locale_fi-FI.ini @@ -40,6 +40,7 @@ settings=Asetukset your_profile=Profiilisi your_settings=Asetuksesi + activities=Toimet pull_requests=Pull requestit issues=Ongelmat @@ -610,7 +611,6 @@ release.ahead=%d committia kohteeseen %s version jälkeen release.source_code=Lähdekoodi release.tag_name=Taginimi release.target=Kohde -release.tag_helper=Valitse olemassaoleva tagi, tai luo uusi tagi julkaistaessa. release.title=Otsikko release.content=Sisältö release.write=Kirjoita @@ -660,7 +660,6 @@ settings.delete_account=Poista tämä organisaatio settings.delete_prompt=Organisaatio poistetaan pysyvästi, ja tätä EI VOI peruuttaa myöhemmin! settings.confirm_delete_account=Vahvista poisto settings.delete_org_title=Organisaation poistaminen -settings.hooks_desc=Lisää webkoukkuja jotka laukeavat kaikissa repoissa tässä organisaatiossa. members.membership_visibility=Jäsenyyden näkyvyys: members.public=Julkinen @@ -689,7 +688,6 @@ teams.update_settings=Päivitä asetukset teams.delete_team=Poista tämä ryhmä teams.add_team_member=Lisää tiimin jäsen teams.delete_team_title=Ryhmän poistaminen -teams.delete_team_desc=Kun tämä tiimi poistetaan, tiimin jäsenet voivat menettää pääsyn joihinkin repoihin. Haluatko jatkaa? teams.read_permission_desc=Tämä tiimi myöntää lukuoikeuden: jäsenet voivat katsella ja kloonata tiimin repot. teams.write_permission_desc=Tämä tiimi myöntää kirjoitusoikeuden: jäsenet voivat lukea ja pushata tiimin repoihin. teams.admin_permission_desc=Tämä tiimi myöntää ylläpito-oikeuden: jäsenet voivat lukea, pushata, ja lisätä yhteistyökumppaneita tiimin repoihin. @@ -811,7 +809,6 @@ auths.smtp_auth=SMTP todennustyyppi auths.smtphost=SMTP isäntä auths.smtpport=SMTP portti auths.allowed_domains=Sallitut verkkotunnukset -auths.allowed_domains_helper=Jätä tyhjäksi jos et rajoita yhtään verkkotunnusta. Useat verkkotunnukset erotetaan pilkulla ','. auths.enable_tls=Ota käyttöön TLS-salaus auths.skip_tls_verify=Ohita TLS tarkistaminen auths.pam_service_name=PAM palvelun nimi @@ -837,7 +834,6 @@ config.reverse_auth_user=Käänteinen todennus käyttäjä config.ssh_config=SSH asetukset config.ssh_enabled=Käytössä -config.ssh_start_builtin_server=Käynnistä sisäänrakennettu palvelin config.ssh_domain=Verkkotunnus config.ssh_port=Portti config.ssh_listen_port=Kuuntele porttia diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini index 1ee6db4eb884..441a333a1697 100644 --- a/options/locale/locale_fr-FR.ini +++ b/options/locale/locale_fr-FR.ini @@ -45,6 +45,7 @@ your_profile=Votre profil your_starred=Vos favoris your_settings=Vos paramètres + activities=Activités pull_requests=Demandes d'ajout issues=Tickets @@ -269,7 +270,7 @@ form.name_pattern_not_allowed=Motif '%s' interdit pour les noms d'utilisateur. [settings] profile=Profil -password=Mot de Passe +password=Mot de passe avatar=Avatar ssh_gpg_keys=Clés SSH / GPG social=Réseaux Sociaux @@ -439,7 +440,7 @@ branches=Branches tags=Tags issues=Tickets pulls=Demandes d'ajout -labels=Etiquettes +labels=Étiquettes milestones=Jalons commits=Révisions releases=Publications @@ -450,7 +451,7 @@ file_permalink=Lien permanent file_too_large=Ce fichier est trop gros pour être afficher video_not_supported_in_browser=Votre navigateur ne supporte pas le tag video HTML5. stored_lfs=Stocké avec Git LFS -commit_graph=Graphique des Commits +commit_graph=Graphique des révisions editor.new_file=Nouveau fichier editor.upload_file=Téléverser un fichier @@ -501,7 +502,7 @@ commits.newer=Récemment issues.new=Nouveau ticket -issues.new.labels=Etiquettes +issues.new.labels=Étiquettes issues.new.no_label=Pas d'étiquette issues.new.clear_labels=Effacer les étiquettes issues.new.milestone=Jalon @@ -517,8 +518,9 @@ issues.new_label=Nouvelle étiquette issues.new_label_placeholder=Nom de l'étiquette... issues.create_label=Créer une étiquette issues.label_templates.title=Charger un ensemble prédéfini d'étiquettes +issues.label_templates.info=Il n'y a pas encore d'étiquettes. Vous pouvez cliquer sur le bouton "Nouvelle étiquette" pour en créer une ou en utiliser une prédéfinies ci-dessous. issues.label_templates.helper=Sélectionnez un ensemble d'étiquettes -issues.label_templates.use=Utilisez ce jeu d'étiquettes +issues.label_templates.use=Utiliser ce jeu d'étiquettes issues.label_templates.fail_to_load_file=Impossible de charger le fichier de modèle étiquette '%s' : %v issues.add_label_at=`ajouté le
%s
label %s` issues.remove_label_at=`supprimé le
%s
label %s` @@ -533,7 +535,7 @@ issues.delete_branch_at=`a supprimé la branche %s %s` issues.open_tab=%d Ouvert issues.close_tab=%d Fermé issues.filter_label=Étiquette -issues.filter_label_no_select=Aucun étiquette sélectionnée +issues.filter_label_no_select=Aucune étiquette sélectionnée issues.filter_milestone=Jalon issues.filter_milestone_no_select=Aucun jalon sélectionné issues.filter_assignee=Assigné @@ -581,14 +583,15 @@ issues.sign_in_require_desc=Connectez-vous pour rejoindre cette issues.edit=Modifier issues.cancel=Annuler issues.save=Enregistrer -issues.label_title=Nom du Label -issues.label_color=Couleur du Label +issues.label_title=Nom de l'étiquette +issues.label_color=Couleur de l'étiquette issues.label_count=%d étiquettes issues.label_open_issues=%d tickets ouverts issues.label_edit=Éditer issues.label_delete=Supprimer -issues.label_modify=Modification du Label -issues.label_deletion=Suppression du Label +issues.label_modify=Modification de l'étiquette +issues.label_deletion=Suppression de l'étiquette +issues.label_deletion_success=L'étiquette a été supprimé avec succès ! issues.label.filter_sort.alphabetically=Par ordre alphabétique issues.label.filter_sort.reverse_alphabetically=Par ordre alphabétique inversé issues.label.filter_sort.by_size=Taille @@ -623,7 +626,7 @@ pulls.cannot_auto_merge_desc=Cette demande d'ajout ne peut pas être fusionnée pulls.cannot_auto_merge_helper=Fusionner manuellement afin de résoudre les conflits. pulls.merge_pull_request=Fusionner la demande d'ajout -milestones.new=Nouveau Jalon +milestones.new=Nouveau jalon milestones.open_tab=%d Ouvert milestones.close_tab=%d Fermé milestones.closed=%s fermé @@ -712,9 +715,8 @@ settings.wiki_delete=Effacer les données du Wiki settings.wiki_delete_desc=Une fois que vous effacez les données du wiki, on ne peut revenir en arrière. Soyez-en sûr. settings.wiki_delete_notices_1=- Cela va supprimer et désactiver le wiki pour %s settings.delete=Supprimer ce dépôt -settings.delete_desc=Attention, cette action est action irréversible. Soyez sûr de vous. +settings.delete_desc=La suppression d'un dépôt est irréversible. Soyez sûr de vous. settings.delete_notices_1=- Cette opération ne peut pas être annulée. -settings.delete_notices_fork_1=- Toutes les bifurcations deviendront indépendantes après l’effacement. settings.transfer_owner=Nouveau propriétaire settings.make_transfer=Transférer settings.confirm_delete=Confirmer la suppression @@ -811,7 +813,6 @@ release.ahead=%d révisions sur %s depuis cette publication release.source_code=Code source release.tag_name=Nom du tag release.target=Cible -release.tag_helper=Choisissez un tag existant ou créez-en un nouveau lors de la publication. release.title=Titre release.content=Contenu release.write=Écrire @@ -865,7 +866,6 @@ settings.delete_account=Supprimer cette organisation settings.delete_prompt=Cela supprimera cette organisation définitivement. Cette opération est IRRÉVERSIBLE ! settings.confirm_delete_account=Confirmez la suppression settings.delete_org_title=Suppression d'organisation -settings.hooks_desc=Ajoute des webhooks qui seront activés pour tous les dépôts de cette organisation. members.membership_visibility=Visibilité des membres: members.public=Public @@ -882,10 +882,10 @@ members.invite_now=Envoyer une invitation teams.join=Rejoindre teams.leave=Quitter -teams.read_access=Accès en Lecture +teams.read_access=Accès en lecture teams.read_access_helper=Cette équipe aura la possibilité de voir et cloner ses dépôts. -teams.write_access=Accès en Écriture -teams.admin_access=Accès Administrateur +teams.write_access=Accès en écriture +teams.admin_access=Accès administrateur teams.no_desc=Aucune description teams.settings=Paramètres teams.owners_permission_desc=Les propriétaires possèdent les droits d'administrateur et disposent d'un accès complet à tous les dépôts de l'organisation. @@ -894,7 +894,6 @@ teams.update_settings=Valider teams.delete_team=Supprimer cette Équipe teams.add_team_member=Ajouter un Membre teams.delete_team_title=Suppression de l'équipe -teams.delete_team_desc=Cette équipe sera supprimée. Les membres pourraient perdre leurs accès à certains dépôts. teams.delete_team_success=L’équipe a été supprimé. teams.read_permission_desc=Cette équipe permet l'accès en lecture : les membres peuvent voir et dupliquer ses dépôts. teams.write_permission_desc=Cette équipe permet l'accès en écriture : les membres peuvent participer à ses dépôts. @@ -979,7 +978,7 @@ users.edit_account=Modifier le Compte users.max_repo_creation=Nombre maximum de dépôts créés users.max_repo_creation_desc=(Mettre à -1 pour utiliser la limite globale par défaut) users.is_admin=Ce compte possède un niveau d'accès administrateur -users.allow_import_local=Ce compte dispose des permissions nécessaire à l'import des dépôts locaux +users.allow_import_local=Ce compte a l'autorisation d'importer des dépôts locaux users.allow_create_organization=Ce compte a l'autorisation de créer des organisations users.update_profile=Mettre à jour le profil users.delete_account=Supprimer ce Compte @@ -1024,7 +1023,6 @@ auths.smtp_auth=Type d'authentification SMTP auths.smtphost=Hôte SMTP auths.smtpport=Port SMTP auths.allowed_domains=Domaines autorisés -auths.allowed_domains_helper=Laissez-le vide pour ne pas restreindre de domaines. Plusieurs domaines doivent être séparés par une virgule «, ». auths.enable_tls=Activer le Chiffrement TLS auths.skip_tls_verify=Ne pas vérifier TLS auths.pam_service_name=Nom du Service PAM @@ -1034,7 +1032,7 @@ auths.activated=Authentification activée auths.deletion_success=L'authentification a été supprimée avec succès ! auths.login_source_exist=La source d'authentification '%s' existe déjà. -config.server_config=Configuration du Serveur +config.server_config=Configuration du serveur config.app_name=Nom de l'application config.app_ver=Version de l'application config.app_url=URL de l'application @@ -1053,7 +1051,6 @@ config.reverse_auth_user=Annuler l'Authentification de l'Utilisateur config.ssh_config=Configuration SSH config.ssh_enabled=Activé -config.ssh_start_builtin_server=Démarrer le serveur intégré config.ssh_domain=Domaine config.ssh_port=Port config.ssh_listen_port=Port d'écoute @@ -1063,7 +1060,7 @@ config.ssh_keygen_path=Chemin vers le générateur de clefs ("ssh-keygen") config.ssh_minimum_key_size_check=Vérification de la longueur de clé minimale config.ssh_minimum_key_sizes=Tailles de clé minimales -config.db_config=Configuration de la Base de Données +config.db_config=Configuration de la base de données config.db_type=Type config.db_host=Hôte config.db_name=Nom @@ -1073,7 +1070,7 @@ config.db_ssl_mode_helper=("postgres" uniquement) config.db_path=Emplacement config.db_path_helper=(pour « sqlite3 » et « TIDB ») -config.service_config=Configuration du Service +config.service_config=Configuration du service config.register_email_confirm=Nécessite une confirmation par e-mail config.disable_register=Désactiver les inscriptions config.show_registration_button=Afficher le bouton d'enregistrement @@ -1101,7 +1098,7 @@ config.test_mail_sent=Un e-mail de test à été envoyé à '%s'. config.oauth_config=Configuration OAuth config.oauth_enabled=Activé -config.cache_config=Configuration du Cache +config.cache_config=Configuration du cache config.cache_adapter=Adaptateur du Cache config.cache_interval=Intervales du Cache config.cache_conn=Liaison du Cache @@ -1133,7 +1130,7 @@ config.git_clone_timeout=Délai imparti pour l'opération "Clone config.git_pull_timeout=Délai imparti pour l'opération "Pull config.git_gc_timeout=Délai imparti pour l'opération "GC -config.log_config=Configuration du Journal +config.log_config=Configuration du journal config.log_mode=Mode du journal monitor.cron=Tâches Cron @@ -1141,10 +1138,10 @@ monitor.name=Nom monitor.schedule=Planification monitor.next=Suivant monitor.previous=Précédent -monitor.execute_times=Nombre d'Éxécutions -monitor.process=Processus en cours d'éxécution +monitor.execute_times=Nombre d'exécutions +monitor.process=Processus en cours d'exécution monitor.desc=Description -monitor.start=Heure de Démarrage +monitor.start=Heure de démarrage monitor.execute_time=Heure d'Éxécution notices.system_notice_list=Notes Systèmes diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini index 6085d0c4a3bc..cffe9ca9773b 100644 --- a/options/locale/locale_hu-HU.ini +++ b/options/locale/locale_hu-HU.ini @@ -46,6 +46,12 @@ your_profile=Saját Profil your_starred=Csillagozottjaid your_settings=Beállításaid +all=Összes +sources=Források +mirrors=Tükrök +collaborative=Együttműködés +forks=Másolatok + activities=Tevékenységek pull_requests=Egyesítési Kérések issues=Hibajegyek @@ -86,7 +92,7 @@ domain_helper=Ez befolyásolja az SSH klónozási URL-jeit. ssh_port=SSH port ssh_port_helper=SSH port amit a szervered használni fog, vagy hagyd üresen a kikapcsoláshoz. http_port=HTTP port -http_port_helper=Ezen a porton érhetÅ‘ el az alkalmazás. +http_port_helper=Ezen a porton érhetÅ‘ el az alkalmazás webfelülete. app_url=Alkalmazás URL-je app_url_helper=Ez hatással van a HTTP/HTTPS-klón URL és néhány E-Mail értesítésre. log_root_path=Naplófájl elérési útja @@ -251,6 +257,7 @@ username_been_taken=Felhasználónév már foglalt. repo_name_been_taken=A tároló neve már foglalt. org_name_been_taken=A szervezet neve már foglalt. team_name_been_taken=A csoportnév már foglalt. +team_no_units_error=A csoportnak legalább egy egységet engedélyezni kell. email_been_used=Az E-mail már használatban van. openid_been_used=Az OpenID cím "%s" már használatban van. username_password_incorrect=Helytelen felhasználónév vagy jelszó. @@ -386,7 +393,7 @@ valid_until=Érvényesség vége: valid_forever=Érvényes örökre last_used=Utolsó használat: no_activity=Mostanság nem aktívan használt -key_state_desc=Ez a kulcs volt használva az elmúlt 7 napban +key_state_desc=Ezt a kulcsot már használta az elmúlt 7 napban token_state_desc=Ez a token volt használva az elmúlt 7 napban show_openid=Megjelenítés a profilon hide_openid=Elrejtés a profilról @@ -491,6 +498,7 @@ migrate.lfs_mirror_unsupported=LFS objektumok tükrözése nem támogatott - has mirror_from=tükörképe a: forked_from=másolva innen: +fork_from_self=Nem fork-olhat önmaga által birtokolt tárolót! copy_link=Másolás copy_link_success=Másolva! copy_link_error=Nyomja meg a ⌘-C vagy Ctrl-C gombokat a másoláshoz @@ -504,7 +512,7 @@ download_archive=Töltse le ezt a tárolót no_desc=Nincs leírás quick_guide=Gyors útmutató -clone_this_repo=A tároló másolása +clone_this_repo=Tároló klónozása create_new_repo_command=Egy új tároló létrehozása a parancssorból push_exist_repo=MeglévÅ‘ tároló feltöltése parancssorból bare_message=A tároló nem tartalmaz semmit, üres. @@ -567,7 +575,7 @@ editor.file_already_exists=A(z) '%s' nevű fájl már létezik a tárolóban. editor.no_changes_to_show=Nincsen megjeleníthetÅ‘ változás. editor.fail_to_update_file=Nem sikerült létrehozni/módosítani a következÅ‘ fájlt: '%s' A hiba oka: %v editor.add_subdir=Alkönyvtár hozzáadása... -editor.unable_to_upload_files=Nem sikerült feltölteni a fájlokat a következÅ‘re: '%s' A hiba oka: %v +editor.unable_to_upload_files=Nem sikerült feltölteni a fájlokat a "%s" hiba: %v editor.upload_files_to_dir=Fájlok feltöltése a következÅ‘re: '%s' editor.cannot_commit_to_protected_branch=Nem lehet a következÅ‘ védett ágra commit-olni: '%s'. @@ -581,6 +589,8 @@ commits.message=Ãœzenet commits.date=Dátum commits.older=Régebbi commits.newer=Újabb +commits.signed_by=Aláírta +commits.gpg_key_id=GPG kulcs azonosító ext_issues=KülsÅ‘ hibajegyek ext_issues.desc=KülsÅ‘ Hibajegy kezelÅ‘: link egy külsÅ‘ hibajegy kezelÅ‘ rendszer oldalára @@ -770,7 +780,7 @@ wiki.pages=Oldalak wiki.last_updated=Utoljára módosítva: %s settings=Beállítások -settings.desc=A beállítások menüpontban állíthatók a tároló paraméterei +settings.desc=A beállítások menüpontban állítható a tároló paraméterei settings.options=Beállítások settings.collaboration=Együttműködés settings.collaboration.admin=Rendszergazda @@ -809,9 +819,9 @@ settings.new_owner_has_same_repo=Az új tulajdonos már rendelkezik ilyen nevű settings.convert=Hagyományos tárolóvá alakítás settings.convert_desc=Ãtalakíthatja ezt a tükörtárolót hagyományos tárolóvá. A művelet nem visszavonható. settings.convert_notices_1=- Ez a művelet át fogja konvertálni ezt a tükör-tárolót egy rendes tárolóvá, és nem lehet visszavonni. -settings.convert_confirm=Konvertálás MegerÅ‘sítése +settings.convert_confirm=Ãtalakítás MegerÅ‘sítése settings.convert_succeed=A tárolót egy rendes tárolóvá kell konvertálni. -settings.transfer=Tulajdonosi jog átadása +settings.transfer=Tulajdonjog átadása settings.transfer_desc=A tároló tulajdonának átruházása egy másik felhasználóra, vagy egy szervezetre ahol rendszergazdai jogai van. settings.transfer_notices_1=- El fogja veszteni a hozzáférését, ha az új tulajdonos egy egyéni felhasználó. settings.transfer_notices_2=- Megmarad a hozzáférése, ha az új tulajdonos egy szervezet és te az egyik tulajdonosa vagy. @@ -824,7 +834,7 @@ settings.delete=A tároló törlése settings.delete_desc=Ha egyszer letöröl egy tárolót, azt nem lehet visszavonni. Bizonyosodjon meg benne, hogy ezt szeretné. settings.delete_notices_1=- Ezt a műveletet NEM lehet visszavonni. settings.delete_notices_2=- Ez a művelet véglegesen törölni fog mindent ami a tárolóhoz tartozik, például kódot, hibajegyeket, hozzászólásokat, Wiki oldalakat és a közreműködÅ‘k jogait. -settings.delete_notices_fork_1=- Minden másolat önállóvá válik a törlés után. +settings.delete_notices_fork_1=- Minden tároló másolat önállóvá válik a törlés után. settings.deletion_success=A tároló törölve lett. settings.update_settings_success=A tároló beállításai firssítve lettek. settings.transfer_owner=Új tulajdonos @@ -874,14 +884,14 @@ settings.event_create_desc=Ãg vagy címke létrehozva settings.event_pull_request=Egyesítési Kérés settings.event_pull_request_desc=Egyesítési kérés megnyitva, lecsukva, újranyitva, szerkesztve, hozzárendelve, senkihez sem rendelve, címke frissítve, címke törölve vagy szinkronizálva. settings.event_push=Feltöltés -settings.event_push_desc=Git push egy tárolóhoz +settings.event_push_desc=Push-olás egy tárolóba settings.active=Aktív settings.active_helper=Az információ az eseményrÅ‘l, amely miatt lefutott is el lesz küldve. settings.add_hook_success=Új Webhook hozzáadva. settings.update_webhook=Webhook frissítése settings.update_hook_success=A Webhook frissítve. settings.delete_webhook=Webhook törlése -settings.recent_deliveries=Közelmúltbeli küldések +settings.recent_deliveries=Legutóbbi Küldések settings.hook_type=Hook típusa settings.add_slack_hook_desc=Slack integráció hozzáadása a tárolójához. settings.slack_token=Token @@ -893,7 +903,7 @@ settings.deploy_key_desc=A Deploy kulcsoknak csak olvasási joga van. Nem ugyan settings.no_deploy_keys=Még nem adott hozzá egyetlen Deploy kulcsot sem. settings.title=Cím settings.deploy_key_content=Tartalom -settings.key_been_used=Deploy kulcs tartalma használva lett. +settings.key_been_used=Deploy kulcs tartalma már fel lett használva. settings.key_name_used=Ezzel a névvel már létezik Deploy kulcs. settings.add_key_success=Az új Deploy kulcs '%s' sikeresen hozzáadva! settings.deploy_key_deletion=Telepítési kulcs törlése @@ -1076,8 +1086,8 @@ dashboard.delete_inactivate_accounts=Minden inaktív fiók törlése dashboard.delete_inactivate_accounts_success=Minden inaktív fiók törölve. dashboard.delete_repo_archives=Összes archív tároló törlése dashboard.delete_repo_archives_success=Az összes archivált tároló törölve lett. -dashboard.delete_missing_repos=Az összes olyan tároló bejegyzés törlése, amiknek a kapcsolódó GIT fájljai elvesztek -dashboard.delete_missing_repos_success=Az összes tároló bejegyzés törölve, amiknek a kapcsolódó GIT fájljai elvesztek. +dashboard.delete_missing_repos=Az összes tárolóban az elveszett Git fájl rekordok törlése +dashboard.delete_missing_repos_success=Az összes tároló bejegyzés törölve, amiknek a kapcsolódó Git fájljai elvesztek. dashboard.git_gc_repos=Memóriaszemét-gyűjtÅ‘ (GC) futtatása az összes tárolón dashboard.git_gc_repos_success=Minden tárolón befejezte a memóriaszemét-gyűjtÅ‘ (GC) a futását. dashboard.resync_all_sshkeys=A '.ssh/authorized_keys' fájl újraírása (a Gitea SSH publikus kulcsaival) @@ -1085,14 +1095,14 @@ dashboard.resync_all_sshkeys_success=Minden kulcs újraírva. dashboard.resync_all_hooks=pre-receive, update és post-receive hook-ok újraszinkronizálása az összes tárolóban. dashboard.resync_all_hooks_success=Az összes tároló pre-receive, update és post-receive hook-ja szinkronizálva lett. dashboard.reinit_missing_repos=Az összes Git tároló újra-inicializálása amihez léteznek bejegyzések -dashboard.reinit_missing_repos_success=Az összes Git tároló amihez létezett bejegyzés újra lett szinkronizálva. +dashboard.reinit_missing_repos_success=Az összes Git tároló amihez létezett bejegyzés újra lett iniciaizálva. dashboard.sync_external_users=KülsÅ‘ felhasználói adatok szinkronizálása dashboard.sync_external_users_started=KülsÅ‘ felhasználó szinkronizálása elkezdÅ‘dött dashboard.server_uptime=Kiszolgáló futási ideje -dashboard.current_goroutine=Aktuális Gorutinok +dashboard.current_goroutine=Jelenlegi Goroutinok dashboard.current_memory_usage=Jelenlegi memória használat dashboard.total_memory_allocated=Összes lefoglalt memória -dashboard.memory_obtained=Memória Megszerezve +dashboard.memory_obtained=Megszerzett Memória dashboard.pointer_lookup_times=Pointer Lookup IdÅ‘k dashboard.memory_allocate_times=Memória Foglalási IdÅ‘k dashboard.memory_free_times=Memória Felszabadítási IdÅ‘k @@ -1146,8 +1156,8 @@ users.allow_import_local=Ez a fiók importálhat helyi tárolókat users.allow_create_organization=Ez a fiók létrehozhat szervezeteket users.update_profile=Fiók profiljának frissítése users.delete_account=A fiók törlése -users.still_own_repo=Ennek a felhasználónak legalább egy tárolója van még, le kell törölnöd, vagy valakinek átadnod. -users.still_has_org=Ez a felhasználó még mindig tagja legalább egy szervezetnek, távoznia kell onnan, vagy a szervezetet törölni. +users.still_own_repo=Ennek a felhasználónak legalább egy tárolója van még, le kell törölnie, vagy valakinek átadnia. +users.still_has_org=Ez a felhasználó még mindig tagja legalább egy szervezetnek, távoznia kell onnan, vagy a szervezetet elÅ‘bb törölni kell. users.deletion_success=Fiók sikeresen törölve. orgs.org_manage_panel=Szervezetek kezelése @@ -1229,7 +1239,7 @@ auths.update_success=A hitelesítési mód beállításai frissítve lettek. auths.update=Hitelesítési forrás frissítése auths.delete=A hitelesítési forrás törlése auths.delete_auth_title=Hitelesítési forrás törlése -auths.delete_auth_desc=A hitelesítési mód törlésre kerül, biztosan folytatni szeretné? +auths.delete_auth_desc=A hitelesítési forrás törlésre kerül, biztosan folytatni szeretné? auths.still_in_used=A hitelesítési mód még használatban van, mielÅ‘tt törölné válasszon más hitelesítési módot az érintett fiókokhoz, vagy törölje Å‘ket. auths.deletion_success=Hitelesítési forrás sikeresen törölve! auths.login_source_exist=Bejelentkezési forrás "%s" már létezik. @@ -1287,7 +1297,7 @@ config.enable_captcha=Captcha Engedélyezése config.active_code_lives=Aktív kód életek config.reset_password_code_lives=Jelszó visszaállításnál használt kód elévülési ideje config.default_keep_email_private=Email cím ne látszódjon" alapértelmezett értéke -config.default_allow_create_organization=Szervezet létrehozása" jogosultság alapértelmezett értéke +config.default_allow_create_organization=Szervezet létrehozása jogosultság alapértelmezett értéke config.no_reply_address=No-reply cím config.webhook_config=Webhook Beállítása diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini index f65f1f26a900..b7b352f3d62f 100644 --- a/options/locale/locale_it-IT.ini +++ b/options/locale/locale_it-IT.ini @@ -40,6 +40,7 @@ settings=Impostazioni your_profile=Il tuo profilo your_settings=Impostazioni + activities=Attivitá pull_requests=Pull Request issues=Problemi @@ -569,7 +570,6 @@ release.ahead=%d commits da %s da questo rilascio release.source_code=Codice Sorgente release.tag_name=Nome tag release.target=Obbiettivo -release.tag_helper=Scegli un tag esistente o crea un nuovo tag una volta pubblicato. release.title=Titolo release.content=Contenuto release.write=Scrivi @@ -617,7 +617,6 @@ settings.delete_account=Elimina questa organizzazione settings.delete_prompt=L'organizzazione verrà rimossa definitivamente, e questa operazione NON PUÃ’ essere annullata! settings.confirm_delete_account=Conferma Eliminazione settings.delete_org_title=Eliminazione Organizzazione -settings.hooks_desc=Aggiungi i webhooks che verranno attivati per tutti i repository sotto questa organizzazione. members.public=Pubblico members.public_helper=rendi privato @@ -645,7 +644,6 @@ teams.update_settings=Aggiorna Impostazioni teams.delete_team=Elimina questo Team teams.add_team_member=Aggiungere un Membro al Team teams.delete_team_title=Eliminazione Team -teams.delete_team_desc=Quando questo team verrà eliminato, i membri di questa squadra potrebbero perdere l'accesso ad alcuni repository. Si desidera continuare? teams.read_permission_desc=Questo Team concede accesso di Lettura: i membri possono visualizzare e clonare i repository del Team. teams.write_permission_desc=Questo Team concede accesso di Scrittura: i membri possono leggere e pushare i repository del Team. teams.admin_permission_desc=Questo Team concede accesso di Amministratore: i membri possono leggere i, pushare a, e aggiungere collaboratori ai repository del Team. @@ -780,7 +778,6 @@ config.reverse_auth_user=Autenticazione Utente Inversa config.ssh_config=Configurazione SSH config.ssh_enabled=Attivo -config.ssh_start_builtin_server=Avvia server builtin config.ssh_domain=Dominio config.ssh_port=Porta config.ssh_listen_port=Porta in ascolto diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini index 800f52082ee5..71836b69374d 100644 --- a/options/locale/locale_ja-JP.ini +++ b/options/locale/locale_ja-JP.ini @@ -37,6 +37,7 @@ settings=設定 your_profile=プロフィール your_settings=設定 + activities=アクティビティ pull_requests=プルリクエスト issues=課題 @@ -549,7 +550,6 @@ release.ahead=ã“ã®ãƒªãƒªãƒ¼ã‚¹ä»¥é™ %s 㸠%d コミット release.source_code=ソース コード release.tag_name=ã‚¿ã‚°å release.target=ターゲット -release.tag_helper=既存ã®ã‚¿ã‚°ã‚’é¸æŠžã™ã‚‹ã‹ã€æ–°ã—ã„タグを作æˆã—発行ã—ã¾ã™ã€‚ release.title=タイトル release.content=コンテント release.write=書込㿠@@ -596,7 +596,6 @@ settings.delete_account=ã“ã®çµ„織を削除 settings.delete_prompt=ã“ã®æ“作をã™ã‚‹ã¨çµ„ç¹”ãŒå®Œå…¨ã«å‰Šé™¤ã•ã‚Œã€äºŒåº¦ã¨å…ƒã«æˆ»ã™ã“ã¨ãŒã§ããªããªã‚Šã¾ã™ ï¼ settings.confirm_delete_account=å‰Šé™¤ã‚’ç¢ºèª settings.delete_org_title=組織ã®å‰Šé™¤ -settings.hooks_desc=ã“ã®çµ„ç¹”ã®ã‚‚ã¨ã§ ã™ã¹ã¦ã®ãƒªãƒã‚¸ãƒˆãƒª ã«å¯¾ã—ã¦ãƒˆãƒªã‚¬ãƒ¼ã•ã‚Œã‚‹ webhook を追加ã—ã¾ã™ã€‚ members.public=パブリック members.public_helper=プライベートã«ã™ã‚‹ @@ -624,7 +623,6 @@ teams.update_settings=設定ã®æ›´æ–° teams.delete_team=ã“ã®ãƒãƒ¼ãƒ ã‚’削除 teams.add_team_member=ãƒãƒ¼ãƒ  メンãƒãƒ¼ã‚’追加 teams.delete_team_title=ãƒãƒ¼ãƒ ã®å‰Šé™¤ -teams.delete_team_desc=ã“ã®ãƒãƒ¼ãƒ ã‚’削除ã—ã¾ã™ã€ç¶™ç¶šã—ã¾ã™ã‹?ã“ã®ãƒãƒ¼ãƒ ã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã„ãã¤ã‹ã®ãƒªãƒã‚¸ãƒˆãƒªã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’失ã†å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ teams.read_permission_desc=ã“ã®ãƒãƒ¼ãƒ ã¯èª­ã¿å–り権é™ã‚’æŒã¡: メンãƒãƒ¼ã¯ãƒªãƒã‚¸ãƒˆãƒªã®è¡¨ç¤ºåŠã³ã‚¯ãƒ­ãƒ¼ãƒ³ã®ä½œæˆãŒã§ãã¾ã™ã€‚ teams.write_permission_desc=ã“ã®ãƒãƒ¼ãƒ ã¯æ›¸ãè¾¼ã¿æ¨©é™ã‚’æŒã¡: メンãƒãƒ¼ã¯ãƒªãƒã‚¸ãƒˆãƒªã®è¡¨ç¤ºåŠãƒªãƒã‚¸ãƒˆãƒªã¸ã®ãƒ—ッシュãŒã§ãã¾ã™ã€‚ teams.admin_permission_desc=ã“ã®ãƒãƒ¼ãƒ ã¯ç®¡ç†è€…ã®æ¨©é™ã‚’æŒã¡: メンãƒãƒ¼ã¯ãƒãƒ¼ãƒ ã®ãƒªãƒã‚¸ãƒˆãƒªã«å¯¾ã—ã¦ã€èª­ã¿å–ã‚Šã€ãƒ—ッシュや共åŒç·¨é›†è€…ã®è¿½åŠ ãŒã§ãã¾ã™ã€‚ diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini index 7095f2a03ec0..b7528d412314 100644 --- a/options/locale/locale_ko-KR.ini +++ b/options/locale/locale_ko-KR.ini @@ -37,6 +37,7 @@ settings=설정 your_profile=프로필 your_settings=설정 + activities=í™œë™ pull_requests=í’€ 리퀘스트 issues=ì´ìŠˆë“¤ @@ -542,7 +543,6 @@ settings.wiki_delete_notices_1=- ì´ê²ƒì€ %sì˜ Wiki를 비활성화 시키고 settings.delete=ì´ ì €ìž¥ì†Œ ì‚­ì œ settings.delete_desc=저장소를 지우고 나면 ë˜ëŒë¦´ 수 없습니다. 다시 한번 확ì¸í•˜ì„¸ìš”. settings.delete_notices_1=- ì´ ìž‘ì—…ì€ ì·¨ì†Œí•  수 없습니다. -settings.delete_notices_fork_1=- 모든 í¬í¬ë“¤ì€ ì‚­ì œ 후ì—ë„ ë…립ì ìœ¼ë¡œ 유지ë©ë‹ˆë‹¤. settings.transfer_owner=새 ì†Œìœ ìž settings.make_transfer=저장소 전송 settings.confirm_delete=ì‚­ì œ í™•ì¸ @@ -629,7 +629,6 @@ release.ahead=ì´ ë¦´ë¦¬ìŠ¤ ì´í›„ë¡œ %d %sì— ì»¤ë°‹í•©ë‹ˆë‹¤. release.source_code=소스 코드 release.tag_name=태그 ì´ë¦„ release.target=ëŒ€ìƒ -release.tag_helper=태그를 ì„ íƒí•˜ê±°ë‚˜ 새로운 태그를 만들어 게시 release.title=제목 release.content=컨í…츠 release.write=쓰기 @@ -678,7 +677,6 @@ settings.delete_account=ì´ ì¡°ì§ì„ 삭제합니다. settings.delete_prompt=ì¡°ì§ì´ ì˜êµ¬ì ìœ¼ë¡œ ì‚­ì œë©ë‹ˆë‹¤. 그리고 취소할 수 없습니다. settings.confirm_delete_account=ì‚­ì œ ìŠ¹ì¸ settings.delete_org_title=ì¡°ì§ ì‚­ì œ -settings.hooks_desc=ì´ ì¡°ì§ì˜ 모든 저장소ì—ì„œ 실행ë˜ëŠ” ì›¹í›…ì„ ì¶”ê°€í•©ë‹ˆë‹¤. members.membership_visibility=íšŒì› í‘œì‹œ: members.public=공개 @@ -707,7 +705,6 @@ teams.update_settings=설정 ì—…ë°ì´íŠ¸ teams.delete_team=ì´ íŒ€ì„ ì‚­ì œí•˜ê¸° teams.add_team_member=팀 êµ¬ì„±ì› ì¶”ê°€ teams.delete_team_title=팀 ì‚­ì œ -teams.delete_team_desc=ì´ íŒ€ì„ ì‚­ì œí•˜ë©´ 몇몇 저장소ì—대해 팀 구성ì›ì´ ì ‘ê·¼ ê¶Œí•œì„ ìžƒê²Œë©ë‹ˆë‹¤. 계ì†í•˜ì‹œê² ìŠµë‹ˆê¹Œ? teams.read_permission_desc=ì´ íŒ€ì˜ ì½ê¸° ê¶Œí•œì„ ë¶€ì—¬: 회ì›ì€ ì´ íŒ€ì˜ ì €ìž¥ì†Œë¥¼ 보거나 복제할 수 있습니다. teams.write_permission_desc=ì´ íŒ€ì˜ ì“°ê¸° ê¶Œí•œì„ ë¶€ì—¬: 회ì›ì€ ì´ íŒ€ì˜ ì €ìž¥ì†Œë¥¼ ì½ê±°ë‚˜ 푸시할 수 있습니다. teams.admin_permission_desc=ì´ íŒ€ì˜ ê´€ë¦¬ìž ê¶Œí•œì„ ë¶€ì—¬: 회ì›ì€ ì´ íŒ€ì˜ ì €ìž¥ì†Œë¥¼ ì½ê±°ë‚˜ 푸시하거나 추가하고 ê³µë™ ìž‘ì—…ìžë¥¼ 추가할 수 있습니다. @@ -826,7 +823,6 @@ auths.smtp_auth=SMTP ì¸ì¦ 유형 auths.smtphost=SMTP 호스트 auths.smtpport=SMTP í¬íŠ¸ auths.allowed_domains=í—ˆìš©ëœ ë„ë©”ì¸ -auths.allowed_domains_helper=ë„ë©”ì¸ì„ 제안하지 않으려면 비워둡니다. 여러 ë„ë©”ì¸ì€ ',' 콤마를 ì´ìš©í•´ 구분합니다. auths.enable_tls=TLS 암호화 활성화 auths.skip_tls_verify=TLS ê²€ì¦ ê±´ë„ˆë›°ê¸° auths.pam_service_name=PAM 서비스 명 @@ -852,7 +848,6 @@ config.reverse_auth_user=ì—­ë°©í–¥ ì‚¬ìš©ìž ì¸ì¦ config.ssh_config=SSH 설정 config.ssh_enabled=í™œì„±í™”ë¨ -config.ssh_start_builtin_server=ë¹ŒíŠ¸ì¸ ì„œë²„ 시작 config.ssh_domain=ë„ë©”ì¸ config.ssh_port=í¬íŠ¸ config.ssh_listen_port=수신 대기 í¬íŠ¸ diff --git a/options/locale/locale_lt-LT.ini b/options/locale/locale_lt-LT.ini index 0b7543811767..e530a3bf1a7e 100644 --- a/options/locale/locale_lt-LT.ini +++ b/options/locale/locale_lt-LT.ini @@ -36,6 +36,7 @@ settings=Nustatymai your_profile=JÅ«sų profilis your_settings=JÅ«sų parametrai + activities=Veiklos issues=Problemos diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini index 8db731726505..d387d0b8c707 100644 --- a/options/locale/locale_lv-LV.ini +++ b/options/locale/locale_lv-LV.ini @@ -46,6 +46,12 @@ your_profile=Tavs profils your_starred=Tavi atzÄ«mÄ“tie ar zvaigznÄ«ti your_settings=Tavi iestatÄ«jumi +all=Visi +sources=Avoti +mirrors=Spoguļi +collaborative=SadarbÄ«bas +forks=AtdalÄ«tie + activities=AktivitÄte pull_requests=Izmaiņu pieprasÄ«jumi issues=ProblÄ“mas @@ -251,6 +257,7 @@ username_been_taken=LietotÄjvÄrds jau ir aizņemts. repo_name_been_taken=Jau eksistÄ“ repozitorijs ar Å¡Ädu nosaukumu. org_name_been_taken=OrganizÄcijas nosaukums jau ir aizņemts. team_name_been_taken=Komandas nosaukums jau ir aizņemts. +team_no_units_error=Komandai ir jÄbÅ«t iespÄ“jotai vismaz vienai sadaļai. email_been_used=E-pasta adrese jau ir izmantota. openid_been_used=OpenID adrese '%s' jau ir izmantota. username_password_incorrect=Nepareizs lietotÄjvÄrds vai parole. @@ -267,9 +274,9 @@ invalid_gpg_key=Nav iespÄ“jams pÄrbaudÄ«t GPG atslÄ“gu: %s unable_verify_ssh_key=SSH atslÄ“gu nav iespÄ“jams pÄrbaudÄ«t, pÄrliecinieties, ka tajÄ nav kļūdu. auth_failed=AutentifikÄcija neizdevÄs: %v -still_own_repo=Å is konts ir vismaz viena repozitorija Ä«paÅ¡nieks, tos sÄkumÄ ir nepiecieÅ¡ams izdzÄ“st vai nomainÄ«t to Ä«paÅ¡nieku. +still_own_repo=Å is konts ir vismaz viena repozitorija Ä«paÅ¡nieks, tos sÄkumÄ ir nepiecieÅ¡ams izdzÄ“st vai mainÄ«t to Ä«paÅ¡nieku. still_has_org=JÅ«su konts ir piesaistÄ«ts vismaz vienai organizÄcijai, sÄkumÄ nepiecieÅ¡ams to pamest. -org_still_own_repo=OrganizÄcijai pieder repozitoriji, tos vispirms ir nepiecieÅ¡ams izdzÄ“st vai pÄrvietot. +org_still_own_repo=OrganizÄcijai pieder repozitoriji, tos sÄkumÄ ir nepiecieÅ¡ams izdzÄ“st vai mainÄ«t to Ä«paÅ¡nieku. target_branch_not_exist=MÄ“rÄ·a atzars neeksistÄ“ @@ -491,6 +498,7 @@ migrate.lfs_mirror_unsupported=LFS objektu spoguļoÅ¡ana netiek atbalstÄ«ta - iz mirror_from=spogulis no forked_from=atdalÄ«ts no +fork_from_self=Nav iespÄ“jams atdalÄ«t repozitoriju, kuram esat Ä«paÅ¡nieks! copy_link=KopÄ“t copy_link_success=NokopÄ“ts! copy_link_error=Nospiediet ⌘-C vai Ctrl-C, lai nokopÄ“tu @@ -581,6 +589,8 @@ commits.message=Ziņojums commits.date=Datums commits.older=VecÄki commits.newer=JaunÄki +commits.signed_by=ParakstÄ«jis +commits.gpg_key_id=GPG atslÄ“gas ID ext_issues=Ä€rÄ“jÄs problÄ“mas ext_issues.desc=Ä€rÄ“jÄs problÄ“mas ir saite uz ÄrÄ“jo problÄ“mu vadÄ«bas lapu @@ -823,8 +833,8 @@ settings.wiki_deletion_success=Repozitorija vikivietnes dati tika izdzÄ“sti. settings.delete=DzÄ“st Å¡o repozitoriju settings.delete_desc=DzÄ“Å¡ot repozitoriju, tÄ datus vairs nebÅ«s iespÄ“jams atgÅ«t. Pirms dzÄ“Å¡anas pÄrliecinieties vai patieÅ¡Äm vÄ“laties to darÄ«t. settings.delete_notices_1=- Å Ä« darbÄ«ba ir NEATGRIEZENISKA. -settings.delete_notices_2=- Å Ä« darbÄ«ba neatgriezeniski dzÄ“sÄ«s visu ar Å¡o repozitoriju saistÄ«to informÄciju, tai skaitÄ kodu, problÄ“mu pieteikumus, komentÄrus, vikivietni un sadarbÄ«bas lietotÄju tiesÄ«bas. -settings.delete_notices_fork_1=- Visi atdalÄ«tie repozitoriji kļūs neatkarÄ«gi pÄ“c dzÄ“Å¡anas. +settings.delete_notices_2=- Å Ä« darbÄ«ba neatgriezeniski dzÄ“sÄ«s Å¡Ä« repozitorija kodu, problÄ“mas, komentÄrus, vikivietni un lÄ«dzstrÄdnieku piekļuvi. +settings.delete_notices_fork_1=- Visi atdalÄ«tie repozitoriju pÄ“c dzÄ“Å¡anas kļūs neatkarÄ«gi. settings.deletion_success=Repozitorijs tika izdzÄ“sts. settings.update_settings_success=Repozitorija iestatÄ«jumi tika saglabÄti. settings.transfer_owner=Jaunais Ä«paÅ¡nieks @@ -941,7 +951,7 @@ release.new_subheader=PublicÄ“jiet laidienus, lai varÄ“tu veikt atsekoÅ¡anu proj release.edit_subheader=DetalizÄ“ts izmaiņu žurnÄls palÄ«dz lietotajiem saprast, kas ir ticis mainÄ«ts. release.tag_name=Taga nosaukums release.target=MÄ“rÄ·is -release.tag_helper=PublicÄ“jot, izvÄ“lieties esoÅ¡u vai izveidojiet jaunu tagu. +release.tag_helper=IzvÄ“lieties jau esoÅ¡u tagu vai izveidojiet jaunu. release.title=Virsraksts release.content=Saturs release.write=RakstÄ«t @@ -967,7 +977,7 @@ branch.delete_notices_1=- Å Ä« darbÄ«ba ir NEATGRIEZENISKA. branch.delete_notices_2=- Å Ä« darbÄ«ba neatgriezeniski izdzÄ“sÄ«s visu zarÄ %s. branch.deletion_success=Atzars '%s' tika izdzÄ“sts. branch.deletion_failed=NeizdevÄs izdzÄ“st atzaru %s. -branch.delete_branch_has_new_commits=%s nevar tikt izdzÄ“sts, jo tam ir jaunas revÄ«zijas pÄ“c sapludinÄÅ¡anas. +branch.delete_branch_has_new_commits=%s nevar tikt dzÄ“sts, jo tam ir jaunas revÄ«zijas pÄ“c tÄ sapludinÄÅ¡anas. [org] org_name_holder=OrganizÄcijas nosaukums @@ -1039,7 +1049,7 @@ teams.update_settings=SaglabÄt iestatÄ«jumus teams.delete_team=DzÄ“st komandu teams.add_team_member=Pievienot komandas biedru teams.delete_team_title=Komandas dzÄ“Å¡ana -teams.delete_team_desc=Komanda tiks dzÄ“sta, vai vÄ“laties turpinÄt? Komandas biedri var zaudÄ“t piekļuvi dažiem vai pat visiem repozitorijiem. +teams.delete_team_desc=DzÄ“Å¡ot komandu, tÄs biedri var zaudÄ“t piekļuvi dažiem vai pat visiem repozitorijiem. Vai vÄ“laties turpinÄt? teams.delete_team_success=Komanda tika izdzÄ“sta. teams.read_permission_desc=Å ai komandai ir lasÄ«Å¡anas tiesÄ«bas: dalÄ«bnieki var skatÄ«ties un klonÄ“t komandas repozitorijus. teams.write_permission_desc=Å ai komandai ir rakstÄ«Å¡anas tiesÄ«bas: dalÄ«bnieki var lasÄ«t un nosÅ«tÄ«t izmaiņas repozitorijiem. @@ -1076,8 +1086,8 @@ dashboard.delete_inactivate_accounts=DzÄ“st visus neaktÄ«vos kontus dashboard.delete_inactivate_accounts_success=Visi neaktÄ«vie konti tika izdzÄ“sti. dashboard.delete_repo_archives=DzÄ“st visu repozitoriju arhÄ«vus dashboard.delete_repo_archives_success=Visu repozitoriju arhÄ«vi tika izdzÄ“sti. -dashboard.delete_missing_repos=DzÄ“st visus repozitoriju ierakstus, kas ir pazaudÄ“juÅ¡i attiecÄ«gos Git failus -dashboard.delete_missing_repos_success=Visi repozitoriju ieraksti, kam bija pazaudÄ“ti Git repozitoriji, tika izdzÄ“sti. +dashboard.delete_missing_repos=DzÄ“st visus repozitorijus, kuriem trÅ«kst Git faili +dashboard.delete_missing_repos_success=Visi repozitoriji, kuriem trÅ«kst Git faili, tika izdzÄ“sti. dashboard.git_gc_repos=IzpildÄ«t visu repozitoriju datu sakÄrtoÅ¡anu dashboard.git_gc_repos_success=Visiem repozitorijiem ir pabeigta datu sakÄrtoÅ¡ana. dashboard.resync_all_sshkeys=PÄrrakstÄ«t '.ssh/authorized_keys' failu (Gitea SSH atslÄ“gÄm) @@ -1146,7 +1156,7 @@ users.allow_import_local=Å im kontam ir tiesÄ«bas importÄ“t lokÄlus repozitorij users.allow_create_organization=Jums nav tiesÄ«bu veidot organizÄcijas users.update_profile=MainÄ«t konta profilu users.delete_account=DzÄ“st Å¡o kontu -users.still_own_repo=Å im kontam pieder vismaz viens repozitorijs. SÄkumÄ to ir nepiecieÅ¡ams izdzÄ“st vai nomainÄ«t tÄ Ä«paÅ¡nieku. +users.still_own_repo=Å im kontam pieder vismaz viens repozitorijs, tos sÄkumÄ ir nepiecieÅ¡ams izdzÄ“st vai mainÄ«t to Ä«paÅ¡nieku. users.still_has_org=Å is konts ir piesaistÄ«ts vismaz vienai organizÄcijai. SÄkumÄ ir nepiecieÅ¡ams to atsaistÄ«t vai izdzÄ“st Å¡o organizÄciju. users.deletion_success=Konts tika veiksmÄ«gi izdzÄ“sts. @@ -1196,7 +1206,7 @@ auths.smtp_auth=SMTP autentifikÄcijas tips auths.smtphost=SMTP resursdators auths.smtpport=SMTP ports auths.allowed_domains=Atļautie domÄ“ni -auths.allowed_domains_helper=AtstÄjiet tukÅ¡u, ja nevÄ“laties ierobežot domÄ“nu vÄrdus. DomÄ“na vÄrdus nepiecieÅ¡ams atdalÄ«t ar komatu ','. +auths.allowed_domains_helper=AtstÄjiet tukÅ¡u, lai atļautu visus domÄ“nus. Lai norÄdÄ«tu vairÄkus domÄ“nus, tos var atdalÄ«t ar komatu. auths.enable_tls=IespÄ“jot TLS Å¡ifrÄ“Å¡anu auths.skip_tls_verify=Izlaist TLS verifikÄciju auths.pam_service_name=PAM servisa nosaukums @@ -1229,7 +1239,7 @@ auths.update_success=AutentifikÄcijas iestatÄ«jumi tika saglabÄti. auths.update=MainÄ«t autentifikÄcijas iestatÄ«jumus auths.delete=DzÄ“st Å¡o autentifikÄcijas avotu auths.delete_auth_title=DzÄ“st autentifikÄcijas avotu -auths.delete_auth_desc=Å is autentifikÄcijas avots tiks dzÄ“sts. Vai patieÅ¡Äm vÄ“laties turpinÄt? +auths.delete_auth_desc=Å is autentificÄ“Å¡anas avots tiks dzÄ“sts, vai patieÅ¡Äm vÄ“laties turpinÄt? auths.still_in_used=Daži lietotÄji joprojÄm izmanto Å¡o autentifikÄcijas avotu. NepiecieÅ¡ams veikt Å¡o lietotÄju konvertÄciju vai dzÄ“Å¡anu. auths.deletion_success=AutentifikÄcija tika veiksmÄ«gi izdzÄ“sta! auths.login_source_exist=PieteikÅ¡anÄs avots '%s' jau eksistÄ“. diff --git a/options/locale/locale_nb-NO.ini b/options/locale/locale_nb-NO.ini index 6daf052d59f7..2ae8a5a061a5 100644 --- a/options/locale/locale_nb-NO.ini +++ b/options/locale/locale_nb-NO.ini @@ -39,6 +39,7 @@ admin_panel=Administrasjonspanel account_settings=Kontoinstillinger settings=Innstillinger + issues=Problemer cancel=Avbryt diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini index 6899f17c46f9..620960129e16 100644 --- a/options/locale/locale_nl-NL.ini +++ b/options/locale/locale_nl-NL.ini @@ -46,6 +46,7 @@ your_profile=Uw profiel your_starred=Jouw Sterren your_settings=Uw instellingen + activities=Activiteiten pull_requests=Pull requests issues=Kwesties @@ -721,7 +722,6 @@ settings.wiki_deletion_success=De repository met wiki data is succesvol gewist. settings.delete=Verwijder deze repository settings.delete_desc=Als u eenmaal een repository verwijderd is er geen weg terug. Gelieve zeker te zijn van uw acties. settings.delete_notices_1=- Deze bewerking kan NIET ongedaan gemaakt worden. -settings.delete_notices_fork_1=-Alle forks zullen onafhankelijk geworden na verwijdering. settings.deletion_success=De repository is verwijderd. settings.update_settings_success=Repository opties zijn verwijderd. settings.transfer_owner=Nieuwe eigenaar @@ -819,7 +819,6 @@ release.ahead=%d aanpassingen aan %s sinds deze versie release.source_code=Broncode release.tag_name=Tagnaam release.target=Doel -release.tag_helper=Kies een bestaande tag, of creëer een nieuwe tag bij publiceren. release.title=Titel release.content=Inhoud release.write=Schrijf @@ -881,7 +880,6 @@ settings.delete_prompt=Deze actie zal de origanisatie permanent verwijderen. U k settings.confirm_delete_account=Bevestig verwijdering settings.delete_org_title=Verwijderen organsiatie settings.delete_org_desc=Deze organisatie zal permanent worden verwijderd, wilt u doorgaan? -settings.hooks_desc=Een webhook toevoegen die door alle repositories in deze organisatie getriggerd kan worden. members.membership_visibility=Zichtbaarheid lidmaatschap: members.public=Openbaar @@ -910,7 +908,6 @@ teams.update_settings=Instellingen bijwerken teams.delete_team=Verwijder deze team teams.add_team_member=Nieuwe team lid aanmaken teams.delete_team_title=Team verwijderen -teams.delete_team_desc=Dit team zal worden verwijderd. De leden van dit team zullen toegang tot alle repositories van het team verliezen. Wilt u doorgaan? teams.delete_team_success=Het team is verwijderd. teams.read_permission_desc=Dit team heeft Lees rechten : leden kunnen repositories lezen en klonen. teams.write_permission_desc=Dit team heeft Schrijf rechten : leden kunnen repositories lezen en push aanvragen verwerken. @@ -1048,7 +1045,6 @@ auths.smtp_auth=SMTP-authenticatietype auths.smtphost=SMTP host auths.smtpport=SMTP poort auths.allowed_domains=Toegelaten domeinen -auths.allowed_domains_helper=Laat dit leeg om geen enkel domein te beperken. Meerdere domeinen moeten door een komma (',') gescheiden worden. auths.enable_tls=Activeer TLS-encryptie auths.skip_tls_verify=TLS-verificatie overslaan auths.pam_service_name=PAM servicenaam @@ -1083,7 +1079,6 @@ config.reverse_auth_user=Omgekeerde verificatie gebruiker config.ssh_config=SSH-configuratie config.ssh_enabled=Ingeschakeld -config.ssh_start_builtin_server=Ingebouwde server starten config.ssh_domain=Domein config.ssh_port=Poort config.ssh_listen_port=Luister op poort diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini index 9940add5ecbc..e4c5dc031665 100644 --- a/options/locale/locale_pl-PL.ini +++ b/options/locale/locale_pl-PL.ini @@ -36,6 +36,7 @@ settings=Ustawienia your_profile=Twój profil your_settings=Twoje ustawienia + activities=AktywnoÅ›ci pull_requests=OczekujÄ…ce zmiany issues=Problemy @@ -546,7 +547,6 @@ settings.wiki_delete_notices_1=- To usunie i wyÅ‚Ä…czy wiki dla %s settings.delete=UsuÅ„ to repozytorium settings.delete_desc=Po usuniÄ™ciu repozytorium nie ma odwrotu. Upewnij siÄ™, że tego chcesz. settings.delete_notices_1=- Ta operacja NIE MOÅ»E zostać cofniÄ™ta. -settings.delete_notices_fork_1=Wszystkie forki stanÄ… siÄ™ niezależne po usuniÄ™ciu. settings.transfer_owner=Nowy wÅ‚aÅ›ciciel settings.make_transfer=PrzenieÅ› settings.confirm_delete=Potwierdź usuniÄ™cie @@ -630,7 +630,6 @@ release.ahead=%d commitów w %s od tego wydania release.source_code=Kod źródÅ‚owy release.tag_name=Nazwa tagu release.target=Cel -release.tag_helper=Wybierz istniejÄ…cy tag, bÄ…dź utwórz nowy podczas publikacji. release.title=TytuÅ‚ release.content=Treść release.write=Napisz @@ -679,7 +678,6 @@ settings.delete_account=UsuÅ„ tÄ… organizacjÄ™ settings.delete_prompt=Organizacja zostanie trwale usuniÄ™ta, a to NIE MOÅ»E być cofniÄ™te! settings.confirm_delete_account=Potwierdź usuniÄ™cie settings.delete_org_title=UsuniÄ™cie organizacji -settings.hooks_desc=Dodaj webhooki, uruchamiane dla wszystkich repozytoriów w tej organizacji. members.membership_visibility=Widoczność czÅ‚onkostwa: members.public=Publiczne @@ -708,7 +706,6 @@ teams.update_settings=Aktualizuj ustawienia teams.delete_team=UsuÅ„ ten zespół teams.add_team_member=Dodaj czÅ‚onka zespoÅ‚u teams.delete_team_title=Usuwanie zespoÅ‚u -teams.delete_team_desc=Ten zespół zostanie usuniÄ™ty, czy na pewno chcesz kontynuować? Jego czÅ‚onkowie mogÄ… utracić dostÄ™p do części repozytoriów. teams.read_permission_desc=Ten zespół daje dostÄ™p do odczytu: czÅ‚onkowie mogÄ… wyÅ›wietlać i klonować repozytoria zespoÅ‚u. teams.write_permission_desc=Ten zespół daje dostÄ™p do zapisu: czÅ‚onkowie mogÄ… wyÅ›wietlać i wysyÅ‚ać do repozytoriów zespoÅ‚u. teams.admin_permission_desc=Ten zespół daje dostÄ™p peÅ‚ny: czÅ‚onkowie mogÄ… wyÅ›wietlać, wysyÅ‚ać i dodawać współpracowników do repozytoriów zespoÅ‚u. @@ -824,7 +821,6 @@ auths.smtp_auth=Typ uwierzytelnienia SMTP auths.smtphost=Serwer SMTP auths.smtpport=Port SMTP auths.allowed_domains=Dozwolone domeny -auths.allowed_domains_helper=Pozostaw puste aby nie ograniczać domen. Wiele domen powinno być oddzielone przecinkami ','. auths.enable_tls=WÅ‚Ä…cz szyfrowanie TLS auths.skip_tls_verify=PomiÅ„ weryfikacjÄ™ protokoÅ‚u TLS auths.pam_service_name=Nazwa usÅ‚ugi PAM @@ -850,7 +846,6 @@ config.reverse_auth_user=Użytkownik dostarczony przez odwrotne proxy config.ssh_config=Konfiguracja SSH config.ssh_enabled=Aktywne -config.ssh_start_builtin_server=Uruchom serwer wbudowany config.ssh_domain=Domena config.ssh_listen_port=Port nasÅ‚uchu config.ssh_root_path=Åšcieżka katalogu głównego diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini index 50c4d4419ef2..484c61eb4d08 100644 --- a/options/locale/locale_pt-BR.ini +++ b/options/locale/locale_pt-BR.ini @@ -9,6 +9,7 @@ sign_in_with=Fazer login com sign_out=Sair sign_up=Cadastrar link_account=Conectar Conta +link_account_signin_or_signup=Faça login para conectar sua conta existente à sua nova conta, ou cadastre-se para uma nova conta register=Registrar website=Site version=Versão @@ -45,6 +46,7 @@ your_profile=Seu perfil your_starred=Você favoritou your_settings=Suas configurações + activities=Atividades pull_requests=Pull requests issues=Issues @@ -53,6 +55,9 @@ cancel=Cancelar [install] install=Instalação +title=Configuração inicial +docker_helper=Se você está rodando o Gitea dentro do Docker, por favor leia as instruções cuidadosamente antes de alterar qualquer coisa nesta página. +requite_db_desc=Gitea requer MySQL, PostgreSQL, SQLite3 ou TiDB. db_title=Configurações de banco de dados db_type=Tipo de banco de dados host=Servidor @@ -62,13 +67,17 @@ db_name=Nome do banco de dados db_helper=Por favor, use InnoDB como Engine e utf8_general_ci como o charset para o MySQL. ssl_mode=Modo SSL path=Caminho +sqlite_helper=O caminho do arquivo de banco de dados SQLite3 ou TiDB.
Por favor use o caminho absoluto se rodar o Gitea como serviço. err_empty_db_path=O Caminho do banco de dados SQLite3 ou TiDB não pode ser vazio. err_invalid_tidb_name=Nome do banco de dados TiDB não permite os caracteres "." e "-". no_admin_and_disable_registration=Você não pode desabilitar o registro sem criar uma conta de administrador. err_empty_admin_password=A senha de administrador não pode ser vazia. +general_title=Configurações gerais do aplicativo app_name=Nome do aplicativo +app_name_helper=Você pode colocar o nome de sua organização aqui. repo_path=Caminho raíz do repositório +repo_path_helper=Todos os repositórios remotos do Git serão salvos neste diretório. lfs_path=Caminho raiz do LFS lfs_path_helper=Os arquivos armazenados com o Git LFS serão armazenados neste diretório. Deixe vazio para desativar o LFS. run_user=Usuário da execução @@ -76,9 +85,11 @@ run_user_helper=O usuário deve ter acesso ao caminho raiz do repositório e exe domain=Domínio domain_helper=Isto afeta URLs para o clone via SSH. ssh_port=Porta SSH +ssh_port_helper=Número da porta que seu servidor SSH está usando, deixe vazio para desativar o recurso SSH. http_port=Porta HTTP http_port_helper=Número da porta em que a aplicação irá executar. app_url=URL do aplicativo +app_url_helper=Isto afeta a URL de clone via HTTP/HTTPS e também algumas notificações por e-mail. log_root_path=Caminho do log log_root_path_helper=Pasta dos arquivos de log. @@ -86,11 +97,14 @@ optional_title=Configurações opcionais email_title=Configurações do serviço de e-mail smtp_host=Host SMTP smtp_from=De +smtp_from_helper=Endereço do remetente de e-mails, no formato RFC 5322. Pode ser apenas o endereço de e-mail ou "Nome" . mailer_user=Usuário do envio mailer_password=Senha do remetente register_confirm=Habilitar confirmação de registro +mail_notify=Habilitar notificações de e-mail server_service_title=Configurações de servidor e outros serviços offline_mode=Ativar modo off-line +offline_mode_popup=Desative o uso de CDNs para que todos os recursos sejam servidos localmente. disable_gravatar=Desativar serviço Gravatar disable_gravatar_popup=Desabilitar o Gravatar e fontes personalizadas, todos os avatares são enviados por usuários ou padrão. federated_avatar_lookup=Habilitar a busca federativa de avatares @@ -101,6 +115,7 @@ enable_captcha=Habilitar captcha enable_captcha_popup=Obrigar validação por captcha para auto-registro de usuários. require_sign_in_view=Obrigar login para a visualização de páginas require_sign_in_view_popup=Somente usuários autenticados podem ver todas as páginas, visitantes somente podem entrar ou se cadastrar. +admin_setting_desc=Você não precisa criar uma conta de administrador agora. O primeiro usuário a se registrar no site automaticamente terá acesso de administrador. admin_title=Configurações da conta de administrador admin_name=Nome de usuário admin_password=Senha @@ -108,11 +123,18 @@ confirm_password=Confirmar senha admin_email=E-mail do administrador install_btn_confirm=Instalar Gitea test_git_failed=Falha ao testar o comando 'git': %v +sqlite3_not_available=Sua versão não suporta SQLite3, por favor faça o download do executável oficial em %s, e NÃO da versão gobuild. +invalid_db_setting=Configuração de banco de dados inválida: %v invalid_repo_path=A raiz do repositório é inválida: %v +run_user_not_match=O usuário configurado não é o mesmo que está executando o aplicativo no momento: %s -> %s +save_config_failed=Falha ao salvar a configuração: %v invalid_admin_setting=Configuração da conta de administrador está inválida: %v +install_success=Bem-vindo! Obrigado por escolher o Gitea. Divirta-se! invalid_log_root_path=Pasta raíz do log é inválida: %v default_keep_email_private=Valor padrão para manter o e-mail privado default_keep_email_private_popup=Esse é o valor padrão para a visibilidade do endereço de e-mail do usuário. Se definido como true, o endereço de e-mail de todos os novos usuários será ocultado até que o usuário altere sua configuração. +default_allow_create_organization=Permissão para que novos usuários possam criar organizações por padrão +default_allow_create_organization_popup=Este é o valor de permissão padrão que será atribuído à novos usuários. Se ativado, novos usuários poderão criar organizações. no_reply_address=Endereço de sem resposta no_reply_address_helper=Domínio para o endereço de e-mail do usuário nos registros do git se ele mantiver seu endereço de e-mail privado. Por exemplo. O usuário 'joe' e 'noreply.example.org' será 'joe@noreply.example.org' @@ -121,6 +143,7 @@ uname_holder=Nome de usuário ou e-mail password_holder=Senha switch_dashboard_context=Trocar contexto do painel de controle my_repos=Meus repositórios +show_more_repos=Mostrar mais repositórios... collaborative_repos=Repositórios colaborativos my_orgs=Minhas organizações my_mirrors=Meus mirrors @@ -134,9 +157,14 @@ repos=Repositórios users=Usuários organizations=Organizações search=Pesquisar +repo_no_results=Nenhum repositório correspondente foi encontrado. +user_no_results=Nenhum usuário correspondente foi encontrado. +org_no_results=Nenhuma organização correspondente foi encontrada. [auth] +create_new_account=Criar conta register_helper_msg=Já tem uma conta? Entre agora! +social_register_helper_msg=Já tem uma conta? Entre agora! disable_register_prompt=Desculpe, novos registros estão desabilitados. Por favor entre em contato com o administrador do site. disable_register_mail=Desculpe, a confirmação de registro por e-mail foi desabilitada. remember_me=Lembrar de mim @@ -149,7 +177,10 @@ prohibit_login_desc=Sua conta foi proibida de fazer login, por favor contate o a resent_limit_prompt=Desculpe, você já requisitou um e-mail de ativação recentemente. Por favor, espere 3 minutos para tentar novamente. has_unconfirmed_mail=Oi %s, você possui um endereço de e-mail não confirmado (%s). Se você não recebeu um e-mail de confirmação ou precisa reenviar um novo, clique no botão abaixo. resend_mail=Clique aqui para reenviar seu e-mail de ativação +email_not_associate=O endereço de e-mail não está associado à nenhuma conta. +send_reset_mail=Clique aqui para re-enviar seu e-mail de redefinição de senha reset_password=Redefinir sua senha +invalid_code=Desculpe, seu código de confirmação expirou ou não é válido. reset_password_helper=Clique aqui para redefinir sua senha password_too_short=O comprimento da senha não pode ser menor que %d. non_local_account=Contas não-locais não podem mudar sua senha através da interface web do Gitea. @@ -157,6 +188,8 @@ verify=Verificar scratch_code=Código de backup use_scratch_code=Use um código de backup twofa_scratch_used=Você usou seu código de backup. Você foi redirecionado para a página de configurações de dois fatores para que você possa remover a inscrição de seu dispositivo ou gerar um novo código de backup. +twofa_passcode_incorrect=Seu código de acesso está incorreto. Se você perdeu seu dispositivo, use seu código de backup para fazer login. +twofa_scratch_token_incorrect=Seu código de backup está incorreto. login_userpass=Usuário / Senha login_openid=OpenID openid_connect_submit=Conectar @@ -170,6 +203,7 @@ activate_account=Por favor, ative sua conta activate_email=Verifique seu endereço de e-mail reset_password=Resetar sua senha register_success=Registro bem-sucedido +register_notify=Bem-vindo ao Gitea [modal] yes=Sim @@ -207,10 +241,32 @@ email_error=` não é um endereço de e-mail válido.` url_error=`não é uma URL válida.` include_error=` deve conter '%s'.` unknown_error=Erro desconhecido: - - +captcha_incorrect=Resposta ao CAPTCHA incorreta. +password_not_match=As senhas escolhidas não coincidem. + +username_been_taken=O nome de usuário já está sendo usado. +repo_name_been_taken=O nome de repositório já está sendo usado. +org_name_been_taken=O nome da organização já está sendo usado. +team_name_been_taken=O nome de equipe já está sendo usado. +email_been_used=O endereço de e-mail já está sendo usado. +openid_been_used=O endereço OpenID '%s' já está sendo usado. +username_password_incorrect=Nome de usuário ou senha incorretos. +enterred_invalid_repo_name=Por favor certifique-se de que o nome do repositório está correto. +enterred_invalid_owner_name=Por favor certifique-se de que o nome do proprietário está correto. +enterred_invalid_password=Por favor certifique-se de que a senha está correta. +user_not_exist=O usuário não existe. +last_org_owner=Não é permitido remover o último usuário da equipe de proprietários, pois deve haver pelo menos um proprietário em uma organização. +cannot_add_org_to_team=Uma organização não pode ser adicionada como membro de uma equipe. +cannot_invite_org_to_org=Uma organização não pode ser convidada a fazer parte de outra organização. + +invalid_ssh_key=Desculpe, não conseguimos verificar a sua chave SSH: %s +invalid_gpg_key=Desculpe, não conseguimos verificar a sua chave GPG: %s +unable_verify_ssh_key=A chave SSH não pôde ser verificada. Por favor cheque se não há nenhum problema com ela. auth_failed=A autenticação falhou: %v +still_own_repo=Sua conta ainda é proprietária de ao menos um repositório; você tem que excluí-los ou transferi-los primeiro. +still_has_org=Sua conta ainda é membro de ao menos uma organização. Você precisa deixá-las primeiro. +org_still_own_repo=Esta organização ainda é proprietária de ao menos um repositório; você tem que excluí-los ou transferi-los primeiro. target_branch_not_exist=O branch de destino não existe. @@ -237,14 +293,19 @@ orgs=Organizações delete=Excluir conta twofa=Autenticação de dois fatores account_link=Contas externas +organization=Organização uid=Uid public_profile=Perfil público +profile_desc=Seu endereço de e-mail é publico e será usado para quaisquer notificações relacionadas à sua conta, além de operações pela interface web do Gitea. +password_username_disabled=Usuários não-locais não podem alterar seus nomes de usuário. Por favor contate o administrador do sistema para mais informações. full_name=Nome completo website=Site location=Localização update_profile=Atualizar o perfil +update_profile_success=Seu perfil foi atualizado. change_username=Nome de usuário alterado +change_username_prompt=Esta mudança vai alterar os links para sua conta. continue=Continuar cancel=Cancelar @@ -260,6 +321,7 @@ change_password=Mudança de senha old_password=Senha Atual new_password=Nova senha retype_new_password=Digite novamente a nova senha +password_incorrect=A senha atual está incorreta. change_password_success=Sua senha foi alterada com sucesso. Agora você pode fazer login usando sua nova conta. password_change_disabled=Usuários não-locais não são permitidos mudar suas senhas pela interface web. @@ -270,6 +332,7 @@ email_desc=Seu endereço de e-mail principal será usado para notificações e o primary=Principal primary_email=Definir como principal delete_email=Excluir +email_deletion=Excluir e-mail email_deletion_success=O e-mail foi excluído com sucesso! openid_deletion=Deleção de OpenID openid_deletion_success=OpenID foi deletado com sucesso! @@ -687,7 +750,6 @@ settings.wiki_delete_notices_1=- Isso irá excluir e desativar a wiki para %s settings.delete=Excluir este repositório settings.delete_desc=Uma vez que você remova um repositório, não tem volta. Por favor, tenha certeza. settings.delete_notices_1=-Esta operação NÃO PODERà ser desfeita. -settings.delete_notices_fork_1=-Todos os forks se tornarão independentes após a exclusão. settings.transfer_owner=Novo dono settings.make_transfer=Fazer transferência settings.confirm_delete=Confirmar exclusão @@ -794,7 +856,6 @@ release.source_code=Código fonte release.new_subheader=Publique lançamentos e gerencie as versões do projeto. release.tag_name=Nome da tag release.target=Destino -release.tag_helper=Escolha uma tag existente, ou crie uma nova tag em publicar. release.title=Título release.content=Conteúdo release.write=Escrever @@ -815,7 +876,6 @@ release.downloads=Downloads branch.delete=Excluir branch %s branch.delete_notices_1=- Esta operação NÃO PODE ser desfeita. branch.deletion_failed=Falha ao excluir branch %s. -branch.delete_branch_has_new_commits=%s não pode ser deletado porque há novos commit após o merge. [org] org_name_holder=Nome da organização @@ -849,7 +909,6 @@ settings.delete_account=Excluir esta organização settings.delete_prompt=A operação irá excluir esta organização permanentemente, e NÃO PODERà ser desfeita! settings.confirm_delete_account=Confirmar exclusão settings.delete_org_title=Exclusão da organização -settings.hooks_desc=Adicionar webhooks que serão acionados para todos os repositórios dessa organização. members.membership_visibility=Visibilidade da associação: members.public=Público @@ -880,7 +939,6 @@ teams.update_settings=Atualizar configurações teams.delete_team=Excluir esta equipe teams.add_team_member=Adicionar membro na equipe teams.delete_team_title=Exclusão da equipe -teams.delete_team_desc=Este equipe será excluída, você quer continuar? Membros desta equipe poderão perder acesso a alguns repositórios. teams.read_permission_desc=Essa equipe concede acesso para Leitura: membros podem ver e clonar os repositórios da equipe. teams.write_permission_desc=Esta equipe concede acesso para escrita: Membros podem ler e fazer push para os repositórios da equipe. teams.admin_permission_desc=Esta equipe concede acesso de Administrador: Membros podem ler, fazer push e adicionar outros colaboradores para os repositórios da equipe. @@ -912,11 +970,9 @@ dashboard.operation_switch=Trocar dashboard.operation_run=Executar dashboard.delete_inactivate_accounts=Excluir todas as contas inativas dashboard.delete_repo_archives=Excluir todos os arquivos dos repositórios -dashboard.delete_missing_repos=Deletar todos os registros de repositórios que não possuem arquivos Git correspondentes dashboard.git_gc_repos=Executar a coleção de lixo em todos os repositórios dashboard.resync_all_sshkeys=Reescrever arquivo '.ssh/authorized_keys' (para chaves SSH do Gitea) dashboard.resync_all_hooks=Resincronizar hooks pre-receive, update e post-receive de todos os repositórios. -dashboard.reinit_missing_repos=Reinicializar todos os repositórios Git perdidos cujos registros existem dashboard.server_uptime=Uptime do Servidor dashboard.current_goroutine=Goroutines Atuais dashboard.current_memory_usage=Uso de memória atual @@ -1010,7 +1066,6 @@ auths.smtp_auth=Tipo de autenticação SMTP auths.smtphost=Host SMTP auths.smtpport=Porta SMTP auths.allowed_domains=Domínios autorizados -auths.allowed_domains_helper=Deixe em branco para permitir qualquer domínio do host SMTP. Vários domínios devem ser separados por vírgula ','. auths.enable_tls=Habilitar Criptografia TLS auths.skip_tls_verify=Ignorar verificação de TLS auths.pam_service_name=Nome de Serviço PAM @@ -1043,7 +1098,6 @@ config.reverse_auth_user=Usuário de autenticação reversa config.ssh_config=Configuração de SSH config.ssh_enabled=Habilitado -config.ssh_start_builtin_server=Iniciar servidor embutido config.ssh_domain=Domínio config.ssh_port=Porta config.ssh_listen_port=Porta de escuta diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini index 2fbde671f9ba..cf4f8dd5ac43 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -34,6 +34,7 @@ mirror=Зеркало new_repo=Ðовый репозиторий new_migrate=ÐÐ¾Ð²Ð°Ñ Ð¼Ð¸Ð³Ñ€Ð°Ñ†Ð¸Ñ new_mirror=Ðовое зеркало +new_fork=Ðовый форк Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ new_org=ÐÐ¾Ð²Ð°Ñ Ð¾Ñ€Ð³Ð°Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ manage_org=Управление организациÑми admin_panel=Панель админиÑтратора @@ -43,6 +44,11 @@ your_profile=Ваш профиль your_starred=Ваше избранное your_settings=Ваши наÑтройки +all=Ð’Ñе +sources=ИÑточники +mirrors=Зеркала +forks=ÐžÑ‚Ð²ÐµÑ‚Ð²Ð»ÐµÐ½Ð¸Ñ + activities=ÐктивноÑÑ‚ÑŒ pull_requests=ЗапроÑÑ‹ на ÑлиÑние issues=Задачи @@ -51,6 +57,7 @@ cancel=Отмена [install] install=УÑтановка +title=ÐÐ°Ñ‡Ð°Ð»ÑŒÐ½Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ docker_helper=ЕÑли вы запуÑкаете Gitea внутри Docker, пожалуйÑта прочтите Ñти Ñоветы внимательно перед тем как что-либо изменить на Ñтой Ñтранице. requite_db_desc=Gitea требует MySQL, PostgreSQL, SQLite3 или TiDB. db_title=ÐаÑтройки базы данных @@ -68,8 +75,10 @@ err_invalid_tidb_name=Ð˜Ð¼Ñ Ð±Ð°Ð·Ñ‹ данных TiDB не может Ñоде no_admin_and_disable_registration=Ð’Ñ‹ не можете отключить региÑтрацию до ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ запиÑи админиÑтратора. err_empty_admin_password=Пароль админиÑтратора не может быть пуÑтым. +general_title=Общие параметры Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ app_name=Ð˜Ð¼Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ repo_path=Путь ÐºÐ¾Ñ€Ð½Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ +repo_path_helper=Ð’Ñе удаленные Git репозиториии будут Ñохранены в Ñтот каталог. lfs_path=Корень LFS lfs_path_helper=Ð’ Ñтой папке будут хранитьÑÑ Ñ„Ð°Ð¹Ð»Ñ‹, хранÑщиеÑÑ Git LFS. ОÑтавьте пуÑтым, чтобы отключить LFS. run_user=Пользователь @@ -118,6 +127,7 @@ save_config_failed=Ðе удалоÑÑŒ Ñохранить конфигураци invalid_admin_setting=Указан недопуÑтимый параметр учетной запиÑи админиÑтратора: %v invalid_log_root_path=ÐедопуÑтимый путь Ð´Ð»Ñ Ð»Ð¾Ð³Ð¾Ð²: %v default_keep_email_private_popup=Это значение по умолчанию видимоÑти адреÑа Ñлектронной почты пользователей. ЕÑли задано значение true, Ð°Ð´Ñ€ÐµÑ Ñлектронной почты вÑех новых пользователей будет Ñкрыт до того, как пользователь Ñам изменит наÑтройки приватноÑти. +no_reply_address=No-reply Ð°Ð´Ñ€ÐµÑ [home] uname_holder=Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð»Ð¸ E-mail @@ -162,11 +172,16 @@ reset_password_helper=Ðажмите здеÑÑŒ, чтобы ÑброÑить Ñ password_too_short=Длина Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½Ðµ менее %d Ñимволов. verify=Проверить scratch_code=Одноразовый пароль +login_userpass=Пользователь / пароль +login_openid=OpenID +openid_register_title=Создать новый аккаунт [mail] activate_account=ПожалуйÑта активируйте Ñвой аккаунт activate_email=Подтвердите Ð°Ð´Ñ€ÐµÑ Ñвоей Ñлектронной почты reset_password=ВоÑÑтановите ваш пароль +register_success=РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð¿Ñ€Ð¾ÑˆÐ»Ð° уÑпешно +register_notify=Добро пожаловать на Gitea [modal] yes=Да @@ -201,8 +216,23 @@ email_error=«не ÑвлÑетÑÑ Ð°Ð´Ñ€ÐµÑом Ñлектронной поч url_error=` не ÑвлÑетÑÑ Ð´Ð¾Ð¿ÑƒÑтимым URL-адреÑом.` include_error=` должен Ñодержать '%s'.` unknown_error=ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°: - - +captcha_incorrect=Капча не пройдена. + +username_been_taken=Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑƒÐ¶Ðµ занÑто. +repo_name_been_taken=Ð˜Ð¼Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ ÑƒÐ¶Ðµ иÑпользуетÑÑ. +org_name_been_taken=Ðазвание организации уже занÑто. +team_name_been_taken=Ðазвание команды уже занÑто. +email_been_used=ÐÐ´Ñ€ÐµÑ Ñлектронной почты уже занÑÑ‚. +openid_been_used=ÐÐ´Ñ€ÐµÑ OpenID '%s' уже иÑпользуетÑÑ. +username_password_incorrect=Ðеверное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð»Ð¸ пароль. +enterred_invalid_repo_name=ПожалуйÑта, убедитеÑÑŒ, что введено правильное Ð¸Ð¼Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ. +enterred_invalid_owner_name=УбедитеÑÑŒ, что введенное Ð¸Ð¼Ñ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†Ð° верное. +enterred_invalid_password=УбедитеÑÑŒ, что введенный пароль верен. +user_not_exist=Пользователь не ÑущеÑтвует. +last_org_owner=Удаление поÑледнего Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð· команды владельцев не разрешаетÑÑ, поÑкольку вÑегда должен быть по крайней мере один владелец в любой организации. + +invalid_ssh_key=К Ñожалению, мы не Ñмогли проверить ваш SSH-ключ: %s +invalid_gpg_key=К Ñожалению, мы не Ñмогли проверить ваш GPG-ключ: %s auth_failed=Ошибка аутентификации: %v @@ -219,16 +249,21 @@ following=ПодпиÑан follow=ПодпиÑатьÑÑ unfollow=ОтпиÑатьÑÑ +form.name_reserved=Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ '%s' зарезервировано. +form.name_pattern_not_allowed=Шаблон имени Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ '%s' не допуÑкаетÑÑ. [settings] profile=Профиль password=Пароль avatar=Ðватар +ssh_gpg_keys=SSH / GPG ключи social=Учетные запиÑи в ÑоцÑетÑÑ… applications=ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ orgs=Организации delete=Удалить аккаунт twofa=Ð”Ð²ÑƒÑ…Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð°Ñ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ +account_link=Внешние учетные запиÑи +organization=ÐžÑ€Ð³Ð°Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ uid=UID public_profile=Открытый профиль @@ -236,7 +271,9 @@ full_name=ФИО website=Веб-Ñайт location=МеÑтоположение update_profile=Обновить профиль +update_profile_success=Ваш профиль уÑпешно обновлен. change_username=Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¾ +change_username_prompt=Это изменение изменит ÑÑылки на ваш аккаунт. continue=Далее cancel=Отмена @@ -247,11 +284,13 @@ choose_new_avatar=Выбрать новый аватар update_avatar=Обновить наÑтройку аватара delete_current_avatar=Удалить текущий аватар uploaded_avatar_not_a_image=Загружаемый файл не ÑвлÑетÑÑ Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸ÐµÐ¼. +update_avatar_success=ÐаÑтройка вашего аватара обновлена. change_password=Сменить пароль old_password=Текущий пароль new_password=Ðовый пароль retype_new_password=Подтверждение нового Ð¿Ð°Ñ€Ð¾Ð»Ñ +password_incorrect=Текущий пароль неправильный. emails=ÐдреÑа Ñлектронной почты manage_emails=Управление адреÑами Ñлектронной почты @@ -267,13 +306,26 @@ add_email_success=Ðовый Ð°Ð´Ñ€ÐµÑ Ñлектронной почты уÑп manage_ssh_keys=Управление SSH ключами add_key=Добавить ключ add_new_key=Добавить SSH ключ +add_new_gpg_key=Добавить GPG ключ +ssh_key_been_used=Этот публичный ключ уже был иÑпользован. +ssh_key_name_used=Публичный ключ Ñ Ñ‚Ð°ÐºÐ¸Ð¼ же именем уже ÑущеÑтвует. +gpg_key_id_used=Публичный GPG ключ Ñ Ñ‚Ð°ÐºÐ¸Ð¼ же идентификатором уже ÑущеÑтвует. +key_id=ИД ключа key_name=Ð˜Ð¼Ñ ÐºÐ»ÑŽÑ‡Ð° key_content=Содержимое delete_key=Удалить ssh_key_deletion=Удаление ключа SSH +ssh_key_deletion_success=SSH ключ был удален. +gpg_key_deletion_success=GPG ключ был удален. add_on=Добавлено +valid_until=ДейÑтвителен до +valid_forever=ДейÑтвителен навÑегда last_used=ПоÑледний раз иÑпользовалÑÑ no_activity=Еще не применÑлÑÑ +key_state_desc=Этот ключ иÑпользовалÑÑ Ð² течение поÑледних 7 дней +token_state_desc=Этот токен иÑпользовалÑÑ Ð² течение поÑледних 7 дней +show_openid=Показывать в профиле +hide_openid=Скрыть из Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ manage_social=Управление привÑзанными учетными запиÑÑми в ÑоцÑетÑÑ… unbind=ОтвÑзать @@ -622,7 +674,6 @@ settings.wiki_delete_notices_1=-Это будет удалено и отключ settings.delete=Удалить Ñтот репозиторий settings.delete_desc=Будьте внимательны! Как только вы удалите репозиторий — пути назад не будет. settings.delete_notices_1=- Эта Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ ÐЕ МОЖЕТ быть отменена. -settings.delete_notices_fork_1=- Ð’Ñе Ð¾Ñ‚Ð²Ð»ÐµÑ‚Ð²Ð»ÐµÐ½Ð¸Ñ Ñтанут незавиÑимыми поÑле удалениÑ. settings.transfer_owner=Ðовый владелец settings.make_transfer=Выполнить передачу settings.confirm_delete=Подтвердить удаление @@ -708,7 +759,6 @@ release.ahead=%d коммитов %s Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ Ñтог release.source_code=ИÑходный код release.tag_name=Ð˜Ð¼Ñ Ñ‚ÐµÐ³Ð° release.target=Цель -release.tag_helper=Выберите ÑущеÑтвующий тег, или Ñоздайте новый. release.title=Заголовок release.content=Содержимое release.write=ЗапиÑÑŒ @@ -757,7 +807,6 @@ settings.delete_account=Удалить Эту Организацию settings.delete_prompt=Это дейÑтвие безвозвратно удалит Ñту организацию навÑегда. settings.confirm_delete_account=Подтвердить удаление settings.delete_org_title=Удаление Организации -settings.hooks_desc=Добавьте автоматичеÑкое обновление, который будет вызыватьÑÑ Ð´Ð»Ñ Ð²Ñех репозиций под Ñтой Группой. members.membership_visibility=ВидимоÑÑ‚ÑŒ учаÑтника команды: members.public=Публичный @@ -786,7 +835,6 @@ teams.update_settings=Обновить наÑтройки teams.delete_team=Удалить Ñту группу разработки teams.add_team_member=Добавление члена группы разработки teams.delete_team_title=Удалить группу разработки -teams.delete_team_desc=Эта команда будет удалена. Ð’Ñ‹ хотите продолжить? Члены Ñтой группы могут потерÑÑ‚ÑŒ доÑтуп к некоторым репозиториÑм. teams.read_permission_desc=Эта команда предоÑтавлÑет доÑтуп на Чтение: члены могут проÑматривать и клонировать репозитории команды. teams.write_permission_desc=Эта команда предоÑтавлÑет доÑтуп на ЗапиÑÑŒ: члены могут получать и выполнÑÑ‚ÑŒ push команды в репозитории. teams.admin_permission_desc=Эта команда дает админиÑтративный доÑтуп: учаÑтники могут читать, пушить и добавлÑÑ‚ÑŒ Ñоавторов к ее репозиториÑм. @@ -906,7 +954,6 @@ auths.smtp_auth=Тип аутентификации SMTP auths.smtphost=Узел SMTP auths.smtpport=SMTP-порт auths.allowed_domains=Разрешенные домены -auths.allowed_domains_helper=ОÑтавьте пуÑтым чтобы не ограничивать домены. ÐеÑколько доменов должны быть разделены запÑтыми ','. auths.enable_tls=Включение ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ TLS auths.skip_tls_verify=ПропуÑтить проверку TLS auths.pam_service_name=Ð˜Ð¼Ñ Ñлужбы PAM @@ -934,7 +981,6 @@ config.reverse_auth_user=Заголовок Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ пользовате config.ssh_config=ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ SSH config.ssh_enabled=Включено -config.ssh_start_builtin_server=ЗапуÑтить вÑтроенный Ñервер config.ssh_domain=Домен config.ssh_port=Порт config.ssh_listen_port=ПроÑлушиваемый порт @@ -967,6 +1013,7 @@ config.active_code_lives=Ð’Ñ€ÐµÐ¼Ñ Ð¶Ð¸Ð·Ð½Ð¸ кода Ð´Ð»Ñ Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸ config.webhook_config=ÐаÑтройка автоматичеÑкого Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ†Ð¸Ð¸ config.queue_length=Длина очереди config.deliver_timeout=Задержка доÑтавки +config.skip_tls_verify=ПропуÑтить проверку TLS config.mailer_config=ÐаÑтройки почты config.mailer_enabled=Включено diff --git a/options/locale/locale_sr-SP.ini b/options/locale/locale_sr-SP.ini index 57cbbc4aec9e..bd68ad9835dd 100644 --- a/options/locale/locale_sr-SP.ini +++ b/options/locale/locale_sr-SP.ini @@ -36,6 +36,7 @@ settings=Подешавања your_profile=Ваш профил your_settings=Ваша подешавања + activities=ÐктивноÑти pull_requests=Захтеви за Ñпајање issues=ДиÑкуÑије @@ -551,7 +552,6 @@ settings.wiki_delete_notices_1=- Ова операција је избриÑат settings.delete=Уклони ово Ñпремиште settings.delete_desc=Ðећете мочи повратити Ñпремиште поÑле бриÑања. Молимо ваÑ, будите Ñигурни. settings.delete_notices_1=- Ова операција ÐЕЋЕ МОЧИ бити укинута. -settings.delete_notices_fork_1=- Сви огранци ће поÑтати незавиÑни поÑле уклањање. settings.transfer_owner=Ðови влаÑник settings.make_transfer=Изврши Ð¿Ñ€ÐµÐ½Ð¾Ñ settings.confirm_delete=Потврдите бриÑање @@ -637,7 +637,6 @@ release.ahead=%d комита на %s почев од овог release.source_code=Изворни код release.tag_name=Име ознаке release.target=Циљ -release.tag_helper=Изаберите поÑујућу ознаку, или креирај нову. release.title=ÐаÑлов release.content=Садржај release.write=Ðапиши @@ -686,7 +685,6 @@ settings.delete_account=Уклони ову организацију settings.delete_prompt=Ова организација ће бото избриÑана и операција ÐЕ МОЖЕ бити отказана у будућноÑти! settings.confirm_delete_account=Потврди бриÑање settings.delete_org_title=БриÑање организација -settings.hooks_desc=Додајте аутоматÑко ажурирање, које ће важити за Ñва Ñпремишта под овој организацији. members.membership_visibility=ВидљивоÑÑ‚: members.public=Јавно @@ -715,7 +713,6 @@ teams.update_settings=Примени промене teams.delete_team=Уклони овај тим teams.add_team_member=Додај члан тиму teams.delete_team_title=Уклони тим -teams.delete_team_desc=Овај потез ће чинити да чланови ове групе ће можта изгубе приÑтуп неким Ñпремиштима. Да ли желите да наÑтавите? teams.read_permission_desc=Овај тим даје приÑтуп на Читање: чланови могу да виде и да клонира Ñпремишта. teams.write_permission_desc=Овај тим даје приÑтуп на ПиÑање: чланови могу да виде и врше push операције на Ñпремишта. teams.admin_permission_desc=Овај тим даје админиÑтраторки приÑтуп: чланови могу да виде, врше push операције, и додавају Ñараднике. @@ -833,7 +830,6 @@ auths.smtp_auth=Тип SMTP аутентикације auths.smtphost=SMTP хоÑÑ‚ auths.smtpport=SMTP порт auths.allowed_domains=Дозвољени домени -auths.allowed_domains_helper=ОÑтавите празно да не ограничавају домени. Више домена морају да буду одвојени зарезима ','. auths.enable_tls=Омогући TLS шифровање auths.skip_tls_verify=ПреÑкочи TLS проверу auths.pam_service_name=Ðазив PAM ÑервиÑа @@ -859,7 +855,6 @@ config.reverse_auth_user=КориÑничко име при обрнуту ау config.ssh_config=SSH конфигурација config.ssh_enabled=Омогућено -config.ssh_start_builtin_server=Покрени уграђени Ñервер config.ssh_domain=Домен config.ssh_port=Порт config.ssh_listen_port=Порт за Ñлушање diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini index 2e477adaa6bc..0ad2a0aaccaa 100644 --- a/options/locale/locale_sv-SE.ini +++ b/options/locale/locale_sv-SE.ini @@ -46,6 +46,7 @@ your_profile=Din profil your_starred=Dina Stjärnmärkta your_settings=Dina inställningar + activities=Aktiviteter pull_requests=Pull förfrÃ¥gningar issues=Problem @@ -779,7 +780,6 @@ settings.wiki_deletion_success=Repots wikidata har tagits bort. settings.delete=Ta Bort Detta Repo settings.delete_desc=När du har tagit bort ett repo sÃ¥ finns det ingen Ã¥tervändo. Var säker pÃ¥ vad du gör. settings.delete_notices_1=- Denna Ã¥tgärd kan INTE Ã¥ngras. -settings.delete_notices_fork_1=- Alla förgreningar kommer bli oberoende efter borttagning. settings.transfer_owner=Ny Ägare settings.make_transfer=Överför settings.confirm_delete=Bekräfta Borttagelsen @@ -867,7 +867,6 @@ release.ahead=%d ändringar mot %s sedan detta släpp release.source_code=Källkod release.tag_name=Taggnamn release.target=MÃ¥l -release.tag_helper=Välj en befintlig tagg, eller skapa en ny tagg pÃ¥ publicera. release.title=Titel release.content=InnehÃ¥ll release.write=Skriv @@ -926,7 +925,6 @@ settings.delete_account=Tag bort denna organisation settings.delete_prompt=Organisationen kommer tas bort permanent, och det gÃ¥r INTE att Ã¥ngra detta! settings.confirm_delete_account=Bekräfta borttagning settings.delete_org_title=Organisation borttagen -settings.hooks_desc=Lägg till webbkrokar som triggas för alla förrÃ¥d under denna organisation. members.membership_visibility=Synlighet för medlemskap: members.public=Publik @@ -955,7 +953,6 @@ teams.update_settings=Uppdatera inställningar teams.delete_team=Ta bort detta team teams.add_team_member=Lägg till teammedlem teams.delete_team_title=Borttagning av team -teams.delete_team_desc=Eftersom detta team tas bort kan medlemmar i teamet förlora sin tillgÃ¥ng till visa förrÃ¥d. Vill du fortsätta? teams.read_permission_desc=Medlemskap i detta team ger läsrättigheter: medlemmar kan visa och klona teamets förrÃ¥d. teams.write_permission_desc=Medlemskap i detta team ger skrivrättigheter: medlemmar kan läsa frÃ¥n och ladda upp till teamets förrÃ¥d. teams.admin_permission_desc=Medlemskap i detta team ger administratörsrättigheter: medlemmar kan läsa frÃ¥n, ladda upp till och lägga till deltagare till teamets förrÃ¥d. @@ -1044,7 +1041,6 @@ users.allow_import_local=Detta konto har tillÃ¥telse att importera lokal förrÃ¥ users.allow_create_organization=Detta konto har tillÃ¥telse att skapa organisationer users.update_profile=Uppdatera kontoprofil users.delete_account=Tag bort detta konto -users.still_has_org=Detta konto är fortfarande medlem i minst en organisation, du mÃ¥ste lämna eller ta bort organisationen först. users.deletion_success=Kontot har tagits bort. orgs.org_manage_panel=Organisationshantering @@ -1091,7 +1087,6 @@ auths.smtp_auth=SMTP Autentiseringstyp auths.smtphost=SMTP-server auths.smtpport=SMTP-port auths.allowed_domains=TillÃ¥tna Domäner -auths.allowed_domains_helper=Lämnas tom för att tillÃ¥ta alla domäner. Multipla domäner separeras med ett kommatecken ','. auths.enable_tls=Aktivera TLS-kryptering auths.skip_tls_verify=Skippa verifikation av TLS auths.pam_service_name=PAM Tjänstnamn @@ -1129,7 +1124,6 @@ config.script_type=Script-typ config.ssh_config=SSH-konfiguration config.ssh_enabled=Aktiverad -config.ssh_start_builtin_server=Starta Inbyggd Server config.ssh_domain=Domän config.ssh_port=Port config.ssh_listen_port=Lyssningsport diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini index ec8adc19e2a8..8234a6794032 100644 --- a/options/locale/locale_tr-TR.ini +++ b/options/locale/locale_tr-TR.ini @@ -36,6 +36,7 @@ settings=Ayarlar your_profile=Profiliniz your_settings=Ayarlarınız + activities=Aktiviteler pull_requests=DeÄŸiÅŸiklik Ä°steÄŸi issues=Sorunlar @@ -498,7 +499,6 @@ settings.wiki_delete_notices_1=- Bu iÅŸlem %s için Wiki'yi silecek ve devre dı settings.delete=Bu Depoyu Sil settings.delete_desc=Bir depoyu bir kez sildiÄŸiniz taktirde geri getiremezsiniz. Lütfen emin olun. settings.delete_notices_1=- Bu iÅŸlem geri ALINAMAZ. -settings.delete_notices_fork_1=Silme iÅŸleminden sonra bütün çatallar bağımsız hale gelir. settings.transfer_owner=Yeni Sahip settings.make_transfer=Transfer Et settings.confirm_delete=Silmeyi Onayla @@ -582,7 +582,6 @@ release.ahead=%s son sürümden beri %d iÅŸleme release.source_code=Kaynak Kodu release.tag_name=Biçim imi adı release.target=Hedef -release.tag_helper=Var olan bir biçim imi seçin veya yayında yenisini oluÅŸturun. release.title=BaÅŸlık release.content=İçerik release.write=Yaz @@ -631,7 +630,6 @@ settings.delete_account=Bu Organizasyonu Sil settings.delete_prompt=Organizasyon kalıcı olarak kaldırılacaktır ve bu iÅŸlem geri ALINAMAZ! settings.confirm_delete_account=Silmeyi Onaylıyorum settings.delete_org_title=Organizasyon Silme -settings.hooks_desc=Bu organizasyona baÄŸlı tüm depoları tetikleyecek bir web isteÄŸi oluÅŸtur. members.membership_visibility=Ãœyelik Görünürlüğü: members.public=Herkese Açık @@ -660,7 +658,6 @@ teams.update_settings=Ayarları Güncelle teams.delete_team=Bu Ekibi Sil teams.add_team_member=Ekip Ãœyesi Ekle teams.delete_team_title=Takım Silme -teams.delete_team_desc=Bu takımı silerseniz üyeler bazı depolara olan eriÅŸimlerini kaybedebilirler. Devam etmek istiyor musunuz? teams.read_permission_desc=Bu takımın yetkilerinden Okuma izni: üyeler görüntüleyebilir ve takımın depolarını klonlayabilir. teams.write_permission_desc=Bu takımın yetkilerinden Yazma izni: üyeler okuyabilir ve takımın depolarına push yapabilir. teams.admin_permission_desc=Bu takımın yetkilerinden Yönetici izni: üyeler okuyabilir, push yapabilir ve takımın depolarına yeni katkıcılar ekleyebilir. @@ -779,7 +776,6 @@ auths.smtp_auth=SMTP Yetkilendirme Türü auths.smtphost=SMTP Sunucusu auths.smtpport=SMTP Portu auths.allowed_domains=Ä°zin Verilen Alan Adları -auths.allowed_domains_helper=Her alan adını kısıtlamak için burayı boÅŸ bırakın. Çoklu alan adları virgülle ',' ayrılmalıdır. auths.enable_tls=TLS Åžifrelemeyi AktifleÅŸtir auths.skip_tls_verify=TLS DoÄŸrulamasını Atla auths.pam_service_name=PAM Servis Adı @@ -805,7 +801,6 @@ config.reverse_auth_user=Tersine Yetkilendirme Kullanıcısı config.ssh_config=SSH Yapılandırması config.ssh_enabled=Aktif -config.ssh_start_builtin_server=Hazır Sunucuyu BaÅŸlat config.ssh_domain=Alan Adı config.ssh_listen_port=Port'u Dinle config.ssh_root_path=Kök Yol diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index f11299862257..eb2847383882 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -46,6 +46,12 @@ your_profile=ä¸ªäººä¿¡æ¯ your_starred=我点赞的仓库 your_settings=用户设置 +all=所有 +sources=自建 +mirrors=é•œåƒ +collaborative=å作 +forks=派生 + activities=最近活动 pull_requests=åˆå¹¶è¯·æ±‚ issues=å·¥å•ç®¡ç† @@ -251,6 +257,7 @@ username_been_taken=用户å已被使用 repo_name_been_taken=仓库å称已被使用。 org_name_been_taken=组织å称已被使用。 team_name_been_taken=团队å称已被使用。 +team_no_units_error=团队必须å¯ç”¨è‡³å°‘一个å•å…ƒã€‚ email_been_used=电å­é‚®ä»¶å·²è¢«å ç”¨ã€‚ openid_been_used=OpenID åœ°å€ '%s' 已被使用。 username_password_incorrect=用户å或密ç é”™è¯¯ @@ -491,6 +498,7 @@ migrate.lfs_mirror_unsupported=ä¸æ”¯æŒé•œåƒ LFS 对象 - 使用 'git lfs fetc mirror_from=é•œåƒè‡ªåœ°å€ forked_from=派生自 +fork_from_self=无法派生已ç»æ‹¥æœ‰çš„ä»“åº“ï¼ copy_link=å¤åˆ¶é“¾æŽ¥ copy_link_success=å¤åˆ¶æˆåŠŸï¼ copy_link_error=请按下 ⌘-C 或 Ctrl-C å¤åˆ¶ @@ -581,6 +589,8 @@ commits.message=备注 commits.date=æ交日期 commits.older=更旧的æ交 commits.newer=æ›´æ–°çš„æ交 +commits.signed_by=签署人: +commits.gpg_key_id=GPG 密钥 ID ext_issues=å¤–éƒ¨å·¥å• ext_issues.desc=外部工å•è¿žæŽ¥åˆ°ä¸€ä¸ªå¤–部工å•ç®¡ç†ç³»ç»Ÿ @@ -1076,7 +1086,7 @@ dashboard.delete_inactivate_accounts=删除所有未激活å¸æˆ· dashboard.delete_inactivate_accounts_success=所有未激活å¸å·æ¸…除æˆåŠŸï¼ dashboard.delete_repo_archives=删除所有仓库存档 dashboard.delete_repo_archives_success=所有仓库存档清除æˆåŠŸï¼ -dashboard.delete_missing_repos=删除所有丢失了Git文件的仓库记录 +dashboard.delete_missing_repos=删除所有丢失 Git 文件的仓库记录 dashboard.delete_missing_repos_success=已失去其对应的 Git 文件的所有仓库已被删除。 dashboard.git_gc_repos=对仓库进行垃圾回收 dashboard.git_gc_repos_success=所有仓库已完æˆæ‰§è¡Œåžƒåœ¾å›žæ”¶ã€‚ @@ -1147,7 +1157,7 @@ users.allow_create_organization=此账å·æœ‰æƒé™åˆ›å»ºç»„织 users.update_profile=æ›´æ–°ç”¨æˆ·ä¿¡æ¯ users.delete_account=删除该用户 users.still_own_repo=æ­¤å¸æˆ·ä»æ‹¥æœ‰è‡³å°‘一个仓库，您需è¦å…ˆåˆ é™¤æˆ–转移它们。 -users.still_has_org=æ­¤å¸æˆ·ä»æ˜¯è‡³å°‘一个组织的æˆå‘˜ï¼Œä½ éœ€è¦å…ˆç¦»å¼€æˆ–删除组织。 +users.still_has_org=该å¸æˆ·ä»æ—§æ˜¯æŸäº›ç»„织的æˆå‘˜ï¼Œæ‚¨å¿…须先使其离开或删除组织。 users.deletion_success=用户删除æˆåŠŸï¼ orgs.org_manage_panel=ç»„ç»‡ç®¡ç† @@ -1229,7 +1239,7 @@ auths.update_success=身份验è¯è®¾ç½®å·²æ›´æ–°ã€‚ auths.update=更新认è¯è®¾ç½® auths.delete=删除此验è¯æ¥æº auths.delete_auth_title=删除身份验è¯æº -auths.delete_auth_desc=此身份验è¯æºå°†è¢«åˆ é™¤ï¼Œä½ ç¡®å®šä½ æƒ³è¦ç»§ç»­å—？ +auths.delete_auth_desc=该认è¯å°†è¢«åˆ é™¤ã€‚是å¦ç»§ç»­ï¼Ÿ auths.still_in_used=此认è¯ä»æ—§ä¸Žä¸€äº›ç”¨æˆ·æœ‰å…³è”，请先删除或者将这些用户转æ¢ä¸ºå…¶å®ƒç™»å½•ç±»åž‹ã€‚ auths.deletion_success=授æƒæºåˆ é™¤æˆåŠŸï¼ auths.login_source_exist=ç™»å½•æº '%s' 已存在。 @@ -1254,7 +1264,7 @@ config.reverse_auth_user=åå‘代ç†è®¤è¯ config.ssh_config=SSH é…ç½® config.ssh_enabled=å¯ç”¨æœåŠ¡ -config.ssh_start_builtin_server=å¯ç”¨å†…ç½®æœåŠ¡ +config.ssh_start_builtin_server=å¯åŠ¨å†…ç½®æœåŠ¡ config.ssh_domain=域å config.ssh_port=ç«¯å£ config.ssh_listen_port=监å¬ç«¯å£ diff --git a/options/locale/locale_zh-HK.ini b/options/locale/locale_zh-HK.ini index b142c181ae33..be3c8b3b8367 100644 --- a/options/locale/locale_zh-HK.ini +++ b/options/locale/locale_zh-HK.ini @@ -38,6 +38,7 @@ settings=設定 your_profile=個人資料 your_settings=用戶設定 + activities=活動 pull_requests=åˆä½µè«‹æ±‚ issues=å•é¡Œ @@ -558,7 +559,6 @@ settings.wiki_delete_notices_1=- 將刪除和åœç”¨ %s çš„ wiki settings.delete=刪除本儲存庫 settings.delete_desc=刪除儲存庫æ“作ä¸å¯é€†è½‰ï¼Œè«‹ä¸‰æ€è€Œå¾Œè¡Œã€‚ settings.delete_notices_1=- æ­¤æ“作 ä¸å¯ä»¥ 被回滾。 -settings.delete_notices_fork_1=- 刪除後所有的複製儲存庫將會æˆç‚ºç¨ç«‹å„²å­˜åº« settings.transfer_owner=æ–°æ“有者 settings.make_transfer=確èªè½‰ç§»å„²å­˜åº« settings.confirm_delete=確èªåˆªé™¤å„²å­˜åº« @@ -646,7 +646,6 @@ release.ahead=在該版本發佈之後已有 %d 次程å¼ç¢¼æ release.source_code=程å¼ç¢¼ release.tag_name=標籤å稱 release.target=目標分支 -release.tag_helper=é¸æ“‡æˆ–建立一個已存在的標籤 release.title=標題 release.content=內容 release.write=內容編輯 @@ -695,7 +694,6 @@ settings.delete_account=刪除當å‰çµ„ç¹” settings.delete_prompt=刪除æ“作會永久清除該組織的訊æ¯ï¼Œä¸¦ä¸” ä¸å¯æ¢å¾©ï¼ settings.confirm_delete_account=確èªåˆªé™¤çµ„ç¹” settings.delete_org_title=組織刪除æ“作 -settings.hooks_desc=在此處新增的 Webhook 將會應用到該組織下的 所有儲存庫。 members.membership_visibility=æˆå“¡å¯è¦‹æ€§ï¼š members.public=公開æˆå“¡ @@ -724,7 +722,6 @@ teams.update_settings=更新團隊設定 teams.delete_team=刪除當å‰åœ˜éšŠ teams.add_team_member=新增團隊æˆå“¡ teams.delete_team_title=團隊刪除æ“作 -teams.delete_team_desc=刪除æ“作會永久清除有關該團隊的訊æ¯ï¼Œæ‚¨ç¢ºå®šè¦ç¹¼çºŒæ“作嗎？團隊æˆå“¡å¯èƒ½æœƒå¤±åŽ»å°æŸäº›å„²å­˜åº«çš„æ“作權é™ã€‚ teams.read_permission_desc=該團隊æ“有å°æ‰€å±¬å„²å­˜åº«çš„ è®€å– æ¬Šé™ï¼Œåœ˜éšŠæˆå“¡å¯ä»¥é€²è¡ŒæŸ¥çœ‹å’Œè¤‡è£½ç­‰åªè®€æ“作。 teams.write_permission_desc=該團隊æ“有å°æ‰€å±¬å„²å­˜åº«çš„ è®€å– å’Œ 寫入 的權é™ã€‚ teams.admin_permission_desc=該團隊æ“有一定的 ç®¡ç† æ¬Šé™ï¼Œåœ˜éšŠæˆå“¡å¯ä»¥è®€å–ã€è¤‡è£½ã€æŽ¨é€ä»¥åŠæ–°å¢žå…¶å®ƒå„²å­˜åº«å”作者。 @@ -843,7 +840,6 @@ auths.smtp_auth=SMTP 驗證類型 auths.smtphost=SMTP ä¸»æ©Ÿåœ°å€ auths.smtpport=SMTP ä¸»æ©Ÿç«¯å£ auths.allowed_domains=域å白åå–® -auths.allowed_domains_helper=留空表示ä¸å°åŸŸååšä»»ä½•é™åˆ¶ã€‚多個域å之間需è¦ä½¿ç”¨é€—號 ',' 分隔。 auths.enable_tls=啟用 TLS 加密 auths.skip_tls_verify=忽略 TLS é©—è­‰ auths.pam_service_name=PAM æœå‹™å稱 @@ -870,7 +866,6 @@ config.reverse_auth_user=åå‘代ç†èªè­‰ config.ssh_config=SSH 設定 config.ssh_enabled=已啟用 -config.ssh_start_builtin_server=啟動內建伺æœå™¨ config.ssh_domain=網域 config.ssh_port=埠 config.ssh_listen_port=監è½åŸ  diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini index 1c2ea4be8d96..9b184c8132dc 100644 --- a/options/locale/locale_zh-TW.ini +++ b/options/locale/locale_zh-TW.ini @@ -5,8 +5,11 @@ dashboard=控制é¢ç‰ˆ explore=探索 help=說明 sign_in=登入 +sign_in_with=ç™»å…¥æ–¹å¼ sign_out=登出 sign_up=註冊 +link_account=連çµå¸³æˆ¶ +link_account_signin_or_signup=使用ç¾æœ‰çš„帳戶登入以連çµåˆ°æ­¤å¸³è™Ÿï¼Œæˆ–註冊新帳戶 register=註冊 website=網站 version=版本 @@ -33,14 +36,22 @@ mirror=é¡åƒ new_repo=新增儲存庫 new_migrate=é·ç§»å¤–部儲存庫 new_mirror=æ–°é¡åƒ +new_fork=Fork 新的儲存庫 new_org=新增組織 manage_org=管ç†çµ„ç¹” admin_panel=管ç†é¢æ¿ account_settings=帳號設定 settings=設定 your_profile=個人資料 +your_starred=å€‹äººæ”¶è— your_settings=用戶設定 +all=所有 +sources=ä¾†æº +mirrors=é¡åƒ +collaborative=å”åŒè€… +forks=複製列表 + activities=活動 pull_requests=åˆä½µè«‹æ±‚ issues=å•é¡Œ @@ -49,30 +60,41 @@ cancel=å–消 [install] install=安è£é é¢ +title=åˆå§‹è¨­å®š +docker_helper=如果您正在 Docker 中執行 Gitea，請先仔細閱讀官方文件後，å†å°æœ¬é é¢é€²è¡Œå¡«å¯«ã€‚ +requite_db_desc=Gitea è¦æ±‚å®‰è£ MySQLã€PostgreSQLã€SQLite3 或 TiDB。 db_title=資料庫設定 db_type=資料庫類型 host=主機 user=帳號 password=密碼 db_name=資料庫å稱 +db_helper=如果您使用 MySQL，請使用 INNODB å¼•æ“Žä»¥åŠ utf8_general_ci 字集。 ssl_mode=SSL æ¨¡å¼ path=資料庫文件路徑 +sqlite_helper=SQLite3 或 TiDB 資料庫檔案路徑。
當啟動為æœå‹™æ™‚，請使用絕å°è·¯å¾‘。 err_empty_db_path=SQLite3 或 TiDB 的資料庫路徑ä¸èƒ½ç‚ºç©ºã€‚ err_invalid_tidb_name=TiDB 資料庫å稱ä¸å…許包å«å­—符 "." 或 "-" 。 no_admin_and_disable_registration=您ä¸èƒ½å¤ åœ¨æœªå»ºç«‹ç®¡ç†å“¡ç”¨æˆ¶çš„情æ³ä¸‹ç¦æ­¢è¨»å†Šã€‚ err_empty_admin_password=管ç†å“¡å¯†ç¢¼ä¸èƒ½ç‚ºç©ºã€‚ +general_title=一般應用程å¼è¨­å®š app_name=應用å稱 +app_name_helper=您å¯ä»¥æŠŠæ‚¨çš„組織å稱放在這裡。 repo_path=儲存庫的根目錄 +repo_path_helper=所有é ç«¯ Git 儲存庫會儲存到此目錄。 lfs_path=LFS 根目錄 +lfs_path_helper=以 Git LFS 儲存檔案時會被儲存在此目錄中。請留空以åœç”¨ LFS 功能。 run_user=執行使用者 run_user_helper=該用戶必須具有å°å„²å­˜åº«æ ¹ç›®éŒ„和執行 Gitea çš„æ“作權é™ã€‚ domain=域å domain_helper=該設定影響 SSH 複製地å€ã€‚ ssh_port=SSH 連接埠 +ssh_port_helper=SSH 伺æœå™¨ä½¿ç”¨çš„埠號。請留空以åœç”¨æ­¤è¨­å®šã€‚ http_port=HTTP 連接埠 http_port_helper=應用監è½çš„連接埠 app_url=應用程å¼ç¶²å€ +app_url_helper=這會影響 HTTP/HTTPS çš„ Clone URL 與一些電å­éƒµä»¶é€šçŸ¥ã€‚ log_root_path=日誌路徑 log_root_path_helper=寫入日誌檔目錄 @@ -80,10 +102,14 @@ optional_title=å¯é¸è¨­å®š email_title=é›»å­éƒµä»¶æœå‹™è¨­å®š smtp_host=SMTP 主機 smtp_from=寄件者 +smtp_from_helper=寄件者 Email åœ°å€ (RFC 5322)。它å¯ä»¥åªæ˜¯ä¸€å€‹é›»å­éƒµä»¶åœ°å€ï¼Œæˆ–使用 "Name" æ ¼å¼ã€‚ +mailer_user=發é€ä½¿ç”¨è€… mailer_password=發é€éƒµä»¶å¯†ç¢¼ register_confirm=å•Ÿç”¨è¨»å†Šéƒµä»¶ç¢ºèª +mail_notify=啟用郵件通知 server_service_title=伺æœå™¨å’Œå…¶ä»–æœå‹™è¨­å®š offline_mode=å•“ç”¨é›¢ç·šæ¨¡å¼ +offline_mode_popup=åœç”¨ CDN 讓所有資æºæª”案都從本地伺æœå™¨æ供。 disable_gravatar=ç¦ç”¨ Gravatar æœå‹™ disable_gravatar_popup=ç¦ç”¨ Gravatar 和自定義æºï¼Œåƒ…使用由用戶上傳或默èªçš„é ­åƒã€‚ federated_avatar_lookup=é–‹å•Ÿè¯åˆé ­åƒæŸ¥è©¢ @@ -94,6 +120,7 @@ enable_captcha=啟用驗證碼æœå‹™ enable_captcha_popup=è¦æ±‚在用戶註冊時輸入驗證碼 require_sign_in_view=啓用登錄訪å•é™åˆ¶ require_sign_in_view_popup=åªæœ‰å·²ç™»éŒ„的用戶æ‰èƒ½å¤ è¨ªå•é é¢ï¼Œå¦å‰‡å°‡åªèƒ½çœ‹åˆ°ç™»éŒ„或註冊é é¢ã€‚ +admin_setting_desc=ä½ ä¸éœ€è¦ç¾åœ¨å»ºç«‹ä¸€å€‹ç®¡ç†å“¡å¸³æˆ¶ã€‚在網站註冊的第一個使用者，就會自動å–得管ç†å“¡æ¬Šé™ã€‚ admin_title=管ç†å“¡å¸³è™Ÿè¨­å®š admin_name=管ç†å“¡ç”¨æˆ¶å admin_password=管ç†å“¡å¯†ç¢¼ @@ -101,17 +128,27 @@ confirm_password=確èªå¯†ç¢¼ admin_email=管ç†å“¡éƒµç®± install_btn_confirm=ç«‹å³å®‰è£ test_git_failed=無法識別 'git' 命令：%v +sqlite3_not_available=您目å‰çš„版本ä¸æ”¯æ´ SQLite3，請從 %s 下載官方的é å…ˆç·¨è­¯ç‰ˆæœ¬ï¼Œè€Œä¸æ˜¯ gobuild 版本。 +invalid_db_setting=資料庫設定無效： %v invalid_repo_path=儲存庫根目錄設定ä¸æ­£ç¢ºï¼š%v +run_user_not_match=執行使用者ä¸æ˜¯ç›®å‰ä½¿ç”¨è€…：%s -> %s +save_config_failed=儲存設定失敗：%v invalid_admin_setting=管ç†å“¡å¸³æˆ¶è¨­å®šä¸æ­£ç¢ºï¼š%v +install_success=æ­¡è¿Žï¼éžå¸¸æ„Ÿè¬æ‚¨é¸æ“‡ Gitea，ç¥ä½ ä¸€åˆ‡é †åˆ©ã€‚ invalid_log_root_path=日誌根目錄無效: %v default_keep_email_private=éš±è—郵件地å€çš„é è¨­å€¼ +default_keep_email_private_popup=這是使用者電å­éƒµä»¶åœ°å€æ˜¯å¦é¡¯ç¤ºçš„é è¨­å€¼ã€‚如果設為真則所有新使用者的電å­éƒµä»¶åœ°å€å°‡è¢«éš±è—，直到使用者變更自己的設定值。 +default_allow_create_organization=新使用者建立組織的權é™çš„é è¨­å€¼ +default_allow_create_organization_popup=這是分é…給新使用者的é è¨­æ¬Šé™ã€‚如éŽè¨­ç‚º true 則新使用者將被å…許建立新的組織。 no_reply_address=ä¸å¯å›žå¾©çš„éƒµä»¶åœ°å€ +no_reply_address_helper=關於git日誌中紀錄用戶電å­éƒµä»¶åœ°å€çš„域å，如果使用者留的E-mail 刻æ„採用éžå…¬é–‹çš„，例如å字是'Joe'和域å是'noreply.example.org' ，那麼會被記為 'joe@noreply.example.org' [home] uname_holder=用戶å或郵箱 password_holder=密碼 switch_dashboard_context=切æ›æŽ§åˆ¶é¢ç‰ˆç”¨æˆ¶ my_repos=我的儲存庫 +show_more_repos=顯示更多儲存庫... collaborative_repos=åƒèˆ‡å”作的儲存庫 my_orgs=我的組織 my_mirrors=我的é¡åƒ @@ -125,29 +162,57 @@ repos=儲存庫 users=用戶 organizations=組織 search=æœå°‹ +repo_no_results=未發ç¾ç›¸ç¬¦å„²å­˜åº«ã€‚ +user_no_results=沒有找到符åˆçš„使用者。 +org_no_results=沒有找到符åˆçš„組織。 [auth] +create_new_account=建立帳戶 register_helper_msg=已經註冊？立å³ç™»éŒ„ï¼ +social_register_helper_msg=已經有帳戶了嗎？ç¾åœ¨å°±åŠ å…¥ï¼ disable_register_prompt=å°ä¸èµ·ï¼Œè¨»å†ŠåŠŸèƒ½å·²è¢«é—œé–‰ã€‚è«‹è¯ç³»ç¶²ç«™ç®¡ç†å“¡ã€‚ disable_register_mail=å°ä¸èµ·ï¼Œè¨»å†Šéƒµç®±ç¢ºèªåŠŸèƒ½å·²è¢«é—œé–‰ã€‚ remember_me=記ä½ç™»éŒ„ +forgot_password_title=忘記密碼 +forgot_password=忘記密碼？ sign_up_now=還沒帳戶？馬上註冊。 +confirmation_mail_sent_prompt=一å°æ–°çš„確èªéƒµä»¶å·²ç™¼é€è‡³ %s。請檢查您的收件箱並在 %s å°æ™‚內完æˆç¢ºèªè¨»å†Šæ“作。 +reset_password_mail_sent_prompt=一å°æ–°çš„確èªéƒµä»¶å·²ç™¼é€è‡³ %s。請檢查您的收件箱並在 %s å°æ™‚內完æˆé‡è¨­å¯†ç¢¼æ“作。 active_your_account=啟用您的帳戶 prohibit_login=ç¦æ­¢ç™»éŒ„ +prohibit_login_desc=您的帳號被ç¦æ­¢ç™»å…¥ï¼Œè«‹è¯ç¹«ç¶²ç«™ç®¡ç†å“¡ +resent_limit_prompt=抱歉，您最近已經請求éŽç”¨ä¾†å•Ÿå‹•çš„é›»å­éƒµä»¶ã€‚請等待 3 分é˜å¾Œå†è©¦ä¸€æ¬¡ã€‚ has_unconfirmed_mail=%s 您好，您有一å°ç™¼é€è‡³( %s) 但未被確èªçš„郵件。如果您未收到啟用郵件，或需è¦é‡æ–°ç™¼é€ï¼Œè«‹å–®æ“Šä¸‹æ–¹çš„按鈕。 resend_mail=單擊此處é‡æ–°ç™¼é€ç¢ºèªéƒµä»¶ +email_not_associate=此電å­éƒµä»¶åœ°å€æœªèˆ‡ä»»ä½•å¸³æˆ¶é€£çµ +send_reset_mail=點é¸æ­¤è™•é‡ç™¼æ‚¨çš„密碼é‡è£½éƒµä»¶ reset_password=é‡ç½®å¯†ç¢¼ +invalid_code=很抱歉，您的驗證碼已經éŽæœŸæˆ–是無效 reset_password_helper=單擊此處é‡ç½®å¯†ç¢¼ password_too_short=密碼長度ä¸èƒ½å°‘æ–¼ %d ä½ï¼ +non_local_account=éžæœ¬æ©Ÿå¸³è™Ÿç„¡æ³•é€éŽGiteaçš„Web介é¢æ›´æ”¹å¯†ç¢¼ verify=é©—è­‰ scratch_code=備用碼 use_scratch_code=使用備用碼 twofa_scratch_used=你已經使用了你的備用碼。你將會被轉到兩步驟驗證設定é é¢ä»¥ä¾¿ç§»é™¤ä½ å·²è¨»å†Šè¨­å‚™æˆ–é‡æ–°ç”¢ç”Ÿæ–°çš„備用碼。 +twofa_passcode_incorrect=你的驗證碼ä¸æ­£ç¢ºã€‚如果您éºå¤±è¨­å‚™ï¼Œè«‹ä½¿ç”¨æ‚¨çš„備用碼登入。 +twofa_scratch_token_incorrect=您的備用碼ä¸æ­£ç¢º +login_userpass=帳戶 / 密碼 +login_openid=OpenID +openid_connect_submit=連接 +openid_connect_title=連接到ç¾æœ‰å¸³æˆ¶ +openid_connect_desc=系統無法識別所é¸æ“‡OpenID URI，您å¯ä»¥åœ¨æ­¤å°‡å®ƒé€£çµåˆ°ä¸€å€‹å³æœ‰å¸³æˆ¶ã€‚ +openid_register_title=建立新帳戶 +openid_register_desc=系統無法識別所é¸æ“‡OpenID URI，您å¯ä»¥åœ¨æ­¤å°‡å®ƒé€£çµåˆ°ä¸€å€‹æ–°çš„帳戶。 +openid_signin_desc=範例網å€: https://anne.me, bob.openid.org.cn, gnusocial.net/carry +disable_forgot_password_mail=å°ä¸èµ·ï¼Œé‡è¨­å¯†ç¢¼å·²è¢«é—œé–‰ã€‚è«‹è¯ç³»ç¶²ç«™ç®¡ç†å“¡ã€‚ [mail] activate_account=請啟用您的帳戶 activate_email=è«‹é©—è­‰æ‚¨çš„éƒµç®±åœ°å€ reset_password=é‡ç½®å¯†ç¢¼ +register_success=註冊æˆåŠŸ +register_notify=歡迎來到 Gitea [modal] yes=確èªæ“作 @@ -175,6 +240,9 @@ TreeName=檔案路徑 Content=內容 require_error=ä¸èƒ½ç‚ºç©ºã€‚ +alpha_dash_error=`必須為英文字æ¯ã€é˜¿æ‹‰ä¼¯æ•¸å­—或橫線（-_）。` +alpha_dash_dot_error=`必須為英文字æ¯ã€é˜¿æ‹‰ä¼¯æ•¸å­—ã€æ©«ç·šï¼ˆ-_）或點。` +git_ref_name_error=`必須是格å¼è‰¯å¥½çš„ git åƒè€ƒå稱。` size_error=長度必須為 %s。 min_size_error=長度最å°ç‚º %s 個字符。 max_size_error=長度最大為 %s 個字符。 @@ -182,10 +250,33 @@ email_error=ä¸æ˜¯ä¸€å€‹æœ‰æ•ˆçš„郵箱地å€ã€‚ url_error=ä¸æ˜¯ä¸€å€‹æœ‰æ•ˆçš„ URL。 include_error=必須包å«å­å­—符串 '%s'。 unknown_error=未知錯誤： - - +captcha_incorrect=CAPTCHA 驗證碼ä¸æ­£ç¢ºã€‚ +password_not_match=您設定的密碼ä¸åŒ¹é…。 + +username_been_taken=用戶å稱已被使用 +repo_name_been_taken=儲存庫å稱已被使用。 +org_name_been_taken=組織å稱已被使用。 +team_name_been_taken=團隊å稱已被使用。 +team_no_units_error=團隊必須啟用至少一個單元。 +email_been_used=é›»å­éƒµä»¶åœ°å€å·²è¢«ä½¿ç”¨ã€‚ +openid_been_used=OpenID ä½å€ '%s' 已被使用。 +username_password_incorrect=帳戶å稱或密碼有誤 +enterred_invalid_repo_name=請檢查您輸入的儲存庫å稱是å¦æ­£ç¢ºã€‚ +enterred_invalid_owner_name=請檢查您輸入的æ“有者å稱是å¦æ­£ç¢ºã€‚ +enterred_invalid_password=請檢查您輸入的密碼是å¦æ­£ç¢ºã€‚ +user_not_exist=該用戶åä¸å­˜åœ¨ +last_org_owner=無法移除群組內唯一的管ç†å“¡ +cannot_add_org_to_team=組織ä¸èƒ½è¢«æ–°å¢žç‚ºåœ˜éšŠæˆå“¡ã€‚ +cannot_invite_org_to_org=組織ä¸èƒ½è¢«é‚€è«‹ç‚ºåœ˜éšŠæˆå“¡ã€‚ + +invalid_ssh_key=很抱歉，我們無法驗證您輸入的 SSH 金鑰：%s +invalid_gpg_key=很抱歉，我們無法驗證您輸入的 GPG 金鑰：%s +unable_verify_ssh_key=無法驗證 SSH é‡‘é‘°ï¼Œè«‹ç¢ºèª SSH 金鑰是å¦æ­£ç¢ºã€‚ auth_failed=授權驗證失敗：%v +still_own_repo=您的帳戶ä»ç„¶æ˜¯æŸäº›å„²å­˜åº«çš„æ“有者，您必須先轉移或刪除它們æ‰èƒ½åŸ·è¡Œåˆªé™¤å¸³æˆ¶æ“ä½œï¼ +still_has_org=您的帳戶ä»ç„¶æ˜¯è‡³å°‘一個組織的æˆå“¡ï¼Œä½ éœ€è¦å…ˆé›¢é–‹ä»–們。 +org_still_own_repo=該組織ä»ç„¶æ˜¯æŸäº›å„²å­˜åº«çš„æ“有者，您必須先轉移或刪除它們æ‰èƒ½åŸ·è¡Œåˆªé™¤çµ„ç¹”æ“ä½œï¼ target_branch_not_exist=目標分支ä¸å­˜åœ¨ @@ -200,24 +291,33 @@ following=關註中 follow=關注 unfollow=å–消關注 +form.name_reserved=用戶å '%s' 是被ä¿ç•™çš„。 +form.name_pattern_not_allowed=用戶åä¸å…許 '%s' çš„æ ¼å¼ã€‚ [settings] profile=å€‹äººè¨Šæ¯ password=修改密碼 avatar=é ­åƒ +ssh_gpg_keys=SSH / GPG 金鑰 social=社交帳號ç¶å®š applications=管ç†æŽˆæ¬Šæ‡‰ç”¨ orgs=管ç†çµ„ç¹” delete=刪除帳戶 twofa=兩步驟驗證 +account_link=外部帳戶 +organization=組織 uid=用戶 ID public_profile=å…¬é–‹è¨Šæ¯ +profile_desc=您的郵件地å€å°‡æœƒè¢«å…¬é–‹ï¼Œä¸¦è¢«ç”¨æ–¼æŽ¥æ”¶å¸³æˆ¶çš„所有æ醒和通知。 +password_username_disabled=éžæœ¬åœ°ä½¿ç”¨è€…ä¸å…許更改他們的使用者å稱。更多詳情請è¯ç¹«æ‚¨çš„系統管ç†å“¡ã€‚ full_name=自定義å稱 website=個人網站 location=æ‰€åœ¨åœ°å€ update_profile=æ›´æ–°è¨Šæ¯ +update_profile_success=您的個人資料已被更新 change_username=用戶å將被修改 +change_username_prompt=此更動將會更改你所連çµçš„帳戶 continue=繼續æ“作 cancel=å–消æ“作 @@ -228,74 +328,137 @@ choose_new_avatar=é¸æ“‡æ–°çš„é ­åƒ update_avatar=æ›´æ–°é ­åƒè¨­å®š delete_current_avatar=刪除當å‰é ­åƒ uploaded_avatar_not_a_image=上傳的文件ä¸æ˜¯ä¸€å¼µåœ–ç‰‡ï¼ +update_avatar_success=æˆåŠŸæ›´æ–°æ‚¨çš„é ­åƒè¨­å®šï¼ change_password=修改密碼 old_password=當å‰å¯†ç¢¼ new_password=新的密碼 retype_new_password=é‡æ–°è¼¸å…¥æ–°çš„密碼 +password_incorrect=當å‰å¯†ç¢¼ä¸æ­£ç¢ºï¼ +change_password_success=密碼修改æˆåŠŸï¼æ‚¨ç¾åœ¨å¯ä»¥ä½¿ç”¨æ–°çš„密碼登入。 +password_change_disabled=éžæœ¬åœ°ç”¨æˆ¶ä¸å…許é€éŽ Web 介é¢è®Šæ›´å¯†ç¢¼ã€‚ emails=é›»å­éƒµä»¶åœ°å€ manage_emails=管ç†é›»å­éƒµä»¶åœ°å€ +manage_openid=ç®¡ç† OpenID ä½å€ email_desc=您的主è¦é‚®ç®±åœ°å€å°†è¢«ç”¨äºŽé€šçŸ¥æ醒和其它æ“作。 primary=ä¸»è¦ primary_email=è®¾ä¸ºä¸»è¦ delete_email=刪除 +email_deletion=刪除電å­éƒµä»¶ +email_deletion_desc=刪除此電å­éƒµä»¶åœ°å€å°‡å¾žæ‚¨çš„帳戶刪除所有的相關的資訊。Git æ交使用此電å­éƒµä»¶å°‡ä¿æŒä¸è®Šã€‚你想è¦ç¹¼çºŒå—Žï¼Ÿ email_deletion_success=æˆåŠŸåˆªé™¤éƒµç®±ï¼ +openid_deletion=OpenID 刪除 +openid_deletion_desc=從您的帳戶刪除此 OpenID ä½å€å°‡æœƒé˜»æ­¢ä½ ä½¿ç”¨å®ƒé€²è¡Œç™»éŒ„。你確定è¦ç¹¼çºŒå—Žï¼Ÿ +openid_deletion_success=OpenID å·²æˆåŠŸåˆ é™¤ï¼ add_new_email=新增新的電å­éƒµä»¶åœ°å€ +add_new_openid=新增新的 OpenID URI add_email=新增電å­éƒµä»¶ +add_openid=新增 OpenID URI +add_email_confirmation_sent=一å°æ–°çš„確èªéƒµä»¶å·²ç¶“被發é€è‡³ %s，請檢查您的收件箱並在 %s å°æ™‚內完æˆç¢ºèªè¨»å†Šæ“作。 add_email_success=æ–°çš„é›»å­éƒµä»¶æ–°å¢žæˆåŠŸã€‚ +add_openid_success=ä½ çš„ OpenID ä½å€å·²æˆåŠŸæ–°å¢žã€‚ keep_email_private=ä¸å…¬é–‹ Email åœ°å€ keep_email_private_popup=設定此é¸é …會使得其他用戶看ä¸åˆ°æ‚¨çš„é›»å­éƒµä»¶ä¿¡ç®± +openid_desc=您的 OpenID ä½å€å°‡è®“您的身份驗證委派到é¸æ“‡çš„供應商 manage_ssh_keys=ç®¡ç† SSH 金鑰 +manage_gpg_keys=ç®¡ç† GPG 金鑰 add_key=增加金鑰 +ssh_desc=這些是與您的帳戶相關è¯çš„ SSH 金鑰。因為這些金鑰å…許任何人使用它們來å–得您的儲存庫權é™ï¼Œéžå¸¸é‡è¦ï¼Œè«‹ç¢ºä¿ä½ è­˜åˆ¥å®ƒå€‘。 +gpg_desc=這些是與您的帳戶相關è¯çš„ GPG 金鑰。因為這些金鑰å¯ä»¥è®“ä½ çš„æ交被驗證，它是éžå¸¸é‡è¦çš„，請確ä¿ç§å¯†é‡‘鑰能夠被安全ä¿å­˜ã€‚ +ssh_helper=需è¦å”助? 查詢GitHub的文件以 您自有SSH金鑰 or solve common problems you may encounter using SSH. +gpg_helper=需è¦å”助嗎？建議å¯çœ‹çœ‹ GitHub çš„ about GPG 文件。 add_new_key=增加 SSH 金鑰 +add_new_gpg_key=新增 GPG 金鑰 +ssh_key_been_used=此公鑰已被使用。 +ssh_key_name_used=已存在具有相åŒå稱的公開金鑰。 +gpg_key_id_used=å·²å­˜åœ¨å…·æœ‰ç›¸åŒ id çš„ GPG 公開金鑰。 +gpg_key_email_not_found=附加到 GPG 金鑰的電å­éƒµä»¶æ‰¾ä¸åˆ°æˆ–尚未確èªï¼š%s +subkeys=次金鑰 +key_id=金鑰 ID key_name=金鑰å稱 key_content=金鑰內容 +add_key_success=您的 SSH 金鑰 '%s' 新增æˆåŠŸã€‚ +add_gpg_key_success=您的 GPG 金鑰 '%s' 已經新增æˆåŠŸã€‚ delete_key=刪除 ssh_key_deletion=刪除 SSH 公鑰 +gpg_key_deletion=GPG 金鑰刪除 +ssh_key_deletion_desc=刪除該 SSH 公鑰將撤銷所有使用此 SSH 金鑰的帳號的訪å•æ¬Šé™ã€‚是å¦ç¹¼çºŒ? +gpg_key_deletion_desc=刪去此 GPG 金鑰將會使與此 GPG 金鑰簽署的所有æ交失去驗證。你確定è¦ç¹¼çºŒå—Žï¼Ÿ +ssh_key_deletion_success=SSH 金鑰已被刪除。 +gpg_key_deletion_success=GPG 金鑰已被刪除。 add_on=增加於 +valid_until=有效期至 +valid_forever=æ°¸é æœ‰æ•ˆ last_used=上次使用在 no_activity=沒有最近活動 +key_state_desc=該金鑰在 7 å¤©å…§è¢«ä½¿ç”¨éŽ +token_state_desc=æ­¤ token 在éŽåŽ»ä¸ƒå¤©å…§æ›¾ç¶“è¢«ä½¿ç”¨éŽ +show_openid=在設定檔顯示 +hide_openid=å¾žè¨­å®šæª”éš±è— manage_social=管ç†é—œè¯ç¤¾äº¤å¸³æˆ¶ +social_desc=這是相關è¯çš„社交帳戶清單。出於安全考é‡ï¼Œè«‹ç¢ºä¿æ‚¨è­˜åˆ¥æ‰€æœ‰é …目，因為它們å¯ç”¨æ–¼ç™»å…¥åˆ°æ‚¨çš„帳戶。 unbind=解除ç¶å®š +unbind_success=已從你的帳戶解除ç¶å®šç¤¾äº¤å¸³è™Ÿã€‚ manage_access_token=管ç†å€‹äººæ“作令牌 generate_new_token=生æˆæ–°çš„令牌 +tokens_desc=您所產生的 Token èƒ½è¢«ç”¨ä¾†å­˜å– Gitea APIs。 new_token_desc=ç›®å‰ç‚ºæ­¢ï¼Œä»»ä½•ä»¤ç‰Œéƒ½å°æ‚¨çš„帳戶æ“有完整的æ“作權é™ã€‚ token_name=令牌å稱 generate_token=生æˆä»¤ç‰Œ +generate_token_success=æˆåŠŸç”¢ç”Ÿ Access Tokenï¼æ‚¨å¿…須立å³è¤‡è£½åˆ°ä¸€å€‹å®‰å…¨çš„地方，因為該 Token åªæœƒé¡¯ç¤ºä¸€æ¬¡ï¼ delete_token=删除令牌 access_token_deletion=刪除個人的連接token +access_token_deletion_desc=刪除此 Access Token 將撤銷任何使用該 Token 應用程å¼çš„æ“作。你想è¦ç¹¼çºŒå—Žï¼Ÿ +delete_token_success=個人 Access Token 已刪除。別忘了更新使用此 Token 的任何應用程å¼ã€‚ +twofa_desc=Gitea 支æ´å…©æ­¥é©Ÿé©—證來加強帳號的安全性 +twofa_is_enrolled=您的帳號已經啟用兩步驟驗證。 +twofa_not_enrolled=您的帳號目å‰å°šæœªå•Ÿç”¨å…©æ­¥é©Ÿé©—證。 twofa_disable=åœç”¨å…©æ­¥é©Ÿé©—è­‰ twofa_scratch_token_regenerate=é‡æ–°ç”¢ç”Ÿå‚™ç”¨ç¢¼ twofa_scratch_token_regenerated=您的備用碼已經é‡æ–°ç”¢ç”Ÿã€‚ç¾åœ¨æ˜¯ %s。請儲存在安全的地方。 twofa_enroll=註冊兩步驟驗證 twofa_disable_note=您å¯ä»¥éš¨æ™‚關閉兩步驟驗證。 +twofa_disable_desc=關閉兩步驟驗證將使得您的帳號ä¸å®‰å…¨ï¼Œä½ ç¢ºå®šè¦ç¹¼çºŒå—Žï¼Ÿ +regenerate_scratch_token_desc=如果您éºå¤±äº†å‚™ç”¨ç¢¼ï¼Œæˆ–者已使用它登入系統了，你å¯åœ¨æ­¤é‡æ–°ç”¢ç”Ÿã€‚ twofa_disabled=兩步驟驗證已經被關閉。 scan_this_image=使用您的授權應用程å¼ä¾†æŽƒçž„圖片: or_enter_secret=或者輸入密碼: %s +then_enter_passcode=然後輸入應用程å¼æ供給您的驗證碼： passcode_invalid=無效的驗證碼，請é‡è©¦ã€‚ twofa_enrolled=您的帳號已經啟用了兩步驟驗證。請務必ä¿å­˜å¥½æ‚¨çš„èªè­‰ç¢¼ (%s)，這åªæœƒé¡¯ç¤ºä¸€æ¬¡ã€‚ +manage_account_links=管ç†å¸³æˆ¶é€£çµ +manage_account_links_desc=連çµåˆ°æ­¤å¸³æˆ¶çš„外部帳戶 +account_links_not_available=ç›®å‰æ²’有連çµåˆ°æ­¤å¸³æˆ¶çš„外部帳戶 +remove_account_link=刪除連çµçš„帳戶 +remove_account_link_desc=刪除此連çµçš„帳戶將撤銷所有相關的訪å•ä½¿ç”¨æ­¤å¸³æˆ¶ã€‚你想è¦ç¹¼çºŒå—Žï¼Ÿ +remove_account_link_success=帳號的連çµå·²ç¶“æˆåŠŸç§»é™¤ï¼ +orgs_none=您尚未æˆç‚ºä»»ä¸€çµ„織的æˆå“¡ã€‚ delete_account=刪除當å‰å¸³æˆ¶ delete_prompt=刪除æ“作會永久清除您的帳戶訊æ¯ï¼Œä¸¦ä¸” ä¸å¯æ¢å¾©ï¼ confirm_delete_account=確èªåˆªé™¤å¸³æˆ¶ delete_account_title=帳戶刪除æ“作 +delete_account_desc=您是å¦ç¢ºå®šè¦æ°¸ä¹…刪除此帳號？ [repo] owner=æ“有者 repo_name=儲存庫å稱 +repo_name_helper=好的儲存庫å稱通常是簡短的ã€å¥½è¨˜çš„ã€ä¸”ç¨ç‰¹çš„。 visibility=å¯è¦‹åº¦ visiblity_helper=該儲存庫為 ç§æœ‰çš„ +visiblity_helper_forced=網站管ç†å“¡å·²å¼·åˆ¶è¦æ±‚所有新建儲存庫必須為 ç§æœ‰å„²å­˜åº« visiblity_fork_helper=（修改該值將會影響到所有複製儲存庫） clone_helper=ä¸çŸ¥é“如何æ“ä½œï¼Ÿè¨ªå• å¸®åŠ©èª¬æ˜Ž ï¼ fork_repo=複製儲存庫 fork_from=複製自 +fork_visiblity_helper=您無法修改已複製儲存庫的å¯è¦‹åº¦ã€‚ repo_desc=儲存庫æè¿° repo_lang=儲存庫語言 repo_gitignore_helper=é¸æ“‡ .gitignore 主題 @@ -307,12 +470,19 @@ auto_init=使用é¸å®šçš„文件和模æ¿åˆå§‹åŒ–儲存庫 create_repo=建立儲存庫 default_branch=默èªåˆ†æ”¯ mirror_prune=è£æ¸› +mirror_prune_desc=刪除任何已ä¸å­˜åœ¨æ–¼é ç«¯è³‡æ–™åº«çš„é ç«¯è¿½è¹¤å¼•ç”¨ +mirror_interval=é¡åƒé–“éš” (有效時間單ä½ç‚º"h", "m"，"s") +mirror_interval_invalid=é¡åƒå‘¨æœŸç„¡æ•ˆ mirror_address=é¡åƒåœ°å€ +mirror_address_desc=請在此ä½å€ä¸­å¼•å…¥ä»»ä½•å¿…è¦ä½¿ç”¨è€…憑證。 mirror_last_synced=上次åŒæ­¥ watchers=關注者 stargazers=稱讚者 forks=複製儲存庫 +form.reach_limit_of_creation=您已經é”到了儲存庫 %d 的上é™ã€‚ +form.name_reserved=儲存庫å稱 '%s' 是é ç•™çš„。 +form.name_pattern_not_allowed=儲存庫å稱格å¼ä¸å…許為'%s'。 need_auth=需è¦æŽˆæ¬Šé©—è­‰ migrate_type=é·ç§»é¡žåž‹ @@ -324,9 +494,11 @@ migrate.clone_local_path=或者是本地端伺æœå™¨è·¯å¾‘ migrate.permission_denied=您並沒有導入本地儲存庫的權é™ã€‚ migrate.invalid_local_path=無效的本地路徑，該路徑ä¸å­˜åœ¨æˆ–ä¸æ˜¯ä¸€å€‹ç›®éŒ„ï¼ migrate.failed=é·ç§»å¤±æ•—：%v +migrate.lfs_mirror_unsupported=é¡åƒ LFS 物件ä¸æ”¯æ´ - 代替使用 'git lfs fetch --all' å’Œ 'git lfs push --all'。 mirror_from=é•œåƒæ¥è‡ª forked_from=複製自 +fork_from_self=您無法複製已經æ“æœ‰çš„å„²å­˜åº«ï¼ copy_link=è¤‡è£½é€£çµ copy_link_success=複製æˆåŠŸï¼ copy_link_error=請按下 ⌘-C 或 Ctrl-C 複製 @@ -341,8 +513,12 @@ download_archive=下載此儲存庫 no_desc=æš«ç„¡æè¿° quick_guide=快速幫助 clone_this_repo=複製當å‰å„²å­˜åº« +create_new_repo_command=從命令列建立新儲存庫。 +push_exist_repo=從命令列推é€å·²å­˜åœ¨çš„儲存庫 +bare_message=此儲存庫未包å«ä»»ä½•å…§å®¹ã€‚ code=程å¼ç¢¼ +code.desc=程å¼ç¢¼æ˜¯ç¨‹å¼ç¢¼å„²å­˜çš„地方 branch=分支 tree=目錄樹 filter_branch_and_tag=éŽæ¿¾åˆ†æ”¯æˆ–標籤 @@ -361,11 +537,13 @@ file_permalink=æ°¸ä¹…é€£çµ file_too_large=檔案太大，無法顯示 video_not_supported_in_browser=您的ç€è¦½å™¨ä¸æ”¯æ´ä½¿ç”¨ HTML5 播放影片。 stored_lfs=儲存到到 Git LFS +commit_graph=æ交圖 editor.new_file=開新檔案 editor.upload_file=上傳檔案 editor.edit_file=編輯文件 editor.preview_changes=é è¦½æ›´æ”¹ +editor.cannot_edit_non_text_files=ä¸èƒ½å¾žç¶²ç«™ä»‹é¢ç·¨è¼¯äºŒé€²ä½æª”案 editor.edit_this_file=編輯此文件 editor.must_be_on_a_branch=你必須在一個分支或æ出å°æ­¤æª”的更改 editor.fork_before_edit=你必須在編輯檔案之å‰å‚™ä»½æ­¤æª”案 @@ -389,24 +567,35 @@ editor.cancel=å–消 editor.filename_cannot_be_empty=檔案åä¸èƒ½ç‚ºç©ºã€‚ editor.branch_already_exists='%s' 已存在於此存儲庫。 editor.directory_is_a_file='%s' 在此儲存庫中的路徑是檔案而ä¸æ˜¯ç›®éŒ„。 +editor.file_is_a_symlink=檔案 '%s' 是一個符號連çµï¼Œä¸èƒ½å¾ž web 編輯器修改。 editor.filename_is_a_directory=檔案å '%s' 是此資料庫中的ç¾æœ‰ç›®éŒ„。 editor.file_editing_no_longer_exists=檔 '%s' 您正在編輯ä¸å†å­˜åœ¨æ–¼è³‡æ–™åº«ã€‚ +editor.file_changed_while_editing=從您開始編輯後，檔案內容已被更改。按一下此處以查看什麼被更改或>按å†æ交 以覆蓋這些更改。 editor.file_already_exists=帶有å稱 '%s' 的檔已經存在在這個資料庫中。 editor.no_changes_to_show=沒有å¯ä»¥é¡¯ç¤ºçš„變更。 editor.fail_to_update_file=上傳/建立檔案 '%s' 失敗, 錯誤訊æ¯: %v editor.add_subdir=新增å­ç›®éŒ„... editor.unable_to_upload_files=上傳檔案失敗到 '%s', 錯誤訊æ¯: %v editor.upload_files_to_dir=上傳檔案到 '%s' +editor.cannot_commit_to_protected_branch=無法æ交到å—ä¿è­·çš„分支 '%s'。 +commits.desc=æ交顯示代碼的更改歷å²è¨˜éŒ„ commits.commits=次程å¼ç¢¼æ交 commits.search=æœå°‹æäº¤æ­·å² +commits.find=æœå°‹ +commits.search_all=所有分支 commits.author=作者 commits.message=備註 commits.date=æ交日期 commits.older=更舊的æ交 commits.newer=æ›´æ–°çš„æ交 +commits.signed_by=簽署人 +commits.gpg_key_id=GPG 金鑰 ID +ext_issues=外部å•é¡Œ +ext_issues.desc=Ext Issue連çµè‡³ä¸€å€‹å¤–部的Issue管ç†é é¢ +issues.desc=å•é¡Œæ˜¯ç®¡ç†å·¥ä½œå’Œè‡­èŸ²çš„地方 issues.new=建立å•é¡Œ issues.new.labels=標籤 issues.new.no_label=未é¸æ“‡æ¨™ç±¤ @@ -424,12 +613,18 @@ issues.new_label=建立標籤 issues.new_label_placeholder=標籤å稱... issues.create_label=建立標籤 issues.label_templates.title=載入一組é å®šç¾©çš„標籤 +issues.label_templates.info=沒有任何標籤。你å¯ä»¥é»žé¸ä¸Šé¢å»ºç«‹ä¸€å€‹æˆ–按下é¢"新建標籤"按鈕來使用一組é å®šç¾©ã€‚ issues.label_templates.helper=é¸æ“‡ä¸€å€‹æ¨™ç±¤é›† issues.label_templates.use=使用此標籤集 issues.label_templates.fail_to_load_file=載入標籤範本檔案 '%s' 失敗: %v +issues.add_label_at=`新增
%s
label %s` +issues.remove_label_at=`刪除
%s
label %s` +issues.add_milestone_at=`新增至%s 里程碑 %s` issues.change_milestone_at=`%[3]s 修改了里程碑 %[1]s 到 %[2]s` issues.remove_milestone_at=`從里程碑 %[2]s 刪除 %[1]s` +issues.deleted_milestone=`（已刪除）` issues.self_assign_at=å°‡ %s 指派給自己 +issues.add_assignee_at=`被%s %s指派` issues.remove_assignee_at=`æ–¼ %s å–消了指派` issues.change_title_at=`修改標題從 %s 為 %s %s` issues.delete_branch_at=`刪除分支 %s %s` @@ -453,6 +648,13 @@ issues.filter_sort.recentupdate=最近更新 issues.filter_sort.leastupdate=最少更新 issues.filter_sort.mostcomment=最多評論 issues.filter_sort.leastcomment=最少評論 +issues.action_open=é–‹å•Ÿ +issues.action_close=關閉 +issues.action_label=標籤 +issues.action_milestone=里程碑 +issues.action_milestone_no_select=無里程碑 +issues.action_assignee=負責人 +issues.action_assignee_no_select=無負責人 issues.opened_by=ç”± %[3]s æ–¼ %[1]s建立 issues.opened_by_fake=ç”± %[2]s æ–¼ %[1]s建立 issues.previous=ä¸Šä¸€é  @@ -486,12 +688,19 @@ issues.label_edit=編輯 issues.label_delete=刪除 issues.label_modify=修改標籤 issues.label_deletion=刪除標籤 +issues.label_deletion_desc=刪除此標籤將其從所有Issue中移除。你確定è¦ç¹¼çºŒå—Žï¼Ÿ +issues.label_deletion_success=此標籤已æˆåŠŸåˆªé™¤ã€‚ issues.label.filter_sort.alphabetically=按字æ¯é¡ºåºæŽ’åº issues.label.filter_sort.reverse_alphabetically=按字æ¯åå‘æŽ’åº +issues.label.filter_sort.by_size=å¤§å° +issues.label.filter_sort.reverse_by_size=å¾žå¤§åˆ°å° issues.num_participants=%d åƒèˆ‡è€… issues.attachment.open_tab=`在新的標籤é ä¸­æŸ¥çœ‹ '%s'` issues.attachment.download=`點擊下載 '%s'` +issues.subscribe=訂閱 +issues.unsubscribe=å–消訂閱 +pulls.desc=Pulls 管ç†ä½ çš„程å¼ç¢¼å¯©æ ¸åŠç¨‹å¼ç¢¼åˆä½µè¦æ±‚。 pulls.new=建立åˆä½µè«‹æ±‚ pulls.compare_changes=å°æ¯”文件變化 pulls.compare_changes_desc=å°æ¯”兩個分支間的文件變化åŠç™¼èµ·ä¸€å€‹åˆä½µè«‹æ±‚。 @@ -507,12 +716,16 @@ pulls.merged_title_desc=æ–¼ %[4]s å°‡ %[1]d 次代碼æ交從 %[2]s"%s"。請確èªæ‚¨æƒ³è¦åˆªé™¤æ­¤é ã€‚ wiki.page_already_exists=相åŒå稱的 Wiki é é¢å·²ç¶“存在。 wiki.pages=所有é é¢ wiki.last_updated=最後更新於 %s settings=儲存庫設定 +settings.desc=設定是您å¯ä»¥ç®¡ç†å„²å­˜åº«è¨­å®šçš„地方 settings.options=基本設定 settings.collaboration=管ç†å”作者 settings.collaboration.admin=管ç†æ¬Šé™ @@ -569,6 +792,7 @@ settings.githooks=ç®¡ç† Git Hooks settings.basic_settings=基本設定 settings.mirror_settings=é¡åƒè¨­å®š settings.sync_mirror=ç«‹å³åŒæ­¥ +settings.mirror_sync_in_progress=é¡åƒåŒæ­¥é€²è¡Œä¸­ï¼Œè«‹ç¨å¾Œé‡æ–°æ•´ç†æ­¤é é¢ç¢ºèªã€‚ settings.site=官方網站 settings.update_settings=更新儲存庫設定 settings.advanced_settings=高級設定 @@ -576,10 +800,13 @@ settings.wiki_desc=啓用 Wiki 系統 settings.use_internal_wiki=使用內建 wiki settings.use_external_wiki=使用外部 wiki settings.external_wiki_url=外部 Wiki é€£çµ +settings.external_wiki_url_error=外部 Wiki 網å€ç„¡æ•ˆ settings.external_wiki_url_desc=當分é ä¸ŠæŒ‰ä¸€ä¸‹ï¼Œè¨ªå®¢å°‡æœƒé‡æ–°å°Žåˆ° URL。 settings.issues_desc=啟用å•é¡Œè¿½è¹¤ settings.use_internal_issue_tracker=使用內建輕é‡ç´šå•é¡Œè¿½è¹¤ settings.use_external_issue_tracker=使用外部的å•é¡Œç®¡ç†ç³»çµ± +settings.external_tracker_url=外部 Issue è¿½è¹¤ç¶²å€ +settings.external_tracker_url_error=外部 Issue Tracker URL 無效 settings.external_tracker_url_desc=當按下分é ï¼Œè¨ªå®¢å°‡æœƒé‡æ–°å°Žå‘æ–°çš„ URL。 settings.tracker_url_format=外部å•é¡Œç®¡ç†ç³»çµ±çš„ URL æ ¼å¼ settings.tracker_issue_style=外部公單管ç†ç³»çµ±å‘½å風格： @@ -590,19 +817,29 @@ settings.pulls_desc=啟用åˆä½µè«‹æ±‚以接å—社å€è²¢ç» settings.danger_zone=å±éšªæ“ä½œå€ settings.new_owner_has_same_repo=新的儲存庫æ“有者已經存在åŒåå„²å­˜åº«ï¼ settings.convert=轉æ›ç‚ºæ­£è¦å„²å­˜åº« +settings.convert_desc=您å¯ä»¥å°‡æ­¤é¡åƒè½‰æˆæ­£è¦å„²å­˜åº«ã€‚此動åšä¸å¯æ¢å¾©ã€‚ settings.convert_notices_1=這項æ“作將會把儲存庫é¡åƒè½‰æ›æˆä¸€èˆ¬çš„儲存庫，這項æ“作ä¸èƒ½å–消。 settings.convert_confirm=確èªè½‰æ› +settings.convert_succeed=儲存庫已æˆåŠŸè½‰æ›ç‚ºä¸€èˆ¬é¡žåž‹ã€‚ settings.transfer=轉移儲存庫所有權 settings.transfer_desc=您å¯ä»¥å°‡å„²å­˜åº«è½‰ç§»è‡³æ‚¨æ“有管ç†å“¡æ¬Šé™çš„帳戶或組織。 +settings.transfer_notices_1=- 如果您將儲存庫轉移給個人用戶，您將會丟失æ“作權é™ã€‚ +settings.transfer_notices_2=- 如果新的所有者的是組織且你是此組織的所有者之一，您的æ“作權é™å°‡è¢«ä¿ç•™ã€‚ +settings.transfer_form_title=請輸入以下訊æ¯ä»¥ç¢ºèªæ‚¨çš„æ“作: settings.wiki_delete=刪除 Wiki 資料 settings.wiki_delete_desc=請注æ„，一旦清除 wiki 資料便無法æ¢å¾©ã€‚ settings.wiki_delete_notices_1=- 將刪除和åœç”¨ %s çš„ wiki +settings.wiki_deletion_success=已刪除儲存庫 wiki 資料。 settings.delete=刪除本儲存庫 settings.delete_desc=刪除儲存庫æ“作ä¸å¯é€†è½‰ï¼Œè«‹ä¸‰æ€è€Œå¾Œè¡Œã€‚ settings.delete_notices_1=- æ­¤æ“作 ä¸å¯ä»¥ 被回滾。 +settings.delete_notices_2=- æ­¤æ“作將永久刪除該儲存庫，包括 程å¼ç¢¼ã€ å•é¡Œã€è©•è«–ã€Wiki é é¢å’Œå”作者的æ“作權é™ã€‚ settings.delete_notices_fork_1=- 刪除後所有的複製儲存庫將會æˆç‚ºç¨ç«‹å„²å­˜åº« +settings.deletion_success=儲存庫已刪除。 +settings.update_settings_success=已更新儲存庫基本設定。 settings.transfer_owner=æ–°æ“有者 settings.make_transfer=確èªè½‰ç§»å„²å­˜åº« +settings.transfer_succeed=已轉移儲存庫所有權。 settings.confirm_delete=確èªåˆªé™¤å„²å­˜åº« settings.add_collaborator=增加新的å”作者 settings.add_collaborator_success=æˆåŠŸå»ºç«‹æ–°çš„å”ä½œè€…ï¼ @@ -614,10 +851,13 @@ settings.search_user_placeholder=æœå°‹ç”¨æˆ¶... settings.org_not_allowed_to_be_collaborator=組織ä¸å…許被加為å”åŒè€…。 settings.user_is_org_member=被æ“作的用戶是組織æˆå“¡ï¼Œå› æ­¤ç„¡æ³•æ–°å¢žç‚ºå”ä½œè€…ï¼ settings.add_webhook=建立 Webhook +settings.hooks_desc=Webhook å…許您設定在 Gitea 上發生指定事件時å°æŒ‡å®š URL ç™¼é€ POST 通知。查看 Webhooks 文檔 ç²å–更多訊æ¯ã€‚ settings.webhook_deletion=刪除 Webhook +settings.webhook_deletion_desc=刪除該 Webhook 將會刪除與其有關的訊æ¯å’ŒæŽ¨é€æ­·å²ã€‚是å¦ç¹¼çºŒï¼Ÿ settings.webhook_deletion_success=Webhook 刪除æˆåŠŸï¼ settings.webhook.test_delivery=æ¸¬è©¦æŽ¨é€ settings.webhook.test_delivery_desc=生æˆä¸¦æŽ¨é€ä¸€å€‹æ¨¡æ“¬çš„ Push 事件 +settings.webhook.test_delivery_success=測試推é€å·²ç¶“加入到隊列，請è€å¿ƒç­‰å¾…數秒å†åˆ·æ–°æŽ¨é€è¨˜éŒ„。 settings.webhook.request=請求內容 settings.webhook.response=響應內容 settings.webhook.headers=標題 @@ -628,6 +868,7 @@ settings.githook_edit_desc=如果 Hook 未啟動，則會顯示樣例文件中 settings.githook_name=Hook å稱 settings.githook_content=Hook 內容 settings.update_githook=æ›´æ–° Hook 設定 +settings.add_webhook_desc=Gitea å°‡å‚³é€ POST 請求åŠç™¼ç”Ÿäº‹ä»¶çš„訊æ¯è‡³æŒ‡å®šçš„ URLã€‚æ‚¨ä¹Ÿèƒ½æŒ‡å®šæŽ¥æ”¶çš„è³‡æ–™æ ¼å¼ (JSON, x-www-form-urlencoded, XML, etc)。更多資訊在webhooks 文件中å¯ç²å¾—。 settings.payload_url=推é€åœ°å€ settings.content_type=è³‡æ–™æ ¼å¼ settings.secret=金鑰文本 @@ -645,6 +886,7 @@ settings.event_pull_request_desc=請求打開，關閉，é‡æ–°æ‰“開，編輯 settings.event_push=æŽ¨é€ settings.event_push_desc=Git å„²å­˜åº«æŽ¨é€ settings.active=是å¦å•Ÿç”¨ +settings.active_helper=觸發hook的事件資訊將åŒæ™‚發é€ã€‚ settings.add_hook_success=Webhook 新增æˆåŠŸï¼ settings.update_webhook=æ›´æ–° Webhook settings.update_hook_success=Webhook æ›´æ–°æˆåŠŸï¼ @@ -665,10 +907,28 @@ settings.key_been_used=éƒ¨ç½²é‡‘é‘°å·²ç¶“è¢«ä½¿ç”¨ï¼ settings.key_name_used=使用相åŒåç¨±çš„éƒ¨ç½²é‡‘é‘°å·²ç¶“å­˜åœ¨ï¼ settings.add_key_success=æˆåŠŸæ–°å¢žéƒ¨ç½²é‡‘é‘° '%s'ï¼ settings.deploy_key_deletion=刪除部署金鑰 +settings.deploy_key_deletion_desc=刪除此管ç†éƒ¨ç½²é‡‘鑰將造æˆæ­¤å„²å­˜åº«æ²’有權é™å­˜å–。你想è¦ç¹¼çºŒå—Žï¼Ÿ +settings.deploy_key_deletion_success=æˆåŠŸåˆªé™¤ç®¡ç†éƒ¨ç½²é‡‘é‘°ï¼ +settings.branches=分支列表 +settings.protected_branch=分支ä¿è­· +settings.protected_branch_can_push=å…許推é€ï¼Ÿ +settings.protected_branch_can_push_yes=ä½ å¯ä»¥æŽ¨é€ +settings.protected_branch_can_push_no=ä½ ä¸èƒ½æŽ¨é€ +settings.add_protected_branch=啟用ä¿è­· +settings.delete_protected_branch=åœç”¨ä¿è­· +settings.add_protected_branch_success=%s æˆåŠŸéŽ–定 +settings.add_protected_branch_failed=%s 鎖定失敗 +settings.remove_protected_branch_success=%s 解鎖æˆåŠŸ +settings.protected_branch_deletion=刪除一個å—ä¿è­·çš„分支 +settings.protected_branch_deletion_desc=任何具有寫入權é™çš„使用者都å¯ä»¥ç›´æŽ¥æŽ¨é€²é€™å€‹åˆ†æ”¯ï¼Œæ‚¨ç¢ºå®šå—Ž? +settings.default_branch_desc=é è¨­åˆ†æ”¯è¢«èªç‚ºæ˜¯"基準"分支，é æœŸå…¨éƒ¨çš„åˆä½µè«‹æ±‚以åŠç¨‹å¼ç¢¼æ交將自動完æˆåˆ°æ­¤åˆ†æ”¯ï¼Œé™¤éžæ‚¨æŒ‡å®šä¸åŒçš„分支。 +settings.choose_branch=é¸æ“‡ä¸€å€‹åˆ†æ”¯ +settings.no_protected_branch=沒有å—ä¿è­·çš„分支 diff.browse_source=ç€è¦½ä»£ç¢¼ diff.parent=父節點 diff.commit=當å‰æ交 +diff.data_not_available=沒有內容比較å¯ä»¥ä½¿ç”¨ diff.show_diff_stats=顯示文件統計 diff.show_split_view=分割檢視 diff.show_unified_view=統一視圖 @@ -678,6 +938,7 @@ diff.view_file=查看文件 diff.file_suppressed=文件差異éŽå¤§å°Žè‡´ç„¡æ³•é¡¯ç¤º diff.too_many_files=部分文件因文件數é‡éŽå¤šè€Œç„¡æ³•é¡¯ç¤º +releases.desc=發佈版本是管ç†æ‚¨å°ˆæ¡ˆç‰ˆæœ¬çš„地方 release.releases=版本發佈 release.new_release=發佈新版本 release.draft=è‰ç¨¿ @@ -686,9 +947,11 @@ release.stable=穩定 release.edit=編輯 release.ahead=在該版本發佈之後已有 %d 次程å¼ç¢¼æ交到 %s 分支 release.source_code=程å¼ç¢¼ +release.new_subheader=公開發佈版本以便跟蹤專案版本。 +release.edit_subheader=詳細的變更記錄å¯ä»¥å¹«åŠ©ç”¨æˆ¶æ›´å¥½åœ°äº†è§£ç”¢å“åšäº†å“ªäº›æ”¹é€²ã€‚ release.tag_name=標籤å稱 release.target=目標分支 -release.tag_helper=é¸æ“‡æˆ–建立一個已存在的標籤 +release.tag_helper=é¸æ“‡å·²å­˜åœ¨æ¨™ç±¤æˆ–新建標籤。 release.title=標題 release.content=內容 release.write=內容編輯 @@ -702,13 +965,19 @@ release.save_draft=儲存è‰ç¨¿ release.edit_release=ç·¨è¼¯ç™¼ä½ˆè¨Šæ¯ release.delete_release=刪除此次發佈 release.deletion=刪除版本發佈æ“作 +release.deletion_desc=刪除此版本發佈將會移除相應的 Git 標籤。你ä¸æœƒéºå¤±ä»»ä½•ç¨‹å¼ç¢¼ï¼Œä½ æƒ³è¦ç¹¼çºŒå—Žï¼Ÿ +release.deletion_success=已刪除此版本發佈。 release.tag_name_already_exist=已經存在使用相åŒæ¨™ç±¤çš„發佈版本。 release.tag_name_invalid=標記å稱ä¸æ˜¯æœ‰æ•ˆçš„。 release.downloads=下載附件 branch.delete=刪除分支 %s +branch.delete_desc=刪除分支將是永久的。沒有其它方法能復原。 branch.delete_notices_1=- æ­¤æ“作ä¸å¯ä»¥è¢«é‚„原。 +branch.delete_notices_2=- æ­¤æ“作將永久刪除在 %s 分支內的所有內容。 +branch.deletion_success=%s 已被刪除。 branch.deletion_failed=刪除分支 %s 失敗。 +branch.delete_branch_has_new_commits=ä¸èƒ½åˆªé™¤ %s，因為åˆä½µå¾Œå·²æ–°å¢žäº†æ–°çš„æ交。 [org] org_name_holder=組織å稱 @@ -725,6 +994,10 @@ create_new_team=建立新的團隊 org_desc=組織æè¿° team_name=團隊å稱 team_desc=團隊æè¿° +team_name_helper=您將使用此å稱在å°è©±ä¸­é€šçŸ¥åœ˜éšŠã€‚ +team_desc_helper=一å¥è©±æ述這個團隊是åšä»€éº¼çš„？ +team_permission_desc=此團隊該具有怎樣權é™? +team_unit_desc=此團隊該具有何å…許æ“作的單元？ form.name_reserved=組織å稱 '%s' 是被ä¿ç•™çš„。 form.name_pattern_not_allowed=組織å稱ä¸å…許 '%s' çš„æ ¼å¼ã€‚ @@ -736,12 +1009,16 @@ settings.full_name=組織全å settings.website=官方網站 settings.location=æ‰€åœ¨åœ°å€ settings.update_settings=更新組織設定 +settings.update_setting_success=組織設定已更新。 +settings.change_orgname_prompt=æ­¤è®Šæ›´å°‡æ”¹è®Šèˆ‡æ­¤çµ„ç¹”æœ‰é—œçš„é€£çµ +settings.update_avatar_success=組織頭åƒå·²æ›´æ–°ã€‚ settings.delete=刪除組織 settings.delete_account=刪除當å‰çµ„ç¹” settings.delete_prompt=刪除æ“作會永久清除該組織的訊æ¯ï¼Œä¸¦ä¸” ä¸å¯æ¢å¾©ï¼ settings.confirm_delete_account=確èªåˆªé™¤çµ„ç¹” settings.delete_org_title=組織刪除æ“作 -settings.hooks_desc=在此處新增的 Webhook 將會應用到該組織下的 所有儲存庫。 +settings.delete_org_desc=將永久刪除此組織，你確定è¦ç¹¼çºŒå—Žï¼Ÿ +settings.hooks_desc=新增 webhooks 將觸發在這個組織下 全部的儲存庫 。 members.membership_visibility=æˆå“¡å¯è¦‹æ€§ï¼š members.public=公開æˆå“¡ @@ -761,7 +1038,9 @@ teams.leave=離開團隊 teams.read_access=讀å–æ¬Šé™ teams.read_access_helper=這個團隊將æ“有查看和複製所屬儲存庫的權é™ã€‚ teams.write_access=å¯«å…¥æ¬Šé™ +teams.write_access_helper=此團隊將能查看和推é€æ‰€å±¬å„²å­˜åº«ã€‚ teams.admin_access=管ç†æ¬Šé™ +teams.admin_access_helper=此團隊將能推é€å’Œåˆä½µè«‹æ±‚所屬儲存庫，åŒæ™‚也能增加其它å”作者。 teams.no_desc=該團隊暫無æè¿° teams.settings=團隊設定 teams.owners_permission_desc=管ç†å“¡åœ˜éšŠå° 所有儲存庫 具有æ“作權é™ï¼Œä¸”å°çµ„織具有 管ç†å“¡æ¬Šé™ã€‚ @@ -770,7 +1049,8 @@ teams.update_settings=更新團隊設定 teams.delete_team=刪除當å‰åœ˜éšŠ teams.add_team_member=新增團隊æˆå“¡ teams.delete_team_title=團隊刪除æ“作 -teams.delete_team_desc=刪除æ“作會永久清除有關該團隊的訊æ¯ï¼Œæ‚¨ç¢ºå®šè¦ç¹¼çºŒæ“作嗎？團隊æˆå“¡å¯èƒ½æœƒå¤±åŽ»å°æŸäº›å„²å­˜åº«çš„æ“作權é™ã€‚ +teams.delete_team_desc=因為刪除此團隊，團隊æˆå“¡å¯èƒ½æœƒå¤±åŽ»å°æŸäº›å„²å­˜åº«çš„æ“作權é™ã€‚你想è¦ç¹¼çºŒå—Žï¼Ÿ +teams.delete_team_success=該團隊已被刪除。 teams.read_permission_desc=該團隊æ“有å°æ‰€å±¬å„²å­˜åº«çš„ è®€å– æ¬Šé™ï¼Œåœ˜éšŠæˆå“¡å¯ä»¥é€²è¡ŒæŸ¥çœ‹å’Œè¤‡è£½ç­‰åªè®€æ“作。 teams.write_permission_desc=該團隊æ“有å°æ‰€å±¬å„²å­˜åº«çš„ è®€å– å’Œ 寫入 的權é™ã€‚ teams.admin_permission_desc=該團隊æ“有一定的 ç®¡ç† æ¬Šé™ï¼Œåœ˜éšŠæˆå“¡å¯ä»¥è®€å–ã€è¤‡è£½ã€æŽ¨é€ä»¥åŠæ–°å¢žå…¶å®ƒå„²å­˜åº«å”作者。 @@ -800,8 +1080,24 @@ dashboard.statistic_info=Gitea 資料庫統計：%d ä½ç”¨æˆ¶ï¼Œ%d dashboard.operation_name=æ“作å稱 dashboard.operation_switch=é–‹é—œ dashboard.operation_run=執行 +dashboard.clean_unbind_oauth=清ç†æœªç¶å®šOAuthçš„é€£çµ +dashboard.clean_unbind_oauth_success=所有未ç¶å®š OAuth 的連çµå·²åˆªé™¤ã€‚ dashboard.delete_inactivate_accounts=刪除所有未啟用帳戶 +dashboard.delete_inactivate_accounts_success=æˆåŠŸæ¸…é™¤æ‰€æœ‰æœªå•Ÿç”¨å¸³è™Ÿï¼ dashboard.delete_repo_archives=刪除所有儲存庫存檔 +dashboard.delete_repo_archives_success=所有儲存庫存檔已刪除。 +dashboard.delete_missing_repos=刪除所有éºå¤± Git 檔案的儲存庫記錄 +dashboard.delete_missing_repos_success=所有缺少Git 檔案的儲存庫記錄å‡å·²åˆªé™¤ã€‚ +dashboard.git_gc_repos=å°æ‰€æœ‰å„²å­˜åº«åŸ·è¡Œåžƒåœ¾å›žæ”¶ +dashboard.git_gc_repos_success=所有儲存庫的垃圾回收已完æˆåŸ·è¡Œã€‚ +dashboard.resync_all_sshkeys=覆寫 '.ssh/authorized_keys ' 檔案 (å°æ–¼ Gitea SSH 金鑰) +dashboard.resync_all_sshkeys_success=所有公開金鑰已é‡å¯«ã€‚ +dashboard.resync_all_hooks=é‡æ–°åŒæ­¥å…¨éƒ¨å„²å­˜åº«çš„ pre-receive, update å’Œ post-receive hooks +dashboard.resync_all_hooks_success=所有儲存庫的 pre-receiveã€updateã€post-receive hooks皆已é‡æ–°åŒæ­¥ã€‚ +dashboard.reinit_missing_repos=é‡æ–°åˆå§‹åŒ–所有éºå¤±å…·å·²å­˜åœ¨è¨˜éŒ„çš„Git 儲存庫 +dashboard.reinit_missing_repos_success=所有éºå¤±å…·å·²å­˜åœ¨è¨˜éŒ„çš„Git 儲存庫已é‡æ–°åˆå§‹åŒ–。 +dashboard.sync_external_users=åŒæ­¥å¤–部使用者資料 +dashboard.sync_external_users_started=外部使用者åŒæ­¥å·²å•Ÿå‹• dashboard.server_uptime=æœå‹™åŸ·è¡Œæ™‚é–“ dashboard.current_goroutine=ç•¶å‰ Goroutines æ•¸é‡ dashboard.current_memory_usage=當å‰å…§å­˜ä½¿ç”¨é‡ @@ -832,6 +1128,7 @@ dashboard.total_gc_pause=垃圾收集暫åœæ™‚é–“ç¸½é‡ dashboard.last_gc_pause=上次垃圾收集暫åœæ™‚é–“ dashboard.gc_times=垃圾收集執行次數 +users.user_manage_panel=使用者管ç†é¢æ¿ users.new_account=建立新的帳戶 users.name=用戶å users.activated=已啟用 @@ -841,34 +1138,49 @@ users.created=建立時間 users.last_login=最後登入 users.never_login=尚未登入 users.send_register_notify=å‘用戶發é€è¨»å†Šé€šçŸ¥éƒµä»¶ +users.new_success=已建立新帳戶 '%s'。 users.edit=編輯 users.auth_source=èªè­‰æº users.local=本地 users.auth_login_name=èªè­‰ç™»éŒ„å稱 users.password_helper=留空使其ä¿æŒä¸è®Šã€‚ +users.update_profile_success=帳戶設定檔已更新。 users.edit_account=ç·¨è¼¯ç”¨æˆ¶è¨Šæ¯ users.max_repo_creation=最大儲存庫新增é™åˆ¶ users.max_repo_creation_desc=(設定 -1 使用全域é è¨­é™åˆ¶) +users.is_activated=此帳戶已完æˆå•Ÿç”¨ +users.prohibit_login=此帳戶被阻止登錄 users.is_admin=該用戶具有管ç†å“¡æ¬Šé™ +users.allow_git_hook=此帳戶具有建立 Git hook çš„æ¬Šé™ users.allow_import_local=è©²ç”¨æˆ¶å…·æœ‰å°Žå…¥æœ¬åœ°å„²å­˜åº«çš„æ¬Šé™ +users.allow_create_organization=此帳戶æ“æœ‰å»ºç«‹çµ„ç¹”çš„æ¬Šé™ users.update_profile=æ›´æ–°ç”¨æˆ¶è¨Šæ¯ users.delete_account=刪除該用戶 +users.still_own_repo=此帳戶ä»ç„¶æ“有一個或多個儲存庫，您必須先刪除或轉移它們。 +users.still_has_org=此帳戶ä»ç„¶æ˜¯ä¸€å€‹æˆ–多個組織的æˆå“¡ï¼Œä½ å¿…須先離開或刪除這些組織。 +users.deletion_success=帳號已æˆåŠŸåˆªé™¤ã€‚ +orgs.org_manage_panel=çµ„ç¹”ç®¡ç† orgs.name=組織å稱 orgs.teams=團隊數 orgs.members=æˆå“¡æ•¸ +orgs.new_orga=建立組織 +repos.repo_manage_panel=å„²å­˜åº«ç®¡ç† repos.owner=所有者 repos.name=儲存庫å稱 repos.private=ç§æœ‰åº« repos.watches=關註數 repos.stars=讚好數 repos.issues=å•é¡Œæ•¸ +repos.size=å¤§å° +auths.auth_manage_panel=èªè­‰ç®¡ç† auths.new=新增èªè­‰ä¾†æº auths.name=èªè­‰å稱 auths.type=èªè­‰é¡žåž‹ auths.enabled=已啟用 +auths.syncenabled=啟用使用者åŒæ­¥ auths.updated=最後更新時間 auths.auth_type=èªè­‰é¡žåž‹ auths.auth_name=èªè­‰å稱 @@ -878,6 +1190,7 @@ auths.host=ä¸»æ©Ÿåœ°å€ auths.port=ä¸»æ©Ÿç«¯å£ auths.bind_dn=ç¶å®šDN auths.bind_password=ç¶å®šå¯†ç¢¼ +auths.bind_password_helper=警告：此密碼將以明文形å¼å„²å­˜ã€‚è«‹ä¸è¦ä½¿ç”¨æ“有高權é™çš„å¸³æˆ¶ï¼ auths.user_base=用戶æœå°‹åŸºæº– auths.user_dn=用戶 DN auths.attribute_username=用戶å屬性 @@ -893,13 +1206,41 @@ auths.smtp_auth=SMTP 驗證類型 auths.smtphost=SMTP ä¸»æ©Ÿåœ°å€ auths.smtpport=SMTP ä¸»æ©Ÿç«¯å£ auths.allowed_domains=域å白åå–® -auths.allowed_domains_helper=留空表示ä¸å°åŸŸååšä»»ä½•é™åˆ¶ã€‚多個域å之間需è¦ä½¿ç”¨é€—號 ',' 分隔。 +auths.allowed_domains_helper=留空表示å…許全部域å。多個域å之間需è¦ä½¿ç”¨é€—號 ',' 分隔。 auths.enable_tls=啟用 TLS 加密 auths.skip_tls_verify=忽略 TLS é©—è­‰ auths.pam_service_name=PAM æœå‹™å稱 +auths.oauth2_provider=OAuth2 æ供者 +auths.oauth2_clientID=用戶端 ID (金鑰) +auths.oauth2_clientSecret=用戶端金鑰 +auths.openIdConnectAutoDiscoveryURL=OpenID 連接自動探索 URL +auths.oauth2_use_custom_url=使用自訂 URL 而éžé è¨­ URL +auths.oauth2_tokenURL=Token URL +auths.oauth2_authURL=授權 URL +auths.oauth2_profileURL=å€‹äººè¨Šæ¯ URL +auths.oauth2_emailURL=é›»å­éƒµä»¶ URL auths.enable_auto_register=å…許授權用戶自動註冊 auths.tips=幫助æ示 +auths.tips.oauth2.general=OAuth2 èªè­‰ +auths.tips.oauth2.general.tip=當註冊一個新的 OAuth2 èªè­‰ï¼Œcallback/redirect 網å€æ‡‰è©²æ˜¯ï¼š/user/oauth2//callback +auths.tip.oauth2_provider=OAuth2 æ供者 +auths.tip.bitbucket=在 https://bitbucket.org/account/user//oauth-consumers/new 註冊新的 OAuth consumer 並且新增權é™"Account"-"Read +auths.tip.dropbox=建立新 App 在 https://www.dropbox.com/developers/apps +auths.tip.facebook=在 https://developers.facebook.com/apps è¨»å†Šä¸€å€‹æ–°çš„æ‡‰ç”¨ï¼Œä¸¦ä¸”æ–°å¢žä¸€å€‹ç”¢å“ "Facebook Login +auths.tip.github=在 https://github.com/settings/applications/new 註冊一個新的 OAuth æ‡‰ç”¨ç¨‹å¼ +auths.tip.gitlab=在 https://gitlab.com/profile/applications è¨»å†Šä¸€å€‹æ–°çš„æ‡‰ç”¨ç¨‹å¼ +auths.tip.google_plus=從 Google API 主控å°ç²å¾— OAuth2 用戶憑證 (HTTPs://console.developers.google.com/) +auths.tip.openid_connect=使用 OpenID 連接探索 URL (/.well-known/openid-configuration) 來指定節點 +auths.tip.twitter=å‰å¾€https://dev.twitter.com/apps，建立應用程å¼ä¸¦ç¢ºä¿"å…許此應用程å¼ä»¥Twitter登錄 "é¸é …已啟用。 +auths.edit=編輯èªè­‰è¨­å®š auths.activated=該授權èªè­‰å·²ç¶“啟用 +auths.new_success=已增加èªè­‰'%s'。 +auths.update_success=èªè­‰è¨­å®šå·²æ›´æ–°ã€‚ +auths.update=æ›´æ–°èªè­‰è¨­å®š +auths.delete=刪除此èªè­‰ä¾†æº +auths.delete_auth_title=刪除èªè­‰ä¾†æº +auths.delete_auth_desc=將刪除此èªè­‰ï¼Œä½ ç¢ºå®šè¦ç¹¼çºŒå—Žï¼Ÿ +auths.still_in_used=部份使用者ä»ä½¿ç”¨æ­¤é©—證來æºï¼Œè«‹å…ˆåˆªé™¤æˆ–轉æ›é€™äº›ä½¿ç”¨è€…到其它登入類型。 auths.deletion_success=èªè­‰æºåˆªé™¤æˆåŠŸï¼ auths.login_source_exist=ç™»å…¥ä¾†æº '%s' 已存在 @@ -907,6 +1248,7 @@ config.server_config=伺æœå™¨è¨­å®š config.app_name=應用å稱 config.app_ver=應用版本 config.app_url=æ‡‰ç”¨ç¶²å€ +config.custom_conf=設定檔案路徑 config.domain=應用域å config.offline_mode=é›¢ç·šæ¨¡å¼ config.disable_router_log=關閉路由日誌 @@ -945,18 +1287,23 @@ config.db_path_helper=（用於 "sqlite3" å’Œ "tidb"） config.service_config=æœå‹™è¨­å®š config.register_email_confirm=註冊電å­éƒµä»¶ç¢ºèª config.disable_register=關閉註冊功能 +config.enable_openid_signup=啟用é€éŽ OpenID 註冊 +config.enable_openid_signin=啟用 OpenID 登錄 config.show_registration_button=顯示註冊按鈕 config.require_sign_in_view=強制登錄ç€è¦½ config.mail_notify=郵件通知æ醒 config.disable_key_size_check=ç¦ç”¨é‡‘鑰最å°é•·åº¦æª¢æŸ¥ config.enable_captcha=啟用驗證碼æœå‹™ config.active_code_lives=啟用用戶連çµæœ‰æ•ˆæœŸ +config.reset_password_code_lives=é‡è¨­å¯†ç¢¼ä»£ç¢¼éŽæœŸæ™‚é–“ config.default_keep_email_private=éš±è—郵件地å€çš„é è¨­å€¼ +config.default_allow_create_organization=建立組織的é è¨­æ¬Šé™ config.no_reply_address=ä¸å¯å›žå¾©çš„éƒµä»¶åœ°å€ config.webhook_config=Webhook 設定 config.queue_length=隊列長度 config.deliver_timeout=推é€è¶…時 +config.skip_tls_verify=ç•¥éŽ TLS é©—è­‰ config.mailer_config=郵件設定 config.mailer_enabled=啟用æœå‹™ @@ -965,6 +1312,7 @@ config.mailer_name=發é€è€…å稱 config.mailer_host=éƒµä»¶ä¸»æ©Ÿåœ°å€ config.mailer_user=發é€è€…帳號 config.send_test_mail=發é€æ¸¬è©¦éƒµä»¶ +config.test_mail_failed=發é€æ¸¬è©¦éƒµä»¶è‡³ '%s' 時失敗：%v config.test_mail_sent=測試電å­éƒµä»¶å·²ç™¼é€åˆ° '%s'。 config.oauth_config=社交帳號設定 @@ -1017,6 +1365,7 @@ monitor.start=開始時間 monitor.execute_time=已執行時間 notices.system_notice_list=系統æç¤ºç®¡ç† +notices.view_detail_header=查看æ示細節 notices.actions=æ“作 notices.select_all=é¸å–全部 notices.deselect_all=å–消所有é¸å– @@ -1027,6 +1376,7 @@ notices.type=æ示類型 notices.type_1=儲存庫 notices.desc=æè¿° notices.op=æ“作 +notices.delete_success=已刪除系統æ示。 [action] create_repo=建立了儲存庫 %s @@ -1042,11 +1392,13 @@ comment_issue=`評論了å•é¡Œ %s#%[2]s` merge_pull_request=`åˆä½µäº†åˆä½µè«‹æ±‚ %s#%[2]s` transfer_repo=將儲存庫 %s 轉移至 %s push_tag=推é€äº†æ¨™ç±¤ %[2]s 到 %[3]s +compare_commits=比較 %d æ交 [tool] ago=%sä¹‹å‰ from_now=%s之後 now=ç¾åœ¨ +future=未來 1s=1 秒 1m=1 åˆ†é˜ 1h=1 å°æ™‚ @@ -1065,17 +1417,30 @@ raw_seconds=秒 raw_minutes=åˆ†é˜ [dropzone] +default_message=拖曳檔案或點é¸ä¸Šå‚³ã€‚ invalid_input_type=您ä¸èƒ½ä¸Šå‚³è©²é¡žåž‹çš„文件 +file_too_big=檔案大å°({{filesize}} MB) 超éŽäº†æœ€å¤§å…許大å°({{maxFilesize}} MB) remove_file=移除文件 [notification] notifications=è¨Šæ¯ unread=未讀 read=已讀 +no_unread=您沒有任何未讀訊æ¯ã€‚ +no_read=您沒有任何已讀訊æ¯ã€‚ +pin=固定通知 mark_as_read=標記為已讀 mark_as_unread=標記為未讀 [gpg] +error.extract_sign=無法æå–簽署 +error.generate_hash=無法產生æ交的雜湊值 +error.no_committer_account=沒有帳戶連çµåˆ°æ交者的電å­éƒµä»¶ +error.no_gpg_keys_found=沒有發ç¾å·²çŸ¥çš„金鑰在資料庫的簽署中 +error.not_signed_commit=未簽åçš„æ交 +error.failed_retrieval_gpg_keys=找ä¸åˆ°ä»»ä½•èˆ‡è©²æ交者帳戶相關的金鑰 [units] +error.no_unit_allowed_repo=在你被å…許訪å•çš„儲存庫中找ä¸åˆ°ä»»ä½•å–®å…ƒ +error.unit_not_allowed=您未被å…許訪å•æ­¤å„²å­˜åº«å–®å…ƒ diff --git a/public/assets/librejs/librejs.html b/public/assets/librejs/librejs.html deleted file mode 100644 index 57d476918482..000000000000 --- a/public/assets/librejs/librejs.html +++ /dev/null @@ -1,84 +0,0 @@ - - - - - JavaScript license information - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
jquery.are-you-sure.js - Expat -
- GNU-GPL-2.0-or-later - 		jquery.are-you-sure.js
semantic-2.2.1.min.jsExpatsemantic-UI-2.2.1.tar.gz
gogs.jsExpatgogs.js
clipboard-1.5.9.min.jsExpatclipboard-1.5.9.tar.gz
emojify-1.1.0.min.jsExpatemojify-1.1.0.tar.gz
loadCSS.min.jsMIT LicenseloadCSS-1.3.1.tar.gz
cssrelpreload.min.jsMIT LicenseloadCSS-1.3.1.tar.gz
dropzone.jsExpatdropzone.js
highlight.pack.jsBSD 3 Clausehighlight.js-9.6.0.tar.gz
jquery.datetimepicker.jsExpatjquery.datetimepicker.js
jquery.minicolors.min.jsExpatjquery.minicolors-2.2.3.tar.gz
simplemde.min.jsExpatsimplemde-markdown-editor-1.10.1.tar.gz
marked.min.jsExpatmarked-0.3.6.tar.gz
notebook.min.jsExpatnotebookjs-0.2.6.tar.gz
- - diff --git a/public/css/github.min.css b/public/css/github.min.css deleted file mode 100644 index 7b3600c93bff..000000000000 --- a/public/css/github.min.css +++ /dev/null @@ -1 +0,0 @@ -.hljs{display:block;overflow-x:auto;padding:.5em;color:#333;background:#f8f8f8}.hljs-comment,.hljs-template_comment,.diff .hljs-header,.hljs-javadoc{color:#998;font-style:italic}.hljs-keyword,.css .rule .hljs-keyword,.hljs-winutils,.javascript .hljs-title,.nginx .hljs-title,.hljs-subst,.hljs-request,.hljs-status{color:#333;font-weight:bold}.hljs-number,.hljs-hexcolor,.ruby .hljs-constant{color:#099}.hljs-string,.hljs-tag .hljs-value,.hljs-phpdoc,.tex .hljs-formula{color:#d14}.hljs-title,.hljs-id,.coffeescript .hljs-params,.scss .hljs-preprocessor{color:#900;font-weight:bold}.javascript .hljs-title,.lisp .hljs-title,.clojure .hljs-title,.hljs-subst{font-weight:normal}.hljs-class .hljs-title,.haskell .hljs-type,.vhdl .hljs-literal,.tex .hljs-command{color:#458;font-weight:bold}.hljs-tag,.hljs-tag .hljs-title,.hljs-rules .hljs-property,.django .hljs-tag .hljs-keyword{color:#000080;font-weight:normal}.hljs-attribute,.hljs-variable,.lisp .hljs-body{color:#008080}.hljs-regexp{color:#009926}.hljs-symbol,.ruby .hljs-symbol .hljs-string,.lisp .hljs-keyword,.tex .hljs-special,.hljs-prompt{color:#990073}.hljs-built_in,.lisp .hljs-title,.clojure .hljs-built_in{color:#0086b3}.hljs-preprocessor,.hljs-pragma,.hljs-pi,.hljs-doctype,.hljs-shebang,.hljs-cdata{color:#999;font-weight:bold}.hljs-deletion{background:#fdd}.hljs-addition{background:#dfd}.diff .hljs-change{background:#0086b3}.hljs-chunk{color:#aaa} \ No newline at end of file diff --git a/public/css/index.css b/public/css/index.css index 32fefb92e4af..30a5f8e605f7 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -471,6 +471,17 @@ footer .ui.language .menu { padding-right: 30px !important; } } +[v-cloak] { + display: none !important; +} +.repos-search { + padding-bottom: 0 !important; +} +.repos-filter { + margin-top: 0 !important; + border-bottom-width: 0 !important; + margin-bottom: 2px !important; +} .markdown:not(code) { overflow: hidden; font-family: "Helvetica Neue", Helvetica, "Segoe UI", Arial, freesans, sans-serif; @@ -1290,7 +1301,6 @@ footer .ui.language .menu { margin-bottom: 20px; } .repository #clone-panel { - margin-top: -8px; margin-left: 5px; width: 350px; } @@ -1318,6 +1328,10 @@ footer .ui.language .menu { .repository.file.list .choose.reference .header .icon { font-size: 1.4em; } +.repository.file.list .repo-path .section, +.repository.file.list .repo-path .divider { + display: inline; +} .repository.file.list #file-buttons { font-weight: normal; } @@ -2049,9 +2063,14 @@ footer .ui.language .menu { .repository .diff-detail-box span.status.rename { background-color: #dad8ff; } +.repository .diff-box { + display: flex; + align-items: center; +} .repository .diff-box .count { margin-right: 12px; font-size: 13px; + flex: 0 0 auto; } .repository .diff-box .count .bar { background-color: #bd2c00; @@ -2066,7 +2085,14 @@ footer .ui.language .menu { height: 12px; } .repository .diff-box .file { + flex: 0 1 100%; color: #888; + word-break: break-all; +} +.repository .diff-box .button { + margin: -5px 0 -5px 12px; + padding: 8px 10px; + flex: 0 0 auto; } .repository .diff-file-box .header { background-color: #f7f7f7; diff --git a/public/img/discord.png b/public/img/discord.png new file mode 100644 index 0000000000000000000000000000000000000000..db0e70d5d42d5a4e9df0db6491f647b3f33bea76 GIT binary patch literal 1559 zcmb7Edo&XY9G)H&d0dp;v2w8MeVH|3lGiqpVP>mYPyKh#`F_9ecYf!5|9t0sUz$G#t*#1E1pol* z-d>(q1+OYbx^1&!FO>{S6a@1>ghMKrnl}Ew5KRfpQ^>TUv6w)BYl7CprQ*R*+bP4d z{&iWJtIY@iU~7`MryGu;wD|n@yeeDG-!&?T(Y5fuTrQ(iMeiG5Xp|7A#B%9-@XptnMd3^YRW!BRa-Md=M|NLpK{9eS{qY# z#+lk91@5qxyHYr42->07qd8BIROvpgNvj)4AUg^$YEEz|%VJ*CO|U5SgN2xu)j-5u|JfpgU@0am_iI zdX8qG;>=E*)BI$sROL*@AH`G2&ih_@2nik7S{_|F%j~gU;kxx;yspl4m86!d(c#p4 zG0^d34V2LXY?TkM+rG4%tu3Q}>NUWpHI5`OJHiNIwzOtX8Z@3g2Q7s+b{^pBUz0;b z3cq!qslOK{pZgLAR>o@fV1Fu{ZCk0UFc ze(I|Br?qji^DFL-@(lxhNBLG*@SP}3$$048byr&3yO@|a-?i#VDpVH8yME=Ib49Y9 zrV~)7!rPV9+eI)9^CwtSgJCltUxzZc8%&`a()-QjB%(=$iUDp{S*C-P4VrT9uv_N% z%RASB{H~Pbup0Q~a3QfkIX1PEcM=C1oETp64U3x%jSaZM^n|F&`yLv9KjrK+VT3H2 z=-TF^Zh5-8!PNW>mvV+x)V#3GJ9V6L6ULEZ$C^y7>_qgDhd>Y=#gPgOJ@!+G+v9rs z^p^zz$!zJ}r?%NE!dzjh|9S?3FhOl%9W)YYES+}b)(88|lx*QY=h3ahlRoxqi%x0M zgzME?_+t$F`%Q-aJzoBiU}YP){7d4&BMB|HhDRH2uLPsny0_^1n(U*!nEj=A#}KeR zM~|JHKB*y|{1l!}#DRXe{@j5mr3#!VAj*Dh$ECNInQO89Hs!m5#~62Lgdvq5IeO%Xkx5BIYTG(SrV_cTr4=Y(nr#cn`J$2PFYMk5ZoWN zdV%Z$jL5`Rb2?EjNBetIblMxjB2IxBCBJ-D&y5lnO1TRRmi}I(<;@3>vGX4t;DxTA zW8^0Lo-GrBQf@YjXBlxQGyYZHkQUh(mfSrkw$sfw^C$m)87EeE*L3Kr=4MZ=ee%V)+ep>WE;)lU~aV+DuNAs{_e5mfpn5 zC~ipg1GEo?cbMt{LY)t*cg^9~_E?fNoWHp`$mHi;7dYDbssI20 literal 0 HcmV?d00001 diff --git a/public/js/index.js b/public/js/index.js index 1783d5cc6c3a..e7ce89d58e7e 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -86,6 +86,22 @@ function initEditForm() { initEditDiffTab($('.edit.form')); } +function initBranchSelector() { + var $selectBranch = $('.ui.select-branch') + var $branchMenu = $selectBranch.find('.reference-list-menu'); + $branchMenu.find('.item:not(.no-select)').click(function () { + var selectedValue = $(this).data('id'); + $($(this).data('id-selector')).val(selectedValue); + $selectBranch.find('.ui .branch-name').text(selectedValue); + }); + $selectBranch.find('.reference.column').click(function () { + $selectBranch.find('.scrolling.reference-list-menu').css('display', 'none'); + $selectBranch.find('.reference .text').removeClass('black'); + $($(this).data('target')).css('display', 'block'); + $(this).find('.text').addClass('black'); + return false; + }); +} function updateIssuesMeta(url, action, issueIds, elementId, afterSuccess) { $.ajax({ @@ -106,6 +122,7 @@ function initCommentForm() { return } + initBranchSelector(); initCommentPreviewTab($('.comment.form')); // Labels @@ -311,9 +328,22 @@ function initInstall() { $('#offline-mode').checkbox('uncheck'); } }); + $('#enable-openid-signin input').change(function () { + if ($(this).is(':checked')) { + if ( $('#disable-registration input').is(':checked') ) { + } else { + $('#enable-openid-signup').checkbox('check'); + } + } else { + $('#enable-openid-signup').checkbox('uncheck'); + } + }); $('#disable-registration input').change(function () { if ($(this).is(':checked')) { $('#enable-captcha').checkbox('uncheck'); + $('#enable-openid-signup').checkbox('uncheck'); + } else { + $('#enable-openid-signup').checkbox('check'); } }); $('#enable-captcha input').change(function () { @@ -374,15 +404,19 @@ function initRepository() { $('.enable-system').change(function () { if (this.checked) { $($(this).data('target')).removeClass('disabled'); + if (!$(this).data('context')) $($(this).data('context')).addClass('disabled'); } else { $($(this).data('target')).addClass('disabled'); + if (!$(this).data('context')) $($(this).data('context')).removeClass('disabled'); } }); $('.enable-system-radio').change(function () { if (this.value == 'false') { $($(this).data('target')).addClass('disabled'); + if (typeof $(this).data('context') !== 'undefined') $($(this).data('context')).removeClass('disabled'); } else if (this.value == 'true') { $($(this).data('target')).removeClass('disabled'); + if (typeof $(this).data('context') !== 'undefined') $($(this).data('context')).addClass('disabled'); } }); } @@ -1443,7 +1477,7 @@ $(document).ready(function () { // Emojify emojify.setConfig({ - img_dir: suburl + '/img/emoji', + img_dir: suburl + '/plugins/emojify/images', ignore_emoticons: true }); var hasEmoji = document.getElementsByClassName('has-emoji'); @@ -1568,7 +1602,7 @@ $(document).ready(function () { initWebhook(); initAdmin(); initCodeView(); - initDashboardSearch(); + initVueApp(); initTeamSettings(); // Repo clone url. @@ -1655,29 +1689,64 @@ $(function () { }); }); -function initDashboardSearch() { - var el = document.getElementById('dashboard-repo-search'); - if (!el) { - return; - } +function initVueComponents(){ + var vueDelimeters = ['${', '}']; - new Vue({ - delimiters: ['${', '}'], - el: el, + Vue.component('repo-search', { + delimiters: vueDelimeters, - data: { - tab: 'repos', - repos: [], - searchQuery: '', - suburl: document.querySelector('meta[name=_suburl]').content, - uid: document.querySelector('meta[name=_context_uid]').content + props: { + searchLimit: { + type: Number, + default: 10 + }, + suburl: { + type: String, + required: true + }, + uid: { + type: Number, + required: true + }, + organizations: { + type: Array, + default: [] + }, + isOrganization: { + type: Boolean, + default: true + }, + canCreateOrganization: { + type: Boolean, + default: false + }, + organizationsTotalCount: { + type: Number, + default: 0 + }, + moreReposLink: { + type: String, + default: '' + } + }, + + data: function() { + return { + tab: 'repos', + repos: [], + reposTotalCount: 0, + reposFilter: 'all', + searchQuery: '', + isLoading: false + } }, mounted: function() { this.searchRepos(); + var self = this; Vue.nextTick(function() { - document.querySelector('#search_repo').focus(); + self.$refs.search.focus(); }); }, @@ -1686,19 +1755,45 @@ function initDashboardSearch() { this.tab = t; }, - searchKeyUp: function() { - this.searchRepos(); + changeReposFilter: function(filter) { + this.reposFilter = filter; + }, + + showRepo: function(repo, filter) { + switch (filter) { + case 'sources': + return repo.owner.id == this.uid && !repo.mirror && !repo.fork; + case 'forks': + return repo.owner.id == this.uid && !repo.mirror && repo.fork; + case 'mirrors': + return repo.mirror; + case 'collaborative': + return repo.owner.id != this.uid; + default: + return true; + } }, searchRepos: function() { var self = this; - $.getJSON(this.searchURL(), function(result) { - self.repos = result.data; + this.isLoading = true; + var searchedQuery = this.searchQuery; + $.getJSON(this.searchURL(), function(result, textStatus, request) { + if (searchedQuery == self.searchQuery) { + self.repos = result.data; + if (searchedQuery == "") { + self.reposTotalCount = request.getResponseHeader('X-Total-Count'); + } + } + }).always(function() { + if (searchedQuery == self.searchQuery) { + self.isLoading = false; + } }); }, searchURL: function() { - return this.suburl + '/api/v1/repos/search?uid=' + this.uid + '&q=' + this.searchQuery; + return this.suburl + '/api/v1/repos/search?uid=' + this.uid + '&q=' + this.searchQuery + '&limit=' + this.searchLimit; }, repoClass: function(repo) { @@ -1713,26 +1808,53 @@ function initDashboardSearch() { } } } + }) +} + +function initVueApp() { + var el = document.getElementById('app'); + if (!el) { + return; + } + + initVueComponents(); + + new Vue({ + delimiters: ['${', '}'], + el: el, + + data: { + searchLimit: document.querySelector('meta[name=_search_limit]').content, + suburl: document.querySelector('meta[name=_suburl]').content, + uid: document.querySelector('meta[name=_context_uid]').content, + }, }); } -function showAddDependencyModal() { - $('.add-dependency') +function timeAddManual() { + $('.mini.modal') .modal({ duration: 200, onApprove: function() { - $('#addDependencyForm').submit(); + $('#add_time_manual_form').submit(); } }).modal('show') ; } +function toggleStopwatch() { + $("#toggle_stopwatch_form").submit(); +} +function cancelStopwatch() { + $("#cancel_stopwatch_form").submit(); +} + function deleteDependencyModal(id, type) { $('.remove-dependency') .modal({ closable: false, duration: 200, - onApprove: function() { + onApprove: function () { $('#removeDependencyID').val(id); $('#dependencyType').val(type); $('#removeDependencyForm').submit(); @@ -1740,3 +1862,15 @@ function deleteDependencyModal(id, type) { }).modal('show') ; } + +function showAddDependencyModal() { + $('.add-dependency') + .modal({ + duration: 200, + onApprove: function() { + $('#addDependencyForm').submit(); + + } + }).modal('show') + ; +} diff --git a/public/less/_base.less b/public/less/_base.less index ba4821035b43..572cec870ed5 100644 --- a/public/less/_base.less +++ b/public/less/_base.less @@ -464,3 +464,17 @@ footer { padding-right: 30px !important; } } + +[v-cloak] { + display: none !important; +} + +.repos-search { + padding-bottom: 0 !important; +} + +.repos-filter { + margin-top: 0 !important; + border-bottom-width: 0 !important; + margin-bottom: 2px !important; +} \ No newline at end of file diff --git a/public/less/_repository.less b/public/less/_repository.less index 2b254123e4d2..8490228b47e6 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -133,7 +133,6 @@ } #clone-panel { - margin-top: -8px; margin-left: 5px; width: 350px; @@ -167,6 +166,13 @@ font-size: 1.4em; } } + + .repo-path { + .section, .divider { + display: inline; + } + } + #file-buttons { font-weight: normal; .ui.button { @@ -882,9 +888,13 @@ } } .diff-box { + display: flex; + align-items: center; + .count { margin-right: 12px; font-size: 13px; + flex: 0 0 auto; .bar { background-color: #bd2c00; @@ -900,7 +910,15 @@ } } .file { + flex: 0 1 100%; color: #888; + word-break: break-all; + } + + .button { + margin: -5px 0 -5px 12px; + padding: 8px 10px; + flex: 0 0 auto; } } .diff-file-box { diff --git a/public/swagger.v1.json b/public/swagger.v1.json index 3ce534d44f6b..e640b4e83160 100644 --- a/public/swagger.v1.json +++ b/public/swagger.v1.json @@ -24,43 +24,71 @@ }, "basePath": "/api/v1", "paths": { - "/markdown": { + "/admin/users": { "post": { "consumes": [ "application/json" ], "produces": [ - "text/html" + "application/json" ], - "operationId": "renderMarkdown", + "tags": [ + "admin" + ], + "operationId": "adminCreateUser", "parameters": [ { - "description": "Text markdown to render", - "name": "Text", + "x-go-name": "SourceID", + "name": "source_id", + "in": "body", + "schema": { + "type": "integer", + "format": "int64" + } + }, + { + "x-go-name": "LoginName", + "name": "login_name", "in": "body", "schema": { "type": "string" } }, { - "description": "Mode to render", - "name": "Mode", + "x-go-name": "Username", + "name": "username", "in": "body", "schema": { "type": "string" } }, { - "description": "Context to render", - "name": "Context", + "x-go-name": "FullName", + "name": "full_name", "in": "body", "schema": { "type": "string" } }, { - "description": "Is it a wiki page ?", - "name": "Wiki", + "x-go-name": "Email", + "name": "email", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "x-go-name": "Password", + "name": "password", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "x-go-name": "SendNotify", + "name": "send_notify", "in": "body", "schema": { "type": "boolean" @@ -68,112 +96,159 @@ } ], "responses": { - "200": { - "$ref": "#/responses/MarkdownRender" + "201": { + "$ref": "#/responses/User" + }, + "403": { + "$ref": "#/responses/forbidden" }, "422": { "$ref": "#/responses/validationError" + }, + "500": { + "$ref": "#/responses/error" } } } }, - "/markdown/raw": { - "post": { - "consumes": [ - "text/plain" - ], + "/admin/users/{username}": { + "delete": { "produces": [ - "text/html" + "application/json" ], - "operationId": "renderMarkdownRaw", + "tags": [ + "admin" + ], + "operationId": "adminDeleteUser", "responses": { - "200": { - "$ref": "#/responses/MarkdownRender" + "204": { + "$ref": "#/responses/empty" + }, + "403": { + "$ref": "#/responses/forbidden" }, "422": { "$ref": "#/responses/validationError" + }, + "500": { + "$ref": "#/responses/error" } } - } - }, - "/org/{org}/repos": { - "post": { + }, + "patch": { "consumes": [ "application/json" ], "produces": [ "application/json" ], - "operationId": "createOrgRepo", + "tags": [ + "admin" + ], + "operationId": "adminEditUser", "parameters": [ { - "uniqueItems": true, - "x-go-name": "Name", - "description": "Name of the repository to create", - "name": "name", + "x-go-name": "SourceID", + "name": "source_id", "in": "body", "schema": { - "type": "string" + "type": "integer", + "format": "int64" } }, { - "x-go-name": "Description", - "description": "Description of the repository to create", - "name": "description", + "x-go-name": "LoginName", + "name": "login_name", "in": "body", "schema": { "type": "string" } }, { - "x-go-name": "Private", - "description": "Is the repository to create private ?", - "name": "private", + "x-go-name": "FullName", + "name": "full_name", "in": "body", "schema": { - "type": "boolean" + "type": "string" } }, { - "x-go-name": "AutoInit", - "description": "Init the repository to create ?", - "name": "auto_init", + "x-go-name": "Email", + "name": "email", "in": "body", "schema": { - "type": "boolean" + "type": "string" } }, { - "x-go-name": "Gitignores", - "description": "Gitignores to use", - "name": "gitignores", + "x-go-name": "Password", + "name": "password", "in": "body", "schema": { "type": "string" } }, { - "x-go-name": "License", - "description": "License to use", - "name": "license", + "x-go-name": "Website", + "name": "website", "in": "body", "schema": { "type": "string" } }, { - "x-go-name": "Readme", - "description": "Readme of the repository to create", - "name": "readme", + "x-go-name": "Location", + "name": "location", "in": "body", "schema": { "type": "string" } + }, + { + "x-go-name": "Active", + "name": "active", + "in": "body", + "schema": { + "type": "boolean" + } + }, + { + "x-go-name": "Admin", + "name": "admin", + "in": "body", + "schema": { + "type": "boolean" + } + }, + { + "x-go-name": "AllowGitHook", + "name": "allow_git_hook", + "in": "body", + "schema": { + "type": "boolean" + } + }, + { + "x-go-name": "AllowImportLocal", + "name": "allow_import_local", + "in": "body", + "schema": { + "type": "boolean" + } + }, + { + "x-go-name": "MaxRepoCreation", + "name": "max_repo_creation", + "in": "body", + "schema": { + "type": "integer", + "format": "int64" + } } ], "responses": { - "201": { - "$ref": "#/responses/Repository" + "200": { + "$ref": "#/responses/User" }, "403": { "$ref": "#/responses/forbidden" @@ -187,15 +262,51 @@ } } }, - "/orgs/{org}/repos": { - "get": { + "/admin/users/{username}/keys": { + "post": { + "consumes": [ + "application/json" + ], "produces": [ "application/json" ], - "operationId": "orgListRepos", + "tags": [ + "admin" + ], + "operationId": "adminCreatePublicKey", + "parameters": [ + { + "uniqueItems": true, + "x-go-name": "Title", + "description": "Title of the key to add", + "name": "title", + "in": "body", + "required": true, + "schema": { + "type": "string" + } + }, + { + "uniqueItems": true, + "x-go-name": "Key", + "description": "An armored SSH key to add", + "name": "key", + "in": "body", + "required": true, + "schema": { + "type": "string" + } + } + ], "responses": { - "200": { - "$ref": "#/responses/RepositoryList" + "201": { + "$ref": "#/responses/PublicKey" + }, + "403": { + "$ref": "#/responses/forbidden" + }, + "422": { + "$ref": "#/responses/validationError" }, "500": { "$ref": "#/responses/error" @@ -203,76 +314,1179 @@ } } }, - "/repos/search": { - "get": { + "/admin/users/{username}/orgs": { + "post": { + "consumes": [ + "application/json" + ], "produces": [ "application/json" ], - "operationId": "repoSearch", + "tags": [ + "admin" + ], + "operationId": "adminCreateOrg", "parameters": [ { - "type": "string", - "x-go-name": "Keyword", - "description": "Keyword to search", - "name": "q", - "in": "query" + "x-go-name": "UserName", + "name": "username", + "in": "body", + "schema": { + "type": "string" + } }, { - "type": "integer", - "format": "int64", - "x-go-name": "OwnerID", - "description": "Owner in we search search", - "name": "uid", - "in": "query" + "x-go-name": "FullName", + "name": "full_name", + "in": "body", + "schema": { + "type": "string" + } }, { - "type": "integer", - "format": "int64", - "x-go-name": "PageSize", - "description": "Limit of result\n\nmaximum: setting.ExplorePagingNum", - "name": "limit", - "in": "query" + "x-go-name": "Description", + "name": "description", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "x-go-name": "Website", + "name": "website", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "x-go-name": "Location", + "name": "location", + "in": "body", + "schema": { + "type": "string" + } } ], "responses": { - "200": { - "$ref": "#/responses/SearchResults" + "201": { + "$ref": "#/responses/Organization" + }, + "403": { + "$ref": "#/responses/forbidden" + }, + "422": { + "$ref": "#/responses/validationError" }, "500": { - "$ref": "#/responses/SearchError" + "$ref": "#/responses/error" } } } }, - "/repos/{owner}/{repo}/forks": { - "get": { - "produces": [ + "/admin/users/{username}/repos": { + "post": { + "consumes": [ "application/json" ], - "operationId": "listForks", - "responses": { - "200": { - "$ref": "#/responses/RepositoryList" - }, - "500": { - "$ref": "#/responses/error" - } - } - }, - "post": { "produces": [ "application/json" ], - "operationId": "createFork", - "responses": { - "202": { - "$ref": "#/responses/Repository" - }, - "403": { - "$ref": "#/responses/forbidden" - }, - "422": { - "$ref": "#/responses/validationError" + "tags": [ + "admin" + ], + "operationId": "adminCreateRepo", + "parameters": [ + { + "uniqueItems": true, + "x-go-name": "Name", + "description": "Name of the repository to create", + "name": "name", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "x-go-name": "Description", + "description": "Description of the repository to create", + "name": "description", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "x-go-name": "Private", + "description": "Is the repository to create private ?", + "name": "private", + "in": "body", + "schema": { + "type": "boolean" + } + }, + { + "x-go-name": "AutoInit", + "description": "Init the repository to create ?", + "name": "auto_init", + "in": "body", + "schema": { + "type": "boolean" + } + }, + { + "x-go-name": "Gitignores", + "description": "Gitignores to use", + "name": "gitignores", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "x-go-name": "License", + "description": "License to use", + "name": "license", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "x-go-name": "Readme", + "description": "Readme of the repository to create", + "name": "readme", + "in": "body", + "schema": { + "type": "string" + } + } + ], + "responses": { + "201": { + "$ref": "#/responses/Repository" + }, + "403": { + "$ref": "#/responses/forbidden" + }, + "422": { + "$ref": "#/responses/validationError" + }, + "500": { + "$ref": "#/responses/error" + } + } + } + }, + "/markdown": { + "post": { + "consumes": [ + "application/json" + ], + "produces": [ + "text/html" + ], + "tags": [ + "miscellaneous" + ], + "operationId": "renderMarkdown", + "parameters": [ + { + "description": "Text markdown to render", + "name": "Text", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "description": "Mode to render", + "name": "Mode", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "description": "Context to render", + "name": "Context", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "description": "Is it a wiki page ?", + "name": "Wiki", + "in": "body", + "schema": { + "type": "boolean" + } + } + ], + "responses": { + "200": { + "$ref": "#/responses/MarkdownRender" + }, + "422": { + "$ref": "#/responses/validationError" + } + } + } + }, + "/markdown/raw": { + "post": { + "consumes": [ + "text/plain" + ], + "produces": [ + "text/html" + ], + "tags": [ + "miscellaneous" + ], + "operationId": "renderMarkdownRaw", + "responses": { + "200": { + "$ref": "#/responses/MarkdownRender" + }, + "422": { + "$ref": "#/responses/validationError" + } + } + } + }, + "/org/{org}/repos": { + "post": { + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "organization" + ], + "operationId": "createOrgRepo", + "parameters": [ + { + "uniqueItems": true, + "x-go-name": "Name", + "description": "Name of the repository to create", + "name": "name", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "x-go-name": "Description", + "description": "Description of the repository to create", + "name": "description", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "x-go-name": "Private", + "description": "Is the repository to create private ?", + "name": "private", + "in": "body", + "schema": { + "type": "boolean" + } + }, + { + "x-go-name": "AutoInit", + "description": "Init the repository to create ?", + "name": "auto_init", + "in": "body", + "schema": { + "type": "boolean" + } + }, + { + "x-go-name": "Gitignores", + "description": "Gitignores to use", + "name": "gitignores", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "x-go-name": "License", + "description": "License to use", + "name": "license", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "x-go-name": "Readme", + "description": "Readme of the repository to create", + "name": "readme", + "in": "body", + "schema": { + "type": "string" + } + } + ], + "responses": { + "201": { + "$ref": "#/responses/Repository" + }, + "403": { + "$ref": "#/responses/forbidden" + }, + "422": { + "$ref": "#/responses/validationError" + }, + "500": { + "$ref": "#/responses/error" + } + } + } + }, + "/orgs/{orgname}/hooks": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "organization" + ], + "operationId": "orgListHooks", + "responses": { + "200": { + "$ref": "#/responses/HookList" + }, + "500": { + "$ref": "#/responses/error" + } + } + } + }, + "/orgs/{orgname}/hooks/": { + "post": { + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "organization" + ], + "operationId": "orgCreateHook", + "parameters": [ + { + "x-go-name": "Type", + "name": "type", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "x-go-name": "Config", + "name": "config", + "in": "body", + "schema": { + "type": "object", + "additionalProperties": { + "type": "string" + } + } + }, + { + "x-go-name": "Events", + "name": "events", + "in": "body", + "schema": { + "type": "array", + "items": { + "type": "string" + } + } + }, + { + "x-go-name": "Active", + "name": "active", + "in": "body", + "schema": { + "type": "boolean" + } + } + ], + "responses": { + "201": { + "$ref": "#/responses/Hook" + }, + "422": { + "$ref": "#/responses/validationError" + }, + "500": { + "$ref": "#/responses/error" + } + } + } + }, + "/orgs/{orgname}/hooks/{id}": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "organization" + ], + "operationId": "orgGetHook", + "responses": { + "200": { + "$ref": "#/responses/Hook" + }, + "404": { + "$ref": "#/responses/notFound" + }, + "500": { + "$ref": "#/responses/error" + } + } + }, + "delete": { + "produces": [ + "application/json" + ], + "tags": [ + "organization" + ], + "operationId": "orgDeleteHook", + "responses": { + "204": { + "$ref": "#/responses/empty" + }, + "404": { + "$ref": "#/responses/notFound" + }, + "500": { + "$ref": "#/responses/error" + } + } + }, + "patch": { + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "organization" + ], + "operationId": "orgEditHook", + "parameters": [ + { + "x-go-name": "Config", + "name": "config", + "in": "body", + "schema": { + "type": "object", + "additionalProperties": { + "type": "string" + } + } + }, + { + "x-go-name": "Events", + "name": "events", + "in": "body", + "schema": { + "type": "array", + "items": { + "type": "string" + } + } + }, + { + "x-go-name": "Active", + "name": "active", + "in": "body", + "schema": { + "type": "boolean" + } + } + ], + "responses": { + "200": { + "$ref": "#/responses/Hook" + }, + "404": { + "$ref": "#/responses/notFound" + }, + "422": { + "$ref": "#/responses/validationError" + }, + "500": { + "$ref": "#/responses/error" + } + } + } + }, + "/orgs/{orgname}/members": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "organization" + ], + "operationId": "orgListMembers", + "responses": { + "200": { + "$ref": "#/responses/UserList" + }, + "500": { + "$ref": "#/responses/error" + } + } + } + }, + "/orgs/{orgname}/members/{username}": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "organization" + ], + "operationId": "orgIsMember", + "responses": { + "204": { + "$ref": "#/responses/empty" + }, + "302": { + "$ref": "#/responses/redirect" + }, + "404": { + "$ref": "#/responses/notFound" + } + } + }, + "delete": { + "produces": [ + "application/json" + ], + "tags": [ + "organization" + ], + "operationId": "orgDeleteMember", + "responses": { + "204": { + "$ref": "#/responses/empty" + }, + "500": { + "$ref": "#/responses/error" + } + } + } + }, + "/orgs/{orgname}/public_members": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "organization" + ], + "operationId": "orgListPublicMembers", + "responses": { + "200": { + "$ref": "#/responses/UserList" + }, + "500": { + "$ref": "#/responses/error" + } + } + } + }, + "/orgs/{orgname}/public_members/{username}": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "organization" + ], + "operationId": "orgIsPublicMember", + "responses": { + "204": { + "$ref": "#/responses/empty" + }, + "404": { + "$ref": "#/responses/notFound" + } + } + }, + "put": { + "produces": [ + "application/json" + ], + "tags": [ + "organization" + ], + "operationId": "orgPublicizeMember", + "responses": { + "204": { + "$ref": "#/responses/empty" + }, + "403": { + "$ref": "#/responses/forbidden" + }, + "500": { + "$ref": "#/responses/error" + } + } + }, + "delete": { + "produces": [ + "application/json" + ], + "tags": [ + "organization" + ], + "operationId": "orgConcealMember", + "responses": { + "204": { + "$ref": "#/responses/empty" + }, + "403": { + "$ref": "#/responses/forbidden" + }, + "500": { + "$ref": "#/responses/error" + } + } + } + }, + "/orgs/{orgname}/repos": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "organization" + ], + "operationId": "orgListRepos", + "responses": { + "200": { + "$ref": "#/responses/RepositoryList" + }, + "500": { + "$ref": "#/responses/error" + } + } + } + }, + "/repos/migrate": { + "post": { + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "repository" + ], + "operationId": "repoMigrate", + "parameters": [ + { + "x-go-name": "CloneAddr", + "name": "clone_addr", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "x-go-name": "AuthUsername", + "name": "auth_username", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "x-go-name": "AuthPassword", + "name": "auth_password", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "x-go-name": "UID", + "name": "uid", + "in": "body", + "schema": { + "type": "integer", + "format": "int64" + } + }, + { + "x-go-name": "RepoName", + "name": "repo_name", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "x-go-name": "Mirror", + "name": "mirror", + "in": "body", + "schema": { + "type": "boolean" + } + }, + { + "x-go-name": "Private", + "name": "private", + "in": "body", + "schema": { + "type": "boolean" + } + }, + { + "x-go-name": "Description", + "name": "description", + "in": "body", + "schema": { + "type": "string" + } + } + ], + "responses": { + "201": { + "$ref": "#/responses/Repository" + }, + "422": { + "$ref": "#/responses/validationError" + }, + "500": { + "$ref": "#/responses/error" + } + } + } + }, + "/repos/search": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "repository" + ], + "operationId": "repoSearch", + "parameters": [ + { + "type": "string", + "x-go-name": "Keyword", + "description": "Keyword to search", + "name": "q", + "in": "query" + }, + { + "type": "integer", + "format": "int64", + "x-go-name": "OwnerID", + "description": "Owner in we search search", + "name": "uid", + "in": "query" + }, + { + "type": "integer", + "format": "int64", + "x-go-name": "PageSize", + "description": "Limit of result\n\nmaximum: setting.ExplorePagingNum", + "name": "limit", + "in": "query" + } + ], + "responses": { + "200": { + "$ref": "#/responses/SearchResults" + }, + "500": { + "$ref": "#/responses/SearchError" + } + } + } + }, + "/repos/{owner}/{repo}/forks": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "repository" + ], + "operationId": "listForks", + "responses": { + "200": { + "$ref": "#/responses/RepositoryList" + }, + "500": { + "$ref": "#/responses/error" + } + } + }, + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "repository" + ], + "operationId": "createFork", + "parameters": [ + { + "x-go-name": "Organization", + "name": "organization", + "in": "body", + "schema": { + "type": "string" + } + } + ], + "responses": { + "202": { + "$ref": "#/responses/Repository" + }, + "403": { + "$ref": "#/responses/forbidden" + }, + "422": { + "$ref": "#/responses/validationError" + }, + "500": { + "$ref": "#/responses/error" + } + } + } + }, + "/repos/{username}/{reponame}": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "repository" + ], + "operationId": "repoGet", + "responses": { + "200": { + "$ref": "#/responses/Repository" + }, + "500": { + "$ref": "#/responses/error" + } + } + }, + "delete": { + "produces": [ + "application/json" + ], + "tags": [ + "repository" + ], + "operationId": "repoDelete", + "responses": { + "204": { + "$ref": "#/responses/empty" + }, + "403": { + "$ref": "#/responses/forbidden" + }, + "500": { + "$ref": "#/responses/error" + } + } + } + }, + "/repos/{username}/{reponame}/hooks": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "repository" + ], + "operationId": "repoListHooks", + "responses": { + "200": { + "$ref": "#/responses/HookList" + }, + "500": { + "$ref": "#/responses/error" + } + } + }, + "post": { + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "repository" + ], + "operationId": "repoCreateHook", + "parameters": [ + { + "x-go-name": "Type", + "name": "type", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "x-go-name": "Config", + "name": "config", + "in": "body", + "schema": { + "type": "object", + "additionalProperties": { + "type": "string" + } + } + }, + { + "x-go-name": "Events", + "name": "events", + "in": "body", + "schema": { + "type": "array", + "items": { + "type": "string" + } + } + }, + { + "x-go-name": "Active", + "name": "active", + "in": "body", + "schema": { + "type": "boolean" + } + } + ], + "responses": { + "200": { + "$ref": "#/responses/Hook" + }, + "422": { + "$ref": "#/responses/validationError" + }, + "500": { + "$ref": "#/responses/error" + } + } + } + }, + "/repos/{username}/{reponame}/hooks/{id}": { + "delete": { + "produces": [ + "application/json" + ], + "tags": [ + "repository" + ], + "operationId": "repoDeleteHook", + "responses": { + "204": { + "$ref": "#/responses/empty" + }, + "404": { + "$ref": "#/responses/notFound" + }, + "500": { + "$ref": "#/responses/error" + } + } + }, + "patch": { + "produces": [ + "application/json" + ], + "tags": [ + "repository" + ], + "operationId": "repoEditHook", + "parameters": [ + { + "x-go-name": "Config", + "name": "config", + "in": "body", + "schema": { + "type": "object", + "additionalProperties": { + "type": "string" + } + } + }, + { + "x-go-name": "Events", + "name": "events", + "in": "body", + "schema": { + "type": "array", + "items": { + "type": "string" + } + } + }, + { + "x-go-name": "Active", + "name": "active", + "in": "body", + "schema": { + "type": "boolean" + } + } + ], + "responses": { + "200": { + "$ref": "#/responses/Hook" + }, + "422": { + "$ref": "#/responses/validationError" + }, + "500": { + "$ref": "#/responses/error" + } + } + } + }, + "/repos/{username}/{reponame}/issues/{issue}/times": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "repository" + ], + "operationId": "issueTrackedTimes", + "responses": { + "200": { + "$ref": "#/responses/TrackedTimes" + }, + "404": { + "$ref": "#/responses/error" + }, + "500": { + "$ref": "#/responses/error" + } + } + }, + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "repository" + ], + "operationId": "addTime", + "parameters": [ + { + "x-go-name": "Time", + "name": "time", + "in": "body", + "schema": { + "type": "integer", + "format": "int64" + } + } + ], + "responses": { + "200": { + "$ref": "#/responses/TrackedTime" + }, + "400": { + "$ref": "#/responses/error" + }, + "403": { + "$ref": "#/responses/error" + }, + "404": { + "$ref": "#/responses/error" + }, + "500": { + "$ref": "#/responses/error" + } + } + } + }, + "/repos/{username}/{reponame}/mirror-sync": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "repository" + ], + "operationId": "repoMirrorSync", + "responses": { + "200": { + "$ref": "#/responses/empty" + }, + "403": { + "$ref": "#/responses/forbidden" + } + } + } + }, + "/repos/{username}/{reponame}/subscription": { + "get": { + "tags": [ + "repository" + ], + "operationId": "userCurrentCheckSubscription", + "responses": { + "200": { + "$ref": "#/responses/WatchInfo" + }, + "404": { + "$ref": "#/responses/notFound" + } + } + }, + "put": { + "tags": [ + "repository" + ], + "operationId": "userCurrentPutSubscription", + "responses": { + "200": { + "$ref": "#/responses/WatchInfo" + }, + "500": { + "$ref": "#/responses/error" + } + } + }, + "delete": { + "tags": [ + "repository" + ], + "operationId": "userCurrentDeleteSubscription", + "responses": { + "204": { + "$ref": "#/responses/empty" }, "500": { "$ref": "#/responses/error" @@ -280,50 +1494,65 @@ } } }, - "/repos/{username}/{reponame}/mirror-sync": { - "post": { + "/repos/{username}/{reponame}/times": { + "get": { "produces": [ "application/json" ], - "operationId": "repoMirrorSync", + "tags": [ + "repository" + ], + "operationId": "repoTrackedTimes", "responses": { "200": { - "$ref": "#/responses/empty" + "$ref": "#/responses/TrackedTimes" }, - "403": { - "$ref": "#/responses/forbidden" + "400": { + "$ref": "#/responses/error" + }, + "500": { + "$ref": "#/responses/error" } } } }, - "/repos/{username}/{reponame}/subscription": { + "/repos/{username}/{reponame}/times/{timetrackingusername}": { "get": { - "operationId": "userCurrentCheckSubscription", + "produces": [ + "application/json" + ], + "tags": [ + "user" + ], + "operationId": "userTrackedTimes", "responses": { "200": { - "$ref": "#/responses/WatchInfo" + "$ref": "#/responses/TrackedTimes" + }, + "400": { + "$ref": "#/responses/error" }, "404": { - "$ref": "#/responses/notFound" - } - } - }, - "put": { - "operationId": "userCurrentPutSubscription", - "responses": { - "200": { - "$ref": "#/responses/WatchInfo" + "$ref": "#/responses/error" }, "500": { "$ref": "#/responses/error" } } - }, - "delete": { - "operationId": "userCurrentDeleteSubscription", + } + }, + "/repositories/{id}": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "repository" + ], + "operationId": "repoGetByID", "responses": { - "204": { - "$ref": "#/responses/empty" + "200": { + "$ref": "#/responses/Repository" }, "500": { "$ref": "#/responses/error" @@ -336,6 +1565,9 @@ "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userGetCurrent", "responses": { "200": { @@ -349,6 +1581,9 @@ "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userCurrentListFollowers", "responses": { "200": { @@ -365,6 +1600,9 @@ "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userCurrentListFollowing", "responses": { "200": { @@ -378,6 +1616,9 @@ }, "/user/following/{username}": { "get": { + "tags": [ + "user" + ], "operationId": "userCurrentCheckFollowing", "responses": { "204": { @@ -389,6 +1630,9 @@ } }, "put": { + "tags": [ + "user" + ], "operationId": "userCurrentPutFollow", "responses": { "204": { @@ -400,6 +1644,9 @@ } }, "delete": { + "tags": [ + "user" + ], "operationId": "userCurrentDeleteFollow", "responses": { "204": { @@ -416,6 +1663,9 @@ "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userCurrentListGPGKeys", "responses": { "200": { @@ -433,6 +1683,9 @@ "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userCurrentPostGPGKey", "parameters": [ { @@ -465,6 +1718,9 @@ "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userCurrentGetGPGKey", "responses": { "200": { @@ -482,6 +1738,9 @@ "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userCurrentDeleteGPGKey", "responses": { "204": { @@ -501,6 +1760,9 @@ "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userCurrentListKeys", "responses": { "200": { @@ -518,6 +1780,9 @@ "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userCurrentPostKey", "parameters": [ { @@ -561,6 +1826,9 @@ "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userCurrentGetKey", "responses": { "200": { @@ -578,6 +1846,9 @@ "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userCurrentDeleteKey", "responses": { "204": { @@ -597,6 +1868,9 @@ "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userCurrentListRepos", "responses": { "200": { @@ -606,6 +1880,99 @@ "$ref": "#/responses/error" } } + }, + "post": { + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "repository", + "user" + ], + "operationId": "createCurrentUserRepo", + "parameters": [ + { + "uniqueItems": true, + "x-go-name": "Name", + "description": "Name of the repository to create", + "name": "name", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "x-go-name": "Description", + "description": "Description of the repository to create", + "name": "description", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "x-go-name": "Private", + "description": "Is the repository to create private ?", + "name": "private", + "in": "body", + "schema": { + "type": "boolean" + } + }, + { + "x-go-name": "AutoInit", + "description": "Init the repository to create ?", + "name": "auto_init", + "in": "body", + "schema": { + "type": "boolean" + } + }, + { + "x-go-name": "Gitignores", + "description": "Gitignores to use", + "name": "gitignores", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "x-go-name": "License", + "description": "License to use", + "name": "license", + "in": "body", + "schema": { + "type": "string" + } + }, + { + "x-go-name": "Readme", + "description": "Readme of the repository to create", + "name": "readme", + "in": "body", + "schema": { + "type": "string" + } + } + ], + "responses": { + "201": { + "$ref": "#/responses/Repository" + }, + "403": { + "$ref": "#/responses/forbidden" + }, + "422": { + "$ref": "#/responses/validationError" + }, + "500": { + "$ref": "#/responses/error" + } + } } }, "/user/starred": { @@ -613,6 +1980,9 @@ "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userCurrentListStarred", "responses": { "200": { @@ -626,6 +1996,9 @@ }, "/user/starred/{username}/{reponame}": { "get": { + "tags": [ + "user" + ], "operationId": "userCurrentCheckStarring", "responses": { "204": { @@ -637,6 +2010,9 @@ } }, "put": { + "tags": [ + "user" + ], "operationId": "userCurrentPutStar", "responses": { "204": { @@ -648,6 +2024,9 @@ } }, "delete": { + "tags": [ + "user" + ], "operationId": "userCurrentDeleteStar", "responses": { "204": { @@ -664,6 +2043,9 @@ "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userCurrentListSubscriptions", "responses": { "200": { @@ -675,11 +2057,33 @@ } } }, + "/user/times": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "user" + ], + "operationId": "userTrackedTimes", + "responses": { + "200": { + "$ref": "#/responses/TrackedTimes" + }, + "500": { + "$ref": "#/responses/error" + } + } + } + }, "/users/:username/followers": { "get": { "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userListFollowers", "responses": { "200": { @@ -696,6 +2100,9 @@ "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userSearch", "responses": { "200": { @@ -712,6 +2119,9 @@ "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userGet", "responses": { "200": { @@ -731,6 +2141,9 @@ "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userListFollowing", "responses": { "200": { @@ -744,6 +2157,9 @@ }, "/users/{username}/following/:target": { "get": { + "tags": [ + "user" + ], "operationId": "userCheckFollowing", "responses": { "204": { @@ -760,6 +2176,9 @@ "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userListGPGKeys", "responses": { "200": { @@ -776,6 +2195,9 @@ "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userListKeys", "responses": { "200": { @@ -792,6 +2214,9 @@ "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userListRepos", "responses": { "200": { @@ -808,6 +2233,9 @@ "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userListStarred", "responses": { "200": { @@ -824,6 +2252,9 @@ "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userListSubscriptions", "responses": { "200": { @@ -840,6 +2271,9 @@ "produces": [ "application/json" ], + "tags": [ + "user" + ], "operationId": "userGetTokens", "responses": { "200": { @@ -857,6 +2291,9 @@ "produces": [ "application/json" ], + "tags": [ + "miscellaneous" + ], "summary": "Return Gitea running version.", "operationId": "getVersion", "responses": { @@ -929,7 +2366,7 @@ "x-go-package": "code.gitea.io/gitea/vendor/code.gitea.io/sdk/gitea" }, "GPGKeyEmail": { - "description": "GPGKeyEmail a email attache to a GPGKey", + "description": "GPGKeyEmail an email attached to a GPGKey", "type": "object", "properties": { "email": { @@ -1153,9 +2590,69 @@ "GPGKeyList": { "description": "GPGKeyList represents a list of GPGKey" }, + "Hook": { + "description": "Hook a hook is a web hook when one repository changed", + "schema": { + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "headers": { + "active": { + "type": "boolean" + }, + "config": {}, + "created_at": {}, + "events": { + "type": "array", + "items": { + "type": "string" + } + }, + "id": { + "type": "integer", + "format": "int64" + }, + "type": { + "type": "string" + }, + "updated_at": {} + } + }, + "HookList": { + "description": "HookList represents a list of API hook." + }, "MarkdownRender": { "description": "MarkdownRender is a rendered markdown document" }, + "Organization": { + "description": "Organization a group of some repositories, users and teams", + "headers": { + "avatar_url": { + "type": "string" + }, + "description": { + "type": "string" + }, + "full_name": { + "type": "string" + }, + "id": { + "type": "integer", + "format": "int64" + }, + "location": { + "type": "string" + }, + "username": { + "type": "string" + }, + "website": { + "type": "string" + } + } + }, "PublicKey": { "description": "PublicKey publickey is a user key to push code to repository", "headers": { @@ -1287,6 +2784,32 @@ } } }, + "TrackedTime": { + "description": "TrackedTime worked time for an issue / pr", + "headers": { + "created": {}, + "id": { + "type": "integer", + "format": "int64" + }, + "issue_id": { + "type": "integer", + "format": "int64" + }, + "time": { + "type": "integer", + "format": "int64", + "description": "Time in seconds" + }, + "user_id": { + "type": "integer", + "format": "int64" + } + } + }, + "TrackedTimes": { + "description": "TrackedTimes represent a list of tracked times" + }, "User": { "description": "User represents a API user.", "headers": { @@ -1361,6 +2884,9 @@ "notFound": { "description": "APINotFound is a not found empty response" }, + "redirect": { + "description": "APIRedirect is a redirect response" + }, "validationError": { "description": "APIValidationError is error format response related to input validation", "headers": { @@ -1372,5 +2898,47 @@ } } } - } -} + }, + "securityDefinitions": { + "AccessToken": { + "type": "apiKey", + "name": "access_token", + "in": "query" + }, + "AuthorizationHeaderToken": { + "type": "apiKey", + "name": "Authorization", + "in": "header" + }, + "BasicAuth": { + "type": "basic" + }, + "Token": { + "type": "apiKey", + "name": "token", + "in": "query" + } + }, + "security": [ + { + "BasicAuth": [ + "[]" + ] + }, + { + "Token": [ + "[]" + ] + }, + { + "AccessToken": [ + "[]" + ] + }, + { + "AuthorizationHeaderToken": [ + "[]" + ] + } + ] +} \ No newline at end of file diff --git a/public/vendor/VERSIONS b/public/vendor/VERSIONS new file mode 100644 index 000000000000..356c35ec7cd6 --- /dev/null +++ b/public/vendor/VERSIONS @@ -0,0 +1,60 @@ +# About: This file was added per request of BKC. It duplicates content present in librejs.html. +# To do: Choose a dependency management solution and use it to replace both files. +# Notes: Download and license information is available in librejs.html. + +File(s): /vendor/plugins/jquery.areyousure/jquery.are-you-sure.js +Version: 1.9.0 + +File(s): /vendor/plugins/jquery/jquery.min.js +Version: 1.11.3 + +File(s): /vendor/plugins/semantic/semantic.min.js +Version: 2.2.1 + +File(s): /vendor/plugins/clipboard/clipboard.min.js +Version: 1.5.9 + +File(s): /vendor/plugins/gitgraph/gitgraph.js +Version: 5fcc26b + +File(s): /vendor/plugins/autolink/autolink.js +Version: 741f66f + +File(s): /vendor/plugins/vue/vue.min.js +Version: 2.1.10 + +File(s): /vendor/plugins/emojify/emojify.min.js +Version: 1.1.0 + +File(s): /vendor/plugins/cssrelpreload/ +Version: 1.3.1 + +File(s): /vendor/plugins/dropzone/dropzone.js +Version: 4.2.0 + +File(s): /vendor/plugins/highlight/highlight.pack.js +Version: 9.6.0 + +File(s): /vendor/plugins/jquery.datetimepicker/jquery.datetimepicker.js +Version: 2.4.5 + +File(s): /vendor/plugins/jquery.minicolors/jquery.minicolors.min.js +Version: 2.2.3 + +File(s): /vendor/plugins/codemirror/ +Version: 5.17.0 + +File(s): /vendor/plugins/simplemde/simplemde.min.js +Version: 1.10.1 + +File(s): /vendor/plugins/pdfjs/ +Version: 1.4.20 + +File(s): /vendor/assets/font-awesome/fonts/ +Version: 4.6.0 + +File(s): /vendor/assets/octicons/ +Version: 4.3.0 + +File(s): /vendor/assets/swagger-ui/ +Version: 3.0.4 diff --git a/public/vendor/assets/font-awesome/LICENSE b/public/vendor/assets/font-awesome/LICENSE new file mode 100644 index 000000000000..1456c1809da6 --- /dev/null +++ b/public/vendor/assets/font-awesome/LICENSE @@ -0,0 +1,97 @@ +Copyright (c) , (), +with Reserved Font Name . +Copyright (c) , (), +with Reserved Font Name . +Copyright (c) , (). + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/public/vendor/assets/font-awesome/css/LICENSE b/public/vendor/assets/font-awesome/css/LICENSE new file mode 100644 index 000000000000..6cd7b7924ef9 --- /dev/null +++ b/public/vendor/assets/font-awesome/css/LICENSE @@ -0,0 +1,7 @@ +Copyright + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/public/assets/font-awesome-4.6.3/css/font-awesome.min.css b/public/vendor/assets/font-awesome/css/font-awesome.min.css similarity index 100% rename from public/assets/font-awesome-4.6.3/css/font-awesome.min.css rename to public/vendor/assets/font-awesome/css/font-awesome.min.css diff --git a/public/assets/font-awesome-4.6.3/fonts/FontAwesome.otf b/public/vendor/assets/font-awesome/fonts/FontAwesome.otf similarity index 100% rename from public/assets/font-awesome-4.6.3/fonts/FontAwesome.otf rename to public/vendor/assets/font-awesome/fonts/FontAwesome.otf diff --git a/public/vendor/assets/font-awesome/fonts/LICENSE b/public/vendor/assets/font-awesome/fonts/LICENSE new file mode 100644 index 000000000000..1456c1809da6 --- /dev/null +++ b/public/vendor/assets/font-awesome/fonts/LICENSE @@ -0,0 +1,97 @@ +Copyright (c) , (), +with Reserved Font Name . +Copyright (c) , (), +with Reserved Font Name . +Copyright (c) , (). + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/public/assets/font-awesome-4.6.3/fonts/fontawesome-webfont.eot b/public/vendor/assets/font-awesome/fonts/fontawesome-webfont.eot similarity index 100% rename from public/assets/font-awesome-4.6.3/fonts/fontawesome-webfont.eot rename to public/vendor/assets/font-awesome/fonts/fontawesome-webfont.eot diff --git a/public/assets/font-awesome-4.6.3/fonts/fontawesome-webfont.svg b/public/vendor/assets/font-awesome/fonts/fontawesome-webfont.svg similarity index 100% rename from public/assets/font-awesome-4.6.3/fonts/fontawesome-webfont.svg rename to public/vendor/assets/font-awesome/fonts/fontawesome-webfont.svg diff --git a/public/assets/font-awesome-4.6.3/fonts/fontawesome-webfont.ttf b/public/vendor/assets/font-awesome/fonts/fontawesome-webfont.ttf similarity index 100% rename from public/assets/font-awesome-4.6.3/fonts/fontawesome-webfont.ttf rename to public/vendor/assets/font-awesome/fonts/fontawesome-webfont.ttf diff --git a/public/assets/font-awesome-4.6.3/fonts/fontawesome-webfont.woff b/public/vendor/assets/font-awesome/fonts/fontawesome-webfont.woff similarity index 100% rename from public/assets/font-awesome-4.6.3/fonts/fontawesome-webfont.woff rename to public/vendor/assets/font-awesome/fonts/fontawesome-webfont.woff diff --git a/public/assets/font-awesome-4.6.3/fonts/fontawesome-webfont.woff2 b/public/vendor/assets/font-awesome/fonts/fontawesome-webfont.woff2 similarity index 100% rename from public/assets/font-awesome-4.6.3/fonts/fontawesome-webfont.woff2 rename to public/vendor/assets/font-awesome/fonts/fontawesome-webfont.woff2 diff --git a/public/vendor/assets/octicons/LICENSE b/public/vendor/assets/octicons/LICENSE new file mode 100644 index 000000000000..4cf2020ce774 --- /dev/null +++ b/public/vendor/assets/octicons/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2012-2016 GitHub, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/public/assets/octicons-4.3.0/octicons.eot b/public/vendor/assets/octicons/octicons.eot similarity index 100% rename from public/assets/octicons-4.3.0/octicons.eot rename to public/vendor/assets/octicons/octicons.eot diff --git a/public/assets/octicons-4.3.0/octicons.min.css b/public/vendor/assets/octicons/octicons.min.css similarity index 100% rename from public/assets/octicons-4.3.0/octicons.min.css rename to public/vendor/assets/octicons/octicons.min.css diff --git a/public/assets/octicons-4.3.0/octicons.svg b/public/vendor/assets/octicons/octicons.svg similarity index 100% rename from public/assets/octicons-4.3.0/octicons.svg rename to public/vendor/assets/octicons/octicons.svg diff --git a/public/assets/octicons-4.3.0/octicons.ttf b/public/vendor/assets/octicons/octicons.ttf similarity index 100% rename from public/assets/octicons-4.3.0/octicons.ttf rename to public/vendor/assets/octicons/octicons.ttf diff --git a/public/assets/octicons-4.3.0/octicons.woff b/public/vendor/assets/octicons/octicons.woff similarity index 100% rename from public/assets/octicons-4.3.0/octicons.woff rename to public/vendor/assets/octicons/octicons.woff diff --git a/public/assets/octicons-4.3.0/octicons.woff2 b/public/vendor/assets/octicons/octicons.woff2 similarity index 100% rename from public/assets/octicons-4.3.0/octicons.woff2 rename to public/vendor/assets/octicons/octicons.woff2 diff --git a/public/assets/swagger-ui/favicon-16x16.png b/public/vendor/assets/swagger-ui/favicon-16x16.png similarity index 100% rename from public/assets/swagger-ui/favicon-16x16.png rename to public/vendor/assets/swagger-ui/favicon-16x16.png diff --git a/public/assets/swagger-ui/favicon-32x32.png b/public/vendor/assets/swagger-ui/favicon-32x32.png similarity index 100% rename from public/assets/swagger-ui/favicon-32x32.png rename to public/vendor/assets/swagger-ui/favicon-32x32.png diff --git a/public/assets/swagger-ui/index.html b/public/vendor/assets/swagger-ui/index.html similarity index 100% rename from public/assets/swagger-ui/index.html rename to public/vendor/assets/swagger-ui/index.html diff --git a/public/assets/swagger-ui/oauth2-redirect.html b/public/vendor/assets/swagger-ui/oauth2-redirect.html similarity index 100% rename from public/assets/swagger-ui/oauth2-redirect.html rename to public/vendor/assets/swagger-ui/oauth2-redirect.html diff --git a/public/assets/swagger-ui/swagger-ui-bundle.js b/public/vendor/assets/swagger-ui/swagger-ui-bundle.js similarity index 100% rename from public/assets/swagger-ui/swagger-ui-bundle.js rename to public/vendor/assets/swagger-ui/swagger-ui-bundle.js diff --git a/public/assets/swagger-ui/swagger-ui-bundle.js.map b/public/vendor/assets/swagger-ui/swagger-ui-bundle.js.map similarity index 100% rename from public/assets/swagger-ui/swagger-ui-bundle.js.map rename to public/vendor/assets/swagger-ui/swagger-ui-bundle.js.map diff --git a/public/assets/swagger-ui/swagger-ui-standalone-preset.js b/public/vendor/assets/swagger-ui/swagger-ui-standalone-preset.js similarity index 100% rename from public/assets/swagger-ui/swagger-ui-standalone-preset.js rename to public/vendor/assets/swagger-ui/swagger-ui-standalone-preset.js diff --git a/public/assets/swagger-ui/swagger-ui-standalone-preset.js.map b/public/vendor/assets/swagger-ui/swagger-ui-standalone-preset.js.map similarity index 100% rename from public/assets/swagger-ui/swagger-ui-standalone-preset.js.map rename to public/vendor/assets/swagger-ui/swagger-ui-standalone-preset.js.map diff --git a/public/assets/swagger-ui/swagger-ui.css b/public/vendor/assets/swagger-ui/swagger-ui.css similarity index 100% rename from public/assets/swagger-ui/swagger-ui.css rename to public/vendor/assets/swagger-ui/swagger-ui.css diff --git a/public/assets/swagger-ui/swagger-ui.css.map b/public/vendor/assets/swagger-ui/swagger-ui.css.map similarity index 100% rename from public/assets/swagger-ui/swagger-ui.css.map rename to public/vendor/assets/swagger-ui/swagger-ui.css.map diff --git a/public/assets/swagger-ui/swagger-ui.js b/public/vendor/assets/swagger-ui/swagger-ui.js similarity index 100% rename from public/assets/swagger-ui/swagger-ui.js rename to public/vendor/assets/swagger-ui/swagger-ui.js diff --git a/public/assets/swagger-ui/swagger-ui.js.map b/public/vendor/assets/swagger-ui/swagger-ui.js.map similarity index 100% rename from public/assets/swagger-ui/swagger-ui.js.map rename to public/vendor/assets/swagger-ui/swagger-ui.js.map diff --git a/public/vendor/librejs.html b/public/vendor/librejs.html new file mode 100644 index 000000000000..68586064c645 --- /dev/null +++ b/public/vendor/librejs.html @@ -0,0 +1,136 @@ + + + + + JavaScript and plugin license information + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ScriptLicenseSource
jquery.are-you-sure.jsExpatjquery.areyousure-1.9.0.tar.gz
jquery.min.jsExpatjquery-1.11.3.min.js
semantic.min.jsExpatsemantic-UI-2.2.1.tar.gz
index.jsExpatindex.js
draw.jsExpatdraw.js
clipboard.min.jsExpatclipboard-1.5.9.tar.gz
gitgraph.jsBSD 3-Clausegitgraph.js-latest
autolink.min.jsExpatautolink.js-latest
vue.min.jsExpatvue.js-v2.1.10.tar.gz
emojify.min.jsExpatemojify-1.1.0.tar.gz
loadCSS.min.jsExpatloadCSS-1.3.1.tar.gz
cssrelpreload.min.jsExpatloadCSS-1.3.1.tar.gz
dropzone.jsExpatdropzone.js-4.2.0.tar.gz
highlight.pack.jsBSD 3-Clausehighlight.js-9.6.0.tar.gz
jquery.datetimepicker.jsExpatjquery.datetimepicker-2.4.5.tar.gz
jquery.minicolors.min.jsExpatjquery.minicolors-2.2.3.tar.gz
loadmode.jsExpatcodemirror-5.17.0.tar.gz
meta.jsExpatcodemirror-5.17.0.tar.gz
simplemde.min.jsExpatsimplemde-markdown-editor-1.10.1.tar.gz
pdf.jsApache-2.0-onlypdf.js-v1.4.20.tar.gz
font-awesome - fontsOFLfont-awesome-4.6.0.zip
font-awesome - codeExpatfont-awesome-4.6.0.zip
octiconsExpatocticons-v4.3.0.tar.gz
swagger-uiApache-2.0swagger-ui-v3.0.4.tar.gz
+ + diff --git a/public/vendor/plugins/autolink/LICENSE b/public/vendor/plugins/autolink/LICENSE new file mode 100644 index 000000000000..bb35e8b86d9d --- /dev/null +++ b/public/vendor/plugins/autolink/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2015 egoist 0x142857@gmail.com + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file diff --git a/public/js/libs/autolink.js b/public/vendor/plugins/autolink/autolink.js similarity index 95% rename from public/js/libs/autolink.js rename to public/vendor/plugins/autolink/autolink.js index 039cd7db245e..2993954ab63b 100644 --- a/public/js/libs/autolink.js +++ b/public/vendor/plugins/autolink/autolink.js @@ -26,7 +26,7 @@ re.lastIndex = 0; var results = re.exec(node.textContent); if(results !== null) { - if($(node).parents().filter('pre>code').length === 0) { + if($(node).parents().filter('code').length === 0) { $(node).replaceWith( $('').html( node.nodeValue.replace(re, '$1') diff --git a/public/vendor/plugins/clipboard/LICENSE b/public/vendor/plugins/clipboard/LICENSE new file mode 100644 index 000000000000..0374ebc83922 --- /dev/null +++ b/public/vendor/plugins/clipboard/LICENSE @@ -0,0 +1,18 @@ +The MIT License + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the 'Software'), to deal in the +Software without restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the +Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/public/js/libs/clipboard-1.5.9.min.js b/public/vendor/plugins/clipboard/clipboard.min.js similarity index 100% rename from public/js/libs/clipboard-1.5.9.min.js rename to public/vendor/plugins/clipboard/clipboard.min.js diff --git a/public/plugins/codemirror-5.17.0/.gitattributes b/public/vendor/plugins/codemirror/.gitattributes similarity index 100% rename from public/plugins/codemirror-5.17.0/.gitattributes rename to public/vendor/plugins/codemirror/.gitattributes diff --git a/public/plugins/codemirror-5.17.0/.gitignore b/public/vendor/plugins/codemirror/.gitignore similarity index 100% rename from public/plugins/codemirror-5.17.0/.gitignore rename to public/vendor/plugins/codemirror/.gitignore diff --git a/public/plugins/codemirror-5.17.0/.npmignore b/public/vendor/plugins/codemirror/.npmignore similarity index 100% rename from public/plugins/codemirror-5.17.0/.npmignore rename to public/vendor/plugins/codemirror/.npmignore diff --git a/public/plugins/codemirror-5.17.0/.travis.yml b/public/vendor/plugins/codemirror/.travis.yml similarity index 100% rename from public/plugins/codemirror-5.17.0/.travis.yml rename to public/vendor/plugins/codemirror/.travis.yml diff --git a/public/vendor/plugins/codemirror/LICENSE b/public/vendor/plugins/codemirror/LICENSE new file mode 100644 index 000000000000..ff7db4b99f55 --- /dev/null +++ b/public/vendor/plugins/codemirror/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (C) 2017 by Marijn Haverbeke and others + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/public/plugins/codemirror-5.17.0/addon/mode/loadmode.js b/public/vendor/plugins/codemirror/addon/mode/loadmode.js similarity index 100% rename from public/plugins/codemirror-5.17.0/addon/mode/loadmode.js rename to public/vendor/plugins/codemirror/addon/mode/loadmode.js diff --git a/public/plugins/codemirror-5.17.0/addon/mode/multiplex.js b/public/vendor/plugins/codemirror/addon/mode/multiplex.js similarity index 100% rename from public/plugins/codemirror-5.17.0/addon/mode/multiplex.js rename to public/vendor/plugins/codemirror/addon/mode/multiplex.js diff --git a/public/plugins/codemirror-5.17.0/addon/mode/multiplex_test.js b/public/vendor/plugins/codemirror/addon/mode/multiplex_test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/addon/mode/multiplex_test.js rename to public/vendor/plugins/codemirror/addon/mode/multiplex_test.js diff --git a/public/plugins/codemirror-5.17.0/addon/mode/overlay.js b/public/vendor/plugins/codemirror/addon/mode/overlay.js similarity index 100% rename from public/plugins/codemirror-5.17.0/addon/mode/overlay.js rename to public/vendor/plugins/codemirror/addon/mode/overlay.js diff --git a/public/plugins/codemirror-5.17.0/addon/mode/simple.js b/public/vendor/plugins/codemirror/addon/mode/simple.js similarity index 100% rename from public/plugins/codemirror-5.17.0/addon/mode/simple.js rename to public/vendor/plugins/codemirror/addon/mode/simple.js diff --git a/public/plugins/codemirror-5.17.0/mode/apl/apl.js b/public/vendor/plugins/codemirror/mode/apl/apl.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/apl/apl.js rename to public/vendor/plugins/codemirror/mode/apl/apl.js diff --git a/public/plugins/codemirror-5.17.0/mode/apl/index.html b/public/vendor/plugins/codemirror/mode/apl/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/apl/index.html rename to public/vendor/plugins/codemirror/mode/apl/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/asciiarmor/asciiarmor.js b/public/vendor/plugins/codemirror/mode/asciiarmor/asciiarmor.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/asciiarmor/asciiarmor.js rename to public/vendor/plugins/codemirror/mode/asciiarmor/asciiarmor.js diff --git a/public/plugins/codemirror-5.17.0/mode/asciiarmor/index.html b/public/vendor/plugins/codemirror/mode/asciiarmor/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/asciiarmor/index.html rename to public/vendor/plugins/codemirror/mode/asciiarmor/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/asn.1/asn.1.js b/public/vendor/plugins/codemirror/mode/asn.1/asn.1.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/asn.1/asn.1.js rename to public/vendor/plugins/codemirror/mode/asn.1/asn.1.js diff --git a/public/plugins/codemirror-5.17.0/mode/asn.1/index.html b/public/vendor/plugins/codemirror/mode/asn.1/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/asn.1/index.html rename to public/vendor/plugins/codemirror/mode/asn.1/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/asterisk/asterisk.js b/public/vendor/plugins/codemirror/mode/asterisk/asterisk.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/asterisk/asterisk.js rename to public/vendor/plugins/codemirror/mode/asterisk/asterisk.js diff --git a/public/plugins/codemirror-5.17.0/mode/asterisk/index.html b/public/vendor/plugins/codemirror/mode/asterisk/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/asterisk/index.html rename to public/vendor/plugins/codemirror/mode/asterisk/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/brainfuck/brainfuck.js b/public/vendor/plugins/codemirror/mode/brainfuck/brainfuck.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/brainfuck/brainfuck.js rename to public/vendor/plugins/codemirror/mode/brainfuck/brainfuck.js diff --git a/public/plugins/codemirror-5.17.0/mode/brainfuck/index.html b/public/vendor/plugins/codemirror/mode/brainfuck/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/brainfuck/index.html rename to public/vendor/plugins/codemirror/mode/brainfuck/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/clike/clike.js b/public/vendor/plugins/codemirror/mode/clike/clike.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/clike/clike.js rename to public/vendor/plugins/codemirror/mode/clike/clike.js diff --git a/public/plugins/codemirror-5.17.0/mode/clike/index.html b/public/vendor/plugins/codemirror/mode/clike/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/clike/index.html rename to public/vendor/plugins/codemirror/mode/clike/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/clike/scala.html b/public/vendor/plugins/codemirror/mode/clike/scala.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/clike/scala.html rename to public/vendor/plugins/codemirror/mode/clike/scala.html diff --git a/public/plugins/codemirror-5.17.0/mode/clike/test.js b/public/vendor/plugins/codemirror/mode/clike/test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/clike/test.js rename to public/vendor/plugins/codemirror/mode/clike/test.js diff --git a/public/plugins/codemirror-5.17.0/mode/clojure/clojure.js b/public/vendor/plugins/codemirror/mode/clojure/clojure.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/clojure/clojure.js rename to public/vendor/plugins/codemirror/mode/clojure/clojure.js diff --git a/public/plugins/codemirror-5.17.0/mode/clojure/index.html b/public/vendor/plugins/codemirror/mode/clojure/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/clojure/index.html rename to public/vendor/plugins/codemirror/mode/clojure/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/cmake/cmake.js b/public/vendor/plugins/codemirror/mode/cmake/cmake.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/cmake/cmake.js rename to public/vendor/plugins/codemirror/mode/cmake/cmake.js diff --git a/public/plugins/codemirror-5.17.0/mode/cmake/index.html b/public/vendor/plugins/codemirror/mode/cmake/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/cmake/index.html rename to public/vendor/plugins/codemirror/mode/cmake/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/cobol/cobol.js b/public/vendor/plugins/codemirror/mode/cobol/cobol.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/cobol/cobol.js rename to public/vendor/plugins/codemirror/mode/cobol/cobol.js diff --git a/public/plugins/codemirror-5.17.0/mode/cobol/index.html b/public/vendor/plugins/codemirror/mode/cobol/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/cobol/index.html rename to public/vendor/plugins/codemirror/mode/cobol/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/coffeescript/coffeescript.js b/public/vendor/plugins/codemirror/mode/coffeescript/coffeescript.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/coffeescript/coffeescript.js rename to public/vendor/plugins/codemirror/mode/coffeescript/coffeescript.js diff --git a/public/plugins/codemirror-5.17.0/mode/coffeescript/index.html b/public/vendor/plugins/codemirror/mode/coffeescript/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/coffeescript/index.html rename to public/vendor/plugins/codemirror/mode/coffeescript/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/commonlisp/commonlisp.js b/public/vendor/plugins/codemirror/mode/commonlisp/commonlisp.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/commonlisp/commonlisp.js rename to public/vendor/plugins/codemirror/mode/commonlisp/commonlisp.js diff --git a/public/plugins/codemirror-5.17.0/mode/commonlisp/index.html b/public/vendor/plugins/codemirror/mode/commonlisp/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/commonlisp/index.html rename to public/vendor/plugins/codemirror/mode/commonlisp/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/crystal/crystal.js b/public/vendor/plugins/codemirror/mode/crystal/crystal.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/crystal/crystal.js rename to public/vendor/plugins/codemirror/mode/crystal/crystal.js diff --git a/public/plugins/codemirror-5.17.0/mode/crystal/index.html b/public/vendor/plugins/codemirror/mode/crystal/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/crystal/index.html rename to public/vendor/plugins/codemirror/mode/crystal/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/css/css.js b/public/vendor/plugins/codemirror/mode/css/css.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/css/css.js rename to public/vendor/plugins/codemirror/mode/css/css.js diff --git a/public/plugins/codemirror-5.17.0/mode/css/gss.html b/public/vendor/plugins/codemirror/mode/css/gss.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/css/gss.html rename to public/vendor/plugins/codemirror/mode/css/gss.html diff --git a/public/plugins/codemirror-5.17.0/mode/css/gss_test.js b/public/vendor/plugins/codemirror/mode/css/gss_test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/css/gss_test.js rename to public/vendor/plugins/codemirror/mode/css/gss_test.js diff --git a/public/plugins/codemirror-5.17.0/mode/css/index.html b/public/vendor/plugins/codemirror/mode/css/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/css/index.html rename to public/vendor/plugins/codemirror/mode/css/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/css/less.html b/public/vendor/plugins/codemirror/mode/css/less.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/css/less.html rename to public/vendor/plugins/codemirror/mode/css/less.html diff --git a/public/plugins/codemirror-5.17.0/mode/css/less_test.js b/public/vendor/plugins/codemirror/mode/css/less_test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/css/less_test.js rename to public/vendor/plugins/codemirror/mode/css/less_test.js diff --git a/public/plugins/codemirror-5.17.0/mode/css/scss.html b/public/vendor/plugins/codemirror/mode/css/scss.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/css/scss.html rename to public/vendor/plugins/codemirror/mode/css/scss.html diff --git a/public/plugins/codemirror-5.17.0/mode/css/scss_test.js b/public/vendor/plugins/codemirror/mode/css/scss_test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/css/scss_test.js rename to public/vendor/plugins/codemirror/mode/css/scss_test.js diff --git a/public/plugins/codemirror-5.17.0/mode/css/test.js b/public/vendor/plugins/codemirror/mode/css/test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/css/test.js rename to public/vendor/plugins/codemirror/mode/css/test.js diff --git a/public/plugins/codemirror-5.17.0/mode/cypher/cypher.js b/public/vendor/plugins/codemirror/mode/cypher/cypher.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/cypher/cypher.js rename to public/vendor/plugins/codemirror/mode/cypher/cypher.js diff --git a/public/plugins/codemirror-5.17.0/mode/cypher/index.html b/public/vendor/plugins/codemirror/mode/cypher/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/cypher/index.html rename to public/vendor/plugins/codemirror/mode/cypher/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/d/d.js b/public/vendor/plugins/codemirror/mode/d/d.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/d/d.js rename to public/vendor/plugins/codemirror/mode/d/d.js diff --git a/public/plugins/codemirror-5.17.0/mode/d/index.html b/public/vendor/plugins/codemirror/mode/d/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/d/index.html rename to public/vendor/plugins/codemirror/mode/d/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/dart/dart.js b/public/vendor/plugins/codemirror/mode/dart/dart.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/dart/dart.js rename to public/vendor/plugins/codemirror/mode/dart/dart.js diff --git a/public/plugins/codemirror-5.17.0/mode/dart/index.html b/public/vendor/plugins/codemirror/mode/dart/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/dart/index.html rename to public/vendor/plugins/codemirror/mode/dart/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/diff/diff.js b/public/vendor/plugins/codemirror/mode/diff/diff.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/diff/diff.js rename to public/vendor/plugins/codemirror/mode/diff/diff.js diff --git a/public/plugins/codemirror-5.17.0/mode/diff/index.html b/public/vendor/plugins/codemirror/mode/diff/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/diff/index.html rename to public/vendor/plugins/codemirror/mode/diff/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/django/django.js b/public/vendor/plugins/codemirror/mode/django/django.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/django/django.js rename to public/vendor/plugins/codemirror/mode/django/django.js diff --git a/public/plugins/codemirror-5.17.0/mode/django/index.html b/public/vendor/plugins/codemirror/mode/django/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/django/index.html rename to public/vendor/plugins/codemirror/mode/django/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/dockerfile/dockerfile.js b/public/vendor/plugins/codemirror/mode/dockerfile/dockerfile.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/dockerfile/dockerfile.js rename to public/vendor/plugins/codemirror/mode/dockerfile/dockerfile.js diff --git a/public/plugins/codemirror-5.17.0/mode/dockerfile/index.html b/public/vendor/plugins/codemirror/mode/dockerfile/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/dockerfile/index.html rename to public/vendor/plugins/codemirror/mode/dockerfile/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/dtd/dtd.js b/public/vendor/plugins/codemirror/mode/dtd/dtd.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/dtd/dtd.js rename to public/vendor/plugins/codemirror/mode/dtd/dtd.js diff --git a/public/plugins/codemirror-5.17.0/mode/dtd/index.html b/public/vendor/plugins/codemirror/mode/dtd/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/dtd/index.html rename to public/vendor/plugins/codemirror/mode/dtd/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/dylan/dylan.js b/public/vendor/plugins/codemirror/mode/dylan/dylan.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/dylan/dylan.js rename to public/vendor/plugins/codemirror/mode/dylan/dylan.js diff --git a/public/plugins/codemirror-5.17.0/mode/dylan/index.html b/public/vendor/plugins/codemirror/mode/dylan/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/dylan/index.html rename to public/vendor/plugins/codemirror/mode/dylan/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/dylan/test.js b/public/vendor/plugins/codemirror/mode/dylan/test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/dylan/test.js rename to public/vendor/plugins/codemirror/mode/dylan/test.js diff --git a/public/plugins/codemirror-5.17.0/mode/ebnf/ebnf.js b/public/vendor/plugins/codemirror/mode/ebnf/ebnf.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/ebnf/ebnf.js rename to public/vendor/plugins/codemirror/mode/ebnf/ebnf.js diff --git a/public/plugins/codemirror-5.17.0/mode/ebnf/index.html b/public/vendor/plugins/codemirror/mode/ebnf/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/ebnf/index.html rename to public/vendor/plugins/codemirror/mode/ebnf/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/ecl/ecl.js b/public/vendor/plugins/codemirror/mode/ecl/ecl.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/ecl/ecl.js rename to public/vendor/plugins/codemirror/mode/ecl/ecl.js diff --git a/public/plugins/codemirror-5.17.0/mode/ecl/index.html b/public/vendor/plugins/codemirror/mode/ecl/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/ecl/index.html rename to public/vendor/plugins/codemirror/mode/ecl/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/eiffel/eiffel.js b/public/vendor/plugins/codemirror/mode/eiffel/eiffel.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/eiffel/eiffel.js rename to public/vendor/plugins/codemirror/mode/eiffel/eiffel.js diff --git a/public/plugins/codemirror-5.17.0/mode/eiffel/index.html b/public/vendor/plugins/codemirror/mode/eiffel/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/eiffel/index.html rename to public/vendor/plugins/codemirror/mode/eiffel/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/elm/elm.js b/public/vendor/plugins/codemirror/mode/elm/elm.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/elm/elm.js rename to public/vendor/plugins/codemirror/mode/elm/elm.js diff --git a/public/plugins/codemirror-5.17.0/mode/elm/index.html b/public/vendor/plugins/codemirror/mode/elm/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/elm/index.html rename to public/vendor/plugins/codemirror/mode/elm/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/erlang/erlang.js b/public/vendor/plugins/codemirror/mode/erlang/erlang.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/erlang/erlang.js rename to public/vendor/plugins/codemirror/mode/erlang/erlang.js diff --git a/public/plugins/codemirror-5.17.0/mode/erlang/index.html b/public/vendor/plugins/codemirror/mode/erlang/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/erlang/index.html rename to public/vendor/plugins/codemirror/mode/erlang/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/factor/factor.js b/public/vendor/plugins/codemirror/mode/factor/factor.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/factor/factor.js rename to public/vendor/plugins/codemirror/mode/factor/factor.js diff --git a/public/plugins/codemirror-5.17.0/mode/factor/index.html b/public/vendor/plugins/codemirror/mode/factor/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/factor/index.html rename to public/vendor/plugins/codemirror/mode/factor/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/fcl/fcl.js b/public/vendor/plugins/codemirror/mode/fcl/fcl.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/fcl/fcl.js rename to public/vendor/plugins/codemirror/mode/fcl/fcl.js diff --git a/public/plugins/codemirror-5.17.0/mode/fcl/index.html b/public/vendor/plugins/codemirror/mode/fcl/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/fcl/index.html rename to public/vendor/plugins/codemirror/mode/fcl/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/forth/forth.js b/public/vendor/plugins/codemirror/mode/forth/forth.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/forth/forth.js rename to public/vendor/plugins/codemirror/mode/forth/forth.js diff --git a/public/plugins/codemirror-5.17.0/mode/forth/index.html b/public/vendor/plugins/codemirror/mode/forth/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/forth/index.html rename to public/vendor/plugins/codemirror/mode/forth/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/fortran/fortran.js b/public/vendor/plugins/codemirror/mode/fortran/fortran.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/fortran/fortran.js rename to public/vendor/plugins/codemirror/mode/fortran/fortran.js diff --git a/public/plugins/codemirror-5.17.0/mode/fortran/index.html b/public/vendor/plugins/codemirror/mode/fortran/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/fortran/index.html rename to public/vendor/plugins/codemirror/mode/fortran/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/gas/gas.js b/public/vendor/plugins/codemirror/mode/gas/gas.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/gas/gas.js rename to public/vendor/plugins/codemirror/mode/gas/gas.js diff --git a/public/plugins/codemirror-5.17.0/mode/gas/index.html b/public/vendor/plugins/codemirror/mode/gas/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/gas/index.html rename to public/vendor/plugins/codemirror/mode/gas/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/gfm/gfm.js b/public/vendor/plugins/codemirror/mode/gfm/gfm.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/gfm/gfm.js rename to public/vendor/plugins/codemirror/mode/gfm/gfm.js diff --git a/public/plugins/codemirror-5.17.0/mode/gfm/index.html b/public/vendor/plugins/codemirror/mode/gfm/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/gfm/index.html rename to public/vendor/plugins/codemirror/mode/gfm/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/gfm/test.js b/public/vendor/plugins/codemirror/mode/gfm/test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/gfm/test.js rename to public/vendor/plugins/codemirror/mode/gfm/test.js diff --git a/public/plugins/codemirror-5.17.0/mode/gherkin/gherkin.js b/public/vendor/plugins/codemirror/mode/gherkin/gherkin.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/gherkin/gherkin.js rename to public/vendor/plugins/codemirror/mode/gherkin/gherkin.js diff --git a/public/plugins/codemirror-5.17.0/mode/gherkin/index.html b/public/vendor/plugins/codemirror/mode/gherkin/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/gherkin/index.html rename to public/vendor/plugins/codemirror/mode/gherkin/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/go/go.js b/public/vendor/plugins/codemirror/mode/go/go.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/go/go.js rename to public/vendor/plugins/codemirror/mode/go/go.js diff --git a/public/plugins/codemirror-5.17.0/mode/go/index.html b/public/vendor/plugins/codemirror/mode/go/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/go/index.html rename to public/vendor/plugins/codemirror/mode/go/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/groovy/groovy.js b/public/vendor/plugins/codemirror/mode/groovy/groovy.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/groovy/groovy.js rename to public/vendor/plugins/codemirror/mode/groovy/groovy.js diff --git a/public/plugins/codemirror-5.17.0/mode/groovy/index.html b/public/vendor/plugins/codemirror/mode/groovy/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/groovy/index.html rename to public/vendor/plugins/codemirror/mode/groovy/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/haml/haml.js b/public/vendor/plugins/codemirror/mode/haml/haml.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/haml/haml.js rename to public/vendor/plugins/codemirror/mode/haml/haml.js diff --git a/public/plugins/codemirror-5.17.0/mode/haml/index.html b/public/vendor/plugins/codemirror/mode/haml/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/haml/index.html rename to public/vendor/plugins/codemirror/mode/haml/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/haml/test.js b/public/vendor/plugins/codemirror/mode/haml/test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/haml/test.js rename to public/vendor/plugins/codemirror/mode/haml/test.js diff --git a/public/plugins/codemirror-5.17.0/mode/handlebars/handlebars.js b/public/vendor/plugins/codemirror/mode/handlebars/handlebars.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/handlebars/handlebars.js rename to public/vendor/plugins/codemirror/mode/handlebars/handlebars.js diff --git a/public/plugins/codemirror-5.17.0/mode/handlebars/index.html b/public/vendor/plugins/codemirror/mode/handlebars/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/handlebars/index.html rename to public/vendor/plugins/codemirror/mode/handlebars/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/haskell-literate/haskell-literate.js b/public/vendor/plugins/codemirror/mode/haskell-literate/haskell-literate.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/haskell-literate/haskell-literate.js rename to public/vendor/plugins/codemirror/mode/haskell-literate/haskell-literate.js diff --git a/public/plugins/codemirror-5.17.0/mode/haskell-literate/index.html b/public/vendor/plugins/codemirror/mode/haskell-literate/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/haskell-literate/index.html rename to public/vendor/plugins/codemirror/mode/haskell-literate/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/haskell/haskell.js b/public/vendor/plugins/codemirror/mode/haskell/haskell.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/haskell/haskell.js rename to public/vendor/plugins/codemirror/mode/haskell/haskell.js diff --git a/public/plugins/codemirror-5.17.0/mode/haskell/index.html b/public/vendor/plugins/codemirror/mode/haskell/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/haskell/index.html rename to public/vendor/plugins/codemirror/mode/haskell/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/haxe/haxe.js b/public/vendor/plugins/codemirror/mode/haxe/haxe.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/haxe/haxe.js rename to public/vendor/plugins/codemirror/mode/haxe/haxe.js diff --git a/public/plugins/codemirror-5.17.0/mode/haxe/index.html b/public/vendor/plugins/codemirror/mode/haxe/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/haxe/index.html rename to public/vendor/plugins/codemirror/mode/haxe/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/htmlembedded/htmlembedded.js b/public/vendor/plugins/codemirror/mode/htmlembedded/htmlembedded.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/htmlembedded/htmlembedded.js rename to public/vendor/plugins/codemirror/mode/htmlembedded/htmlembedded.js diff --git a/public/plugins/codemirror-5.17.0/mode/htmlembedded/index.html b/public/vendor/plugins/codemirror/mode/htmlembedded/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/htmlembedded/index.html rename to public/vendor/plugins/codemirror/mode/htmlembedded/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/htmlmixed/htmlmixed.js b/public/vendor/plugins/codemirror/mode/htmlmixed/htmlmixed.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/htmlmixed/htmlmixed.js rename to public/vendor/plugins/codemirror/mode/htmlmixed/htmlmixed.js diff --git a/public/plugins/codemirror-5.17.0/mode/htmlmixed/index.html b/public/vendor/plugins/codemirror/mode/htmlmixed/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/htmlmixed/index.html rename to public/vendor/plugins/codemirror/mode/htmlmixed/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/http/http.js b/public/vendor/plugins/codemirror/mode/http/http.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/http/http.js rename to public/vendor/plugins/codemirror/mode/http/http.js diff --git a/public/plugins/codemirror-5.17.0/mode/http/index.html b/public/vendor/plugins/codemirror/mode/http/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/http/index.html rename to public/vendor/plugins/codemirror/mode/http/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/idl/idl.js b/public/vendor/plugins/codemirror/mode/idl/idl.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/idl/idl.js rename to public/vendor/plugins/codemirror/mode/idl/idl.js diff --git a/public/plugins/codemirror-5.17.0/mode/idl/index.html b/public/vendor/plugins/codemirror/mode/idl/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/idl/index.html rename to public/vendor/plugins/codemirror/mode/idl/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/index.html b/public/vendor/plugins/codemirror/mode/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/index.html rename to public/vendor/plugins/codemirror/mode/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/jade/index.html b/public/vendor/plugins/codemirror/mode/jade/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/jade/index.html rename to public/vendor/plugins/codemirror/mode/jade/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/jade/jade.js b/public/vendor/plugins/codemirror/mode/jade/jade.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/jade/jade.js rename to public/vendor/plugins/codemirror/mode/jade/jade.js diff --git a/public/plugins/codemirror-5.17.0/mode/javascript/index.html b/public/vendor/plugins/codemirror/mode/javascript/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/javascript/index.html rename to public/vendor/plugins/codemirror/mode/javascript/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/javascript/javascript.js b/public/vendor/plugins/codemirror/mode/javascript/javascript.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/javascript/javascript.js rename to public/vendor/plugins/codemirror/mode/javascript/javascript.js diff --git a/public/plugins/codemirror-5.17.0/mode/javascript/json-ld.html b/public/vendor/plugins/codemirror/mode/javascript/json-ld.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/javascript/json-ld.html rename to public/vendor/plugins/codemirror/mode/javascript/json-ld.html diff --git a/public/plugins/codemirror-5.17.0/mode/javascript/test.js b/public/vendor/plugins/codemirror/mode/javascript/test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/javascript/test.js rename to public/vendor/plugins/codemirror/mode/javascript/test.js diff --git a/public/plugins/codemirror-5.17.0/mode/javascript/typescript.html b/public/vendor/plugins/codemirror/mode/javascript/typescript.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/javascript/typescript.html rename to public/vendor/plugins/codemirror/mode/javascript/typescript.html diff --git a/public/plugins/codemirror-5.17.0/mode/jinja2/index.html b/public/vendor/plugins/codemirror/mode/jinja2/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/jinja2/index.html rename to public/vendor/plugins/codemirror/mode/jinja2/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/jinja2/jinja2.js b/public/vendor/plugins/codemirror/mode/jinja2/jinja2.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/jinja2/jinja2.js rename to public/vendor/plugins/codemirror/mode/jinja2/jinja2.js diff --git a/public/plugins/codemirror-5.17.0/mode/jsx/index.html b/public/vendor/plugins/codemirror/mode/jsx/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/jsx/index.html rename to public/vendor/plugins/codemirror/mode/jsx/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/jsx/jsx.js b/public/vendor/plugins/codemirror/mode/jsx/jsx.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/jsx/jsx.js rename to public/vendor/plugins/codemirror/mode/jsx/jsx.js diff --git a/public/plugins/codemirror-5.17.0/mode/jsx/test.js b/public/vendor/plugins/codemirror/mode/jsx/test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/jsx/test.js rename to public/vendor/plugins/codemirror/mode/jsx/test.js diff --git a/public/plugins/codemirror-5.17.0/mode/julia/index.html b/public/vendor/plugins/codemirror/mode/julia/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/julia/index.html rename to public/vendor/plugins/codemirror/mode/julia/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/julia/julia.js b/public/vendor/plugins/codemirror/mode/julia/julia.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/julia/julia.js rename to public/vendor/plugins/codemirror/mode/julia/julia.js diff --git a/public/plugins/codemirror-5.17.0/mode/livescript/index.html b/public/vendor/plugins/codemirror/mode/livescript/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/livescript/index.html rename to public/vendor/plugins/codemirror/mode/livescript/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/livescript/livescript.js b/public/vendor/plugins/codemirror/mode/livescript/livescript.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/livescript/livescript.js rename to public/vendor/plugins/codemirror/mode/livescript/livescript.js diff --git a/public/plugins/codemirror-5.17.0/mode/lua/index.html b/public/vendor/plugins/codemirror/mode/lua/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/lua/index.html rename to public/vendor/plugins/codemirror/mode/lua/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/lua/lua.js b/public/vendor/plugins/codemirror/mode/lua/lua.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/lua/lua.js rename to public/vendor/plugins/codemirror/mode/lua/lua.js diff --git a/public/plugins/codemirror-5.17.0/mode/markdown/index.html b/public/vendor/plugins/codemirror/mode/markdown/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/markdown/index.html rename to public/vendor/plugins/codemirror/mode/markdown/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/markdown/markdown.js b/public/vendor/plugins/codemirror/mode/markdown/markdown.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/markdown/markdown.js rename to public/vendor/plugins/codemirror/mode/markdown/markdown.js diff --git a/public/plugins/codemirror-5.17.0/mode/markdown/test.js b/public/vendor/plugins/codemirror/mode/markdown/test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/markdown/test.js rename to public/vendor/plugins/codemirror/mode/markdown/test.js diff --git a/public/plugins/codemirror-5.17.0/mode/mathematica/index.html b/public/vendor/plugins/codemirror/mode/mathematica/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/mathematica/index.html rename to public/vendor/plugins/codemirror/mode/mathematica/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/mathematica/mathematica.js b/public/vendor/plugins/codemirror/mode/mathematica/mathematica.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/mathematica/mathematica.js rename to public/vendor/plugins/codemirror/mode/mathematica/mathematica.js diff --git a/public/plugins/codemirror-5.17.0/mode/mbox/index.html b/public/vendor/plugins/codemirror/mode/mbox/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/mbox/index.html rename to public/vendor/plugins/codemirror/mode/mbox/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/mbox/mbox.js b/public/vendor/plugins/codemirror/mode/mbox/mbox.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/mbox/mbox.js rename to public/vendor/plugins/codemirror/mode/mbox/mbox.js diff --git a/public/plugins/codemirror-5.17.0/mode/meta.js b/public/vendor/plugins/codemirror/mode/meta.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/meta.js rename to public/vendor/plugins/codemirror/mode/meta.js diff --git a/public/plugins/codemirror-5.17.0/mode/mirc/index.html b/public/vendor/plugins/codemirror/mode/mirc/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/mirc/index.html rename to public/vendor/plugins/codemirror/mode/mirc/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/mirc/mirc.js b/public/vendor/plugins/codemirror/mode/mirc/mirc.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/mirc/mirc.js rename to public/vendor/plugins/codemirror/mode/mirc/mirc.js diff --git a/public/plugins/codemirror-5.17.0/mode/mllike/index.html b/public/vendor/plugins/codemirror/mode/mllike/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/mllike/index.html rename to public/vendor/plugins/codemirror/mode/mllike/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/mllike/mllike.js b/public/vendor/plugins/codemirror/mode/mllike/mllike.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/mllike/mllike.js rename to public/vendor/plugins/codemirror/mode/mllike/mllike.js diff --git a/public/plugins/codemirror-5.17.0/mode/modelica/index.html b/public/vendor/plugins/codemirror/mode/modelica/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/modelica/index.html rename to public/vendor/plugins/codemirror/mode/modelica/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/modelica/modelica.js b/public/vendor/plugins/codemirror/mode/modelica/modelica.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/modelica/modelica.js rename to public/vendor/plugins/codemirror/mode/modelica/modelica.js diff --git a/public/plugins/codemirror-5.17.0/mode/mscgen/index.html b/public/vendor/plugins/codemirror/mode/mscgen/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/mscgen/index.html rename to public/vendor/plugins/codemirror/mode/mscgen/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/mscgen/mscgen.js b/public/vendor/plugins/codemirror/mode/mscgen/mscgen.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/mscgen/mscgen.js rename to public/vendor/plugins/codemirror/mode/mscgen/mscgen.js diff --git a/public/plugins/codemirror-5.17.0/mode/mscgen/mscgen_test.js b/public/vendor/plugins/codemirror/mode/mscgen/mscgen_test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/mscgen/mscgen_test.js rename to public/vendor/plugins/codemirror/mode/mscgen/mscgen_test.js diff --git a/public/plugins/codemirror-5.17.0/mode/mscgen/msgenny_test.js b/public/vendor/plugins/codemirror/mode/mscgen/msgenny_test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/mscgen/msgenny_test.js rename to public/vendor/plugins/codemirror/mode/mscgen/msgenny_test.js diff --git a/public/plugins/codemirror-5.17.0/mode/mscgen/xu_test.js b/public/vendor/plugins/codemirror/mode/mscgen/xu_test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/mscgen/xu_test.js rename to public/vendor/plugins/codemirror/mode/mscgen/xu_test.js diff --git a/public/plugins/codemirror-5.17.0/mode/mumps/index.html b/public/vendor/plugins/codemirror/mode/mumps/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/mumps/index.html rename to public/vendor/plugins/codemirror/mode/mumps/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/mumps/mumps.js b/public/vendor/plugins/codemirror/mode/mumps/mumps.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/mumps/mumps.js rename to public/vendor/plugins/codemirror/mode/mumps/mumps.js diff --git a/public/plugins/codemirror-5.17.0/mode/nginx/index.html b/public/vendor/plugins/codemirror/mode/nginx/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/nginx/index.html rename to public/vendor/plugins/codemirror/mode/nginx/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/nginx/nginx.js b/public/vendor/plugins/codemirror/mode/nginx/nginx.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/nginx/nginx.js rename to public/vendor/plugins/codemirror/mode/nginx/nginx.js diff --git a/public/plugins/codemirror-5.17.0/mode/nsis/index.html b/public/vendor/plugins/codemirror/mode/nsis/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/nsis/index.html rename to public/vendor/plugins/codemirror/mode/nsis/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/nsis/nsis.js b/public/vendor/plugins/codemirror/mode/nsis/nsis.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/nsis/nsis.js rename to public/vendor/plugins/codemirror/mode/nsis/nsis.js diff --git a/public/plugins/codemirror-5.17.0/mode/ntriples/index.html b/public/vendor/plugins/codemirror/mode/ntriples/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/ntriples/index.html rename to public/vendor/plugins/codemirror/mode/ntriples/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/ntriples/ntriples.js b/public/vendor/plugins/codemirror/mode/ntriples/ntriples.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/ntriples/ntriples.js rename to public/vendor/plugins/codemirror/mode/ntriples/ntriples.js diff --git a/public/plugins/codemirror-5.17.0/mode/octave/index.html b/public/vendor/plugins/codemirror/mode/octave/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/octave/index.html rename to public/vendor/plugins/codemirror/mode/octave/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/octave/octave.js b/public/vendor/plugins/codemirror/mode/octave/octave.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/octave/octave.js rename to public/vendor/plugins/codemirror/mode/octave/octave.js diff --git a/public/plugins/codemirror-5.17.0/mode/oz/index.html b/public/vendor/plugins/codemirror/mode/oz/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/oz/index.html rename to public/vendor/plugins/codemirror/mode/oz/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/oz/oz.js b/public/vendor/plugins/codemirror/mode/oz/oz.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/oz/oz.js rename to public/vendor/plugins/codemirror/mode/oz/oz.js diff --git a/public/plugins/codemirror-5.17.0/mode/pascal/index.html b/public/vendor/plugins/codemirror/mode/pascal/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/pascal/index.html rename to public/vendor/plugins/codemirror/mode/pascal/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/pascal/pascal.js b/public/vendor/plugins/codemirror/mode/pascal/pascal.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/pascal/pascal.js rename to public/vendor/plugins/codemirror/mode/pascal/pascal.js diff --git a/public/plugins/codemirror-5.17.0/mode/pegjs/index.html b/public/vendor/plugins/codemirror/mode/pegjs/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/pegjs/index.html rename to public/vendor/plugins/codemirror/mode/pegjs/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/pegjs/pegjs.js b/public/vendor/plugins/codemirror/mode/pegjs/pegjs.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/pegjs/pegjs.js rename to public/vendor/plugins/codemirror/mode/pegjs/pegjs.js diff --git a/public/plugins/codemirror-5.17.0/mode/perl/index.html b/public/vendor/plugins/codemirror/mode/perl/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/perl/index.html rename to public/vendor/plugins/codemirror/mode/perl/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/perl/perl.js b/public/vendor/plugins/codemirror/mode/perl/perl.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/perl/perl.js rename to public/vendor/plugins/codemirror/mode/perl/perl.js diff --git a/public/plugins/codemirror-5.17.0/mode/php/index.html b/public/vendor/plugins/codemirror/mode/php/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/php/index.html rename to public/vendor/plugins/codemirror/mode/php/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/php/php.js b/public/vendor/plugins/codemirror/mode/php/php.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/php/php.js rename to public/vendor/plugins/codemirror/mode/php/php.js diff --git a/public/plugins/codemirror-5.17.0/mode/php/test.js b/public/vendor/plugins/codemirror/mode/php/test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/php/test.js rename to public/vendor/plugins/codemirror/mode/php/test.js diff --git a/public/plugins/codemirror-5.17.0/mode/pig/index.html b/public/vendor/plugins/codemirror/mode/pig/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/pig/index.html rename to public/vendor/plugins/codemirror/mode/pig/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/pig/pig.js b/public/vendor/plugins/codemirror/mode/pig/pig.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/pig/pig.js rename to public/vendor/plugins/codemirror/mode/pig/pig.js diff --git a/public/plugins/codemirror-5.17.0/mode/powershell/index.html b/public/vendor/plugins/codemirror/mode/powershell/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/powershell/index.html rename to public/vendor/plugins/codemirror/mode/powershell/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/powershell/powershell.js b/public/vendor/plugins/codemirror/mode/powershell/powershell.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/powershell/powershell.js rename to public/vendor/plugins/codemirror/mode/powershell/powershell.js diff --git a/public/plugins/codemirror-5.17.0/mode/powershell/test.js b/public/vendor/plugins/codemirror/mode/powershell/test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/powershell/test.js rename to public/vendor/plugins/codemirror/mode/powershell/test.js diff --git a/public/plugins/codemirror-5.17.0/mode/properties/index.html b/public/vendor/plugins/codemirror/mode/properties/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/properties/index.html rename to public/vendor/plugins/codemirror/mode/properties/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/properties/properties.js b/public/vendor/plugins/codemirror/mode/properties/properties.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/properties/properties.js rename to public/vendor/plugins/codemirror/mode/properties/properties.js diff --git a/public/plugins/codemirror-5.17.0/mode/protobuf/index.html b/public/vendor/plugins/codemirror/mode/protobuf/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/protobuf/index.html rename to public/vendor/plugins/codemirror/mode/protobuf/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/protobuf/protobuf.js b/public/vendor/plugins/codemirror/mode/protobuf/protobuf.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/protobuf/protobuf.js rename to public/vendor/plugins/codemirror/mode/protobuf/protobuf.js diff --git a/public/plugins/codemirror-5.17.0/mode/puppet/index.html b/public/vendor/plugins/codemirror/mode/puppet/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/puppet/index.html rename to public/vendor/plugins/codemirror/mode/puppet/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/puppet/puppet.js b/public/vendor/plugins/codemirror/mode/puppet/puppet.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/puppet/puppet.js rename to public/vendor/plugins/codemirror/mode/puppet/puppet.js diff --git a/public/plugins/codemirror-5.17.0/mode/python/index.html b/public/vendor/plugins/codemirror/mode/python/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/python/index.html rename to public/vendor/plugins/codemirror/mode/python/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/python/python.js b/public/vendor/plugins/codemirror/mode/python/python.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/python/python.js rename to public/vendor/plugins/codemirror/mode/python/python.js diff --git a/public/plugins/codemirror-5.17.0/mode/python/test.js b/public/vendor/plugins/codemirror/mode/python/test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/python/test.js rename to public/vendor/plugins/codemirror/mode/python/test.js diff --git a/public/plugins/codemirror-5.17.0/mode/q/index.html b/public/vendor/plugins/codemirror/mode/q/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/q/index.html rename to public/vendor/plugins/codemirror/mode/q/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/q/q.js b/public/vendor/plugins/codemirror/mode/q/q.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/q/q.js rename to public/vendor/plugins/codemirror/mode/q/q.js diff --git a/public/plugins/codemirror-5.17.0/mode/r/index.html b/public/vendor/plugins/codemirror/mode/r/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/r/index.html rename to public/vendor/plugins/codemirror/mode/r/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/r/r.js b/public/vendor/plugins/codemirror/mode/r/r.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/r/r.js rename to public/vendor/plugins/codemirror/mode/r/r.js diff --git a/public/plugins/codemirror-5.17.0/mode/rpm/changes/index.html b/public/vendor/plugins/codemirror/mode/rpm/changes/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/rpm/changes/index.html rename to public/vendor/plugins/codemirror/mode/rpm/changes/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/rpm/index.html b/public/vendor/plugins/codemirror/mode/rpm/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/rpm/index.html rename to public/vendor/plugins/codemirror/mode/rpm/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/rpm/rpm.js b/public/vendor/plugins/codemirror/mode/rpm/rpm.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/rpm/rpm.js rename to public/vendor/plugins/codemirror/mode/rpm/rpm.js diff --git a/public/plugins/codemirror-5.17.0/mode/rst/index.html b/public/vendor/plugins/codemirror/mode/rst/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/rst/index.html rename to public/vendor/plugins/codemirror/mode/rst/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/rst/rst.js b/public/vendor/plugins/codemirror/mode/rst/rst.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/rst/rst.js rename to public/vendor/plugins/codemirror/mode/rst/rst.js diff --git a/public/plugins/codemirror-5.17.0/mode/ruby/index.html b/public/vendor/plugins/codemirror/mode/ruby/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/ruby/index.html rename to public/vendor/plugins/codemirror/mode/ruby/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/ruby/ruby.js b/public/vendor/plugins/codemirror/mode/ruby/ruby.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/ruby/ruby.js rename to public/vendor/plugins/codemirror/mode/ruby/ruby.js diff --git a/public/plugins/codemirror-5.17.0/mode/ruby/test.js b/public/vendor/plugins/codemirror/mode/ruby/test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/ruby/test.js rename to public/vendor/plugins/codemirror/mode/ruby/test.js diff --git a/public/plugins/codemirror-5.17.0/mode/rust/index.html b/public/vendor/plugins/codemirror/mode/rust/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/rust/index.html rename to public/vendor/plugins/codemirror/mode/rust/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/rust/rust.js b/public/vendor/plugins/codemirror/mode/rust/rust.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/rust/rust.js rename to public/vendor/plugins/codemirror/mode/rust/rust.js diff --git a/public/plugins/codemirror-5.17.0/mode/rust/test.js b/public/vendor/plugins/codemirror/mode/rust/test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/rust/test.js rename to public/vendor/plugins/codemirror/mode/rust/test.js diff --git a/public/plugins/codemirror-5.17.0/mode/sas/index.html b/public/vendor/plugins/codemirror/mode/sas/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/sas/index.html rename to public/vendor/plugins/codemirror/mode/sas/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/sas/sas.js b/public/vendor/plugins/codemirror/mode/sas/sas.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/sas/sas.js rename to public/vendor/plugins/codemirror/mode/sas/sas.js diff --git a/public/plugins/codemirror-5.17.0/mode/sass/index.html b/public/vendor/plugins/codemirror/mode/sass/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/sass/index.html rename to public/vendor/plugins/codemirror/mode/sass/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/sass/sass.js b/public/vendor/plugins/codemirror/mode/sass/sass.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/sass/sass.js rename to public/vendor/plugins/codemirror/mode/sass/sass.js diff --git a/public/plugins/codemirror-5.17.0/mode/scheme/index.html b/public/vendor/plugins/codemirror/mode/scheme/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/scheme/index.html rename to public/vendor/plugins/codemirror/mode/scheme/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/scheme/scheme.js b/public/vendor/plugins/codemirror/mode/scheme/scheme.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/scheme/scheme.js rename to public/vendor/plugins/codemirror/mode/scheme/scheme.js diff --git a/public/plugins/codemirror-5.17.0/mode/shell/index.html b/public/vendor/plugins/codemirror/mode/shell/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/shell/index.html rename to public/vendor/plugins/codemirror/mode/shell/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/shell/shell.js b/public/vendor/plugins/codemirror/mode/shell/shell.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/shell/shell.js rename to public/vendor/plugins/codemirror/mode/shell/shell.js diff --git a/public/plugins/codemirror-5.17.0/mode/shell/test.js b/public/vendor/plugins/codemirror/mode/shell/test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/shell/test.js rename to public/vendor/plugins/codemirror/mode/shell/test.js diff --git a/public/plugins/codemirror-5.17.0/mode/sieve/index.html b/public/vendor/plugins/codemirror/mode/sieve/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/sieve/index.html rename to public/vendor/plugins/codemirror/mode/sieve/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/sieve/sieve.js b/public/vendor/plugins/codemirror/mode/sieve/sieve.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/sieve/sieve.js rename to public/vendor/plugins/codemirror/mode/sieve/sieve.js diff --git a/public/plugins/codemirror-5.17.0/mode/slim/index.html b/public/vendor/plugins/codemirror/mode/slim/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/slim/index.html rename to public/vendor/plugins/codemirror/mode/slim/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/slim/slim.js b/public/vendor/plugins/codemirror/mode/slim/slim.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/slim/slim.js rename to public/vendor/plugins/codemirror/mode/slim/slim.js diff --git a/public/plugins/codemirror-5.17.0/mode/slim/test.js b/public/vendor/plugins/codemirror/mode/slim/test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/slim/test.js rename to public/vendor/plugins/codemirror/mode/slim/test.js diff --git a/public/plugins/codemirror-5.17.0/mode/smalltalk/index.html b/public/vendor/plugins/codemirror/mode/smalltalk/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/smalltalk/index.html rename to public/vendor/plugins/codemirror/mode/smalltalk/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/smalltalk/smalltalk.js b/public/vendor/plugins/codemirror/mode/smalltalk/smalltalk.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/smalltalk/smalltalk.js rename to public/vendor/plugins/codemirror/mode/smalltalk/smalltalk.js diff --git a/public/plugins/codemirror-5.17.0/mode/smarty/index.html b/public/vendor/plugins/codemirror/mode/smarty/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/smarty/index.html rename to public/vendor/plugins/codemirror/mode/smarty/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/smarty/smarty.js b/public/vendor/plugins/codemirror/mode/smarty/smarty.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/smarty/smarty.js rename to public/vendor/plugins/codemirror/mode/smarty/smarty.js diff --git a/public/plugins/codemirror-5.17.0/mode/solr/index.html b/public/vendor/plugins/codemirror/mode/solr/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/solr/index.html rename to public/vendor/plugins/codemirror/mode/solr/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/solr/solr.js b/public/vendor/plugins/codemirror/mode/solr/solr.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/solr/solr.js rename to public/vendor/plugins/codemirror/mode/solr/solr.js diff --git a/public/plugins/codemirror-5.17.0/mode/soy/index.html b/public/vendor/plugins/codemirror/mode/soy/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/soy/index.html rename to public/vendor/plugins/codemirror/mode/soy/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/soy/soy.js b/public/vendor/plugins/codemirror/mode/soy/soy.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/soy/soy.js rename to public/vendor/plugins/codemirror/mode/soy/soy.js diff --git a/public/plugins/codemirror-5.17.0/mode/sparql/index.html b/public/vendor/plugins/codemirror/mode/sparql/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/sparql/index.html rename to public/vendor/plugins/codemirror/mode/sparql/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/sparql/sparql.js b/public/vendor/plugins/codemirror/mode/sparql/sparql.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/sparql/sparql.js rename to public/vendor/plugins/codemirror/mode/sparql/sparql.js diff --git a/public/plugins/codemirror-5.17.0/mode/spreadsheet/index.html b/public/vendor/plugins/codemirror/mode/spreadsheet/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/spreadsheet/index.html rename to public/vendor/plugins/codemirror/mode/spreadsheet/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/spreadsheet/spreadsheet.js b/public/vendor/plugins/codemirror/mode/spreadsheet/spreadsheet.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/spreadsheet/spreadsheet.js rename to public/vendor/plugins/codemirror/mode/spreadsheet/spreadsheet.js diff --git a/public/plugins/codemirror-5.17.0/mode/sql/index.html b/public/vendor/plugins/codemirror/mode/sql/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/sql/index.html rename to public/vendor/plugins/codemirror/mode/sql/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/sql/sql.js b/public/vendor/plugins/codemirror/mode/sql/sql.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/sql/sql.js rename to public/vendor/plugins/codemirror/mode/sql/sql.js diff --git a/public/plugins/codemirror-5.17.0/mode/stex/index.html b/public/vendor/plugins/codemirror/mode/stex/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/stex/index.html rename to public/vendor/plugins/codemirror/mode/stex/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/stex/stex.js b/public/vendor/plugins/codemirror/mode/stex/stex.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/stex/stex.js rename to public/vendor/plugins/codemirror/mode/stex/stex.js diff --git a/public/plugins/codemirror-5.17.0/mode/stex/test.js b/public/vendor/plugins/codemirror/mode/stex/test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/stex/test.js rename to public/vendor/plugins/codemirror/mode/stex/test.js diff --git a/public/plugins/codemirror-5.17.0/mode/stylus/index.html b/public/vendor/plugins/codemirror/mode/stylus/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/stylus/index.html rename to public/vendor/plugins/codemirror/mode/stylus/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/stylus/stylus.js b/public/vendor/plugins/codemirror/mode/stylus/stylus.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/stylus/stylus.js rename to public/vendor/plugins/codemirror/mode/stylus/stylus.js diff --git a/public/plugins/codemirror-5.17.0/mode/swift/index.html b/public/vendor/plugins/codemirror/mode/swift/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/swift/index.html rename to public/vendor/plugins/codemirror/mode/swift/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/swift/swift.js b/public/vendor/plugins/codemirror/mode/swift/swift.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/swift/swift.js rename to public/vendor/plugins/codemirror/mode/swift/swift.js diff --git a/public/plugins/codemirror-5.17.0/mode/tcl/index.html b/public/vendor/plugins/codemirror/mode/tcl/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/tcl/index.html rename to public/vendor/plugins/codemirror/mode/tcl/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/tcl/tcl.js b/public/vendor/plugins/codemirror/mode/tcl/tcl.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/tcl/tcl.js rename to public/vendor/plugins/codemirror/mode/tcl/tcl.js diff --git a/public/plugins/codemirror-5.17.0/mode/textile/index.html b/public/vendor/plugins/codemirror/mode/textile/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/textile/index.html rename to public/vendor/plugins/codemirror/mode/textile/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/textile/test.js b/public/vendor/plugins/codemirror/mode/textile/test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/textile/test.js rename to public/vendor/plugins/codemirror/mode/textile/test.js diff --git a/public/plugins/codemirror-5.17.0/mode/textile/textile.js b/public/vendor/plugins/codemirror/mode/textile/textile.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/textile/textile.js rename to public/vendor/plugins/codemirror/mode/textile/textile.js diff --git a/public/plugins/codemirror-5.17.0/mode/tiddlywiki/index.html b/public/vendor/plugins/codemirror/mode/tiddlywiki/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/tiddlywiki/index.html rename to public/vendor/plugins/codemirror/mode/tiddlywiki/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/tiddlywiki/tiddlywiki.css b/public/vendor/plugins/codemirror/mode/tiddlywiki/tiddlywiki.css similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/tiddlywiki/tiddlywiki.css rename to public/vendor/plugins/codemirror/mode/tiddlywiki/tiddlywiki.css diff --git a/public/plugins/codemirror-5.17.0/mode/tiddlywiki/tiddlywiki.js b/public/vendor/plugins/codemirror/mode/tiddlywiki/tiddlywiki.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/tiddlywiki/tiddlywiki.js rename to public/vendor/plugins/codemirror/mode/tiddlywiki/tiddlywiki.js diff --git a/public/plugins/codemirror-5.17.0/mode/tiki/index.html b/public/vendor/plugins/codemirror/mode/tiki/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/tiki/index.html rename to public/vendor/plugins/codemirror/mode/tiki/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/tiki/tiki.css b/public/vendor/plugins/codemirror/mode/tiki/tiki.css similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/tiki/tiki.css rename to public/vendor/plugins/codemirror/mode/tiki/tiki.css diff --git a/public/plugins/codemirror-5.17.0/mode/tiki/tiki.js b/public/vendor/plugins/codemirror/mode/tiki/tiki.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/tiki/tiki.js rename to public/vendor/plugins/codemirror/mode/tiki/tiki.js diff --git a/public/plugins/codemirror-5.17.0/mode/toml/index.html b/public/vendor/plugins/codemirror/mode/toml/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/toml/index.html rename to public/vendor/plugins/codemirror/mode/toml/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/toml/toml.js b/public/vendor/plugins/codemirror/mode/toml/toml.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/toml/toml.js rename to public/vendor/plugins/codemirror/mode/toml/toml.js diff --git a/public/plugins/codemirror-5.17.0/mode/tornado/index.html b/public/vendor/plugins/codemirror/mode/tornado/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/tornado/index.html rename to public/vendor/plugins/codemirror/mode/tornado/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/tornado/tornado.js b/public/vendor/plugins/codemirror/mode/tornado/tornado.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/tornado/tornado.js rename to public/vendor/plugins/codemirror/mode/tornado/tornado.js diff --git a/public/plugins/codemirror-5.17.0/mode/troff/index.html b/public/vendor/plugins/codemirror/mode/troff/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/troff/index.html rename to public/vendor/plugins/codemirror/mode/troff/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/troff/troff.js b/public/vendor/plugins/codemirror/mode/troff/troff.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/troff/troff.js rename to public/vendor/plugins/codemirror/mode/troff/troff.js diff --git a/public/plugins/codemirror-5.17.0/mode/ttcn-cfg/index.html b/public/vendor/plugins/codemirror/mode/ttcn-cfg/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/ttcn-cfg/index.html rename to public/vendor/plugins/codemirror/mode/ttcn-cfg/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/ttcn-cfg/ttcn-cfg.js b/public/vendor/plugins/codemirror/mode/ttcn-cfg/ttcn-cfg.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/ttcn-cfg/ttcn-cfg.js rename to public/vendor/plugins/codemirror/mode/ttcn-cfg/ttcn-cfg.js diff --git a/public/plugins/codemirror-5.17.0/mode/ttcn/index.html b/public/vendor/plugins/codemirror/mode/ttcn/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/ttcn/index.html rename to public/vendor/plugins/codemirror/mode/ttcn/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/ttcn/ttcn.js b/public/vendor/plugins/codemirror/mode/ttcn/ttcn.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/ttcn/ttcn.js rename to public/vendor/plugins/codemirror/mode/ttcn/ttcn.js diff --git a/public/plugins/codemirror-5.17.0/mode/turtle/index.html b/public/vendor/plugins/codemirror/mode/turtle/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/turtle/index.html rename to public/vendor/plugins/codemirror/mode/turtle/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/turtle/turtle.js b/public/vendor/plugins/codemirror/mode/turtle/turtle.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/turtle/turtle.js rename to public/vendor/plugins/codemirror/mode/turtle/turtle.js diff --git a/public/plugins/codemirror-5.17.0/mode/twig/index.html b/public/vendor/plugins/codemirror/mode/twig/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/twig/index.html rename to public/vendor/plugins/codemirror/mode/twig/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/twig/twig.js b/public/vendor/plugins/codemirror/mode/twig/twig.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/twig/twig.js rename to public/vendor/plugins/codemirror/mode/twig/twig.js diff --git a/public/plugins/codemirror-5.17.0/mode/vb/index.html b/public/vendor/plugins/codemirror/mode/vb/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/vb/index.html rename to public/vendor/plugins/codemirror/mode/vb/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/vb/vb.js b/public/vendor/plugins/codemirror/mode/vb/vb.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/vb/vb.js rename to public/vendor/plugins/codemirror/mode/vb/vb.js diff --git a/public/plugins/codemirror-5.17.0/mode/vbscript/index.html b/public/vendor/plugins/codemirror/mode/vbscript/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/vbscript/index.html rename to public/vendor/plugins/codemirror/mode/vbscript/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/vbscript/vbscript.js b/public/vendor/plugins/codemirror/mode/vbscript/vbscript.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/vbscript/vbscript.js rename to public/vendor/plugins/codemirror/mode/vbscript/vbscript.js diff --git a/public/plugins/codemirror-5.17.0/mode/velocity/index.html b/public/vendor/plugins/codemirror/mode/velocity/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/velocity/index.html rename to public/vendor/plugins/codemirror/mode/velocity/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/velocity/velocity.js b/public/vendor/plugins/codemirror/mode/velocity/velocity.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/velocity/velocity.js rename to public/vendor/plugins/codemirror/mode/velocity/velocity.js diff --git a/public/plugins/codemirror-5.17.0/mode/verilog/index.html b/public/vendor/plugins/codemirror/mode/verilog/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/verilog/index.html rename to public/vendor/plugins/codemirror/mode/verilog/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/verilog/test.js b/public/vendor/plugins/codemirror/mode/verilog/test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/verilog/test.js rename to public/vendor/plugins/codemirror/mode/verilog/test.js diff --git a/public/plugins/codemirror-5.17.0/mode/verilog/verilog.js b/public/vendor/plugins/codemirror/mode/verilog/verilog.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/verilog/verilog.js rename to public/vendor/plugins/codemirror/mode/verilog/verilog.js diff --git a/public/plugins/codemirror-5.17.0/mode/vhdl/index.html b/public/vendor/plugins/codemirror/mode/vhdl/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/vhdl/index.html rename to public/vendor/plugins/codemirror/mode/vhdl/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/vhdl/vhdl.js b/public/vendor/plugins/codemirror/mode/vhdl/vhdl.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/vhdl/vhdl.js rename to public/vendor/plugins/codemirror/mode/vhdl/vhdl.js diff --git a/public/plugins/codemirror-5.17.0/mode/vue/index.html b/public/vendor/plugins/codemirror/mode/vue/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/vue/index.html rename to public/vendor/plugins/codemirror/mode/vue/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/vue/vue.js b/public/vendor/plugins/codemirror/mode/vue/vue.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/vue/vue.js rename to public/vendor/plugins/codemirror/mode/vue/vue.js diff --git a/public/plugins/codemirror-5.17.0/mode/webidl/index.html b/public/vendor/plugins/codemirror/mode/webidl/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/webidl/index.html rename to public/vendor/plugins/codemirror/mode/webidl/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/webidl/webidl.js b/public/vendor/plugins/codemirror/mode/webidl/webidl.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/webidl/webidl.js rename to public/vendor/plugins/codemirror/mode/webidl/webidl.js diff --git a/public/plugins/codemirror-5.17.0/mode/xml/index.html b/public/vendor/plugins/codemirror/mode/xml/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/xml/index.html rename to public/vendor/plugins/codemirror/mode/xml/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/xml/test.js b/public/vendor/plugins/codemirror/mode/xml/test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/xml/test.js rename to public/vendor/plugins/codemirror/mode/xml/test.js diff --git a/public/plugins/codemirror-5.17.0/mode/xml/xml.js b/public/vendor/plugins/codemirror/mode/xml/xml.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/xml/xml.js rename to public/vendor/plugins/codemirror/mode/xml/xml.js diff --git a/public/plugins/codemirror-5.17.0/mode/xquery/index.html b/public/vendor/plugins/codemirror/mode/xquery/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/xquery/index.html rename to public/vendor/plugins/codemirror/mode/xquery/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/xquery/test.js b/public/vendor/plugins/codemirror/mode/xquery/test.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/xquery/test.js rename to public/vendor/plugins/codemirror/mode/xquery/test.js diff --git a/public/plugins/codemirror-5.17.0/mode/xquery/xquery.js b/public/vendor/plugins/codemirror/mode/xquery/xquery.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/xquery/xquery.js rename to public/vendor/plugins/codemirror/mode/xquery/xquery.js diff --git a/public/plugins/codemirror-5.17.0/mode/yacas/index.html b/public/vendor/plugins/codemirror/mode/yacas/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/yacas/index.html rename to public/vendor/plugins/codemirror/mode/yacas/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/yacas/yacas.js b/public/vendor/plugins/codemirror/mode/yacas/yacas.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/yacas/yacas.js rename to public/vendor/plugins/codemirror/mode/yacas/yacas.js diff --git a/public/plugins/codemirror-5.17.0/mode/yaml-frontmatter/index.html b/public/vendor/plugins/codemirror/mode/yaml-frontmatter/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/yaml-frontmatter/index.html rename to public/vendor/plugins/codemirror/mode/yaml-frontmatter/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/yaml-frontmatter/yaml-frontmatter.js b/public/vendor/plugins/codemirror/mode/yaml-frontmatter/yaml-frontmatter.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/yaml-frontmatter/yaml-frontmatter.js rename to public/vendor/plugins/codemirror/mode/yaml-frontmatter/yaml-frontmatter.js diff --git a/public/plugins/codemirror-5.17.0/mode/yaml/index.html b/public/vendor/plugins/codemirror/mode/yaml/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/yaml/index.html rename to public/vendor/plugins/codemirror/mode/yaml/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/yaml/yaml.js b/public/vendor/plugins/codemirror/mode/yaml/yaml.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/yaml/yaml.js rename to public/vendor/plugins/codemirror/mode/yaml/yaml.js diff --git a/public/plugins/codemirror-5.17.0/mode/z80/index.html b/public/vendor/plugins/codemirror/mode/z80/index.html similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/z80/index.html rename to public/vendor/plugins/codemirror/mode/z80/index.html diff --git a/public/plugins/codemirror-5.17.0/mode/z80/z80.js b/public/vendor/plugins/codemirror/mode/z80/z80.js similarity index 100% rename from public/plugins/codemirror-5.17.0/mode/z80/z80.js rename to public/vendor/plugins/codemirror/mode/z80/z80.js diff --git a/public/vendor/plugins/cssrelpreload/LICENSE b/public/vendor/plugins/cssrelpreload/LICENSE new file mode 100644 index 000000000000..733395b51531 --- /dev/null +++ b/public/vendor/plugins/cssrelpreload/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) @scottjehl, 2016 Filament Group + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/public/js/libs/cssrelpreload.min.js b/public/vendor/plugins/cssrelpreload/cssrelpreload.min.js similarity index 100% rename from public/js/libs/cssrelpreload.min.js rename to public/vendor/plugins/cssrelpreload/cssrelpreload.min.js diff --git a/public/js/libs/loadCSS.min.js b/public/vendor/plugins/cssrelpreload/loadCSS.min.js similarity index 100% rename from public/js/libs/loadCSS.min.js rename to public/vendor/plugins/cssrelpreload/loadCSS.min.js diff --git a/public/vendor/plugins/dropzone/LICENSE b/public/vendor/plugins/dropzone/LICENSE new file mode 100644 index 000000000000..286061f3d3bd --- /dev/null +++ b/public/vendor/plugins/dropzone/LICENSE @@ -0,0 +1,20 @@ +(c) Copyright 2012 Matias Meno + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/public/plugins/dropzone-4.2.0/dropzone.css b/public/vendor/plugins/dropzone/dropzone.css similarity index 100% rename from public/plugins/dropzone-4.2.0/dropzone.css rename to public/vendor/plugins/dropzone/dropzone.css diff --git a/public/plugins/dropzone-4.2.0/dropzone.js b/public/vendor/plugins/dropzone/dropzone.js similarity index 100% rename from public/plugins/dropzone-4.2.0/dropzone.js rename to public/vendor/plugins/dropzone/dropzone.js diff --git a/public/vendor/plugins/emojify/LICENSE b/public/vendor/plugins/emojify/LICENSE new file mode 100644 index 000000000000..d9f26a72586b --- /dev/null +++ b/public/vendor/plugins/emojify/LICENSE @@ -0,0 +1,8 @@ +THE MIT LICENSE (MIT) +Copyright © 2014 Hassan Khan, http://hassankhan.me + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Softwareâ€), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED “AS ISâ€, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/public/js/libs/emojify-1.1.0.min.js b/public/vendor/plugins/emojify/emojify.min.js similarity index 100% rename from public/js/libs/emojify-1.1.0.min.js rename to public/vendor/plugins/emojify/emojify.min.js diff --git a/public/img/emoji/+1.png b/public/vendor/plugins/emojify/images/+1.png similarity index 100% rename from public/img/emoji/+1.png rename to public/vendor/plugins/emojify/images/+1.png diff --git a/public/img/emoji/-1.png b/public/vendor/plugins/emojify/images/-1.png similarity index 100% rename from public/img/emoji/-1.png rename to public/vendor/plugins/emojify/images/-1.png diff --git a/public/img/emoji/100.png b/public/vendor/plugins/emojify/images/100.png similarity index 100% rename from public/img/emoji/100.png rename to public/vendor/plugins/emojify/images/100.png diff --git a/public/img/emoji/1234.png b/public/vendor/plugins/emojify/images/1234.png similarity index 100% rename from public/img/emoji/1234.png rename to public/vendor/plugins/emojify/images/1234.png diff --git a/public/img/emoji/8ball.png b/public/vendor/plugins/emojify/images/8ball.png similarity index 100% rename from public/img/emoji/8ball.png rename to public/vendor/plugins/emojify/images/8ball.png diff --git a/public/img/emoji/a.png b/public/vendor/plugins/emojify/images/a.png similarity index 100% rename from public/img/emoji/a.png rename to public/vendor/plugins/emojify/images/a.png diff --git a/public/img/emoji/ab.png b/public/vendor/plugins/emojify/images/ab.png similarity index 100% rename from public/img/emoji/ab.png rename to public/vendor/plugins/emojify/images/ab.png diff --git a/public/img/emoji/abc.png b/public/vendor/plugins/emojify/images/abc.png similarity index 100% rename from public/img/emoji/abc.png rename to public/vendor/plugins/emojify/images/abc.png diff --git a/public/img/emoji/abcd.png b/public/vendor/plugins/emojify/images/abcd.png similarity index 100% rename from public/img/emoji/abcd.png rename to public/vendor/plugins/emojify/images/abcd.png diff --git a/public/img/emoji/accept.png b/public/vendor/plugins/emojify/images/accept.png similarity index 100% rename from public/img/emoji/accept.png rename to public/vendor/plugins/emojify/images/accept.png diff --git a/public/img/emoji/aerial_tramway.png b/public/vendor/plugins/emojify/images/aerial_tramway.png similarity index 100% rename from public/img/emoji/aerial_tramway.png rename to public/vendor/plugins/emojify/images/aerial_tramway.png diff --git a/public/img/emoji/airplane.png b/public/vendor/plugins/emojify/images/airplane.png similarity index 100% rename from public/img/emoji/airplane.png rename to public/vendor/plugins/emojify/images/airplane.png diff --git a/public/img/emoji/alarm_clock.png b/public/vendor/plugins/emojify/images/alarm_clock.png similarity index 100% rename from public/img/emoji/alarm_clock.png rename to public/vendor/plugins/emojify/images/alarm_clock.png diff --git a/public/img/emoji/alien.png b/public/vendor/plugins/emojify/images/alien.png similarity index 100% rename from public/img/emoji/alien.png rename to public/vendor/plugins/emojify/images/alien.png diff --git a/public/img/emoji/ambulance.png b/public/vendor/plugins/emojify/images/ambulance.png similarity index 100% rename from public/img/emoji/ambulance.png rename to public/vendor/plugins/emojify/images/ambulance.png diff --git a/public/img/emoji/anchor.png b/public/vendor/plugins/emojify/images/anchor.png similarity index 100% rename from public/img/emoji/anchor.png rename to public/vendor/plugins/emojify/images/anchor.png diff --git a/public/img/emoji/angel.png b/public/vendor/plugins/emojify/images/angel.png similarity index 100% rename from public/img/emoji/angel.png rename to public/vendor/plugins/emojify/images/angel.png diff --git a/public/img/emoji/anger.png b/public/vendor/plugins/emojify/images/anger.png similarity index 100% rename from public/img/emoji/anger.png rename to public/vendor/plugins/emojify/images/anger.png diff --git a/public/img/emoji/angry.png b/public/vendor/plugins/emojify/images/angry.png similarity index 100% rename from public/img/emoji/angry.png rename to public/vendor/plugins/emojify/images/angry.png diff --git a/public/img/emoji/anguished.png b/public/vendor/plugins/emojify/images/anguished.png similarity index 100% rename from public/img/emoji/anguished.png rename to public/vendor/plugins/emojify/images/anguished.png diff --git a/public/img/emoji/ant.png b/public/vendor/plugins/emojify/images/ant.png similarity index 100% rename from public/img/emoji/ant.png rename to public/vendor/plugins/emojify/images/ant.png diff --git a/public/img/emoji/apple.png b/public/vendor/plugins/emojify/images/apple.png similarity index 100% rename from public/img/emoji/apple.png rename to public/vendor/plugins/emojify/images/apple.png diff --git a/public/img/emoji/aquarius.png b/public/vendor/plugins/emojify/images/aquarius.png similarity index 100% rename from public/img/emoji/aquarius.png rename to public/vendor/plugins/emojify/images/aquarius.png diff --git a/public/img/emoji/aries.png b/public/vendor/plugins/emojify/images/aries.png similarity index 100% rename from public/img/emoji/aries.png rename to public/vendor/plugins/emojify/images/aries.png diff --git a/public/img/emoji/arrow_backward.png b/public/vendor/plugins/emojify/images/arrow_backward.png similarity index 100% rename from public/img/emoji/arrow_backward.png rename to public/vendor/plugins/emojify/images/arrow_backward.png diff --git a/public/img/emoji/arrow_double_down.png b/public/vendor/plugins/emojify/images/arrow_double_down.png similarity index 100% rename from public/img/emoji/arrow_double_down.png rename to public/vendor/plugins/emojify/images/arrow_double_down.png diff --git a/public/img/emoji/arrow_double_up.png b/public/vendor/plugins/emojify/images/arrow_double_up.png similarity index 100% rename from public/img/emoji/arrow_double_up.png rename to public/vendor/plugins/emojify/images/arrow_double_up.png diff --git a/public/img/emoji/arrow_down.png b/public/vendor/plugins/emojify/images/arrow_down.png similarity index 100% rename from public/img/emoji/arrow_down.png rename to public/vendor/plugins/emojify/images/arrow_down.png diff --git a/public/img/emoji/arrow_down_small.png b/public/vendor/plugins/emojify/images/arrow_down_small.png similarity index 100% rename from public/img/emoji/arrow_down_small.png rename to public/vendor/plugins/emojify/images/arrow_down_small.png diff --git a/public/img/emoji/arrow_forward.png b/public/vendor/plugins/emojify/images/arrow_forward.png similarity index 100% rename from public/img/emoji/arrow_forward.png rename to public/vendor/plugins/emojify/images/arrow_forward.png diff --git a/public/img/emoji/arrow_heading_down.png b/public/vendor/plugins/emojify/images/arrow_heading_down.png similarity index 100% rename from public/img/emoji/arrow_heading_down.png rename to public/vendor/plugins/emojify/images/arrow_heading_down.png diff --git a/public/img/emoji/arrow_heading_up.png b/public/vendor/plugins/emojify/images/arrow_heading_up.png similarity index 100% rename from public/img/emoji/arrow_heading_up.png rename to public/vendor/plugins/emojify/images/arrow_heading_up.png diff --git a/public/img/emoji/arrow_left.png b/public/vendor/plugins/emojify/images/arrow_left.png similarity index 100% rename from public/img/emoji/arrow_left.png rename to public/vendor/plugins/emojify/images/arrow_left.png diff --git a/public/img/emoji/arrow_lower_left.png b/public/vendor/plugins/emojify/images/arrow_lower_left.png similarity index 100% rename from public/img/emoji/arrow_lower_left.png rename to public/vendor/plugins/emojify/images/arrow_lower_left.png diff --git a/public/img/emoji/arrow_lower_right.png b/public/vendor/plugins/emojify/images/arrow_lower_right.png similarity index 100% rename from public/img/emoji/arrow_lower_right.png rename to public/vendor/plugins/emojify/images/arrow_lower_right.png diff --git a/public/img/emoji/arrow_right.png b/public/vendor/plugins/emojify/images/arrow_right.png similarity index 100% rename from public/img/emoji/arrow_right.png rename to public/vendor/plugins/emojify/images/arrow_right.png diff --git a/public/img/emoji/arrow_right_hook.png b/public/vendor/plugins/emojify/images/arrow_right_hook.png similarity index 100% rename from public/img/emoji/arrow_right_hook.png rename to public/vendor/plugins/emojify/images/arrow_right_hook.png diff --git a/public/img/emoji/arrow_up.png b/public/vendor/plugins/emojify/images/arrow_up.png similarity index 100% rename from public/img/emoji/arrow_up.png rename to public/vendor/plugins/emojify/images/arrow_up.png diff --git a/public/img/emoji/arrow_up_down.png b/public/vendor/plugins/emojify/images/arrow_up_down.png similarity index 100% rename from public/img/emoji/arrow_up_down.png rename to public/vendor/plugins/emojify/images/arrow_up_down.png diff --git a/public/img/emoji/arrow_up_small.png b/public/vendor/plugins/emojify/images/arrow_up_small.png similarity index 100% rename from public/img/emoji/arrow_up_small.png rename to public/vendor/plugins/emojify/images/arrow_up_small.png diff --git a/public/img/emoji/arrow_upper_left.png b/public/vendor/plugins/emojify/images/arrow_upper_left.png similarity index 100% rename from public/img/emoji/arrow_upper_left.png rename to public/vendor/plugins/emojify/images/arrow_upper_left.png diff --git a/public/img/emoji/arrow_upper_right.png b/public/vendor/plugins/emojify/images/arrow_upper_right.png similarity index 100% rename from public/img/emoji/arrow_upper_right.png rename to public/vendor/plugins/emojify/images/arrow_upper_right.png diff --git a/public/img/emoji/arrows_clockwise.png b/public/vendor/plugins/emojify/images/arrows_clockwise.png similarity index 100% rename from public/img/emoji/arrows_clockwise.png rename to public/vendor/plugins/emojify/images/arrows_clockwise.png diff --git a/public/img/emoji/arrows_counterclockwise.png b/public/vendor/plugins/emojify/images/arrows_counterclockwise.png similarity index 100% rename from public/img/emoji/arrows_counterclockwise.png rename to public/vendor/plugins/emojify/images/arrows_counterclockwise.png diff --git a/public/img/emoji/art.png b/public/vendor/plugins/emojify/images/art.png similarity index 100% rename from public/img/emoji/art.png rename to public/vendor/plugins/emojify/images/art.png diff --git a/public/img/emoji/articulated_lorry.png b/public/vendor/plugins/emojify/images/articulated_lorry.png similarity index 100% rename from public/img/emoji/articulated_lorry.png rename to public/vendor/plugins/emojify/images/articulated_lorry.png diff --git a/public/img/emoji/astonished.png b/public/vendor/plugins/emojify/images/astonished.png similarity index 100% rename from public/img/emoji/astonished.png rename to public/vendor/plugins/emojify/images/astonished.png diff --git a/public/img/emoji/atm.png b/public/vendor/plugins/emojify/images/atm.png similarity index 100% rename from public/img/emoji/atm.png rename to public/vendor/plugins/emojify/images/atm.png diff --git a/public/img/emoji/b.png b/public/vendor/plugins/emojify/images/b.png similarity index 100% rename from public/img/emoji/b.png rename to public/vendor/plugins/emojify/images/b.png diff --git a/public/img/emoji/baby.png b/public/vendor/plugins/emojify/images/baby.png similarity index 100% rename from public/img/emoji/baby.png rename to public/vendor/plugins/emojify/images/baby.png diff --git a/public/img/emoji/baby_bottle.png b/public/vendor/plugins/emojify/images/baby_bottle.png similarity index 100% rename from public/img/emoji/baby_bottle.png rename to public/vendor/plugins/emojify/images/baby_bottle.png diff --git a/public/img/emoji/baby_chick.png b/public/vendor/plugins/emojify/images/baby_chick.png similarity index 100% rename from public/img/emoji/baby_chick.png rename to public/vendor/plugins/emojify/images/baby_chick.png diff --git a/public/img/emoji/baby_symbol.png b/public/vendor/plugins/emojify/images/baby_symbol.png similarity index 100% rename from public/img/emoji/baby_symbol.png rename to public/vendor/plugins/emojify/images/baby_symbol.png diff --git a/public/img/emoji/back.png b/public/vendor/plugins/emojify/images/back.png similarity index 100% rename from public/img/emoji/back.png rename to public/vendor/plugins/emojify/images/back.png diff --git a/public/img/emoji/baggage_claim.png b/public/vendor/plugins/emojify/images/baggage_claim.png similarity index 100% rename from public/img/emoji/baggage_claim.png rename to public/vendor/plugins/emojify/images/baggage_claim.png diff --git a/public/img/emoji/balloon.png b/public/vendor/plugins/emojify/images/balloon.png similarity index 100% rename from public/img/emoji/balloon.png rename to public/vendor/plugins/emojify/images/balloon.png diff --git a/public/img/emoji/ballot_box_with_check.png b/public/vendor/plugins/emojify/images/ballot_box_with_check.png similarity index 100% rename from public/img/emoji/ballot_box_with_check.png rename to public/vendor/plugins/emojify/images/ballot_box_with_check.png diff --git a/public/img/emoji/bamboo.png b/public/vendor/plugins/emojify/images/bamboo.png similarity index 100% rename from public/img/emoji/bamboo.png rename to public/vendor/plugins/emojify/images/bamboo.png diff --git a/public/img/emoji/banana.png b/public/vendor/plugins/emojify/images/banana.png similarity index 100% rename from public/img/emoji/banana.png rename to public/vendor/plugins/emojify/images/banana.png diff --git a/public/img/emoji/bangbang.png b/public/vendor/plugins/emojify/images/bangbang.png similarity index 100% rename from public/img/emoji/bangbang.png rename to public/vendor/plugins/emojify/images/bangbang.png diff --git a/public/img/emoji/bank.png b/public/vendor/plugins/emojify/images/bank.png similarity index 100% rename from public/img/emoji/bank.png rename to public/vendor/plugins/emojify/images/bank.png diff --git a/public/img/emoji/bar_chart.png b/public/vendor/plugins/emojify/images/bar_chart.png similarity index 100% rename from public/img/emoji/bar_chart.png rename to public/vendor/plugins/emojify/images/bar_chart.png diff --git a/public/img/emoji/barber.png b/public/vendor/plugins/emojify/images/barber.png similarity index 100% rename from public/img/emoji/barber.png rename to public/vendor/plugins/emojify/images/barber.png diff --git a/public/img/emoji/baseball.png b/public/vendor/plugins/emojify/images/baseball.png similarity index 100% rename from public/img/emoji/baseball.png rename to public/vendor/plugins/emojify/images/baseball.png diff --git a/public/img/emoji/basketball.png b/public/vendor/plugins/emojify/images/basketball.png similarity index 100% rename from public/img/emoji/basketball.png rename to public/vendor/plugins/emojify/images/basketball.png diff --git a/public/img/emoji/bath.png b/public/vendor/plugins/emojify/images/bath.png similarity index 100% rename from public/img/emoji/bath.png rename to public/vendor/plugins/emojify/images/bath.png diff --git a/public/img/emoji/bathtub.png b/public/vendor/plugins/emojify/images/bathtub.png similarity index 100% rename from public/img/emoji/bathtub.png rename to public/vendor/plugins/emojify/images/bathtub.png diff --git a/public/img/emoji/battery.png b/public/vendor/plugins/emojify/images/battery.png similarity index 100% rename from public/img/emoji/battery.png rename to public/vendor/plugins/emojify/images/battery.png diff --git a/public/img/emoji/bear.png b/public/vendor/plugins/emojify/images/bear.png similarity index 100% rename from public/img/emoji/bear.png rename to public/vendor/plugins/emojify/images/bear.png diff --git a/public/img/emoji/bee.png b/public/vendor/plugins/emojify/images/bee.png similarity index 100% rename from public/img/emoji/bee.png rename to public/vendor/plugins/emojify/images/bee.png diff --git a/public/img/emoji/beer.png b/public/vendor/plugins/emojify/images/beer.png similarity index 100% rename from public/img/emoji/beer.png rename to public/vendor/plugins/emojify/images/beer.png diff --git a/public/img/emoji/beers.png b/public/vendor/plugins/emojify/images/beers.png similarity index 100% rename from public/img/emoji/beers.png rename to public/vendor/plugins/emojify/images/beers.png diff --git a/public/img/emoji/beetle.png b/public/vendor/plugins/emojify/images/beetle.png similarity index 100% rename from public/img/emoji/beetle.png rename to public/vendor/plugins/emojify/images/beetle.png diff --git a/public/img/emoji/beginner.png b/public/vendor/plugins/emojify/images/beginner.png similarity index 100% rename from public/img/emoji/beginner.png rename to public/vendor/plugins/emojify/images/beginner.png diff --git a/public/img/emoji/bell.png b/public/vendor/plugins/emojify/images/bell.png similarity index 100% rename from public/img/emoji/bell.png rename to public/vendor/plugins/emojify/images/bell.png diff --git a/public/img/emoji/bento.png b/public/vendor/plugins/emojify/images/bento.png similarity index 100% rename from public/img/emoji/bento.png rename to public/vendor/plugins/emojify/images/bento.png diff --git a/public/img/emoji/bicyclist.png b/public/vendor/plugins/emojify/images/bicyclist.png similarity index 100% rename from public/img/emoji/bicyclist.png rename to public/vendor/plugins/emojify/images/bicyclist.png diff --git a/public/img/emoji/bike.png b/public/vendor/plugins/emojify/images/bike.png similarity index 100% rename from public/img/emoji/bike.png rename to public/vendor/plugins/emojify/images/bike.png diff --git a/public/img/emoji/bikini.png b/public/vendor/plugins/emojify/images/bikini.png similarity index 100% rename from public/img/emoji/bikini.png rename to public/vendor/plugins/emojify/images/bikini.png diff --git a/public/img/emoji/bird.png b/public/vendor/plugins/emojify/images/bird.png similarity index 100% rename from public/img/emoji/bird.png rename to public/vendor/plugins/emojify/images/bird.png diff --git a/public/img/emoji/birthday.png b/public/vendor/plugins/emojify/images/birthday.png similarity index 100% rename from public/img/emoji/birthday.png rename to public/vendor/plugins/emojify/images/birthday.png diff --git a/public/img/emoji/black_circle.png b/public/vendor/plugins/emojify/images/black_circle.png similarity index 100% rename from public/img/emoji/black_circle.png rename to public/vendor/plugins/emojify/images/black_circle.png diff --git a/public/img/emoji/black_joker.png b/public/vendor/plugins/emojify/images/black_joker.png similarity index 100% rename from public/img/emoji/black_joker.png rename to public/vendor/plugins/emojify/images/black_joker.png diff --git a/public/img/emoji/black_medium_small_square.png b/public/vendor/plugins/emojify/images/black_medium_small_square.png similarity index 100% rename from public/img/emoji/black_medium_small_square.png rename to public/vendor/plugins/emojify/images/black_medium_small_square.png diff --git a/public/img/emoji/black_medium_square.png b/public/vendor/plugins/emojify/images/black_medium_square.png similarity index 100% rename from public/img/emoji/black_medium_square.png rename to public/vendor/plugins/emojify/images/black_medium_square.png diff --git a/public/img/emoji/black_nib.png b/public/vendor/plugins/emojify/images/black_nib.png similarity index 100% rename from public/img/emoji/black_nib.png rename to public/vendor/plugins/emojify/images/black_nib.png diff --git a/public/img/emoji/black_small_square.png b/public/vendor/plugins/emojify/images/black_small_square.png similarity index 100% rename from public/img/emoji/black_small_square.png rename to public/vendor/plugins/emojify/images/black_small_square.png diff --git a/public/img/emoji/black_square.png b/public/vendor/plugins/emojify/images/black_square.png similarity index 100% rename from public/img/emoji/black_square.png rename to public/vendor/plugins/emojify/images/black_square.png diff --git a/public/img/emoji/black_square_button.png b/public/vendor/plugins/emojify/images/black_square_button.png similarity index 100% rename from public/img/emoji/black_square_button.png rename to public/vendor/plugins/emojify/images/black_square_button.png diff --git a/public/img/emoji/blossom.png b/public/vendor/plugins/emojify/images/blossom.png similarity index 100% rename from public/img/emoji/blossom.png rename to public/vendor/plugins/emojify/images/blossom.png diff --git a/public/img/emoji/blowfish.png b/public/vendor/plugins/emojify/images/blowfish.png similarity index 100% rename from public/img/emoji/blowfish.png rename to public/vendor/plugins/emojify/images/blowfish.png diff --git a/public/img/emoji/blue_book.png b/public/vendor/plugins/emojify/images/blue_book.png similarity index 100% rename from public/img/emoji/blue_book.png rename to public/vendor/plugins/emojify/images/blue_book.png diff --git a/public/img/emoji/blue_car.png b/public/vendor/plugins/emojify/images/blue_car.png similarity index 100% rename from public/img/emoji/blue_car.png rename to public/vendor/plugins/emojify/images/blue_car.png diff --git a/public/img/emoji/blue_heart.png b/public/vendor/plugins/emojify/images/blue_heart.png similarity index 100% rename from public/img/emoji/blue_heart.png rename to public/vendor/plugins/emojify/images/blue_heart.png diff --git a/public/img/emoji/blush.png b/public/vendor/plugins/emojify/images/blush.png similarity index 100% rename from public/img/emoji/blush.png rename to public/vendor/plugins/emojify/images/blush.png diff --git a/public/img/emoji/boar.png b/public/vendor/plugins/emojify/images/boar.png similarity index 100% rename from public/img/emoji/boar.png rename to public/vendor/plugins/emojify/images/boar.png diff --git a/public/img/emoji/boat.png b/public/vendor/plugins/emojify/images/boat.png similarity index 100% rename from public/img/emoji/boat.png rename to public/vendor/plugins/emojify/images/boat.png diff --git a/public/img/emoji/bomb.png b/public/vendor/plugins/emojify/images/bomb.png similarity index 100% rename from public/img/emoji/bomb.png rename to public/vendor/plugins/emojify/images/bomb.png diff --git a/public/img/emoji/book.png b/public/vendor/plugins/emojify/images/book.png similarity index 100% rename from public/img/emoji/book.png rename to public/vendor/plugins/emojify/images/book.png diff --git a/public/img/emoji/bookmark.png b/public/vendor/plugins/emojify/images/bookmark.png similarity index 100% rename from public/img/emoji/bookmark.png rename to public/vendor/plugins/emojify/images/bookmark.png diff --git a/public/img/emoji/bookmark_tabs.png b/public/vendor/plugins/emojify/images/bookmark_tabs.png similarity index 100% rename from public/img/emoji/bookmark_tabs.png rename to public/vendor/plugins/emojify/images/bookmark_tabs.png diff --git a/public/img/emoji/books.png b/public/vendor/plugins/emojify/images/books.png similarity index 100% rename from public/img/emoji/books.png rename to public/vendor/plugins/emojify/images/books.png diff --git a/public/img/emoji/boom.png b/public/vendor/plugins/emojify/images/boom.png similarity index 100% rename from public/img/emoji/boom.png rename to public/vendor/plugins/emojify/images/boom.png diff --git a/public/img/emoji/boot.png b/public/vendor/plugins/emojify/images/boot.png similarity index 100% rename from public/img/emoji/boot.png rename to public/vendor/plugins/emojify/images/boot.png diff --git a/public/img/emoji/bouquet.png b/public/vendor/plugins/emojify/images/bouquet.png similarity index 100% rename from public/img/emoji/bouquet.png rename to public/vendor/plugins/emojify/images/bouquet.png diff --git a/public/img/emoji/bow.png b/public/vendor/plugins/emojify/images/bow.png similarity index 100% rename from public/img/emoji/bow.png rename to public/vendor/plugins/emojify/images/bow.png diff --git a/public/img/emoji/bowling.png b/public/vendor/plugins/emojify/images/bowling.png similarity index 100% rename from public/img/emoji/bowling.png rename to public/vendor/plugins/emojify/images/bowling.png diff --git a/public/img/emoji/bowtie.png b/public/vendor/plugins/emojify/images/bowtie.png similarity index 100% rename from public/img/emoji/bowtie.png rename to public/vendor/plugins/emojify/images/bowtie.png diff --git a/public/img/emoji/boy.png b/public/vendor/plugins/emojify/images/boy.png similarity index 100% rename from public/img/emoji/boy.png rename to public/vendor/plugins/emojify/images/boy.png diff --git a/public/img/emoji/bread.png b/public/vendor/plugins/emojify/images/bread.png similarity index 100% rename from public/img/emoji/bread.png rename to public/vendor/plugins/emojify/images/bread.png diff --git a/public/img/emoji/bride_with_veil.png b/public/vendor/plugins/emojify/images/bride_with_veil.png similarity index 100% rename from public/img/emoji/bride_with_veil.png rename to public/vendor/plugins/emojify/images/bride_with_veil.png diff --git a/public/img/emoji/bridge_at_night.png b/public/vendor/plugins/emojify/images/bridge_at_night.png similarity index 100% rename from public/img/emoji/bridge_at_night.png rename to public/vendor/plugins/emojify/images/bridge_at_night.png diff --git a/public/img/emoji/briefcase.png b/public/vendor/plugins/emojify/images/briefcase.png similarity index 100% rename from public/img/emoji/briefcase.png rename to public/vendor/plugins/emojify/images/briefcase.png diff --git a/public/img/emoji/broken_heart.png b/public/vendor/plugins/emojify/images/broken_heart.png similarity index 100% rename from public/img/emoji/broken_heart.png rename to public/vendor/plugins/emojify/images/broken_heart.png diff --git a/public/img/emoji/bug.png b/public/vendor/plugins/emojify/images/bug.png similarity index 100% rename from public/img/emoji/bug.png rename to public/vendor/plugins/emojify/images/bug.png diff --git a/public/img/emoji/bulb.png b/public/vendor/plugins/emojify/images/bulb.png similarity index 100% rename from public/img/emoji/bulb.png rename to public/vendor/plugins/emojify/images/bulb.png diff --git a/public/img/emoji/bullettrain_front.png b/public/vendor/plugins/emojify/images/bullettrain_front.png similarity index 100% rename from public/img/emoji/bullettrain_front.png rename to public/vendor/plugins/emojify/images/bullettrain_front.png diff --git a/public/img/emoji/bullettrain_side.png b/public/vendor/plugins/emojify/images/bullettrain_side.png similarity index 100% rename from public/img/emoji/bullettrain_side.png rename to public/vendor/plugins/emojify/images/bullettrain_side.png diff --git a/public/img/emoji/bus.png b/public/vendor/plugins/emojify/images/bus.png similarity index 100% rename from public/img/emoji/bus.png rename to public/vendor/plugins/emojify/images/bus.png diff --git a/public/img/emoji/busstop.png b/public/vendor/plugins/emojify/images/busstop.png similarity index 100% rename from public/img/emoji/busstop.png rename to public/vendor/plugins/emojify/images/busstop.png diff --git a/public/img/emoji/bust_in_silhouette.png b/public/vendor/plugins/emojify/images/bust_in_silhouette.png similarity index 100% rename from public/img/emoji/bust_in_silhouette.png rename to public/vendor/plugins/emojify/images/bust_in_silhouette.png diff --git a/public/img/emoji/busts_in_silhouette.png b/public/vendor/plugins/emojify/images/busts_in_silhouette.png similarity index 100% rename from public/img/emoji/busts_in_silhouette.png rename to public/vendor/plugins/emojify/images/busts_in_silhouette.png diff --git a/public/img/emoji/cactus.png b/public/vendor/plugins/emojify/images/cactus.png similarity index 100% rename from public/img/emoji/cactus.png rename to public/vendor/plugins/emojify/images/cactus.png diff --git a/public/img/emoji/cake.png b/public/vendor/plugins/emojify/images/cake.png similarity index 100% rename from public/img/emoji/cake.png rename to public/vendor/plugins/emojify/images/cake.png diff --git a/public/img/emoji/calendar.png b/public/vendor/plugins/emojify/images/calendar.png similarity index 100% rename from public/img/emoji/calendar.png rename to public/vendor/plugins/emojify/images/calendar.png diff --git a/public/img/emoji/calling.png b/public/vendor/plugins/emojify/images/calling.png similarity index 100% rename from public/img/emoji/calling.png rename to public/vendor/plugins/emojify/images/calling.png diff --git a/public/img/emoji/camel.png b/public/vendor/plugins/emojify/images/camel.png similarity index 100% rename from public/img/emoji/camel.png rename to public/vendor/plugins/emojify/images/camel.png diff --git a/public/img/emoji/camera.png b/public/vendor/plugins/emojify/images/camera.png similarity index 100% rename from public/img/emoji/camera.png rename to public/vendor/plugins/emojify/images/camera.png diff --git a/public/img/emoji/cancer.png b/public/vendor/plugins/emojify/images/cancer.png similarity index 100% rename from public/img/emoji/cancer.png rename to public/vendor/plugins/emojify/images/cancer.png diff --git a/public/img/emoji/candy.png b/public/vendor/plugins/emojify/images/candy.png similarity index 100% rename from public/img/emoji/candy.png rename to public/vendor/plugins/emojify/images/candy.png diff --git a/public/img/emoji/capital_abcd.png b/public/vendor/plugins/emojify/images/capital_abcd.png similarity index 100% rename from public/img/emoji/capital_abcd.png rename to public/vendor/plugins/emojify/images/capital_abcd.png diff --git a/public/img/emoji/capricorn.png b/public/vendor/plugins/emojify/images/capricorn.png similarity index 100% rename from public/img/emoji/capricorn.png rename to public/vendor/plugins/emojify/images/capricorn.png diff --git a/public/img/emoji/car.png b/public/vendor/plugins/emojify/images/car.png similarity index 100% rename from public/img/emoji/car.png rename to public/vendor/plugins/emojify/images/car.png diff --git a/public/img/emoji/card_index.png b/public/vendor/plugins/emojify/images/card_index.png similarity index 100% rename from public/img/emoji/card_index.png rename to public/vendor/plugins/emojify/images/card_index.png diff --git a/public/img/emoji/carousel_horse.png b/public/vendor/plugins/emojify/images/carousel_horse.png similarity index 100% rename from public/img/emoji/carousel_horse.png rename to public/vendor/plugins/emojify/images/carousel_horse.png diff --git a/public/img/emoji/cat.png b/public/vendor/plugins/emojify/images/cat.png similarity index 100% rename from public/img/emoji/cat.png rename to public/vendor/plugins/emojify/images/cat.png diff --git a/public/img/emoji/cat2.png b/public/vendor/plugins/emojify/images/cat2.png similarity index 100% rename from public/img/emoji/cat2.png rename to public/vendor/plugins/emojify/images/cat2.png diff --git a/public/img/emoji/cd.png b/public/vendor/plugins/emojify/images/cd.png similarity index 100% rename from public/img/emoji/cd.png rename to public/vendor/plugins/emojify/images/cd.png diff --git a/public/img/emoji/chart.png b/public/vendor/plugins/emojify/images/chart.png similarity index 100% rename from public/img/emoji/chart.png rename to public/vendor/plugins/emojify/images/chart.png diff --git a/public/img/emoji/chart_with_downwards_trend.png b/public/vendor/plugins/emojify/images/chart_with_downwards_trend.png similarity index 100% rename from public/img/emoji/chart_with_downwards_trend.png rename to public/vendor/plugins/emojify/images/chart_with_downwards_trend.png diff --git a/public/img/emoji/chart_with_upwards_trend.png b/public/vendor/plugins/emojify/images/chart_with_upwards_trend.png similarity index 100% rename from public/img/emoji/chart_with_upwards_trend.png rename to public/vendor/plugins/emojify/images/chart_with_upwards_trend.png diff --git a/public/img/emoji/checkered_flag.png b/public/vendor/plugins/emojify/images/checkered_flag.png similarity index 100% rename from public/img/emoji/checkered_flag.png rename to public/vendor/plugins/emojify/images/checkered_flag.png diff --git a/public/img/emoji/cherries.png b/public/vendor/plugins/emojify/images/cherries.png similarity index 100% rename from public/img/emoji/cherries.png rename to public/vendor/plugins/emojify/images/cherries.png diff --git a/public/img/emoji/cherry_blossom.png b/public/vendor/plugins/emojify/images/cherry_blossom.png similarity index 100% rename from public/img/emoji/cherry_blossom.png rename to public/vendor/plugins/emojify/images/cherry_blossom.png diff --git a/public/img/emoji/chestnut.png b/public/vendor/plugins/emojify/images/chestnut.png similarity index 100% rename from public/img/emoji/chestnut.png rename to public/vendor/plugins/emojify/images/chestnut.png diff --git a/public/img/emoji/chicken.png b/public/vendor/plugins/emojify/images/chicken.png similarity index 100% rename from public/img/emoji/chicken.png rename to public/vendor/plugins/emojify/images/chicken.png diff --git a/public/img/emoji/children_crossing.png b/public/vendor/plugins/emojify/images/children_crossing.png similarity index 100% rename from public/img/emoji/children_crossing.png rename to public/vendor/plugins/emojify/images/children_crossing.png diff --git a/public/img/emoji/chocolate_bar.png b/public/vendor/plugins/emojify/images/chocolate_bar.png similarity index 100% rename from public/img/emoji/chocolate_bar.png rename to public/vendor/plugins/emojify/images/chocolate_bar.png diff --git a/public/img/emoji/christmas_tree.png b/public/vendor/plugins/emojify/images/christmas_tree.png similarity index 100% rename from public/img/emoji/christmas_tree.png rename to public/vendor/plugins/emojify/images/christmas_tree.png diff --git a/public/img/emoji/church.png b/public/vendor/plugins/emojify/images/church.png similarity index 100% rename from public/img/emoji/church.png rename to public/vendor/plugins/emojify/images/church.png diff --git a/public/img/emoji/cinema.png b/public/vendor/plugins/emojify/images/cinema.png similarity index 100% rename from public/img/emoji/cinema.png rename to public/vendor/plugins/emojify/images/cinema.png diff --git a/public/img/emoji/circus_tent.png b/public/vendor/plugins/emojify/images/circus_tent.png similarity index 100% rename from public/img/emoji/circus_tent.png rename to public/vendor/plugins/emojify/images/circus_tent.png diff --git a/public/img/emoji/city_sunrise.png b/public/vendor/plugins/emojify/images/city_sunrise.png similarity index 100% rename from public/img/emoji/city_sunrise.png rename to public/vendor/plugins/emojify/images/city_sunrise.png diff --git a/public/img/emoji/city_sunset.png b/public/vendor/plugins/emojify/images/city_sunset.png similarity index 100% rename from public/img/emoji/city_sunset.png rename to public/vendor/plugins/emojify/images/city_sunset.png diff --git a/public/img/emoji/cl.png b/public/vendor/plugins/emojify/images/cl.png similarity index 100% rename from public/img/emoji/cl.png rename to public/vendor/plugins/emojify/images/cl.png diff --git a/public/img/emoji/clap.png b/public/vendor/plugins/emojify/images/clap.png similarity index 100% rename from public/img/emoji/clap.png rename to public/vendor/plugins/emojify/images/clap.png diff --git a/public/img/emoji/clapper.png b/public/vendor/plugins/emojify/images/clapper.png similarity index 100% rename from public/img/emoji/clapper.png rename to public/vendor/plugins/emojify/images/clapper.png diff --git a/public/img/emoji/clipboard.png b/public/vendor/plugins/emojify/images/clipboard.png similarity index 100% rename from public/img/emoji/clipboard.png rename to public/vendor/plugins/emojify/images/clipboard.png diff --git a/public/img/emoji/clock1.png b/public/vendor/plugins/emojify/images/clock1.png similarity index 100% rename from public/img/emoji/clock1.png rename to public/vendor/plugins/emojify/images/clock1.png diff --git a/public/img/emoji/clock10.png b/public/vendor/plugins/emojify/images/clock10.png similarity index 100% rename from public/img/emoji/clock10.png rename to public/vendor/plugins/emojify/images/clock10.png diff --git a/public/img/emoji/clock1030.png b/public/vendor/plugins/emojify/images/clock1030.png similarity index 100% rename from public/img/emoji/clock1030.png rename to public/vendor/plugins/emojify/images/clock1030.png diff --git a/public/img/emoji/clock11.png b/public/vendor/plugins/emojify/images/clock11.png similarity index 100% rename from public/img/emoji/clock11.png rename to public/vendor/plugins/emojify/images/clock11.png diff --git a/public/img/emoji/clock1130.png b/public/vendor/plugins/emojify/images/clock1130.png similarity index 100% rename from public/img/emoji/clock1130.png rename to public/vendor/plugins/emojify/images/clock1130.png diff --git a/public/img/emoji/clock12.png b/public/vendor/plugins/emojify/images/clock12.png similarity index 100% rename from public/img/emoji/clock12.png rename to public/vendor/plugins/emojify/images/clock12.png diff --git a/public/img/emoji/clock1230.png b/public/vendor/plugins/emojify/images/clock1230.png similarity index 100% rename from public/img/emoji/clock1230.png rename to public/vendor/plugins/emojify/images/clock1230.png diff --git a/public/img/emoji/clock130.png b/public/vendor/plugins/emojify/images/clock130.png similarity index 100% rename from public/img/emoji/clock130.png rename to public/vendor/plugins/emojify/images/clock130.png diff --git a/public/img/emoji/clock2.png b/public/vendor/plugins/emojify/images/clock2.png similarity index 100% rename from public/img/emoji/clock2.png rename to public/vendor/plugins/emojify/images/clock2.png diff --git a/public/img/emoji/clock230.png b/public/vendor/plugins/emojify/images/clock230.png similarity index 100% rename from public/img/emoji/clock230.png rename to public/vendor/plugins/emojify/images/clock230.png diff --git a/public/img/emoji/clock3.png b/public/vendor/plugins/emojify/images/clock3.png similarity index 100% rename from public/img/emoji/clock3.png rename to public/vendor/plugins/emojify/images/clock3.png diff --git a/public/img/emoji/clock330.png b/public/vendor/plugins/emojify/images/clock330.png similarity index 100% rename from public/img/emoji/clock330.png rename to public/vendor/plugins/emojify/images/clock330.png diff --git a/public/img/emoji/clock4.png b/public/vendor/plugins/emojify/images/clock4.png similarity index 100% rename from public/img/emoji/clock4.png rename to public/vendor/plugins/emojify/images/clock4.png diff --git a/public/img/emoji/clock430.png b/public/vendor/plugins/emojify/images/clock430.png similarity index 100% rename from public/img/emoji/clock430.png rename to public/vendor/plugins/emojify/images/clock430.png diff --git a/public/img/emoji/clock5.png b/public/vendor/plugins/emojify/images/clock5.png similarity index 100% rename from public/img/emoji/clock5.png rename to public/vendor/plugins/emojify/images/clock5.png diff --git a/public/img/emoji/clock530.png b/public/vendor/plugins/emojify/images/clock530.png similarity index 100% rename from public/img/emoji/clock530.png rename to public/vendor/plugins/emojify/images/clock530.png diff --git a/public/img/emoji/clock6.png b/public/vendor/plugins/emojify/images/clock6.png similarity index 100% rename from public/img/emoji/clock6.png rename to public/vendor/plugins/emojify/images/clock6.png diff --git a/public/img/emoji/clock630.png b/public/vendor/plugins/emojify/images/clock630.png similarity index 100% rename from public/img/emoji/clock630.png rename to public/vendor/plugins/emojify/images/clock630.png diff --git a/public/img/emoji/clock7.png b/public/vendor/plugins/emojify/images/clock7.png similarity index 100% rename from public/img/emoji/clock7.png rename to public/vendor/plugins/emojify/images/clock7.png diff --git a/public/img/emoji/clock730.png b/public/vendor/plugins/emojify/images/clock730.png similarity index 100% rename from public/img/emoji/clock730.png rename to public/vendor/plugins/emojify/images/clock730.png diff --git a/public/img/emoji/clock8.png b/public/vendor/plugins/emojify/images/clock8.png similarity index 100% rename from public/img/emoji/clock8.png rename to public/vendor/plugins/emojify/images/clock8.png diff --git a/public/img/emoji/clock830.png b/public/vendor/plugins/emojify/images/clock830.png similarity index 100% rename from public/img/emoji/clock830.png rename to public/vendor/plugins/emojify/images/clock830.png diff --git a/public/img/emoji/clock9.png b/public/vendor/plugins/emojify/images/clock9.png similarity index 100% rename from public/img/emoji/clock9.png rename to public/vendor/plugins/emojify/images/clock9.png diff --git a/public/img/emoji/clock930.png b/public/vendor/plugins/emojify/images/clock930.png similarity index 100% rename from public/img/emoji/clock930.png rename to public/vendor/plugins/emojify/images/clock930.png diff --git a/public/img/emoji/closed_book.png b/public/vendor/plugins/emojify/images/closed_book.png similarity index 100% rename from public/img/emoji/closed_book.png rename to public/vendor/plugins/emojify/images/closed_book.png diff --git a/public/img/emoji/closed_lock_with_key.png b/public/vendor/plugins/emojify/images/closed_lock_with_key.png similarity index 100% rename from public/img/emoji/closed_lock_with_key.png rename to public/vendor/plugins/emojify/images/closed_lock_with_key.png diff --git a/public/img/emoji/closed_umbrella.png b/public/vendor/plugins/emojify/images/closed_umbrella.png similarity index 100% rename from public/img/emoji/closed_umbrella.png rename to public/vendor/plugins/emojify/images/closed_umbrella.png diff --git a/public/img/emoji/cloud.png b/public/vendor/plugins/emojify/images/cloud.png similarity index 100% rename from public/img/emoji/cloud.png rename to public/vendor/plugins/emojify/images/cloud.png diff --git a/public/img/emoji/clubs.png b/public/vendor/plugins/emojify/images/clubs.png similarity index 100% rename from public/img/emoji/clubs.png rename to public/vendor/plugins/emojify/images/clubs.png diff --git a/public/img/emoji/cn.png b/public/vendor/plugins/emojify/images/cn.png similarity index 100% rename from public/img/emoji/cn.png rename to public/vendor/plugins/emojify/images/cn.png diff --git a/public/img/emoji/cocktail.png b/public/vendor/plugins/emojify/images/cocktail.png similarity index 100% rename from public/img/emoji/cocktail.png rename to public/vendor/plugins/emojify/images/cocktail.png diff --git a/public/img/emoji/coffee.png b/public/vendor/plugins/emojify/images/coffee.png similarity index 100% rename from public/img/emoji/coffee.png rename to public/vendor/plugins/emojify/images/coffee.png diff --git a/public/img/emoji/cold_sweat.png b/public/vendor/plugins/emojify/images/cold_sweat.png similarity index 100% rename from public/img/emoji/cold_sweat.png rename to public/vendor/plugins/emojify/images/cold_sweat.png diff --git a/public/img/emoji/collision.png b/public/vendor/plugins/emojify/images/collision.png similarity index 100% rename from public/img/emoji/collision.png rename to public/vendor/plugins/emojify/images/collision.png diff --git a/public/img/emoji/computer.png b/public/vendor/plugins/emojify/images/computer.png similarity index 100% rename from public/img/emoji/computer.png rename to public/vendor/plugins/emojify/images/computer.png diff --git a/public/img/emoji/confetti_ball.png b/public/vendor/plugins/emojify/images/confetti_ball.png similarity index 100% rename from public/img/emoji/confetti_ball.png rename to public/vendor/plugins/emojify/images/confetti_ball.png diff --git a/public/img/emoji/confounded.png b/public/vendor/plugins/emojify/images/confounded.png similarity index 100% rename from public/img/emoji/confounded.png rename to public/vendor/plugins/emojify/images/confounded.png diff --git a/public/img/emoji/confused.png b/public/vendor/plugins/emojify/images/confused.png similarity index 100% rename from public/img/emoji/confused.png rename to public/vendor/plugins/emojify/images/confused.png diff --git a/public/img/emoji/congratulations.png b/public/vendor/plugins/emojify/images/congratulations.png similarity index 100% rename from public/img/emoji/congratulations.png rename to public/vendor/plugins/emojify/images/congratulations.png diff --git a/public/img/emoji/construction.png b/public/vendor/plugins/emojify/images/construction.png similarity index 100% rename from public/img/emoji/construction.png rename to public/vendor/plugins/emojify/images/construction.png diff --git a/public/img/emoji/construction_worker.png b/public/vendor/plugins/emojify/images/construction_worker.png similarity index 100% rename from public/img/emoji/construction_worker.png rename to public/vendor/plugins/emojify/images/construction_worker.png diff --git a/public/img/emoji/convenience_store.png b/public/vendor/plugins/emojify/images/convenience_store.png similarity index 100% rename from public/img/emoji/convenience_store.png rename to public/vendor/plugins/emojify/images/convenience_store.png diff --git a/public/img/emoji/cookie.png b/public/vendor/plugins/emojify/images/cookie.png similarity index 100% rename from public/img/emoji/cookie.png rename to public/vendor/plugins/emojify/images/cookie.png diff --git a/public/img/emoji/cool.png b/public/vendor/plugins/emojify/images/cool.png similarity index 100% rename from public/img/emoji/cool.png rename to public/vendor/plugins/emojify/images/cool.png diff --git a/public/img/emoji/cop.png b/public/vendor/plugins/emojify/images/cop.png similarity index 100% rename from public/img/emoji/cop.png rename to public/vendor/plugins/emojify/images/cop.png diff --git a/public/img/emoji/copyright.png b/public/vendor/plugins/emojify/images/copyright.png similarity index 100% rename from public/img/emoji/copyright.png rename to public/vendor/plugins/emojify/images/copyright.png diff --git a/public/img/emoji/corn.png b/public/vendor/plugins/emojify/images/corn.png similarity index 100% rename from public/img/emoji/corn.png rename to public/vendor/plugins/emojify/images/corn.png diff --git a/public/img/emoji/couple.png b/public/vendor/plugins/emojify/images/couple.png similarity index 100% rename from public/img/emoji/couple.png rename to public/vendor/plugins/emojify/images/couple.png diff --git a/public/img/emoji/couple_with_heart.png b/public/vendor/plugins/emojify/images/couple_with_heart.png similarity index 100% rename from public/img/emoji/couple_with_heart.png rename to public/vendor/plugins/emojify/images/couple_with_heart.png diff --git a/public/img/emoji/couplekiss.png b/public/vendor/plugins/emojify/images/couplekiss.png similarity index 100% rename from public/img/emoji/couplekiss.png rename to public/vendor/plugins/emojify/images/couplekiss.png diff --git a/public/img/emoji/cow.png b/public/vendor/plugins/emojify/images/cow.png similarity index 100% rename from public/img/emoji/cow.png rename to public/vendor/plugins/emojify/images/cow.png diff --git a/public/img/emoji/cow2.png b/public/vendor/plugins/emojify/images/cow2.png similarity index 100% rename from public/img/emoji/cow2.png rename to public/vendor/plugins/emojify/images/cow2.png diff --git a/public/img/emoji/credit_card.png b/public/vendor/plugins/emojify/images/credit_card.png similarity index 100% rename from public/img/emoji/credit_card.png rename to public/vendor/plugins/emojify/images/credit_card.png diff --git a/public/img/emoji/crescent_moon.png b/public/vendor/plugins/emojify/images/crescent_moon.png similarity index 100% rename from public/img/emoji/crescent_moon.png rename to public/vendor/plugins/emojify/images/crescent_moon.png diff --git a/public/img/emoji/crocodile.png b/public/vendor/plugins/emojify/images/crocodile.png similarity index 100% rename from public/img/emoji/crocodile.png rename to public/vendor/plugins/emojify/images/crocodile.png diff --git a/public/img/emoji/crossed_flags.png b/public/vendor/plugins/emojify/images/crossed_flags.png similarity index 100% rename from public/img/emoji/crossed_flags.png rename to public/vendor/plugins/emojify/images/crossed_flags.png diff --git a/public/img/emoji/crown.png b/public/vendor/plugins/emojify/images/crown.png similarity index 100% rename from public/img/emoji/crown.png rename to public/vendor/plugins/emojify/images/crown.png diff --git a/public/img/emoji/cry.png b/public/vendor/plugins/emojify/images/cry.png similarity index 100% rename from public/img/emoji/cry.png rename to public/vendor/plugins/emojify/images/cry.png diff --git a/public/img/emoji/crying_cat_face.png b/public/vendor/plugins/emojify/images/crying_cat_face.png similarity index 100% rename from public/img/emoji/crying_cat_face.png rename to public/vendor/plugins/emojify/images/crying_cat_face.png diff --git a/public/img/emoji/crystal_ball.png b/public/vendor/plugins/emojify/images/crystal_ball.png similarity index 100% rename from public/img/emoji/crystal_ball.png rename to public/vendor/plugins/emojify/images/crystal_ball.png diff --git a/public/img/emoji/cupid.png b/public/vendor/plugins/emojify/images/cupid.png similarity index 100% rename from public/img/emoji/cupid.png rename to public/vendor/plugins/emojify/images/cupid.png diff --git a/public/img/emoji/curly_loop.png b/public/vendor/plugins/emojify/images/curly_loop.png similarity index 100% rename from public/img/emoji/curly_loop.png rename to public/vendor/plugins/emojify/images/curly_loop.png diff --git a/public/img/emoji/currency_exchange.png b/public/vendor/plugins/emojify/images/currency_exchange.png similarity index 100% rename from public/img/emoji/currency_exchange.png rename to public/vendor/plugins/emojify/images/currency_exchange.png diff --git a/public/img/emoji/curry.png b/public/vendor/plugins/emojify/images/curry.png similarity index 100% rename from public/img/emoji/curry.png rename to public/vendor/plugins/emojify/images/curry.png diff --git a/public/img/emoji/custard.png b/public/vendor/plugins/emojify/images/custard.png similarity index 100% rename from public/img/emoji/custard.png rename to public/vendor/plugins/emojify/images/custard.png diff --git a/public/img/emoji/customs.png b/public/vendor/plugins/emojify/images/customs.png similarity index 100% rename from public/img/emoji/customs.png rename to public/vendor/plugins/emojify/images/customs.png diff --git a/public/img/emoji/cyclone.png b/public/vendor/plugins/emojify/images/cyclone.png similarity index 100% rename from public/img/emoji/cyclone.png rename to public/vendor/plugins/emojify/images/cyclone.png diff --git a/public/img/emoji/dancer.png b/public/vendor/plugins/emojify/images/dancer.png similarity index 100% rename from public/img/emoji/dancer.png rename to public/vendor/plugins/emojify/images/dancer.png diff --git a/public/img/emoji/dancers.png b/public/vendor/plugins/emojify/images/dancers.png similarity index 100% rename from public/img/emoji/dancers.png rename to public/vendor/plugins/emojify/images/dancers.png diff --git a/public/img/emoji/dango.png b/public/vendor/plugins/emojify/images/dango.png similarity index 100% rename from public/img/emoji/dango.png rename to public/vendor/plugins/emojify/images/dango.png diff --git a/public/img/emoji/dart.png b/public/vendor/plugins/emojify/images/dart.png similarity index 100% rename from public/img/emoji/dart.png rename to public/vendor/plugins/emojify/images/dart.png diff --git a/public/img/emoji/dash.png b/public/vendor/plugins/emojify/images/dash.png similarity index 100% rename from public/img/emoji/dash.png rename to public/vendor/plugins/emojify/images/dash.png diff --git a/public/img/emoji/date.png b/public/vendor/plugins/emojify/images/date.png similarity index 100% rename from public/img/emoji/date.png rename to public/vendor/plugins/emojify/images/date.png diff --git a/public/img/emoji/de.png b/public/vendor/plugins/emojify/images/de.png similarity index 100% rename from public/img/emoji/de.png rename to public/vendor/plugins/emojify/images/de.png diff --git a/public/img/emoji/deciduous_tree.png b/public/vendor/plugins/emojify/images/deciduous_tree.png similarity index 100% rename from public/img/emoji/deciduous_tree.png rename to public/vendor/plugins/emojify/images/deciduous_tree.png diff --git a/public/img/emoji/department_store.png b/public/vendor/plugins/emojify/images/department_store.png similarity index 100% rename from public/img/emoji/department_store.png rename to public/vendor/plugins/emojify/images/department_store.png diff --git a/public/img/emoji/diamond_shape_with_a_dot_inside.png b/public/vendor/plugins/emojify/images/diamond_shape_with_a_dot_inside.png similarity index 100% rename from public/img/emoji/diamond_shape_with_a_dot_inside.png rename to public/vendor/plugins/emojify/images/diamond_shape_with_a_dot_inside.png diff --git a/public/img/emoji/diamonds.png b/public/vendor/plugins/emojify/images/diamonds.png similarity index 100% rename from public/img/emoji/diamonds.png rename to public/vendor/plugins/emojify/images/diamonds.png diff --git a/public/img/emoji/disappointed.png b/public/vendor/plugins/emojify/images/disappointed.png similarity index 100% rename from public/img/emoji/disappointed.png rename to public/vendor/plugins/emojify/images/disappointed.png diff --git a/public/img/emoji/disappointed_relieved.png b/public/vendor/plugins/emojify/images/disappointed_relieved.png similarity index 100% rename from public/img/emoji/disappointed_relieved.png rename to public/vendor/plugins/emojify/images/disappointed_relieved.png diff --git a/public/img/emoji/dizzy.png b/public/vendor/plugins/emojify/images/dizzy.png similarity index 100% rename from public/img/emoji/dizzy.png rename to public/vendor/plugins/emojify/images/dizzy.png diff --git a/public/img/emoji/dizzy_face.png b/public/vendor/plugins/emojify/images/dizzy_face.png similarity index 100% rename from public/img/emoji/dizzy_face.png rename to public/vendor/plugins/emojify/images/dizzy_face.png diff --git a/public/img/emoji/do_not_litter.png b/public/vendor/plugins/emojify/images/do_not_litter.png similarity index 100% rename from public/img/emoji/do_not_litter.png rename to public/vendor/plugins/emojify/images/do_not_litter.png diff --git a/public/img/emoji/dog.png b/public/vendor/plugins/emojify/images/dog.png similarity index 100% rename from public/img/emoji/dog.png rename to public/vendor/plugins/emojify/images/dog.png diff --git a/public/img/emoji/dog2.png b/public/vendor/plugins/emojify/images/dog2.png similarity index 100% rename from public/img/emoji/dog2.png rename to public/vendor/plugins/emojify/images/dog2.png diff --git a/public/img/emoji/dollar.png b/public/vendor/plugins/emojify/images/dollar.png similarity index 100% rename from public/img/emoji/dollar.png rename to public/vendor/plugins/emojify/images/dollar.png diff --git a/public/img/emoji/dolls.png b/public/vendor/plugins/emojify/images/dolls.png similarity index 100% rename from public/img/emoji/dolls.png rename to public/vendor/plugins/emojify/images/dolls.png diff --git a/public/img/emoji/dolphin.png b/public/vendor/plugins/emojify/images/dolphin.png similarity index 100% rename from public/img/emoji/dolphin.png rename to public/vendor/plugins/emojify/images/dolphin.png diff --git a/public/img/emoji/donut.png b/public/vendor/plugins/emojify/images/donut.png similarity index 100% rename from public/img/emoji/donut.png rename to public/vendor/plugins/emojify/images/donut.png diff --git a/public/img/emoji/door.png b/public/vendor/plugins/emojify/images/door.png similarity index 100% rename from public/img/emoji/door.png rename to public/vendor/plugins/emojify/images/door.png diff --git a/public/img/emoji/doughnut.png b/public/vendor/plugins/emojify/images/doughnut.png similarity index 100% rename from public/img/emoji/doughnut.png rename to public/vendor/plugins/emojify/images/doughnut.png diff --git a/public/img/emoji/dragon.png b/public/vendor/plugins/emojify/images/dragon.png similarity index 100% rename from public/img/emoji/dragon.png rename to public/vendor/plugins/emojify/images/dragon.png diff --git a/public/img/emoji/dragon_face.png b/public/vendor/plugins/emojify/images/dragon_face.png similarity index 100% rename from public/img/emoji/dragon_face.png rename to public/vendor/plugins/emojify/images/dragon_face.png diff --git a/public/img/emoji/dress.png b/public/vendor/plugins/emojify/images/dress.png similarity index 100% rename from public/img/emoji/dress.png rename to public/vendor/plugins/emojify/images/dress.png diff --git a/public/img/emoji/dromedary_camel.png b/public/vendor/plugins/emojify/images/dromedary_camel.png similarity index 100% rename from public/img/emoji/dromedary_camel.png rename to public/vendor/plugins/emojify/images/dromedary_camel.png diff --git a/public/img/emoji/droplet.png b/public/vendor/plugins/emojify/images/droplet.png similarity index 100% rename from public/img/emoji/droplet.png rename to public/vendor/plugins/emojify/images/droplet.png diff --git a/public/img/emoji/dvd.png b/public/vendor/plugins/emojify/images/dvd.png similarity index 100% rename from public/img/emoji/dvd.png rename to public/vendor/plugins/emojify/images/dvd.png diff --git a/public/img/emoji/e-mail.png b/public/vendor/plugins/emojify/images/e-mail.png similarity index 100% rename from public/img/emoji/e-mail.png rename to public/vendor/plugins/emojify/images/e-mail.png diff --git a/public/img/emoji/ear.png b/public/vendor/plugins/emojify/images/ear.png similarity index 100% rename from public/img/emoji/ear.png rename to public/vendor/plugins/emojify/images/ear.png diff --git a/public/img/emoji/ear_of_rice.png b/public/vendor/plugins/emojify/images/ear_of_rice.png similarity index 100% rename from public/img/emoji/ear_of_rice.png rename to public/vendor/plugins/emojify/images/ear_of_rice.png diff --git a/public/img/emoji/earth_africa.png b/public/vendor/plugins/emojify/images/earth_africa.png similarity index 100% rename from public/img/emoji/earth_africa.png rename to public/vendor/plugins/emojify/images/earth_africa.png diff --git a/public/img/emoji/earth_americas.png b/public/vendor/plugins/emojify/images/earth_americas.png similarity index 100% rename from public/img/emoji/earth_americas.png rename to public/vendor/plugins/emojify/images/earth_americas.png diff --git a/public/img/emoji/earth_asia.png b/public/vendor/plugins/emojify/images/earth_asia.png similarity index 100% rename from public/img/emoji/earth_asia.png rename to public/vendor/plugins/emojify/images/earth_asia.png diff --git a/public/img/emoji/egg.png b/public/vendor/plugins/emojify/images/egg.png similarity index 100% rename from public/img/emoji/egg.png rename to public/vendor/plugins/emojify/images/egg.png diff --git a/public/img/emoji/eggplant.png b/public/vendor/plugins/emojify/images/eggplant.png similarity index 100% rename from public/img/emoji/eggplant.png rename to public/vendor/plugins/emojify/images/eggplant.png diff --git a/public/img/emoji/eight.png b/public/vendor/plugins/emojify/images/eight.png similarity index 100% rename from public/img/emoji/eight.png rename to public/vendor/plugins/emojify/images/eight.png diff --git a/public/img/emoji/eight_pointed_black_star.png b/public/vendor/plugins/emojify/images/eight_pointed_black_star.png similarity index 100% rename from public/img/emoji/eight_pointed_black_star.png rename to public/vendor/plugins/emojify/images/eight_pointed_black_star.png diff --git a/public/img/emoji/eight_spoked_asterisk.png b/public/vendor/plugins/emojify/images/eight_spoked_asterisk.png similarity index 100% rename from public/img/emoji/eight_spoked_asterisk.png rename to public/vendor/plugins/emojify/images/eight_spoked_asterisk.png diff --git a/public/img/emoji/electric_plug.png b/public/vendor/plugins/emojify/images/electric_plug.png similarity index 100% rename from public/img/emoji/electric_plug.png rename to public/vendor/plugins/emojify/images/electric_plug.png diff --git a/public/img/emoji/elephant.png b/public/vendor/plugins/emojify/images/elephant.png similarity index 100% rename from public/img/emoji/elephant.png rename to public/vendor/plugins/emojify/images/elephant.png diff --git a/public/img/emoji/email.png b/public/vendor/plugins/emojify/images/email.png similarity index 100% rename from public/img/emoji/email.png rename to public/vendor/plugins/emojify/images/email.png diff --git a/public/img/emoji/end.png b/public/vendor/plugins/emojify/images/end.png similarity index 100% rename from public/img/emoji/end.png rename to public/vendor/plugins/emojify/images/end.png diff --git a/public/img/emoji/envelope.png b/public/vendor/plugins/emojify/images/envelope.png similarity index 100% rename from public/img/emoji/envelope.png rename to public/vendor/plugins/emojify/images/envelope.png diff --git a/public/img/emoji/es.png b/public/vendor/plugins/emojify/images/es.png similarity index 100% rename from public/img/emoji/es.png rename to public/vendor/plugins/emojify/images/es.png diff --git a/public/img/emoji/euro.png b/public/vendor/plugins/emojify/images/euro.png similarity index 100% rename from public/img/emoji/euro.png rename to public/vendor/plugins/emojify/images/euro.png diff --git a/public/img/emoji/european_castle.png b/public/vendor/plugins/emojify/images/european_castle.png similarity index 100% rename from public/img/emoji/european_castle.png rename to public/vendor/plugins/emojify/images/european_castle.png diff --git a/public/img/emoji/european_post_office.png b/public/vendor/plugins/emojify/images/european_post_office.png similarity index 100% rename from public/img/emoji/european_post_office.png rename to public/vendor/plugins/emojify/images/european_post_office.png diff --git a/public/img/emoji/evergreen_tree.png b/public/vendor/plugins/emojify/images/evergreen_tree.png similarity index 100% rename from public/img/emoji/evergreen_tree.png rename to public/vendor/plugins/emojify/images/evergreen_tree.png diff --git a/public/img/emoji/exclamation.png b/public/vendor/plugins/emojify/images/exclamation.png similarity index 100% rename from public/img/emoji/exclamation.png rename to public/vendor/plugins/emojify/images/exclamation.png diff --git a/public/img/emoji/expressionless.png b/public/vendor/plugins/emojify/images/expressionless.png similarity index 100% rename from public/img/emoji/expressionless.png rename to public/vendor/plugins/emojify/images/expressionless.png diff --git a/public/img/emoji/eyeglasses.png b/public/vendor/plugins/emojify/images/eyeglasses.png similarity index 100% rename from public/img/emoji/eyeglasses.png rename to public/vendor/plugins/emojify/images/eyeglasses.png diff --git a/public/img/emoji/eyes.png b/public/vendor/plugins/emojify/images/eyes.png similarity index 100% rename from public/img/emoji/eyes.png rename to public/vendor/plugins/emojify/images/eyes.png diff --git a/public/img/emoji/facepunch.png b/public/vendor/plugins/emojify/images/facepunch.png similarity index 100% rename from public/img/emoji/facepunch.png rename to public/vendor/plugins/emojify/images/facepunch.png diff --git a/public/img/emoji/factory.png b/public/vendor/plugins/emojify/images/factory.png similarity index 100% rename from public/img/emoji/factory.png rename to public/vendor/plugins/emojify/images/factory.png diff --git a/public/img/emoji/fallen_leaf.png b/public/vendor/plugins/emojify/images/fallen_leaf.png similarity index 100% rename from public/img/emoji/fallen_leaf.png rename to public/vendor/plugins/emojify/images/fallen_leaf.png diff --git a/public/img/emoji/family.png b/public/vendor/plugins/emojify/images/family.png similarity index 100% rename from public/img/emoji/family.png rename to public/vendor/plugins/emojify/images/family.png diff --git a/public/img/emoji/fast_forward.png b/public/vendor/plugins/emojify/images/fast_forward.png similarity index 100% rename from public/img/emoji/fast_forward.png rename to public/vendor/plugins/emojify/images/fast_forward.png diff --git a/public/img/emoji/fax.png b/public/vendor/plugins/emojify/images/fax.png similarity index 100% rename from public/img/emoji/fax.png rename to public/vendor/plugins/emojify/images/fax.png diff --git a/public/img/emoji/fearful.png b/public/vendor/plugins/emojify/images/fearful.png similarity index 100% rename from public/img/emoji/fearful.png rename to public/vendor/plugins/emojify/images/fearful.png diff --git a/public/img/emoji/feelsgood.png b/public/vendor/plugins/emojify/images/feelsgood.png similarity index 100% rename from public/img/emoji/feelsgood.png rename to public/vendor/plugins/emojify/images/feelsgood.png diff --git a/public/img/emoji/feet.png b/public/vendor/plugins/emojify/images/feet.png similarity index 100% rename from public/img/emoji/feet.png rename to public/vendor/plugins/emojify/images/feet.png diff --git a/public/img/emoji/ferris_wheel.png b/public/vendor/plugins/emojify/images/ferris_wheel.png similarity index 100% rename from public/img/emoji/ferris_wheel.png rename to public/vendor/plugins/emojify/images/ferris_wheel.png diff --git a/public/img/emoji/file_folder.png b/public/vendor/plugins/emojify/images/file_folder.png similarity index 100% rename from public/img/emoji/file_folder.png rename to public/vendor/plugins/emojify/images/file_folder.png diff --git a/public/img/emoji/finnadie.png b/public/vendor/plugins/emojify/images/finnadie.png similarity index 100% rename from public/img/emoji/finnadie.png rename to public/vendor/plugins/emojify/images/finnadie.png diff --git a/public/img/emoji/fire.png b/public/vendor/plugins/emojify/images/fire.png similarity index 100% rename from public/img/emoji/fire.png rename to public/vendor/plugins/emojify/images/fire.png diff --git a/public/img/emoji/fire_engine.png b/public/vendor/plugins/emojify/images/fire_engine.png similarity index 100% rename from public/img/emoji/fire_engine.png rename to public/vendor/plugins/emojify/images/fire_engine.png diff --git a/public/img/emoji/fireworks.png b/public/vendor/plugins/emojify/images/fireworks.png similarity index 100% rename from public/img/emoji/fireworks.png rename to public/vendor/plugins/emojify/images/fireworks.png diff --git a/public/img/emoji/first_quarter_moon.png b/public/vendor/plugins/emojify/images/first_quarter_moon.png similarity index 100% rename from public/img/emoji/first_quarter_moon.png rename to public/vendor/plugins/emojify/images/first_quarter_moon.png diff --git a/public/img/emoji/first_quarter_moon_with_face.png b/public/vendor/plugins/emojify/images/first_quarter_moon_with_face.png similarity index 100% rename from public/img/emoji/first_quarter_moon_with_face.png rename to public/vendor/plugins/emojify/images/first_quarter_moon_with_face.png diff --git a/public/img/emoji/fish.png b/public/vendor/plugins/emojify/images/fish.png similarity index 100% rename from public/img/emoji/fish.png rename to public/vendor/plugins/emojify/images/fish.png diff --git a/public/img/emoji/fish_cake.png b/public/vendor/plugins/emojify/images/fish_cake.png similarity index 100% rename from public/img/emoji/fish_cake.png rename to public/vendor/plugins/emojify/images/fish_cake.png diff --git a/public/img/emoji/fishing_pole_and_fish.png b/public/vendor/plugins/emojify/images/fishing_pole_and_fish.png similarity index 100% rename from public/img/emoji/fishing_pole_and_fish.png rename to public/vendor/plugins/emojify/images/fishing_pole_and_fish.png diff --git a/public/img/emoji/fist.png b/public/vendor/plugins/emojify/images/fist.png similarity index 100% rename from public/img/emoji/fist.png rename to public/vendor/plugins/emojify/images/fist.png diff --git a/public/img/emoji/five.png b/public/vendor/plugins/emojify/images/five.png similarity index 100% rename from public/img/emoji/five.png rename to public/vendor/plugins/emojify/images/five.png diff --git a/public/img/emoji/flags.png b/public/vendor/plugins/emojify/images/flags.png similarity index 100% rename from public/img/emoji/flags.png rename to public/vendor/plugins/emojify/images/flags.png diff --git a/public/img/emoji/flashlight.png b/public/vendor/plugins/emojify/images/flashlight.png similarity index 100% rename from public/img/emoji/flashlight.png rename to public/vendor/plugins/emojify/images/flashlight.png diff --git a/public/img/emoji/floppy_disk.png b/public/vendor/plugins/emojify/images/floppy_disk.png similarity index 100% rename from public/img/emoji/floppy_disk.png rename to public/vendor/plugins/emojify/images/floppy_disk.png diff --git a/public/img/emoji/flower_playing_cards.png b/public/vendor/plugins/emojify/images/flower_playing_cards.png similarity index 100% rename from public/img/emoji/flower_playing_cards.png rename to public/vendor/plugins/emojify/images/flower_playing_cards.png diff --git a/public/img/emoji/flushed.png b/public/vendor/plugins/emojify/images/flushed.png similarity index 100% rename from public/img/emoji/flushed.png rename to public/vendor/plugins/emojify/images/flushed.png diff --git a/public/img/emoji/foggy.png b/public/vendor/plugins/emojify/images/foggy.png similarity index 100% rename from public/img/emoji/foggy.png rename to public/vendor/plugins/emojify/images/foggy.png diff --git a/public/img/emoji/football.png b/public/vendor/plugins/emojify/images/football.png similarity index 100% rename from public/img/emoji/football.png rename to public/vendor/plugins/emojify/images/football.png diff --git a/public/img/emoji/fork_and_knife.png b/public/vendor/plugins/emojify/images/fork_and_knife.png similarity index 100% rename from public/img/emoji/fork_and_knife.png rename to public/vendor/plugins/emojify/images/fork_and_knife.png diff --git a/public/img/emoji/fountain.png b/public/vendor/plugins/emojify/images/fountain.png similarity index 100% rename from public/img/emoji/fountain.png rename to public/vendor/plugins/emojify/images/fountain.png diff --git a/public/img/emoji/four.png b/public/vendor/plugins/emojify/images/four.png similarity index 100% rename from public/img/emoji/four.png rename to public/vendor/plugins/emojify/images/four.png diff --git a/public/img/emoji/four_leaf_clover.png b/public/vendor/plugins/emojify/images/four_leaf_clover.png similarity index 100% rename from public/img/emoji/four_leaf_clover.png rename to public/vendor/plugins/emojify/images/four_leaf_clover.png diff --git a/public/img/emoji/fr.png b/public/vendor/plugins/emojify/images/fr.png similarity index 100% rename from public/img/emoji/fr.png rename to public/vendor/plugins/emojify/images/fr.png diff --git a/public/img/emoji/free.png b/public/vendor/plugins/emojify/images/free.png similarity index 100% rename from public/img/emoji/free.png rename to public/vendor/plugins/emojify/images/free.png diff --git a/public/img/emoji/fried_shrimp.png b/public/vendor/plugins/emojify/images/fried_shrimp.png similarity index 100% rename from public/img/emoji/fried_shrimp.png rename to public/vendor/plugins/emojify/images/fried_shrimp.png diff --git a/public/img/emoji/fries.png b/public/vendor/plugins/emojify/images/fries.png similarity index 100% rename from public/img/emoji/fries.png rename to public/vendor/plugins/emojify/images/fries.png diff --git a/public/img/emoji/frog.png b/public/vendor/plugins/emojify/images/frog.png similarity index 100% rename from public/img/emoji/frog.png rename to public/vendor/plugins/emojify/images/frog.png diff --git a/public/img/emoji/frowning.png b/public/vendor/plugins/emojify/images/frowning.png similarity index 100% rename from public/img/emoji/frowning.png rename to public/vendor/plugins/emojify/images/frowning.png diff --git a/public/img/emoji/fu.png b/public/vendor/plugins/emojify/images/fu.png similarity index 100% rename from public/img/emoji/fu.png rename to public/vendor/plugins/emojify/images/fu.png diff --git a/public/img/emoji/fuelpump.png b/public/vendor/plugins/emojify/images/fuelpump.png similarity index 100% rename from public/img/emoji/fuelpump.png rename to public/vendor/plugins/emojify/images/fuelpump.png diff --git a/public/img/emoji/full_moon.png b/public/vendor/plugins/emojify/images/full_moon.png similarity index 100% rename from public/img/emoji/full_moon.png rename to public/vendor/plugins/emojify/images/full_moon.png diff --git a/public/img/emoji/full_moon_with_face.png b/public/vendor/plugins/emojify/images/full_moon_with_face.png similarity index 100% rename from public/img/emoji/full_moon_with_face.png rename to public/vendor/plugins/emojify/images/full_moon_with_face.png diff --git a/public/img/emoji/game_die.png b/public/vendor/plugins/emojify/images/game_die.png similarity index 100% rename from public/img/emoji/game_die.png rename to public/vendor/plugins/emojify/images/game_die.png diff --git a/public/img/emoji/gb.png b/public/vendor/plugins/emojify/images/gb.png similarity index 100% rename from public/img/emoji/gb.png rename to public/vendor/plugins/emojify/images/gb.png diff --git a/public/img/emoji/gem.png b/public/vendor/plugins/emojify/images/gem.png similarity index 100% rename from public/img/emoji/gem.png rename to public/vendor/plugins/emojify/images/gem.png diff --git a/public/img/emoji/gemini.png b/public/vendor/plugins/emojify/images/gemini.png similarity index 100% rename from public/img/emoji/gemini.png rename to public/vendor/plugins/emojify/images/gemini.png diff --git a/public/img/emoji/ghost.png b/public/vendor/plugins/emojify/images/ghost.png similarity index 100% rename from public/img/emoji/ghost.png rename to public/vendor/plugins/emojify/images/ghost.png diff --git a/public/img/emoji/gift.png b/public/vendor/plugins/emojify/images/gift.png similarity index 100% rename from public/img/emoji/gift.png rename to public/vendor/plugins/emojify/images/gift.png diff --git a/public/img/emoji/gift_heart.png b/public/vendor/plugins/emojify/images/gift_heart.png similarity index 100% rename from public/img/emoji/gift_heart.png rename to public/vendor/plugins/emojify/images/gift_heart.png diff --git a/public/img/emoji/girl.png b/public/vendor/plugins/emojify/images/girl.png similarity index 100% rename from public/img/emoji/girl.png rename to public/vendor/plugins/emojify/images/girl.png diff --git a/public/img/emoji/globe_with_meridians.png b/public/vendor/plugins/emojify/images/globe_with_meridians.png similarity index 100% rename from public/img/emoji/globe_with_meridians.png rename to public/vendor/plugins/emojify/images/globe_with_meridians.png diff --git a/public/img/emoji/goat.png b/public/vendor/plugins/emojify/images/goat.png similarity index 100% rename from public/img/emoji/goat.png rename to public/vendor/plugins/emojify/images/goat.png diff --git a/public/img/emoji/goberserk.png b/public/vendor/plugins/emojify/images/goberserk.png similarity index 100% rename from public/img/emoji/goberserk.png rename to public/vendor/plugins/emojify/images/goberserk.png diff --git a/public/img/emoji/godmode.png b/public/vendor/plugins/emojify/images/godmode.png similarity index 100% rename from public/img/emoji/godmode.png rename to public/vendor/plugins/emojify/images/godmode.png diff --git a/public/img/emoji/golf.png b/public/vendor/plugins/emojify/images/golf.png similarity index 100% rename from public/img/emoji/golf.png rename to public/vendor/plugins/emojify/images/golf.png diff --git a/public/img/emoji/grapes.png b/public/vendor/plugins/emojify/images/grapes.png similarity index 100% rename from public/img/emoji/grapes.png rename to public/vendor/plugins/emojify/images/grapes.png diff --git a/public/img/emoji/green_apple.png b/public/vendor/plugins/emojify/images/green_apple.png similarity index 100% rename from public/img/emoji/green_apple.png rename to public/vendor/plugins/emojify/images/green_apple.png diff --git a/public/img/emoji/green_book.png b/public/vendor/plugins/emojify/images/green_book.png similarity index 100% rename from public/img/emoji/green_book.png rename to public/vendor/plugins/emojify/images/green_book.png diff --git a/public/img/emoji/green_heart.png b/public/vendor/plugins/emojify/images/green_heart.png similarity index 100% rename from public/img/emoji/green_heart.png rename to public/vendor/plugins/emojify/images/green_heart.png diff --git a/public/img/emoji/grey_exclamation.png b/public/vendor/plugins/emojify/images/grey_exclamation.png similarity index 100% rename from public/img/emoji/grey_exclamation.png rename to public/vendor/plugins/emojify/images/grey_exclamation.png diff --git a/public/img/emoji/grey_question.png b/public/vendor/plugins/emojify/images/grey_question.png similarity index 100% rename from public/img/emoji/grey_question.png rename to public/vendor/plugins/emojify/images/grey_question.png diff --git a/public/img/emoji/grimacing.png b/public/vendor/plugins/emojify/images/grimacing.png similarity index 100% rename from public/img/emoji/grimacing.png rename to public/vendor/plugins/emojify/images/grimacing.png diff --git a/public/img/emoji/grin.png b/public/vendor/plugins/emojify/images/grin.png similarity index 100% rename from public/img/emoji/grin.png rename to public/vendor/plugins/emojify/images/grin.png diff --git a/public/img/emoji/grinning.png b/public/vendor/plugins/emojify/images/grinning.png similarity index 100% rename from public/img/emoji/grinning.png rename to public/vendor/plugins/emojify/images/grinning.png diff --git a/public/img/emoji/guardsman.png b/public/vendor/plugins/emojify/images/guardsman.png similarity index 100% rename from public/img/emoji/guardsman.png rename to public/vendor/plugins/emojify/images/guardsman.png diff --git a/public/img/emoji/guitar.png b/public/vendor/plugins/emojify/images/guitar.png similarity index 100% rename from public/img/emoji/guitar.png rename to public/vendor/plugins/emojify/images/guitar.png diff --git a/public/img/emoji/gun.png b/public/vendor/plugins/emojify/images/gun.png similarity index 100% rename from public/img/emoji/gun.png rename to public/vendor/plugins/emojify/images/gun.png diff --git a/public/img/emoji/haircut.png b/public/vendor/plugins/emojify/images/haircut.png similarity index 100% rename from public/img/emoji/haircut.png rename to public/vendor/plugins/emojify/images/haircut.png diff --git a/public/img/emoji/hamburger.png b/public/vendor/plugins/emojify/images/hamburger.png similarity index 100% rename from public/img/emoji/hamburger.png rename to public/vendor/plugins/emojify/images/hamburger.png diff --git a/public/img/emoji/hammer.png b/public/vendor/plugins/emojify/images/hammer.png similarity index 100% rename from public/img/emoji/hammer.png rename to public/vendor/plugins/emojify/images/hammer.png diff --git a/public/img/emoji/hamster.png b/public/vendor/plugins/emojify/images/hamster.png similarity index 100% rename from public/img/emoji/hamster.png rename to public/vendor/plugins/emojify/images/hamster.png diff --git a/public/img/emoji/hand.png b/public/vendor/plugins/emojify/images/hand.png similarity index 100% rename from public/img/emoji/hand.png rename to public/vendor/plugins/emojify/images/hand.png diff --git a/public/img/emoji/handbag.png b/public/vendor/plugins/emojify/images/handbag.png similarity index 100% rename from public/img/emoji/handbag.png rename to public/vendor/plugins/emojify/images/handbag.png diff --git a/public/img/emoji/hankey.png b/public/vendor/plugins/emojify/images/hankey.png similarity index 100% rename from public/img/emoji/hankey.png rename to public/vendor/plugins/emojify/images/hankey.png diff --git a/public/img/emoji/hash.png b/public/vendor/plugins/emojify/images/hash.png similarity index 100% rename from public/img/emoji/hash.png rename to public/vendor/plugins/emojify/images/hash.png diff --git a/public/img/emoji/hatched_chick.png b/public/vendor/plugins/emojify/images/hatched_chick.png similarity index 100% rename from public/img/emoji/hatched_chick.png rename to public/vendor/plugins/emojify/images/hatched_chick.png diff --git a/public/img/emoji/hatching_chick.png b/public/vendor/plugins/emojify/images/hatching_chick.png similarity index 100% rename from public/img/emoji/hatching_chick.png rename to public/vendor/plugins/emojify/images/hatching_chick.png diff --git a/public/img/emoji/headphones.png b/public/vendor/plugins/emojify/images/headphones.png similarity index 100% rename from public/img/emoji/headphones.png rename to public/vendor/plugins/emojify/images/headphones.png diff --git a/public/img/emoji/hear_no_evil.png b/public/vendor/plugins/emojify/images/hear_no_evil.png similarity index 100% rename from public/img/emoji/hear_no_evil.png rename to public/vendor/plugins/emojify/images/hear_no_evil.png diff --git a/public/img/emoji/heart.png b/public/vendor/plugins/emojify/images/heart.png similarity index 100% rename from public/img/emoji/heart.png rename to public/vendor/plugins/emojify/images/heart.png diff --git a/public/img/emoji/heart_decoration.png b/public/vendor/plugins/emojify/images/heart_decoration.png similarity index 100% rename from public/img/emoji/heart_decoration.png rename to public/vendor/plugins/emojify/images/heart_decoration.png diff --git a/public/img/emoji/heart_eyes.png b/public/vendor/plugins/emojify/images/heart_eyes.png similarity index 100% rename from public/img/emoji/heart_eyes.png rename to public/vendor/plugins/emojify/images/heart_eyes.png diff --git a/public/img/emoji/heart_eyes_cat.png b/public/vendor/plugins/emojify/images/heart_eyes_cat.png similarity index 100% rename from public/img/emoji/heart_eyes_cat.png rename to public/vendor/plugins/emojify/images/heart_eyes_cat.png diff --git a/public/img/emoji/heartbeat.png b/public/vendor/plugins/emojify/images/heartbeat.png similarity index 100% rename from public/img/emoji/heartbeat.png rename to public/vendor/plugins/emojify/images/heartbeat.png diff --git a/public/img/emoji/heartpulse.png b/public/vendor/plugins/emojify/images/heartpulse.png similarity index 100% rename from public/img/emoji/heartpulse.png rename to public/vendor/plugins/emojify/images/heartpulse.png diff --git a/public/img/emoji/hearts.png b/public/vendor/plugins/emojify/images/hearts.png similarity index 100% rename from public/img/emoji/hearts.png rename to public/vendor/plugins/emojify/images/hearts.png diff --git a/public/img/emoji/heavy_check_mark.png b/public/vendor/plugins/emojify/images/heavy_check_mark.png similarity index 100% rename from public/img/emoji/heavy_check_mark.png rename to public/vendor/plugins/emojify/images/heavy_check_mark.png diff --git a/public/img/emoji/heavy_division_sign.png b/public/vendor/plugins/emojify/images/heavy_division_sign.png similarity index 100% rename from public/img/emoji/heavy_division_sign.png rename to public/vendor/plugins/emojify/images/heavy_division_sign.png diff --git a/public/img/emoji/heavy_dollar_sign.png b/public/vendor/plugins/emojify/images/heavy_dollar_sign.png similarity index 100% rename from public/img/emoji/heavy_dollar_sign.png rename to public/vendor/plugins/emojify/images/heavy_dollar_sign.png diff --git a/public/img/emoji/heavy_exclamation_mark.png b/public/vendor/plugins/emojify/images/heavy_exclamation_mark.png similarity index 100% rename from public/img/emoji/heavy_exclamation_mark.png rename to public/vendor/plugins/emojify/images/heavy_exclamation_mark.png diff --git a/public/img/emoji/heavy_minus_sign.png b/public/vendor/plugins/emojify/images/heavy_minus_sign.png similarity index 100% rename from public/img/emoji/heavy_minus_sign.png rename to public/vendor/plugins/emojify/images/heavy_minus_sign.png diff --git a/public/img/emoji/heavy_multiplication_x.png b/public/vendor/plugins/emojify/images/heavy_multiplication_x.png similarity index 100% rename from public/img/emoji/heavy_multiplication_x.png rename to public/vendor/plugins/emojify/images/heavy_multiplication_x.png diff --git a/public/img/emoji/heavy_plus_sign.png b/public/vendor/plugins/emojify/images/heavy_plus_sign.png similarity index 100% rename from public/img/emoji/heavy_plus_sign.png rename to public/vendor/plugins/emojify/images/heavy_plus_sign.png diff --git a/public/img/emoji/helicopter.png b/public/vendor/plugins/emojify/images/helicopter.png similarity index 100% rename from public/img/emoji/helicopter.png rename to public/vendor/plugins/emojify/images/helicopter.png diff --git a/public/img/emoji/herb.png b/public/vendor/plugins/emojify/images/herb.png similarity index 100% rename from public/img/emoji/herb.png rename to public/vendor/plugins/emojify/images/herb.png diff --git a/public/img/emoji/hibiscus.png b/public/vendor/plugins/emojify/images/hibiscus.png similarity index 100% rename from public/img/emoji/hibiscus.png rename to public/vendor/plugins/emojify/images/hibiscus.png diff --git a/public/img/emoji/high_brightness.png b/public/vendor/plugins/emojify/images/high_brightness.png similarity index 100% rename from public/img/emoji/high_brightness.png rename to public/vendor/plugins/emojify/images/high_brightness.png diff --git a/public/img/emoji/high_heel.png b/public/vendor/plugins/emojify/images/high_heel.png similarity index 100% rename from public/img/emoji/high_heel.png rename to public/vendor/plugins/emojify/images/high_heel.png diff --git a/public/img/emoji/hocho.png b/public/vendor/plugins/emojify/images/hocho.png similarity index 100% rename from public/img/emoji/hocho.png rename to public/vendor/plugins/emojify/images/hocho.png diff --git a/public/img/emoji/honey_pot.png b/public/vendor/plugins/emojify/images/honey_pot.png similarity index 100% rename from public/img/emoji/honey_pot.png rename to public/vendor/plugins/emojify/images/honey_pot.png diff --git a/public/img/emoji/honeybee.png b/public/vendor/plugins/emojify/images/honeybee.png similarity index 100% rename from public/img/emoji/honeybee.png rename to public/vendor/plugins/emojify/images/honeybee.png diff --git a/public/img/emoji/horse.png b/public/vendor/plugins/emojify/images/horse.png similarity index 100% rename from public/img/emoji/horse.png rename to public/vendor/plugins/emojify/images/horse.png diff --git a/public/img/emoji/horse_racing.png b/public/vendor/plugins/emojify/images/horse_racing.png similarity index 100% rename from public/img/emoji/horse_racing.png rename to public/vendor/plugins/emojify/images/horse_racing.png diff --git a/public/img/emoji/hospital.png b/public/vendor/plugins/emojify/images/hospital.png similarity index 100% rename from public/img/emoji/hospital.png rename to public/vendor/plugins/emojify/images/hospital.png diff --git a/public/img/emoji/hotel.png b/public/vendor/plugins/emojify/images/hotel.png similarity index 100% rename from public/img/emoji/hotel.png rename to public/vendor/plugins/emojify/images/hotel.png diff --git a/public/img/emoji/hotsprings.png b/public/vendor/plugins/emojify/images/hotsprings.png similarity index 100% rename from public/img/emoji/hotsprings.png rename to public/vendor/plugins/emojify/images/hotsprings.png diff --git a/public/img/emoji/hourglass.png b/public/vendor/plugins/emojify/images/hourglass.png similarity index 100% rename from public/img/emoji/hourglass.png rename to public/vendor/plugins/emojify/images/hourglass.png diff --git a/public/img/emoji/hourglass_flowing_sand.png b/public/vendor/plugins/emojify/images/hourglass_flowing_sand.png similarity index 100% rename from public/img/emoji/hourglass_flowing_sand.png rename to public/vendor/plugins/emojify/images/hourglass_flowing_sand.png diff --git a/public/img/emoji/house.png b/public/vendor/plugins/emojify/images/house.png similarity index 100% rename from public/img/emoji/house.png rename to public/vendor/plugins/emojify/images/house.png diff --git a/public/img/emoji/house_with_garden.png b/public/vendor/plugins/emojify/images/house_with_garden.png similarity index 100% rename from public/img/emoji/house_with_garden.png rename to public/vendor/plugins/emojify/images/house_with_garden.png diff --git a/public/img/emoji/hurtrealbad.png b/public/vendor/plugins/emojify/images/hurtrealbad.png similarity index 100% rename from public/img/emoji/hurtrealbad.png rename to public/vendor/plugins/emojify/images/hurtrealbad.png diff --git a/public/img/emoji/hushed.png b/public/vendor/plugins/emojify/images/hushed.png similarity index 100% rename from public/img/emoji/hushed.png rename to public/vendor/plugins/emojify/images/hushed.png diff --git a/public/img/emoji/ice_cream.png b/public/vendor/plugins/emojify/images/ice_cream.png similarity index 100% rename from public/img/emoji/ice_cream.png rename to public/vendor/plugins/emojify/images/ice_cream.png diff --git a/public/img/emoji/icecream.png b/public/vendor/plugins/emojify/images/icecream.png similarity index 100% rename from public/img/emoji/icecream.png rename to public/vendor/plugins/emojify/images/icecream.png diff --git a/public/img/emoji/id.png b/public/vendor/plugins/emojify/images/id.png similarity index 100% rename from public/img/emoji/id.png rename to public/vendor/plugins/emojify/images/id.png diff --git a/public/img/emoji/ideograph_advantage.png b/public/vendor/plugins/emojify/images/ideograph_advantage.png similarity index 100% rename from public/img/emoji/ideograph_advantage.png rename to public/vendor/plugins/emojify/images/ideograph_advantage.png diff --git a/public/img/emoji/imp.png b/public/vendor/plugins/emojify/images/imp.png similarity index 100% rename from public/img/emoji/imp.png rename to public/vendor/plugins/emojify/images/imp.png diff --git a/public/img/emoji/inbox_tray.png b/public/vendor/plugins/emojify/images/inbox_tray.png similarity index 100% rename from public/img/emoji/inbox_tray.png rename to public/vendor/plugins/emojify/images/inbox_tray.png diff --git a/public/img/emoji/incoming_envelope.png b/public/vendor/plugins/emojify/images/incoming_envelope.png similarity index 100% rename from public/img/emoji/incoming_envelope.png rename to public/vendor/plugins/emojify/images/incoming_envelope.png diff --git a/public/img/emoji/information_desk_person.png b/public/vendor/plugins/emojify/images/information_desk_person.png similarity index 100% rename from public/img/emoji/information_desk_person.png rename to public/vendor/plugins/emojify/images/information_desk_person.png diff --git a/public/img/emoji/information_source.png b/public/vendor/plugins/emojify/images/information_source.png similarity index 100% rename from public/img/emoji/information_source.png rename to public/vendor/plugins/emojify/images/information_source.png diff --git a/public/img/emoji/innocent.png b/public/vendor/plugins/emojify/images/innocent.png similarity index 100% rename from public/img/emoji/innocent.png rename to public/vendor/plugins/emojify/images/innocent.png diff --git a/public/img/emoji/interrobang.png b/public/vendor/plugins/emojify/images/interrobang.png similarity index 100% rename from public/img/emoji/interrobang.png rename to public/vendor/plugins/emojify/images/interrobang.png diff --git a/public/img/emoji/iphone.png b/public/vendor/plugins/emojify/images/iphone.png similarity index 100% rename from public/img/emoji/iphone.png rename to public/vendor/plugins/emojify/images/iphone.png diff --git a/public/img/emoji/it.png b/public/vendor/plugins/emojify/images/it.png similarity index 100% rename from public/img/emoji/it.png rename to public/vendor/plugins/emojify/images/it.png diff --git a/public/img/emoji/izakaya_lantern.png b/public/vendor/plugins/emojify/images/izakaya_lantern.png similarity index 100% rename from public/img/emoji/izakaya_lantern.png rename to public/vendor/plugins/emojify/images/izakaya_lantern.png diff --git a/public/img/emoji/jack_o_lantern.png b/public/vendor/plugins/emojify/images/jack_o_lantern.png similarity index 100% rename from public/img/emoji/jack_o_lantern.png rename to public/vendor/plugins/emojify/images/jack_o_lantern.png diff --git a/public/img/emoji/japan.png b/public/vendor/plugins/emojify/images/japan.png similarity index 100% rename from public/img/emoji/japan.png rename to public/vendor/plugins/emojify/images/japan.png diff --git a/public/img/emoji/japanese_castle.png b/public/vendor/plugins/emojify/images/japanese_castle.png similarity index 100% rename from public/img/emoji/japanese_castle.png rename to public/vendor/plugins/emojify/images/japanese_castle.png diff --git a/public/img/emoji/japanese_goblin.png b/public/vendor/plugins/emojify/images/japanese_goblin.png similarity index 100% rename from public/img/emoji/japanese_goblin.png rename to public/vendor/plugins/emojify/images/japanese_goblin.png diff --git a/public/img/emoji/japanese_ogre.png b/public/vendor/plugins/emojify/images/japanese_ogre.png similarity index 100% rename from public/img/emoji/japanese_ogre.png rename to public/vendor/plugins/emojify/images/japanese_ogre.png diff --git a/public/img/emoji/jeans.png b/public/vendor/plugins/emojify/images/jeans.png similarity index 100% rename from public/img/emoji/jeans.png rename to public/vendor/plugins/emojify/images/jeans.png diff --git a/public/img/emoji/joy.png b/public/vendor/plugins/emojify/images/joy.png similarity index 100% rename from public/img/emoji/joy.png rename to public/vendor/plugins/emojify/images/joy.png diff --git a/public/img/emoji/joy_cat.png b/public/vendor/plugins/emojify/images/joy_cat.png similarity index 100% rename from public/img/emoji/joy_cat.png rename to public/vendor/plugins/emojify/images/joy_cat.png diff --git a/public/img/emoji/jp.png b/public/vendor/plugins/emojify/images/jp.png similarity index 100% rename from public/img/emoji/jp.png rename to public/vendor/plugins/emojify/images/jp.png diff --git a/public/img/emoji/key.png b/public/vendor/plugins/emojify/images/key.png similarity index 100% rename from public/img/emoji/key.png rename to public/vendor/plugins/emojify/images/key.png diff --git a/public/img/emoji/keycap_ten.png b/public/vendor/plugins/emojify/images/keycap_ten.png similarity index 100% rename from public/img/emoji/keycap_ten.png rename to public/vendor/plugins/emojify/images/keycap_ten.png diff --git a/public/img/emoji/kimono.png b/public/vendor/plugins/emojify/images/kimono.png similarity index 100% rename from public/img/emoji/kimono.png rename to public/vendor/plugins/emojify/images/kimono.png diff --git a/public/img/emoji/kiss.png b/public/vendor/plugins/emojify/images/kiss.png similarity index 100% rename from public/img/emoji/kiss.png rename to public/vendor/plugins/emojify/images/kiss.png diff --git a/public/img/emoji/kissing.png b/public/vendor/plugins/emojify/images/kissing.png similarity index 100% rename from public/img/emoji/kissing.png rename to public/vendor/plugins/emojify/images/kissing.png diff --git a/public/img/emoji/kissing_cat.png b/public/vendor/plugins/emojify/images/kissing_cat.png similarity index 100% rename from public/img/emoji/kissing_cat.png rename to public/vendor/plugins/emojify/images/kissing_cat.png diff --git a/public/img/emoji/kissing_closed_eyes.png b/public/vendor/plugins/emojify/images/kissing_closed_eyes.png similarity index 100% rename from public/img/emoji/kissing_closed_eyes.png rename to public/vendor/plugins/emojify/images/kissing_closed_eyes.png diff --git a/public/img/emoji/kissing_face.png b/public/vendor/plugins/emojify/images/kissing_face.png similarity index 100% rename from public/img/emoji/kissing_face.png rename to public/vendor/plugins/emojify/images/kissing_face.png diff --git a/public/img/emoji/kissing_heart.png b/public/vendor/plugins/emojify/images/kissing_heart.png similarity index 100% rename from public/img/emoji/kissing_heart.png rename to public/vendor/plugins/emojify/images/kissing_heart.png diff --git a/public/img/emoji/kissing_smiling_eyes.png b/public/vendor/plugins/emojify/images/kissing_smiling_eyes.png similarity index 100% rename from public/img/emoji/kissing_smiling_eyes.png rename to public/vendor/plugins/emojify/images/kissing_smiling_eyes.png diff --git a/public/img/emoji/koala.png b/public/vendor/plugins/emojify/images/koala.png similarity index 100% rename from public/img/emoji/koala.png rename to public/vendor/plugins/emojify/images/koala.png diff --git a/public/img/emoji/koko.png b/public/vendor/plugins/emojify/images/koko.png similarity index 100% rename from public/img/emoji/koko.png rename to public/vendor/plugins/emojify/images/koko.png diff --git a/public/img/emoji/kr.png b/public/vendor/plugins/emojify/images/kr.png similarity index 100% rename from public/img/emoji/kr.png rename to public/vendor/plugins/emojify/images/kr.png diff --git a/public/img/emoji/large_blue_circle.png b/public/vendor/plugins/emojify/images/large_blue_circle.png similarity index 100% rename from public/img/emoji/large_blue_circle.png rename to public/vendor/plugins/emojify/images/large_blue_circle.png diff --git a/public/img/emoji/large_blue_diamond.png b/public/vendor/plugins/emojify/images/large_blue_diamond.png similarity index 100% rename from public/img/emoji/large_blue_diamond.png rename to public/vendor/plugins/emojify/images/large_blue_diamond.png diff --git a/public/img/emoji/large_orange_diamond.png b/public/vendor/plugins/emojify/images/large_orange_diamond.png similarity index 100% rename from public/img/emoji/large_orange_diamond.png rename to public/vendor/plugins/emojify/images/large_orange_diamond.png diff --git a/public/img/emoji/last_quarter_moon.png b/public/vendor/plugins/emojify/images/last_quarter_moon.png similarity index 100% rename from public/img/emoji/last_quarter_moon.png rename to public/vendor/plugins/emojify/images/last_quarter_moon.png diff --git a/public/img/emoji/last_quarter_moon_with_face.png b/public/vendor/plugins/emojify/images/last_quarter_moon_with_face.png similarity index 100% rename from public/img/emoji/last_quarter_moon_with_face.png rename to public/vendor/plugins/emojify/images/last_quarter_moon_with_face.png diff --git a/public/img/emoji/laughing.png b/public/vendor/plugins/emojify/images/laughing.png similarity index 100% rename from public/img/emoji/laughing.png rename to public/vendor/plugins/emojify/images/laughing.png diff --git a/public/img/emoji/leaves.png b/public/vendor/plugins/emojify/images/leaves.png similarity index 100% rename from public/img/emoji/leaves.png rename to public/vendor/plugins/emojify/images/leaves.png diff --git a/public/img/emoji/ledger.png b/public/vendor/plugins/emojify/images/ledger.png similarity index 100% rename from public/img/emoji/ledger.png rename to public/vendor/plugins/emojify/images/ledger.png diff --git a/public/img/emoji/left_luggage.png b/public/vendor/plugins/emojify/images/left_luggage.png similarity index 100% rename from public/img/emoji/left_luggage.png rename to public/vendor/plugins/emojify/images/left_luggage.png diff --git a/public/img/emoji/left_right_arrow.png b/public/vendor/plugins/emojify/images/left_right_arrow.png similarity index 100% rename from public/img/emoji/left_right_arrow.png rename to public/vendor/plugins/emojify/images/left_right_arrow.png diff --git a/public/img/emoji/leftwards_arrow_with_hook.png b/public/vendor/plugins/emojify/images/leftwards_arrow_with_hook.png similarity index 100% rename from public/img/emoji/leftwards_arrow_with_hook.png rename to public/vendor/plugins/emojify/images/leftwards_arrow_with_hook.png diff --git a/public/img/emoji/lemon.png b/public/vendor/plugins/emojify/images/lemon.png similarity index 100% rename from public/img/emoji/lemon.png rename to public/vendor/plugins/emojify/images/lemon.png diff --git a/public/img/emoji/leo.png b/public/vendor/plugins/emojify/images/leo.png similarity index 100% rename from public/img/emoji/leo.png rename to public/vendor/plugins/emojify/images/leo.png diff --git a/public/img/emoji/leopard.png b/public/vendor/plugins/emojify/images/leopard.png similarity index 100% rename from public/img/emoji/leopard.png rename to public/vendor/plugins/emojify/images/leopard.png diff --git a/public/img/emoji/libra.png b/public/vendor/plugins/emojify/images/libra.png similarity index 100% rename from public/img/emoji/libra.png rename to public/vendor/plugins/emojify/images/libra.png diff --git a/public/img/emoji/light_rail.png b/public/vendor/plugins/emojify/images/light_rail.png similarity index 100% rename from public/img/emoji/light_rail.png rename to public/vendor/plugins/emojify/images/light_rail.png diff --git a/public/img/emoji/link.png b/public/vendor/plugins/emojify/images/link.png similarity index 100% rename from public/img/emoji/link.png rename to public/vendor/plugins/emojify/images/link.png diff --git a/public/img/emoji/lips.png b/public/vendor/plugins/emojify/images/lips.png similarity index 100% rename from public/img/emoji/lips.png rename to public/vendor/plugins/emojify/images/lips.png diff --git a/public/img/emoji/lipstick.png b/public/vendor/plugins/emojify/images/lipstick.png similarity index 100% rename from public/img/emoji/lipstick.png rename to public/vendor/plugins/emojify/images/lipstick.png diff --git a/public/img/emoji/lock.png b/public/vendor/plugins/emojify/images/lock.png similarity index 100% rename from public/img/emoji/lock.png rename to public/vendor/plugins/emojify/images/lock.png diff --git a/public/img/emoji/lock_with_ink_pen.png b/public/vendor/plugins/emojify/images/lock_with_ink_pen.png similarity index 100% rename from public/img/emoji/lock_with_ink_pen.png rename to public/vendor/plugins/emojify/images/lock_with_ink_pen.png diff --git a/public/img/emoji/lollipop.png b/public/vendor/plugins/emojify/images/lollipop.png similarity index 100% rename from public/img/emoji/lollipop.png rename to public/vendor/plugins/emojify/images/lollipop.png diff --git a/public/img/emoji/loop.png b/public/vendor/plugins/emojify/images/loop.png similarity index 100% rename from public/img/emoji/loop.png rename to public/vendor/plugins/emojify/images/loop.png diff --git a/public/img/emoji/loudspeaker.png b/public/vendor/plugins/emojify/images/loudspeaker.png similarity index 100% rename from public/img/emoji/loudspeaker.png rename to public/vendor/plugins/emojify/images/loudspeaker.png diff --git a/public/img/emoji/love_hotel.png b/public/vendor/plugins/emojify/images/love_hotel.png similarity index 100% rename from public/img/emoji/love_hotel.png rename to public/vendor/plugins/emojify/images/love_hotel.png diff --git a/public/img/emoji/love_letter.png b/public/vendor/plugins/emojify/images/love_letter.png similarity index 100% rename from public/img/emoji/love_letter.png rename to public/vendor/plugins/emojify/images/love_letter.png diff --git a/public/img/emoji/low_brightness.png b/public/vendor/plugins/emojify/images/low_brightness.png similarity index 100% rename from public/img/emoji/low_brightness.png rename to public/vendor/plugins/emojify/images/low_brightness.png diff --git a/public/img/emoji/m.png b/public/vendor/plugins/emojify/images/m.png similarity index 100% rename from public/img/emoji/m.png rename to public/vendor/plugins/emojify/images/m.png diff --git a/public/img/emoji/mag.png b/public/vendor/plugins/emojify/images/mag.png similarity index 100% rename from public/img/emoji/mag.png rename to public/vendor/plugins/emojify/images/mag.png diff --git a/public/img/emoji/mag_right.png b/public/vendor/plugins/emojify/images/mag_right.png similarity index 100% rename from public/img/emoji/mag_right.png rename to public/vendor/plugins/emojify/images/mag_right.png diff --git a/public/img/emoji/mahjong.png b/public/vendor/plugins/emojify/images/mahjong.png similarity index 100% rename from public/img/emoji/mahjong.png rename to public/vendor/plugins/emojify/images/mahjong.png diff --git a/public/img/emoji/mailbox.png b/public/vendor/plugins/emojify/images/mailbox.png similarity index 100% rename from public/img/emoji/mailbox.png rename to public/vendor/plugins/emojify/images/mailbox.png diff --git a/public/img/emoji/mailbox_closed.png b/public/vendor/plugins/emojify/images/mailbox_closed.png similarity index 100% rename from public/img/emoji/mailbox_closed.png rename to public/vendor/plugins/emojify/images/mailbox_closed.png diff --git a/public/img/emoji/mailbox_with_mail.png b/public/vendor/plugins/emojify/images/mailbox_with_mail.png similarity index 100% rename from public/img/emoji/mailbox_with_mail.png rename to public/vendor/plugins/emojify/images/mailbox_with_mail.png diff --git a/public/img/emoji/mailbox_with_no_mail.png b/public/vendor/plugins/emojify/images/mailbox_with_no_mail.png similarity index 100% rename from public/img/emoji/mailbox_with_no_mail.png rename to public/vendor/plugins/emojify/images/mailbox_with_no_mail.png diff --git a/public/img/emoji/man.png b/public/vendor/plugins/emojify/images/man.png similarity index 100% rename from public/img/emoji/man.png rename to public/vendor/plugins/emojify/images/man.png diff --git a/public/img/emoji/man_with_gua_pi_mao.png b/public/vendor/plugins/emojify/images/man_with_gua_pi_mao.png similarity index 100% rename from public/img/emoji/man_with_gua_pi_mao.png rename to public/vendor/plugins/emojify/images/man_with_gua_pi_mao.png diff --git a/public/img/emoji/man_with_turban.png b/public/vendor/plugins/emojify/images/man_with_turban.png similarity index 100% rename from public/img/emoji/man_with_turban.png rename to public/vendor/plugins/emojify/images/man_with_turban.png diff --git a/public/img/emoji/mans_shoe.png b/public/vendor/plugins/emojify/images/mans_shoe.png similarity index 100% rename from public/img/emoji/mans_shoe.png rename to public/vendor/plugins/emojify/images/mans_shoe.png diff --git a/public/img/emoji/maple_leaf.png b/public/vendor/plugins/emojify/images/maple_leaf.png similarity index 100% rename from public/img/emoji/maple_leaf.png rename to public/vendor/plugins/emojify/images/maple_leaf.png diff --git a/public/img/emoji/mask.png b/public/vendor/plugins/emojify/images/mask.png similarity index 100% rename from public/img/emoji/mask.png rename to public/vendor/plugins/emojify/images/mask.png diff --git a/public/img/emoji/massage.png b/public/vendor/plugins/emojify/images/massage.png similarity index 100% rename from public/img/emoji/massage.png rename to public/vendor/plugins/emojify/images/massage.png diff --git a/public/img/emoji/meat_on_bone.png b/public/vendor/plugins/emojify/images/meat_on_bone.png similarity index 100% rename from public/img/emoji/meat_on_bone.png rename to public/vendor/plugins/emojify/images/meat_on_bone.png diff --git a/public/img/emoji/mega.png b/public/vendor/plugins/emojify/images/mega.png similarity index 100% rename from public/img/emoji/mega.png rename to public/vendor/plugins/emojify/images/mega.png diff --git a/public/img/emoji/melon.png b/public/vendor/plugins/emojify/images/melon.png similarity index 100% rename from public/img/emoji/melon.png rename to public/vendor/plugins/emojify/images/melon.png diff --git a/public/img/emoji/memo.png b/public/vendor/plugins/emojify/images/memo.png similarity index 100% rename from public/img/emoji/memo.png rename to public/vendor/plugins/emojify/images/memo.png diff --git a/public/img/emoji/mens.png b/public/vendor/plugins/emojify/images/mens.png similarity index 100% rename from public/img/emoji/mens.png rename to public/vendor/plugins/emojify/images/mens.png diff --git a/public/img/emoji/metal.png b/public/vendor/plugins/emojify/images/metal.png similarity index 100% rename from public/img/emoji/metal.png rename to public/vendor/plugins/emojify/images/metal.png diff --git a/public/img/emoji/metro.png b/public/vendor/plugins/emojify/images/metro.png similarity index 100% rename from public/img/emoji/metro.png rename to public/vendor/plugins/emojify/images/metro.png diff --git a/public/img/emoji/microphone.png b/public/vendor/plugins/emojify/images/microphone.png similarity index 100% rename from public/img/emoji/microphone.png rename to public/vendor/plugins/emojify/images/microphone.png diff --git a/public/img/emoji/microscope.png b/public/vendor/plugins/emojify/images/microscope.png similarity index 100% rename from public/img/emoji/microscope.png rename to public/vendor/plugins/emojify/images/microscope.png diff --git a/public/img/emoji/milky_way.png b/public/vendor/plugins/emojify/images/milky_way.png similarity index 100% rename from public/img/emoji/milky_way.png rename to public/vendor/plugins/emojify/images/milky_way.png diff --git a/public/img/emoji/minibus.png b/public/vendor/plugins/emojify/images/minibus.png similarity index 100% rename from public/img/emoji/minibus.png rename to public/vendor/plugins/emojify/images/minibus.png diff --git a/public/img/emoji/minidisc.png b/public/vendor/plugins/emojify/images/minidisc.png similarity index 100% rename from public/img/emoji/minidisc.png rename to public/vendor/plugins/emojify/images/minidisc.png diff --git a/public/img/emoji/mobile_phone_off.png b/public/vendor/plugins/emojify/images/mobile_phone_off.png similarity index 100% rename from public/img/emoji/mobile_phone_off.png rename to public/vendor/plugins/emojify/images/mobile_phone_off.png diff --git a/public/img/emoji/money_with_wings.png b/public/vendor/plugins/emojify/images/money_with_wings.png similarity index 100% rename from public/img/emoji/money_with_wings.png rename to public/vendor/plugins/emojify/images/money_with_wings.png diff --git a/public/img/emoji/moneybag.png b/public/vendor/plugins/emojify/images/moneybag.png similarity index 100% rename from public/img/emoji/moneybag.png rename to public/vendor/plugins/emojify/images/moneybag.png diff --git a/public/img/emoji/monkey.png b/public/vendor/plugins/emojify/images/monkey.png similarity index 100% rename from public/img/emoji/monkey.png rename to public/vendor/plugins/emojify/images/monkey.png diff --git a/public/img/emoji/monkey_face.png b/public/vendor/plugins/emojify/images/monkey_face.png similarity index 100% rename from public/img/emoji/monkey_face.png rename to public/vendor/plugins/emojify/images/monkey_face.png diff --git a/public/img/emoji/monorail.png b/public/vendor/plugins/emojify/images/monorail.png similarity index 100% rename from public/img/emoji/monorail.png rename to public/vendor/plugins/emojify/images/monorail.png diff --git a/public/img/emoji/mortar_board.png b/public/vendor/plugins/emojify/images/mortar_board.png similarity index 100% rename from public/img/emoji/mortar_board.png rename to public/vendor/plugins/emojify/images/mortar_board.png diff --git a/public/img/emoji/mount_fuji.png b/public/vendor/plugins/emojify/images/mount_fuji.png similarity index 100% rename from public/img/emoji/mount_fuji.png rename to public/vendor/plugins/emojify/images/mount_fuji.png diff --git a/public/img/emoji/mountain_bicyclist.png b/public/vendor/plugins/emojify/images/mountain_bicyclist.png similarity index 100% rename from public/img/emoji/mountain_bicyclist.png rename to public/vendor/plugins/emojify/images/mountain_bicyclist.png diff --git a/public/img/emoji/mountain_cableway.png b/public/vendor/plugins/emojify/images/mountain_cableway.png similarity index 100% rename from public/img/emoji/mountain_cableway.png rename to public/vendor/plugins/emojify/images/mountain_cableway.png diff --git a/public/img/emoji/mountain_railway.png b/public/vendor/plugins/emojify/images/mountain_railway.png similarity index 100% rename from public/img/emoji/mountain_railway.png rename to public/vendor/plugins/emojify/images/mountain_railway.png diff --git a/public/img/emoji/mouse.png b/public/vendor/plugins/emojify/images/mouse.png similarity index 100% rename from public/img/emoji/mouse.png rename to public/vendor/plugins/emojify/images/mouse.png diff --git a/public/img/emoji/mouse2.png b/public/vendor/plugins/emojify/images/mouse2.png similarity index 100% rename from public/img/emoji/mouse2.png rename to public/vendor/plugins/emojify/images/mouse2.png diff --git a/public/img/emoji/movie_camera.png b/public/vendor/plugins/emojify/images/movie_camera.png similarity index 100% rename from public/img/emoji/movie_camera.png rename to public/vendor/plugins/emojify/images/movie_camera.png diff --git a/public/img/emoji/moyai.png b/public/vendor/plugins/emojify/images/moyai.png similarity index 100% rename from public/img/emoji/moyai.png rename to public/vendor/plugins/emojify/images/moyai.png diff --git a/public/img/emoji/muscle.png b/public/vendor/plugins/emojify/images/muscle.png similarity index 100% rename from public/img/emoji/muscle.png rename to public/vendor/plugins/emojify/images/muscle.png diff --git a/public/img/emoji/mushroom.png b/public/vendor/plugins/emojify/images/mushroom.png similarity index 100% rename from public/img/emoji/mushroom.png rename to public/vendor/plugins/emojify/images/mushroom.png diff --git a/public/img/emoji/musical_keyboard.png b/public/vendor/plugins/emojify/images/musical_keyboard.png similarity index 100% rename from public/img/emoji/musical_keyboard.png rename to public/vendor/plugins/emojify/images/musical_keyboard.png diff --git a/public/img/emoji/musical_note.png b/public/vendor/plugins/emojify/images/musical_note.png similarity index 100% rename from public/img/emoji/musical_note.png rename to public/vendor/plugins/emojify/images/musical_note.png diff --git a/public/img/emoji/musical_score.png b/public/vendor/plugins/emojify/images/musical_score.png similarity index 100% rename from public/img/emoji/musical_score.png rename to public/vendor/plugins/emojify/images/musical_score.png diff --git a/public/img/emoji/mute.png b/public/vendor/plugins/emojify/images/mute.png similarity index 100% rename from public/img/emoji/mute.png rename to public/vendor/plugins/emojify/images/mute.png diff --git a/public/img/emoji/nail_care.png b/public/vendor/plugins/emojify/images/nail_care.png similarity index 100% rename from public/img/emoji/nail_care.png rename to public/vendor/plugins/emojify/images/nail_care.png diff --git a/public/img/emoji/name_badge.png b/public/vendor/plugins/emojify/images/name_badge.png similarity index 100% rename from public/img/emoji/name_badge.png rename to public/vendor/plugins/emojify/images/name_badge.png diff --git a/public/img/emoji/neckbeard.png b/public/vendor/plugins/emojify/images/neckbeard.png similarity index 100% rename from public/img/emoji/neckbeard.png rename to public/vendor/plugins/emojify/images/neckbeard.png diff --git a/public/img/emoji/necktie.png b/public/vendor/plugins/emojify/images/necktie.png similarity index 100% rename from public/img/emoji/necktie.png rename to public/vendor/plugins/emojify/images/necktie.png diff --git a/public/img/emoji/negative_squared_cross_mark.png b/public/vendor/plugins/emojify/images/negative_squared_cross_mark.png similarity index 100% rename from public/img/emoji/negative_squared_cross_mark.png rename to public/vendor/plugins/emojify/images/negative_squared_cross_mark.png diff --git a/public/img/emoji/neutral_face.png b/public/vendor/plugins/emojify/images/neutral_face.png similarity index 100% rename from public/img/emoji/neutral_face.png rename to public/vendor/plugins/emojify/images/neutral_face.png diff --git a/public/img/emoji/new.png b/public/vendor/plugins/emojify/images/new.png similarity index 100% rename from public/img/emoji/new.png rename to public/vendor/plugins/emojify/images/new.png diff --git a/public/img/emoji/new_moon.png b/public/vendor/plugins/emojify/images/new_moon.png similarity index 100% rename from public/img/emoji/new_moon.png rename to public/vendor/plugins/emojify/images/new_moon.png diff --git a/public/img/emoji/new_moon_with_face.png b/public/vendor/plugins/emojify/images/new_moon_with_face.png similarity index 100% rename from public/img/emoji/new_moon_with_face.png rename to public/vendor/plugins/emojify/images/new_moon_with_face.png diff --git a/public/img/emoji/newspaper.png b/public/vendor/plugins/emojify/images/newspaper.png similarity index 100% rename from public/img/emoji/newspaper.png rename to public/vendor/plugins/emojify/images/newspaper.png diff --git a/public/img/emoji/ng.png b/public/vendor/plugins/emojify/images/ng.png similarity index 100% rename from public/img/emoji/ng.png rename to public/vendor/plugins/emojify/images/ng.png diff --git a/public/img/emoji/nine.png b/public/vendor/plugins/emojify/images/nine.png similarity index 100% rename from public/img/emoji/nine.png rename to public/vendor/plugins/emojify/images/nine.png diff --git a/public/img/emoji/no_bell.png b/public/vendor/plugins/emojify/images/no_bell.png similarity index 100% rename from public/img/emoji/no_bell.png rename to public/vendor/plugins/emojify/images/no_bell.png diff --git a/public/img/emoji/no_bicycles.png b/public/vendor/plugins/emojify/images/no_bicycles.png similarity index 100% rename from public/img/emoji/no_bicycles.png rename to public/vendor/plugins/emojify/images/no_bicycles.png diff --git a/public/img/emoji/no_entry.png b/public/vendor/plugins/emojify/images/no_entry.png similarity index 100% rename from public/img/emoji/no_entry.png rename to public/vendor/plugins/emojify/images/no_entry.png diff --git a/public/img/emoji/no_entry_sign.png b/public/vendor/plugins/emojify/images/no_entry_sign.png similarity index 100% rename from public/img/emoji/no_entry_sign.png rename to public/vendor/plugins/emojify/images/no_entry_sign.png diff --git a/public/img/emoji/no_good.png b/public/vendor/plugins/emojify/images/no_good.png similarity index 100% rename from public/img/emoji/no_good.png rename to public/vendor/plugins/emojify/images/no_good.png diff --git a/public/img/emoji/no_mobile_phones.png b/public/vendor/plugins/emojify/images/no_mobile_phones.png similarity index 100% rename from public/img/emoji/no_mobile_phones.png rename to public/vendor/plugins/emojify/images/no_mobile_phones.png diff --git a/public/img/emoji/no_mouth.png b/public/vendor/plugins/emojify/images/no_mouth.png similarity index 100% rename from public/img/emoji/no_mouth.png rename to public/vendor/plugins/emojify/images/no_mouth.png diff --git a/public/img/emoji/no_pedestrians.png b/public/vendor/plugins/emojify/images/no_pedestrians.png similarity index 100% rename from public/img/emoji/no_pedestrians.png rename to public/vendor/plugins/emojify/images/no_pedestrians.png diff --git a/public/img/emoji/no_smoking.png b/public/vendor/plugins/emojify/images/no_smoking.png similarity index 100% rename from public/img/emoji/no_smoking.png rename to public/vendor/plugins/emojify/images/no_smoking.png diff --git a/public/img/emoji/non-potable_water.png b/public/vendor/plugins/emojify/images/non-potable_water.png similarity index 100% rename from public/img/emoji/non-potable_water.png rename to public/vendor/plugins/emojify/images/non-potable_water.png diff --git a/public/img/emoji/nose.png b/public/vendor/plugins/emojify/images/nose.png similarity index 100% rename from public/img/emoji/nose.png rename to public/vendor/plugins/emojify/images/nose.png diff --git a/public/img/emoji/notebook.png b/public/vendor/plugins/emojify/images/notebook.png similarity index 100% rename from public/img/emoji/notebook.png rename to public/vendor/plugins/emojify/images/notebook.png diff --git a/public/img/emoji/notebook_with_decorative_cover.png b/public/vendor/plugins/emojify/images/notebook_with_decorative_cover.png similarity index 100% rename from public/img/emoji/notebook_with_decorative_cover.png rename to public/vendor/plugins/emojify/images/notebook_with_decorative_cover.png diff --git a/public/img/emoji/notes.png b/public/vendor/plugins/emojify/images/notes.png similarity index 100% rename from public/img/emoji/notes.png rename to public/vendor/plugins/emojify/images/notes.png diff --git a/public/img/emoji/nut_and_bolt.png b/public/vendor/plugins/emojify/images/nut_and_bolt.png similarity index 100% rename from public/img/emoji/nut_and_bolt.png rename to public/vendor/plugins/emojify/images/nut_and_bolt.png diff --git a/public/img/emoji/o.png b/public/vendor/plugins/emojify/images/o.png similarity index 100% rename from public/img/emoji/o.png rename to public/vendor/plugins/emojify/images/o.png diff --git a/public/img/emoji/o2.png b/public/vendor/plugins/emojify/images/o2.png similarity index 100% rename from public/img/emoji/o2.png rename to public/vendor/plugins/emojify/images/o2.png diff --git a/public/img/emoji/ocean.png b/public/vendor/plugins/emojify/images/ocean.png similarity index 100% rename from public/img/emoji/ocean.png rename to public/vendor/plugins/emojify/images/ocean.png diff --git a/public/img/emoji/octocat.png b/public/vendor/plugins/emojify/images/octocat.png similarity index 100% rename from public/img/emoji/octocat.png rename to public/vendor/plugins/emojify/images/octocat.png diff --git a/public/img/emoji/octopus.png b/public/vendor/plugins/emojify/images/octopus.png similarity index 100% rename from public/img/emoji/octopus.png rename to public/vendor/plugins/emojify/images/octopus.png diff --git a/public/img/emoji/oden.png b/public/vendor/plugins/emojify/images/oden.png similarity index 100% rename from public/img/emoji/oden.png rename to public/vendor/plugins/emojify/images/oden.png diff --git a/public/img/emoji/office.png b/public/vendor/plugins/emojify/images/office.png similarity index 100% rename from public/img/emoji/office.png rename to public/vendor/plugins/emojify/images/office.png diff --git a/public/img/emoji/ok.png b/public/vendor/plugins/emojify/images/ok.png similarity index 100% rename from public/img/emoji/ok.png rename to public/vendor/plugins/emojify/images/ok.png diff --git a/public/img/emoji/ok_hand.png b/public/vendor/plugins/emojify/images/ok_hand.png similarity index 100% rename from public/img/emoji/ok_hand.png rename to public/vendor/plugins/emojify/images/ok_hand.png diff --git a/public/img/emoji/ok_woman.png b/public/vendor/plugins/emojify/images/ok_woman.png similarity index 100% rename from public/img/emoji/ok_woman.png rename to public/vendor/plugins/emojify/images/ok_woman.png diff --git a/public/img/emoji/older_man.png b/public/vendor/plugins/emojify/images/older_man.png similarity index 100% rename from public/img/emoji/older_man.png rename to public/vendor/plugins/emojify/images/older_man.png diff --git a/public/img/emoji/older_woman.png b/public/vendor/plugins/emojify/images/older_woman.png similarity index 100% rename from public/img/emoji/older_woman.png rename to public/vendor/plugins/emojify/images/older_woman.png diff --git a/public/img/emoji/on.png b/public/vendor/plugins/emojify/images/on.png similarity index 100% rename from public/img/emoji/on.png rename to public/vendor/plugins/emojify/images/on.png diff --git a/public/img/emoji/oncoming_automobile.png b/public/vendor/plugins/emojify/images/oncoming_automobile.png similarity index 100% rename from public/img/emoji/oncoming_automobile.png rename to public/vendor/plugins/emojify/images/oncoming_automobile.png diff --git a/public/img/emoji/oncoming_bus.png b/public/vendor/plugins/emojify/images/oncoming_bus.png similarity index 100% rename from public/img/emoji/oncoming_bus.png rename to public/vendor/plugins/emojify/images/oncoming_bus.png diff --git a/public/img/emoji/oncoming_police_car.png b/public/vendor/plugins/emojify/images/oncoming_police_car.png similarity index 100% rename from public/img/emoji/oncoming_police_car.png rename to public/vendor/plugins/emojify/images/oncoming_police_car.png diff --git a/public/img/emoji/oncoming_taxi.png b/public/vendor/plugins/emojify/images/oncoming_taxi.png similarity index 100% rename from public/img/emoji/oncoming_taxi.png rename to public/vendor/plugins/emojify/images/oncoming_taxi.png diff --git a/public/img/emoji/one.png b/public/vendor/plugins/emojify/images/one.png similarity index 100% rename from public/img/emoji/one.png rename to public/vendor/plugins/emojify/images/one.png diff --git a/public/img/emoji/open_file_folder.png b/public/vendor/plugins/emojify/images/open_file_folder.png similarity index 100% rename from public/img/emoji/open_file_folder.png rename to public/vendor/plugins/emojify/images/open_file_folder.png diff --git a/public/img/emoji/open_hands.png b/public/vendor/plugins/emojify/images/open_hands.png similarity index 100% rename from public/img/emoji/open_hands.png rename to public/vendor/plugins/emojify/images/open_hands.png diff --git a/public/img/emoji/open_mouth.png b/public/vendor/plugins/emojify/images/open_mouth.png similarity index 100% rename from public/img/emoji/open_mouth.png rename to public/vendor/plugins/emojify/images/open_mouth.png diff --git a/public/img/emoji/ophiuchus.png b/public/vendor/plugins/emojify/images/ophiuchus.png similarity index 100% rename from public/img/emoji/ophiuchus.png rename to public/vendor/plugins/emojify/images/ophiuchus.png diff --git a/public/img/emoji/orange_book.png b/public/vendor/plugins/emojify/images/orange_book.png similarity index 100% rename from public/img/emoji/orange_book.png rename to public/vendor/plugins/emojify/images/orange_book.png diff --git a/public/img/emoji/outbox_tray.png b/public/vendor/plugins/emojify/images/outbox_tray.png similarity index 100% rename from public/img/emoji/outbox_tray.png rename to public/vendor/plugins/emojify/images/outbox_tray.png diff --git a/public/img/emoji/ox.png b/public/vendor/plugins/emojify/images/ox.png similarity index 100% rename from public/img/emoji/ox.png rename to public/vendor/plugins/emojify/images/ox.png diff --git a/public/img/emoji/package.png b/public/vendor/plugins/emojify/images/package.png similarity index 100% rename from public/img/emoji/package.png rename to public/vendor/plugins/emojify/images/package.png diff --git a/public/img/emoji/page_facing_up.png b/public/vendor/plugins/emojify/images/page_facing_up.png similarity index 100% rename from public/img/emoji/page_facing_up.png rename to public/vendor/plugins/emojify/images/page_facing_up.png diff --git a/public/img/emoji/page_with_curl.png b/public/vendor/plugins/emojify/images/page_with_curl.png similarity index 100% rename from public/img/emoji/page_with_curl.png rename to public/vendor/plugins/emojify/images/page_with_curl.png diff --git a/public/img/emoji/pager.png b/public/vendor/plugins/emojify/images/pager.png similarity index 100% rename from public/img/emoji/pager.png rename to public/vendor/plugins/emojify/images/pager.png diff --git a/public/img/emoji/palm_tree.png b/public/vendor/plugins/emojify/images/palm_tree.png similarity index 100% rename from public/img/emoji/palm_tree.png rename to public/vendor/plugins/emojify/images/palm_tree.png diff --git a/public/img/emoji/panda_face.png b/public/vendor/plugins/emojify/images/panda_face.png similarity index 100% rename from public/img/emoji/panda_face.png rename to public/vendor/plugins/emojify/images/panda_face.png diff --git a/public/img/emoji/paperclip.png b/public/vendor/plugins/emojify/images/paperclip.png similarity index 100% rename from public/img/emoji/paperclip.png rename to public/vendor/plugins/emojify/images/paperclip.png diff --git a/public/img/emoji/parking.png b/public/vendor/plugins/emojify/images/parking.png similarity index 100% rename from public/img/emoji/parking.png rename to public/vendor/plugins/emojify/images/parking.png diff --git a/public/img/emoji/part_alternation_mark.png b/public/vendor/plugins/emojify/images/part_alternation_mark.png similarity index 100% rename from public/img/emoji/part_alternation_mark.png rename to public/vendor/plugins/emojify/images/part_alternation_mark.png diff --git a/public/img/emoji/partly_sunny.png b/public/vendor/plugins/emojify/images/partly_sunny.png similarity index 100% rename from public/img/emoji/partly_sunny.png rename to public/vendor/plugins/emojify/images/partly_sunny.png diff --git a/public/img/emoji/passport_control.png b/public/vendor/plugins/emojify/images/passport_control.png similarity index 100% rename from public/img/emoji/passport_control.png rename to public/vendor/plugins/emojify/images/passport_control.png diff --git a/public/img/emoji/paw_prints.png b/public/vendor/plugins/emojify/images/paw_prints.png similarity index 100% rename from public/img/emoji/paw_prints.png rename to public/vendor/plugins/emojify/images/paw_prints.png diff --git a/public/img/emoji/peach.png b/public/vendor/plugins/emojify/images/peach.png similarity index 100% rename from public/img/emoji/peach.png rename to public/vendor/plugins/emojify/images/peach.png diff --git a/public/img/emoji/pear.png b/public/vendor/plugins/emojify/images/pear.png similarity index 100% rename from public/img/emoji/pear.png rename to public/vendor/plugins/emojify/images/pear.png diff --git a/public/img/emoji/pencil.png b/public/vendor/plugins/emojify/images/pencil.png similarity index 100% rename from public/img/emoji/pencil.png rename to public/vendor/plugins/emojify/images/pencil.png diff --git a/public/img/emoji/pencil2.png b/public/vendor/plugins/emojify/images/pencil2.png similarity index 100% rename from public/img/emoji/pencil2.png rename to public/vendor/plugins/emojify/images/pencil2.png diff --git a/public/img/emoji/penguin.png b/public/vendor/plugins/emojify/images/penguin.png similarity index 100% rename from public/img/emoji/penguin.png rename to public/vendor/plugins/emojify/images/penguin.png diff --git a/public/img/emoji/pensive.png b/public/vendor/plugins/emojify/images/pensive.png similarity index 100% rename from public/img/emoji/pensive.png rename to public/vendor/plugins/emojify/images/pensive.png diff --git a/public/img/emoji/performing_arts.png b/public/vendor/plugins/emojify/images/performing_arts.png similarity index 100% rename from public/img/emoji/performing_arts.png rename to public/vendor/plugins/emojify/images/performing_arts.png diff --git a/public/img/emoji/persevere.png b/public/vendor/plugins/emojify/images/persevere.png similarity index 100% rename from public/img/emoji/persevere.png rename to public/vendor/plugins/emojify/images/persevere.png diff --git a/public/img/emoji/person_frowning.png b/public/vendor/plugins/emojify/images/person_frowning.png similarity index 100% rename from public/img/emoji/person_frowning.png rename to public/vendor/plugins/emojify/images/person_frowning.png diff --git a/public/img/emoji/person_with_blond_hair.png b/public/vendor/plugins/emojify/images/person_with_blond_hair.png similarity index 100% rename from public/img/emoji/person_with_blond_hair.png rename to public/vendor/plugins/emojify/images/person_with_blond_hair.png diff --git a/public/img/emoji/person_with_pouting_face.png b/public/vendor/plugins/emojify/images/person_with_pouting_face.png similarity index 100% rename from public/img/emoji/person_with_pouting_face.png rename to public/vendor/plugins/emojify/images/person_with_pouting_face.png diff --git a/public/img/emoji/phone.png b/public/vendor/plugins/emojify/images/phone.png similarity index 100% rename from public/img/emoji/phone.png rename to public/vendor/plugins/emojify/images/phone.png diff --git a/public/img/emoji/pig.png b/public/vendor/plugins/emojify/images/pig.png similarity index 100% rename from public/img/emoji/pig.png rename to public/vendor/plugins/emojify/images/pig.png diff --git a/public/img/emoji/pig2.png b/public/vendor/plugins/emojify/images/pig2.png similarity index 100% rename from public/img/emoji/pig2.png rename to public/vendor/plugins/emojify/images/pig2.png diff --git a/public/img/emoji/pig_nose.png b/public/vendor/plugins/emojify/images/pig_nose.png similarity index 100% rename from public/img/emoji/pig_nose.png rename to public/vendor/plugins/emojify/images/pig_nose.png diff --git a/public/img/emoji/pill.png b/public/vendor/plugins/emojify/images/pill.png similarity index 100% rename from public/img/emoji/pill.png rename to public/vendor/plugins/emojify/images/pill.png diff --git a/public/img/emoji/pineapple.png b/public/vendor/plugins/emojify/images/pineapple.png similarity index 100% rename from public/img/emoji/pineapple.png rename to public/vendor/plugins/emojify/images/pineapple.png diff --git a/public/img/emoji/pisces.png b/public/vendor/plugins/emojify/images/pisces.png similarity index 100% rename from public/img/emoji/pisces.png rename to public/vendor/plugins/emojify/images/pisces.png diff --git a/public/img/emoji/pizza.png b/public/vendor/plugins/emojify/images/pizza.png similarity index 100% rename from public/img/emoji/pizza.png rename to public/vendor/plugins/emojify/images/pizza.png diff --git a/public/img/emoji/plus1.png b/public/vendor/plugins/emojify/images/plus1.png similarity index 100% rename from public/img/emoji/plus1.png rename to public/vendor/plugins/emojify/images/plus1.png diff --git a/public/img/emoji/point_down.png b/public/vendor/plugins/emojify/images/point_down.png similarity index 100% rename from public/img/emoji/point_down.png rename to public/vendor/plugins/emojify/images/point_down.png diff --git a/public/img/emoji/point_left.png b/public/vendor/plugins/emojify/images/point_left.png similarity index 100% rename from public/img/emoji/point_left.png rename to public/vendor/plugins/emojify/images/point_left.png diff --git a/public/img/emoji/point_right.png b/public/vendor/plugins/emojify/images/point_right.png similarity index 100% rename from public/img/emoji/point_right.png rename to public/vendor/plugins/emojify/images/point_right.png diff --git a/public/img/emoji/point_up.png b/public/vendor/plugins/emojify/images/point_up.png similarity index 100% rename from public/img/emoji/point_up.png rename to public/vendor/plugins/emojify/images/point_up.png diff --git a/public/img/emoji/point_up_2.png b/public/vendor/plugins/emojify/images/point_up_2.png similarity index 100% rename from public/img/emoji/point_up_2.png rename to public/vendor/plugins/emojify/images/point_up_2.png diff --git a/public/img/emoji/police_car.png b/public/vendor/plugins/emojify/images/police_car.png similarity index 100% rename from public/img/emoji/police_car.png rename to public/vendor/plugins/emojify/images/police_car.png diff --git a/public/img/emoji/poodle.png b/public/vendor/plugins/emojify/images/poodle.png similarity index 100% rename from public/img/emoji/poodle.png rename to public/vendor/plugins/emojify/images/poodle.png diff --git a/public/img/emoji/poop.png b/public/vendor/plugins/emojify/images/poop.png similarity index 100% rename from public/img/emoji/poop.png rename to public/vendor/plugins/emojify/images/poop.png diff --git a/public/img/emoji/post_office.png b/public/vendor/plugins/emojify/images/post_office.png similarity index 100% rename from public/img/emoji/post_office.png rename to public/vendor/plugins/emojify/images/post_office.png diff --git a/public/img/emoji/postal_horn.png b/public/vendor/plugins/emojify/images/postal_horn.png similarity index 100% rename from public/img/emoji/postal_horn.png rename to public/vendor/plugins/emojify/images/postal_horn.png diff --git a/public/img/emoji/postbox.png b/public/vendor/plugins/emojify/images/postbox.png similarity index 100% rename from public/img/emoji/postbox.png rename to public/vendor/plugins/emojify/images/postbox.png diff --git a/public/img/emoji/potable_water.png b/public/vendor/plugins/emojify/images/potable_water.png similarity index 100% rename from public/img/emoji/potable_water.png rename to public/vendor/plugins/emojify/images/potable_water.png diff --git a/public/img/emoji/pouch.png b/public/vendor/plugins/emojify/images/pouch.png similarity index 100% rename from public/img/emoji/pouch.png rename to public/vendor/plugins/emojify/images/pouch.png diff --git a/public/img/emoji/poultry_leg.png b/public/vendor/plugins/emojify/images/poultry_leg.png similarity index 100% rename from public/img/emoji/poultry_leg.png rename to public/vendor/plugins/emojify/images/poultry_leg.png diff --git a/public/img/emoji/pound.png b/public/vendor/plugins/emojify/images/pound.png similarity index 100% rename from public/img/emoji/pound.png rename to public/vendor/plugins/emojify/images/pound.png diff --git a/public/img/emoji/pouting_cat.png b/public/vendor/plugins/emojify/images/pouting_cat.png similarity index 100% rename from public/img/emoji/pouting_cat.png rename to public/vendor/plugins/emojify/images/pouting_cat.png diff --git a/public/img/emoji/pray.png b/public/vendor/plugins/emojify/images/pray.png similarity index 100% rename from public/img/emoji/pray.png rename to public/vendor/plugins/emojify/images/pray.png diff --git a/public/img/emoji/princess.png b/public/vendor/plugins/emojify/images/princess.png similarity index 100% rename from public/img/emoji/princess.png rename to public/vendor/plugins/emojify/images/princess.png diff --git a/public/img/emoji/punch.png b/public/vendor/plugins/emojify/images/punch.png similarity index 100% rename from public/img/emoji/punch.png rename to public/vendor/plugins/emojify/images/punch.png diff --git a/public/img/emoji/purple_heart.png b/public/vendor/plugins/emojify/images/purple_heart.png similarity index 100% rename from public/img/emoji/purple_heart.png rename to public/vendor/plugins/emojify/images/purple_heart.png diff --git a/public/img/emoji/purse.png b/public/vendor/plugins/emojify/images/purse.png similarity index 100% rename from public/img/emoji/purse.png rename to public/vendor/plugins/emojify/images/purse.png diff --git a/public/img/emoji/pushpin.png b/public/vendor/plugins/emojify/images/pushpin.png similarity index 100% rename from public/img/emoji/pushpin.png rename to public/vendor/plugins/emojify/images/pushpin.png diff --git a/public/img/emoji/put_litter_in_its_place.png b/public/vendor/plugins/emojify/images/put_litter_in_its_place.png similarity index 100% rename from public/img/emoji/put_litter_in_its_place.png rename to public/vendor/plugins/emojify/images/put_litter_in_its_place.png diff --git a/public/img/emoji/question.png b/public/vendor/plugins/emojify/images/question.png similarity index 100% rename from public/img/emoji/question.png rename to public/vendor/plugins/emojify/images/question.png diff --git a/public/img/emoji/rabbit.png b/public/vendor/plugins/emojify/images/rabbit.png similarity index 100% rename from public/img/emoji/rabbit.png rename to public/vendor/plugins/emojify/images/rabbit.png diff --git a/public/img/emoji/rabbit2.png b/public/vendor/plugins/emojify/images/rabbit2.png similarity index 100% rename from public/img/emoji/rabbit2.png rename to public/vendor/plugins/emojify/images/rabbit2.png diff --git a/public/img/emoji/racehorse.png b/public/vendor/plugins/emojify/images/racehorse.png similarity index 100% rename from public/img/emoji/racehorse.png rename to public/vendor/plugins/emojify/images/racehorse.png diff --git a/public/img/emoji/radio.png b/public/vendor/plugins/emojify/images/radio.png similarity index 100% rename from public/img/emoji/radio.png rename to public/vendor/plugins/emojify/images/radio.png diff --git a/public/img/emoji/radio_button.png b/public/vendor/plugins/emojify/images/radio_button.png similarity index 100% rename from public/img/emoji/radio_button.png rename to public/vendor/plugins/emojify/images/radio_button.png diff --git a/public/img/emoji/rage.png b/public/vendor/plugins/emojify/images/rage.png similarity index 100% rename from public/img/emoji/rage.png rename to public/vendor/plugins/emojify/images/rage.png diff --git a/public/img/emoji/rage1.png b/public/vendor/plugins/emojify/images/rage1.png similarity index 100% rename from public/img/emoji/rage1.png rename to public/vendor/plugins/emojify/images/rage1.png diff --git a/public/img/emoji/rage2.png b/public/vendor/plugins/emojify/images/rage2.png similarity index 100% rename from public/img/emoji/rage2.png rename to public/vendor/plugins/emojify/images/rage2.png diff --git a/public/img/emoji/rage3.png b/public/vendor/plugins/emojify/images/rage3.png similarity index 100% rename from public/img/emoji/rage3.png rename to public/vendor/plugins/emojify/images/rage3.png diff --git a/public/img/emoji/rage4.png b/public/vendor/plugins/emojify/images/rage4.png similarity index 100% rename from public/img/emoji/rage4.png rename to public/vendor/plugins/emojify/images/rage4.png diff --git a/public/img/emoji/railway_car.png b/public/vendor/plugins/emojify/images/railway_car.png similarity index 100% rename from public/img/emoji/railway_car.png rename to public/vendor/plugins/emojify/images/railway_car.png diff --git a/public/img/emoji/rainbow.png b/public/vendor/plugins/emojify/images/rainbow.png similarity index 100% rename from public/img/emoji/rainbow.png rename to public/vendor/plugins/emojify/images/rainbow.png diff --git a/public/img/emoji/raised_hand.png b/public/vendor/plugins/emojify/images/raised_hand.png similarity index 100% rename from public/img/emoji/raised_hand.png rename to public/vendor/plugins/emojify/images/raised_hand.png diff --git a/public/img/emoji/raised_hands.png b/public/vendor/plugins/emojify/images/raised_hands.png similarity index 100% rename from public/img/emoji/raised_hands.png rename to public/vendor/plugins/emojify/images/raised_hands.png diff --git a/public/img/emoji/raising_hand.png b/public/vendor/plugins/emojify/images/raising_hand.png similarity index 100% rename from public/img/emoji/raising_hand.png rename to public/vendor/plugins/emojify/images/raising_hand.png diff --git a/public/img/emoji/ram.png b/public/vendor/plugins/emojify/images/ram.png similarity index 100% rename from public/img/emoji/ram.png rename to public/vendor/plugins/emojify/images/ram.png diff --git a/public/img/emoji/ramen.png b/public/vendor/plugins/emojify/images/ramen.png similarity index 100% rename from public/img/emoji/ramen.png rename to public/vendor/plugins/emojify/images/ramen.png diff --git a/public/img/emoji/rat.png b/public/vendor/plugins/emojify/images/rat.png similarity index 100% rename from public/img/emoji/rat.png rename to public/vendor/plugins/emojify/images/rat.png diff --git a/public/img/emoji/recycle.png b/public/vendor/plugins/emojify/images/recycle.png similarity index 100% rename from public/img/emoji/recycle.png rename to public/vendor/plugins/emojify/images/recycle.png diff --git a/public/img/emoji/red_car.png b/public/vendor/plugins/emojify/images/red_car.png similarity index 100% rename from public/img/emoji/red_car.png rename to public/vendor/plugins/emojify/images/red_car.png diff --git a/public/img/emoji/red_circle.png b/public/vendor/plugins/emojify/images/red_circle.png similarity index 100% rename from public/img/emoji/red_circle.png rename to public/vendor/plugins/emojify/images/red_circle.png diff --git a/public/img/emoji/registered.png b/public/vendor/plugins/emojify/images/registered.png similarity index 100% rename from public/img/emoji/registered.png rename to public/vendor/plugins/emojify/images/registered.png diff --git a/public/img/emoji/relaxed.png b/public/vendor/plugins/emojify/images/relaxed.png similarity index 100% rename from public/img/emoji/relaxed.png rename to public/vendor/plugins/emojify/images/relaxed.png diff --git a/public/img/emoji/relieved.png b/public/vendor/plugins/emojify/images/relieved.png similarity index 100% rename from public/img/emoji/relieved.png rename to public/vendor/plugins/emojify/images/relieved.png diff --git a/public/img/emoji/repeat.png b/public/vendor/plugins/emojify/images/repeat.png similarity index 100% rename from public/img/emoji/repeat.png rename to public/vendor/plugins/emojify/images/repeat.png diff --git a/public/img/emoji/repeat_one.png b/public/vendor/plugins/emojify/images/repeat_one.png similarity index 100% rename from public/img/emoji/repeat_one.png rename to public/vendor/plugins/emojify/images/repeat_one.png diff --git a/public/img/emoji/restroom.png b/public/vendor/plugins/emojify/images/restroom.png similarity index 100% rename from public/img/emoji/restroom.png rename to public/vendor/plugins/emojify/images/restroom.png diff --git a/public/img/emoji/revolving_hearts.png b/public/vendor/plugins/emojify/images/revolving_hearts.png similarity index 100% rename from public/img/emoji/revolving_hearts.png rename to public/vendor/plugins/emojify/images/revolving_hearts.png diff --git a/public/img/emoji/rewind.png b/public/vendor/plugins/emojify/images/rewind.png similarity index 100% rename from public/img/emoji/rewind.png rename to public/vendor/plugins/emojify/images/rewind.png diff --git a/public/img/emoji/ribbon.png b/public/vendor/plugins/emojify/images/ribbon.png similarity index 100% rename from public/img/emoji/ribbon.png rename to public/vendor/plugins/emojify/images/ribbon.png diff --git a/public/img/emoji/rice.png b/public/vendor/plugins/emojify/images/rice.png similarity index 100% rename from public/img/emoji/rice.png rename to public/vendor/plugins/emojify/images/rice.png diff --git a/public/img/emoji/rice_ball.png b/public/vendor/plugins/emojify/images/rice_ball.png similarity index 100% rename from public/img/emoji/rice_ball.png rename to public/vendor/plugins/emojify/images/rice_ball.png diff --git a/public/img/emoji/rice_cracker.png b/public/vendor/plugins/emojify/images/rice_cracker.png similarity index 100% rename from public/img/emoji/rice_cracker.png rename to public/vendor/plugins/emojify/images/rice_cracker.png diff --git a/public/img/emoji/rice_scene.png b/public/vendor/plugins/emojify/images/rice_scene.png similarity index 100% rename from public/img/emoji/rice_scene.png rename to public/vendor/plugins/emojify/images/rice_scene.png diff --git a/public/img/emoji/ring.png b/public/vendor/plugins/emojify/images/ring.png similarity index 100% rename from public/img/emoji/ring.png rename to public/vendor/plugins/emojify/images/ring.png diff --git a/public/img/emoji/rocket.png b/public/vendor/plugins/emojify/images/rocket.png similarity index 100% rename from public/img/emoji/rocket.png rename to public/vendor/plugins/emojify/images/rocket.png diff --git a/public/img/emoji/roller_coaster.png b/public/vendor/plugins/emojify/images/roller_coaster.png similarity index 100% rename from public/img/emoji/roller_coaster.png rename to public/vendor/plugins/emojify/images/roller_coaster.png diff --git a/public/img/emoji/rooster.png b/public/vendor/plugins/emojify/images/rooster.png similarity index 100% rename from public/img/emoji/rooster.png rename to public/vendor/plugins/emojify/images/rooster.png diff --git a/public/img/emoji/rose.png b/public/vendor/plugins/emojify/images/rose.png similarity index 100% rename from public/img/emoji/rose.png rename to public/vendor/plugins/emojify/images/rose.png diff --git a/public/img/emoji/rotating_light.png b/public/vendor/plugins/emojify/images/rotating_light.png similarity index 100% rename from public/img/emoji/rotating_light.png rename to public/vendor/plugins/emojify/images/rotating_light.png diff --git a/public/img/emoji/round_pushpin.png b/public/vendor/plugins/emojify/images/round_pushpin.png similarity index 100% rename from public/img/emoji/round_pushpin.png rename to public/vendor/plugins/emojify/images/round_pushpin.png diff --git a/public/img/emoji/rowboat.png b/public/vendor/plugins/emojify/images/rowboat.png similarity index 100% rename from public/img/emoji/rowboat.png rename to public/vendor/plugins/emojify/images/rowboat.png diff --git a/public/img/emoji/ru.png b/public/vendor/plugins/emojify/images/ru.png similarity index 100% rename from public/img/emoji/ru.png rename to public/vendor/plugins/emojify/images/ru.png diff --git a/public/img/emoji/rugby_football.png b/public/vendor/plugins/emojify/images/rugby_football.png similarity index 100% rename from public/img/emoji/rugby_football.png rename to public/vendor/plugins/emojify/images/rugby_football.png diff --git a/public/img/emoji/runner.png b/public/vendor/plugins/emojify/images/runner.png similarity index 100% rename from public/img/emoji/runner.png rename to public/vendor/plugins/emojify/images/runner.png diff --git a/public/img/emoji/running.png b/public/vendor/plugins/emojify/images/running.png similarity index 100% rename from public/img/emoji/running.png rename to public/vendor/plugins/emojify/images/running.png diff --git a/public/img/emoji/running_shirt_with_sash.png b/public/vendor/plugins/emojify/images/running_shirt_with_sash.png similarity index 100% rename from public/img/emoji/running_shirt_with_sash.png rename to public/vendor/plugins/emojify/images/running_shirt_with_sash.png diff --git a/public/img/emoji/sa.png b/public/vendor/plugins/emojify/images/sa.png similarity index 100% rename from public/img/emoji/sa.png rename to public/vendor/plugins/emojify/images/sa.png diff --git a/public/img/emoji/sagittarius.png b/public/vendor/plugins/emojify/images/sagittarius.png similarity index 100% rename from public/img/emoji/sagittarius.png rename to public/vendor/plugins/emojify/images/sagittarius.png diff --git a/public/img/emoji/sailboat.png b/public/vendor/plugins/emojify/images/sailboat.png similarity index 100% rename from public/img/emoji/sailboat.png rename to public/vendor/plugins/emojify/images/sailboat.png diff --git a/public/img/emoji/sake.png b/public/vendor/plugins/emojify/images/sake.png similarity index 100% rename from public/img/emoji/sake.png rename to public/vendor/plugins/emojify/images/sake.png diff --git a/public/img/emoji/sandal.png b/public/vendor/plugins/emojify/images/sandal.png similarity index 100% rename from public/img/emoji/sandal.png rename to public/vendor/plugins/emojify/images/sandal.png diff --git a/public/img/emoji/santa.png b/public/vendor/plugins/emojify/images/santa.png similarity index 100% rename from public/img/emoji/santa.png rename to public/vendor/plugins/emojify/images/santa.png diff --git a/public/img/emoji/satellite.png b/public/vendor/plugins/emojify/images/satellite.png similarity index 100% rename from public/img/emoji/satellite.png rename to public/vendor/plugins/emojify/images/satellite.png diff --git a/public/img/emoji/satisfied.png b/public/vendor/plugins/emojify/images/satisfied.png similarity index 100% rename from public/img/emoji/satisfied.png rename to public/vendor/plugins/emojify/images/satisfied.png diff --git a/public/img/emoji/saxophone.png b/public/vendor/plugins/emojify/images/saxophone.png similarity index 100% rename from public/img/emoji/saxophone.png rename to public/vendor/plugins/emojify/images/saxophone.png diff --git a/public/img/emoji/school.png b/public/vendor/plugins/emojify/images/school.png similarity index 100% rename from public/img/emoji/school.png rename to public/vendor/plugins/emojify/images/school.png diff --git a/public/img/emoji/school_satchel.png b/public/vendor/plugins/emojify/images/school_satchel.png similarity index 100% rename from public/img/emoji/school_satchel.png rename to public/vendor/plugins/emojify/images/school_satchel.png diff --git a/public/img/emoji/scissors.png b/public/vendor/plugins/emojify/images/scissors.png similarity index 100% rename from public/img/emoji/scissors.png rename to public/vendor/plugins/emojify/images/scissors.png diff --git a/public/img/emoji/scorpius.png b/public/vendor/plugins/emojify/images/scorpius.png similarity index 100% rename from public/img/emoji/scorpius.png rename to public/vendor/plugins/emojify/images/scorpius.png diff --git a/public/img/emoji/scream.png b/public/vendor/plugins/emojify/images/scream.png similarity index 100% rename from public/img/emoji/scream.png rename to public/vendor/plugins/emojify/images/scream.png diff --git a/public/img/emoji/scream_cat.png b/public/vendor/plugins/emojify/images/scream_cat.png similarity index 100% rename from public/img/emoji/scream_cat.png rename to public/vendor/plugins/emojify/images/scream_cat.png diff --git a/public/img/emoji/scroll.png b/public/vendor/plugins/emojify/images/scroll.png similarity index 100% rename from public/img/emoji/scroll.png rename to public/vendor/plugins/emojify/images/scroll.png diff --git a/public/img/emoji/seat.png b/public/vendor/plugins/emojify/images/seat.png similarity index 100% rename from public/img/emoji/seat.png rename to public/vendor/plugins/emojify/images/seat.png diff --git a/public/img/emoji/secret.png b/public/vendor/plugins/emojify/images/secret.png similarity index 100% rename from public/img/emoji/secret.png rename to public/vendor/plugins/emojify/images/secret.png diff --git a/public/img/emoji/see_no_evil.png b/public/vendor/plugins/emojify/images/see_no_evil.png similarity index 100% rename from public/img/emoji/see_no_evil.png rename to public/vendor/plugins/emojify/images/see_no_evil.png diff --git a/public/img/emoji/seedling.png b/public/vendor/plugins/emojify/images/seedling.png similarity index 100% rename from public/img/emoji/seedling.png rename to public/vendor/plugins/emojify/images/seedling.png diff --git a/public/img/emoji/seven.png b/public/vendor/plugins/emojify/images/seven.png similarity index 100% rename from public/img/emoji/seven.png rename to public/vendor/plugins/emojify/images/seven.png diff --git a/public/img/emoji/shaved_ice.png b/public/vendor/plugins/emojify/images/shaved_ice.png similarity index 100% rename from public/img/emoji/shaved_ice.png rename to public/vendor/plugins/emojify/images/shaved_ice.png diff --git a/public/img/emoji/sheep.png b/public/vendor/plugins/emojify/images/sheep.png similarity index 100% rename from public/img/emoji/sheep.png rename to public/vendor/plugins/emojify/images/sheep.png diff --git a/public/img/emoji/shell.png b/public/vendor/plugins/emojify/images/shell.png similarity index 100% rename from public/img/emoji/shell.png rename to public/vendor/plugins/emojify/images/shell.png diff --git a/public/img/emoji/ship.png b/public/vendor/plugins/emojify/images/ship.png similarity index 100% rename from public/img/emoji/ship.png rename to public/vendor/plugins/emojify/images/ship.png diff --git a/public/img/emoji/shipit.png b/public/vendor/plugins/emojify/images/shipit.png similarity index 100% rename from public/img/emoji/shipit.png rename to public/vendor/plugins/emojify/images/shipit.png diff --git a/public/img/emoji/shirt.png b/public/vendor/plugins/emojify/images/shirt.png similarity index 100% rename from public/img/emoji/shirt.png rename to public/vendor/plugins/emojify/images/shirt.png diff --git a/public/img/emoji/shit.png b/public/vendor/plugins/emojify/images/shit.png similarity index 100% rename from public/img/emoji/shit.png rename to public/vendor/plugins/emojify/images/shit.png diff --git a/public/img/emoji/shoe.png b/public/vendor/plugins/emojify/images/shoe.png similarity index 100% rename from public/img/emoji/shoe.png rename to public/vendor/plugins/emojify/images/shoe.png diff --git a/public/img/emoji/shower.png b/public/vendor/plugins/emojify/images/shower.png similarity index 100% rename from public/img/emoji/shower.png rename to public/vendor/plugins/emojify/images/shower.png diff --git a/public/img/emoji/signal_strength.png b/public/vendor/plugins/emojify/images/signal_strength.png similarity index 100% rename from public/img/emoji/signal_strength.png rename to public/vendor/plugins/emojify/images/signal_strength.png diff --git a/public/img/emoji/six.png b/public/vendor/plugins/emojify/images/six.png similarity index 100% rename from public/img/emoji/six.png rename to public/vendor/plugins/emojify/images/six.png diff --git a/public/img/emoji/six_pointed_star.png b/public/vendor/plugins/emojify/images/six_pointed_star.png similarity index 100% rename from public/img/emoji/six_pointed_star.png rename to public/vendor/plugins/emojify/images/six_pointed_star.png diff --git a/public/img/emoji/ski.png b/public/vendor/plugins/emojify/images/ski.png similarity index 100% rename from public/img/emoji/ski.png rename to public/vendor/plugins/emojify/images/ski.png diff --git a/public/img/emoji/skull.png b/public/vendor/plugins/emojify/images/skull.png similarity index 100% rename from public/img/emoji/skull.png rename to public/vendor/plugins/emojify/images/skull.png diff --git a/public/img/emoji/sleeping.png b/public/vendor/plugins/emojify/images/sleeping.png similarity index 100% rename from public/img/emoji/sleeping.png rename to public/vendor/plugins/emojify/images/sleeping.png diff --git a/public/img/emoji/sleepy.png b/public/vendor/plugins/emojify/images/sleepy.png similarity index 100% rename from public/img/emoji/sleepy.png rename to public/vendor/plugins/emojify/images/sleepy.png diff --git a/public/img/emoji/slot_machine.png b/public/vendor/plugins/emojify/images/slot_machine.png similarity index 100% rename from public/img/emoji/slot_machine.png rename to public/vendor/plugins/emojify/images/slot_machine.png diff --git a/public/img/emoji/small_blue_diamond.png b/public/vendor/plugins/emojify/images/small_blue_diamond.png similarity index 100% rename from public/img/emoji/small_blue_diamond.png rename to public/vendor/plugins/emojify/images/small_blue_diamond.png diff --git a/public/img/emoji/small_orange_diamond.png b/public/vendor/plugins/emojify/images/small_orange_diamond.png similarity index 100% rename from public/img/emoji/small_orange_diamond.png rename to public/vendor/plugins/emojify/images/small_orange_diamond.png diff --git a/public/img/emoji/small_red_triangle.png b/public/vendor/plugins/emojify/images/small_red_triangle.png similarity index 100% rename from public/img/emoji/small_red_triangle.png rename to public/vendor/plugins/emojify/images/small_red_triangle.png diff --git a/public/img/emoji/small_red_triangle_down.png b/public/vendor/plugins/emojify/images/small_red_triangle_down.png similarity index 100% rename from public/img/emoji/small_red_triangle_down.png rename to public/vendor/plugins/emojify/images/small_red_triangle_down.png diff --git a/public/img/emoji/smile.png b/public/vendor/plugins/emojify/images/smile.png similarity index 100% rename from public/img/emoji/smile.png rename to public/vendor/plugins/emojify/images/smile.png diff --git a/public/img/emoji/smile_cat.png b/public/vendor/plugins/emojify/images/smile_cat.png similarity index 100% rename from public/img/emoji/smile_cat.png rename to public/vendor/plugins/emojify/images/smile_cat.png diff --git a/public/img/emoji/smiley.png b/public/vendor/plugins/emojify/images/smiley.png similarity index 100% rename from public/img/emoji/smiley.png rename to public/vendor/plugins/emojify/images/smiley.png diff --git a/public/img/emoji/smiley_cat.png b/public/vendor/plugins/emojify/images/smiley_cat.png similarity index 100% rename from public/img/emoji/smiley_cat.png rename to public/vendor/plugins/emojify/images/smiley_cat.png diff --git a/public/img/emoji/smiling_imp.png b/public/vendor/plugins/emojify/images/smiling_imp.png similarity index 100% rename from public/img/emoji/smiling_imp.png rename to public/vendor/plugins/emojify/images/smiling_imp.png diff --git a/public/img/emoji/smirk.png b/public/vendor/plugins/emojify/images/smirk.png similarity index 100% rename from public/img/emoji/smirk.png rename to public/vendor/plugins/emojify/images/smirk.png diff --git a/public/img/emoji/smirk_cat.png b/public/vendor/plugins/emojify/images/smirk_cat.png similarity index 100% rename from public/img/emoji/smirk_cat.png rename to public/vendor/plugins/emojify/images/smirk_cat.png diff --git a/public/img/emoji/smoking.png b/public/vendor/plugins/emojify/images/smoking.png similarity index 100% rename from public/img/emoji/smoking.png rename to public/vendor/plugins/emojify/images/smoking.png diff --git a/public/img/emoji/snail.png b/public/vendor/plugins/emojify/images/snail.png similarity index 100% rename from public/img/emoji/snail.png rename to public/vendor/plugins/emojify/images/snail.png diff --git a/public/img/emoji/snake.png b/public/vendor/plugins/emojify/images/snake.png similarity index 100% rename from public/img/emoji/snake.png rename to public/vendor/plugins/emojify/images/snake.png diff --git a/public/img/emoji/snowboarder.png b/public/vendor/plugins/emojify/images/snowboarder.png similarity index 100% rename from public/img/emoji/snowboarder.png rename to public/vendor/plugins/emojify/images/snowboarder.png diff --git a/public/img/emoji/snowflake.png b/public/vendor/plugins/emojify/images/snowflake.png similarity index 100% rename from public/img/emoji/snowflake.png rename to public/vendor/plugins/emojify/images/snowflake.png diff --git a/public/img/emoji/snowman.png b/public/vendor/plugins/emojify/images/snowman.png similarity index 100% rename from public/img/emoji/snowman.png rename to public/vendor/plugins/emojify/images/snowman.png diff --git a/public/img/emoji/sob.png b/public/vendor/plugins/emojify/images/sob.png similarity index 100% rename from public/img/emoji/sob.png rename to public/vendor/plugins/emojify/images/sob.png diff --git a/public/img/emoji/soccer.png b/public/vendor/plugins/emojify/images/soccer.png similarity index 100% rename from public/img/emoji/soccer.png rename to public/vendor/plugins/emojify/images/soccer.png diff --git a/public/img/emoji/soon.png b/public/vendor/plugins/emojify/images/soon.png similarity index 100% rename from public/img/emoji/soon.png rename to public/vendor/plugins/emojify/images/soon.png diff --git a/public/img/emoji/sos.png b/public/vendor/plugins/emojify/images/sos.png similarity index 100% rename from public/img/emoji/sos.png rename to public/vendor/plugins/emojify/images/sos.png diff --git a/public/img/emoji/sound.png b/public/vendor/plugins/emojify/images/sound.png similarity index 100% rename from public/img/emoji/sound.png rename to public/vendor/plugins/emojify/images/sound.png diff --git a/public/img/emoji/space_invader.png b/public/vendor/plugins/emojify/images/space_invader.png similarity index 100% rename from public/img/emoji/space_invader.png rename to public/vendor/plugins/emojify/images/space_invader.png diff --git a/public/img/emoji/spades.png b/public/vendor/plugins/emojify/images/spades.png similarity index 100% rename from public/img/emoji/spades.png rename to public/vendor/plugins/emojify/images/spades.png diff --git a/public/img/emoji/spaghetti.png b/public/vendor/plugins/emojify/images/spaghetti.png similarity index 100% rename from public/img/emoji/spaghetti.png rename to public/vendor/plugins/emojify/images/spaghetti.png diff --git a/public/img/emoji/sparkle.png b/public/vendor/plugins/emojify/images/sparkle.png similarity index 100% rename from public/img/emoji/sparkle.png rename to public/vendor/plugins/emojify/images/sparkle.png diff --git a/public/img/emoji/sparkler.png b/public/vendor/plugins/emojify/images/sparkler.png similarity index 100% rename from public/img/emoji/sparkler.png rename to public/vendor/plugins/emojify/images/sparkler.png diff --git a/public/img/emoji/sparkles.png b/public/vendor/plugins/emojify/images/sparkles.png similarity index 100% rename from public/img/emoji/sparkles.png rename to public/vendor/plugins/emojify/images/sparkles.png diff --git a/public/img/emoji/sparkling_heart.png b/public/vendor/plugins/emojify/images/sparkling_heart.png similarity index 100% rename from public/img/emoji/sparkling_heart.png rename to public/vendor/plugins/emojify/images/sparkling_heart.png diff --git a/public/img/emoji/speak_no_evil.png b/public/vendor/plugins/emojify/images/speak_no_evil.png similarity index 100% rename from public/img/emoji/speak_no_evil.png rename to public/vendor/plugins/emojify/images/speak_no_evil.png diff --git a/public/img/emoji/speaker.png b/public/vendor/plugins/emojify/images/speaker.png similarity index 100% rename from public/img/emoji/speaker.png rename to public/vendor/plugins/emojify/images/speaker.png diff --git a/public/img/emoji/speech_balloon.png b/public/vendor/plugins/emojify/images/speech_balloon.png similarity index 100% rename from public/img/emoji/speech_balloon.png rename to public/vendor/plugins/emojify/images/speech_balloon.png diff --git a/public/img/emoji/speedboat.png b/public/vendor/plugins/emojify/images/speedboat.png similarity index 100% rename from public/img/emoji/speedboat.png rename to public/vendor/plugins/emojify/images/speedboat.png diff --git a/public/img/emoji/squirrel.png b/public/vendor/plugins/emojify/images/squirrel.png similarity index 100% rename from public/img/emoji/squirrel.png rename to public/vendor/plugins/emojify/images/squirrel.png diff --git a/public/img/emoji/star.png b/public/vendor/plugins/emojify/images/star.png similarity index 100% rename from public/img/emoji/star.png rename to public/vendor/plugins/emojify/images/star.png diff --git a/public/img/emoji/star2.png b/public/vendor/plugins/emojify/images/star2.png similarity index 100% rename from public/img/emoji/star2.png rename to public/vendor/plugins/emojify/images/star2.png diff --git a/public/img/emoji/stars.png b/public/vendor/plugins/emojify/images/stars.png similarity index 100% rename from public/img/emoji/stars.png rename to public/vendor/plugins/emojify/images/stars.png diff --git a/public/img/emoji/station.png b/public/vendor/plugins/emojify/images/station.png similarity index 100% rename from public/img/emoji/station.png rename to public/vendor/plugins/emojify/images/station.png diff --git a/public/img/emoji/statue_of_liberty.png b/public/vendor/plugins/emojify/images/statue_of_liberty.png similarity index 100% rename from public/img/emoji/statue_of_liberty.png rename to public/vendor/plugins/emojify/images/statue_of_liberty.png diff --git a/public/img/emoji/steam_locomotive.png b/public/vendor/plugins/emojify/images/steam_locomotive.png similarity index 100% rename from public/img/emoji/steam_locomotive.png rename to public/vendor/plugins/emojify/images/steam_locomotive.png diff --git a/public/img/emoji/stew.png b/public/vendor/plugins/emojify/images/stew.png similarity index 100% rename from public/img/emoji/stew.png rename to public/vendor/plugins/emojify/images/stew.png diff --git a/public/img/emoji/straight_ruler.png b/public/vendor/plugins/emojify/images/straight_ruler.png similarity index 100% rename from public/img/emoji/straight_ruler.png rename to public/vendor/plugins/emojify/images/straight_ruler.png diff --git a/public/img/emoji/strawberry.png b/public/vendor/plugins/emojify/images/strawberry.png similarity index 100% rename from public/img/emoji/strawberry.png rename to public/vendor/plugins/emojify/images/strawberry.png diff --git a/public/img/emoji/stuck_out_tongue.png b/public/vendor/plugins/emojify/images/stuck_out_tongue.png similarity index 100% rename from public/img/emoji/stuck_out_tongue.png rename to public/vendor/plugins/emojify/images/stuck_out_tongue.png diff --git a/public/img/emoji/stuck_out_tongue_closed_eyes.png b/public/vendor/plugins/emojify/images/stuck_out_tongue_closed_eyes.png similarity index 100% rename from public/img/emoji/stuck_out_tongue_closed_eyes.png rename to public/vendor/plugins/emojify/images/stuck_out_tongue_closed_eyes.png diff --git a/public/img/emoji/stuck_out_tongue_winking_eye.png b/public/vendor/plugins/emojify/images/stuck_out_tongue_winking_eye.png similarity index 100% rename from public/img/emoji/stuck_out_tongue_winking_eye.png rename to public/vendor/plugins/emojify/images/stuck_out_tongue_winking_eye.png diff --git a/public/img/emoji/sun_with_face.png b/public/vendor/plugins/emojify/images/sun_with_face.png similarity index 100% rename from public/img/emoji/sun_with_face.png rename to public/vendor/plugins/emojify/images/sun_with_face.png diff --git a/public/img/emoji/sunflower.png b/public/vendor/plugins/emojify/images/sunflower.png similarity index 100% rename from public/img/emoji/sunflower.png rename to public/vendor/plugins/emojify/images/sunflower.png diff --git a/public/img/emoji/sunglasses.png b/public/vendor/plugins/emojify/images/sunglasses.png similarity index 100% rename from public/img/emoji/sunglasses.png rename to public/vendor/plugins/emojify/images/sunglasses.png diff --git a/public/img/emoji/sunny.png b/public/vendor/plugins/emojify/images/sunny.png similarity index 100% rename from public/img/emoji/sunny.png rename to public/vendor/plugins/emojify/images/sunny.png diff --git a/public/img/emoji/sunrise.png b/public/vendor/plugins/emojify/images/sunrise.png similarity index 100% rename from public/img/emoji/sunrise.png rename to public/vendor/plugins/emojify/images/sunrise.png diff --git a/public/img/emoji/sunrise_over_mountains.png b/public/vendor/plugins/emojify/images/sunrise_over_mountains.png similarity index 100% rename from public/img/emoji/sunrise_over_mountains.png rename to public/vendor/plugins/emojify/images/sunrise_over_mountains.png diff --git a/public/img/emoji/surfer.png b/public/vendor/plugins/emojify/images/surfer.png similarity index 100% rename from public/img/emoji/surfer.png rename to public/vendor/plugins/emojify/images/surfer.png diff --git a/public/img/emoji/sushi.png b/public/vendor/plugins/emojify/images/sushi.png similarity index 100% rename from public/img/emoji/sushi.png rename to public/vendor/plugins/emojify/images/sushi.png diff --git a/public/img/emoji/suspect.png b/public/vendor/plugins/emojify/images/suspect.png similarity index 100% rename from public/img/emoji/suspect.png rename to public/vendor/plugins/emojify/images/suspect.png diff --git a/public/img/emoji/suspension_railway.png b/public/vendor/plugins/emojify/images/suspension_railway.png similarity index 100% rename from public/img/emoji/suspension_railway.png rename to public/vendor/plugins/emojify/images/suspension_railway.png diff --git a/public/img/emoji/sweat.png b/public/vendor/plugins/emojify/images/sweat.png similarity index 100% rename from public/img/emoji/sweat.png rename to public/vendor/plugins/emojify/images/sweat.png diff --git a/public/img/emoji/sweat_drops.png b/public/vendor/plugins/emojify/images/sweat_drops.png similarity index 100% rename from public/img/emoji/sweat_drops.png rename to public/vendor/plugins/emojify/images/sweat_drops.png diff --git a/public/img/emoji/sweat_smile.png b/public/vendor/plugins/emojify/images/sweat_smile.png similarity index 100% rename from public/img/emoji/sweat_smile.png rename to public/vendor/plugins/emojify/images/sweat_smile.png diff --git a/public/img/emoji/sweet_potato.png b/public/vendor/plugins/emojify/images/sweet_potato.png similarity index 100% rename from public/img/emoji/sweet_potato.png rename to public/vendor/plugins/emojify/images/sweet_potato.png diff --git a/public/img/emoji/swimmer.png b/public/vendor/plugins/emojify/images/swimmer.png similarity index 100% rename from public/img/emoji/swimmer.png rename to public/vendor/plugins/emojify/images/swimmer.png diff --git a/public/img/emoji/symbols.png b/public/vendor/plugins/emojify/images/symbols.png similarity index 100% rename from public/img/emoji/symbols.png rename to public/vendor/plugins/emojify/images/symbols.png diff --git a/public/img/emoji/syringe.png b/public/vendor/plugins/emojify/images/syringe.png similarity index 100% rename from public/img/emoji/syringe.png rename to public/vendor/plugins/emojify/images/syringe.png diff --git a/public/img/emoji/tada.png b/public/vendor/plugins/emojify/images/tada.png similarity index 100% rename from public/img/emoji/tada.png rename to public/vendor/plugins/emojify/images/tada.png diff --git a/public/img/emoji/tanabata_tree.png b/public/vendor/plugins/emojify/images/tanabata_tree.png similarity index 100% rename from public/img/emoji/tanabata_tree.png rename to public/vendor/plugins/emojify/images/tanabata_tree.png diff --git a/public/img/emoji/tangerine.png b/public/vendor/plugins/emojify/images/tangerine.png similarity index 100% rename from public/img/emoji/tangerine.png rename to public/vendor/plugins/emojify/images/tangerine.png diff --git a/public/img/emoji/taurus.png b/public/vendor/plugins/emojify/images/taurus.png similarity index 100% rename from public/img/emoji/taurus.png rename to public/vendor/plugins/emojify/images/taurus.png diff --git a/public/img/emoji/taxi.png b/public/vendor/plugins/emojify/images/taxi.png similarity index 100% rename from public/img/emoji/taxi.png rename to public/vendor/plugins/emojify/images/taxi.png diff --git a/public/img/emoji/tea.png b/public/vendor/plugins/emojify/images/tea.png similarity index 100% rename from public/img/emoji/tea.png rename to public/vendor/plugins/emojify/images/tea.png diff --git a/public/img/emoji/telephone.png b/public/vendor/plugins/emojify/images/telephone.png similarity index 100% rename from public/img/emoji/telephone.png rename to public/vendor/plugins/emojify/images/telephone.png diff --git a/public/img/emoji/telephone_receiver.png b/public/vendor/plugins/emojify/images/telephone_receiver.png similarity index 100% rename from public/img/emoji/telephone_receiver.png rename to public/vendor/plugins/emojify/images/telephone_receiver.png diff --git a/public/img/emoji/telescope.png b/public/vendor/plugins/emojify/images/telescope.png similarity index 100% rename from public/img/emoji/telescope.png rename to public/vendor/plugins/emojify/images/telescope.png diff --git a/public/img/emoji/tennis.png b/public/vendor/plugins/emojify/images/tennis.png similarity index 100% rename from public/img/emoji/tennis.png rename to public/vendor/plugins/emojify/images/tennis.png diff --git a/public/img/emoji/tent.png b/public/vendor/plugins/emojify/images/tent.png similarity index 100% rename from public/img/emoji/tent.png rename to public/vendor/plugins/emojify/images/tent.png diff --git a/public/img/emoji/thought_balloon.png b/public/vendor/plugins/emojify/images/thought_balloon.png similarity index 100% rename from public/img/emoji/thought_balloon.png rename to public/vendor/plugins/emojify/images/thought_balloon.png diff --git a/public/img/emoji/three.png b/public/vendor/plugins/emojify/images/three.png similarity index 100% rename from public/img/emoji/three.png rename to public/vendor/plugins/emojify/images/three.png diff --git a/public/img/emoji/thumbsdown.png b/public/vendor/plugins/emojify/images/thumbsdown.png similarity index 100% rename from public/img/emoji/thumbsdown.png rename to public/vendor/plugins/emojify/images/thumbsdown.png diff --git a/public/img/emoji/thumbsup.png b/public/vendor/plugins/emojify/images/thumbsup.png similarity index 100% rename from public/img/emoji/thumbsup.png rename to public/vendor/plugins/emojify/images/thumbsup.png diff --git a/public/img/emoji/ticket.png b/public/vendor/plugins/emojify/images/ticket.png similarity index 100% rename from public/img/emoji/ticket.png rename to public/vendor/plugins/emojify/images/ticket.png diff --git a/public/img/emoji/tiger.png b/public/vendor/plugins/emojify/images/tiger.png similarity index 100% rename from public/img/emoji/tiger.png rename to public/vendor/plugins/emojify/images/tiger.png diff --git a/public/img/emoji/tiger2.png b/public/vendor/plugins/emojify/images/tiger2.png similarity index 100% rename from public/img/emoji/tiger2.png rename to public/vendor/plugins/emojify/images/tiger2.png diff --git a/public/img/emoji/tired_face.png b/public/vendor/plugins/emojify/images/tired_face.png similarity index 100% rename from public/img/emoji/tired_face.png rename to public/vendor/plugins/emojify/images/tired_face.png diff --git a/public/img/emoji/tm.png b/public/vendor/plugins/emojify/images/tm.png similarity index 100% rename from public/img/emoji/tm.png rename to public/vendor/plugins/emojify/images/tm.png diff --git a/public/img/emoji/toilet.png b/public/vendor/plugins/emojify/images/toilet.png similarity index 100% rename from public/img/emoji/toilet.png rename to public/vendor/plugins/emojify/images/toilet.png diff --git a/public/img/emoji/tokyo_tower.png b/public/vendor/plugins/emojify/images/tokyo_tower.png similarity index 100% rename from public/img/emoji/tokyo_tower.png rename to public/vendor/plugins/emojify/images/tokyo_tower.png diff --git a/public/img/emoji/tomato.png b/public/vendor/plugins/emojify/images/tomato.png similarity index 100% rename from public/img/emoji/tomato.png rename to public/vendor/plugins/emojify/images/tomato.png diff --git a/public/img/emoji/tongue.png b/public/vendor/plugins/emojify/images/tongue.png similarity index 100% rename from public/img/emoji/tongue.png rename to public/vendor/plugins/emojify/images/tongue.png diff --git a/public/img/emoji/top.png b/public/vendor/plugins/emojify/images/top.png similarity index 100% rename from public/img/emoji/top.png rename to public/vendor/plugins/emojify/images/top.png diff --git a/public/img/emoji/tophat.png b/public/vendor/plugins/emojify/images/tophat.png similarity index 100% rename from public/img/emoji/tophat.png rename to public/vendor/plugins/emojify/images/tophat.png diff --git a/public/img/emoji/tractor.png b/public/vendor/plugins/emojify/images/tractor.png similarity index 100% rename from public/img/emoji/tractor.png rename to public/vendor/plugins/emojify/images/tractor.png diff --git a/public/img/emoji/traffic_light.png b/public/vendor/plugins/emojify/images/traffic_light.png similarity index 100% rename from public/img/emoji/traffic_light.png rename to public/vendor/plugins/emojify/images/traffic_light.png diff --git a/public/img/emoji/train.png b/public/vendor/plugins/emojify/images/train.png similarity index 100% rename from public/img/emoji/train.png rename to public/vendor/plugins/emojify/images/train.png diff --git a/public/img/emoji/train2.png b/public/vendor/plugins/emojify/images/train2.png similarity index 100% rename from public/img/emoji/train2.png rename to public/vendor/plugins/emojify/images/train2.png diff --git a/public/img/emoji/tram.png b/public/vendor/plugins/emojify/images/tram.png similarity index 100% rename from public/img/emoji/tram.png rename to public/vendor/plugins/emojify/images/tram.png diff --git a/public/img/emoji/triangular_flag_on_post.png b/public/vendor/plugins/emojify/images/triangular_flag_on_post.png similarity index 100% rename from public/img/emoji/triangular_flag_on_post.png rename to public/vendor/plugins/emojify/images/triangular_flag_on_post.png diff --git a/public/img/emoji/triangular_ruler.png b/public/vendor/plugins/emojify/images/triangular_ruler.png similarity index 100% rename from public/img/emoji/triangular_ruler.png rename to public/vendor/plugins/emojify/images/triangular_ruler.png diff --git a/public/img/emoji/trident.png b/public/vendor/plugins/emojify/images/trident.png similarity index 100% rename from public/img/emoji/trident.png rename to public/vendor/plugins/emojify/images/trident.png diff --git a/public/img/emoji/triumph.png b/public/vendor/plugins/emojify/images/triumph.png similarity index 100% rename from public/img/emoji/triumph.png rename to public/vendor/plugins/emojify/images/triumph.png diff --git a/public/img/emoji/trolleybus.png b/public/vendor/plugins/emojify/images/trolleybus.png similarity index 100% rename from public/img/emoji/trolleybus.png rename to public/vendor/plugins/emojify/images/trolleybus.png diff --git a/public/img/emoji/trollface.png b/public/vendor/plugins/emojify/images/trollface.png similarity index 100% rename from public/img/emoji/trollface.png rename to public/vendor/plugins/emojify/images/trollface.png diff --git a/public/img/emoji/trophy.png b/public/vendor/plugins/emojify/images/trophy.png similarity index 100% rename from public/img/emoji/trophy.png rename to public/vendor/plugins/emojify/images/trophy.png diff --git a/public/img/emoji/tropical_drink.png b/public/vendor/plugins/emojify/images/tropical_drink.png similarity index 100% rename from public/img/emoji/tropical_drink.png rename to public/vendor/plugins/emojify/images/tropical_drink.png diff --git a/public/img/emoji/tropical_fish.png b/public/vendor/plugins/emojify/images/tropical_fish.png similarity index 100% rename from public/img/emoji/tropical_fish.png rename to public/vendor/plugins/emojify/images/tropical_fish.png diff --git a/public/img/emoji/truck.png b/public/vendor/plugins/emojify/images/truck.png similarity index 100% rename from public/img/emoji/truck.png rename to public/vendor/plugins/emojify/images/truck.png diff --git a/public/img/emoji/trumpet.png b/public/vendor/plugins/emojify/images/trumpet.png similarity index 100% rename from public/img/emoji/trumpet.png rename to public/vendor/plugins/emojify/images/trumpet.png diff --git a/public/img/emoji/tshirt.png b/public/vendor/plugins/emojify/images/tshirt.png similarity index 100% rename from public/img/emoji/tshirt.png rename to public/vendor/plugins/emojify/images/tshirt.png diff --git a/public/img/emoji/tulip.png b/public/vendor/plugins/emojify/images/tulip.png similarity index 100% rename from public/img/emoji/tulip.png rename to public/vendor/plugins/emojify/images/tulip.png diff --git a/public/img/emoji/turtle.png b/public/vendor/plugins/emojify/images/turtle.png similarity index 100% rename from public/img/emoji/turtle.png rename to public/vendor/plugins/emojify/images/turtle.png diff --git a/public/img/emoji/tv.png b/public/vendor/plugins/emojify/images/tv.png similarity index 100% rename from public/img/emoji/tv.png rename to public/vendor/plugins/emojify/images/tv.png diff --git a/public/img/emoji/twisted_rightwards_arrows.png b/public/vendor/plugins/emojify/images/twisted_rightwards_arrows.png similarity index 100% rename from public/img/emoji/twisted_rightwards_arrows.png rename to public/vendor/plugins/emojify/images/twisted_rightwards_arrows.png diff --git a/public/img/emoji/two.png b/public/vendor/plugins/emojify/images/two.png similarity index 100% rename from public/img/emoji/two.png rename to public/vendor/plugins/emojify/images/two.png diff --git a/public/img/emoji/two_hearts.png b/public/vendor/plugins/emojify/images/two_hearts.png similarity index 100% rename from public/img/emoji/two_hearts.png rename to public/vendor/plugins/emojify/images/two_hearts.png diff --git a/public/img/emoji/two_men_holding_hands.png b/public/vendor/plugins/emojify/images/two_men_holding_hands.png similarity index 100% rename from public/img/emoji/two_men_holding_hands.png rename to public/vendor/plugins/emojify/images/two_men_holding_hands.png diff --git a/public/img/emoji/two_women_holding_hands.png b/public/vendor/plugins/emojify/images/two_women_holding_hands.png similarity index 100% rename from public/img/emoji/two_women_holding_hands.png rename to public/vendor/plugins/emojify/images/two_women_holding_hands.png diff --git a/public/img/emoji/u5272.png b/public/vendor/plugins/emojify/images/u5272.png similarity index 100% rename from public/img/emoji/u5272.png rename to public/vendor/plugins/emojify/images/u5272.png diff --git a/public/img/emoji/u5408.png b/public/vendor/plugins/emojify/images/u5408.png similarity index 100% rename from public/img/emoji/u5408.png rename to public/vendor/plugins/emojify/images/u5408.png diff --git a/public/img/emoji/u55b6.png b/public/vendor/plugins/emojify/images/u55b6.png similarity index 100% rename from public/img/emoji/u55b6.png rename to public/vendor/plugins/emojify/images/u55b6.png diff --git a/public/img/emoji/u6307.png b/public/vendor/plugins/emojify/images/u6307.png similarity index 100% rename from public/img/emoji/u6307.png rename to public/vendor/plugins/emojify/images/u6307.png diff --git a/public/img/emoji/u6708.png b/public/vendor/plugins/emojify/images/u6708.png similarity index 100% rename from public/img/emoji/u6708.png rename to public/vendor/plugins/emojify/images/u6708.png diff --git a/public/img/emoji/u6709.png b/public/vendor/plugins/emojify/images/u6709.png similarity index 100% rename from public/img/emoji/u6709.png rename to public/vendor/plugins/emojify/images/u6709.png diff --git a/public/img/emoji/u6e80.png b/public/vendor/plugins/emojify/images/u6e80.png similarity index 100% rename from public/img/emoji/u6e80.png rename to public/vendor/plugins/emojify/images/u6e80.png diff --git a/public/img/emoji/u7121.png b/public/vendor/plugins/emojify/images/u7121.png similarity index 100% rename from public/img/emoji/u7121.png rename to public/vendor/plugins/emojify/images/u7121.png diff --git a/public/img/emoji/u7533.png b/public/vendor/plugins/emojify/images/u7533.png similarity index 100% rename from public/img/emoji/u7533.png rename to public/vendor/plugins/emojify/images/u7533.png diff --git a/public/img/emoji/u7981.png b/public/vendor/plugins/emojify/images/u7981.png similarity index 100% rename from public/img/emoji/u7981.png rename to public/vendor/plugins/emojify/images/u7981.png diff --git a/public/img/emoji/u7a7a.png b/public/vendor/plugins/emojify/images/u7a7a.png similarity index 100% rename from public/img/emoji/u7a7a.png rename to public/vendor/plugins/emojify/images/u7a7a.png diff --git a/public/img/emoji/uk.png b/public/vendor/plugins/emojify/images/uk.png similarity index 100% rename from public/img/emoji/uk.png rename to public/vendor/plugins/emojify/images/uk.png diff --git a/public/img/emoji/umbrella.png b/public/vendor/plugins/emojify/images/umbrella.png similarity index 100% rename from public/img/emoji/umbrella.png rename to public/vendor/plugins/emojify/images/umbrella.png diff --git a/public/img/emoji/unamused.png b/public/vendor/plugins/emojify/images/unamused.png similarity index 100% rename from public/img/emoji/unamused.png rename to public/vendor/plugins/emojify/images/unamused.png diff --git a/public/img/emoji/underage.png b/public/vendor/plugins/emojify/images/underage.png similarity index 100% rename from public/img/emoji/underage.png rename to public/vendor/plugins/emojify/images/underage.png diff --git a/public/img/emoji/unlock.png b/public/vendor/plugins/emojify/images/unlock.png similarity index 100% rename from public/img/emoji/unlock.png rename to public/vendor/plugins/emojify/images/unlock.png diff --git a/public/img/emoji/up.png b/public/vendor/plugins/emojify/images/up.png similarity index 100% rename from public/img/emoji/up.png rename to public/vendor/plugins/emojify/images/up.png diff --git a/public/img/emoji/us.png b/public/vendor/plugins/emojify/images/us.png similarity index 100% rename from public/img/emoji/us.png rename to public/vendor/plugins/emojify/images/us.png diff --git a/public/img/emoji/v.png b/public/vendor/plugins/emojify/images/v.png similarity index 100% rename from public/img/emoji/v.png rename to public/vendor/plugins/emojify/images/v.png diff --git a/public/img/emoji/vertical_traffic_light.png b/public/vendor/plugins/emojify/images/vertical_traffic_light.png similarity index 100% rename from public/img/emoji/vertical_traffic_light.png rename to public/vendor/plugins/emojify/images/vertical_traffic_light.png diff --git a/public/img/emoji/vhs.png b/public/vendor/plugins/emojify/images/vhs.png similarity index 100% rename from public/img/emoji/vhs.png rename to public/vendor/plugins/emojify/images/vhs.png diff --git a/public/img/emoji/vibration_mode.png b/public/vendor/plugins/emojify/images/vibration_mode.png similarity index 100% rename from public/img/emoji/vibration_mode.png rename to public/vendor/plugins/emojify/images/vibration_mode.png diff --git a/public/img/emoji/video_camera.png b/public/vendor/plugins/emojify/images/video_camera.png similarity index 100% rename from public/img/emoji/video_camera.png rename to public/vendor/plugins/emojify/images/video_camera.png diff --git a/public/img/emoji/video_game.png b/public/vendor/plugins/emojify/images/video_game.png similarity index 100% rename from public/img/emoji/video_game.png rename to public/vendor/plugins/emojify/images/video_game.png diff --git a/public/img/emoji/violin.png b/public/vendor/plugins/emojify/images/violin.png similarity index 100% rename from public/img/emoji/violin.png rename to public/vendor/plugins/emojify/images/violin.png diff --git a/public/img/emoji/virgo.png b/public/vendor/plugins/emojify/images/virgo.png similarity index 100% rename from public/img/emoji/virgo.png rename to public/vendor/plugins/emojify/images/virgo.png diff --git a/public/img/emoji/volcano.png b/public/vendor/plugins/emojify/images/volcano.png similarity index 100% rename from public/img/emoji/volcano.png rename to public/vendor/plugins/emojify/images/volcano.png diff --git a/public/img/emoji/vs.png b/public/vendor/plugins/emojify/images/vs.png similarity index 100% rename from public/img/emoji/vs.png rename to public/vendor/plugins/emojify/images/vs.png diff --git a/public/img/emoji/walking.png b/public/vendor/plugins/emojify/images/walking.png similarity index 100% rename from public/img/emoji/walking.png rename to public/vendor/plugins/emojify/images/walking.png diff --git a/public/img/emoji/waning_crescent_moon.png b/public/vendor/plugins/emojify/images/waning_crescent_moon.png similarity index 100% rename from public/img/emoji/waning_crescent_moon.png rename to public/vendor/plugins/emojify/images/waning_crescent_moon.png diff --git a/public/img/emoji/waning_gibbous_moon.png b/public/vendor/plugins/emojify/images/waning_gibbous_moon.png similarity index 100% rename from public/img/emoji/waning_gibbous_moon.png rename to public/vendor/plugins/emojify/images/waning_gibbous_moon.png diff --git a/public/img/emoji/warning.png b/public/vendor/plugins/emojify/images/warning.png similarity index 100% rename from public/img/emoji/warning.png rename to public/vendor/plugins/emojify/images/warning.png diff --git a/public/img/emoji/watch.png b/public/vendor/plugins/emojify/images/watch.png similarity index 100% rename from public/img/emoji/watch.png rename to public/vendor/plugins/emojify/images/watch.png diff --git a/public/img/emoji/water_buffalo.png b/public/vendor/plugins/emojify/images/water_buffalo.png similarity index 100% rename from public/img/emoji/water_buffalo.png rename to public/vendor/plugins/emojify/images/water_buffalo.png diff --git a/public/img/emoji/watermelon.png b/public/vendor/plugins/emojify/images/watermelon.png similarity index 100% rename from public/img/emoji/watermelon.png rename to public/vendor/plugins/emojify/images/watermelon.png diff --git a/public/img/emoji/wave.png b/public/vendor/plugins/emojify/images/wave.png similarity index 100% rename from public/img/emoji/wave.png rename to public/vendor/plugins/emojify/images/wave.png diff --git a/public/img/emoji/wavy_dash.png b/public/vendor/plugins/emojify/images/wavy_dash.png similarity index 100% rename from public/img/emoji/wavy_dash.png rename to public/vendor/plugins/emojify/images/wavy_dash.png diff --git a/public/img/emoji/waxing_crescent_moon.png b/public/vendor/plugins/emojify/images/waxing_crescent_moon.png similarity index 100% rename from public/img/emoji/waxing_crescent_moon.png rename to public/vendor/plugins/emojify/images/waxing_crescent_moon.png diff --git a/public/img/emoji/waxing_gibbous_moon.png b/public/vendor/plugins/emojify/images/waxing_gibbous_moon.png similarity index 100% rename from public/img/emoji/waxing_gibbous_moon.png rename to public/vendor/plugins/emojify/images/waxing_gibbous_moon.png diff --git a/public/img/emoji/wc.png b/public/vendor/plugins/emojify/images/wc.png similarity index 100% rename from public/img/emoji/wc.png rename to public/vendor/plugins/emojify/images/wc.png diff --git a/public/img/emoji/weary.png b/public/vendor/plugins/emojify/images/weary.png similarity index 100% rename from public/img/emoji/weary.png rename to public/vendor/plugins/emojify/images/weary.png diff --git a/public/img/emoji/wedding.png b/public/vendor/plugins/emojify/images/wedding.png similarity index 100% rename from public/img/emoji/wedding.png rename to public/vendor/plugins/emojify/images/wedding.png diff --git a/public/img/emoji/whale.png b/public/vendor/plugins/emojify/images/whale.png similarity index 100% rename from public/img/emoji/whale.png rename to public/vendor/plugins/emojify/images/whale.png diff --git a/public/img/emoji/whale2.png b/public/vendor/plugins/emojify/images/whale2.png similarity index 100% rename from public/img/emoji/whale2.png rename to public/vendor/plugins/emojify/images/whale2.png diff --git a/public/img/emoji/wheelchair.png b/public/vendor/plugins/emojify/images/wheelchair.png similarity index 100% rename from public/img/emoji/wheelchair.png rename to public/vendor/plugins/emojify/images/wheelchair.png diff --git a/public/img/emoji/white_check_mark.png b/public/vendor/plugins/emojify/images/white_check_mark.png similarity index 100% rename from public/img/emoji/white_check_mark.png rename to public/vendor/plugins/emojify/images/white_check_mark.png diff --git a/public/img/emoji/white_circle.png b/public/vendor/plugins/emojify/images/white_circle.png similarity index 100% rename from public/img/emoji/white_circle.png rename to public/vendor/plugins/emojify/images/white_circle.png diff --git a/public/img/emoji/white_flower.png b/public/vendor/plugins/emojify/images/white_flower.png similarity index 100% rename from public/img/emoji/white_flower.png rename to public/vendor/plugins/emojify/images/white_flower.png diff --git a/public/img/emoji/white_large_square.png b/public/vendor/plugins/emojify/images/white_large_square.png similarity index 100% rename from public/img/emoji/white_large_square.png rename to public/vendor/plugins/emojify/images/white_large_square.png diff --git a/public/img/emoji/white_medium_small_square.png b/public/vendor/plugins/emojify/images/white_medium_small_square.png similarity index 100% rename from public/img/emoji/white_medium_small_square.png rename to public/vendor/plugins/emojify/images/white_medium_small_square.png diff --git a/public/img/emoji/white_medium_square.png b/public/vendor/plugins/emojify/images/white_medium_square.png similarity index 100% rename from public/img/emoji/white_medium_square.png rename to public/vendor/plugins/emojify/images/white_medium_square.png diff --git a/public/img/emoji/white_small_square.png b/public/vendor/plugins/emojify/images/white_small_square.png similarity index 100% rename from public/img/emoji/white_small_square.png rename to public/vendor/plugins/emojify/images/white_small_square.png diff --git a/public/img/emoji/white_square_button.png b/public/vendor/plugins/emojify/images/white_square_button.png similarity index 100% rename from public/img/emoji/white_square_button.png rename to public/vendor/plugins/emojify/images/white_square_button.png diff --git a/public/img/emoji/wind_chime.png b/public/vendor/plugins/emojify/images/wind_chime.png similarity index 100% rename from public/img/emoji/wind_chime.png rename to public/vendor/plugins/emojify/images/wind_chime.png diff --git a/public/img/emoji/wine_glass.png b/public/vendor/plugins/emojify/images/wine_glass.png similarity index 100% rename from public/img/emoji/wine_glass.png rename to public/vendor/plugins/emojify/images/wine_glass.png diff --git a/public/img/emoji/wink.png b/public/vendor/plugins/emojify/images/wink.png similarity index 100% rename from public/img/emoji/wink.png rename to public/vendor/plugins/emojify/images/wink.png diff --git a/public/img/emoji/wolf.png b/public/vendor/plugins/emojify/images/wolf.png similarity index 100% rename from public/img/emoji/wolf.png rename to public/vendor/plugins/emojify/images/wolf.png diff --git a/public/img/emoji/woman.png b/public/vendor/plugins/emojify/images/woman.png similarity index 100% rename from public/img/emoji/woman.png rename to public/vendor/plugins/emojify/images/woman.png diff --git a/public/img/emoji/womans_clothes.png b/public/vendor/plugins/emojify/images/womans_clothes.png similarity index 100% rename from public/img/emoji/womans_clothes.png rename to public/vendor/plugins/emojify/images/womans_clothes.png diff --git a/public/img/emoji/womans_hat.png b/public/vendor/plugins/emojify/images/womans_hat.png similarity index 100% rename from public/img/emoji/womans_hat.png rename to public/vendor/plugins/emojify/images/womans_hat.png diff --git a/public/img/emoji/womens.png b/public/vendor/plugins/emojify/images/womens.png similarity index 100% rename from public/img/emoji/womens.png rename to public/vendor/plugins/emojify/images/womens.png diff --git a/public/img/emoji/worried.png b/public/vendor/plugins/emojify/images/worried.png similarity index 100% rename from public/img/emoji/worried.png rename to public/vendor/plugins/emojify/images/worried.png diff --git a/public/img/emoji/wrench.png b/public/vendor/plugins/emojify/images/wrench.png similarity index 100% rename from public/img/emoji/wrench.png rename to public/vendor/plugins/emojify/images/wrench.png diff --git a/public/img/emoji/x.png b/public/vendor/plugins/emojify/images/x.png similarity index 100% rename from public/img/emoji/x.png rename to public/vendor/plugins/emojify/images/x.png diff --git a/public/img/emoji/yellow_heart.png b/public/vendor/plugins/emojify/images/yellow_heart.png similarity index 100% rename from public/img/emoji/yellow_heart.png rename to public/vendor/plugins/emojify/images/yellow_heart.png diff --git a/public/img/emoji/yen.png b/public/vendor/plugins/emojify/images/yen.png similarity index 100% rename from public/img/emoji/yen.png rename to public/vendor/plugins/emojify/images/yen.png diff --git a/public/img/emoji/yum.png b/public/vendor/plugins/emojify/images/yum.png similarity index 100% rename from public/img/emoji/yum.png rename to public/vendor/plugins/emojify/images/yum.png diff --git a/public/img/emoji/zap.png b/public/vendor/plugins/emojify/images/zap.png similarity index 100% rename from public/img/emoji/zap.png rename to public/vendor/plugins/emojify/images/zap.png diff --git a/public/img/emoji/zero.png b/public/vendor/plugins/emojify/images/zero.png similarity index 100% rename from public/img/emoji/zero.png rename to public/vendor/plugins/emojify/images/zero.png diff --git a/public/img/emoji/zzz.png b/public/vendor/plugins/emojify/images/zzz.png similarity index 100% rename from public/img/emoji/zzz.png rename to public/vendor/plugins/emojify/images/zzz.png diff --git a/public/vendor/plugins/gitgraph/LICENSE b/public/vendor/plugins/gitgraph/LICENSE new file mode 100644 index 000000000000..30cd6b7692dc --- /dev/null +++ b/public/vendor/plugins/gitgraph/LICENSE @@ -0,0 +1,24 @@ +Copyright (c) 2011, Terrence Lee +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of the fgdev nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/public/css/gitgraph.css b/public/vendor/plugins/gitgraph/gitgraph.css similarity index 100% rename from public/css/gitgraph.css rename to public/vendor/plugins/gitgraph/gitgraph.css diff --git a/public/js/libs/gitgraph.js b/public/vendor/plugins/gitgraph/gitgraph.js similarity index 98% rename from public/js/libs/gitgraph.js rename to public/vendor/plugins/gitgraph/gitgraph.js index e2f00269935c..f6c73a2ec488 100644 --- a/public/js/libs/gitgraph.js +++ b/public/vendor/plugins/gitgraph/gitgraph.js @@ -1,4 +1,5 @@ /* + * @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD 3-Clause * Copyright (c) 2011, Terrence Lee * All rights reserved. * @@ -396,4 +397,5 @@ var gitGraph = function (canvas, rawGraphList, config) { init(); draw(graphList); -}; \ No newline at end of file +}; +// @end-license diff --git a/public/vendor/plugins/highlight/LICENSE b/public/vendor/plugins/highlight/LICENSE new file mode 100644 index 000000000000..f4f114631657 --- /dev/null +++ b/public/vendor/plugins/highlight/LICENSE @@ -0,0 +1,25 @@ +Copyright (c) 2006, Ivan Sagalaev +All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of highlight.js nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/public/plugins/highlight-9.11.0/default.css b/public/vendor/plugins/highlight/default.css similarity index 100% rename from public/plugins/highlight-9.11.0/default.css rename to public/vendor/plugins/highlight/default.css diff --git a/public/plugins/highlight-9.11.0/github.css b/public/vendor/plugins/highlight/github.css similarity index 100% rename from public/plugins/highlight-9.11.0/github.css rename to public/vendor/plugins/highlight/github.css diff --git a/public/plugins/highlight-9.11.0/highlight.pack.js b/public/vendor/plugins/highlight/highlight.pack.js similarity index 100% rename from public/plugins/highlight-9.11.0/highlight.pack.js rename to public/vendor/plugins/highlight/highlight.pack.js diff --git a/public/vendor/plugins/jquery.areyousure/LICENSE b/public/vendor/plugins/jquery.areyousure/LICENSE new file mode 100644 index 000000000000..0374ebc83922 --- /dev/null +++ b/public/vendor/plugins/jquery.areyousure/LICENSE @@ -0,0 +1,18 @@ +The MIT License + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the 'Software'), to deal in the +Software without restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the +Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/public/js/libs/jquery.are-you-sure.js b/public/vendor/plugins/jquery.areyousure/jquery.are-you-sure.js similarity index 100% rename from public/js/libs/jquery.are-you-sure.js rename to public/vendor/plugins/jquery.areyousure/jquery.are-you-sure.js diff --git a/public/vendor/plugins/jquery.datetimepicker/LICENSE b/public/vendor/plugins/jquery.datetimepicker/LICENSE new file mode 100644 index 000000000000..f2e9a16a9616 --- /dev/null +++ b/public/vendor/plugins/jquery.datetimepicker/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2013 http://xdsoft.net + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/public/plugins/jquery.datetimepicker-2.4.5/jquery.datetimepicker.css b/public/vendor/plugins/jquery.datetimepicker/jquery.datetimepicker.css similarity index 100% rename from public/plugins/jquery.datetimepicker-2.4.5/jquery.datetimepicker.css rename to public/vendor/plugins/jquery.datetimepicker/jquery.datetimepicker.css diff --git a/public/plugins/jquery.datetimepicker-2.4.5/jquery.datetimepicker.js b/public/vendor/plugins/jquery.datetimepicker/jquery.datetimepicker.js similarity index 100% rename from public/plugins/jquery.datetimepicker-2.4.5/jquery.datetimepicker.js rename to public/vendor/plugins/jquery.datetimepicker/jquery.datetimepicker.js diff --git a/public/vendor/plugins/jquery.minicolors/LICENSE b/public/vendor/plugins/jquery.minicolors/LICENSE new file mode 100644 index 000000000000..5dee574ef49b --- /dev/null +++ b/public/vendor/plugins/jquery.minicolors/LICENSE @@ -0,0 +1,18 @@ +Copyright 2017 A Beautiful Site, LLC + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the +Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/public/plugins/jquery.minicolors-2.2.3/jquery.minicolors.css b/public/vendor/plugins/jquery.minicolors/jquery.minicolors.css similarity index 100% rename from public/plugins/jquery.minicolors-2.2.3/jquery.minicolors.css rename to public/vendor/plugins/jquery.minicolors/jquery.minicolors.css diff --git a/public/plugins/jquery.minicolors-2.2.3/jquery.minicolors.min.js b/public/vendor/plugins/jquery.minicolors/jquery.minicolors.min.js similarity index 100% rename from public/plugins/jquery.minicolors-2.2.3/jquery.minicolors.min.js rename to public/vendor/plugins/jquery.minicolors/jquery.minicolors.min.js diff --git a/public/plugins/jquery.minicolors-2.2.3/jquery.minicolors.png b/public/vendor/plugins/jquery.minicolors/jquery.minicolors.png similarity index 100% rename from public/plugins/jquery.minicolors-2.2.3/jquery.minicolors.png rename to public/vendor/plugins/jquery.minicolors/jquery.minicolors.png diff --git a/public/vendor/plugins/jquery/LICENSE b/public/vendor/plugins/jquery/LICENSE new file mode 100644 index 000000000000..0374ebc83922 --- /dev/null +++ b/public/vendor/plugins/jquery/LICENSE @@ -0,0 +1,18 @@ +The MIT License + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the 'Software'), to deal in the +Software without restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the +Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/public/js/jquery-1.11.3.min.js b/public/vendor/plugins/jquery/jquery.min.js similarity index 100% rename from public/js/jquery-1.11.3.min.js rename to public/vendor/plugins/jquery/jquery.min.js diff --git a/public/plugins/pdfjs-1.4.20/LICENSE b/public/vendor/plugins/pdfjs/LICENSE similarity index 100% rename from public/plugins/pdfjs-1.4.20/LICENSE rename to public/vendor/plugins/pdfjs/LICENSE diff --git a/public/plugins/pdfjs-1.4.20/build/pdf.js b/public/vendor/plugins/pdfjs/build/pdf.js similarity index 100% rename from public/plugins/pdfjs-1.4.20/build/pdf.js rename to public/vendor/plugins/pdfjs/build/pdf.js diff --git a/public/plugins/pdfjs-1.4.20/build/pdf.worker.js b/public/vendor/plugins/pdfjs/build/pdf.worker.js similarity index 100% rename from public/plugins/pdfjs-1.4.20/build/pdf.worker.js rename to public/vendor/plugins/pdfjs/build/pdf.worker.js diff --git a/public/plugins/pdfjs-1.4.20/web/compatibility.js b/public/vendor/plugins/pdfjs/web/compatibility.js similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/compatibility.js rename to public/vendor/plugins/pdfjs/web/compatibility.js diff --git a/public/plugins/pdfjs-1.4.20/web/debugger.js b/public/vendor/plugins/pdfjs/web/debugger.js similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/debugger.js rename to public/vendor/plugins/pdfjs/web/debugger.js diff --git a/public/plugins/pdfjs-1.4.20/web/images/annotation-check.svg b/public/vendor/plugins/pdfjs/web/images/annotation-check.svg similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/annotation-check.svg rename to public/vendor/plugins/pdfjs/web/images/annotation-check.svg diff --git a/public/plugins/pdfjs-1.4.20/web/images/annotation-comment.svg b/public/vendor/plugins/pdfjs/web/images/annotation-comment.svg similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/annotation-comment.svg rename to public/vendor/plugins/pdfjs/web/images/annotation-comment.svg diff --git a/public/plugins/pdfjs-1.4.20/web/images/annotation-help.svg b/public/vendor/plugins/pdfjs/web/images/annotation-help.svg similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/annotation-help.svg rename to public/vendor/plugins/pdfjs/web/images/annotation-help.svg diff --git a/public/plugins/pdfjs-1.4.20/web/images/annotation-insert.svg b/public/vendor/plugins/pdfjs/web/images/annotation-insert.svg similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/annotation-insert.svg rename to public/vendor/plugins/pdfjs/web/images/annotation-insert.svg diff --git a/public/plugins/pdfjs-1.4.20/web/images/annotation-key.svg b/public/vendor/plugins/pdfjs/web/images/annotation-key.svg similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/annotation-key.svg rename to public/vendor/plugins/pdfjs/web/images/annotation-key.svg diff --git a/public/plugins/pdfjs-1.4.20/web/images/annotation-newparagraph.svg b/public/vendor/plugins/pdfjs/web/images/annotation-newparagraph.svg similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/annotation-newparagraph.svg rename to public/vendor/plugins/pdfjs/web/images/annotation-newparagraph.svg diff --git a/public/plugins/pdfjs-1.4.20/web/images/annotation-noicon.svg b/public/vendor/plugins/pdfjs/web/images/annotation-noicon.svg similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/annotation-noicon.svg rename to public/vendor/plugins/pdfjs/web/images/annotation-noicon.svg diff --git a/public/plugins/pdfjs-1.4.20/web/images/annotation-note.svg b/public/vendor/plugins/pdfjs/web/images/annotation-note.svg similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/annotation-note.svg rename to public/vendor/plugins/pdfjs/web/images/annotation-note.svg diff --git a/public/plugins/pdfjs-1.4.20/web/images/annotation-paragraph.svg b/public/vendor/plugins/pdfjs/web/images/annotation-paragraph.svg similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/annotation-paragraph.svg rename to public/vendor/plugins/pdfjs/web/images/annotation-paragraph.svg diff --git a/public/plugins/pdfjs-1.4.20/web/images/findbarButton-next-rtl.png b/public/vendor/plugins/pdfjs/web/images/findbarButton-next-rtl.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/findbarButton-next-rtl.png rename to public/vendor/plugins/pdfjs/web/images/findbarButton-next-rtl.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/findbarButton-next-rtl@2x.png b/public/vendor/plugins/pdfjs/web/images/findbarButton-next-rtl@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/findbarButton-next-rtl@2x.png rename to public/vendor/plugins/pdfjs/web/images/findbarButton-next-rtl@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/findbarButton-next.png b/public/vendor/plugins/pdfjs/web/images/findbarButton-next.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/findbarButton-next.png rename to public/vendor/plugins/pdfjs/web/images/findbarButton-next.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/findbarButton-next@2x.png b/public/vendor/plugins/pdfjs/web/images/findbarButton-next@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/findbarButton-next@2x.png rename to public/vendor/plugins/pdfjs/web/images/findbarButton-next@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/findbarButton-previous-rtl.png b/public/vendor/plugins/pdfjs/web/images/findbarButton-previous-rtl.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/findbarButton-previous-rtl.png rename to public/vendor/plugins/pdfjs/web/images/findbarButton-previous-rtl.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/findbarButton-previous-rtl@2x.png b/public/vendor/plugins/pdfjs/web/images/findbarButton-previous-rtl@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/findbarButton-previous-rtl@2x.png rename to public/vendor/plugins/pdfjs/web/images/findbarButton-previous-rtl@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/findbarButton-previous.png b/public/vendor/plugins/pdfjs/web/images/findbarButton-previous.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/findbarButton-previous.png rename to public/vendor/plugins/pdfjs/web/images/findbarButton-previous.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/findbarButton-previous@2x.png b/public/vendor/plugins/pdfjs/web/images/findbarButton-previous@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/findbarButton-previous@2x.png rename to public/vendor/plugins/pdfjs/web/images/findbarButton-previous@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/grab.cur b/public/vendor/plugins/pdfjs/web/images/grab.cur similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/grab.cur rename to public/vendor/plugins/pdfjs/web/images/grab.cur diff --git a/public/plugins/pdfjs-1.4.20/web/images/grabbing.cur b/public/vendor/plugins/pdfjs/web/images/grabbing.cur similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/grabbing.cur rename to public/vendor/plugins/pdfjs/web/images/grabbing.cur diff --git a/public/plugins/pdfjs-1.4.20/web/images/loading-icon.gif b/public/vendor/plugins/pdfjs/web/images/loading-icon.gif similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/loading-icon.gif rename to public/vendor/plugins/pdfjs/web/images/loading-icon.gif diff --git a/public/plugins/pdfjs-1.4.20/web/images/loading-small.png b/public/vendor/plugins/pdfjs/web/images/loading-small.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/loading-small.png rename to public/vendor/plugins/pdfjs/web/images/loading-small.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/loading-small@2x.png b/public/vendor/plugins/pdfjs/web/images/loading-small@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/loading-small@2x.png rename to public/vendor/plugins/pdfjs/web/images/loading-small@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-documentProperties.png b/public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-documentProperties.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-documentProperties.png rename to public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-documentProperties.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-documentProperties@2x.png b/public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-documentProperties@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-documentProperties@2x.png rename to public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-documentProperties@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-firstPage.png b/public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-firstPage.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-firstPage.png rename to public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-firstPage.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-firstPage@2x.png b/public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-firstPage@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-firstPage@2x.png rename to public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-firstPage@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-handTool.png b/public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-handTool.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-handTool.png rename to public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-handTool.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-handTool@2x.png b/public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-handTool@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-handTool@2x.png rename to public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-handTool@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-lastPage.png b/public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-lastPage.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-lastPage.png rename to public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-lastPage.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-lastPage@2x.png b/public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-lastPage@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-lastPage@2x.png rename to public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-lastPage@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-rotateCcw.png b/public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-rotateCcw.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-rotateCcw.png rename to public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-rotateCcw.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-rotateCcw@2x.png b/public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-rotateCcw@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-rotateCcw@2x.png rename to public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-rotateCcw@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-rotateCw.png b/public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-rotateCw.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-rotateCw.png rename to public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-rotateCw.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-rotateCw@2x.png b/public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-rotateCw@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/secondaryToolbarButton-rotateCw@2x.png rename to public/vendor/plugins/pdfjs/web/images/secondaryToolbarButton-rotateCw@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/shadow.png b/public/vendor/plugins/pdfjs/web/images/shadow.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/shadow.png rename to public/vendor/plugins/pdfjs/web/images/shadow.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/texture.png b/public/vendor/plugins/pdfjs/web/images/texture.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/texture.png rename to public/vendor/plugins/pdfjs/web/images/texture.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-bookmark.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-bookmark.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-bookmark.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-bookmark.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-bookmark@2x.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-bookmark@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-bookmark@2x.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-bookmark@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-download.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-download.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-download.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-download.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-download@2x.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-download@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-download@2x.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-download@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-menuArrows.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-menuArrows.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-menuArrows.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-menuArrows.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-menuArrows@2x.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-menuArrows@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-menuArrows@2x.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-menuArrows@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-openFile.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-openFile.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-openFile.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-openFile.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-openFile@2x.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-openFile@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-openFile@2x.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-openFile@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageDown-rtl.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-pageDown-rtl.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageDown-rtl.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-pageDown-rtl.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageDown-rtl@2x.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-pageDown-rtl@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageDown-rtl@2x.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-pageDown-rtl@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageDown.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-pageDown.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageDown.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-pageDown.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageDown@2x.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-pageDown@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageDown@2x.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-pageDown@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageUp-rtl.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-pageUp-rtl.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageUp-rtl.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-pageUp-rtl.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageUp-rtl@2x.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-pageUp-rtl@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageUp-rtl@2x.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-pageUp-rtl@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageUp.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-pageUp.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageUp.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-pageUp.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageUp@2x.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-pageUp@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-pageUp@2x.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-pageUp@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-presentationMode.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-presentationMode.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-presentationMode.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-presentationMode.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-presentationMode@2x.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-presentationMode@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-presentationMode@2x.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-presentationMode@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-print.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-print.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-print.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-print.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-print@2x.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-print@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-print@2x.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-print@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-search.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-search.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-search.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-search.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-search@2x.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-search@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-search@2x.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-search@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-secondaryToolbarToggle-rtl.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-secondaryToolbarToggle-rtl.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-secondaryToolbarToggle-rtl.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-secondaryToolbarToggle-rtl.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-secondaryToolbarToggle-rtl@2x.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-secondaryToolbarToggle-rtl@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-secondaryToolbarToggle-rtl@2x.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-secondaryToolbarToggle-rtl@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-secondaryToolbarToggle.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-secondaryToolbarToggle.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-secondaryToolbarToggle.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-secondaryToolbarToggle.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-secondaryToolbarToggle@2x.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-secondaryToolbarToggle@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-secondaryToolbarToggle@2x.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-secondaryToolbarToggle@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-sidebarToggle-rtl.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-sidebarToggle-rtl.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-sidebarToggle-rtl.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-sidebarToggle-rtl.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-sidebarToggle-rtl@2x.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-sidebarToggle-rtl@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-sidebarToggle-rtl@2x.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-sidebarToggle-rtl@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-sidebarToggle.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-sidebarToggle.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-sidebarToggle.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-sidebarToggle.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-sidebarToggle@2x.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-sidebarToggle@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-sidebarToggle@2x.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-sidebarToggle@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewAttachments.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-viewAttachments.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewAttachments.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-viewAttachments.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewAttachments@2x.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-viewAttachments@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewAttachments@2x.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-viewAttachments@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewOutline-rtl.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-viewOutline-rtl.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewOutline-rtl.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-viewOutline-rtl.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewOutline-rtl@2x.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-viewOutline-rtl@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewOutline-rtl@2x.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-viewOutline-rtl@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewOutline.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-viewOutline.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewOutline.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-viewOutline.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewOutline@2x.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-viewOutline@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewOutline@2x.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-viewOutline@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewThumbnail.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-viewThumbnail.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewThumbnail.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-viewThumbnail.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewThumbnail@2x.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-viewThumbnail@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-viewThumbnail@2x.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-viewThumbnail@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-zoomIn.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-zoomIn.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-zoomIn.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-zoomIn.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-zoomIn@2x.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-zoomIn@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-zoomIn@2x.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-zoomIn@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-zoomOut.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-zoomOut.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-zoomOut.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-zoomOut.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/toolbarButton-zoomOut@2x.png b/public/vendor/plugins/pdfjs/web/images/toolbarButton-zoomOut@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/toolbarButton-zoomOut@2x.png rename to public/vendor/plugins/pdfjs/web/images/toolbarButton-zoomOut@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/treeitem-collapsed-rtl.png b/public/vendor/plugins/pdfjs/web/images/treeitem-collapsed-rtl.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/treeitem-collapsed-rtl.png rename to public/vendor/plugins/pdfjs/web/images/treeitem-collapsed-rtl.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/treeitem-collapsed-rtl@2x.png b/public/vendor/plugins/pdfjs/web/images/treeitem-collapsed-rtl@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/treeitem-collapsed-rtl@2x.png rename to public/vendor/plugins/pdfjs/web/images/treeitem-collapsed-rtl@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/treeitem-collapsed.png b/public/vendor/plugins/pdfjs/web/images/treeitem-collapsed.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/treeitem-collapsed.png rename to public/vendor/plugins/pdfjs/web/images/treeitem-collapsed.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/treeitem-collapsed@2x.png b/public/vendor/plugins/pdfjs/web/images/treeitem-collapsed@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/treeitem-collapsed@2x.png rename to public/vendor/plugins/pdfjs/web/images/treeitem-collapsed@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/treeitem-expanded.png b/public/vendor/plugins/pdfjs/web/images/treeitem-expanded.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/treeitem-expanded.png rename to public/vendor/plugins/pdfjs/web/images/treeitem-expanded.png diff --git a/public/plugins/pdfjs-1.4.20/web/images/treeitem-expanded@2x.png b/public/vendor/plugins/pdfjs/web/images/treeitem-expanded@2x.png similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/images/treeitem-expanded@2x.png rename to public/vendor/plugins/pdfjs/web/images/treeitem-expanded@2x.png diff --git a/public/plugins/pdfjs-1.4.20/web/viewer.css b/public/vendor/plugins/pdfjs/web/viewer.css similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/viewer.css rename to public/vendor/plugins/pdfjs/web/viewer.css diff --git a/public/plugins/pdfjs-1.4.20/web/viewer.html b/public/vendor/plugins/pdfjs/web/viewer.html similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/viewer.html rename to public/vendor/plugins/pdfjs/web/viewer.html diff --git a/public/plugins/pdfjs-1.4.20/web/viewer.js b/public/vendor/plugins/pdfjs/web/viewer.js similarity index 100% rename from public/plugins/pdfjs-1.4.20/web/viewer.js rename to public/vendor/plugins/pdfjs/web/viewer.js diff --git a/public/vendor/plugins/semantic/LICENSE b/public/vendor/plugins/semantic/LICENSE new file mode 100644 index 000000000000..0374ebc83922 --- /dev/null +++ b/public/vendor/plugins/semantic/LICENSE @@ -0,0 +1,18 @@ +The MIT License + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the 'Software'), to deal in the +Software without restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the +Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/public/css/semantic-2.2.1.min.css b/public/vendor/plugins/semantic/semantic.min.css similarity index 100% rename from public/css/semantic-2.2.1.min.css rename to public/vendor/plugins/semantic/semantic.min.css diff --git a/public/js/semantic-2.2.1.min.js b/public/vendor/plugins/semantic/semantic.min.js similarity index 100% rename from public/js/semantic-2.2.1.min.js rename to public/vendor/plugins/semantic/semantic.min.js diff --git a/public/css/themes/basic/assets/fonts/icons.eot b/public/vendor/plugins/semantic/themes/basic/assets/fonts/icons.eot similarity index 100% rename from public/css/themes/basic/assets/fonts/icons.eot rename to public/vendor/plugins/semantic/themes/basic/assets/fonts/icons.eot diff --git a/public/css/themes/basic/assets/fonts/icons.svg b/public/vendor/plugins/semantic/themes/basic/assets/fonts/icons.svg similarity index 100% rename from public/css/themes/basic/assets/fonts/icons.svg rename to public/vendor/plugins/semantic/themes/basic/assets/fonts/icons.svg diff --git a/public/css/themes/basic/assets/fonts/icons.ttf b/public/vendor/plugins/semantic/themes/basic/assets/fonts/icons.ttf similarity index 100% rename from public/css/themes/basic/assets/fonts/icons.ttf rename to public/vendor/plugins/semantic/themes/basic/assets/fonts/icons.ttf diff --git a/public/css/themes/basic/assets/fonts/icons.woff b/public/vendor/plugins/semantic/themes/basic/assets/fonts/icons.woff similarity index 100% rename from public/css/themes/basic/assets/fonts/icons.woff rename to public/vendor/plugins/semantic/themes/basic/assets/fonts/icons.woff diff --git a/public/css/themes/default/assets/fonts/icons.eot b/public/vendor/plugins/semantic/themes/default/assets/fonts/icons.eot similarity index 100% rename from public/css/themes/default/assets/fonts/icons.eot rename to public/vendor/plugins/semantic/themes/default/assets/fonts/icons.eot diff --git a/public/css/themes/default/assets/fonts/icons.otf b/public/vendor/plugins/semantic/themes/default/assets/fonts/icons.otf similarity index 100% rename from public/css/themes/default/assets/fonts/icons.otf rename to public/vendor/plugins/semantic/themes/default/assets/fonts/icons.otf diff --git a/public/css/themes/default/assets/fonts/icons.svg b/public/vendor/plugins/semantic/themes/default/assets/fonts/icons.svg similarity index 100% rename from public/css/themes/default/assets/fonts/icons.svg rename to public/vendor/plugins/semantic/themes/default/assets/fonts/icons.svg diff --git a/public/css/themes/default/assets/fonts/icons.ttf b/public/vendor/plugins/semantic/themes/default/assets/fonts/icons.ttf similarity index 100% rename from public/css/themes/default/assets/fonts/icons.ttf rename to public/vendor/plugins/semantic/themes/default/assets/fonts/icons.ttf diff --git a/public/css/themes/default/assets/fonts/icons.woff b/public/vendor/plugins/semantic/themes/default/assets/fonts/icons.woff similarity index 100% rename from public/css/themes/default/assets/fonts/icons.woff rename to public/vendor/plugins/semantic/themes/default/assets/fonts/icons.woff diff --git a/public/css/themes/default/assets/fonts/icons.woff2 b/public/vendor/plugins/semantic/themes/default/assets/fonts/icons.woff2 similarity index 100% rename from public/css/themes/default/assets/fonts/icons.woff2 rename to public/vendor/plugins/semantic/themes/default/assets/fonts/icons.woff2 diff --git a/public/css/themes/default/assets/images/flags.png b/public/vendor/plugins/semantic/themes/default/assets/images/flags.png similarity index 100% rename from public/css/themes/default/assets/images/flags.png rename to public/vendor/plugins/semantic/themes/default/assets/images/flags.png diff --git a/public/css/themes/github/assets/fonts/octicons-local.ttf b/public/vendor/plugins/semantic/themes/github/assets/fonts/octicons-local.ttf similarity index 100% rename from public/css/themes/github/assets/fonts/octicons-local.ttf rename to public/vendor/plugins/semantic/themes/github/assets/fonts/octicons-local.ttf diff --git a/public/css/themes/github/assets/fonts/octicons.svg b/public/vendor/plugins/semantic/themes/github/assets/fonts/octicons.svg similarity index 100% rename from public/css/themes/github/assets/fonts/octicons.svg rename to public/vendor/plugins/semantic/themes/github/assets/fonts/octicons.svg diff --git a/public/css/themes/github/assets/fonts/octicons.ttf b/public/vendor/plugins/semantic/themes/github/assets/fonts/octicons.ttf similarity index 100% rename from public/css/themes/github/assets/fonts/octicons.ttf rename to public/vendor/plugins/semantic/themes/github/assets/fonts/octicons.ttf diff --git a/public/css/themes/github/assets/fonts/octicons.woff b/public/vendor/plugins/semantic/themes/github/assets/fonts/octicons.woff similarity index 100% rename from public/css/themes/github/assets/fonts/octicons.woff rename to public/vendor/plugins/semantic/themes/github/assets/fonts/octicons.woff diff --git a/public/vendor/plugins/simplemde/LICENSE b/public/vendor/plugins/simplemde/LICENSE new file mode 100644 index 000000000000..d9f79afc18cc --- /dev/null +++ b/public/vendor/plugins/simplemde/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2015 Next Step Webs, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/public/plugins/simplemde-1.10.1/simplemde.min.css b/public/vendor/plugins/simplemde/simplemde.min.css similarity index 100% rename from public/plugins/simplemde-1.10.1/simplemde.min.css rename to public/vendor/plugins/simplemde/simplemde.min.css diff --git a/public/plugins/simplemde-1.10.1/simplemde.min.js b/public/vendor/plugins/simplemde/simplemde.min.js similarity index 100% rename from public/plugins/simplemde-1.10.1/simplemde.min.js rename to public/vendor/plugins/simplemde/simplemde.min.js diff --git a/public/vendor/plugins/vue/LICENSE b/public/vendor/plugins/vue/LICENSE new file mode 100644 index 000000000000..b65dd9e62e21 --- /dev/null +++ b/public/vendor/plugins/vue/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2013-present, Yuxi (Evan) You + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/public/js/libs/vue.min.js b/public/vendor/plugins/vue/vue.min.js similarity index 100% rename from public/js/libs/vue.min.js rename to public/vendor/plugins/vue/vue.min.js diff --git a/routers/admin/admin.go b/routers/admin/admin.go index d439544c8b23..94b88a05c3ea 100644 --- a/routers/admin/admin.go +++ b/routers/admin/admin.go @@ -145,7 +145,7 @@ func Dashboard(ctx *context.Context) { err = models.DeleteRepositoryArchives() case cleanMissingRepos: success = ctx.Tr("admin.dashboard.delete_missing_repos_success") - err = models.DeleteMissingRepositories() + err = models.DeleteMissingRepositories(ctx.User) case gitGCRepos: success = ctx.Tr("admin.dashboard.git_gc_repos_success") err = models.GitGcRepos() diff --git a/routers/admin/repos.go b/routers/admin/repos.go index 7f885b34c96e..12df6fba1e83 100644 --- a/routers/admin/repos.go +++ b/routers/admin/repos.go @@ -39,7 +39,7 @@ func DeleteRepo(ctx *context.Context) { return } - if err := models.DeleteRepository(repo.MustOwner().ID, repo.ID); err != nil { + if err := models.DeleteRepository(ctx.User, repo.MustOwner().ID, repo.ID); err != nil { ctx.Handle(500, "DeleteRepository", err) return } diff --git a/routers/api/v1/admin/org.go b/routers/api/v1/admin/org.go index 706e2cedeba0..99c9cf0b9567 100644 --- a/routers/api/v1/admin/org.go +++ b/routers/api/v1/admin/org.go @@ -14,8 +14,21 @@ import ( ) // CreateOrg api for create organization -// see https://github.com/gogits/go-gogs-client/wiki/Administration-Organizations#create-a-new-organization func CreateOrg(ctx *context.APIContext, form api.CreateOrgOption) { + // swagger:route POST /admin/users/{username}/orgs admin adminCreateOrg + // + // Consumes: + // - application/json + // + // Produces: + // - application/json + // + // Responses: + // 201: Organization + // 403: forbidden + // 422: validationError + // 500: error + u := user.GetUserByParams(ctx) if ctx.Written() { return diff --git a/routers/api/v1/admin/repo.go b/routers/api/v1/admin/repo.go index a52d462137f6..232fb988c8fd 100644 --- a/routers/api/v1/admin/repo.go +++ b/routers/api/v1/admin/repo.go @@ -13,8 +13,21 @@ import ( ) // CreateRepo api for creating a repository -// see https://github.com/gogits/go-gogs-client/wiki/Administration-Repositories#create-a-new-repository func CreateRepo(ctx *context.APIContext, form api.CreateRepoOption) { + // swagger:route POST /admin/users/{username}/repos admin adminCreateRepo + // + // Consumes: + // - application/json + // + // Produces: + // - application/json + // + // Responses: + // 201: Repository + // 403: forbidden + // 422: validationError + // 500: error + owner := user.GetUserByParams(ctx) if ctx.Written() { return diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index 36fea14f115d..74cbba8cde9a 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -35,8 +35,21 @@ func parseLoginSource(ctx *context.APIContext, u *models.User, sourceID int64, l } // CreateUser api for creating a user -// see https://github.com/gogits/go-gogs-client/wiki/Administration-Users#create-a-new-user func CreateUser(ctx *context.APIContext, form api.CreateUserOption) { + // swagger:route POST /admin/users admin adminCreateUser + // + // Consumes: + // - application/json + // + // Produces: + // - application/json + // + // Responses: + // 201: User + // 403: forbidden + // 422: validationError + // 500: error + u := &models.User{ Name: form.Username, FullName: form.FullName, @@ -73,8 +86,21 @@ func CreateUser(ctx *context.APIContext, form api.CreateUserOption) { } // EditUser api for modifying a user's information -// see https://github.com/gogits/go-gogs-client/wiki/Administration-Users#edit-an-existing-user func EditUser(ctx *context.APIContext, form api.EditUserOption) { + // swagger:route PATCH /admin/users/{username} admin adminEditUser + // + // Consumes: + // - application/json + // + // Produces: + // - application/json + // + // Responses: + // 200: User + // 403: forbidden + // 422: validationError + // 500: error + u := user.GetUserByParams(ctx) if ctx.Written() { return @@ -130,8 +156,18 @@ func EditUser(ctx *context.APIContext, form api.EditUserOption) { } // DeleteUser api for deleting a user -// https://github.com/gogits/go-gogs-client/wiki/Administration-Users#delete-a-user func DeleteUser(ctx *context.APIContext) { + // swagger:route DELETE /admin/users/{username} admin adminDeleteUser + // + // Produces: + // - application/json + // + // Responses: + // 204: empty + // 403: forbidden + // 422: validationError + // 500: error + u := user.GetUserByParams(ctx) if ctx.Written() { return @@ -152,8 +188,21 @@ func DeleteUser(ctx *context.APIContext) { } // CreatePublicKey api for creating a public key to a user -// see https://github.com/gogits/go-gogs-client/wiki/Administration-Users#create-a-public-key-for-user func CreatePublicKey(ctx *context.APIContext, form api.CreateKeyOption) { + // swagger:route POST /admin/users/{username}/keys admin adminCreatePublicKey + // + // Consumes: + // - application/json + // + // Produces: + // - application/json + // + // Responses: + // 201: PublicKey + // 403: forbidden + // 422: validationError + // 500: error + u := user.GetUserByParams(ctx) if ctx.Written() { return diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 23c7c7c3052f..526940493f0f 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -23,6 +23,28 @@ // - application/json // - text/html // +// Security: +// - BasicAuth: [] +// - Token: [] +// - AccessToken: [] +// - AuthorizationHeaderToken: [] +// +// SecurityDefinitions: +// BasicAuth: +// type: basic +// Token: +// type: apiKey +// name: token +// in: query +// AccessToken: +// type: apiKey +// name: access_token +// in: query +// AuthorizationHeaderToken: +// type: apiKey +// name: Authorization +// in: header +// // swagger:meta package v1 @@ -328,6 +350,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Delete("", user.Unstar) }, repoAssignment()) }) + m.Get("/times", repo.ListMyTrackedTimes) m.Get("/subscriptions", user.GetMyWatchedRepos) }, reqToken()) @@ -373,6 +396,11 @@ func RegisterRoutes(m *macaron.Macaron) { m.Combo("/:id").Get(repo.GetDeployKey). Delete(repo.DeleteDeploykey) }, reqToken(), reqRepoWriter()) + m.Group("/times", func() { + m.Combo("").Get(repo.ListTrackedTimesByRepository) + m.Combo("/:timetrackingusername").Get(repo.ListTrackedTimesByUser) + + }, mustEnableIssues) m.Group("/issues", func() { m.Combo("").Get(repo.ListIssues). Post(reqToken(), bind(api.CreateIssueOption{}), repo.CreateIssue) @@ -400,6 +428,11 @@ func RegisterRoutes(m *macaron.Macaron) { m.Delete("/:id", reqToken(), repo.DeleteIssueLabel) }) + m.Group("/times", func() { + m.Combo("").Get(repo.ListTrackedTimes). + Post(reqToken(), bind(api.AddTimeOption{}), repo.AddTime) + }) + }) }, mustEnableIssues) m.Group("/labels", func() { diff --git a/routers/api/v1/misc/markdown.go b/routers/api/v1/misc/markdown.go index 0d346a927029..933488301b6a 100644 --- a/routers/api/v1/misc/markdown.go +++ b/routers/api/v1/misc/markdown.go @@ -14,7 +14,7 @@ import ( // Markdown render markdown document to HTML func Markdown(ctx *context.APIContext, form api.MarkdownOption) { - // swagger:route POST /markdown renderMarkdown + // swagger:route POST /markdown miscellaneous renderMarkdown // // Consumes: // - application/json @@ -52,7 +52,7 @@ func Markdown(ctx *context.APIContext, form api.MarkdownOption) { // MarkdownRaw render raw markdown HTML func MarkdownRaw(ctx *context.APIContext) { - // swagger:route POST /markdown/raw renderMarkdownRaw + // swagger:route POST /markdown/raw miscellaneous renderMarkdownRaw // // Consumes: // - text/plain diff --git a/routers/api/v1/misc/markdown_test.go b/routers/api/v1/misc/markdown_test.go index 182b147820b0..d6e619347802 100644 --- a/routers/api/v1/misc/markdown_test.go +++ b/routers/api/v1/misc/markdown_test.go @@ -75,7 +75,7 @@ func TestAPI_RenderGFM(t *testing.T) { `, // wine-staging wiki home extract: special wiki syntax, images diff --git a/routers/api/v1/misc/version.go b/routers/api/v1/misc/version.go index 873326a2ccce..1780398bf9e5 100644 --- a/routers/api/v1/misc/version.go +++ b/routers/api/v1/misc/version.go @@ -12,7 +12,7 @@ import ( // Version shows the version of the Gitea server func Version(ctx *context.APIContext) { - // swagger:route GET /version getVersion + // swagger:route GET /version miscellaneous getVersion // // Return Gitea running version. // diff --git a/routers/api/v1/org/hook.go b/routers/api/v1/org/hook.go index 3a0b74ac21d1..d8a4c45fc8ec 100644 --- a/routers/api/v1/org/hook.go +++ b/routers/api/v1/org/hook.go @@ -15,6 +15,15 @@ import ( // ListHooks list an organziation's webhooks func ListHooks(ctx *context.APIContext) { + // swagger:route GET /orgs/{orgname}/hooks organization orgListHooks + // + // Produces: + // - application/json + // + // Responses: + // 200: HookList + // 500: error + org := ctx.Org.Organization orgHooks, err := models.GetWebhooksByOrgID(org.ID) if err != nil { @@ -30,6 +39,16 @@ func ListHooks(ctx *context.APIContext) { // GetHook get an organization's hook by id func GetHook(ctx *context.APIContext) { + // swagger:route GET /orgs/{orgname}/hooks/{id} organization orgGetHook + // + // Produces: + // - application/json + // + // Responses: + // 200: Hook + // 404: notFound + // 500: error + org := ctx.Org.Organization hookID := ctx.ParamsInt64(":id") hook, err := utils.GetOrgHook(ctx, org.ID, hookID) @@ -41,6 +60,19 @@ func GetHook(ctx *context.APIContext) { // CreateHook create a hook for an organization func CreateHook(ctx *context.APIContext, form api.CreateHookOption) { + // swagger:route POST /orgs/{orgname}/hooks/ organization orgCreateHook + // + // Consumes: + // - application/json + // + // Produces: + // - application/json + // + // Responses: + // 201: Hook + // 422: validationError + // 500: error + if !utils.CheckCreateHookOption(ctx, &form) { return } @@ -49,12 +81,36 @@ func CreateHook(ctx *context.APIContext, form api.CreateHookOption) { // EditHook modify a hook of a repository func EditHook(ctx *context.APIContext, form api.EditHookOption) { + // swagger:route PATCH /orgs/{orgname}/hooks/{id} organization orgEditHook + // + // Consumes: + // - application/json + // + // Produces: + // - application/json + // + // Responses: + // 200: Hook + // 422: validationError + // 404: notFound + // 500: error + hookID := ctx.ParamsInt64(":id") utils.EditOrgHook(ctx, &form, hookID) } // DeleteHook delete a hook of an organization func DeleteHook(ctx *context.APIContext) { + // swagger:route DELETE /orgs/{orgname}/hooks/{id} organization orgDeleteHook + // + // Produces: + // - application/json + // + // Responses: + // 204: empty + // 404: notFound + // 500: error + org := ctx.Org.Organization hookID := ctx.ParamsInt64(":id") if err := models.DeleteWebhookByOrgID(org.ID, hookID); err != nil { diff --git a/routers/api/v1/org/member.go b/routers/api/v1/org/member.go index 476025e644c1..34953705567a 100644 --- a/routers/api/v1/org/member.go +++ b/routers/api/v1/org/member.go @@ -53,17 +53,45 @@ func listMembers(ctx *context.APIContext, publicOnly bool) { // ListMembers list an organization's members func ListMembers(ctx *context.APIContext) { + // swagger:route GET /orgs/{orgname}/members organization orgListMembers + // + // Produces: + // - application/json + // + // Responses: + // 200: UserList + // 500: error + publicOnly := ctx.User == nil || !ctx.Org.Organization.IsOrgMember(ctx.User.ID) listMembers(ctx, publicOnly) } // ListPublicMembers list an organization's public members func ListPublicMembers(ctx *context.APIContext) { + // swagger:route GET /orgs/{orgname}/public_members organization orgListPublicMembers + // + // Produces: + // - application/json + // + // Responses: + // 200: UserList + // 500: error + listMembers(ctx, true) } // IsMember check if a user is a member of an organization func IsMember(ctx *context.APIContext) { + // swagger:route GET /orgs/{orgname}/members/{username} organization orgIsMember + // + // Produces: + // - application/json + // + // Responses: + // 204: empty + // 302: redirect + // 404: notFound + userToCheck := user.GetUserByParams(ctx) if ctx.Written() { return @@ -85,6 +113,15 @@ func IsMember(ctx *context.APIContext) { // IsPublicMember check if a user is a public member of an organization func IsPublicMember(ctx *context.APIContext) { + // swagger:route GET /orgs/{orgname}/public_members/{username} organization orgIsPublicMember + // + // Produces: + // - application/json + // + // Responses: + // 204: empty + // 404: notFound + userToCheck := user.GetUserByParams(ctx) if ctx.Written() { return @@ -98,6 +135,16 @@ func IsPublicMember(ctx *context.APIContext) { // PublicizeMember make a member's membership public func PublicizeMember(ctx *context.APIContext) { + // swagger:route PUT /orgs/{orgname}/public_members/{username} organization orgPublicizeMember + // + // Produces: + // - application/json + // + // Responses: + // 204: empty + // 403: forbidden + // 500: error + userToPublicize := user.GetUserByParams(ctx) if ctx.Written() { return @@ -116,6 +163,16 @@ func PublicizeMember(ctx *context.APIContext) { // ConcealMember make a member's membership not public func ConcealMember(ctx *context.APIContext) { + // swagger:route DELETE /orgs/{orgname}/public_members/{username} organization orgConcealMember + // + // Produces: + // - application/json + // + // Responses: + // 204: empty + // 403: forbidden + // 500: error + userToConceal := user.GetUserByParams(ctx) if ctx.Written() { return @@ -134,6 +191,15 @@ func ConcealMember(ctx *context.APIContext) { // DeleteMember remove a member from an organization func DeleteMember(ctx *context.APIContext) { + // swagger:route DELETE /orgs/{orgname}/members/{username} organization orgDeleteMember + // + // Produces: + // - application/json + // + // Responses: + // 204: empty + // 500: error + member := user.GetUserByParams(ctx) if ctx.Written() { return diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go index e4a36b95c0d2..ec55b9ebe469 100644 --- a/routers/api/v1/org/org.go +++ b/routers/api/v1/org/org.go @@ -56,7 +56,7 @@ func Edit(ctx *context.APIContext, form api.EditOrgOption) { org.Description = form.Description org.Website = form.Website org.Location = form.Location - if err := models.UpdateUser(org); err != nil { + if err := models.UpdateUserCols(org, "full_name", "description", "website", "location"); err != nil { ctx.Error(500, "UpdateUser", err) return } diff --git a/routers/api/v1/repo/fork.go b/routers/api/v1/repo/fork.go index 25464dbd78b2..2f3addf69220 100644 --- a/routers/api/v1/repo/fork.go +++ b/routers/api/v1/repo/fork.go @@ -14,7 +14,7 @@ import ( // ListForks list a repository's forks func ListForks(ctx *context.APIContext) { - // swagger:route GET /repos/{owner}/{repo}/forks listForks + // swagger:route GET /repos/{owner}/{repo}/forks repository listForks // // Produces: // - application/json @@ -42,7 +42,7 @@ func ListForks(ctx *context.APIContext) { // CreateFork create a fork of a repo func CreateFork(ctx *context.APIContext, form api.CreateForkOption) { - // swagger:route POST /repos/{owner}/{repo}/forks createFork + // swagger:route POST /repos/{owner}/{repo}/forks repository createFork // // Produces: // - application/json @@ -73,7 +73,7 @@ func CreateFork(ctx *context.APIContext, form api.CreateForkOption) { } forker = org } - fork, err := models.ForkRepository(forker, repo, repo.Name, repo.Description) + fork, err := models.ForkRepository(ctx.User, forker, repo, repo.Name, repo.Description) if err != nil { ctx.Error(500, "ForkRepository", err) return diff --git a/routers/api/v1/repo/hook.go b/routers/api/v1/repo/hook.go index 93dcd081d705..72dfeff3d071 100644 --- a/routers/api/v1/repo/hook.go +++ b/routers/api/v1/repo/hook.go @@ -15,13 +15,13 @@ import ( // ListHooks list all hooks of a repository func ListHooks(ctx *context.APIContext) { - // swagger:route GET /repos/{username}/{reponame}/hooks + // swagger:route GET /repos/{username}/{reponame}/hooks repository repoListHooks // // Produces: // - application/json // // Responses: - // 200: apiHooks + // 200: HookList // 500: error hooks, err := models.GetWebhooksByRepoID(ctx.Repo.Repository.ID) @@ -50,7 +50,7 @@ func GetHook(ctx *context.APIContext) { // CreateHook create a hook for a repository func CreateHook(ctx *context.APIContext, form api.CreateHookOption) { - // swagger:route POST /repos/{username}/{reponame}/hooks + // swagger:route POST /repos/{username}/{reponame}/hooks repository repoCreateHook // // Consumes: // - application/json @@ -59,7 +59,7 @@ func CreateHook(ctx *context.APIContext, form api.CreateHookOption) { // - application/json // // Responses: - // 200: apiHook + // 200: Hook // 422: validationError // 500: error @@ -71,13 +71,13 @@ func CreateHook(ctx *context.APIContext, form api.CreateHookOption) { // EditHook modify a hook of a repository func EditHook(ctx *context.APIContext, form api.EditHookOption) { - // swagger:route PATCH /repos/{username}/{reponame}/hooks/{id} + // swagger:route PATCH /repos/{username}/{reponame}/hooks/{id} repository repoEditHook // // Produces: // - application/json // // Responses: - // 200: apiHook //TODO + // 200: Hook // 422: validationError // 500: error @@ -87,7 +87,7 @@ func EditHook(ctx *context.APIContext, form api.EditHookOption) { // DeleteHook delete a hook of a repository func DeleteHook(ctx *context.APIContext) { - // swagger:route DELETE /repos/{username}/{reponame}/hooks/{id} + // swagger:route DELETE /repos/{username}/{reponame}/hooks/{id} repository repoDeleteHook // // Produces: // - application/json diff --git a/routers/api/v1/repo/issue_tracked_time.go b/routers/api/v1/repo/issue_tracked_time.go new file mode 100644 index 000000000000..964fc11ddb67 --- /dev/null +++ b/routers/api/v1/repo/issue_tracked_time.go @@ -0,0 +1,158 @@ +// Copyright 2017 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package repo + +import ( + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" + api "code.gitea.io/sdk/gitea" +) + +// ListTrackedTimes list all the tracked times of an issue +func ListTrackedTimes(ctx *context.APIContext) { + // swagger:route GET /repos/{username}/{reponame}/issues/{issue}/times repository issueTrackedTimes + // + // Produces: + // - application/json + // + // Responses: + // 200: TrackedTimes + // 404: error + // 500: error + if !ctx.Repo.Repository.IsTimetrackerEnabled() { + ctx.Error(404, "IsTimetrackerEnabled", "Timetracker is diabled") + return + } + issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + if err != nil { + if models.IsErrIssueNotExist(err) { + ctx.Error(404, "GetIssueByIndex", err) + } else { + ctx.Error(500, "GetIssueByIndex", err) + } + return + } + + if trackedTimes, err := models.GetTrackedTimes(models.FindTrackedTimesOptions{IssueID: issue.ID}); err != nil { + ctx.Error(500, "GetTrackedTimesByIssue", err) + } else { + ctx.JSON(200, &trackedTimes) + } +} + +// AddTime adds time manual to the given issue +func AddTime(ctx *context.APIContext, form api.AddTimeOption) { + // swagger:route Post /repos/{username}/{reponame}/issues/{issue}/times repository addTime + // + // Produces: + // - application/json + // + // Responses: + // 200: TrackedTime + // 400: error + // 403: error + // 404: error + // 500: error + issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + if err != nil { + if models.IsErrIssueNotExist(err) { + ctx.Error(404, "GetIssueByIndex", err) + } else { + ctx.Error(500, "GetIssueByIndex", err) + } + return + } + + if !ctx.Repo.CanUseTimetracker(issue, ctx.User) { + if !ctx.Repo.Repository.IsTimetrackerEnabled() { + ctx.JSON(400, struct{ Message string }{Message: "time tracking disabled"}) + return + } + ctx.Status(403) + return + } + var tt *models.TrackedTime + if tt, err = models.AddTime(ctx.User, issue, form.Time); err != nil { + ctx.Error(500, "AddTime", err) + return + } + ctx.JSON(200, tt) + +} + +// ListTrackedTimesByUser lists all tracked times of the user +func ListTrackedTimesByUser(ctx *context.APIContext) { + // swagger:route GET /repos/{username}/{reponame}/times/{timetrackingusername} user userTrackedTimes + // + // Produces: + // - application/json + // + // Responses: + // 200: TrackedTimes + // 400: error + // 404: error + // 500: error + if !ctx.Repo.Repository.IsTimetrackerEnabled() { + ctx.JSON(400, struct{ Message string }{Message: "time tracking disabled"}) + return + } + user, err := models.GetUserByName(ctx.Params(":timetrackingusername")) + if err != nil { + if models.IsErrUserNotExist(err) { + ctx.Error(404, "GetUserByName", err) + } else { + ctx.Error(500, "GetUserByName", err) + } + return + } + if user == nil { + ctx.Status(404) + return + } + if trackedTimes, err := models.GetTrackedTimes(models.FindTrackedTimesOptions{UserID: user.ID, RepositoryID: ctx.Repo.Repository.ID}); err != nil { + ctx.Error(500, "GetTrackedTimesByUser", err) + } else { + ctx.JSON(200, &trackedTimes) + } +} + +// ListTrackedTimesByRepository lists all tracked times of the user +func ListTrackedTimesByRepository(ctx *context.APIContext) { + // swagger:route GET /repos/{username}/{reponame}/times repository repoTrackedTimes + // + // Produces: + // - application/json + // + // Responses: + // 200: TrackedTimes + // 400: error + // 500: error + if !ctx.Repo.Repository.IsTimetrackerEnabled() { + ctx.JSON(400, struct{ Message string }{Message: "time tracking disabled"}) + return + } + if trackedTimes, err := models.GetTrackedTimes(models.FindTrackedTimesOptions{RepositoryID: ctx.Repo.Repository.ID}); err != nil { + ctx.Error(500, "GetTrackedTimesByUser", err) + } else { + ctx.JSON(200, &trackedTimes) + } +} + +// ListMyTrackedTimes lists all tracked times of the current user +func ListMyTrackedTimes(ctx *context.APIContext) { + // swagger:route GET /user/times user userTrackedTimes + // + // Produces: + // - application/json + // + // Responses: + // 200: TrackedTimes + // 500: error + if trackedTimes, err := models.GetTrackedTimes(models.FindTrackedTimesOptions{UserID: ctx.User.ID}); err != nil { + ctx.Error(500, "GetTrackedTimesByUser", err) + } else { + ctx.JSON(200, &trackedTimes) + } +} diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index edd6a72637aa..20393102fc82 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -5,6 +5,7 @@ package repo import ( + "fmt" "strings" api "code.gitea.io/sdk/gitea" @@ -19,7 +20,7 @@ import ( // Search repositories via options func Search(ctx *context.APIContext) { - // swagger:route GET /repos/search repoSearch + // swagger:route GET /repos/search repository repoSearch // // Produces: // - application/json @@ -41,6 +42,7 @@ func Search(ctx *context.APIContext) { if ctx.IsSigned && opts.OwnerID > 0 { if ctx.User.ID == opts.OwnerID { opts.Private = true + opts.Collaborate = true } else { u, err := models.GetUserByID(opts.OwnerID) if err != nil { @@ -53,7 +55,10 @@ func Search(ctx *context.APIContext) { if u.IsOrganization() && u.IsOwnedBy(ctx.User.ID) { opts.Private = true } - // FIXME: how about collaborators? + + if !u.IsOrganization() { + opts.Collaborate = true + } } } @@ -91,6 +96,7 @@ func Search(ctx *context.APIContext) { } ctx.SetLinkHeader(int(count), setting.API.MaxResponseItems) + ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", count)) ctx.JSON(200, api.SearchResults{ OK: true, Data: results, @@ -99,7 +105,7 @@ func Search(ctx *context.APIContext) { // CreateUserRepo create a repository for a user func CreateUserRepo(ctx *context.APIContext, owner *models.User, opt api.CreateRepoOption) { - repo, err := models.CreateRepository(owner, models.CreateRepoOptions{ + repo, err := models.CreateRepository(ctx.User, owner, models.CreateRepoOptions{ Name: opt.Name, Description: opt.Description, Gitignores: opt.Gitignores, @@ -115,7 +121,7 @@ func CreateUserRepo(ctx *context.APIContext, owner *models.User, opt api.CreateR ctx.Error(422, "", err) } else { if repo != nil { - if err = models.DeleteRepository(ctx.User.ID, repo.ID); err != nil { + if err = models.DeleteRepository(ctx.User, ctx.User.ID, repo.ID); err != nil { log.Error(4, "DeleteRepository: %v", err) } } @@ -128,8 +134,21 @@ func CreateUserRepo(ctx *context.APIContext, owner *models.User, opt api.CreateR } // Create one repository of mine -// see https://github.com/gogits/go-gogs-client/wiki/Repositories#create func Create(ctx *context.APIContext, opt api.CreateRepoOption) { + // swagger:route POST /user/repos repository user createCurrentUserRepo + // + // Consumes: + // - application/json + // + // Produces: + // - application/json + // + // Responses: + // 201: Repository + // 403: forbidden + // 422: validationError + // 500: error + // Shouldn't reach this condition, but just in case. if ctx.User.IsOrganization() { ctx.Error(422, "", "not allowed creating repository for organization") @@ -140,7 +159,7 @@ func Create(ctx *context.APIContext, opt api.CreateRepoOption) { // CreateOrgRepo create one repository of the organization func CreateOrgRepo(ctx *context.APIContext, opt api.CreateRepoOption) { - // swagger:route POST /org/{org}/repos createOrgRepo + // swagger:route POST /org/{org}/repos organization createOrgRepo // // Consumes: // - application/json @@ -173,7 +192,7 @@ func CreateOrgRepo(ctx *context.APIContext, opt api.CreateRepoOption) { // Migrate migrate remote git repository to gitea func Migrate(ctx *context.APIContext, form auth.MigrateRepoForm) { - // swagger:route POST /repos/migrate + // swagger:route POST /repos/migrate repository repoMigrate // // Consumes: // - application/json @@ -235,7 +254,7 @@ func Migrate(ctx *context.APIContext, form auth.MigrateRepoForm) { return } - repo, err := models.MigrateRepository(ctxUser, models.MigrateRepoOptions{ + repo, err := models.MigrateRepository(ctx.User, ctxUser, models.MigrateRepoOptions{ Name: form.RepoName, Description: form.Description, IsPrivate: form.Private || setting.Repository.ForcePrivate, @@ -244,7 +263,7 @@ func Migrate(ctx *context.APIContext, form auth.MigrateRepoForm) { }) if err != nil { if repo != nil { - if errDelete := models.DeleteRepository(ctxUser.ID, repo.ID); errDelete != nil { + if errDelete := models.DeleteRepository(ctx.User, ctxUser.ID, repo.ID); errDelete != nil { log.Error(4, "DeleteRepository: %v", errDelete) } } @@ -258,7 +277,7 @@ func Migrate(ctx *context.APIContext, form auth.MigrateRepoForm) { // Get one repository func Get(ctx *context.APIContext) { - // swagger:route GET /repos/{username}/{reponame} + // swagger:route GET /repos/{username}/{reponame} repository repoGet // // Produces: // - application/json @@ -272,7 +291,7 @@ func Get(ctx *context.APIContext) { // GetByID returns a single Repository func GetByID(ctx *context.APIContext) { - // swagger:route GET /repositories/{id} + // swagger:route GET /repositories/{id} repository repoGetByID // // Produces: // - application/json @@ -304,7 +323,7 @@ func GetByID(ctx *context.APIContext) { // Delete one repository func Delete(ctx *context.APIContext) { - // swagger:route DELETE /repos/{username}/{reponame} + // swagger:route DELETE /repos/{username}/{reponame} repository repoDelete // // Produces: // - application/json @@ -326,7 +345,7 @@ func Delete(ctx *context.APIContext) { return } - if err := models.DeleteRepository(owner.ID, repo.ID); err != nil { + if err := models.DeleteRepository(ctx.User, owner.ID, repo.ID); err != nil { ctx.Error(500, "DeleteRepository", err) return } @@ -337,7 +356,7 @@ func Delete(ctx *context.APIContext) { // MirrorSync adds a mirrored repository to the sync queue func MirrorSync(ctx *context.APIContext) { - // swagger:route POST /repos/{username}/{reponame}/mirror-sync repoMirrorSync + // swagger:route POST /repos/{username}/{reponame}/mirror-sync repository repoMirrorSync // // Produces: // - application/json diff --git a/routers/api/v1/user/app.go b/routers/api/v1/user/app.go index 88837a71a2a7..1d722e36e401 100644 --- a/routers/api/v1/user/app.go +++ b/routers/api/v1/user/app.go @@ -13,7 +13,7 @@ import ( // ListAccessTokens list all the access tokens func ListAccessTokens(ctx *context.APIContext) { - // swagger:route GET /users/{username}/tokens userGetTokens + // swagger:route GET /users/{username}/tokens user userGetTokens // // Produces: // - application/json @@ -40,7 +40,7 @@ func ListAccessTokens(ctx *context.APIContext) { // CreateAccessToken create access tokens func CreateAccessToken(ctx *context.APIContext, form api.CreateAccessTokenOption) { - // swagger:route POST /users/{username} /tokens userCreateToken + // swagger:route POST /users/{username} /tokens user userCreateToken // // Consumes: // - application/json diff --git a/routers/api/v1/user/follower.go b/routers/api/v1/user/follower.go index 84240c795720..55a0b032db0e 100644 --- a/routers/api/v1/user/follower.go +++ b/routers/api/v1/user/follower.go @@ -30,7 +30,7 @@ func listUserFollowers(ctx *context.APIContext, u *models.User) { // ListMyFollowers list all my followers func ListMyFollowers(ctx *context.APIContext) { - // swagger:route GET /user/followers userCurrentListFollowers + // swagger:route GET /user/followers user userCurrentListFollowers // // Produces: // - application/json @@ -44,7 +44,7 @@ func ListMyFollowers(ctx *context.APIContext) { // ListFollowers list user's followers func ListFollowers(ctx *context.APIContext) { - // swagger:route GET /users/:username/followers userListFollowers + // swagger:route GET /users/:username/followers user userListFollowers // // Produces: // - application/json @@ -71,7 +71,7 @@ func listUserFollowing(ctx *context.APIContext, u *models.User) { // ListMyFollowing list all my followings func ListMyFollowing(ctx *context.APIContext) { - // swagger:route GET /user/following userCurrentListFollowing + // swagger:route GET /user/following user userCurrentListFollowing // // Produces: // - application/json @@ -85,7 +85,7 @@ func ListMyFollowing(ctx *context.APIContext) { // ListFollowing list user's followings func ListFollowing(ctx *context.APIContext) { - // swagger:route GET /users/{username}/following userListFollowing + // swagger:route GET /users/{username}/following user userListFollowing // // Produces: // - application/json @@ -111,7 +111,7 @@ func checkUserFollowing(ctx *context.APIContext, u *models.User, followID int64) // CheckMyFollowing check if the repo is followed by me func CheckMyFollowing(ctx *context.APIContext) { - // swagger:route GET /user/following/{username} userCurrentCheckFollowing + // swagger:route GET /user/following/{username} user userCurrentCheckFollowing // // Responses: // 204: empty @@ -126,7 +126,7 @@ func CheckMyFollowing(ctx *context.APIContext) { // CheckFollowing check if the repo is followed by user func CheckFollowing(ctx *context.APIContext) { - // swagger:route GET /users/{username}/following/:target userCheckFollowing + // swagger:route GET /users/{username}/following/:target user userCheckFollowing // // Responses: // 204: empty @@ -145,7 +145,7 @@ func CheckFollowing(ctx *context.APIContext) { // Follow follow one repository func Follow(ctx *context.APIContext) { - // swagger:route PUT /user/following/{username} userCurrentPutFollow + // swagger:route PUT /user/following/{username} user userCurrentPutFollow // // Responses: // 204: empty @@ -164,7 +164,7 @@ func Follow(ctx *context.APIContext) { // Unfollow unfollow one repository func Unfollow(ctx *context.APIContext) { - // swagger:route DELETE /user/following/{username} userCurrentDeleteFollow + // swagger:route DELETE /user/following/{username} user userCurrentDeleteFollow // // Responses: // 204: empty diff --git a/routers/api/v1/user/gpg_key.go b/routers/api/v1/user/gpg_key.go index 8c5e171b7f2e..96ff6e88ba29 100644 --- a/routers/api/v1/user/gpg_key.go +++ b/routers/api/v1/user/gpg_key.go @@ -34,7 +34,7 @@ func listGPGKeys(ctx *context.APIContext, uid int64) { //ListGPGKeys get the GPG key list of a user func ListGPGKeys(ctx *context.APIContext) { - // swagger:route GET /users/{username}/gpg_keys userListGPGKeys + // swagger:route GET /users/{username}/gpg_keys user userListGPGKeys // // Produces: // - application/json @@ -52,7 +52,7 @@ func ListGPGKeys(ctx *context.APIContext) { //ListMyGPGKeys get the GPG key list of the logged user func ListMyGPGKeys(ctx *context.APIContext) { - // swagger:route GET /user/gpg_keys userCurrentListGPGKeys + // swagger:route GET /user/gpg_keys user userCurrentListGPGKeys // // Produces: // - application/json @@ -66,7 +66,7 @@ func ListMyGPGKeys(ctx *context.APIContext) { //GetGPGKey get the GPG key based on a id func GetGPGKey(ctx *context.APIContext) { - // swagger:route GET /user/gpg_keys/{id} userCurrentGetGPGKey + // swagger:route GET /user/gpg_keys/{id} user userCurrentGetGPGKey // // Produces: // - application/json @@ -100,7 +100,7 @@ func CreateUserGPGKey(ctx *context.APIContext, form api.CreateGPGKeyOption, uid //CreateGPGKey associate a GPG key to the current user func CreateGPGKey(ctx *context.APIContext, form api.CreateGPGKeyOption) { - // swagger:route POST /user/gpg_keys userCurrentPostGPGKey + // swagger:route POST /user/gpg_keys user userCurrentPostGPGKey // // Consumes: // - application/json @@ -118,7 +118,7 @@ func CreateGPGKey(ctx *context.APIContext, form api.CreateGPGKeyOption) { //DeleteGPGKey remove a GPG key associated to the current user func DeleteGPGKey(ctx *context.APIContext) { - // swagger:route DELETE /user/gpg_keys/{id} userCurrentDeleteGPGKey + // swagger:route DELETE /user/gpg_keys/{id} user userCurrentDeleteGPGKey // // Produces: // - application/json diff --git a/routers/api/v1/user/key.go b/routers/api/v1/user/key.go index a53ed2f8c90b..1772ef4d2528 100644 --- a/routers/api/v1/user/key.go +++ b/routers/api/v1/user/key.go @@ -55,7 +55,7 @@ func listPublicKeys(ctx *context.APIContext, uid int64) { // ListMyPublicKeys list all my public keys func ListMyPublicKeys(ctx *context.APIContext) { - // swagger:route GET /user/keys userCurrentListKeys + // swagger:route GET /user/keys user userCurrentListKeys // // Produces: // - application/json @@ -69,7 +69,7 @@ func ListMyPublicKeys(ctx *context.APIContext) { // ListPublicKeys list all user's public keys func ListPublicKeys(ctx *context.APIContext) { - // swagger:route GET /users/{username}/keys userListKeys + // swagger:route GET /users/{username}/keys user userListKeys // // Produces: // - application/json @@ -87,7 +87,7 @@ func ListPublicKeys(ctx *context.APIContext) { // GetPublicKey get one public key func GetPublicKey(ctx *context.APIContext) { - // swagger:route GET /user/keys/{id} userCurrentGetKey + // swagger:route GET /user/keys/{id} user userCurrentGetKey // // Produces: // - application/json @@ -130,7 +130,7 @@ func CreateUserPublicKey(ctx *context.APIContext, form api.CreateKeyOption, uid // CreatePublicKey create one public key for me func CreatePublicKey(ctx *context.APIContext, form api.CreateKeyOption) { - // swagger:route POST /user/keys userCurrentPostKey + // swagger:route POST /user/keys user userCurrentPostKey // // Consumes: // - application/json @@ -148,7 +148,7 @@ func CreatePublicKey(ctx *context.APIContext, form api.CreateKeyOption) { // DeletePublicKey delete one public key of mine func DeletePublicKey(ctx *context.APIContext) { - // swagger:route DELETE /user/keys/{id} userCurrentDeleteKey + // swagger:route DELETE /user/keys/{id} user userCurrentDeleteKey // // Produces: // - application/json diff --git a/routers/api/v1/user/repo.go b/routers/api/v1/user/repo.go index b4a4653faa2a..f119632e394c 100644 --- a/routers/api/v1/user/repo.go +++ b/routers/api/v1/user/repo.go @@ -36,7 +36,7 @@ func listUserRepos(ctx *context.APIContext, u *models.User) { // ListUserRepos - list the repos owned by the given user. func ListUserRepos(ctx *context.APIContext) { - // swagger:route GET /users/{username}/repos userListRepos + // swagger:route GET /users/{username}/repos user userListRepos // // Produces: // - application/json @@ -54,7 +54,7 @@ func ListUserRepos(ctx *context.APIContext) { // ListMyRepos - list the repositories you own or have access to. func ListMyRepos(ctx *context.APIContext) { - // swagger:route GET /user/repos userCurrentListRepos + // swagger:route GET /user/repos user userCurrentListRepos // // Produces: // - application/json @@ -87,7 +87,7 @@ func ListMyRepos(ctx *context.APIContext) { // ListOrgRepos - list the repositories of an organization. func ListOrgRepos(ctx *context.APIContext) { - // swagger:route GET /orgs/{org}/repos orgListRepos + // swagger:route GET /orgs/{orgname}/repos organization orgListRepos // // Produces: // - application/json diff --git a/routers/api/v1/user/star.go b/routers/api/v1/user/star.go index 49d704cb2e01..6f943a271242 100644 --- a/routers/api/v1/user/star.go +++ b/routers/api/v1/user/star.go @@ -33,7 +33,7 @@ func getStarredRepos(userID int64, private bool) ([]*api.Repository, error) { // GetStarredRepos returns the repos that the user specified by the APIContext // has starred func GetStarredRepos(ctx *context.APIContext) { - // swagger:route GET /users/{username}/starred userListStarred + // swagger:route GET /users/{username}/starred user userListStarred // // Produces: // - application/json @@ -53,7 +53,7 @@ func GetStarredRepos(ctx *context.APIContext) { // GetMyStarredRepos returns the repos that the authenticated user has starred func GetMyStarredRepos(ctx *context.APIContext) { - // swagger:route GET /user/starred userCurrentListStarred + // swagger:route GET /user/starred user userCurrentListStarred // // Produces: // - application/json @@ -71,7 +71,7 @@ func GetMyStarredRepos(ctx *context.APIContext) { // IsStarring returns whether the authenticated is starring the repo func IsStarring(ctx *context.APIContext) { - // swagger:route GET /user/starred/{username}/{reponame} userCurrentCheckStarring + // swagger:route GET /user/starred/{username}/{reponame} user userCurrentCheckStarring // // Responses: // 204: empty @@ -86,7 +86,7 @@ func IsStarring(ctx *context.APIContext) { // Star the repo specified in the APIContext, as the authenticated user func Star(ctx *context.APIContext) { - // swagger:route PUT /user/starred/{username}/{reponame} userCurrentPutStar + // swagger:route PUT /user/starred/{username}/{reponame} user userCurrentPutStar // // Responses: // 204: empty @@ -102,7 +102,7 @@ func Star(ctx *context.APIContext) { // Unstar the repo specified in the APIContext, as the authenticated user func Unstar(ctx *context.APIContext) { - // swagger:route DELETE /user/starred/{username}/{reponame} userCurrentDeleteStar + // swagger:route DELETE /user/starred/{username}/{reponame} user userCurrentDeleteStar // // Responses: // 204: empty diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go index cdb55c0d8129..0ab6eaf44cf6 100644 --- a/routers/api/v1/user/user.go +++ b/routers/api/v1/user/user.go @@ -17,7 +17,7 @@ import ( // Search search users func Search(ctx *context.APIContext) { - // swagger:route GET /users/search userSearch + // swagger:route GET /users/search user userSearch // // Produces: // - application/json @@ -65,7 +65,7 @@ func Search(ctx *context.APIContext) { // GetInfo get user's information func GetInfo(ctx *context.APIContext) { - // swagger:route GET /users/{username} userGet + // swagger:route GET /users/{username} user userGet // // Produces: // - application/json @@ -94,7 +94,7 @@ func GetInfo(ctx *context.APIContext) { // GetAuthenticatedUser get curent user's information func GetAuthenticatedUser(ctx *context.APIContext) { - // swagger:route GET /user userGetCurrent + // swagger:route GET /user user userGetCurrent // // Produces: // - application/json diff --git a/routers/api/v1/user/watch.go b/routers/api/v1/user/watch.go index 230c819202f9..18628c91d18d 100644 --- a/routers/api/v1/user/watch.go +++ b/routers/api/v1/user/watch.go @@ -33,7 +33,7 @@ func getWatchedRepos(userID int64, private bool) ([]*api.Repository, error) { // GetWatchedRepos returns the repos that the user specified in ctx is watching func GetWatchedRepos(ctx *context.APIContext) { - // swagger:route GET /users/{username}/subscriptions userListSubscriptions + // swagger:route GET /users/{username}/subscriptions user userListSubscriptions // // Produces: // - application/json @@ -53,7 +53,7 @@ func GetWatchedRepos(ctx *context.APIContext) { // GetMyWatchedRepos returns the repos that the authenticated user is watching func GetMyWatchedRepos(ctx *context.APIContext) { - // swagger:route GET /user/subscriptions userCurrentListSubscriptions + // swagger:route GET /user/subscriptions user userCurrentListSubscriptions // // Produces: // - application/json @@ -72,7 +72,7 @@ func GetMyWatchedRepos(ctx *context.APIContext) { // IsWatching returns whether the authenticated user is watching the repo // specified in ctx func IsWatching(ctx *context.APIContext) { - // swagger:route GET /repos/{username}/{reponame}/subscription userCurrentCheckSubscription + // swagger:route GET /repos/{username}/{reponame}/subscription repository userCurrentCheckSubscription // // Responses: // 200: WatchInfo @@ -94,7 +94,7 @@ func IsWatching(ctx *context.APIContext) { // Watch the repo specified in ctx, as the authenticated user func Watch(ctx *context.APIContext) { - // swagger:route PUT /repos/{username}/{reponame}/subscription userCurrentPutSubscription + // swagger:route PUT /repos/{username}/{reponame}/subscription repository userCurrentPutSubscription // // Responses: // 200: WatchInfo @@ -118,7 +118,7 @@ func Watch(ctx *context.APIContext) { // Unwatch the repo specified in ctx, as the authenticated user func Unwatch(ctx *context.APIContext) { - // swagger:route DELETE /repos/{username}/{reponame}/subscription userCurrentDeleteSubscription + // swagger:route DELETE /repos/{username}/{reponame}/subscription repository userCurrentDeleteSubscription // // Responses: // 204: empty diff --git a/routers/home.go b/routers/home.go index 0f7b21462757..16d0720551c4 100644 --- a/routers/home.go +++ b/routers/home.go @@ -112,11 +112,12 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) { keyword := strings.Trim(ctx.Query("q"), " ") if len(keyword) == 0 { repos, count, err = opts.Ranger(&models.SearchRepoOptions{ - Page: page, - PageSize: opts.PageSize, - Searcher: ctx.User, - OrderBy: orderBy, - Private: opts.Private, + Page: page, + PageSize: opts.PageSize, + Searcher: ctx.User, + OrderBy: orderBy, + Private: opts.Private, + Collaborate: true, }) if err != nil { ctx.Handle(500, "opts.Ranger", err) @@ -125,12 +126,13 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) { } else { if isKeywordValid(keyword) { repos, count, err = models.SearchRepositoryByName(&models.SearchRepoOptions{ - Keyword: keyword, - OrderBy: orderBy, - Private: opts.Private, - Page: page, - PageSize: opts.PageSize, - Searcher: ctx.User, + Keyword: keyword, + OrderBy: orderBy, + Private: opts.Private, + Page: page, + PageSize: opts.PageSize, + Searcher: ctx.User, + Collaborate: true, }) if err != nil { ctx.Handle(500, "SearchRepositoryByName", err) diff --git a/routers/init.go b/routers/init.go index ad624d3b7ad9..bd46abdf94e8 100644 --- a/routers/init.go +++ b/routers/init.go @@ -50,6 +50,7 @@ func GlobalInit() { if setting.InstallLock { highlight.NewContext() + markdown.InitMarkdown() markdown.NewSanitizer() if err := models.NewEngine(migrations.Migrate); err != nil { log.Fatal(4, "Failed to initialize ORM engine: %v", err) diff --git a/routers/install.go b/routers/install.go index 3d051bd3769e..427bb960f2ac 100644 --- a/routers/install.go +++ b/routers/install.go @@ -108,11 +108,14 @@ func Install(ctx *context.Context) { form.OfflineMode = setting.OfflineMode form.DisableGravatar = setting.DisableGravatar form.EnableFederatedAvatar = setting.EnableFederatedAvatar + form.EnableOpenIDSignIn = true + form.EnableOpenIDSignUp = true form.DisableRegistration = setting.Service.DisableRegistration form.EnableCaptcha = setting.Service.EnableCaptcha form.RequireSignInView = setting.Service.RequireSignInView form.DefaultKeepEmailPrivate = setting.Service.DefaultKeepEmailPrivate form.DefaultAllowCreateOrganization = setting.Service.DefaultAllowCreateOrganization + form.DefaultEnableTimetracking = setting.Service.DefaultEnableTimetracking form.NoReplyAddress = setting.Service.NoReplyAddress auth.AssignForm(form, ctx.Data) @@ -292,11 +295,14 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) { cfg.Section("server").Key("OFFLINE_MODE").SetValue(com.ToStr(form.OfflineMode)) cfg.Section("picture").Key("DISABLE_GRAVATAR").SetValue(com.ToStr(form.DisableGravatar)) cfg.Section("picture").Key("ENABLE_FEDERATED_AVATAR").SetValue(com.ToStr(form.EnableFederatedAvatar)) + cfg.Section("openid").Key("ENABLE_OPENID_SIGNIN").SetValue(com.ToStr(form.EnableOpenIDSignIn)) + cfg.Section("openid").Key("ENABLE_OPENID_SIGNUP").SetValue(com.ToStr(form.EnableOpenIDSignUp)) cfg.Section("service").Key("DISABLE_REGISTRATION").SetValue(com.ToStr(form.DisableRegistration)) cfg.Section("service").Key("ENABLE_CAPTCHA").SetValue(com.ToStr(form.EnableCaptcha)) cfg.Section("service").Key("REQUIRE_SIGNIN_VIEW").SetValue(com.ToStr(form.RequireSignInView)) cfg.Section("service").Key("DEFAULT_KEEP_EMAIL_PRIVATE").SetValue(com.ToStr(form.DefaultKeepEmailPrivate)) cfg.Section("service").Key("DEFAULT_ALLOW_CREATE_ORGANIZATION").SetValue(com.ToStr(form.DefaultAllowCreateOrganization)) + cfg.Section("service").Key("DEFAULT_ENABLE_TIMETRACKING").SetValue(com.ToStr(form.DefaultEnableTimetracking)) cfg.Section("service").Key("NO_REPLY_ADDRESS").SetValue(com.ToStr(form.NoReplyAddress)) cfg.Section("").Key("RUN_MODE").SetValue("prod") diff --git a/routers/private/push_update.go b/routers/private/push_update.go index 3008ef0e7a6e..988d273344ba 100644 --- a/routers/private/push_update.go +++ b/routers/private/push_update.go @@ -32,15 +32,7 @@ func PushUpdate(ctx *macaron.Context) { return } - repo, err := models.PushUpdate(opt) - if err != nil { - ctx.JSON(500, map[string]interface{}{ - "err": err.Error(), - }) - return - } - - pusher, err := models.GetUserByID(opt.PusherID) + err := models.PushUpdate(branch, opt) if err != nil { if models.IsErrUserNotExist(err) { ctx.Error(404) @@ -51,10 +43,5 @@ func PushUpdate(ctx *macaron.Context) { } return } - - log.Trace("TriggerTask '%s/%s' by %s", repo.Name, branch, pusher.Name) - - go models.HookQueue.Add(repo.ID) - go models.AddTestPullRequestTask(pusher, repo.ID, branch, true) ctx.Status(202) } diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 22223e557239..7435ff24468d 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -293,6 +293,13 @@ func RetrieveRepoMetas(ctx *context.Context, repo *models.Repository) []*models. return nil } + brs, err := ctx.Repo.GitRepo.GetBranches() + if err != nil { + ctx.Handle(500, "GetBranches", err) + return nil + } + ctx.Data["Branches"] = brs + return labels } @@ -419,6 +426,7 @@ func NewIssuePost(ctx *context.Context, form auth.CreateIssueForm) { ctx.Data["PageIsIssueList"] = true ctx.Data["RequireHighlightJS"] = true ctx.Data["RequireSimpleMDE"] = true + ctx.Data["ReadOnly"] = false renderAttachmentSettings(ctx) var ( @@ -448,6 +456,7 @@ func NewIssuePost(ctx *context.Context, form auth.CreateIssueForm) { MilestoneID: milestoneID, AssigneeID: assigneeID, Content: form.Content, + Ref: form.Ref, } if err := models.NewIssue(repo, issue, labelIDs, attachments); err != nil { ctx.Handle(500, "NewIssue", err) @@ -581,6 +590,38 @@ func ViewIssue(ctx *context.Context) { comment *models.Comment participants = make([]*models.User, 1, 10) ) + if ctx.Repo.Repository.IsTimetrackerEnabled() { + if ctx.IsSigned { + // Deal with the stopwatch + ctx.Data["IsStopwatchRunning"] = models.StopwatchExists(ctx.User.ID, issue.ID) + if !ctx.Data["IsStopwatchRunning"].(bool) { + var exists bool + var sw *models.Stopwatch + if exists, sw, err = models.HasUserStopwatch(ctx.User.ID); err != nil { + ctx.Handle(500, "HasUserStopwatch", err) + return + } + ctx.Data["HasUserStopwatch"] = exists + if exists { + // Add warning if the user has already a stopwatch + var otherIssue *models.Issue + if otherIssue, err = models.GetIssueByID(sw.IssueID); err != nil { + ctx.Handle(500, "GetIssueByID", err) + return + } + // Add link to the issue of the already running stopwatch + ctx.Data["OtherStopwatchURL"] = otherIssue.HTMLURL() + } + } + ctx.Data["CanUseTimetracker"] = ctx.Repo.CanUseTimetracker(issue, ctx.User) + } else { + ctx.Data["CanUseTimetracker"] = false + } + if ctx.Data["WorkingUsers"], err = models.TotalTimes(models.FindTrackedTimesOptions{IssueID: issue.ID}); err != nil { + ctx.Handle(500, "TotalTimes", err) + return + } + } // Render comments and and fetch participants. participants[0] = issue.Poster @@ -679,12 +720,14 @@ func ViewIssue(ctx *context.Context) { ctx.Data["Participants"] = participants ctx.Data["NumParticipants"] = len(participants) ctx.Data["Issue"] = issue + ctx.Data["ReadOnly"] = true ctx.Data["IsIssueOwner"] = ctx.Repo.IsWriter() || (ctx.IsSigned && issue.IsPoster(ctx.User.ID)) ctx.Data["SignInLink"] = setting.AppSubURL + "/user/login?redirect_to=" + ctx.Data["Link"].(string) ctx.HTML(200, tplIssueView) } -func getActionIssue(ctx *context.Context) *models.Issue { +// GetActionIssue will return the issue which is used in the context. +func GetActionIssue(ctx *context.Context) *models.Issue { issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) if err != nil { if models.IsErrIssueNotExist(err) { @@ -721,7 +764,7 @@ func getActionIssues(ctx *context.Context) []*models.Issue { // UpdateIssueTitle change issue's title func UpdateIssueTitle(ctx *context.Context) { - issue := getActionIssue(ctx) + issue := GetActionIssue(ctx) if ctx.Written() { return } @@ -749,7 +792,7 @@ func UpdateIssueTitle(ctx *context.Context) { // UpdateIssueContent change issue's content func UpdateIssueContent(ctx *context.Context) { - issue := getActionIssue(ctx) + issue := GetActionIssue(ctx) if ctx.Written() { return } diff --git a/routers/repo/issue_stopwatch.go b/routers/repo/issue_stopwatch.go new file mode 100644 index 000000000000..7e3121da9f7e --- /dev/null +++ b/routers/repo/issue_stopwatch.go @@ -0,0 +1,50 @@ +// Copyright 2017 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package repo + +import ( + "net/http" + + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" +) + +// IssueStopwatch creates or stops a stopwatch for the given issue. +func IssueStopwatch(c *context.Context) { + issueIndex := c.ParamsInt64("index") + issue, err := models.GetIssueByIndex(c.Repo.Repository.ID, issueIndex) + + if err != nil { + c.Handle(http.StatusInternalServerError, "GetIssueByIndex", err) + return + } + + if err := models.CreateOrStopIssueStopwatch(c.User, issue); err != nil { + c.Handle(http.StatusInternalServerError, "CreateOrStopIssueStopwatch", err) + return + } + + url := issue.HTMLURL() + c.Redirect(url, http.StatusSeeOther) +} + +// CancelStopwatch cancel the stopwatch +func CancelStopwatch(c *context.Context) { + issueIndex := c.ParamsInt64("index") + issue, err := models.GetIssueByIndex(c.Repo.Repository.ID, issueIndex) + + if err != nil { + c.Handle(http.StatusInternalServerError, "GetIssueByIndex", err) + return + } + + if err := models.CancelStopwatch(c.User, issue); err != nil { + c.Handle(http.StatusInternalServerError, "CancelStopwatch", err) + return + } + + url := issue.HTMLURL() + c.Redirect(url, http.StatusSeeOther) +} diff --git a/routers/repo/issue_timetrack.go b/routers/repo/issue_timetrack.go new file mode 100644 index 000000000000..e01cd48a66a7 --- /dev/null +++ b/routers/repo/issue_timetrack.go @@ -0,0 +1,50 @@ +// Copyright 2017 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package repo + +import ( + "net/http" + "time" + + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/context" +) + +// AddTimeManually tracks time manually +func AddTimeManually(c *context.Context, form auth.AddTimeManuallyForm) { + issueIndex := c.ParamsInt64("index") + issue, err := models.GetIssueByIndex(c.Repo.Repository.ID, issueIndex) + if err != nil { + if models.IsErrIssueNotExist(err) { + c.Handle(http.StatusNotFound, "GetIssueByIndex", err) + return + } + c.Handle(http.StatusInternalServerError, "GetIssueByIndex", err) + return + } + url := issue.HTMLURL() + + if c.HasError() { + c.Flash.Error(c.GetErrMsg()) + c.Redirect(url) + return + } + + total := time.Duration(form.Hours)*time.Hour + time.Duration(form.Minutes)*time.Minute + + if total <= 0 { + c.Flash.Error(c.Tr("repo.issues.add_time_sum_to_small")) + c.Redirect(url, http.StatusSeeOther) + return + } + + if _, err := models.AddTime(c.User, issue, int64(total)); err != nil { + c.Handle(http.StatusInternalServerError, "AddTime", err) + return + } + + c.Redirect(url, http.StatusSeeOther) +} diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 8617fedce2d8..3802dfecb335 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -125,7 +125,7 @@ func ForkPost(ctx *context.Context, form auth.CreateRepoForm) { } } - repo, err := models.ForkRepository(ctxUser, forkRepo, form.RepoName, form.Description) + repo, err := models.ForkRepository(ctx.User, ctxUser, forkRepo, form.RepoName, form.Description) if err != nil { ctx.Data["Err_RepoName"] = true switch { diff --git a/routers/repo/repo.go b/routers/repo/repo.go index 5fcbb84b9a60..ebbce1e19cd2 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -127,7 +127,7 @@ func CreatePost(ctx *context.Context, form auth.CreateRepoForm) { return } - repo, err := models.CreateRepository(ctxUser, models.CreateRepoOptions{ + repo, err := models.CreateRepository(ctx.User, ctxUser, models.CreateRepoOptions{ Name: form.RepoName, Description: form.Description, Gitignores: form.Gitignores, @@ -143,7 +143,7 @@ func CreatePost(ctx *context.Context, form auth.CreateRepoForm) { } if repo != nil { - if errDelete := models.DeleteRepository(ctxUser.ID, repo.ID); errDelete != nil { + if errDelete := models.DeleteRepository(ctx.User, ctxUser.ID, repo.ID); errDelete != nil { log.Error(4, "DeleteRepository: %v", errDelete) } } @@ -204,7 +204,7 @@ func MigratePost(ctx *context.Context, form auth.MigrateRepoForm) { return } - repo, err := models.MigrateRepository(ctxUser, models.MigrateRepoOptions{ + repo, err := models.MigrateRepository(ctx.User, ctxUser, models.MigrateRepoOptions{ Name: form.RepoName, Description: form.Description, IsPrivate: form.Private || setting.Repository.ForcePrivate, @@ -218,7 +218,7 @@ func MigratePost(ctx *context.Context, form auth.MigrateRepoForm) { } if repo != nil { - if errDelete := models.DeleteRepository(ctxUser.ID, repo.ID); errDelete != nil { + if errDelete := models.DeleteRepository(ctx.User, ctxUser.ID, repo.ID); errDelete != nil { log.Error(4, "DeleteRepository: %v", errDelete) } } diff --git a/routers/repo/setting.go b/routers/repo/setting.go index c014ce83ff9d..a94af68d1929 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -201,7 +201,10 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) { RepoID: repo.ID, Type: models.UnitTypeIssues, Index: int(models.UnitTypeIssues), - Config: new(models.UnitConfig), + Config: &models.IssuesConfig{ + EnableTimetracker: form.EnableTimetracker, + AllowOnlyContributorsToTrackTime: form.AllowOnlyContributorsToTrackTime, + }, }) } } @@ -323,7 +326,7 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) { } } - if err := models.DeleteRepository(ctx.Repo.Owner.ID, repo.ID); err != nil { + if err := models.DeleteRepository(ctx.User, ctx.Repo.Owner.ID, repo.ID); err != nil { ctx.Handle(500, "DeleteRepository", err) return } diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go index 5489d718570c..9c88b4385ef0 100644 --- a/routers/repo/webhook.go +++ b/routers/repo/webhook.go @@ -11,16 +11,15 @@ import ( "fmt" "strings" - "github.com/Unknwon/com" - "code.gitea.io/git" - api "code.gitea.io/sdk/gitea" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/auth" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/setting" + api "code.gitea.io/sdk/gitea" + + "github.com/Unknwon/com" ) const ( @@ -96,10 +95,17 @@ func WebhooksNew(ctx *context.Context) { return } - ctx.Data["HookType"] = checkHookType(ctx) + hookType := checkHookType(ctx) + ctx.Data["HookType"] = hookType if ctx.Written() { return } + if hookType == "discord" { + ctx.Data["DiscordHook"] = map[string]interface{}{ + "Username": "Gitea", + "IconURL": setting.AppURL + "img/favicon.png", + } + } ctx.Data["BaseLink"] = orCtx.Link ctx.HTML(200, orCtx.NewTemplate) @@ -115,6 +121,7 @@ func ParseHookEvent(form auth.WebhookForm) *models.HookEvent { Create: form.Create, Push: form.Push, PullRequest: form.PullRequest, + Repository: form.Repository, }, } } @@ -213,6 +220,55 @@ func GogsHooksNewPost(ctx *context.Context, form auth.NewWebhookForm) { ctx.Redirect(orCtx.Link + "/settings/hooks") } +// DiscordHooksNewPost response for creating discord hook +func DiscordHooksNewPost(ctx *context.Context, form auth.NewDiscordHookForm) { + ctx.Data["Title"] = ctx.Tr("repo.settings") + ctx.Data["PageIsSettingsHooks"] = true + ctx.Data["PageIsSettingsHooksNew"] = true + ctx.Data["Webhook"] = models.Webhook{HookEvent: &models.HookEvent{}} + + orCtx, err := getOrgRepoCtx(ctx) + if err != nil { + ctx.Handle(500, "getOrgRepoCtx", err) + return + } + + if ctx.HasError() { + ctx.HTML(200, orCtx.NewTemplate) + return + } + + meta, err := json.Marshal(&models.DiscordMeta{ + Username: form.Username, + IconURL: form.IconURL, + }) + if err != nil { + ctx.Handle(500, "Marshal", err) + return + } + + w := &models.Webhook{ + RepoID: orCtx.RepoID, + URL: form.PayloadURL, + ContentType: models.ContentTypeJSON, + HookEvent: ParseHookEvent(form.WebhookForm), + IsActive: form.Active, + HookTaskType: models.DISCORD, + Meta: string(meta), + OrgID: orCtx.OrgID, + } + if err := w.UpdateEvent(); err != nil { + ctx.Handle(500, "UpdateEvent", err) + return + } else if err := models.CreateWebhook(w); err != nil { + ctx.Handle(500, "CreateWebhook", err) + return + } + + ctx.Flash.Success(ctx.Tr("repo.settings.add_hook_success")) + ctx.Redirect(orCtx.Link + "/settings/hooks") +} + // SlackHooksNewPost response for creating slack hook func SlackHooksNewPost(ctx *context.Context, form auth.NewSlackHookForm) { ctx.Data["Title"] = ctx.Tr("repo.settings") @@ -295,6 +351,9 @@ func checkWebhook(ctx *context.Context) (*orgRepoCtx, *models.Webhook) { ctx.Data["HookType"] = "slack" case models.GOGS: ctx.Data["HookType"] = "gogs" + case models.DISCORD: + ctx.Data["DiscordHook"] = w.GetDiscordHook() + ctx.Data["HookType"] = "discord" default: ctx.Data["HookType"] = "gitea" } @@ -443,8 +502,58 @@ func SlackHooksEditPost(ctx *context.Context, form auth.NewSlackHookForm) { ctx.Redirect(fmt.Sprintf("%s/settings/hooks/%d", orCtx.Link, w.ID)) } +// DiscordHooksEditPost response for editing discord hook +func DiscordHooksEditPost(ctx *context.Context, form auth.NewDiscordHookForm) { + ctx.Data["Title"] = ctx.Tr("repo.settings") + ctx.Data["PageIsSettingsHooks"] = true + ctx.Data["PageIsSettingsHooksEdit"] = true + + orCtx, w := checkWebhook(ctx) + if ctx.Written() { + return + } + ctx.Data["Webhook"] = w + + if ctx.HasError() { + ctx.HTML(200, orCtx.NewTemplate) + return + } + + meta, err := json.Marshal(&models.DiscordMeta{ + Username: form.Username, + IconURL: form.IconURL, + }) + if err != nil { + ctx.Handle(500, "Marshal", err) + return + } + + w.URL = form.PayloadURL + w.Meta = string(meta) + w.HookEvent = ParseHookEvent(form.WebhookForm) + w.IsActive = form.Active + if err := w.UpdateEvent(); err != nil { + ctx.Handle(500, "UpdateEvent", err) + return + } else if err := models.UpdateWebhook(w); err != nil { + ctx.Handle(500, "UpdateWebhook", err) + return + } + + ctx.Flash.Success(ctx.Tr("repo.settings.update_hook_success")) + ctx.Redirect(fmt.Sprintf("%s/settings/hooks/%d", orCtx.Link, w.ID)) +} + // TestWebhook test if web hook is work fine func TestWebhook(ctx *context.Context) { + hookID := ctx.ParamsInt64(":id") + w, err := models.GetWebhookByRepoID(ctx.Repo.Repository.ID, hookID) + if err != nil { + ctx.Flash.Error("GetWebhookByID: " + err.Error()) + ctx.Status(500) + return + } + // Grab latest commit or fake one if it's empty repository. commit := ctx.Repo.Commit if commit == nil { @@ -481,8 +590,8 @@ func TestWebhook(ctx *context.Context) { Pusher: apiUser, Sender: apiUser, } - if err := models.PrepareWebhooks(ctx.Repo.Repository, models.HookEventPush, p); err != nil { - ctx.Flash.Error("PrepareWebhooks: " + err.Error()) + if err := models.PrepareWebhook(w, ctx.Repo.Repository, models.HookEventPush, p); err != nil { + ctx.Flash.Error("PrepareWebhook: " + err.Error()) ctx.Status(500) } else { go models.HookQueue.Add(ctx.Repo.Repository.ID) diff --git a/routers/routes/routes.go b/routers/routes/routes.go index be80184deb8e..c69c4e9e4c36 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -136,6 +136,20 @@ func RegisterRoutes(m *macaron.Macaron) { bindIgnErr := binding.BindIgnErr validation.AddBindingRules() + openIDSignInEnabled := func(ctx *context.Context) { + if !setting.Service.EnableOpenIDSignIn { + ctx.Error(403) + return + } + } + + openIDSignUpEnabled := func(ctx *context.Context) { + if !setting.Service.EnableOpenIDSignUp { + ctx.Error(403) + return + } + } + m.Use(user.GetNotificationCount) // FIXME: not all routes need go through same middlewares. @@ -163,19 +177,21 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/user", func() { m.Get("/login", user.SignIn) m.Post("/login", bindIgnErr(auth.SignInForm{}), user.SignInPost) - if setting.Service.EnableOpenIDSignIn { + m.Group("", func() { m.Combo("/login/openid"). Get(user.SignInOpenID). Post(bindIgnErr(auth.SignInOpenIDForm{}), user.SignInOpenIDPost) - m.Group("/openid", func() { - m.Combo("/connect"). - Get(user.ConnectOpenID). - Post(bindIgnErr(auth.ConnectOpenIDForm{}), user.ConnectOpenIDPost) - m.Combo("/register"). - Get(user.RegisterOpenID). + }, openIDSignInEnabled) + m.Group("/openid", func() { + m.Combo("/connect"). + Get(user.ConnectOpenID). + Post(bindIgnErr(auth.ConnectOpenIDForm{}), user.ConnectOpenIDPost) + m.Group("/register", func() { + m.Combo(""). + Get(user.RegisterOpenID, openIDSignUpEnabled). Post(bindIgnErr(auth.SignUpOpenIDForm{}), user.RegisterOpenIDPost) - }) - } + }, openIDSignUpEnabled) + }, openIDSignInEnabled) m.Get("/sign_up", user.SignUp) m.Post("/sign_up", bindIgnErr(auth.RegisterForm{}), user.SignUpPost) m.Get("/reset_password", user.ResetPasswd) @@ -206,15 +222,12 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/email/delete", user.DeleteEmail) m.Get("/password", user.SettingsPassword) m.Post("/password", bindIgnErr(auth.ChangePasswordForm{}), user.SettingsPasswordPost) - if setting.Service.EnableOpenIDSignIn { - m.Group("/openid", func() { - m.Combo("").Get(user.SettingsOpenID). - Post(bindIgnErr(auth.AddOpenIDForm{}), user.SettingsOpenIDPost) - m.Post("/delete", user.DeleteOpenID) - m.Post("/toggle_visibility", user.ToggleOpenIDVisibility) - }) - } - + m.Group("/openid", func() { + m.Combo("").Get(user.SettingsOpenID). + Post(bindIgnErr(auth.AddOpenIDForm{}), user.SettingsOpenIDPost) + m.Post("/delete", user.DeleteOpenID) + m.Post("/toggle_visibility", user.ToggleOpenIDVisibility) + }, openIDSignInEnabled) m.Combo("/keys").Get(user.SettingsKeys). Post(bindIgnErr(auth.AddKeyForm{}), user.SettingsKeysPost) m.Post("/keys/delete", user.DeleteKey) @@ -383,10 +396,12 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/gitea/new", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksNewPost) m.Post("/gogs/new", bindIgnErr(auth.NewGogshookForm{}), repo.GogsHooksNewPost) m.Post("/slack/new", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksNewPost) + m.Post("/discord/new", bindIgnErr(auth.NewDiscordHookForm{}), repo.DiscordHooksNewPost) m.Get("/:id", repo.WebHooksEdit) m.Post("/gitea/:id", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksEditPost) m.Post("/gogs/:id", bindIgnErr(auth.NewGogshookForm{}), repo.GogsHooksEditPost) m.Post("/slack/:id", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksEditPost) + m.Post("/discord/:id", bindIgnErr(auth.NewDiscordHookForm{}), repo.DiscordHooksEditPost) }) m.Route("/delete", "GET,POST", org.SettingsDelete) @@ -429,11 +444,13 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/gitea/new", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksNewPost) m.Post("/gogs/new", bindIgnErr(auth.NewGogshookForm{}), repo.GogsHooksNewPost) m.Post("/slack/new", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksNewPost) + m.Post("/discord/new", bindIgnErr(auth.NewDiscordHookForm{}), repo.DiscordHooksNewPost) m.Get("/:id", repo.WebHooksEdit) m.Post("/:id/test", repo.TestWebhook) m.Post("/gitea/:id", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksEditPost) m.Post("/gogs/:id", bindIgnErr(auth.NewGogshookForm{}), repo.GogsHooksNewPost) m.Post("/slack/:id", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksEditPost) + m.Post("/discord/:id", bindIgnErr(auth.NewDiscordHookForm{}), repo.DiscordHooksEditPost) m.Group("/git", func() { m.Get("", repo.GitHooks) @@ -469,6 +486,19 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/addDependency", repo.AddDependency) m.Post("/removeDependency", repo.RemoveDependency) m.Combo("/comments").Post(bindIgnErr(auth.CreateCommentForm{}), repo.NewComment) + m.Group("/times", func() { + m.Post("/add", bindIgnErr(auth.AddTimeManuallyForm{}), repo.AddTimeManually) + m.Group("/stopwatch", func() { + m.Post("/toggle", repo.IssueStopwatch) + m.Post("/cancel", repo.CancelStopwatch) + }) + + }, func(ctx *context.Context) { + if !ctx.Repo.CanUseTimetracker(repo.GetActionIssue(ctx), ctx.User) { + ctx.Handle(404, ctx.Req.RequestURI, nil) + return + } + }) }) m.Post("/labels", repo.UpdateIssueLabel, reqRepoWriter) @@ -582,7 +612,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/*", repo.WikiRaw) }, repo.MustEnableWiki, context.CheckUnit(models.UnitTypeWiki), context.CheckUnit(models.UnitTypeWiki)) - m.Get("/archive/*", repo.MustBeNotBare, repo.Download, context.CheckUnit(models.UnitTypeCode)) + m.Get("/archive/*", repo.MustBeNotBare, context.CheckUnit(models.UnitTypeCode), repo.Download) m.Group("/pulls/:index", func() { m.Get("/commits", context.RepoRef(), repo.ViewPullCommits) @@ -602,10 +632,11 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/src/*", repo.SetEditorconfigIfExists, repo.Home) m.Get("/forks", repo.Forks) }, context.RepoRef(), context.CheckUnit(models.UnitTypeCode)) - m.Get("/commit/:sha([a-f0-9]{7,40})\\.:ext(patch|diff)", repo.MustBeNotBare, repo.RawDiff, context.CheckUnit(models.UnitTypeCode)) + m.Get("/commit/:sha([a-f0-9]{7,40})\\.:ext(patch|diff)", + repo.MustBeNotBare, context.CheckUnit(models.UnitTypeCode), repo.RawDiff) m.Get("/compare/:before([a-z0-9]{40})\\.\\.\\.:after([a-z0-9]{40})", repo.SetEditorconfigIfExists, - repo.SetDiffViewStyle, repo.MustBeNotBare, repo.CompareDiff, context.CheckUnit(models.UnitTypeCode)) + repo.SetDiffViewStyle, repo.MustBeNotBare, context.CheckUnit(models.UnitTypeCode), repo.CompareDiff) }, ignSignIn, context.RepoAssignment(), context.UnitTypes(), context.LoadRepoUnits()) m.Group("/:username/:reponame", func() { m.Get("/stars", repo.Stars) diff --git a/routers/user/auth.go b/routers/user/auth.go index f1aa9d26a8eb..eb41e2f99444 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -154,8 +154,10 @@ func SignInPost(ctx *context.Context, form auth.SignInForm) { if err != nil { if models.IsErrUserNotExist(err) { ctx.RenderWithErr(ctx.Tr("form.username_password_incorrect"), tplSignIn, &form) + log.Info("Failed authentication attempt for %s from %s", form.UserName, ctx.RemoteAddr()) } else if models.IsErrEmailAlreadyUsed(err) { ctx.RenderWithErr(ctx.Tr("form.email_been_used"), tplSignIn, &form) + log.Info("Failed authentication attempt for %s from %s", form.UserName, ctx.RemoteAddr()) } else { ctx.Handle(500, "UserSignIn", err) } @@ -340,8 +342,8 @@ func handleSignInFull(ctx *context.Context, u *models.User, remember bool, obeyR // Register last login u.SetLastLogin() - if err := models.UpdateUser(u); err != nil { - ctx.Handle(500, "UpdateUser", err) + if err := models.UpdateUserCols(u, "last_login_unix"); err != nil { + ctx.Handle(500, "UpdateUserCols", err) return } @@ -430,8 +432,8 @@ func handleOAuth2SignIn(u *models.User, gothUser goth.User, ctx *context.Context // Register last login u.SetLastLogin() - if err := models.UpdateUser(u); err != nil { - ctx.Handle(500, "UpdateUser", err) + if err := models.UpdateUserCols(u, "last_login_unix"); err != nil { + ctx.Handle(500, "UpdateUserCols", err) return } @@ -666,7 +668,8 @@ func LinkAccountPostRegister(ctx *context.Context, cpt *captcha.Captcha, form au if models.CountUsers() == 1 { u.IsAdmin = true u.IsActive = true - if err := models.UpdateUser(u); err != nil { + u.SetLastLogin() + if err := models.UpdateUserCols(u, "is_admin", "is_active", "last_login_unix"); err != nil { ctx.Handle(500, "UpdateUser", err) return } @@ -781,7 +784,8 @@ func SignUpPost(ctx *context.Context, cpt *captcha.Captcha, form auth.RegisterFo if models.CountUsers() == 1 { u.IsAdmin = true u.IsActive = true - if err := models.UpdateUser(u); err != nil { + u.SetLastLogin() + if err := models.UpdateUserCols(u, "is_admin", "is_active", "last_login_unix"); err != nil { ctx.Handle(500, "UpdateUser", err) return } @@ -840,7 +844,7 @@ func Activate(ctx *context.Context) { ctx.Handle(500, "UpdateUser", err) return } - if err := models.UpdateUser(user); err != nil { + if err := models.UpdateUserCols(user, "is_active", "rands"); err != nil { if models.IsErrUserNotExist(err) { ctx.Error(404) } else { @@ -991,7 +995,7 @@ func ResetPasswdPost(ctx *context.Context) { return } u.EncodePasswd() - if err := models.UpdateUser(u); err != nil { + if err := models.UpdateUserCols(u, "passwd", "rands", "salt"); err != nil { ctx.Handle(500, "UpdateUser", err) return } diff --git a/routers/user/auth_openid.go b/routers/user/auth_openid.go index ff03e538f8cc..a5124680dd4d 100644 --- a/routers/user/auth_openid.go +++ b/routers/user/auth_openid.go @@ -259,6 +259,7 @@ func ConnectOpenID(ctx *context.Context) { // ConnectOpenIDPost handles submission of a form to connect an OpenID URI to an existing account func ConnectOpenIDPost(ctx *context.Context, form auth.ConnectOpenIDForm) { + oid, _ := ctx.Session.Get("openid_verified_uri").(string) if oid == "" { ctx.Redirect(setting.AppSubURL + "/user/login/openid") @@ -300,10 +301,6 @@ func ConnectOpenIDPost(ctx *context.Context, form auth.ConnectOpenIDForm) { // RegisterOpenID shows a form to create a new user authenticated via an OpenID URI func RegisterOpenID(ctx *context.Context) { - if !setting.Service.EnableOpenIDSignUp { - ctx.Error(403) - return - } oid, _ := ctx.Session.Get("openid_verified_uri").(string) if oid == "" { ctx.Redirect(setting.AppSubURL + "/user/login/openid") @@ -328,10 +325,6 @@ func RegisterOpenID(ctx *context.Context) { // RegisterOpenIDPost handles submission of a form to create a new user authenticated via an OpenID URI func RegisterOpenIDPost(ctx *context.Context, cpt *captcha.Captcha, form auth.SignUpOpenIDForm) { - if !setting.Service.EnableOpenIDSignUp { - ctx.Error(403) - return - } oid, _ := ctx.Session.Get("openid_verified_uri").(string) if oid == "" { ctx.Redirect(setting.AppSubURL + "/user/login/openid") @@ -404,7 +397,8 @@ func RegisterOpenIDPost(ctx *context.Context, cpt *captcha.Captcha, form auth.Si if models.CountUsers() == 1 { u.IsAdmin = true u.IsActive = true - if err := models.UpdateUser(u); err != nil { + u.SetLastLogin() + if err := models.UpdateUserCols(u, "is_admin", "is_active", "last_login_unix"); err != nil { ctx.Handle(500, "UpdateUser", err) return } diff --git a/routers/user/home.go b/routers/user/home.go index b2096bc2ceea..c2c6a67018ea 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -19,7 +19,7 @@ import ( ) const ( - tplDashborad base.TplName = "user/dashboard/dashboard" + tplDashboard base.TplName = "user/dashboard/dashboard" tplIssues base.TplName = "user/dashboard/issues" tplProfile base.TplName = "user/profile" tplOrgHome base.TplName = "org/home" @@ -54,24 +54,14 @@ func getDashboardContextUser(ctx *context.Context) *models.User { } // retrieveFeeds loads feeds for the specified user -func retrieveFeeds(ctx *context.Context, user *models.User, includePrivate, isProfile bool, includeDeletedComments bool) { - var requestingID int64 - if ctx.User != nil { - requestingID = ctx.User.ID - } - actions, err := models.GetFeeds(models.GetFeedsOptions{ - RequestedUser: user, - RequestingUserID: requestingID, - IncludePrivate: includePrivate, - OnlyPerformedBy: isProfile, - IncludeDeleted: includeDeletedComments, - }) +func retrieveFeeds(ctx *context.Context, options models.GetFeedsOptions) { + actions, err := models.GetFeeds(options) if err != nil { ctx.Handle(500, "GetFeeds", err) return } - userCache := map[int64]*models.User{user.ID: user} + userCache := map[int64]*models.User{options.RequestedUser.ID: options.RequestedUser} if ctx.User != nil { userCache[ctx.User.ID] = ctx.User } @@ -131,33 +121,16 @@ func Dashboard(ctx *context.Context) { ctx.Data["Title"] = ctxUser.DisplayName() + " - " + ctx.Tr("dashboard") ctx.Data["PageIsDashboard"] = true ctx.Data["PageIsNews"] = true - - // Only user can have collaborative repositories. - if !ctxUser.IsOrganization() { - collaborateRepos, err := ctx.User.GetAccessibleRepositories(setting.UI.User.RepoPagingNum) - if err != nil { - ctx.Handle(500, "GetAccessibleRepositories", err) - return - } else if err = models.RepositoryList(collaborateRepos).LoadAttributes(); err != nil { - ctx.Handle(500, "RepositoryList.LoadAttributes", err) - return - } - ctx.Data["CollaborativeRepos"] = collaborateRepos - } + ctx.Data["SearchLimit"] = setting.UI.User.RepoPagingNum var err error - var repos, mirrors []*models.Repository + var mirrors []*models.Repository if ctxUser.IsOrganization() { env, err := ctxUser.AccessibleReposEnv(ctx.User.ID) if err != nil { ctx.Handle(500, "AccessibleReposEnv", err) return } - repos, err = env.Repos(1, setting.UI.User.RepoPagingNum) - if err != nil { - ctx.Handle(500, "env.Repos", err) - return - } mirrors, err = env.MirrorRepos() if err != nil { @@ -165,19 +138,12 @@ func Dashboard(ctx *context.Context) { return } } else { - if err = ctxUser.GetRepositories(1, setting.UI.User.RepoPagingNum); err != nil { - ctx.Handle(500, "GetRepositories", err) - return - } - repos = ctxUser.Repos - mirrors, err = ctxUser.GetMirrorRepositories() if err != nil { ctx.Handle(500, "GetMirrorRepositories", err) return } } - ctx.Data["Repos"] = repos ctx.Data["MaxShowRepoNum"] = setting.UI.User.RepoPagingNum if err := models.MirrorRepositoryList(mirrors).LoadAttributes(); err != nil { @@ -187,11 +153,15 @@ func Dashboard(ctx *context.Context) { ctx.Data["MirrorCount"] = len(mirrors) ctx.Data["Mirrors"] = mirrors - retrieveFeeds(ctx, ctxUser, true, false, false) + retrieveFeeds(ctx, models.GetFeedsOptions{RequestedUser: ctxUser, + IncludePrivate: true, + OnlyPerformedBy: false, + IncludeDeleted: false, + }) if ctx.Written() { return } - ctx.HTML(200, tplDashborad) + ctx.HTML(200, tplDashboard) } // Issues render the user issues page diff --git a/routers/user/profile.go b/routers/user/profile.go index c7d761052e85..23f5057727ca 100644 --- a/routers/user/profile.go +++ b/routers/user/profile.go @@ -138,7 +138,11 @@ func Profile(ctx *context.Context) { ctx.Data["Keyword"] = keyword switch tab { case "activity": - retrieveFeeds(ctx, ctxUser, showPrivate, true, false) + retrieveFeeds(ctx, models.GetFeedsOptions{RequestedUser: ctxUser, + IncludePrivate: showPrivate, + OnlyPerformedBy: true, + IncludeDeleted: false, + }) if ctx.Written() { return } @@ -200,13 +204,14 @@ func Profile(ctx *context.Context) { ctx.Data["Total"] = total } else { repos, count, err = models.SearchRepositoryByName(&models.SearchRepoOptions{ - Keyword: keyword, - OwnerID: ctxUser.ID, - OrderBy: orderBy, - Private: showPrivate, - Page: page, - IsProfile: true, - PageSize: setting.UI.User.RepoPagingNum, + Keyword: keyword, + OwnerID: ctxUser.ID, + OrderBy: orderBy, + Private: showPrivate, + Page: page, + IsProfile: true, + PageSize: setting.UI.User.RepoPagingNum, + Collaborate: true, }) if err != nil { ctx.Handle(500, "SearchRepositoryByName", err) @@ -219,6 +224,8 @@ func Profile(ctx *context.Context) { } } + ctx.Data["ShowUserEmail"] = setting.UI.ShowUserEmail + ctx.HTML(200, tplProfile) } diff --git a/routers/user/setting.go b/routers/user/setting.go index b6bd4ed5c22c..2c951eaf5fe3 100644 --- a/routers/user/setting.go +++ b/routers/user/setting.go @@ -156,7 +156,7 @@ func UpdateAvatarSetting(ctx *context.Context, form auth.AvatarForm, ctxUser *mo } } - if err := models.UpdateUser(ctxUser); err != nil { + if err := models.UpdateUserCols(ctxUser, "avatar", "avatar_email", "use_custom_avatar"); err != nil { return fmt.Errorf("UpdateUser: %v", err) } @@ -221,7 +221,7 @@ func SettingsPasswordPost(ctx *context.Context, form auth.ChangePasswordForm) { return } ctx.User.EncodePasswd() - if err := models.UpdateUser(ctx.User); err != nil { + if err := models.UpdateUserCols(ctx.User, "salt", "passwd"); err != nil { ctx.Handle(500, "UpdateUser", err) return } @@ -378,9 +378,9 @@ func SettingsKeysPost(ctx *context.Context, form auth.AddKeyForm) { case models.IsErrGPGKeyIDAlreadyUsed(err): ctx.Data["Err_Content"] = true ctx.RenderWithErr(ctx.Tr("settings.gpg_key_id_used"), tplSettingsKeys, &form) - case models.IsErrGPGEmailNotFound(err): + case models.IsErrGPGNoEmailFound(err): ctx.Data["Err_Content"] = true - ctx.RenderWithErr(ctx.Tr("settings.gpg_key_email_not_found", err.(models.ErrGPGEmailNotFound).Email), tplSettingsKeys, &form) + ctx.RenderWithErr(ctx.Tr("settings.gpg_no_key_email_found"), tplSettingsKeys, &form) default: ctx.Handle(500, "AddPublicKey", err) } @@ -583,7 +583,7 @@ func twofaGenerateSecretAndQr(ctx *context.Context) bool { if otpKey == nil { err = nil // clear the error, in case the URL was invalid otpKey, err = totp.Generate(totp.GenerateOpts{ - Issuer: setting.AppName, + Issuer: setting.AppName + " (" + strings.TrimRight(setting.AppURL, "/") + ")", AccountName: ctx.User.Name, }) if err != nil { diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index f9038e1425a5..b57b1847f68c 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -132,6 +132,10 @@
{{.i18n.Tr "admin.config.default_allow_create_organization"}}
+
{{.i18n.Tr "admin.config.default_enable_timetracking"}}
+
+
{{.i18n.Tr "admin.config.default_allow_only_contributors_to_track_time"}}
+
{{.i18n.Tr "admin.config.no_reply_address"}}
{{if .Service.NoReplyAddress}}{{.Service.NoReplyAddress}}{{else}}-{{end}}
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index 4feeef302a40..ae7cb56616f4 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -86,7 +86,7 @@
- +
diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 923f39e85bb0..be1c28b761cc 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -22,49 +22,49 @@ {{end}}
- Javascript licenses + Javascript licenses API {{.i18n.Tr "website"}} {{if (or .ShowFooterVersion .PageIsAdmin)}}{{GoVer}}{{end}}
- - + + {{if .RequireSimpleMDE}} - - - + + + {{end}} {{if .RequireGitGraph}} - + {{end}} - - - - {{if .RequireHighlightJS}} - + {{end}} {{if .RequireMinicolors}} - + {{end}} {{if .RequireDatetimepicker}} - + {{end}} {{if .RequireDropzone}} - + {{end}} - - - - + + + + + + + + - + \ No newline at end of file diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index bb6f1ecaf521..edb7b2003da7 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -17,45 +17,82 @@ {{if .ContextUser}} {{end}} + {{if .SearchLimit}} + + {{end}} {{if .GoGetImport}} {{end}} + + - - - + + + {{if .RequireSimpleMDE}} - + {{end}} {{if .RequireGitGraph}} - + {{end}} - + {{if .RequireHighlightJS}} - + {{end}} {{if .RequireMinicolors}} - + {{end}} {{if .RequireDatetimepicker}} - + {{end}} {{if .RequireDropzone}} - + {{end}} - - + + {{if .PageIsUserProfile}} diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index 76ed6491f476..9686e9dca31b 100644 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -2,7 +2,7 @@ {{range .Repos}}
- {{if or $.PageIsExplore $.PageIsProfileStarList }}{{.Owner.Name}} / {{end}}{{.Name}} + {{if or $.PageIsExplore $.PageIsProfileStarList }}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}} {{if .IsPrivate}} {{else if .IsFork}} diff --git a/templates/install.tmpl b/templates/install.tmpl index ede1d4399f38..924eb2837c8e 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -188,12 +188,24 @@
+
+
+ + +
+
+
+
+ + +
+
@@ -218,6 +230,12 @@
+
+
+ + +
+
diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl index 8d55e80ea86e..1710713f94e1 100644 --- a/templates/org/settings/hook_new.tmpl +++ b/templates/org/settings/hook_new.tmpl @@ -22,6 +22,7 @@ {{template "repo/settings/hook_gitea" .}} {{template "repo/settings/hook_gogs" .}} {{template "repo/settings/hook_slack" .}} + {{template "repo/settings/hook_discord" .}}
{{template "repo/settings/hook_history" .}} diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl index ae09b25246a4..063006314baa 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -1,6 +1,6 @@
-
+
{{if .IsViewBranch}}{{.i18n.Tr "repo.branch"}}{{else}}{{.i18n.Tr "repo.tree"}}{{end}}: diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 40675d75b837..5495b110b79f 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -54,7 +54,7 @@ {{else}}

-
+
{{if $file.IsBin}} {{$.i18n.Tr "repo.diff.bin"}} {{else if not $file.IsRenamed}} @@ -68,13 +68,11 @@
{{if $file.IsRenamed}}{{$file.OldName}} → {{end}}{{$file.Name}}{{if .IsLFSFile}} ({{$.i18n.Tr "repo.stored_lfs"}}){{end}} {{if not $file.IsSubmodule}} -
- {{if $file.IsDeleted}} - {{$.i18n.Tr "repo.diff.view_file"}} - {{else}} - {{$.i18n.Tr "repo.diff.view_file"}} - {{end}} -
+ {{if $file.IsDeleted}} + {{$.i18n.Tr "repo.diff.view_file"}} + {{else}} + {{$.i18n.Tr "repo.diff.view_file"}} + {{end}} {{end}}

diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 7c91000488fd..2ed93d1d930a 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -81,12 +81,12 @@ {{if and (.Repository.UnitEnabled $.UnitTypeReleases) (not .IsBareRepo) }} - {{.i18n.Tr "repo.releases"}} {{.Repository.NumTags}} + {{.i18n.Tr "repo.releases"}} {{.Repository.NumReleases}} {{end}} {{if or (.Repository.UnitEnabled $.UnitTypeWiki) (.Repository.UnitEnabled $.UnitTypeExternalWiki)}} - + {{.i18n.Tr "repo.wiki"}} {{end}} diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 24ce082da6a5..f3feb149c6f7 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -11,27 +11,14 @@ {{if .PullRequestCtx.Allowed}}
- +
{{end}} {{template "repo/branch_dropdown" .}} -
- - {{EllipsisString .Repository.Name 30}} - {{ $n := len .TreeNames}} - {{ $l := Subtract $n 1}} - {{range $i, $v := .TreeNames}} - / - {{if eq $i $l}} - {{EllipsisString $v 30}} - {{else}} - {{ $p := index $.Paths $i}} - {{EllipsisString $v 30}} - {{end}} - {{end}} - -
+ {{ $n := len .TreeNames}} + {{ $l := Subtract $n 1}} +
{{EllipsisString .Repository.Name 30}}{{range $i, $v := .TreeNames}}/{{if eq $i $l}}{{EllipsisString $v 30}}{{else}}{{ $p := index $.Paths $i}}{{EllipsisString $v 30}}{{end}}{{end}}
{{if .Repository.CanEnableEditor}}
@@ -48,9 +35,9 @@
{{end}} - + {{if eq $n 0}} -
+
{{if not $.DisableHTTP}} + +
+
+ {{end}} + {{if .Repository.IsTimetrackerEnabled }} + {{if .CanUseTimetracker }} +
+
+ {{.i18n.Tr "repo.issues.tracker"}} +
+
+ {{$.CsrfTokenHtml}} +
+
+ {{$.CsrfTokenHtml}} +
+ {{if $.IsStopwatchRunning}} +
+ + +
{{else}} - - {{.i18n.Tr "repo.issues.subscribe"}} + {{if .HasUserStopwatch}} +
+ {{.i18n.Tr "repo.issues.tracking_already_started" .OtherStopwatchURL | Safe}} +
+ {{end}} +
+ + +
+
{{.i18n.Tr "repo.issues.add_time"}}
+
+
+ {{$.CsrfTokenHtml}} + + +
+
+
+
{{.i18n.Tr "repo.issues.add_time_short"}}
+
{{.i18n.Tr "repo.issues.add_time_cancel"}}
+
+
+
{{end}} - - -
-
+
+
+ {{end}} + {{if gt (len .WorkingUsers) 0}} +
+
+ {{.i18n.Tr "repo.issues.time_spent_total"}} +
+ {{range $user, $trackedtime := .WorkingUsers}} +
+ + + +
+ {{$user.DisplayName}} +
+ {{$trackedtime}} +
+
+
+ {{end}} +
+
+ {{end}} {{end}} {{if .IssueDependenciesEnabled}} diff --git a/templates/repo/settings/hook_discord.tmpl b/templates/repo/settings/hook_discord.tmpl new file mode 100644 index 000000000000..901e7e6311fe --- /dev/null +++ b/templates/repo/settings/hook_discord.tmpl @@ -0,0 +1,19 @@ +{{if eq .HookType "discord"}} +

{{.i18n.Tr "repo.settings.add_discord_hook_desc" "https://discordapp.com" | Str2html}}

+
+ {{.CsrfTokenHtml}} +
+ + +
+
+ + +
+
+ + +
+ {{template "repo/settings/hook_settings" .}} +
+{{end}} diff --git a/templates/repo/settings/hook_gitea.tmpl b/templates/repo/settings/hook_gitea.tmpl index 4ac6d718c962..fc5e35e068de 100644 --- a/templates/repo/settings/hook_gitea.tmpl +++ b/templates/repo/settings/hook_gitea.tmpl @@ -1,5 +1,5 @@ {{if eq .HookType "gitea"}} -

{{.i18n.Tr "repo.settings.add_webhook_desc" "https://docs.gitea.io/features/webhook.html" | Str2html}}

+

{{.i18n.Tr "repo.settings.add_webhook_desc" "https://docs.gitea.io/en-us/webhooks/" | Str2html}}

{{.CsrfTokenHtml}}
diff --git a/templates/repo/settings/hook_gogs.tmpl b/templates/repo/settings/hook_gogs.tmpl index a8145f278976..28098d14ec6e 100644 --- a/templates/repo/settings/hook_gogs.tmpl +++ b/templates/repo/settings/hook_gogs.tmpl @@ -1,5 +1,5 @@ {{if eq .HookType "gogs"}} -

{{.i18n.Tr "repo.settings.add_webhook_desc" "https://docs.gitea.io/features/webhook.html" | Str2html}}

+

{{.i18n.Tr "repo.settings.add_webhook_desc" "https://docs.gitea.io/en-us/webhooks/" | Str2html}}

{{.CsrfTokenHtml}}
diff --git a/templates/repo/settings/hook_list.tmpl b/templates/repo/settings/hook_list.tmpl index 45ef70ecad9a..dce3439096cc 100644 --- a/templates/repo/settings/hook_list.tmpl +++ b/templates/repo/settings/hook_list.tmpl @@ -14,6 +14,9 @@ Slack + + Discord +
diff --git a/templates/repo/settings/hook_new.tmpl b/templates/repo/settings/hook_new.tmpl index cbb52680cde9..a40eb9e4280a 100644 --- a/templates/repo/settings/hook_new.tmpl +++ b/templates/repo/settings/hook_new.tmpl @@ -13,6 +13,8 @@ {{else if eq .HookType "slack"}} + {{else if eq .HookType "discord"}} + {{end}}
@@ -20,6 +22,7 @@ {{template "repo/settings/hook_gitea" .}} {{template "repo/settings/hook_gogs" .}} {{template "repo/settings/hook_slack" .}} + {{template "repo/settings/hook_discord" .}}
{{template "repo/settings/hook_history" .}} diff --git a/templates/repo/settings/hook_settings.tmpl b/templates/repo/settings/hook_settings.tmpl index e0c687dbaeda..7f3406588fa7 100644 --- a/templates/repo/settings/hook_settings.tmpl +++ b/templates/repo/settings/hook_settings.tmpl @@ -52,6 +52,16 @@
+ +
+
+
+ + + {{.i18n.Tr "repo.settings.event_repository_desc"}} +
+
+
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index a57378f28763..742e6f225960 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -134,10 +134,25 @@
- +
+
+
+
+ + +
+
+
+
+ + + +
+
+
@@ -146,7 +161,7 @@
- +
diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 9382bb075e0b..36fccb00b345 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -48,7 +48,7 @@ {{.i18n.Tr "repo.video_not_supported_in_browser"}} {{else if .IsPDFFile}} - + {{else}} {{.i18n.Tr "repo.file_view_raw"}} {{end}} diff --git a/templates/swagger.tmpl b/templates/swagger.tmpl index 405db4f235e1..8bcc1c5340a6 100644 --- a/templates/swagger.tmpl +++ b/templates/swagger.tmpl @@ -5,9 +5,9 @@ Swagger UI - - - + + +