diff options
52 files changed, 2014 insertions, 580 deletions
diff --git a/cmd/serve.go b/cmd/serve.go index 9638da8b..ec1da3be 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -146,12 +146,12 @@ func runServ(c *cli.Context) { fail("Key permission denied", "Cannot push with deployment key: %d", key.ID) } // Check if this deploy key belongs to current repository. - if !models.HasDeployKey(key.ID, repo.Id) { - fail("Key access denied", "Key access denied: %d-%d", key.ID, repo.Id) + if !models.HasDeployKey(key.ID, repo.ID) { + fail("Key access denied", "Key access denied: %d-%d", key.ID, repo.ID) } // Update deploy key activity. - deployKey, err := models.GetDeployKeyByRepo(key.ID, repo.Id) + deployKey, err := models.GetDeployKeyByRepo(key.ID, repo.ID) if err != nil { fail("Internal error", "GetDeployKey: %v", err) } @@ -419,8 +419,8 @@ func runWeb(ctx *cli.Context) { m.Get("/action/:action", repo.Action) m.Group("/issues", func() { - m.Get("/new", repo.CreateIssue) - m.Post("/new", bindIgnErr(auth.CreateIssueForm{}), repo.CreateIssuePost) + m.Combo("/new").Get(repo.NewIssue). + Post(bindIgnErr(auth.CreateIssueForm{}), repo.NewIssuePost) m.Post("/:index", bindIgnErr(auth.CreateIssueForm{}), repo.UpdateIssue) m.Post("/:index/label", repo.UpdateIssueLabel) m.Post("/:index/milestone", repo.UpdateIssueMilestone) @@ -449,6 +449,8 @@ func runWeb(ctx *cli.Context) { m.Get("/edit/:tagname", repo.EditRelease) m.Post("/edit/:tagname", bindIgnErr(auth.EditReleaseForm{}), repo.EditReleasePost) }, reqRepoAdmin, middleware.RepoRef()) + + m.Combo("/compare/*").Get(repo.CompareAndPullRequest) }, reqSignIn, middleware.RepoAssignment(true)) m.Group("/:username/:reponame", func() { @@ -469,7 +471,7 @@ func runWeb(ctx *cli.Context) { m.Get("/commit/*", repo.Diff) }, middleware.RepoRef()) - m.Get("/compare/:before([a-z0-9]+)...:after([a-z0-9]+)", repo.CompareDiff) + m.Get("/compare/:before([a-z0-9]{40})...:after([a-z0-9]{40})", repo.CompareDiff) }, ignSignIn, middleware.RepoAssignment(true)) m.Group("/:username", func() { diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 3b26d3fc..528ab9fe 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -372,6 +372,18 @@ commits.older = Older commits.newer = Newer issues.new = New Issue +issues.new.labels = Labels +issues.new.no_label = No Label +issues.new.clear_labels = Clear labels +issues.new.milestone = Milestone +issues.new.no_milestone = No Milestone +issues.new.clear_milestone = Clear milestone +issues.new.open_milestone = Open Milestones +issues.new.closed_milestone = Closed Milestones +issues.new.assignee = Assignee +issues.new.clear_assignee = Clear assignee +issues.new.no_assignee = No assignee +issues.create = Create Issue issues.new_label = New Label issues.new_label_placeholder = Label name... issues.create_label = Create Label @@ -401,6 +413,10 @@ issues.label_deletion = Label Deletion issues.label_deletion_desc = Delete this label will remove its information in all related issues. Do you want to continue? issues.label_deletion_success = Label has been deleted successfully! +pulls.compare_changes = Compare Changes +pulls.compare_changes_desc = Compare two branches and make a pull request for changes. +pulls.no_results = No results found. + milestones.new = New Milestone milestones.open_tab = %d Open milestones.close_tab = %d Closed diff --git a/config.codekit b/config.codekit index 120180d3..f24f204f 100644 --- a/config.codekit +++ b/config.codekit @@ -122,15 +122,6 @@ "outputPathIsOutsideProject": 0, "outputPathIsSetByUser": 0 }, - "\/public\/css\/gogs.min.css": { - "fileType": 16, - "ignore": 1, - "ignoreWasSetByUser": 0, - "inputAbbreviatedPath": "\/public\/css\/gogs.min.css", - "outputAbbreviatedPath": "No Output Path", - "outputPathIsOutsideProject": 0, - "outputPathIsSetByUser": 0 - }, "\/public\/css\/jquery.datetimepicker.css": { "fileType": 16, "ignore": 0, @@ -308,7 +299,7 @@ "outputPathIsSetByUser": 0, "processed": 1 }, - "\/public\/less\/_base.less": { + "\/public\/less\/_form.less": { "allowInsecureImports": 0, "createSourceMap": 0, "disableJavascript": 0, @@ -316,8 +307,8 @@ "ieCompatibility": 1, "ignore": 1, "ignoreWasSetByUser": 0, - "inputAbbreviatedPath": "\/public\/less\/_base.less", - "outputAbbreviatedPath": "\/public\/css\/_base.css", + "inputAbbreviatedPath": "\/public\/less\/_form.less", + "outputAbbreviatedPath": "\/public\/css\/_form.css", "outputPathIsOutsideProject": 0, "outputPathIsSetByUser": 0, "outputStyle": 0, @@ -328,7 +319,7 @@ "strictMath": 0, "strictUnits": 0 }, - "\/public\/less\/_form.less": { + "\/public\/less\/_home.less": { "allowInsecureImports": 0, "createSourceMap": 0, "disableJavascript": 0, @@ -336,8 +327,8 @@ "ieCompatibility": 1, "ignore": 1, "ignoreWasSetByUser": 0, - "inputAbbreviatedPath": "\/public\/less\/_form.less", - "outputAbbreviatedPath": "\/public\/css\/_form.css", + "inputAbbreviatedPath": "\/public\/less\/_home.less", + "outputAbbreviatedPath": "\/public\/css\/_home.css", "outputPathIsOutsideProject": 0, "outputPathIsSetByUser": 0, "outputStyle": 0, @@ -348,7 +339,7 @@ "strictMath": 0, "strictUnits": 0 }, - "\/public\/less\/_home.less": { + "\/public\/less\/_install.less": { "allowInsecureImports": 0, "createSourceMap": 0, "disableJavascript": 0, @@ -356,8 +347,8 @@ "ieCompatibility": 1, "ignore": 1, "ignoreWasSetByUser": 0, - "inputAbbreviatedPath": "\/public\/less\/_home.less", - "outputAbbreviatedPath": "\/public\/css\/_home.css", + "inputAbbreviatedPath": "\/public\/less\/_install.less", + "outputAbbreviatedPath": "\/public\/css\/_install.css", "outputPathIsOutsideProject": 0, "outputPathIsSetByUser": 0, "outputStyle": 0, @@ -368,7 +359,7 @@ "strictMath": 0, "strictUnits": 0 }, - "\/public\/less\/_install.less": { + "\/public\/less\/_markdown.less": { "allowInsecureImports": 0, "createSourceMap": 0, "disableJavascript": 0, @@ -376,8 +367,8 @@ "ieCompatibility": 1, "ignore": 1, "ignoreWasSetByUser": 0, - "inputAbbreviatedPath": "\/public\/less\/_install.less", - "outputAbbreviatedPath": "\/public\/css\/_install.css", + "inputAbbreviatedPath": "\/public\/less\/_markdown.less", + "outputAbbreviatedPath": "\/public\/css\/_markdown.css", "outputPathIsOutsideProject": 0, "outputPathIsSetByUser": 0, "outputStyle": 0, @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.6.4.0809 Beta" +const APP_VER = "0.6.4.0810 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/models/access.go b/models/access.go index 54d0f099..8d698f15 100644 --- a/models/access.go +++ b/models/access.go @@ -37,11 +37,11 @@ func accessLevel(e Engine, u *User, repo *Repository) (AccessMode, error) { } if u != nil { - if u.Id == repo.OwnerId { + if u.Id == repo.OwnerID { return ACCESS_MODE_OWNER, nil } - a := &Access{UserID: u.Id, RepoID: repo.Id} + a := &Access{UserID: u.Id, RepoID: repo.ID} if has, err := e.Get(a); !has || err != nil { return mode, err } @@ -77,7 +77,7 @@ func (u *User) GetAccessibleRepositories() (map[*Repository]AccessMode, error) { repos := make(map[*Repository]AccessMode, len(accesses)) for _, access := range accesses { - repo, err := GetRepositoryById(access.RepoID) + repo, err := GetRepositoryByID(access.RepoID) if err != nil { if IsErrRepoNotExist(err) { log.Error(4, "%v", err) @@ -87,7 +87,7 @@ func (u *User) GetAccessibleRepositories() (map[*Repository]AccessMode, error) { } if err = repo.GetOwner(); err != nil { return nil, err - } else if repo.OwnerId == u.Id { + } else if repo.OwnerID == u.Id { continue } repos[repo] = access.Mode @@ -121,13 +121,13 @@ func (repo *Repository) refreshAccesses(e Engine, accessMap map[int64]AccessMode } newAccesses = append(newAccesses, Access{ UserID: userID, - RepoID: repo.Id, + RepoID: repo.ID, Mode: mode, }) } // Delete old accesses and insert new ones for repository. - if _, err = e.Delete(&Access{RepoID: repo.Id}); err != nil { + if _, err = e.Delete(&Access{RepoID: repo.ID}); err != nil { return fmt.Errorf("delete old accesses: %v", err) } else if _, err = e.Insert(newAccesses); err != nil { return fmt.Errorf("insert new accesses: %v", err) @@ -193,7 +193,7 @@ func (repo *Repository) recalculateTeamAccesses(e Engine, ignTeamID int64) (err // have relations with repository. if t.IsOwnerTeam() { t.Authorize = ACCESS_MODE_OWNER - } else if !t.hasRepository(e, repo.Id) { + } else if !t.hasRepository(e, repo.ID) { continue } diff --git a/models/action.go b/models/action.go index 99cd1709..4069cbca 100644 --- a/models/action.go +++ b/models/action.go @@ -348,7 +348,7 @@ func CommitRepoAction(userId, repoUserId int64, userName, actEmail string, // check if repo belongs to org and append additional webhooks if repo.Owner.IsOrganization() { // get hooks for org - orgws, err := GetActiveWebhooksByOrgId(repo.OwnerId) + orgws, err := GetActiveWebhooksByOrgId(repo.OwnerID) if err != nil { return errors.New("GetActiveWebhooksByOrgId: " + err.Error()) } @@ -388,7 +388,7 @@ func CommitRepoAction(userId, repoUserId int64, userName, actEmail string, Ref: refFullName, Commits: commits, Repo: &PayloadRepo{ - Id: repo.Id, + Id: repo.ID, Name: repo.LowerName, Url: repoLink, Description: repo.Description, @@ -431,7 +431,7 @@ func CommitRepoAction(userId, repoUserId int64, userName, actEmail string, } if err = CreateHookTask(&HookTask{ - RepoID: repo.Id, + RepoID: repo.ID, HookID: w.Id, Type: w.HookTaskType, Url: w.Url, @@ -453,12 +453,12 @@ func newRepoAction(e Engine, u *User, repo *Repository) (err error) { ActUserName: u.Name, ActEmail: u.Email, OpType: CREATE_REPO, - RepoID: repo.Id, + RepoID: repo.ID, RepoUserName: repo.Owner.Name, RepoName: repo.Name, IsPrivate: repo.IsPrivate, }); err != nil { - return fmt.Errorf("notify watchers '%d/%s'", u.Id, repo.Id) + return fmt.Errorf("notify watchers '%d/%s'", u.Id, repo.ID) } log.Trace("action.NewRepoAction: %s/%s", u.Name, repo.Name) @@ -476,19 +476,19 @@ func transferRepoAction(e Engine, actUser, oldOwner, newOwner *User, repo *Repos ActUserName: actUser.Name, ActEmail: actUser.Email, OpType: TRANSFER_REPO, - RepoID: repo.Id, + RepoID: repo.ID, RepoUserName: newOwner.Name, RepoName: repo.Name, IsPrivate: repo.IsPrivate, Content: path.Join(oldOwner.LowerName, repo.LowerName), } if err = notifyWatchers(e, action); err != nil { - return fmt.Errorf("notify watchers '%d/%s'", actUser.Id, repo.Id) + return fmt.Errorf("notify watchers '%d/%s'", actUser.Id, repo.ID) } // Remove watch for organization. if repo.Owner.IsOrganization() { - if err = watchRepo(e, repo.Owner.Id, repo.Id, false); err != nil { + if err = watchRepo(e, repo.Owner.Id, repo.ID, false); err != nil { return fmt.Errorf("watch repository: %v", err) } } diff --git a/models/error.go b/models/error.go index 0e554e52..91acd9cb 100644 --- a/models/error.go +++ b/models/error.go @@ -239,6 +239,26 @@ func (err ErrRepoAlreadyExist) Error() string { return fmt.Sprintf("repository already exists [uname: %d, name: %s]", err.Uname, err.Name) } +// .____ ___. .__ +// | | _____ \_ |__ ____ | | +// | | \__ \ | __ \_/ __ \| | +// | |___ / __ \| \_\ \ ___/| |__ +// |_______ (____ /___ /\___ >____/ +// \/ \/ \/ \/ + +type ErrLabelNotExist struct { + ID int64 +} + +func IsErrLabelNotExist(err error) bool { + _, ok := err.(ErrLabelNotExist) + return ok +} + +func (err ErrLabelNotExist) Error() string { + return fmt.Sprintf("label does not exist [id: %d]", err.ID) +} + // _____ .__.__ __ // / \ |__| | ____ _______/ |_ ____ ____ ____ // / \ / \| | | _/ __ \ / ___/\ __\/ _ \ / \_/ __ \ @@ -247,7 +267,8 @@ func (err ErrRepoAlreadyExist) Error() string { // \/ \/ \/ \/ \/ type ErrMilestoneNotExist struct { - ID int64 + ID int64 + RepoID int64 } func IsErrMilestoneNotExist(err error) bool { @@ -256,5 +277,5 @@ func IsErrMilestoneNotExist(err error) bool { } func (err ErrMilestoneNotExist) Error() string { - return fmt.Sprintf("milestone does not exist [id: %d]", err.ID) + return fmt.Sprintf("milestone does not exist [id: %d, repo_id: %d]", err.ID, err.RepoID) } diff --git a/models/issue.go b/models/issue.go index 1e528d86..79363ce5 100644 --- a/models/issue.go +++ b/models/issue.go @@ -7,6 +7,7 @@ package models import ( "bytes" "errors" + "fmt" "html/template" "os" "strconv" @@ -16,13 +17,13 @@ import ( "github.com/Unknwon/com" "github.com/go-xorm/xorm" + "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/setting" ) var ( ErrIssueNotExist = errors.New("Issue does not exist") - ErrLabelNotExist = errors.New("Label does not exist") ErrWrongIssueCounter = errors.New("Invalid number of issues for this milestone") ErrAttachmentNotExist = errors.New("Attachment does not exist") ErrAttachmentNotLinked = errors.New("Attachment does not belong to this issue") @@ -38,7 +39,6 @@ type Issue struct { Repo *Repository `xorm:"-"` PosterID int64 Poster *User `xorm:"-"` - LabelIds string `xorm:"TEXT"` Labels []*Label `xorm:"-"` MilestoneID int64 Milestone *Milestone `xorm:"-"` @@ -60,15 +60,28 @@ func (i *Issue) AfterSet(colName string, _ xorm.Cell) { var err error switch colName { case "milestone_id": + if i.MilestoneID == 0 { + return + } + i.Milestone, err = GetMilestoneByID(i.MilestoneID) if err != nil { log.Error(3, "GetMilestoneById: %v", err) } + case "assignee_id": + if i.AssigneeID == 0 { + return + } + + i.Assignee, err = GetUserByID(i.AssigneeID) + if err != nil { + log.Error(3, "GetUserByID: %v", err) + } } } func (i *Issue) GetPoster() (err error) { - i.Poster, err = GetUserById(i.PosterID) + i.Poster, err = GetUserByID(i.PosterID) if IsErrUserNotExist(err) { i.Poster = &User{Name: "FakeUser"} return nil @@ -76,35 +89,56 @@ func (i *Issue) GetPoster() (err error) { return err } -func (i *Issue) GetLabels() error { - if len(i.LabelIds) < 3 { +func (i *Issue) hasLabel(e Engine, labelID int64) bool { + return hasIssueLabel(e, i.ID, labelID) +} + +// HasLabel returns true if issue has been labeled by given ID. +func (i *Issue) HasLabel(labelID int64) bool { + return i.hasLabel(x, labelID) +} + +func (i *Issue) addLabel(e Engine, labelID int64) error { + return newIssueLabel(e, i.ID, labelID) +} + +// AddLabel adds new label to issue by given ID. +func (i *Issue) AddLabel(labelID int64) error { + return i.addLabel(x, labelID) +} + +func (i *Issue) getLabels(e Engine) (err error) { + if len(i.Labels) > 0 { return nil } - strIds := strings.Split(strings.TrimSuffix(i.LabelIds[1:], "|"), "|$") - i.Labels = make([]*Label, 0, len(strIds)) - for _, strId := range strIds { - id := com.StrTo(strId).MustInt64() - if id > 0 { - l, err := GetLabelById(id) - if err != nil { - if err == ErrLabelNotExist { - continue - } - return err - } - i.Labels = append(i.Labels, l) - } + i.Labels, err = getLabelsByIssueID(e, i.ID) + if err != nil { + return fmt.Errorf("getLabelsByIssueID: %v", err) } return nil } +// GetLabels retrieves all labels of issue and assign to corresponding field. +func (i *Issue) GetLabels() error { + return i.getLabels(x) +} + +func (i *Issue) removeLabel(e Engine, labelID int64) error { + return deleteIssueLabel(e, i.ID, labelID) +} + +// RemoveLabel removes a label from issue by given ID. +func (i *Issue) RemoveLabel(labelID int64) error { + return i.removeLabel(x, labelID) +} + func (i *Issue) GetAssignee() (err error) { - if i.AssigneeID == 0 { + if i.AssigneeID == 0 || i.Assignee != nil { return nil } - i.Assignee, err = GetUserById(i.AssigneeID) + i.Assignee, err = GetUserByID(i.AssigneeID) if IsErrUserNotExist(err) { return nil } @@ -124,8 +158,8 @@ func (i *Issue) AfterDelete() { } } -// CreateIssue creates new issue for repository. -func NewIssue(issue *Issue) (err error) { +// CreateIssue creates new issue with labels for repository. +func NewIssue(repo *Repository, issue *Issue, labelIDs []int64) (err error) { sess := x.NewSession() defer sessionRelease(sess) if err = sess.Begin(); err != nil { @@ -134,20 +168,27 @@ func NewIssue(issue *Issue) (err error) { if _, err = sess.Insert(issue); err != nil { return err - } else if _, err = sess.Exec("UPDATE `repository` SET num_issues = num_issues + 1 WHERE id = ?", issue.RepoID); err != nil { + } else if _, err = sess.Exec("UPDATE `repository` SET num_issues=num_issues+1 WHERE id=?", issue.RepoID); err != nil { return err } - if err = sess.Commit(); err != nil { - return err + for _, id := range labelIDs { + if err = issue.addLabel(sess, id); err != nil { + return fmt.Errorf("addLabel: %v", err) + } } if issue.MilestoneID > 0 { - // FIXES(280): Update milestone counter. - return ChangeMilestoneAssign(0, issue.MilestoneID, issue) + if err = changeMilestoneAssign(sess, 0, issue); err != nil { + return err + } } - return + if err = newIssueUsers(sess, repo, issue); err != nil { + return err + } + + return sess.Commit() } // GetIssueByRef returns an Issue specified by a GFM reference. @@ -170,7 +211,7 @@ func GetIssueByRef(ref string) (issue *Issue, err error) { return } - return GetIssueByIndex(repo.Id, issueNumber) + return GetIssueByIndex(repo.ID, issueNumber) } // GetIssueByIndex returns issue by given index in repository. @@ -198,7 +239,7 @@ func GetIssueById(id int64) (*Issue, error) { } // Issues returns a list of issues by given conditions. -func Issues(uid, assigneeID, repoID, posterID, milestoneID int64, page int, isClosed, isMention bool, labelIds, sortType string) ([]*Issue, error) { +func Issues(uid, assigneeID, repoID, posterID, milestoneID int64, page int, isClosed, isMention bool, labels, sortType string) ([]*Issue, error) { sess := x.Limit(setting.IssuePagingNum, (page-1)*setting.IssuePagingNum) if repoID > 0 { @@ -217,14 +258,6 @@ func Issues(uid, assigneeID, repoID, posterID, milestoneID int64, page int, isCl sess.And("issue.milestone_id=?", milestoneID) } - if len(labelIds) > 0 { - for _, label := range strings.Split(labelIds, ",") { - if com.StrTo(label).MustInt() > 0 { - sess.And("label_ids like ?", "%$"+label+"|%") - } - } - } - switch sortType { case "oldest": sess.Asc("created") @@ -242,10 +275,26 @@ func Issues(uid, assigneeID, repoID, posterID, milestoneID int64, page int, isCl sess.Desc("created") } + labelIDs := base.StringsToInt64s(strings.Split(labels, ",")) + if len(labelIDs) > 0 { + validJoin := false + queryStr := "issue.id=issue_label.issue_id" + for _, id := range labelIDs { + if id == 0 { + continue + } + validJoin = true + queryStr += " AND issue_label.label_id=" + com.ToStr(id) + } + if validJoin { + sess.Join("INNER", "issue_label", queryStr) + } + } + if isMention { - queryStr := "issue.id = issue_user.issue_id AND issue_user.is_mentioned=1" + queryStr := "issue.id=issue_user.issue_id AND issue_user.is_mentioned=1" if uid > 0 { - queryStr += " AND issue_user.uid = " + com.ToStr(uid) + queryStr += " AND issue_user.uid=" + com.ToStr(uid) } sess.Join("INNER", "issue_user", queryStr) } @@ -261,12 +310,6 @@ const ( IS_CLOSE ) -// GetIssuesByLabel returns a list of issues by given label and repository. -func GetIssuesByLabel(repoID, labelID int64) ([]*Issue, error) { - issues := make([]*Issue, 0, 10) - return issues, x.Where("repo_id=?", repoID).And("label_ids like '%$" + com.ToStr(labelID) + "|%'").Find(&issues) -} - // GetIssueCountByPoster returns number of issues of repository by poster. func GetIssueCountByPoster(uid, rid int64, isClosed bool) int64 { count, _ := x.Where("repo_id=?", rid).And("poster_id=?", uid).And("is_closed=?", isClosed).Count(new(Issue)) @@ -282,11 +325,11 @@ func GetIssueCountByPoster(uid, rid int64, isClosed bool) int64 { // IssueUser represents an issue-user relation. type IssueUser struct { - Id int64 - Uid int64 `xorm:"INDEX"` // User ID. - IssueId int64 - RepoId int64 `xorm:"INDEX"` - MilestoneId int64 + ID int64 `xorm:"pk autoincr"` + UID int64 `xorm:"uid INDEX"` // User ID. + IssueID int64 + RepoID int64 `xorm:"INDEX"` + MilestoneID int64 IsRead bool IsAssigned bool IsMentioned bool @@ -295,69 +338,72 @@ type IssueUser struct { } // FIXME: organization -// NewIssueUserPairs adds new issue-user pairs for new issue of repository. -func NewIssueUserPairs(repo *Repository, issueID, orgID, posterID, assigneeID int64) error { - users, err := repo.GetCollaborators() +func newIssueUsers(e *xorm.Session, repo *Repository, issue *Issue) error { + users, err := repo.GetAssignees() if err != nil { return err } iu := &IssueUser{ - IssueId: issueID, - RepoId: repo.Id, + IssueID: issue.ID, + RepoID: repo.ID, } + // Poster can be anyone. isNeedAddPoster := true for _, u := range users { - iu.Id = 0 - iu.Uid = u.Id - iu.IsPoster = iu.Uid == posterID + iu.ID = 0 + iu.UID = u.Id + iu.IsPoster = iu.UID == issue.PosterID if isNeedAddPoster && iu.IsPoster { isNeedAddPoster = false } - iu.IsAssigned = iu.Uid == assigneeID - if _, err = x.Insert(iu); err != nil { + iu.IsAssigned = iu.UID == issue.AssigneeID + if _, err = e.Insert(iu); err != nil { return err } } if isNeedAddPoster { - iu.Id = 0 - iu.Uid = posterID + iu.ID = 0 + iu.UID = issue.PosterID iu.IsPoster = true - iu.IsAssigned = iu.Uid == assigneeID - if _, err = x.Insert(iu); err != nil { + if _, err = e.Insert(iu); err != nil { return err } } + return nil +} - // Add owner's as well. - if repo.OwnerId != posterID { - iu.Id = 0 - iu.Uid = repo.OwnerId - iu.IsAssigned = iu.Uid == assigneeID - if _, err = x.Insert(iu); err != nil { - return err - } +// NewIssueUsers adds new issue-user relations for new issue of repository. +func NewIssueUsers(repo *Repository, issue *Issue) (err error) { + sess := x.NewSession() + defer sessionRelease(sess) + if err = sess.Begin(); err != nil { + return err } - return nil + if err = newIssueUsers(sess, repo, issue); err != nil { + return err + } + + return sess.Commit() } // PairsContains returns true when pairs list contains given issue. func PairsContains(ius []*IssueUser, issueId, uid int64) int { for i := range ius { - if ius[i].IssueId == issueId && - ius[i].Uid == uid { + if ius[i].IssueID == issueId && + ius[i].UID == uid { return i } } return -1 } -// GetIssueUserPairs returns issue-user pairs by given repository and user. -func GetIssueUserPairs(rid, uid int64, isClosed bool) ([]*IssueUser, error) { +// GetIssueUsers returns issue-user pairs by given repository and user. +func GetIssueUsers(rid, uid int64, isClosed bool) ([]*IssueUser, error) { ius := make([]*IssueUser, 0, 10) - err := x.Where("is_closed=?", isClosed).Find(&ius, &IssueUser{RepoId: rid, Uid: uid}) + err := x.Where("is_closed=?", isClosed).Find(&ius, &IssueUser{RepoID: rid, UID: uid}) return ius, err } @@ -420,50 +466,58 @@ const ( FM_MENTION ) +func parseCountResult(results []map[string][]byte) int64 { + if len(results) == 0 { + return 0 + } + for _, result := range results[0] { + return com.StrTo(string(result)).MustInt64() + } + return 0 +} + // GetIssueStats returns issue statistic information by given conditions. func GetIssueStats(repoID, uid, labelID, milestoneID int64, isShowClosed bool, filterMode int) *IssueStats { stats := &IssueStats{} - issue := new(Issue) + // issue := new(Issue) - queryStr := "issue.repo_id=? AND issue.is_closed=?" + queryStr := "SELECT COUNT(*) FROM `issue` " if labelID > 0 { - queryStr += " AND issue.label_ids like '%$" + com.ToStr(labelID) + "|%'" + queryStr += "INNER JOIN `issue_label` ON `issue`.id=`issue_label`.issue_id AND `issue_label`.label_id=" + com.ToStr(labelID) } + + baseCond := " WHERE issue.repo_id=? AND issue.is_closed=?" if milestoneID > 0 { - queryStr += " AND milestone_id=" + com.ToStr(milestoneID) + baseCond += " AND issue.milestone_id=" + com.ToStr(milestoneID) } switch filterMode { case FM_ALL: - stats.OpenCount, _ = x.Where(queryStr, repoID, false).Count(issue) - stats.ClosedCount, _ = x.Where(queryStr, repoID, true).Count(issue) - return stats + resutls, _ := x.Query(queryStr+baseCond, repoID, false) + stats.OpenCount = parseCountResult(resutls) + resutls, _ = x.Query(queryStr+baseCond, repoID, true) + stats.ClosedCount = parseCountResult(resutls) case FM_ASSIGN: - queryStr += " AND assignee_id=?" - stats.OpenCount, _ = x.Where(queryStr, repoID, false, uid).Count(issue) - stats.ClosedCount, _ = x.Where(queryStr, repoID, true, uid).Count(issue) - return stats + baseCond += " AND assignee_id=?" + resutls, _ := x.Query(queryStr+baseCond, repoID, false, uid) + stats.OpenCount = parseCountResult(resutls) + resutls, _ = x.Query(queryStr+baseCond, repoID, true, uid) + stats.ClosedCount = parseCountResult(resutls) case FM_CREATE: - queryStr += " AND poster_id=?" - stats.OpenCount, _ = x.Where(queryStr, repoID, false, uid).Count(issue) - stats.ClosedCount, _ = x.Where(queryStr, repoID, true, uid).Count(issue) - return stats + baseCond += " AND poster_id=?" + resutls, _ := x.Query(queryStr+baseCond, repoID, false, uid) + stats.OpenCount = parseCountResult(resutls) + resutls, _ = x.Query(queryStr+baseCond, repoID, true, uid) + stats.ClosedCount = parseCountResult(resutls) case FM_MENTION: - queryStr += " AND uid=? AND is_mentioned=?" - if labelID > 0 { - stats.OpenCount, _ = x.Where(queryStr, repoID, false, uid, true). - Join("INNER", "issue", "issue.id = issue_id").Count(new(IssueUser)) - stats.ClosedCount, _ = x.Where(queryStr, repoID, true, uid, true). - Join("INNER", "issue", "issue.id = issue_id").Count(new(IssueUser)) - return stats - } - - queryStr = strings.Replace(queryStr, "issue.", "", 2) - stats.OpenCount, _ = x.Where(queryStr, repoID, false, uid, true).Count(new(IssueUser)) - stats.ClosedCount, _ = x.Where(queryStr, repoID, true, uid, true).Count(new(IssueUser)) - return stats + queryStr += " INNER JOIN `issue_user` ON `issue`.id=`issue_user`.issue_id" + baseCond += " AND `issue_user`.uid=? AND `issue_user`.is_mentioned=?" + resutls, _ := x.Query(queryStr+baseCond, repoID, false, uid, true) + stats.OpenCount = parseCountResult(resutls) + resutls, _ = x.Query(queryStr+baseCond, repoID, true, uid, true) + stats.ClosedCount = parseCountResult(resutls) } return stats } @@ -477,15 +531,14 @@ func GetUserIssueStats(uid int64, filterMode int) *IssueStats { return stats } +func updateIssue(e Engine, issue *Issue) error { + _, err := e.Id(issue.ID).AllCols().Update(issue) + return err +} + // UpdateIssue updates information of issue. func UpdateIssue(issue *Issue) error { - _, err := x.Id(issue.ID).AllCols().Update(issue) - - if err != nil { - return err - } - - return err + return updateIssue(x, issue) } // UpdateIssueUserByStatus updates issue-user pairs by issue status. @@ -495,22 +548,34 @@ func UpdateIssueUserPairsByStatus(iid int64, isClosed bool) error { return err } -// UpdateIssueUserPairByAssignee updates issue-user pair for assigning. -func UpdateIssueUserPairByAssignee(aid, iid int64) error { - rawSql := "UPDATE `issue_user` SET is_assigned = ? WHERE issue_id = ?" - if _, err := x.Exec(rawSql, false, iid); err != nil { +func updateIssueUserByAssignee(e *xorm.Session, issueID, assigneeID int64) (err error) { + if _, err = e.Exec("UPDATE `issue_user` SET is_assigned=? WHERE issue_id=?", false, issueID); err != nil { return err } // Assignee ID equals to 0 means clear assignee. - if aid == 0 { + if assigneeID == 0 { return nil } - rawSql = "UPDATE `issue_user` SET is_assigned = ? WHERE uid = ? AND issue_id = ?" - _, err := x.Exec(rawSql, true, aid, iid) + _, err = e.Exec("UPDATE `issue_user` SET is_assigned=? WHERE uid=? AND issue_id=?", true, assigneeID, issueID) return err } +// UpdateIssueUserByAssignee updates issue-user relation for assignee. +func UpdateIssueUserByAssignee(issueID, assigneeID int64) (err error) { + sess := x.NewSession() + defer sessionRelease(sess) + if err = sess.Begin(); err != nil { + return err + } + + if err = updateIssueUserByAssignee(sess, issueID, assigneeID); err != nil { + return err + } + + return sess.Commit() +} + // UpdateIssueUserPairByRead updates issue-user pair for reading. func UpdateIssueUserPairByRead(uid, iid int64) error { rawSql := "UPDATE `issue_user` SET is_read = ? WHERE uid = ? AND issue_id = ?" @@ -521,7 +586,7 @@ func UpdateIssueUserPairByRead(uid, iid int64) error { // UpdateIssueUserPairsByMentions updates issue-user pairs by mentioning. func UpdateIssueUserPairsByMentions(uids []int64, iid int64) error { for _, uid := range uids { - iu := &IssueUser{Uid: uid, IssueId: iid} + iu := &IssueUser{UID: uid, IssueID: iid} has, err := x.Get(iu) if err != nil { return err @@ -529,7 +594,7 @@ func UpdateIssueUserPairsByMentions(uids []int64, iid int64) error { iu.IsMentioned = true if has { - _, err = x.Id(iu.Id).AllCols().Update(iu) + _, err = x.Id(iu.ID).AllCols().Update(iu) } else { _, err = x.Insert(iu) } @@ -550,7 +615,7 @@ func UpdateIssueUserPairsByMentions(uids []int64, iid int64) error { // Label represents a label of repository for issues. type Label struct { ID int64 `xorm:"pk autoincr"` - RepoId int64 `xorm:"INDEX"` + RepoID int64 `xorm:"INDEX"` Name string Color string `xorm:"VARCHAR(7)"` NumIssues int @@ -570,10 +635,9 @@ func NewLabel(l *Label) error { return err } -// GetLabelById returns a label by given ID. -func GetLabelById(id int64) (*Label, error) { +func getLabelByID(e Engine, id int64) (*Label, error) { if id <= 0 { - return nil, ErrLabelNotExist + return nil, ErrLabelNotExist{id} } l := &Label{ID: id} @@ -581,16 +645,43 @@ func GetLabelById(id int64) (*Label, error) { if err != nil { return nil, err } else if !has { - return nil, ErrLabelNotExist + return nil, ErrLabelNotExist{l.ID} } return l, nil } -// GetLabels returns a list of labels of given repository ID. -func GetLabels(repoId int64) ([]*Label, error) { +// GetLabelByID returns a label by given ID. +func GetLabelByID(id int64) (*Label, error) { + return getLabelByID(x, id) +} + +// GetLabelsByRepoID returns all labels that belong to given repository by ID. +func GetLabelsByRepoID(repoID int64) ([]*Label, error) { labels := make([]*Label, 0, 10) - err := x.Where("repo_id=?", repoId).Find(&labels) - return labels, err + return labels, x.Where("repo_id=?", repoID).Find(&labels) +} + +func getLabelsByIssueID(e Engine, issueID int64) ([]*Label, error) { + issueLabels, err := getIssueLabels(e, issueID) + if err != nil { + return nil, fmt.Errorf("getIssueLabels: %v", err) + } + + var label *Label + labels := make([]*Label, 0, len(issueLabels)) + for idx := range issueLabels { + label, err = getLabelByID(e, issueLabels[idx].LabelID) + if err != nil && !IsErrLabelNotExist(err) { + return nil, fmt.Errorf("getLabelByID: %v", err) + } + labels = append(labels, label) + } + return labels, nil +} + +// GetLabelsByIssueID returns all labels that belong to given issue by ID. +func GetLabelsByIssueID(issueID int64) ([]*Label, error) { + return getLabelsByIssueID(x, issueID) } // UpdateLabel updates label information. @@ -601,38 +692,92 @@ func UpdateLabel(l *Label) error { // DeleteLabel delete a label of given repository. func DeleteLabel(repoID, labelID int64) error { - l, err := GetLabelById(labelID) + l, err := GetLabelByID(labelID) if err != nil { - if err == ErrLabelNotExist { + if IsErrLabelNotExist(err) { return nil } return err } - issues, err := GetIssuesByLabel(repoID, labelID) - if err != nil { - return err - } - sess := x.NewSession() defer sessionRelease(sess) if err = sess.Begin(); err != nil { return err } - for _, issue := range issues { - issue.LabelIds = strings.Replace(issue.LabelIds, "$"+com.ToStr(labelID)+"|", "", -1) - if _, err = sess.Id(issue.ID).AllCols().Update(issue); err != nil { - return err - } - } - - if _, err = sess.Delete(l); err != nil { + if _, err = x.Where("label_id=?", labelID).Delete(new(IssueLabel)); err != nil { + return err + } else if _, err = sess.Delete(l); err != nil { return err } return sess.Commit() } +// .___ .____ ___. .__ +// | | ______ ________ __ ____ | | _____ \_ |__ ____ | | +// | |/ ___// ___/ | \_/ __ \| | \__ \ | __ \_/ __ \| | +// | |\___ \ \___ \| | /\ ___/| |___ / __ \| \_\ \ ___/| |__ +// |___/____ >____ >____/ \___ >_______ (____ /___ /\___ >____/ +// \/ \/ \/ \/ \/ \/ \/ + +// IssueLabel represetns an issue-lable relation. +type IssueLabel struct { + ID int64 `xorm:"pk autoincr"` + IssueID int64 `xorm:"UNIQUE(s)"` + LabelID int64 `xorm:"UNIQUE(s)"` +} + +func hasIssueLabel(e Engine, issueID, labelID int64) bool { + has, _ := e.Where("issue_id=? AND label_id=?", issueID, labelID).Get(new(IssueLabel)) + return has +} + +// HasIssueLabel returns true if issue has been labeled. +func HasIssueLabel(issueID, labelID int64) bool { + return hasIssueLabel(x, issueID, labelID) +} + +func newIssueLabel(e Engine, issueID, labelID int64) error { + if issueID == 0 || labelID == 0 { + return nil + } + + _, err := e.Insert(&IssueLabel{ + IssueID: issueID, + LabelID: labelID, + }) + return err +} + +// NewIssueLabel creates a new issue-label relation. +func NewIssueLabel(issueID, labelID int64) error { + return newIssueLabel(x, issueID, labelID) +} + +func getIssueLabels(e Engine, issueID int64) ([]*IssueLabel, error) { + issueLabels := make([]*IssueLabel, 0, 10) + return issueLabels, e.Where("issue_id=?", issueID).Asc("label_id").Find(&issueLabels) +} + +// GetIssueLabels returns all issue-label relations of given issue by ID. +func GetIssueLabels(issueID int64) ([]*IssueLabel, error) { + return getIssueLabels(x, issueID) +} + +func deleteIssueLabel(e Engine, issueID, labelID int64) error { + _, err := e.Delete(&IssueLabel{ + IssueID: issueID, + LabelID: labelID, + }) + return err +} + +// DeleteIssueLabel deletes issue-label relation. +func DeleteIssueLabel(issueID, labelID int64) error { + return deleteIssueLabel(x, issueID, labelID) +} + // _____ .__.__ __ // / \ |__| | ____ _______/ |_ ____ ____ ____ // / \ / \| | | _/ __ \ / ___/\ __\/ _ \ / \_/ __ \ @@ -702,14 +847,30 @@ func NewMilestone(m *Milestone) (err error) { return sess.Commit() } +func getMilestoneByID(e Engine, id int64) (*Milestone, error) { + m := &Milestone{ID: id} + has, err := x.Get(m) + if err != nil { + return nil, err + } else if !has { + return nil, ErrMilestoneNotExist{id, 0} + } + return m, nil +} + // GetMilestoneByID returns the milestone of given ID. func GetMilestoneByID(id int64) (*Milestone, error) { - m := &Milestone{ID: id} + return getMilestoneByID(x, id) +} + +// GetRepoMilestoneByID returns the milestone of given ID and repository. +func GetRepoMilestoneByID(repoID, milestoneID int64) (*Milestone, error) { + m := &Milestone{ID: milestoneID, RepoID: repoID} has, err := x.Get(m) if err != nil { return nil, err } else if !has { - return nil, ErrMilestoneNotExist{id} + return nil, ErrMilestoneNotExist{milestoneID, repoID} } return m, nil } @@ -768,7 +929,7 @@ func MilestoneStats(repoID int64) (open int64, closed int64) { // ChangeMilestoneStatus changes the milestone open/closed status. func ChangeMilestoneStatus(m *Milestone, isClosed bool) (err error) { - repo, err := GetRepositoryById(m.RepoID) + repo, err := GetRepositoryByID(m.RepoID) if err != nil { return err } @@ -784,9 +945,9 @@ func ChangeMilestoneStatus(m *Milestone, isClosed bool) (err error) { return err } - repo.NumMilestones = int(countRepoMilestones(sess, repo.Id)) - repo.NumClosedMilestones = int(countRepoClosedMilestones(sess, repo.Id)) - if _, err = sess.Id(repo.Id).AllCols().Update(repo); err != nil { + repo.NumMilestones = int(countRepoMilestones(sess, repo.ID)) + repo.NumClosedMilestones = int(countRepoClosedMilestones(sess, repo.ID)) + if _, err = sess.Id(repo.ID).AllCols().Update(repo); err != nil { return err } return sess.Commit() @@ -815,16 +976,9 @@ func ChangeMilestoneIssueStats(issue *Issue) error { return UpdateMilestone(m) } -// ChangeMilestoneAssign changes assignment of milestone for issue. -func ChangeMilestoneAssign(oldMid, mid int64, issue *Issue) (err error) { - sess := x.NewSession() - defer sess.Close() - if err = sess.Begin(); err != nil { - return err - } - +func changeMilestoneAssign(e *xorm.Session, oldMid int64, issue *Issue) error { if oldMid > 0 { - m, err := GetMilestoneByID(oldMid) + m, err := getMilestoneByID(e, oldMid) if err != nil { return err } @@ -834,20 +988,15 @@ func ChangeMilestoneAssign(oldMid, mid int64, issue *Issue) (err error) { m.NumClosedIssues-- } - if _, err = sess.Id(m.ID).AllCols().Update(m); err != nil { - sess.Rollback() + if err = updateMilestone(e, m); err != nil { return err - } - - rawSql := "UPDATE `issue_user` SET milestone_id = 0 WHERE issue_id = ?" - if _, err = sess.Exec(rawSql, issue.ID); err != nil { - sess.Rollback() + } else if _, err = e.Exec("UPDATE `issue_user` SET milestone_id=0 WHERE issue_id=?", issue.ID); err != nil { return err } } - if mid > 0 { - m, err := GetMilestoneByID(mid) + if issue.MilestoneID > 0 { + m, err := GetMilestoneByID(issue.MilestoneID) if err != nil { return err } @@ -861,18 +1010,28 @@ func ChangeMilestoneAssign(oldMid, mid int64, issue *Issue) (err error) { return ErrWrongIssueCounter } - if _, err = sess.Id(m.ID).AllCols().Update(m); err != nil { - sess.Rollback() + if err = updateMilestone(e, m); err != nil { return err - } - - rawSql := "UPDATE `issue_user` SET milestone_id = ? WHERE issue_id = ?" - if _, err = sess.Exec(rawSql, m.ID, issue.ID); err != nil { - sess.Rollback() + } else if _, err = e.Exec("UPDATE `issue_user` SET milestone_id=? WHERE issue_id=?", m.ID, issue.ID); err != nil { return err } } + return nil +} + +// ChangeMilestoneAssign changes assignment of milestone for issue. +func ChangeMilestoneAssign(oldMid int64, issue *Issue) (err error) { + sess := x.NewSession() + defer sess.Close() + if err = sess.Begin(); err != nil { + return err + } + + if err = changeMilestoneAssign(sess, oldMid, issue); err != nil { + return err + } + return sess.Commit() } @@ -886,7 +1045,7 @@ func DeleteMilestoneByID(mid int64) error { return err } - repo, err := GetRepositoryById(m.RepoID) + repo, err := GetRepositoryByID(m.RepoID) if err != nil { return err } @@ -901,9 +1060,9 @@ func DeleteMilestoneByID(mid int64) error { return err } - repo.NumMilestones = int(countRepoMilestones(sess, repo.Id)) - repo.NumClosedMilestones = int(countRepoClosedMilestones(sess, repo.Id)) - if _, err = sess.Id(repo.Id).AllCols().Update(repo); err != nil { + repo.NumMilestones = int(countRepoMilestones(sess, repo.ID)) + repo.NumClosedMilestones = int(countRepoClosedMilestones(sess, repo.ID)) + if _, err = sess.Id(repo.ID).AllCols().Update(repo); err != nil { return err } diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 865cefb4..d9a971e0 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -58,6 +58,7 @@ var migrations = []Migration{ NewMigration("generate team-repo from team", teamToTeamRepo), // V3 -> V4:v0.5.13 NewMigration("fix locale file load panic", fixLocaleFileLoadPanic), // V4 -> V5:v0.6.0 NewMigration("trim action compare URL prefix", trimCommitActionAppUrlPrefix), // V5 -> V6:v0.6.3 + NewMigration("generate issue-label from issue", issueToIssueLabel), // V6 -> V7:v0.6.4 } // Migrate database to current version @@ -133,6 +134,9 @@ func accessToCollaboration(x *xorm.Engine) (err error) { results, err := x.Query("SELECT u.id AS `uid`, a.repo_name AS `repo`, a.mode AS `mode`, a.created as `created` FROM `access` a JOIN `user` u ON a.user_name=u.lower_name") if err != nil { + if strings.Contains(err.Error(), "no such column") { + return nil + } return err } @@ -281,6 +285,9 @@ func accessRefactor(x *xorm.Engine) (err error) { results, err = x.Query("SELECT `id`,`authorize`,`repo_ids` FROM `team` WHERE org_id=? AND authorize>? ORDER BY `authorize` ASC", ownerID, int(minAccessLevel)) if err != nil { + if strings.Contains(err.Error(), "no such column") { + return nil + } return fmt.Errorf("select teams from org: %v", err) } @@ -342,6 +349,9 @@ func teamToTeamRepo(x *xorm.Engine) error { results, err := x.Query("SELECT `id`,`org_id`,`repo_ids` FROM `team`") if err != nil { + if strings.Contains(err.Error(), "no such column") { + return nil + } return fmt.Errorf("select teams: %v", err) } for _, team := range results { @@ -372,7 +382,7 @@ func teamToTeamRepo(x *xorm.Engine) error { } if err = sess.Sync2(new(TeamRepo)); err != nil { - return fmt.Errorf("sync: %v", err) + return fmt.Errorf("sync2: %v", err) } else if _, err = sess.Insert(teamRepos); err != nil { return fmt.Errorf("insert team-repos: %v", err) } @@ -456,3 +466,52 @@ func trimCommitActionAppUrlPrefix(x *xorm.Engine) error { } return sess.Commit() } + +func issueToIssueLabel(x *xorm.Engine) error { + type IssueLabel struct { + ID int64 `xorm:"pk autoincr"` + IssueID int64 `xorm:"UNIQUE(s)"` + LabelID int64 `xorm:"UNIQUE(s)"` + } + + issueLabels := make([]*IssueLabel, 0, 50) + results, err := x.Query("SELECT `id`,`label_ids` FROM `issue`") + if err != nil { + if strings.Contains(err.Error(), "no such column") { + return nil + } + return fmt.Errorf("select issues: %v", err) + } + for _, issue := range results { + issueID := com.StrTo(issue["id"]).MustInt64() + + // Just in case legacy code can have duplicated IDs for same label. + mark := make(map[int64]bool) + for _, idStr := range strings.Split(string(issue["label_ids"]), "|") { + labelID := com.StrTo(strings.TrimPrefix(idStr, "$")).MustInt64() + if labelID == 0 || mark[labelID] { + continue + } + + mark[labelID] = true + issueLabels = append(issueLabels, &IssueLabel{ + IssueID: issueID, + LabelID: labelID, + }) + } + } + + sess := x.NewSession() + defer sessionRelease(sess) + if err = sess.Begin(); err != nil { + return err + } + + if err = sess.Sync2(new(IssueLabel)); err != nil { + return fmt.Errorf("sync2: %v", err) + } else if _, err = sess.Insert(issueLabels); err != nil { + return fmt.Errorf("insert issue-labels: %v", err) + } + + return sess.Commit() +} diff --git a/models/models.go b/models/models.go index 01b96c0f..e06d5cf8 100644 --- a/models/models.go +++ b/models/models.go @@ -57,7 +57,8 @@ func init() { new(User), new(PublicKey), new(Oauth2), new(AccessToken), new(Repository), new(DeployKey), new(Collaboration), new(Access), new(Watch), new(Star), new(Follow), new(Action), - new(Issue), new(Comment), new(Attachment), new(IssueUser), new(Label), new(Milestone), + new(Issue), new(Comment), new(Attachment), new(IssueUser), + new(Label), new(IssueLabel), new(Milestone), new(Mirror), new(Release), new(LoginSource), new(Webhook), new(UpdateTask), new(HookTask), new(Team), new(OrgUser), new(TeamUser), new(TeamRepo), diff --git a/models/oauth2.go b/models/oauth2.go index d19e248c..a15f7b6f 100644 --- a/models/oauth2.go +++ b/models/oauth2.go @@ -58,7 +58,7 @@ func GetOauth2(identity string) (oa *Oauth2, err error) { } else if oa.Uid == -1 { return oa, ErrOauth2NotAssociated } - oa.User, err = GetUserById(oa.Uid) + oa.User, err = GetUserByID(oa.Uid) return oa, err } diff --git a/models/org.go b/models/org.go index 3caed30b..b8d19456 100644 --- a/models/org.go +++ b/models/org.go @@ -66,7 +66,7 @@ func (org *User) GetMembers() error { org.Members = make([]*User, len(ous)) for i, ou := range ous { - org.Members[i], err = GetUserById(ou.Uid) + org.Members[i], err = GetUserByID(ou.Uid) if err != nil { return err } @@ -343,11 +343,11 @@ func RemoveOrgUser(orgId, uid int64) error { return nil } - u, err := GetUserById(uid) + u, err := GetUserByID(uid) if err != nil { return fmt.Errorf("GetUserById: %v", err) } - org, err := GetUserById(orgId) + org, err := GetUserByID(orgId) if err != nil { return fmt.Errorf("get organization: %v", err) } else if err = org.GetRepositories(); err != nil { @@ -380,10 +380,10 @@ func RemoveOrgUser(orgId, uid int64) error { // Delete all repository accesses. access := &Access{UserID: u.Id} for _, repo := range org.Repos { - access.RepoID = repo.Id + access.RepoID = repo.ID if _, err = sess.Delete(access); err != nil { return err - } else if err = watchRepo(sess, u.Id, repo.Id, false); err != nil { + } else if err = watchRepo(sess, u.Id, repo.ID, false); err != nil { return err } } @@ -443,7 +443,7 @@ func (t *Team) getRepositories(e Engine) (err error) { t.Repos = make([]*Repository, 0, len(teamRepos)) for i := range teamRepos { - repo, err := getRepositoryById(e, teamRepos[i].RepoID) + repo, err := getRepositoryByID(e, teamRepos[i].RepoID) if err != nil { return fmt.Errorf("getRepositoryById(%d): %v", teamRepos[i].RepoID, err) } @@ -487,7 +487,7 @@ func (t *Team) HasRepository(repoID int64) bool { } func (t *Team) addRepository(e Engine, repo *Repository) (err error) { - if err = addTeamRepo(e, t.OrgID, t.ID, repo.Id); err != nil { + if err = addTeamRepo(e, t.OrgID, t.ID, repo.ID); err != nil { return err } @@ -504,7 +504,7 @@ func (t *Team) addRepository(e Engine, repo *Repository) (err error) { return fmt.Errorf("getMembers: %v", err) } for _, u := range t.Members { - if err = watchRepo(e, u.Id, repo.Id, true); err != nil { + if err = watchRepo(e, u.Id, repo.ID, true); err != nil { return fmt.Errorf("watchRepo: %v", err) } } @@ -513,9 +513,9 @@ func (t *Team) addRepository(e Engine, repo *Repository) (err error) { // AddRepository adds new repository to team of organization. func (t *Team) AddRepository(repo *Repository) (err error) { - if repo.OwnerId != t.OrgID { + if repo.OwnerID != t.OrgID { return errors.New("Repository does not belong to organization") - } else if t.HasRepository(repo.Id) { + } else if t.HasRepository(repo.ID) { return nil } @@ -533,7 +533,7 @@ func (t *Team) AddRepository(repo *Repository) (err error) { } func (t *Team) removeRepository(e Engine, repo *Repository, recalculate bool) (err error) { - if err = removeTeamRepo(e, t.ID, repo.Id); err != nil { + if err = removeTeamRepo(e, t.ID, repo.ID); err != nil { return err } @@ -560,7 +560,7 @@ func (t *Team) removeRepository(e Engine, repo *Repository, recalculate bool) (e continue } - if err = watchRepo(e, u.Id, repo.Id, false); err != nil { + if err = watchRepo(e, u.Id, repo.ID, false); err != nil { return err } } @@ -574,7 +574,7 @@ func (t *Team) RemoveRepository(repoID int64) error { return nil } - repo, err := GetRepositoryById(repoID) + repo, err := GetRepositoryByID(repoID) if err != nil { return err } @@ -713,7 +713,7 @@ func DeleteTeam(t *Team) error { } // Get organization. - org, err := GetUserById(t.OrgID) + org, err := GetUserByID(t.OrgID) if err != nil { return err } @@ -903,7 +903,7 @@ func removeTeamMember(e Engine, orgId, teamId, uid int64) error { } // Get organization. - org, err := getUserById(e, orgId) + org, err := getUserByID(e, orgId) if err != nil { return err } diff --git a/models/repo.go b/models/repo.go index 8135bc57..1c4f09c4 100644 --- a/models/repo.go +++ b/models/repo.go @@ -129,8 +129,8 @@ func NewRepoContext() { // Repository represents a git repository. type Repository struct { - Id int64 - OwnerId int64 `xorm:"UNIQUE(s)"` + ID int64 `xorm:"pk autoincr"` + OwnerID int64 `xorm:"UNIQUE(s)"` Owner *User `xorm:"-"` LowerName string `xorm:"UNIQUE(s) INDEX NOT NULL"` Name string `xorm:"INDEX NOT NULL"` @@ -159,8 +159,8 @@ type Repository struct { *Mirror `xorm:"-"` IsFork bool `xorm:"NOT NULL DEFAULT false"` - ForkId int64 - ForkRepo *Repository `xorm:"-"` + ForkID int64 + BaseRepo *Repository `xorm:"-"` Created time.Time `xorm:"CREATED"` Updated time.Time `xorm:"UPDATED"` @@ -168,7 +168,7 @@ type Repository struct { func (repo *Repository) getOwner(e Engine) (err error) { if repo.Owner == nil { - repo.Owner, err = getUserById(e, repo.OwnerId) + repo.Owner, err = getUserByID(e, repo.OwnerID) } return err } @@ -177,17 +177,54 @@ func (repo *Repository) GetOwner() (err error) { return repo.getOwner(x) } +// GetAssignees returns all users that have write access of repository. +func (repo *Repository) GetAssignees() (_ []*User, err error) { + if err = repo.GetOwner(); err != nil { + return nil, err + } + + accesses := make([]*Access, 0, 10) + if err = x.Where("repo_id=? AND mode>=?", repo.ID, ACCESS_MODE_WRITE).Find(&accesses); err != nil { + return nil, err + } + + users := make([]*User, 0, len(accesses)+1) // Just waste 1 unit does not matter. + if !repo.Owner.IsOrganization() { + users = append(users, repo.Owner) + } + + var u *User + for i := range accesses { + u, err = GetUserByID(accesses[i].UserID) + if err != nil { + return nil, err + } + users = append(users, u) + } + return users, nil +} + +// GetAssigneeByID returns the user that has write access of repository by given ID. +func (repo *Repository) GetAssigneeByID(userID int64) (*User, error) { + return GetAssigneeByID(repo, userID) +} + +// GetMilestoneByID returns the milestone belongs to repository by given ID. +func (repo *Repository) GetMilestoneByID(milestoneID int64) (*Milestone, error) { + return GetRepoMilestoneByID(repo.ID, milestoneID) +} + func (repo *Repository) GetMirror() (err error) { - repo.Mirror, err = GetMirror(repo.Id) + repo.Mirror, err = GetMirror(repo.ID) return err } -func (repo *Repository) GetForkRepo() (err error) { +func (repo *Repository) GetBaseRepo() (err error) { if !repo.IsFork { return nil } - repo.ForkRepo, err = GetRepositoryById(repo.ForkId) + repo.BaseRepo, err = GetRepositoryByID(repo.ForkID) return err } @@ -211,7 +248,7 @@ func (repo *Repository) HasAccess(u *User) bool { } func (repo *Repository) IsOwnedBy(u *User) bool { - return repo.OwnerId == u.Id + return repo.OwnerID == u.Id } // DescriptionHtml does special handles to description and return HTML string. @@ -224,7 +261,7 @@ func (repo *Repository) DescriptionHtml() template.HTML { func isRepositoryExist(e Engine, u *User, repoName string) (bool, error) { has, err := e.Get(&Repository{ - OwnerId: u.Id, + OwnerID: u.Id, LowerName: strings.ToLower(repoName), }) return has && com.IsDir(RepoPath(u.Name, repoName)), err @@ -287,8 +324,8 @@ func IsUsableName(name string) error { // Mirror represents a mirror information of repository. type Mirror struct { - Id int64 - RepoId int64 + ID int64 `xorm:"pk autoincr"` + RepoID int64 RepoName string // <user name>/<repo name> Interval int // Hour. Updated time.Time `xorm:"UPDATED"` @@ -296,7 +333,7 @@ type Mirror struct { } func getMirror(e Engine, repoId int64) (*Mirror, error) { - m := &Mirror{RepoId: repoId} + m := &Mirror{RepoID: repoId} has, err := e.Get(m) if err != nil { return nil, err @@ -312,7 +349,7 @@ func GetMirror(repoId int64) (*Mirror, error) { } func updateMirror(e Engine, m *Mirror) error { - _, err := e.Id(m.Id).Update(m) + _, err := e.Id(m.ID).Update(m) return err } @@ -330,7 +367,7 @@ func MirrorRepository(repoId int64, userName, repoName, repoPath, url string) er } if _, err = x.InsertOne(&Mirror{ - RepoId: repoId, + RepoID: repoId, RepoName: strings.ToLower(userName + "/" + repoName), Interval: 24, NextUpdate: time.Now().Add(24 * time.Hour), @@ -365,7 +402,7 @@ func MigrateRepository(u *User, name, desc string, private, mirror bool, url str repo.IsBare = false if mirror { - if err = MirrorRepository(repo.Id, u.Name, repo.Name, repoPath, url); err != nil { + if err = MirrorRepository(repo.ID, u.Name, repo.Name, repoPath, url); err != nil { return repo, err } repo.IsMirror = true @@ -517,7 +554,7 @@ func initRepository(e Engine, repoPath string, u *User, repo *Repository, initRe if len(fileName) == 0 { // Re-fetch the repository from database before updating it (else it would // override changes that were done earlier with sql) - if repo, err = getRepositoryById(e, repo.Id); err != nil { + if repo, err = getRepositoryByID(e, repo.ID); err != nil { return err } repo.IsBare = true @@ -562,7 +599,7 @@ func createRepository(e *xorm.Session, u *User, repo *Repository) (err error) { } } - if err = watchRepo(e, u.Id, repo.Id, true); err != nil { + if err = watchRepo(e, u.Id, repo.ID, true); err != nil { return fmt.Errorf("watchRepo: %v", err) } else if err = newRepoAction(e, u, repo); err != nil { return fmt.Errorf("newRepoAction: %v", err) @@ -574,7 +611,7 @@ func createRepository(e *xorm.Session, u *User, repo *Repository) (err error) { // CreateRepository creates a repository for given user or organization. func CreateRepository(u *User, name, desc, lang, license string, isPrivate, isMirror, initReadme bool) (_ *Repository, err error) { repo := &Repository{ - OwnerId: u.Id, + OwnerID: u.Id, Owner: u, Name: name, LowerName: strings.ToLower(name), @@ -630,12 +667,12 @@ func GetRepositoriesWithUsers(num, offset int) ([]*Repository, error) { } for _, repo := range repos { - repo.Owner = &User{Id: repo.OwnerId} + repo.Owner = &User{Id: repo.OwnerID} has, err := x.Get(repo.Owner) if err != nil { return nil, err } else if !has { - return nil, ErrUserNotExist{repo.OwnerId, ""} + return nil, ErrUserNotExist{repo.OwnerID, ""} } } @@ -672,11 +709,11 @@ func TransferOwnership(u *User, newOwnerName string, repo *Repository) error { // Note: we have to set value here to make sure recalculate accesses is based on // new owner. - repo.OwnerId = newOwner.Id + repo.OwnerID = newOwner.Id repo.Owner = newOwner // Update repository. - if _, err := sess.Id(repo.Id).Update(repo); err != nil { + if _, err := sess.Id(repo.ID).Update(repo); err != nil { return fmt.Errorf("update owner: %v", err) } @@ -687,7 +724,7 @@ func TransferOwnership(u *User, newOwnerName string, repo *Repository) error { } // Dummy object. - collaboration := &Collaboration{RepoID: repo.Id} + collaboration := &Collaboration{RepoID: repo.ID} for _, c := range collaborators { collaboration.UserID = c.Id if c.Id == newOwner.Id || newOwner.IsOrgMember(c.Id) { @@ -703,7 +740,7 @@ func TransferOwnership(u *User, newOwnerName string, repo *Repository) error { return fmt.Errorf("getTeams: %v", err) } for _, t := range owner.Teams { - if !t.hasRepository(sess, repo.Id) { + if !t.hasRepository(sess, repo.ID) { continue } @@ -713,7 +750,7 @@ func TransferOwnership(u *User, newOwnerName string, repo *Repository) error { } } - if err = owner.removeOrgRepo(sess, repo.Id); err != nil { + if err = owner.removeOrgRepo(sess, repo.ID); err != nil { return fmt.Errorf("removeOrgRepo: %v", err) } } @@ -739,7 +776,7 @@ func TransferOwnership(u *User, newOwnerName string, repo *Repository) error { return fmt.Errorf("decrease old owner repository count: %v", err) } - if err = watchRepo(sess, newOwner.Id, repo.Id, true); err != nil { + if err = watchRepo(sess, newOwner.Id, repo.ID, true); err != nil { return fmt.Errorf("watchRepo: %v", err) } else if err = transferRepoAction(sess, u, owner, newOwner, repo); err != nil { return fmt.Errorf("transferRepoAction: %v", err) @@ -747,7 +784,7 @@ func TransferOwnership(u *User, newOwnerName string, repo *Repository) error { // Update mirror information. if repo.IsMirror { - mirror, err := getMirror(sess, repo.Id) + mirror, err := getMirror(sess, repo.ID) if err != nil { return fmt.Errorf("getMirror: %v", err) } @@ -794,7 +831,7 @@ func updateRepository(e Engine, repo *Repository, visibilityChanged bool) (err e repo.Website = repo.Website[:255] } - if _, err = e.Id(repo.Id).AllCols().Update(repo); err != nil { + if _, err = e.Id(repo.ID).AllCols().Update(repo); err != nil { return fmt.Errorf("update: %v", err) } @@ -831,7 +868,7 @@ func UpdateRepository(repo *Repository, visibilityChanged bool) (err error) { // DeleteRepository deletes a repository for a user or organization. func DeleteRepository(uid, repoID int64, userName string) error { - repo := &Repository{Id: repoID, OwnerId: uid} + repo := &Repository{ID: repoID, OwnerID: uid} has, err := x.Get(repo) if err != nil { return err @@ -840,7 +877,7 @@ func DeleteRepository(uid, repoID int64, userName string) error { } // In case is a organization. - org, err := GetUserById(uid) + org, err := GetUserByID(uid) if err != nil { return err } @@ -866,17 +903,17 @@ func DeleteRepository(uid, repoID int64, userName string) error { } } - if _, err = sess.Delete(&Repository{Id: repoID}); err != nil { + if _, err = sess.Delete(&Repository{ID: repoID}); err != nil { return err - } else if _, err = sess.Delete(&Access{RepoID: repo.Id}); err != nil { + } else if _, err = sess.Delete(&Access{RepoID: repo.ID}); err != nil { return err - } else if _, err = sess.Delete(&Action{RepoID: repo.Id}); err != nil { + } else if _, err = sess.Delete(&Action{RepoID: repo.ID}); err != nil { return err } else if _, err = sess.Delete(&Watch{RepoID: repoID}); err != nil { return err - } else if _, err = sess.Delete(&Mirror{RepoId: repoID}); err != nil { + } else if _, err = sess.Delete(&Mirror{RepoID: repoID}); err != nil { return err - } else if _, err = sess.Delete(&IssueUser{RepoId: repoID}); err != nil { + } else if _, err = sess.Delete(&IssueUser{RepoID: repoID}); err != nil { return err } else if _, err = sess.Delete(&Milestone{RepoID: repoID}); err != nil { return err @@ -902,7 +939,7 @@ func DeleteRepository(uid, repoID int64, userName string) error { } if repo.IsFork { - if _, err = sess.Exec("UPDATE `repository` SET num_forks=num_forks-1 WHERE id=?", repo.ForkId); err != nil { + if _, err = sess.Exec("UPDATE `repository` SET num_forks=num_forks-1 WHERE id=?", repo.ForkID); err != nil { return err } } @@ -946,7 +983,7 @@ func GetRepositoryByRef(ref string) (*Repository, error) { // GetRepositoryByName returns the repository by given name under user if exists. func GetRepositoryByName(uid int64, repoName string) (*Repository, error) { repo := &Repository{ - OwnerId: uid, + OwnerID: uid, LowerName: strings.ToLower(repoName), } has, err := x.Get(repo) @@ -958,7 +995,7 @@ func GetRepositoryByName(uid int64, repoName string) (*Repository, error) { return repo, err } -func getRepositoryById(e Engine, id int64) (*Repository, error) { +func getRepositoryByID(e Engine, id int64) (*Repository, error) { repo := new(Repository) has, err := e.Id(id).Get(repo) if err != nil { @@ -969,9 +1006,9 @@ func getRepositoryById(e Engine, id int64) (*Repository, error) { return repo, nil } -// GetRepositoryById returns the repository by given id if exists. -func GetRepositoryById(id int64) (*Repository, error) { - return getRepositoryById(x, id) +// GetRepositoryByID returns the repository by given id if exists. +func GetRepositoryByID(id int64) (*Repository, error) { + return getRepositoryByID(x, id) } // GetRepositories returns a list of repositories of given user. @@ -982,8 +1019,7 @@ func GetRepositories(uid int64, private bool) ([]*Repository, error) { sess.Where("is_private=?", false) } - err := sess.Find(&repos, &Repository{OwnerId: uid}) - return repos, err + return repos, sess.Find(&repos, &Repository{OwnerID: uid}) } // GetRecentUpdatedRepositories returns the list of repositories that are recently updated. @@ -993,8 +1029,8 @@ func GetRecentUpdatedRepositories(num int) (repos []*Repository, err error) { } // GetRepositoryCount returns the total number of repositories of user. -func GetRepositoryCount(user *User) (int64, error) { - return x.Count(&Repository{OwnerId: user.Id}) +func GetRepositoryCount(u *User) (int64, error) { + return x.Count(&Repository{OwnerID: u.Id}) } type SearchOption struct { @@ -1199,7 +1235,7 @@ type Collaboration struct { // Add collaborator and accompanying access func (repo *Repository) AddCollaborator(u *User) error { collaboration := &Collaboration{ - RepoID: repo.Id, + RepoID: repo.ID, UserID: u.Id, } @@ -1238,13 +1274,13 @@ func (repo *Repository) AddCollaborator(u *User) error { func (repo *Repository) getCollaborators(e Engine) ([]*User, error) { collaborations := make([]*Collaboration, 0) - if err := e.Find(&collaborations, &Collaboration{RepoID: repo.Id}); err != nil { + if err := e.Find(&collaborations, &Collaboration{RepoID: repo.ID}); err != nil { return nil, err } users := make([]*User, len(collaborations)) for i, c := range collaborations { - user, err := getUserById(e, c.UserID) + user, err := getUserByID(e, c.UserID) if err != nil { return nil, err } @@ -1261,7 +1297,7 @@ func (repo *Repository) GetCollaborators() ([]*User, error) { // Delete collaborator and accompanying access func (repo *Repository) DeleteCollaborator(u *User) (err error) { collaboration := &Collaboration{ - RepoID: repo.Id, + RepoID: repo.ID, UserID: u.Id, } @@ -1430,14 +1466,14 @@ func HasForkedRepo(ownerID, repoID int64) (*Repository, bool) { func ForkRepository(u *User, oldRepo *Repository, name, desc string) (_ *Repository, err error) { repo := &Repository{ - OwnerId: u.Id, + OwnerID: u.Id, Owner: u, Name: name, LowerName: strings.ToLower(name), Description: desc, IsPrivate: oldRepo.IsPrivate, IsFork: true, - ForkId: oldRepo.Id, + ForkID: oldRepo.ID, } sess := x.NewSession() @@ -1450,7 +1486,7 @@ func ForkRepository(u *User, oldRepo *Repository, name, desc string) (_ *Reposit return nil, err } - if _, err = sess.Exec("UPDATE `repository` SET num_forks=num_forks+1 WHERE id=?", oldRepo.Id); err != nil { + if _, err = sess.Exec("UPDATE `repository` SET num_forks=num_forks+1 WHERE id=?", oldRepo.ID); err != nil { return nil, err } diff --git a/models/update.go b/models/update.go index 33b7733e..f381d6fd 100644 --- a/models/update.go +++ b/models/update.go @@ -105,7 +105,7 @@ func Update(refName, oldCommitId, newCommitId, userName, repoUserName, repoName commit := &base.PushCommits{} if err = CommitRepoAction(userId, ru.Id, userName, actEmail, - repos.Id, repoUserName, repoName, refName, commit, oldCommitId, newCommitId); err != nil { + repos.ID, repoUserName, repoName, refName, commit, oldCommitId, newCommitId); err != nil { log.GitLogger.Fatal(4, "CommitRepoAction: %s/%s:%v", repoUserName, repoName, err) } return err @@ -154,7 +154,7 @@ func Update(refName, oldCommitId, newCommitId, userName, repoUserName, repoName } if err = CommitRepoAction(userId, ru.Id, userName, actEmail, - repos.Id, repoUserName, repoName, refName, &base.PushCommits{l.Len(), commits, ""}, oldCommitId, newCommitId); err != nil { + repos.ID, repoUserName, repoName, refName, &base.PushCommits{l.Len(), commits, ""}, oldCommitId, newCommitId); err != nil { return fmt.Errorf("runUpdate.models.CommitRepoAction: %s/%s:%v", repoUserName, repoName, err) } return nil diff --git a/models/user.go b/models/user.go index 3b28f5ed..16caa18b 100644 --- a/models/user.go +++ b/models/user.go @@ -257,7 +257,7 @@ func (u *User) GetOrganizations() error { u.Orgs = make([]*User, len(ous)) for i, ou := range ous { - u.Orgs[i], err = GetUserById(ou.OrgID) + u.Orgs[i], err = GetUserByID(ou.OrgID) if err != nil { return err } @@ -586,7 +586,7 @@ func GetUserByKeyId(keyId int64) (*User, error) { return user, nil } -func getUserById(e Engine, id int64) (*User, error) { +func getUserByID(e Engine, id int64) (*User, error) { u := new(User) has, err := e.Id(id).Get(u) if err != nil { @@ -597,9 +597,20 @@ func getUserById(e Engine, id int64) (*User, error) { return u, nil } -// GetUserById returns the user object by given ID if exists. -func GetUserById(id int64) (*User, error) { - return getUserById(x, id) +// GetUserByID returns the user object by given ID if exists. +func GetUserByID(id int64) (*User, error) { + return getUserByID(x, id) +} + +// GetAssigneeByID returns the user with write access of repository by given ID. +func GetAssigneeByID(repo *Repository, userID int64) (*User, error) { + has, err := HasAccess(&User{Id: userID}, repo, ACCESS_MODE_WRITE) + if err != nil { + return nil, err + } else if !has { + return nil, ErrUserNotExist{userID, ""} + } + return GetUserByID(userID) } // GetUserByName returns user by given name. @@ -651,7 +662,7 @@ func GetEmailAddresses(uid int64) ([]*EmailAddress, error) { return nil, err } - u, err := GetUserById(uid) + u, err := GetUserByID(uid) if err != nil { return nil, err } @@ -697,7 +708,7 @@ func (email *EmailAddress) Activate() error { return err } - if user, err := GetUserById(email.Uid); err != nil { + if user, err := GetUserByID(email.Uid); err != nil { return err } else { user.Rands = GetUserSalt() @@ -824,7 +835,7 @@ func GetUserByEmail(email string) (*User, error) { return nil, err } if has { - return GetUserById(emailAddress.Uid) + return GetUserByID(emailAddress.Uid) } return nil, ErrUserNotExist{0, "email"} diff --git a/modules/auth/apiv1/miscellaneous.go b/modules/auth/apiv1/miscellaneous.go index 4e757005..e05b4838 100644 --- a/modules/auth/apiv1/miscellaneous.go +++ b/modules/auth/apiv1/miscellaneous.go @@ -14,9 +14,9 @@ import ( ) type MarkdownForm struct { - Text string `form:"text"` - Mode string `form:"mode"` - Context string `form:"context"` + Text string + Mode string + Context string } func (f *MarkdownForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors { diff --git a/modules/auth/auth.go b/modules/auth/auth.go index 7e01abc3..92bcd720 100644 --- a/modules/auth/auth.go +++ b/modules/auth/auth.go @@ -54,7 +54,7 @@ func SignedInId(req *http.Request, sess session.Store) int64 { return 0 } if id, ok := uid.(int64); ok { - if _, err := models.GetUserById(id); err != nil { + if _, err := models.GetUserByID(id); err != nil { if !models.IsErrUserNotExist(err) { log.Error(4, "GetUserById: %v", err) } @@ -127,7 +127,7 @@ func SignedInUser(req *http.Request, sess session.Store) (*models.User, bool) { return nil, false } - u, err := models.GetUserById(uid) + u, err := models.GetUserByID(uid) if err != nil { log.Error(4, "GetUserById: %v", err) return nil, false diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go index 98639021..d15135c9 100644 --- a/modules/auth/repo_form.go +++ b/modules/auth/repo_form.go @@ -98,11 +98,11 @@ func (f *NewSlackHookForm) Validate(ctx *macaron.Context, errs binding.Errors) b // \/ \/ \/ type CreateIssueForm struct { - IssueName string `form:"title" binding:"Required;MaxSize(255)"` - MilestoneId int64 `form:"milestoneid"` - AssigneeId int64 `form:"assigneeid"` - Labels string `form:"labels"` - Content string `form:"content"` + Title string `binding:"Required;MaxSize(255)"` + LabelIDs string `form:"label_ids"` + MilestoneID int64 + AssigneeID int64 + Content string } func (f *CreateIssueForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors { diff --git a/modules/base/tool.go b/modules/base/tool.go index 92f493af..2435ebe0 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -420,3 +420,21 @@ func Subtract(left interface{}, right interface{}) interface{} { return fleft + float64(rleft) - (fright + float64(rright)) } } + +// StringsToInt64s converts a slice of string to a slice of int64. +func StringsToInt64s(strs []string) []int64 { + ints := make([]int64, len(strs)) + for i := range strs { + ints[i] = com.StrTo(strs[i]).MustInt64() + } + return ints +} + +// Int64sToMap converts a slice of int64 to a int64 map. +func Int64sToMap(ints []int64) map[int64]bool { + m := make(map[int64]bool) + for _, i := range ints { + m[i] = true + } + return m +} diff --git a/modules/bindata/bindata.go b/modules/bindata/bindata.go index 41a694ce..f383af91 100644 --- a/modules/bindata/bindata.go +++ b/modules/bindata/bindata.go @@ -127,7 +127,7 @@ func confAppIni() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/app.ini", size: 9252, mode: os.FileMode(420), modTime: time.Unix(1439217966, 0)} + info := bindataFileInfo{name: "conf/app.ini", size: 9252, mode: os.FileMode(420), modTime: time.Unix(1439218861, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -772,7 +772,7 @@ func confLocaleLocale_deDeIni() (*asset, error) { return a, nil } -var _confLocaleLocale_enUsIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xc4\x7d\xeb\x72\xdc\x46\xb2\xe6\x7f\x3c\x05\xac\x0d\xad\xec\x08\xaa\x15\xb6\x63\x2f\xe1\x90\xe4\xa5\x49\xeb\x32\x47\x14\x79\x44\x6a\x66\x67\x15\x0a\x0c\xba\x01\x76\x63\xd8\x0d\xb4\x01\x34\xdb\x3d\xbf\xf6\x35\xf6\xf5\xf6\x49\x36\xf3\xcb\xcc\xba\x00\x68\x4a\x9e\x73\x62\xcf\x1f\xb2\xba\x2a\xeb\x96\x95\x95\x95\xb7\x2a\xe4\xdb\x6d\x56\x94\xdd\x22\x7d\x91\x9e\xa6\xdb\xbc\xaa\xd7\x65\xd7\xa5\x5d\xb9\xbe\x7d\xba\x6a\xba\xbe\x2c\xd2\xd7\x55\x4f\xbf\xdb\xfb\x6a\x51\x26\xc9\xaa\xd9\x94\x04\xfa\x86\xfe\x25\x45\xde\xad\xe6\x4d\xde\x16\x94\x71\x6e\xe9\xa4\xfc\x7d\xbb\x6e\x5a\x06\xfa\x55\x52\xc9\xaa\x5c\x6f\xb9\x0e\xfd\x4b\xba\x6a\x59\x67\x55\x4d\x3f\xaf\x29\x95\xbe\xad\x93\xae\x59\x54\xf9\x3a\x0b\x0a\x90\x61\xe5\x3f\xa5\x3f\xd4\x45\x7a\xdd\x97\xdb\xf4\x79\xb7\xc9\xd7\xeb\x97\x79\x87\x2a\x7d\x99\xe6\x8b\x45\xb3\xab\xfb\xe7\xcf\xa4\x40\x1a\x6f\x76\xbd\xb5\x7e\xb9\xeb\x25\x6f\xb7\xb5\xac\x8f\xdb\xa4\x2d\x97\x15\x4d\xac\xa5\xac\x0f\x9a\x4c\xf6\xe5\xbc\xab\x7a\x1e\xf4\x5f\x24\x95\xdc\x97\x6d\x57\x35\x3c\x9e\x3f\x4b\x2a\xd9\xe6\x4b\x06\xb8\xa2\x7f\x49\x5f\x6e\xb6\xeb\x1c\x15\x6e\x34\x99\xac\xf3\x7a\xb9\x13\x98\x77\x9a\x4c\x16\x6d\x49\x45\x59\x5d\xee\x29\xf7\x0c\x3f\x52\xfa\x31\x9b\xcd\x92\x1d\xe1\x34\xdb\xb6\xcd\x6d\xb5\x2e\xb3\xbc\x2e\xb2\x8d\x60\xed\x23\xe5\xa7\x9a\x9f\x52\x7e\xca\xf9\x98\x46\x59\x10\x82\xb2\xbc\xd3\xb9\xd0\xd2\x10\xbe\xf2\x2e\x41\x53\x75\xbe\xb1\xda\x9c\x4c\xca\x4d\x5e\xad\x79\x11\x9e\x72\x82\x06\xdf\x75\xfb\x06\x4b\x75\xa5\x49\x42\x44\xd6\x1f\xb6\x25\xf0\xf0\xf4\x86\x52\xc9\x22\xdf\xf6\x8b\x55\xce\x63\x95\x54\x42\x40\xdb\x86\x10\xd2\xb4\x07\xc0\xd9\x8f\xa4\x69\x97\x79\x5d\xfd\x23\xef\x05\x49\x97\xc1\xcf\x64\x53\xb5\x6d\xc3\xf8\xbd\x40\x22\xa1\x19\x67\xdc\x0e\xe5\xbc\x27\x4c\x04\xad\x70\xc9\xa6\x5a\xb6\x82\x4a\x2e\xbc\xc0\x2f\x6e\x85\xcb\x6e\x9b\xf6\x4e\x0b\x5e\x71\x72\x50\x95\x06\xa1\xa5\x71\xff\x79\x4d\xc8\xd7\xd2\x0b\xfc\x88\x00\xba\x24\x2f\x36\x84\xca\x6d\x5e\x97\x8c\xa3\x53\xfe\x45\x78\xa1\x5f\x89\xd2\x54\xd6\x95\x7d\x5f\xd5\x4b\x46\xf6\xa9\x64\xa5\xd7\x9a\x95\x04\x65\x2e\xef\xd0\xec\xdc\x72\x52\xfe\x5f\xe9\x67\x7a\x25\x3f\xa5\x2c\xa8\x84\x42\x57\x93\x67\xd2\x65\xb7\x65\x59\xc8\x5c\xba\xf4\x15\xa5\x93\xed\x6e\xbd\x26\xac\xfd\xb6\x2b\xbb\x9e\x2b\x5d\xd1\x6f\x9a\xbf\xfc\x4e\xaa\xae\xa3\x04\x65\xbf\x45\x22\xa1\xa5\xab\x17\x98\xcc\x19\x12\x49\xf2\xa9\x2b\xf3\x76\xb1\xfa\x9c\xc8\x7f\x8c\x95\x13\x4c\x7b\xc7\x16\x95\x09\x49\x89\x48\x7a\xb0\x0e\x92\x45\x53\xf0\x8f\x33\xfa\x47\x4d\x57\x75\xd7\xd3\x8e\xfb\x9c\x68\x82\xc1\x24\x25\x0b\xd0\x57\x3d\xb0\xa0\x99\xd8\xbe\x1d\xaf\x60\xfa\xaa\x6a\xbb\xfe\x69\x5f\x11\xb1\x7e\xd8\xd5\x09\xcf\x8f\x76\x5b\x56\xcc\x8d\x09\xbd\x6e\x08\x45\xc8\x6e\x69\x7e\x17\x87\xeb\x7f\x7d\x77\x92\x5e\x11\x27\x5a\xb6\x25\xa5\x53\x6a\x83\xfe\x51\x9d\x1f\x67\x09\xd5\xb2\x9e\xce\xf3\x3e\x9f\xe7\x5d\xe9\xd1\xca\x85\x42\xdd\xae\x0c\x34\xce\x5c\x0d\x1c\xac\xeb\xa3\xf9\x4e\xed\x10\x6a\x43\xf7\x95\x6b\xe3\x3d\x6f\x2e\xca\x67\xa6\x86\xca\x57\xeb\x92\xf3\xa9\xa9\xf4\xed\xfb\xf7\x97\xe7\xbf\xa4\x65\xbd\xac\xea\x32\xdd\x57\xfd\x2a\xdd\xf5\xb7\xff\x3d\x5b\x96\x75\xd9\x12\x8f\x5b\x54\x29\xed\xa9\x96\x28\x21\x25\xc2\x96\xc9\xcd\x92\xae\x5b\xd3\xde\x07\x7a\xaf\xaf\xdf\xa5\x17\x8c\xe2\x6d\xde\xaf\x30\x90\x7e\x95\x74\xbf\xad\x19\x45\xae\xc3\x9b\x55\x99\x82\xca\x00\xd4\xdc\x1a\x3e\xd2\x42\xc7\x38\x4b\xca\xb6\xcd\x88\x2d\xf5\x87\x4c\x2b\x6b\x7b\x43\x48\x69\x82\x48\xa7\x6e\xfa\x74\x5e\xa6\xa8\x33\x4b\x12\x1b\xb0\x61\xf7\x74\xbb\x5d\x57\x0b\xd9\xeb\xaf\xa5\xcc\x23\x9a\x4f\x10\xc5\x52\x08\x07\x44\x59\x59\x80\x2e\x62\xcf\xbc\x1f\xd2\x88\x81\xa0\xfe\xaa\x24\x06\xb8\xda\x2d\x85\xed\xad\x9b\x5d\xf1\x0d\x28\xd5\x46\xef\x09\x35\xfd\xd0\xd0\x80\x81\x1d\x07\xe0\xbb\x38\x25\x8a\xe3\x43\xab\x2d\x37\x0d\xf1\x15\x47\xec\x15\x11\xd4\xbe\xa2\x42\x9a\x69\x97\xdf\xd3\x7e\xeb\x9b\xb4\x5f\x55\x5d\x5a\x10\xb1\x2d\xb8\x61\xda\x1a\x3b\x3a\x2e\x84\x2c\x88\x40\x85\x34\x2c\x2f\x5e\x03\x40\x6d\x76\x44\x4d\x2b\x6a\x8c\x0f\x23\x3e\x39\xa9\xc9\xa9\x71\x62\x4a\xd4\x0e\xe8\x9b\x28\xb7\x21\xae\xcc\x7c\xf3\x1c\x09\xfd\x1d\xb6\x4f\xa3\xca\x6f\x6f\x69\x54\x1d\x51\xc5\x9b\x74\xb1\x6e\x88\xa4\x3e\x7e\x78\x47\x95\x57\x7d\xbf\xcd\xb6\x4d\x0b\x32\xbe\xb9\xb9\xa2\xed\xd1\xf6\x3e\x37\xc0\x35\xc3\xd4\xbb\xcd\x9c\x7e\xed\x57\x15\x31\x81\x3c\x58\x20\xa0\x62\xcd\xe7\x5f\x9d\x36\xf5\x0c\x6b\xb5\x6b\xd7\x83\x65\xa4\x2e\xad\xe4\xc8\xf0\x78\x08\xcf\xf8\xcf\xb5\x1f\x25\xa6\xdb\x91\x90\xb0\xc7\xa2\xd2\x54\x4b\x9c\x43\x44\x5b\xcd\x96\xdb\x0d\x88\xeb\x52\x33\x3c\x45\xe1\xec\x72\xe5\x72\x82\x51\x29\x44\x90\x80\x0b\x6f\x68\xc2\xba\x9b\xaf\x2f\x08\x0d\xd8\xd2\xc8\xbd\x6d\x9b\x0d\xe5\xbe\xa2\x7f\x3e\xc3\x0f\xff\x82\xdb\x03\x4c\x5e\x14\xc4\x66\xba\x93\xf4\xc3\xab\xb3\xf4\xbf\xfc\xf8\xc3\x0f\xb3\xf4\x6d\xcf\x1b\x82\x69\xe4\xef\xbc\xb6\x94\x94\xa3\xd4\x81\xd2\xce\xed\x69\xf9\x1f\x31\x81\x3f\x4a\x9f\xa3\xf4\x7f\x94\xbf\xe7\x24\x06\x94\xb3\x45\xb3\x79\xc9\x9b\x7b\x93\xf7\xb3\x84\x4b\x88\x6a\x94\x9c\xae\xcb\xba\xa0\x84\x1e\xc8\x5a\x16\x70\x1d\x2d\x0f\x8e\x67\x11\x4e\xb2\x45\x53\xdf\x56\x2d\x4f\xe8\xd7\x3a\x9f\x13\x4e\x4c\x6c\x21\x76\x8c\x12\x3b\xf5\x08\x69\xb4\x91\xab\xdb\x83\x07\xc5\x54\xdf\x73\xa6\x2e\x68\xc2\xa2\x5c\xc9\xc7\x11\xd0\xe9\xb0\x7c\x8d\x6c\xac\xdb\x25\x4d\xaf\x35\x7c\x77\x1e\xe1\xcd\xed\xed\x9a\x18\x9b\x31\x2b\xed\xe1\x52\x72\x85\x6f\x85\x20\x44\x8c\x5b\x08\x5e\xe7\x55\x07\xc8\xb3\xf3\xf7\x69\x79\x4f\xd4\x46\xe4\x40\x27\x65\xb1\x5b\x80\xc2\x18\xf6\x24\xe5\x63\x82\xf0\x4b\x9c\x61\x21\xec\x2d\xd8\xab\x3c\x34\x66\x08\x0b\x02\xa2\x2d\x5a\x48\x7b\x99\x20\xa8\x35\x11\xc4\xba\xb9\x66\xd9\x35\x2c\x9b\xac\x30\x1a\x1d\x56\xa9\x1b\xd6\xa5\xe5\xae\xd7\x87\x14\xf2\x02\xe8\x42\x24\x3a\x13\x3d\xbb\x59\xa2\x67\x95\x09\xb0\xd9\x7d\x05\x61\xcf\x2d\x15\x4a\x4d\x9a\x65\xf6\xf0\x67\x06\x60\x29\xb2\x9b\xac\xeb\x06\x76\xc9\x1d\x77\x4e\xd0\xe3\xf1\x75\x18\x02\x7a\x60\x69\x94\x88\xf1\xbe\x02\xa7\x51\x64\x61\xac\x84\x31\x74\x4d\x5d\x75\x65\x89\x16\xa8\xfe\x33\x6a\x13\x75\x66\x2a\xfc\xa8\x3c\x62\xe7\x2e\xc9\x24\x69\xd1\xa4\x7c\x10\x80\x9d\x51\x6d\x9b\x6a\xad\xd3\xd7\x39\xa7\x6d\xb5\x5c\x11\x5f\x69\xf6\x27\x82\xb4\xfd\xaa\x29\x99\x76\xde\x9e\xbf\xf8\x5e\xc6\xb1\x64\xe6\xe6\x2a\x31\x5b\xcc\x77\x7d\xc3\x74\xaa\x4b\x28\x43\x70\xc7\x0b\x20\x47\x62\x96\x00\x0d\x05\x5b\x13\xdd\xc6\xa7\xb5\xee\x93\xb0\x4c\x37\x88\x87\x91\xda\x03\xe1\x58\xa5\x98\x6c\xd9\x40\x3c\x33\xa9\x85\x59\x35\x49\xfa\x5d\x9f\x2d\xab\x3e\xbb\xe5\x0d\xcb\x6d\xbe\xe2\xba\x7c\x72\x50\x49\xfa\x84\x8a\x9e\xa4\xb4\xeb\x49\xe6\x2c\x7e\x4a\x1f\xdf\xeb\x71\xfd\x23\xef\xc4\x2c\xbf\x27\x58\x2c\x86\x0a\x7d\x6d\x29\xd2\x82\x69\x17\x45\x43\x74\xce\x38\xef\x76\x5b\x70\x74\x3d\xa1\x4f\xd2\xad\x00\x16\xcd\xbe\x5e\x37\x79\x01\x96\x43\xbb\xab\x82\x6e\x34\xaf\xea\x9c\x4e\x17\x6b\x05\xac\xec\x31\x51\xc3\xfb\xcb\x1b\x00\x2e\x9b\xf9\xae\x5a\x17\x06\x30\xa3\x19\xde\xe7\xeb\xaa\x60\x39\x4b\xd7\x3d\x94\x69\x2c\xab\x92\xb1\x2c\x9a\x96\x8f\x43\xcc\xc6\x2a\x1e\x39\x87\x5b\x3e\xdf\x90\x4d\x75\x15\x16\xf5\xdc\x91\xc9\x68\xa0\x85\x87\x00\xca\x07\x2a\x28\xa6\xea\xea\x27\x3d\x46\xba\xd8\x51\x5f\xb4\xe8\x9c\x4d\x15\xbb\xf4\xe9\x4b\xfa\x9b\xf0\xf1\x2c\x7c\x6f\x39\x46\x3c\x17\xa6\x52\xb8\x93\x5d\x1a\x0d\x35\x22\x6f\x47\x5d\x46\xbc\xc1\x5c\xc3\xf1\x1a\x09\x74\x3b\xa1\x57\x56\x04\xd7\xb4\xac\xe5\x37\x94\x78\x42\x1b\x78\xb9\xc6\x22\xe4\x90\x5e\x48\x8c\x6b\x08\x6f\x4c\x20\x27\xb2\x5d\x6e\x69\x6a\xcc\x3b\xfb\xfc\x8e\xc6\x96\xb7\x24\x84\x25\x9f\x58\x59\xfe\x9c\xec\x44\x00\x6a\xd6\x85\x13\x36\x41\xd3\x4d\x3b\x54\xce\x3c\x90\xa3\xd7\x8e\xa4\xc8\xc5\x2a\x73\xaa\x36\x23\xa5\x2f\x7f\xc7\x99\x87\x22\xaf\x79\x33\xb1\x73\x51\xb2\x39\x60\xb9\x78\x12\x17\x07\xbf\x5a\x24\xfe\xd0\x16\x21\x11\x7d\xde\x30\xd6\xee\x4b\x07\x75\x16\xe6\xc6\x15\xa8\x2d\x12\xd4\xb4\xa9\x58\x87\xa2\x22\x51\xf4\xb4\x54\x94\x3d\x52\x45\x3e\xa9\x09\xe0\x73\x62\x1d\x44\x4d\x26\x9f\x88\x19\x90\x5e\xe2\x75\xe3\xcc\x16\xc7\xe9\xc8\xac\xd2\x29\x3f\xf0\xe7\xe0\xaa\xdc\xf2\x91\xb9\xe9\xb0\xaa\x6b\x82\x2c\x0e\x2a\x7b\xb9\xf5\xfd\x59\x38\x2d\x2d\x38\xf1\xa7\x6f\xcc\xb8\xf0\x07\x9b\xf8\xa5\xa2\x95\x44\xfd\xf8\xe4\x10\x85\x9d\x64\x64\x58\x29\xda\xf6\x70\x92\x46\x67\xd0\x8a\x74\xf3\x79\x49\x07\x9c\x56\x2b\x66\xa6\x1d\xf0\xaa\xe5\x0b\x21\x79\x18\x1a\x40\xa4\x52\xb3\x69\x87\x47\x1a\x8f\x50\x18\x94\xf6\xe2\x0e\x7c\x1c\xe7\xe1\xa9\x3f\xd1\x27\x21\x6c\x53\xb2\xcc\x97\x6d\x44\xb7\x97\x5f\xe9\x45\x99\x90\x60\xb2\xa4\xfd\x68\xf4\xf6\x82\x55\xb2\x25\x24\x54\x25\x37\x06\x28\xfb\x90\x83\x2a\x84\xe5\xfc\x6c\x06\x15\xda\xd8\x7b\xe8\xab\xb4\x35\x47\xe8\xa7\xb3\x86\x8a\x67\xc6\x91\xe5\xc0\x85\x7c\xd2\xd1\x66\xf7\x48\x3c\x65\x63\x48\x1a\x42\xa9\x9c\xe8\xa7\xc5\x15\x78\xd3\x3f\x9f\xbf\x7c\xdc\x3d\x7f\x36\x7f\xe9\x58\xe3\x62\x55\x2e\xee\x44\x97\xa8\xea\x79\xf3\x3b\x14\x2e\x5a\x78\xc6\x71\xcd\x5b\xe4\x71\x91\xae\xa8\x14\x32\x39\x6d\x65\xaa\x46\x88\xe7\xd2\x68\xd1\x68\x30\xbc\xe3\x67\x66\x9a\x72\x87\x83\x11\x12\xd5\x46\x27\x32\xb2\x84\x96\x91\xf7\x0e\x74\x7a\x4f\xb7\xa7\x9c\xcb\x94\x0b\x36\xef\x49\x17\xf3\x5d\x57\x9b\xaa\x1f\x91\x0e\xf3\x91\x5c\x49\x50\xf5\x7c\xc3\x25\xda\x02\x36\x30\x16\xe2\xc6\xd4\x0c\x9d\x9b\x46\x4e\xfb\x9c\xd4\x9b\x1f\x53\x22\xa1\x1d\x9d\x42\x3c\x27\x1a\x26\xb1\xe3\x9c\x0f\x5e\x52\x10\xf2\x2e\xdb\xd5\x8a\xd6\xb2\x30\x62\x7a\x53\xe1\x90\xe0\x7e\x8d\xe4\x03\x28\xc3\xbc\xca\xb9\xe9\xb7\x0e\xe3\xdf\x91\x50\x7c\xeb\xaa\x31\xe7\xe6\x01\x55\x2c\x93\xe5\x93\x8b\x47\x9c\xad\x2e\x45\xbd\x02\x06\x18\x8e\x17\x9a\x94\x03\xbf\x7a\xa4\x61\xdc\x51\x0e\x16\x64\xbe\xeb\xfb\x86\x65\xee\x35\x53\x8d\xd4\xb1\x51\x9f\x01\x10\x6a\x84\x6f\x0f\x0b\x12\xe2\x49\xd6\xa6\x34\x19\x38\xf3\x46\x42\xd5\x56\x06\xb3\xd3\xa3\xce\x81\x15\xa2\xae\xe7\xf5\xc1\x48\x99\x08\x82\x47\xc1\x1d\xf6\xd3\x63\xf9\xb6\x2d\xbf\xf3\xa3\x71\x7b\x06\x35\x6c\x44\x52\x3d\xd8\x4f\x1f\x50\x2a\xe6\x21\xdb\x75\x76\x72\xa9\x91\xc5\xd3\x47\x1b\xa3\x17\xe5\xbc\x33\x88\xc1\x92\xd8\x58\x00\xd1\x34\x0b\xd4\x9e\x0d\xfa\xf2\xea\xce\x18\x83\x7d\x3c\x64\x7f\x00\xf5\x4d\x93\x75\x2b\x51\x2d\x6d\x78\xe9\xba\xac\x97\x91\x99\x00\x26\x62\x10\xdd\x7f\xe5\x63\x8e\x04\xf8\x7c\xfd\x39\x39\xc0\x1e\xf5\x57\xe2\xf0\x35\x2c\x7d\x4d\x42\x05\xa2\x8c\x5c\x20\x41\xa0\xac\x19\x7d\x4e\xf8\x08\x7c\x3f\x10\xeb\xf8\x88\xd0\xbc\x40\xbe\x40\xd1\xaf\x91\xb4\x66\x4b\x98\x5c\x4d\x88\x80\x1f\x4a\x6f\xd1\x44\xca\x4d\x91\x94\xe8\x1b\x53\x75\x48\x9f\xbe\x2b\xb5\xf1\x37\xa4\x36\x77\x1f\xa1\xf6\x8a\x0e\xcb\x0a\xef\x55\x7e\x60\xa1\x4b\xb2\xf5\x07\x0a\x6e\xca\x7c\xa3\xa3\xe4\xa4\x34\x71\x4a\xc7\x99\x66\x72\x92\x4e\xb9\xc0\xaa\x91\x40\xfc\xb0\x29\x88\x2c\xa2\xc7\xbe\x13\xff\x4b\x35\x97\xfe\x6d\x64\x8a\xf9\x5b\x92\xaf\xb7\xab\x1c\xe7\x7f\x00\x06\xab\x03\x01\x61\xe1\x53\x80\x80\x16\x76\x9b\xb2\xad\x16\x9c\xe4\x0a\xdf\x3e\xcd\xbe\x83\xc1\x89\x36\x0a\x09\x82\x71\x63\x05\x6d\x92\x7f\xaa\x41\x4e\xb3\x90\x18\xb6\xdb\x55\xff\xb0\x59\x44\xcd\x71\x3e\xf1\x1c\x82\x80\x48\xe6\xa1\x1c\x10\x0e\x46\x16\xcf\xfa\x94\xf9\x42\xcf\x22\x60\xd4\xf4\x26\xff\xfd\x4b\x15\x37\xcd\x44\x3d\x61\x05\xbe\x92\x6d\x78\x9d\x62\xcc\x0e\x08\x9e\xed\x1b\x47\xa1\x69\xe9\x19\xa4\xbe\xa3\x53\xad\x76\x60\x1f\xe5\x77\x8a\xdf\x3f\x99\xf1\x9c\x8e\x10\x15\xa0\x53\x67\x46\xa7\xc3\xb9\x60\xbe\x09\x41\x78\xe6\xb7\x5b\x28\x1c\x3b\x72\x66\x31\xd2\x54\x7e\xc7\x38\x48\xa2\x14\x3d\x81\x48\x6a\xe6\x2d\xfe\x19\x9f\x91\x19\x0b\x9d\x75\x28\x5a\xba\xd3\xd3\xce\x17\x40\x88\xdd\x37\x1b\xd7\x1b\x6c\xb8\xa3\xd5\x49\x14\x98\xa8\x7d\x39\x36\xe4\x1d\xa9\xdf\xd3\x96\x99\x68\xc0\xed\xa4\xa3\x15\x65\x31\x51\x89\x66\x5e\x8c\x78\xc1\xb8\x22\x83\x91\xda\xb3\x5e\x97\x4b\x36\x35\x59\xc7\x51\x6f\x4a\x42\x74\x18\x08\x58\x48\x40\x1e\xc3\x6e\xb1\xc2\x75\x0d\x85\x78\xb7\x46\xb1\xfa\x44\xa3\x26\x71\x9c\x92\x5c\x33\x50\xa2\x74\x18\x7a\x92\x6f\x58\x5f\xe8\x76\xcc\x9a\x59\xb7\x10\xe9\x24\x5e\x0d\x3e\x78\xd1\x54\x89\x2e\x8e\x37\x4f\xb4\xc8\x0a\xd7\x97\xda\x07\xd8\x1f\x6c\x3a\x54\xb7\xc7\x0d\x6b\xe3\x0e\xe8\x58\xb3\x4e\x21\x2c\x7f\xaf\x60\xb6\x7b\x5d\xb1\x39\x08\x2a\xa1\xd3\x84\x51\x36\x4b\xd6\xc4\x0c\x58\xf5\x90\x59\x89\x1c\xdb\xdc\xb3\xe6\xc6\xfd\x71\xa9\xd4\x13\x33\x9e\x4e\x8a\xd7\x59\x95\x4b\x52\xe6\x9a\x7d\x59\x9c\xd0\x11\xcf\x35\x68\x9c\x60\x1b\xf9\x7a\x9f\x1f\x3a\xd8\x48\x8c\xe3\xb0\xc9\x52\xaa\x33\x3b\x21\x01\x60\x89\x51\x85\xf6\x69\xda\x71\x86\x89\x8e\x78\x27\x1f\x1e\xee\x98\xde\x43\x3d\x04\xb7\x50\xab\x0b\x69\xdd\x7c\xec\xe1\x88\xd5\xb3\x86\x55\x5b\x56\x04\x59\xc6\x97\xe2\xa0\x21\xb8\x3c\x94\xf3\x4f\xd4\x3d\x61\xf1\x88\xba\x61\x61\x85\xf8\xb1\xe0\x9a\xe4\x3f\xc2\x2c\x86\x14\xd8\x0a\x76\xd4\xfe\x53\x91\x8b\x2b\xc2\x21\xeb\x59\x5e\x7d\xe6\xb3\x89\x56\xc5\x0c\xbb\x92\x0f\xe5\x37\xe9\x7a\xda\x02\x8c\x69\x73\xd3\xfd\x55\xe4\x2b\x55\x99\xb9\x14\x5b\x0c\x68\xea\x56\xd5\x36\x6d\x60\x2c\x0c\x51\xe8\xc9\x36\x10\x31\x09\x1b\x45\x09\xb9\x9b\xad\xa6\x6d\x5e\x77\xb7\x25\xcc\xa7\x9b\xf4\x96\x3d\x41\x33\xed\x9a\x25\x56\x71\xd7\x1d\xe9\x59\x74\x18\x74\x1d\x9e\x16\x58\xbb\x60\xa1\xe2\xae\x09\xe6\x1e\x3d\xeb\x18\x80\x55\xdf\x52\x67\x63\x60\x32\x1b\xa1\x00\x52\x63\xe4\xa4\xb0\xd1\xdc\x97\x21\x22\x6e\xff\xd9\x99\x07\x58\x57\x0b\xb1\x98\xd5\xe3\x65\x92\x4e\x61\xad\x80\x8f\x69\x7e\x88\x67\xcf\x55\x1d\x05\xb0\xc7\xe3\xbe\xd4\x5e\x78\x63\xf0\x5e\x19\x34\x08\x2b\x85\xd7\x15\x92\x3e\x87\xca\x37\xa7\x21\x2e\x56\xd1\xee\xbc\x41\x49\x2a\x25\xa3\x0d\x9a\x7c\xe2\xae\x49\x8d\x5f\xe5\xf5\xb2\x64\x53\x17\xb5\xc4\x47\x1e\x7e\xab\x84\x2e\x99\x34\xe0\x65\x2b\x69\x36\x90\x5b\x95\x05\x6d\xc8\x66\xf3\x60\xcd\xaa\x36\x83\x4d\x97\xfc\xbd\x21\x19\x02\x96\xde\x3f\x51\x8a\xa5\xdf\x3a\x89\x7c\x3b\x03\x3b\x03\xd4\x83\xaa\x3f\xc0\xe9\x34\x27\x19\x58\x94\x34\xca\x21\x35\x17\xdc\x01\x96\x8b\x57\x96\xa6\xf5\xc8\x99\xe9\xf1\xd6\x96\x94\xc2\x89\x19\xe9\x95\xa5\x13\xd6\x92\x37\x33\x1c\x0e\x2c\x4c\xc3\x38\x1d\x1c\x09\x4f\x1e\x77\x4f\x78\xc1\xac\x6c\x16\xc0\x6f\xf3\x9e\xd8\x62\x2d\x2a\x8a\x70\xa8\xb0\xaa\x16\xbb\x26\xc0\x55\x04\x6c\x06\x8f\xae\xa0\xe2\x73\xe2\x1d\xcd\xe6\x63\x9e\x32\x88\x2a\x8b\xe9\x54\xe6\xfd\x17\x4a\xaa\x45\x24\x75\x61\x16\xaa\xaa\xc2\x8d\x67\x4e\x9f\x2e\xf6\x01\x75\x89\x9a\x80\x62\xfb\x8f\x92\xf7\x8b\xf4\x5c\x12\xa6\xf4\xee\x2a\xcc\xa9\x2a\x92\x64\x0b\xbc\x07\x6e\x71\x5d\x08\x37\x68\x0d\x7f\xf0\x36\xe8\x76\x78\xb2\x13\x16\xa4\x15\x10\xae\xb9\x04\x20\x05\xb0\x0f\x35\x50\xd8\xd8\xb8\x0a\x4d\xae\x0e\xdc\x1d\xa4\xef\x72\x3d\x06\xdb\x97\xf3\x94\xcd\x9d\x44\x38\xa4\x17\xe9\x44\x37\x39\xa9\x54\xf7\x55\xee\x2c\x33\xb4\x5a\xec\x78\xd7\x53\xf4\x15\x3b\xdd\xe1\xc9\x1c\x47\x88\xb0\x3f\x42\x5d\x0f\xef\x34\x99\xec\xb6\x05\xdb\xb4\xfc\x84\x3f\x22\xc3\x4d\x38\x2e\x0f\xac\x8d\x98\xba\x55\x73\xd2\x8c\x80\x17\xa9\xc2\xf1\xc8\x0e\x33\xdb\x3e\x13\x51\x1f\xba\x85\x8a\x21\x48\x68\xe4\x97\x22\x55\x5a\x0d\x60\x26\xbc\x07\xe8\x15\xbf\x1e\x10\x42\x67\x65\xba\x6a\xf6\xe9\xba\xaa\xef\x3a\xc5\xaf\xb3\x87\x98\x9e\x9c\x9e\x23\x83\x80\xc5\x52\xc3\x62\x55\x55\xef\xca\x9f\x13\x4b\x89\x21\x1e\xc9\x71\x9c\x42\x29\xa7\xe2\x90\x19\xa8\xff\xe4\x0c\xd9\xe9\x29\xb2\x27\x61\xbd\x9e\xab\x55\xe0\xd1\x65\xf6\xab\x8e\x9d\xdb\x92\x05\x6c\xb0\xc3\xd7\xca\x85\x08\x3f\x4d\xd3\xa9\xed\xd1\xb3\x1f\xce\x83\xa1\x42\xa1\x74\xb5\x1c\x84\x2e\xa6\x0c\xc6\xfc\x14\x04\xc5\xea\x21\x09\x4b\x3a\x1e\xec\xed\xac\xda\x48\x28\xd0\x47\x2d\x15\x97\xbd\xd3\x2b\x50\x3c\x23\x4d\x79\x30\x99\xd0\x63\xf0\x9e\x70\x29\xd3\x37\x3e\x6a\x85\x27\x26\x2e\x08\x42\x70\xd8\x47\x83\x1d\x52\x96\x36\x60\xc6\xef\x2f\x10\x98\x91\x4f\xe8\x48\x11\xde\xec\x58\x4b\xb3\x8e\x84\xc2\x33\x35\xe3\xbb\x72\xc6\x6c\x50\xfe\x1e\x2e\xaf\xa1\xb5\x21\xd2\x94\xb4\x85\xa3\xd2\xf4\x60\x4c\xa3\xbd\x63\xf5\xf6\x34\xb7\x70\x3a\x46\xf0\x33\xa1\xfe\x1c\x96\x61\xf1\x8a\xed\x3a\x91\x27\xb9\x2b\xb8\xd4\xa4\x09\x42\x00\x14\x8e\xce\xeb\x19\xa7\xc2\x8d\xd8\x20\x2e\xb1\x45\x0e\x40\xc3\x8b\x62\x7d\xb2\x34\x1f\x76\xc8\xd8\xb6\x2d\x2d\x3a\x1d\xbc\x03\x4b\xd4\x88\xa5\x45\xec\x0b\xdc\xab\x81\x43\xd6\x73\x2d\xd2\x20\xb5\x2d\xe6\xff\x48\x59\x8e\xb7\x5e\x96\x6c\xdd\xb2\x4e\x95\x59\xbb\x52\x61\xd9\x09\x8d\x01\x7b\xa0\x74\xe6\x89\x02\x98\x88\x87\x08\xb0\x10\xc4\x2c\xa1\x96\x9d\x45\x76\x5e\x58\x6c\xff\xc3\x6c\xbb\x51\x87\xce\xb6\xeb\x87\x3a\x20\x1b\x1e\xe3\xe0\xc4\x19\x11\x10\x15\xe0\xfc\xd5\xa5\x0f\x4e\x55\x5d\x7c\x77\xb8\x72\x37\x22\xd3\x33\x9a\x28\x0b\x47\xb0\x12\x01\x38\x2c\x0b\x78\x08\xba\x40\xe0\x8e\x08\xf8\xdd\xc8\x0c\x19\xf3\xd7\x53\x68\x30\x84\x15\x81\x65\x79\x80\x0f\x34\x91\xfe\x54\x23\xda\x30\x22\xc4\xed\xea\xe2\x50\x0e\xe2\x71\xf4\x22\xd1\x89\xaa\x0d\xab\x6a\xb9\xa2\x79\x55\x1b\x76\x39\x82\x6b\x9b\x5f\xcb\x6b\x75\xfc\x8b\x36\x5e\xb3\xac\xd9\x86\xc3\x3d\xcc\x30\x19\xc7\x6d\x9f\x77\x7d\xdb\xd4\xcb\x97\xe7\x0d\xab\x5b\x6c\x09\xe1\xa3\xe2\xe7\xe7\xcf\x34\x9f\x58\x06\xaf\x21\x87\x63\xbe\xae\xfa\x37\xbb\xf9\x93\x2e\x5d\x92\x6c\x80\x03\xe4\x79\x9e\xae\xda\xf2\xf6\xc5\xa3\xc7\xdd\xa3\x97\xea\x67\x96\xa8\xa0\x7d\xed\xd0\xf2\xfc\x59\xfe\x92\xa5\xe7\xae\x59\x93\x50\x1b\x57\x69\x36\x1b\x59\x5f\x62\x7f\x1b\x81\xc4\xf8\xe1\x9a\x2e\x6b\x60\xae\x6c\x15\x3f\xd4\xe0\xcc\xd1\xba\x5f\x1f\x5d\x36\x13\x93\x22\xfb\x82\x0a\x2a\x0c\x0c\x8f\x5b\xdd\x07\x4c\x93\x6d\x0b\xa9\xab\x86\x03\x76\x5c\x0d\x0b\xc9\xe6\x1a\x6f\xda\x30\xe3\x04\x24\x68\xb4\x61\xf5\xa9\x2a\x8d\x44\x24\x0d\xce\xb3\x3e\xe5\xe0\xa4\x94\x91\x56\x40\xbf\xcc\x53\xcd\x94\x09\x81\xd1\x1b\x41\x98\x60\x23\x1a\xfe\xc6\x18\x80\xcc\x3e\xd8\xfe\x90\x5f\x4e\x51\x81\xe4\x17\x68\xdd\x3a\x97\x77\xaa\x63\xa3\x80\x0e\xaa\x40\x9e\x7e\xdf\xa8\x4f\x22\xb5\x4c\x8c\x9a\x04\xe8\xbe\x8c\xc8\x9d\xbb\xa3\x7f\x68\x85\x68\x13\x6a\xfb\x7f\x4b\x0b\x52\xc1\xfd\x76\x32\x81\x54\x37\xd3\xa9\xdf\x0b\x43\x11\x55\xbd\x79\x47\xf7\x53\xb0\x8d\xb4\x55\x17\xa6\x21\xe6\x83\x12\x82\xe0\xbc\xaa\x0b\xd9\x36\x4a\xf5\x1a\xf7\xe0\xc8\x9d\x0e\xd3\x9a\x81\x60\xe3\xe3\x84\xfe\x0e\x90\x7f\x1d\xb5\x1f\xd0\x06\x71\xab\x5d\x1d\x70\x0b\xd9\x8e\x59\xdf\x88\xad\x4b\x27\x79\x45\xfa\x06\x62\x9e\x4e\xa5\xc1\x1b\x2e\xee\x34\xee\x4e\x9d\xa2\x56\xe5\xb5\x66\x62\xc1\x01\x98\xa0\xa8\x73\x88\xc0\x2f\xaf\x7a\x5a\x2b\xea\xaf\xd6\x68\x26\xac\x01\x6d\x3d\xe3\x0f\x2b\xf1\x5f\xa7\xa7\x57\x6f\x67\x89\xeb\xcf\xda\xfc\x35\x27\x99\x49\x46\xb0\x77\x5a\x2f\x93\xd2\x90\xbf\x38\x6f\x89\x54\x37\x23\x1b\x6a\x82\x9c\xdd\x9c\x46\xf3\x91\xb9\xc4\xe5\x82\xe2\xb2\x0b\x2c\x01\xd2\x1b\x46\x32\xe4\xcc\x6e\xa6\xdf\x10\x62\x9d\x3d\x8a\x4f\x84\xed\x81\x79\x5d\x10\xa9\x92\x0b\x82\xf6\xe0\x56\x83\x10\x19\x82\x84\x36\x9c\xb2\x7c\xdb\xba\xbd\x62\x03\xd6\xdd\x12\xe6\x06\x94\x00\x32\xdc\xda\x7a\x46\xe3\xf5\x07\x5d\x38\x68\x51\xd2\x07\xfb\x33\x15\x36\x2a\xfe\x57\x1e\x97\x48\x66\x8a\xe3\x50\x35\xa3\x36\xf7\xe5\x9a\x23\xe9\x74\x40\xde\x09\xa9\x8a\x58\xe4\x82\x54\x20\xe7\x7c\xe4\xc8\x45\x27\x49\xc8\xda\x86\xd6\x11\x6b\x8c\x20\x88\x80\xe1\x75\x14\x0d\xca\xd8\xfd\xd9\xe9\xfb\xf7\x97\x37\x9e\xcb\x33\x65\xd5\x05\x9d\x45\xdf\xb8\xf8\x9b\xd1\xb8\x2c\x0a\x07\xe3\x43\x40\x56\x04\xe1\xe3\x80\xb4\xc6\x31\xb8\x70\xe3\x5b\xeb\x94\x5c\x36\xd8\xcd\x0d\x8f\x45\x6a\x14\xf1\xf8\x8b\x63\x0a\x4a\xf2\x89\x8f\xc7\xcf\x89\xd9\x18\x2f\xf9\x7f\x12\x9a\x69\x03\xd3\x38\xa8\xd9\x5b\xd0\x7d\xb8\x29\x0d\xa0\x29\x46\x66\x5b\xb0\xbd\x5d\x0e\x09\x94\x70\xdf\x80\x91\xde\xa6\xf0\xae\x9d\xb0\x15\xaa\x69\x41\x83\x8c\xdc\x5d\x5d\xfd\xb6\xc3\xf9\xce\xf2\x27\xc9\x2b\x1c\xd6\x35\xaf\xd6\xc2\x6d\xff\xec\x7e\x48\x3e\xa7\x06\xb1\x98\x41\xe7\xf4\xeb\x79\xb7\xe5\x48\x35\xe2\xb6\xdd\x8b\x47\xbb\x2a\x65\xa3\x06\x47\x86\x3c\x7a\x49\xd2\x22\x7b\xa9\x69\xf9\x08\xe2\x25\x1b\x26\xee\xcc\xde\x35\x8c\xaf\x47\x99\x05\x52\x72\x19\xa2\x29\x91\x3b\x31\x0a\x95\xad\xc5\x60\xd1\x8b\xa5\x2b\x0d\x66\xc1\xdc\x99\xa9\xfb\xae\x0c\x31\xa5\x1e\x09\x5d\xd7\x73\xfa\xd7\x56\x88\x06\x95\x7c\xbe\x51\x91\x06\xb7\x29\x5c\xa6\xef\xf7\x9a\xd6\x7b\xc1\x0a\xd5\x6c\x59\xf5\x24\xd3\xf3\x1d\x0a\x68\xda\xb4\x61\x88\x29\xe2\x32\x86\xa4\x2c\x67\xa2\xae\xc1\xa2\x62\x55\x57\x7d\xc6\xe7\xf4\x46\x22\xd8\xa9\xd9\x7c\x2d\x32\x50\x8c\x68\x71\x18\xa7\x1f\x7e\x3d\x3d\xbf\xf8\x75\xb6\x29\x2c\xa0\x45\xf1\xa9\x91\x2c\x01\x46\x8b\xf2\x36\xdf\xad\xcd\xd4\x86\x09\x23\x23\xfd\x05\x19\x7a\x6d\x82\xb4\x22\xc2\xdf\xbd\x1c\x89\x72\x91\xe2\xad\xe5\x7c\xcb\x32\xef\x77\x47\x0c\x50\x43\x2f\xce\x1f\xb7\x43\x0d\x5b\x78\xd8\x1c\xc5\x2e\xfe\x8c\x8d\x8b\xa9\x86\x81\x44\xce\xcf\x44\xaf\x75\x58\x10\xbe\xbb\xd7\x21\x51\xf8\x61\xe9\x71\x5a\x36\xdd\x28\x8f\x49\x9a\x74\xe0\x72\x9d\xe2\xef\xd3\xf9\x7a\x57\x6a\xb2\xcd\x8b\x6a\x47\xc2\xa1\xe0\xd1\x68\xdc\x7a\xd2\x65\xb9\xd0\xdb\x26\xc1\xba\x28\xc4\x0c\xd1\xcb\x99\xa9\x01\xec\x37\x67\x11\x5b\x55\x3f\x07\x65\x8e\x00\x84\xa3\x5a\x48\xdc\x5b\xc9\x94\x18\x55\x04\xc4\x41\xd6\x8e\x6d\xa6\xe6\xae\xcf\xc3\x78\xf3\x44\x36\x85\xed\x34\xdd\x22\xb7\x6e\xaf\x21\x72\x99\xc3\x52\xe3\x4d\x86\x8b\x31\x01\xa6\xc2\x60\x12\xe6\x66\x05\xb3\xe3\xed\x21\x63\xcb\x0d\x38\xf0\xf6\x90\x20\xe4\x82\xce\xaf\x0c\xc7\xa3\x64\x82\x1f\xae\xab\xad\xdc\xdd\xa2\x82\xaa\x94\xb8\x49\x24\x2e\xff\x25\x11\xa4\xb8\x15\xc2\x42\xe3\x42\x17\x17\x10\xdf\xfd\x19\xec\xa9\x67\xf1\x5c\x2c\xc9\x2f\x1e\x65\x73\xda\xa3\x77\x8f\x02\x71\x9d\xaf\x7e\xb1\x8c\xfe\x0d\x09\x52\x7b\xf5\x77\x7e\x94\x54\x62\xbf\xff\x82\x5f\x3b\x8e\xc3\x13\xe7\x2a\x27\x12\xfd\xc5\x06\xd9\x44\x2f\x03\x31\x33\x4a\x58\x20\x55\xb6\x41\xc2\x68\xc8\x39\x7e\xdb\xf1\x2c\x45\xd3\x78\x91\xfe\x2b\xff\x4a\x5f\xf3\x2f\x9d\x0a\x6f\x63\xb7\x47\xb1\xc2\x83\x8d\x1d\x06\xa6\x81\xe3\x68\x74\xa7\xdf\xd3\x12\xcd\x12\x60\x5f\xc3\x58\x0c\x90\x43\xa0\x93\xed\x8e\x5d\xf6\xbc\xee\xd6\xdb\x15\xe5\x20\x9e\x9c\x33\xf9\xc8\x0a\x5a\x70\xd6\xfa\xa8\x8d\xc4\xb1\x0a\x65\x11\x7d\x5b\x42\xbc\xa2\x7f\x5a\x86\xab\x63\x7d\x0e\xfb\xac\x00\x11\xc9\xfd\xe7\xf4\x86\x72\x14\xa2\x0c\x8b\x12\x05\x45\xf9\xf0\x12\x11\xb6\x51\x07\x8e\xcb\x09\x22\xf9\x75\xd9\xf5\x84\x22\xe8\xba\xee\x47\xc2\x63\xac\x7a\x89\x1c\x44\x2a\xd1\xb8\x56\xb1\xc1\x4b\x32\x81\x85\xb3\xcd\x39\x4a\xec\x43\xbe\x97\x9f\x84\x69\xbd\x75\xf4\x46\x52\x92\x8d\xb8\x67\x01\x45\x74\xb4\x83\xc7\x31\xae\x34\x7c\x65\xe9\xc4\x06\x30\x1b\x0f\xc4\x4a\x06\x97\x9e\xd2\xc5\xa0\xfc\x56\xc4\xfb\x57\x2c\xdc\x5b\x5e\x0e\xfe\x95\x5a\x14\x87\xcb\xdf\xd0\xf6\x17\x63\xde\x85\xa4\x5c\x49\x21\x01\x46\xe7\x7c\xfd\xcf\xf2\x2c\x84\xf3\x92\xff\xbb\x5c\x22\x18\xdd\x3f\xf4\x3f\x51\xcc\xcf\xe4\x5e\x20\xcb\xf5\x72\xcb\xca\x67\x67\xc2\xe3\xa4\x10\xcb\x31\x2a\xcc\xb6\xeb\x7c\x51\xba\x90\x51\x00\x81\x6f\xf3\x0d\x2f\x05\x56\x52\xb6\xc6\x94\x7e\xa3\xf6\x48\x18\x64\x57\xfc\x9c\x8a\x1f\xd3\x8e\xa7\x5f\xae\xf2\x9a\x6d\xa4\xae\xe8\x8c\x7f\x16\x56\x48\xcb\xc3\x71\x8a\xd6\x72\xd4\x64\x58\x46\x47\x0c\xb3\x2f\x31\xf2\xbd\x67\x79\x9b\xd3\x1c\xce\x3f\x51\xc3\x11\x5c\x48\x6f\xc7\x60\x8e\xb6\xbc\x39\x52\x93\xce\x0e\x8e\xa6\x87\xa4\xa9\xc9\x01\x84\x9e\x55\x38\xa1\xc6\x25\x33\x0e\x10\x76\x7b\xe6\x14\x6e\x39\xec\x9b\x29\xd0\x4e\x6f\x6c\x12\xbb\x65\xde\xec\xba\x2c\x54\x73\x9a\xaa\x24\xab\x55\x64\xf3\x83\xd6\x91\xf5\x2a\xd8\xe9\x77\xa4\xca\x86\x3d\x7b\x60\xc4\x5a\xe5\xc2\x65\x84\x55\x78\x91\xd1\x30\x41\x48\x3a\x7d\xfc\xe9\xfb\xcf\x1d\xb7\xec\x0c\x2b\xcf\x1e\x7f\xfa\xe1\x33\x71\x6b\xfc\x63\x76\x6d\xb5\xb7\x6d\x79\x5f\x35\x3b\xdc\x42\xd4\xa4\xa7\x46\xc4\x22\xbf\xe7\xb8\x63\xcd\x92\x65\x37\x99\xde\x93\x65\x5c\xbe\x68\xd6\x8d\x27\x5b\xfc\x1a\x02\x88\xf2\xf0\x58\x49\xa5\x8b\x8b\x41\xb6\x6e\x31\x1e\xc3\xa9\x53\x0f\x16\x44\x20\xcb\xa2\xe2\x76\x7e\xa5\x7f\x71\xc1\xc0\x81\x15\x17\xba\xd8\x35\x19\x20\x22\xd8\xec\x0a\xcd\xb8\x15\x75\x03\x01\xd4\x69\x2f\x93\x60\x5e\xd8\x55\x93\x25\x9d\x3d\xb2\x89\x20\xec\xa8\x07\x97\x99\x5a\x55\xcb\x3d\x22\x6e\x9b\xed\x7a\x28\x15\x0f\x97\xb6\x7c\xdc\xf3\x32\xdd\xb5\x57\x5a\x65\xa4\x3e\x76\x58\xb5\xa6\xd8\x64\x14\xf0\xff\x80\x53\xf9\x7d\x19\x14\x4f\x30\x91\xa0\x74\x9a\x91\x0c\x01\x0a\x39\x90\x39\xf1\xb8\x8b\xfa\xa6\xa3\x7e\x57\x66\xca\x6c\x69\xa7\xd3\xaf\x14\xbf\x86\x43\x60\xb6\x3b\xd5\xb7\xb5\x3c\x98\x11\x21\x64\xbe\x22\x91\x49\xa2\x24\x85\x37\x06\x67\x1e\x61\x54\xfd\xff\xaa\x1c\x2b\x56\xa3\xe6\xa5\x96\xab\x3e\x89\x1d\xdb\x0b\x08\x40\x0c\x0b\x26\x14\x9f\xb0\xd4\x4f\xfa\x9c\x66\xcc\xa7\x4c\xfa\xad\x5d\x9f\xfb\x2e\x9e\x64\x29\x2e\x2c\xfe\x1f\x16\xb8\x7b\x1f\xda\x54\x26\x24\xa5\x2d\xa2\x71\xcd\xf1\xf7\x21\x4e\x5c\xf8\xde\x93\x03\x35\xf7\x74\xb3\x79\x5a\x14\x4f\x26\x66\x1d\xd0\x93\x9b\xf6\xc0\x12\xa9\x1c\x6d\x40\x58\x41\x4b\xc1\xe6\x9c\xc6\x1d\x03\x44\xeb\xf4\x91\x83\x20\x4a\x56\x4c\xd2\xc2\xe3\x0d\x9e\x93\x60\xed\xba\x26\xdd\x96\xcd\x96\xd0\xee\x2c\x3e\x6c\x9e\x90\xb0\xb0\x70\x26\x03\x77\x64\x50\x34\x88\x5e\x7d\x70\x78\x86\x07\x71\x93\x75\xac\xee\x6e\x8e\xa0\x44\x6e\x9e\x1e\x45\x48\xc0\x4e\x3c\x52\x1d\x4b\x99\x00\x9c\x62\x28\xbe\xef\x7f\x4f\xa6\x32\xd5\xf9\x14\x09\x7c\x89\xad\x4c\x5d\x9f\xb7\xbc\x99\xd0\x37\xa2\x0d\x24\xe5\x8b\x82\xcb\x2b\xc0\xcf\x59\xf8\xdb\x83\xad\x9a\xe6\x4e\x2e\xf0\xcc\x91\xf4\x25\x4b\xd2\xd8\xb5\x90\xef\x07\xbf\x89\x4b\xe7\x79\x57\x2d\xc2\x6b\xfa\xbf\x70\xc6\xc4\x10\x0b\x5e\xe3\x36\xfb\x87\xc8\x29\xe7\xf8\x95\xfe\x2f\x26\x0c\x07\xa2\xa1\x02\x97\x76\x61\xeb\x9a\x03\x06\x5c\xa9\xba\x6a\x83\xae\xd4\xb3\x3c\xee\x4b\xbd\x9e\xac\x29\x4c\x5b\xa4\x9c\xcb\xff\x58\x15\xa3\x8f\xa1\x72\xcf\xc6\x54\xe7\x1a\x1d\x79\xff\xa7\xbc\xfe\x71\x70\xe2\x03\x84\xe2\x86\xe2\xe2\x9e\x58\x65\xd1\xe4\xa5\x85\x4e\x8d\xc1\x9c\x81\xcf\x87\x4b\xc5\xf6\x00\x36\x5f\xd7\xe2\x0d\x45\xc8\x14\x87\x56\x71\x56\x1c\xa7\x45\x74\x2d\xb7\x9d\xfd\x4d\x07\x84\x5d\xc3\x1a\xcc\x17\x3d\xac\x5f\x3c\x21\x81\xa0\x49\x8e\x3f\xeb\xc4\x9e\xa2\xc1\x5f\x12\x08\x20\x86\xc1\xdc\x5d\x14\x62\x6f\xc3\xd0\x04\xe4\x7c\x3c\xfe\xb6\x8f\x44\x12\xd8\x50\x51\x16\x90\xcf\x20\x6e\x06\xb8\x0f\xcc\x11\x03\x40\x43\xca\x25\xf1\x27\xf1\x56\x48\xb5\x3c\x8a\x3b\x93\x10\x47\xd8\x68\xd4\x1e\x3a\xcf\x17\x77\x6e\x44\xcc\xfe\xca\xb6\x47\xc4\xd7\x18\xed\xec\x71\x5e\x40\x8e\x7a\xbe\x7d\xf9\x14\x66\x06\xb9\x1c\x8e\x59\xc8\x06\xaf\x6e\x03\x84\xc0\xeb\xc2\x5e\x94\xfb\xaa\xd8\x11\x79\xf3\x62\xcc\x9e\x3f\xdb\xbe\x8c\xeb\x13\x45\xc0\xf4\x74\xb4\x8d\xc1\xc2\xb1\xde\x5b\xe1\xa6\x09\x87\x54\x22\xb6\xef\xd6\x87\xac\x76\xe8\xe1\xe8\x2e\x0a\x58\x51\x40\xea\xc6\x4e\xbe\x10\xf1\x30\xc6\x89\x99\x84\xf1\xb8\x08\xcc\xc2\x0e\x86\x9d\xa4\x59\x40\xda\x70\x3d\x18\xcd\x4e\x34\x25\x2e\x8d\x81\x81\xcd\x47\x10\xba\xa1\x59\x85\xf6\xf8\xf0\x62\x13\x7b\x3a\x61\x5a\x77\xa0\xec\xdc\xf3\x1c\x53\xf4\xda\xa2\xc0\x7c\xce\x82\xec\xe3\x15\x06\xae\xc6\xa8\xad\xd8\xd5\x18\x0c\x50\x8e\x9a\x63\xed\x9c\x4d\xb6\xa1\x0e\x91\xa0\x15\x04\x0a\x57\x08\x09\xcd\xf4\xf6\x9a\x3e\x8c\x33\x8c\xc9\xd4\xd2\xfd\xaa\x09\xee\x4e\x88\xff\x13\x9b\x35\x1c\xc8\x2c\x9e\xeb\x5e\xce\x07\xc5\x8b\x9e\x16\x83\x63\xc4\x36\x9f\x9d\x25\x88\xc3\xdf\xec\x88\xb7\xac\x2b\x5a\x74\x1c\x19\xfa\x06\xc3\xe5\xf5\x0d\x6e\xb7\x13\x2f\x24\x46\xb3\x64\x7a\x4d\xff\xb2\x22\x55\x8b\x23\x65\xf9\x29\x04\x0e\x60\x58\xa6\xcd\x62\xc1\x61\x0b\x55\xad\xb7\x47\xf7\xa5\x39\xd8\xea\x62\x2d\x21\x0c\x61\x00\x88\xf1\x5d\xb1\xad\xa5\x78\xee\x80\x99\x40\xb7\x2d\x17\x24\x94\xcc\xd2\x77\x24\xa2\xd5\x78\x23\x08\x77\xd5\x98\x97\x3c\x68\x8a\x73\x33\x81\x4d\x8c\xb5\xbc\xd9\xf8\x80\x74\x8f\xb1\xd8\x29\x89\x79\x6f\x39\x4c\x52\xb4\x51\x2e\x20\x71\xa2\x5c\xdf\x4a\xc8\x2b\xfb\x18\x21\xca\xc9\xcd\x7d\xf6\x73\xc8\x85\x66\xb6\x16\xa2\x01\x0d\xde\x80\xab\x16\xf7\xbc\x78\x66\xdb\xb2\x65\x71\xc4\xc2\x9c\xc2\x08\x97\xe1\x98\xa0\xc6\xd9\xb8\xde\x0a\x5b\xc0\xf2\x41\x70\x95\x4b\x79\x27\xcc\x8b\x59\xe6\x33\xf7\xb9\xd9\x8f\xb7\x72\x11\x8f\x4f\x3a\xc2\x17\xa2\xc8\x0d\x44\xce\x0f\xdc\xb6\xe1\x70\xea\x9d\x2e\x87\x05\x8f\x01\xa1\xdc\xcf\xc4\x88\xf4\x40\x66\x04\x89\x73\x68\x04\xe1\xdd\xf8\x00\x32\x5f\xfe\x90\x85\x29\xb8\x97\x03\xde\x44\x94\xa8\x7b\x0a\x2d\x86\xf7\x93\x85\x7c\x1f\xd8\x46\x01\x95\x47\xcf\xeb\x60\x86\x7a\x2f\xef\x39\x5f\x2a\x7b\xc9\xd4\xfb\xfc\x19\x92\x76\x17\xd1\x28\x8f\x5f\xf3\x08\x28\x8e\x5f\x6a\x68\x08\x7f\x38\xfa\xda\x72\x99\xb7\x85\x05\xe5\x2b\xf5\xb3\xcf\x19\x54\x1e\xc6\x5c\xe5\x6b\x92\xc8\xb5\x09\xda\xad\x04\x72\xc7\x16\x38\x22\x14\x7e\x8b\xc6\x94\x10\xe6\xfc\x85\x6c\x2d\x0e\x67\x21\x82\xdf\x6d\x79\x0f\xc8\x86\xb2\x7e\x30\xed\x6f\xff\x74\x7d\xf9\xfe\x24\xfd\xfd\xe9\x7e\xbf\x7f\xca\xd5\x9f\xee\xda\x35\x07\x7e\x14\x1c\xf4\xff\x3f\x2f\xde\x9d\xa4\x65\xbf\xf8\x6e\x46\xd2\x3b\xb6\x86\x17\x7b\xd5\x1f\x7e\xcb\x7e\x7a\x26\x4b\xd6\xec\xfe\xf9\x2d\xb3\x95\xdb\x61\xfa\x72\x4a\x78\x57\x2c\x64\xda\xbc\xec\x66\x5d\x52\x2a\x10\x2b\x93\x97\x18\x4b\xd2\x95\x70\x3b\x14\x09\x5f\x00\xac\xda\xf2\x7d\x64\x74\x88\x70\x83\xfc\x8e\xfd\x89\xbb\x75\x21\x74\x6a\x1c\x8d\x66\xa7\x28\x2b\x8b\x9f\x87\x2d\xc1\x2e\x8d\x87\x22\x5e\xa4\x7f\x62\x45\x8f\x51\x2a\x54\xc0\x45\x46\x05\x00\x0e\x69\x09\x3b\x2c\xd5\x9b\xae\xe5\xb0\xc0\x7b\x08\xce\xcb\x1e\xa1\x71\x53\xb4\x21\x23\x77\x63\xf3\xab\x69\x1b\x95\xce\x35\x6a\xac\x15\xee\x2d\x6e\xee\x88\x9a\x07\x7b\x80\xcf\xa5\xfd\x70\x1f\x0c\x8f\x24\xdd\x64\x9e\xdd\xeb\x26\x1b\x71\x7c\x05\xfc\xd2\x3e\x53\x09\x62\x24\xd1\x05\x3d\xa8\x64\x37\xea\x41\x82\x66\x32\x9d\xa5\xc5\xac\x23\x90\xe6\xdc\xe5\xc5\x47\x90\x51\x0d\x18\x48\x4c\x32\x8c\x90\x6e\x4d\x62\x5e\x16\xee\x70\x3e\xcc\xa2\x58\xa9\x6b\x06\x41\x84\x14\x7b\x16\xcd\x0b\x37\x8a\x0f\x0b\xc5\x0c\x69\xd5\xe2\x1f\x24\x4e\x63\x50\x38\x7c\xc1\x68\x50\xcc\x9a\x85\x3c\xae\x76\x26\xa9\x10\x5b\xdb\x75\x73\xb0\x10\xba\x73\xfc\xd2\xd8\xf4\x70\x66\x1e\x4c\x27\xe5\x21\x03\x09\xbe\xc9\xe2\xe6\xfe\x1a\xdc\x52\x56\x31\xa0\x3e\xa4\x02\xc3\xfe\xf5\x50\xd4\x8b\xac\x32\x13\xc3\x9b\x88\xc2\x72\x50\xc3\x78\xb1\x73\xd7\xc3\x91\x78\xb1\xb8\x6a\x18\x33\x16\x54\xfd\x8a\x98\xb1\x18\x49\xe3\x88\x30\x3f\xd5\xaf\x08\x0a\x9b\x9a\x74\x60\x80\x50\x32\x9e\x42\xfc\x44\x85\x29\x43\x44\x11\xce\xcd\x5b\x22\x42\xb3\x83\xe8\x06\xb4\x15\x6e\x9b\x91\xc2\xf7\x35\x3a\xe6\xd4\x48\x3c\x4a\x02\xe4\x7e\xc9\x2c\x51\x54\xb7\xb7\xb3\x79\xdb\xec\x3b\x0e\x4a\xc3\x3b\x44\xec\x37\xe3\xdf\xe9\x35\x7e\x0b\xc8\x36\x6f\x85\x28\x24\x21\x99\xe2\xe7\xa1\x4c\x49\x48\x26\x1f\x6d\xa3\x77\x60\xce\xa9\x04\x4f\xaf\xf0\xb3\x4c\x1c\x4b\x2e\x25\x33\xa9\x42\xec\x7c\x9f\x71\x0a\xc1\x74\x30\x91\xb0\x2a\x8e\x4a\xd7\x9c\xa3\x60\x9c\x34\x84\x5b\x68\x0e\xdb\x56\x2d\xba\x1f\x72\x98\x8f\xd2\x01\x61\x19\x1c\x81\x11\x31\x54\x10\xb4\x3c\x48\x18\xe4\x43\x10\x86\x4b\x0f\xa1\x08\xc2\xa6\xff\xe5\xed\x7b\xf9\x09\xcf\x9d\xde\x75\x80\xeb\xee\x15\xc7\x50\x98\x3f\x70\x36\xe5\x17\xb4\x32\xf1\xaf\x8a\x7e\x6a\x0f\x43\xe2\x97\x83\x28\xda\xfc\x16\xb6\x4a\xfe\xef\x72\x49\x98\xf3\xd5\xae\xda\xf2\xe9\xb0\x1a\x21\x47\x50\x7d\x8d\x84\xcb\x57\x5b\x23\xff\x73\x79\x39\xdb\x15\x03\x1c\x3e\x2e\x3c\x46\xcc\xbb\x48\x74\xf7\x98\x0e\xda\x8a\x15\x70\x25\xd0\x41\x87\xa0\x0e\x7f\x7d\x1f\xb4\x83\xa7\x12\x0d\xa2\xcf\x97\x2e\x34\x2e\x5f\x8a\x3b\xc4\x97\x41\xb4\xb7\xfb\x56\x51\x1d\x7f\x87\xdf\x4c\x0a\xde\x7b\x4c\xe5\x78\x8c\x6c\x11\x3a\xa5\x29\x93\xbd\xd1\xb8\x32\xd3\xad\x66\xc3\x85\x70\x6e\x19\xc5\x59\x8a\xdf\x0e\xca\x24\x15\x26\x97\x6c\x53\x04\xc2\x8a\x10\x50\x78\xac\x5c\xe4\xed\x1d\xbf\x4e\x04\x47\x91\x35\xb0\x6f\xf5\x8e\x0c\xff\x0f\x57\x4c\x5f\xc5\xba\x92\xd4\xa8\xc3\xd8\x95\x89\xda\xd0\x99\x8c\x99\xba\x0a\x2c\x5d\xc9\x7d\xac\x77\x92\x92\xe7\x2c\x87\x94\x31\x8e\x11\xa5\xb2\xa7\xc3\x75\x0b\xe0\x1d\xa2\xff\x52\xfe\xdf\xff\xfd\x7f\x88\x3d\x6d\x1b\x3a\x2d\x11\xbd\xac\x17\x67\xfd\xba\x5b\x28\x8c\x7f\xc3\xec\x29\x78\x74\x30\x10\x41\x7f\xaa\x01\xc1\x94\x1a\xd1\x28\x3f\x70\x64\xf4\x7d\xcd\x36\xaa\x98\xc8\xa1\xed\x78\x32\x87\x7d\x7c\xd8\x86\x11\x55\xa6\x67\x84\xbb\xb8\x67\x8b\x8b\x45\x93\xeb\x30\x4a\x74\xd3\x47\x4a\xf2\x89\x74\xea\xcf\xfe\x7a\xb7\x5b\x88\xe8\x6a\x37\x54\x1c\x0f\x63\x08\x7b\xcd\xe4\x37\x7e\xcd\x51\x54\x46\x79\x4b\x02\xaf\xd8\x5a\xc0\x9b\x5c\xb7\x94\x60\x7c\xd7\x48\xd8\xd1\x93\xce\x22\xf2\xf5\x99\x11\xc4\xbc\x4f\x5c\x8b\x08\x43\xfd\x49\x63\x54\xa7\x84\x5c\x23\x55\x77\x4c\xf4\x2c\x2c\x82\x39\xcc\xfe\x63\x62\x60\x91\xa8\x9f\x80\x03\x0c\x38\xc1\x37\x7d\xf9\xc9\x4c\x26\x3f\xb1\xf0\xbe\x45\x06\xed\x6b\x64\xe0\x16\x3b\x42\x28\xf8\x7f\x82\xbb\x83\x6a\xa4\xe0\x5c\x4d\x69\xfe\xe0\x7e\x62\x1b\xbd\xc5\xe4\xc3\x4c\x70\x6f\x39\x7a\xfc\x88\x1b\x07\xa2\x26\x5c\x44\xa3\xdb\xec\x58\x19\xe4\x3e\x04\x1d\x05\xeb\x3d\x59\xc3\x6a\xa7\x97\x5f\xb8\x2d\xe2\x72\xea\x4c\x56\x92\xc1\x5d\x6a\x7e\x74\xa4\xe6\x67\xc4\x0c\xcb\xae\x9b\x60\xcb\xac\xc4\x7f\xe4\xab\xf1\x7a\xe5\x73\xda\x3c\x3f\x0b\x3c\x87\x71\x54\x5d\x17\x08\x09\xa8\xe3\xb3\xd3\x35\x29\x08\xeb\x48\x99\x41\x43\x2c\xca\xfd\x7c\x24\xde\x6d\xfc\xee\xc0\x1f\x8f\x78\x1b\xb7\xf1\x70\xcc\xdb\x3f\xeb\xba\x98\xbe\x53\xe8\x8a\xc7\x97\x0b\x5d\xd1\xd4\x2d\xc3\x7f\x83\x23\x81\x48\x4a\x87\x31\xda\xdb\x47\x3d\x09\x5a\xc7\x19\xa2\x8f\xbf\xf7\xf0\xc7\xfd\x09\xd1\x2d\xfb\xaf\x90\xf6\xe2\x19\x07\x82\x5e\x34\x2a\x87\x10\x36\x58\xc5\xd1\xd7\xc7\xb4\x37\x2f\xb8\x46\x3c\x63\xa8\xe3\x8d\x82\xad\x31\xd3\x07\xab\xc4\xa1\xd7\xe1\x30\x9d\x79\xca\x07\x2b\x9b\x15\x47\x82\xae\xc5\x9c\xf7\xe5\xc8\xeb\x23\xf6\xe1\x87\x42\xb0\x87\xa3\x64\x5e\xe3\x5e\x64\x0d\x07\xf9\x60\x8d\xf0\x98\x8d\x7d\x30\xff\x96\xb0\xec\x69\x1b\x2c\xeb\x80\x7b\x33\xc5\xe0\x50\x36\xfc\x79\x83\x02\xeb\x10\x86\x2f\x51\x32\x3c\xc3\xf5\x98\xdb\xe1\xa1\xd5\x7e\x38\x68\xbe\xb4\x21\xdc\x7b\xa6\x57\x8e\xed\x42\xcf\x20\xdf\xb3\x3e\xdc\x97\xda\x4a\x50\xb5\x07\x92\xdf\x10\x77\x26\x4b\x86\xf5\xe3\x3e\xe2\x60\x74\xcb\x75\x66\xf0\x0b\x24\x5c\x3e\x61\x6d\x51\x22\x58\xf8\x4c\x52\xae\x44\x75\x2d\x7d\x39\xc3\x0f\x42\x5e\x45\x78\x01\x4b\xa8\xcf\xd5\x53\x4f\x71\xcd\xf1\x96\xb4\x28\x87\x2d\x2f\x61\xee\xae\x09\xf3\x32\x09\xa0\x8a\x9b\x3a\x2a\x48\xc8\x3f\x0d\xdb\x92\x17\xe2\xf4\xf4\x7c\xdf\xec\x13\x39\x3a\x67\x7c\x91\x3f\x95\x5b\xfc\x9a\x13\x0f\x49\xf2\x58\x46\xd1\xdb\x33\x98\x03\x89\xe9\x72\x59\x66\x5c\x3e\x08\x20\xc6\xc9\xe1\x42\x87\xed\x51\x0e\x16\x40\x21\x35\x20\xe6\x93\xe5\xfa\x90\x38\x66\xda\x2a\x04\x58\xdf\xad\x48\xa2\x51\xbf\x21\xc4\xd7\x74\xcc\xe3\x1c\x75\x77\x62\xf6\x2d\xdc\xd1\xe4\xb8\x50\xe1\x87\x1b\x1b\x87\x3c\x62\xe9\xc6\xe1\x5e\x48\xf5\xe3\x08\x21\xbe\x66\x1c\xdc\xcb\x33\x7e\x54\x1e\x8b\xf8\xd0\x78\x48\x39\xd4\x2b\xa7\xa1\xf7\xa4\x1b\x0e\xd1\x47\xe0\xde\x04\xe7\x35\x3c\x90\xc5\x40\xfe\x60\xf3\xe6\xf8\xe0\x94\x12\x71\x84\x4d\x88\x08\xe2\x28\x9e\xbc\x79\xf4\xe5\x2d\xce\x2b\x8d\x9a\x0e\x34\x70\x01\x7b\xb0\xa9\x53\x48\xc7\xe5\x45\x3a\xc8\x58\x17\x2a\xd7\x49\xe1\x97\x0f\x5e\x81\xb3\x3b\x43\x22\xdf\x85\x47\x06\x04\x3c\x5b\xc9\x42\x5e\x28\x72\x7b\x9c\x59\x5d\xd0\xeb\xb8\x31\xc7\xaa\x01\xe5\x58\xf4\x18\xce\x78\x67\x28\x9d\x05\xc6\x56\x66\xca\x27\x26\xb3\x8a\xb7\xd5\xa0\x36\xf9\x21\x72\x00\xf3\x5d\x29\xd6\xc8\xa2\x5d\x73\xfc\xc4\x1e\x0f\xc5\x9f\xd5\xf2\xec\x8f\x23\x98\xa3\x46\x99\x59\xb8\xd5\xc7\x04\xe2\xc9\x6e\xd9\xe6\x6c\x0b\xb7\xb5\x66\x66\x11\x90\x02\x1a\xfc\xc9\xcd\xd2\x3d\xa1\xec\xb9\x01\x3c\x6c\xd4\xd0\x93\x87\x98\xc2\x1f\x18\x00\xd8\xc6\xc3\x23\x00\x5b\x90\xc7\x8b\x68\x18\x01\x0b\x78\x68\x20\xfa\xf6\xf1\xd7\x0f\x04\x7c\xe3\x2b\x07\x72\x62\xa3\xd0\x27\x33\x8a\x62\x72\xff\x3f\x34\xbe\x81\xba\x03\xe2\x8c\xde\x64\x19\x10\x7c\xf4\x1d\x0a\x47\xf4\x41\x2c\x84\x35\x0b\x07\x98\xc6\x66\xe8\x71\xe6\x9b\xaa\x69\x09\xa1\xca\xd6\x7d\x18\xbf\x11\xdf\x8e\xe0\x88\x82\xbe\x3d\xa8\x48\xc2\x93\x8b\x2f\x67\xf8\xab\xe7\xa2\x84\xc1\x97\x29\xef\xf4\x7c\x02\xda\x3f\x1f\xf9\xde\x8d\xbc\xcb\x2d\xee\xe9\x2e\xfa\x2c\xca\xf8\xc9\x94\x07\x9f\xab\x89\x9f\xe9\x19\xbe\xd7\xd4\xc9\xf5\xba\xa5\xc9\x72\xf6\xf4\x71\xe2\x83\x37\xae\x0f\x84\x83\x0d\x5e\x7b\x5f\xf0\x4b\x05\x4d\x5d\x89\xdf\xff\x42\x52\xfc\x58\x05\x9b\x62\xd4\x0e\xc3\xb7\x3e\x7d\xf0\xae\x9f\x1d\x8c\x8b\x6c\x63\x52\x41\x40\xd2\x41\x79\xf0\x7c\x0a\xe2\x2d\x5b\x7b\x10\xc6\xb7\x80\x91\xc0\x84\xb9\x0b\x46\xa6\xe3\x40\xa3\xbb\x6e\xaa\xc7\x8c\x1d\x75\xa9\xba\x29\xdd\x57\x2a\x98\x49\xf0\x1b\x01\x05\xbf\x11\x20\x0f\xa1\x9f\x04\x19\x11\xce\xc3\x82\xad\xbb\x8d\x1d\x65\xc7\x07\x9f\xcf\xc7\x4d\x94\x38\x8b\xaf\x9f\x44\x19\xf9\x62\xd4\x8b\x19\xb0\xc3\x3c\x89\xa5\x0b\x73\xd8\x98\xc8\x0e\xbb\xa8\xf5\xf8\x92\x72\x58\x24\x2f\x0f\x45\x59\xfa\xd8\x72\x3c\x13\xb1\xa9\x86\x79\xeb\x66\xc9\xaf\x26\xc1\x08\x19\x4f\x4f\x65\xe7\xb8\x4d\x0b\xe9\x8b\x9a\x40\xbc\x75\x98\x03\xbf\x56\x9f\x77\x71\x6d\x6c\xc1\x30\x43\x2f\xad\x8e\x00\x49\xa7\xce\x17\x2b\xcc\x7f\x36\x45\x48\xa6\x1a\x3b\x62\xd2\xcf\xac\x4c\x40\xca\x83\xd8\xa9\x3d\x7f\x3d\x09\xc3\xdf\xd9\xc0\x6b\xe3\x41\x29\x87\xc8\xd6\x99\xde\xe3\x6e\xf4\xda\x1a\xc7\xcb\xba\x3b\xdb\xe9\x25\x76\x5c\xf7\x60\xa5\xe0\x14\xe3\x0b\x00\x7a\x4f\x5c\x6b\x8a\xc4\xf1\xc0\x71\xe6\x5b\xd6\x83\x51\x23\x17\x72\xaf\xab\x75\x5e\x4e\x60\xe9\xc6\x42\x1b\x1c\x91\x7c\x55\x1b\x83\x51\x7a\x08\xd7\xcc\x1f\x1f\x2a\xac\x67\x7c\x97\x06\x16\xb9\x68\x90\x11\x5b\x33\x90\x2f\xb4\x30\x18\xe2\x64\x13\x7f\x60\x90\xfc\x42\xff\x72\xe1\x5e\x34\x3f\xe7\xc7\x30\xda\x39\xdf\xda\xe1\x33\xac\x94\x2f\x4d\x34\x75\x6c\x81\x9b\xae\xfe\xd0\xc8\x30\x20\xd6\xb9\xa7\x9a\x3f\x36\xb6\xb6\xec\x0e\xf5\x22\xc3\xf3\xf2\xdd\x4a\x1d\x95\x1f\x4a\xb1\x95\x3f\x99\x51\xde\xb3\x5c\xaf\x4e\x96\x70\xe9\x75\x4f\xe4\xb5\xa0\x6f\x17\x94\x8f\xe7\xed\xe9\x88\x7b\x0a\x9e\x88\xda\x26\xc0\x91\x78\xd6\x7f\xf7\x60\x47\x83\xb9\x04\x0c\x31\xc0\x6d\x8b\xa1\xf4\xe5\x57\xcd\x20\x70\x92\x87\xd3\x60\x32\xd0\xdd\x0f\x5e\x11\x3e\x8b\xc7\x88\xfb\x96\x6f\x8b\xf2\xf3\x26\xfc\x6a\xb0\x86\xfb\xe8\x81\x66\x9f\x0f\x50\xe3\xd1\x91\x09\x85\xfd\x3e\xb0\x42\x4f\xa2\x51\x7c\x79\x8e\xe1\x21\x24\x1f\x46\xd9\x6d\xf1\x75\x2a\xf7\x45\x94\x8f\xf8\x1d\x32\x05\x79\xa9\x28\x5b\x36\x6d\x43\xcb\x03\x13\xb1\xbd\x5e\xf4\xda\xf2\xba\x89\x0a\x30\x81\x1f\xb2\x9d\x5e\x26\xb3\x3a\x17\xc8\x26\xf9\x81\x6f\x96\xf9\x5a\x7d\xd3\xe7\x6b\xab\xc3\x16\xc8\x85\xda\xad\x6f\xb8\xc0\x6a\x9d\x5a\x41\x50\x53\xeb\x34\x73\x8e\xf7\x44\x15\x05\xbe\xd4\x9c\x00\x16\x6e\x0e\xbe\xab\x45\xe8\xda\x6d\x33\x9e\x2a\xae\xf9\x48\x76\xfa\x0e\xd9\xe9\x0d\x67\x8f\x7b\xb0\x51\xb9\x6a\x83\x41\x1d\xab\x77\xdb\x96\xa3\x3a\xaf\xf8\x66\xe3\x10\xde\x30\xb7\x2a\xf3\xed\x08\x6f\x6f\x28\x73\x84\x35\x40\x8e\x11\x00\xd8\xe3\x58\x08\x6b\x55\x05\x14\xab\xb0\xc6\x5b\xca\x3a\x06\x8d\x08\x80\x21\x3c\xbe\x1b\x75\xa4\x86\x9e\xd9\xc3\x51\xa9\xcf\x66\x34\xaa\x66\xfe\x77\x7c\x65\x49\xa1\x2f\xe5\x67\x00\x35\x6f\x9a\x9e\x1f\xb3\xdf\xb2\xb8\xb5\xb8\x73\x68\xfa\xc5\xf2\x59\xdc\x5a\xdc\x8d\x30\x25\xd0\x63\x54\x09\xf4\x71\x5c\x6d\xf8\x5a\x35\xf5\xd5\xee\x16\xfd\x8e\x36\xa8\xeb\xf0\xe2\x9a\xaf\x68\x5f\xbb\x82\x51\x8f\xa3\x9a\x21\x85\x0e\x2b\x4f\xf5\xbc\x20\x21\xa2\x9c\xec\xfa\x8c\x4b\x1e\xec\x7b\x54\x37\xec\x7c\x54\x7d\x6a\xa7\xe0\x71\x3e\x36\x3a\xcf\x77\x8b\xbb\xb2\xe7\x98\xf1\x55\x06\x0f\x73\xd8\xd6\x95\x81\xa5\xbf\x00\x2c\x7d\x43\x60\xe9\x8d\x7c\x2a\x69\xdc\x2a\x1d\x3a\x9b\xb2\xcf\x11\x29\x10\xb4\xf2\xfa\x8c\x56\x80\xb3\x8b\x7c\xaa\x16\xac\x33\x99\x4a\xd9\xba\x0b\x59\xf0\x09\x5a\xd0\x8f\x38\x89\xe0\x7d\xea\x40\xa6\x5a\x63\x35\x40\x4e\xbf\xc5\x61\x21\x2f\xcf\xb1\x62\x40\x63\xf8\x20\x39\x01\x2c\x1e\x08\x22\x58\xe3\x91\x70\x8a\xe3\xa5\x20\x02\xbf\x89\x19\xa5\x70\x30\x0f\x2c\x8c\x8b\xe0\xae\xf2\x5d\x37\x09\xb8\xcd\x65\x33\x1d\x85\xb4\xee\x0d\xd0\x7a\x1e\xc2\x69\xa7\x9d\xa0\x52\xd8\x8a\x68\x6a\x12\x5b\xac\x8f\xf3\xd8\x07\x20\x11\x5a\x6c\x4f\xf3\xe0\x33\x90\x02\xfb\xc5\x6f\x93\x28\x98\x48\xaf\x90\x59\x25\xc7\xe4\x2d\xbc\xbb\x6b\x69\x2b\x83\x25\x4a\x6d\x7a\x9a\x17\x7d\x28\x45\xf3\xec\xee\x94\xbb\x06\xaa\xf9\xe1\x7d\x46\x6d\x11\x82\xa9\x85\xac\xc4\x6f\xd0\x6b\xe4\x8a\x00\xca\xf3\x04\xe2\x49\x5a\x87\x95\xa1\x34\xb8\xaf\xf8\x45\x0d\xbc\x83\x3e\x11\xcc\xed\xe8\x1b\x96\xf6\x7c\xcb\x57\x3e\x63\xe9\x67\x13\xe0\x18\x8e\xee\x18\xbb\x55\x97\x85\xe8\x1c\xbe\xfe\x92\x0f\xd0\xcb\xe0\x8a\xe1\x08\x14\x9e\xef\xf0\xab\x2b\x81\xfb\xd1\x50\x0e\x47\x1f\xbe\xf6\xa4\x81\x7c\xa3\x16\x82\x3a\xc1\x27\xb2\x38\x1c\x5a\xee\x1a\x4d\xa1\xc8\x5b\x07\x0d\x43\xee\x39\x50\x40\x3f\xe8\x5a\x8a\x71\x31\xfd\x4a\xf1\xff\x97\x87\x9a\xc3\x01\xf8\xe7\x9a\x8f\xf4\xff\xef\xf2\x5c\xf3\xd0\x32\xeb\xde\x6b\xc6\x7b\xb4\x33\x5c\x0e\x88\xf7\x71\xe4\xb8\x8a\xf6\x33\x6a\x84\xfb\x14\x19\xb1\x2b\x1f\x59\xde\xec\x6b\x16\x5f\xb1\xda\x60\x8b\x0e\xfb\x0b\xee\x73\x44\xbd\x49\x8d\xf1\xab\x42\xf1\x10\x24\x67\xec\x2d\x92\x7c\xb5\x46\xa4\xfa\x32\x46\xa9\xd6\xa3\x19\x4c\x12\xea\xa2\xb1\xbc\xd1\xd7\x60\x79\x53\xeb\xd6\x1e\x0c\x39\xde\xdc\xd1\xa8\xa5\x92\xdc\xf4\xb5\xab\x22\x93\xcc\x44\x01\x83\xa9\x48\x4e\x78\x7d\x5e\x72\xe4\x7d\x52\x3c\xd8\x2f\x29\xcd\x1f\x47\x61\x04\x23\xd6\x66\xe2\xae\x83\x46\x01\x34\xc9\xab\x82\xb1\x0c\xe3\x53\x25\x37\xfc\xf8\xab\xe4\xe8\x77\x34\xf1\x09\x4d\xc9\x99\x23\x7e\x08\x51\x6e\x6c\x7c\x3a\x7f\x6f\xdd\xf6\x7d\x5b\xcd\x77\xfd\xf4\xcb\xbb\xae\x74\x04\x6d\x6e\x7f\xa6\xdd\xf4\x0b\xb0\xdd\xce\x1a\xbe\xde\x7d\xa9\xdd\xc1\x57\x51\x06\x70\xf2\x48\x40\xea\x1e\xc0\x78\x85\xdf\x5a\xb8\x61\x1e\x99\x75\xfc\xa1\xe7\x0b\x62\x31\x45\x7a\x7d\xaa\x25\xf8\x5a\xa6\x5a\x47\xf0\x51\xcd\xa3\xab\xc0\x90\xa3\xaf\x6f\xfa\x22\xc5\x2b\x8a\x02\xe4\xea\x0b\xbe\xbd\x3c\xae\x2a\xaf\xd7\xde\xbc\xbb\xa6\xe4\xa2\x3d\x88\xc3\x48\xd7\x85\x3d\x06\xfa\x8d\x4a\xfb\xa4\xc1\xe9\x85\xfb\x0a\x68\xb0\xd2\xda\x24\x7f\x61\x30\x0b\xbe\xed\xad\x8d\xd3\xf8\x1b\xfd\x7e\x96\x1a\x4c\x95\x56\xf9\xfd\x77\x0e\xfe\xdd\x76\xd6\x4e\x70\x15\x79\x40\xf6\xfa\xd2\xaf\xae\xc0\xe8\x30\x8a\x2d\xb7\x38\x68\xdc\xa1\x14\xd2\x7b\x78\x56\x46\x1d\x7c\xe5\xbb\xbc\x61\x5b\xc1\xa1\xf2\xc0\x58\x27\xef\x1a\xc6\xef\x34\x85\x80\x99\xec\x3f\x7b\x8e\x2d\x6a\xd8\x39\x99\xc6\x15\xa2\x77\xd9\xa2\x4a\xd3\x61\x00\x0f\xbd\xc8\x26\x46\x01\x53\xc6\x9d\xcd\x5b\x95\xf1\xd8\xf4\xad\xb0\x0f\x7d\x80\x38\x00\xb9\x17\xd7\x5a\x00\x61\x5f\x76\x0f\x80\xa6\x3f\x80\xab\x00\x43\x9e\xa2\xd9\x83\xef\xa2\x46\x1f\x44\xb5\x9a\xf6\x7d\xb7\x66\x27\xda\x36\xbe\xbf\xa8\x77\x8c\x3e\x20\x93\x05\x2d\x03\x9f\xfa\x08\x71\x50\xa4\x1d\x71\x51\xd8\x09\x4e\x28\xfe\x22\xe3\x83\x1f\x4c\x36\x04\xb3\xc9\x7d\x91\xc9\x23\x3d\x41\x1d\x18\xfc\x17\x08\xe3\x1d\x57\xa2\x71\x8f\x6b\xd0\xb8\x8f\x80\x8b\x13\xd8\xf8\xf9\x35\x7e\x09\x0b\x71\x23\xe6\xd0\x32\xa5\x22\x9b\xb0\xe4\x0d\x3f\x57\x11\xe2\xa0\x98\x7b\xc2\x70\x1f\xb1\x9c\x24\x0d\xff\x11\xf0\xb0\x5b\xfe\x7c\x77\x70\x10\xf8\xdc\xf0\x48\xf3\xb9\xe1\x57\xc2\x7d\xee\xd4\x67\xbb\xc7\xa5\xde\x33\xff\x2d\xc7\xa6\x3c\xda\xca\x97\xcc\xbb\x47\xf8\x56\xeb\x77\x41\x8d\xf0\x93\xdf\x71\xee\xb0\x0d\xfd\xc2\xe8\xa0\x09\x63\x96\xd1\x96\xa9\x16\x47\x10\xe3\x3e\x34\x18\x3d\xe0\x0c\xf4\xcb\x07\x6b\xf5\x58\x89\xbe\x30\x3c\x24\x66\xcf\x6c\x1d\x29\x87\x8c\xd6\x06\xc6\x21\xed\xd1\xa7\x77\xf5\x73\x6f\x1a\xdb\xee\x3e\x6e\xf8\x0b\xb2\xfd\x08\x27\xbf\xab\x3b\xfc\xa0\x2e\x07\x9d\x5b\x95\xf8\x0b\xc8\xe3\x4f\x1f\x2b\x98\xbd\x22\x0f\x8b\xc0\xe8\xc1\x79\x98\x02\xf4\xbd\x79\x63\x0c\x72\xc5\x89\xe3\xbb\xb3\xb5\x9a\xbf\xe5\x1a\x14\xa2\xbc\xd3\x77\xb0\x77\xbb\x71\x47\x5f\x61\x8b\x2a\xc9\xc7\xdf\xdc\x97\x9e\xc6\x95\xed\xb6\x9e\x5b\x44\xbb\x7d\x34\xb9\x88\xbf\xed\xca\x1d\x35\x2e\x9f\x67\xe3\xb7\xce\xe8\x67\xfa\x0e\x3f\xdd\x5a\xc9\xb5\x22\x68\xc3\x1c\xcc\xfc\xc2\x2e\x1a\x41\x29\xa6\x1c\xb7\x4a\x77\xd5\x96\x8f\x65\xfd\x3c\x0d\x2f\x0e\xe5\xe0\x6c\xfe\x33\x72\x42\x24\x87\x9c\xf9\x02\xbf\xa7\x07\xa8\xb0\x63\x29\x30\x2e\x37\x82\x22\x3a\x6f\x02\x62\x7a\xf3\xeb\xbb\xcb\x01\xe4\xc4\x06\xd5\x92\x89\x0d\x1d\x7f\x7e\x3b\xdc\xbe\xe2\xca\x71\x53\x80\xfb\x66\x7a\x06\x02\x79\x74\x02\x42\x43\xde\x33\x0b\xe2\x99\x6c\x48\xa9\xad\xc8\xb7\xb2\x63\x94\xce\xe4\x77\x0c\x14\x3c\x00\x29\x50\xf6\xfe\xe3\xa8\xd7\x3a\xec\xb3\x16\x37\x84\xe7\x07\x12\x22\x10\xf0\x03\x09\xb5\x9d\x1c\x9e\x41\x93\xca\x7a\x5f\x15\x2a\x38\x0a\xfc\x95\x66\x19\xa8\x81\xf8\x96\x0d\x42\x9b\x76\xc3\x24\xc2\xad\x9c\xf4\x76\x86\x5f\xd1\xd2\xe9\x46\xe4\xfd\x22\xb0\x7e\x1b\xf2\xf3\xf5\x52\xc3\x80\x97\x0b\x87\x18\x33\x28\xbd\x3e\xf3\x4f\x63\xc2\xf6\x34\x98\xcc\xba\xba\x2d\x9d\xa5\x4a\x67\xf3\x8e\xf2\x22\x60\xfe\x6e\x7e\x67\x17\x22\xe5\x13\x80\xfc\xe5\xed\xc1\x24\xc2\xa6\x74\x26\xa3\x96\xb6\x15\xac\x87\x01\x5e\x24\x63\x1a\xe3\x06\xad\x7c\x3b\x00\x57\xc6\x3d\x64\xb7\xf6\x09\x9d\x60\x87\xf8\xef\x59\xf8\xf3\xd9\xf5\xce\xe7\xf2\x64\xcf\x0c\xa5\x27\x17\xc3\xe0\xe4\xb2\x68\x81\xd9\xa2\x95\xb7\x55\xf8\xdf\x0d\xfb\x71\x5d\x49\xb8\xf7\x2c\xaf\x23\xda\x2b\x76\x72\xd9\x46\x93\x1e\xde\x47\x17\x08\x9a\xac\x60\xe2\x39\xb1\x18\xa0\xfc\xbd\x5c\xec\x02\xb7\xc2\xaf\xf2\x5b\xed\x78\xbe\x99\xc6\x82\x03\x77\x35\x1e\x3c\xbb\x92\x9c\x00\x66\xea\x81\x25\x1b\x3a\x42\x1c\x2d\xd4\xf1\x68\xff\xae\x7b\xa8\x3f\x0c\x65\x11\x17\x16\xe5\x20\x3f\xb3\xb5\xdc\xbd\x18\x04\x61\x18\x6c\x28\x85\x84\x79\xd9\xf7\x91\x9c\xe6\xca\x26\x06\x6e\x45\x0d\x3e\x0e\xbf\x9d\x05\xb0\x10\xc5\x83\xc7\xc9\x65\x0c\x52\xfe\xa5\x10\xab\xe4\x93\xc4\x34\x7c\x1e\xbc\x5f\x6b\xe6\xc7\x20\x8c\x26\xba\xff\xf3\x58\x9e\x88\x93\x4b\x52\x56\x89\x23\x88\xe4\x89\xbb\x00\xf6\x59\xd7\x2e\x9e\x3d\x0e\x1f\x96\x63\x8b\x90\x07\xe0\x87\xe8\xb8\xf0\x47\x7d\x75\x4e\xc7\x01\xa3\x06\xb5\xf9\x37\x7d\xb0\x4e\x7e\x87\xed\x8a\xd9\x43\x9a\xee\xfe\x93\x6b\xfd\x6f\x89\x06\x5b\xf8\x26\x34\x03\x6f\xd9\xff\x91\x86\xdc\x1b\x1e\x3a\x3f\xfb\x3d\xc0\x0b\xae\x4c\x33\x42\xe4\xee\xf4\xf0\x03\x07\x8a\x2a\xdc\xbc\xe6\x9b\x38\x1e\x4f\xf4\xe3\x61\x44\x45\x4d\x8d\x10\xd5\x6c\xf8\x0e\x62\xf6\x43\xe6\x1f\xc2\xc4\x25\x3c\x29\xa8\x3a\x7d\x17\x4b\xbe\x1e\xf1\x83\x7b\x04\x33\xf9\xd4\x37\xcd\xfa\x73\x92\x2f\x79\x4e\xf4\x37\xc1\x2b\xb3\x12\xaf\x8b\x98\x34\x4a\x26\xf2\x93\x53\xdf\x73\xc3\xdf\x93\x96\x4a\x0c\x04\x8f\xb3\x7d\xbf\x41\x86\x7c\x7f\x18\x19\x2b\x64\xf0\xf3\xc4\xf8\x59\xe0\x67\x91\x1f\xf0\x6b\x8f\x5f\xfb\xb2\xbc\x93\xca\xe0\x30\x54\x9d\xb4\xbe\x15\x72\x0e\xf8\xcd\xaf\x8d\xe1\xe3\xef\xe8\x47\x9f\xf5\xb3\x1f\x78\x12\x4e\x3e\x77\x8c\x7c\xfb\x41\xf9\xf2\x21\x90\x17\xfe\x9b\x20\x8f\xd9\x3f\x76\xd0\x2c\xa4\x28\x87\xbb\xd7\x2c\x49\x3e\x06\x9b\x20\x5d\x56\x1b\x94\x34\xe5\xf2\x38\x34\x53\x92\x94\xd7\xe6\xfb\xcc\x8f\x4b\x53\xc8\xf5\xa3\xd2\x54\xf2\xff\x02\x00\x00\xff\xff\x74\xa9\x25\x86\x53\x8d\x00\x00") +var _confLocaleLocale_enUsIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xc4\x7d\xeb\x92\xdb\x46\xb2\xe6\x7f\x3c\x05\xac\x0d\xad\xec\x88\x16\x15\xf6\xc4\x5e\xc2\x21\xc9\xdb\xee\xb6\x2e\x73\xd4\xea\x3e\xea\x96\x67\x67\x15\x0a\x0c\x48\xa0\x49\x4c\x93\x00\x0d\x80\x4d\x73\x7e\xed\x6b\xec\xeb\xed\x93\x6c\xe6\x97\x99\x75\x01\xc0\x96\x3c\xe7\xc4\x9e\x3f\x64\xa1\x2a\xeb\x96\x95\x95\x95\x99\x95\x55\x95\x6f\xb7\x59\x51\x76\x8b\xf4\x45\x7a\x9a\x6e\xf3\xaa\x5e\x97\x5d\x97\x76\xe5\xfa\xf6\xe9\xaa\xe9\xfa\xb2\x48\x5f\x57\x3d\x7d\xb7\xf7\xd5\xa2\x4c\x92\x55\xb3\x29\x09\xf4\x0d\xfd\x25\x45\xde\xad\xe6\x4d\xde\x16\x14\x71\x6e\xe1\xa4\xfc\x7d\xbb\x6e\x5a\x06\xfa\x45\x42\xc9\xaa\x5c\x6f\x39\x0f\xfd\x25\x5d\xb5\xac\xb3\xaa\xa6\xcf\x6b\x0a\xa5\x6f\xeb\xa4\x6b\x16\x55\xbe\xce\x82\x04\x44\x58\xfa\x8f\xe9\x0f\x75\x91\x5e\xf7\xe5\x36\x7d\xde\x6d\xf2\xf5\xfa\x65\xde\x21\x4b\x5f\xa6\xf9\x62\xd1\xec\xea\xfe\xf9\x33\x49\x90\xc2\x9b\x5d\x6f\xa5\x5f\xee\x7a\x89\xdb\x6d\x2d\xea\xe3\x36\x69\xcb\x65\x45\x1d\x6b\x29\xea\x83\x06\x93\x7d\x39\xef\xaa\x9e\x1b\xfd\x17\x09\x25\xf7\x65\xdb\x55\x0d\xb7\xe7\x57\x09\x25\xdb\x7c\xc9\x00\x57\xf4\x97\xf4\xe5\x66\xbb\xce\x91\xe1\x46\x83\xc9\x3a\xaf\x97\x3b\x81\x79\xa7\xc1\x64\xd1\x96\x94\x94\xd5\xe5\x9e\x62\xcf\xf0\x91\xd2\xc7\x6c\x36\x4b\x76\x84\xd3\x6c\xdb\x36\xb7\xd5\xba\xcc\xf2\xba\xc8\x36\x82\xb5\x8f\x14\x9f\x6a\x7c\x4a\xf1\x29\xc7\xa3\x1b\x65\x41\x08\xca\xf2\x4e\xfb\x42\x43\x43\xf8\xca\xbb\x04\x45\xd5\xf9\xc6\x72\x73\x30\x29\x37\x79\xb5\xe6\x41\x78\xca\x01\x6a\x7c\xd7\xed\x1b\x0c\xd5\x95\x06\x09\x11\x59\x7f\xd8\x96\xc0\xc3\xd3\x1b\x0a\x25\x8b\x7c\xdb\x2f\x56\x39\xb7\x55\x42\x09\x01\x6d\x1b\x42\x48\xd3\x1e\x00\x67\x1f\x49\xd3\x2e\xf3\xba\xfa\x47\xde\x0b\x92\x2e\x83\xcf\x64\x53\xb5\x6d\xc3\xf8\xbd\x40\x20\xa1\x1e\x67\x5c\x0e\xc5\xbc\x27\x4c\x04\xa5\x70\xca\xa6\x5a\xb6\x82\x4a\x4e\xbc\xc0\x17\x97\xc2\x69\xb7\x4d\x7b\xa7\x09\xaf\x38\x38\xc8\x4a\x8d\xd0\xd4\xb8\xfe\xbc\x26\xe4\x6b\xea\x05\x3e\x22\x80\x2e\xc9\x8b\x0d\xa1\x72\x9b\xd7\x25\xe3\xe8\x94\xbf\x08\x2f\xf4\x95\x28\x4d\x65\x5d\xd9\xf7\x55\xbd\x64\x64\x9f\x4a\x54\x7a\xad\x51\x49\x90\xe6\xe2\x0e\xcd\xce\x0d\x27\xc5\xff\x95\x3e\xd3\x2b\xf9\x94\xb4\x20\x13\x12\x5d\x4e\xee\x49\x97\xdd\x96\x65\x21\x7d\xe9\xd2\x57\x14\x4e\xb6\xbb\xf5\x9a\xb0\xf6\xdb\xae\xec\x7a\xce\x74\x45\xdf\xd4\x7f\xf9\x4e\xaa\xae\xa3\x00\x45\xbf\x45\x20\xa1\xa1\xab\x17\xe8\xcc\x19\x02\x49\xf2\xa9\x2b\xf3\x76\xb1\xfa\x9c\xc8\x3f\xda\xca\x01\xa6\xbd\x63\x83\xca\x84\xa4\x44\x24\x35\x58\x05\xc9\xa2\x29\xf8\xe3\x8c\xfe\xa8\xe8\xaa\xee\x7a\x9a\x71\x9f\x13\x0d\x30\x98\x84\x64\x00\xfa\xaa\x07\x16\x34\x12\xd3\xb7\xe3\x11\x4c\x5f\x55\x6d\xd7\x3f\xed\x2b\x22\xd6\x0f\xbb\x3a\xe1\xfe\xd1\x6c\xcb\x8a\xb9\x31\xa1\xd7\x0d\xa1\x08\xd1\x2d\xf5\xef\xe2\x70\xfd\xaf\xef\x4e\xd2\x2b\xe2\x44\xcb\xb6\xa4\x70\x4a\x65\xd0\x1f\xe5\xf9\xd3\x2c\xa1\x5c\x56\xd3\x79\xde\xe7\xf3\xbc\x2b\x3d\x5a\x39\x51\xa8\xdb\xa5\x81\xc6\x99\xab\x81\x83\x75\x7d\xd4\xdf\xa9\x19\x42\x65\xe8\xbc\x72\x65\xbc\xe7\xc9\x45\xf1\xcc\xd4\x90\xf9\x6a\x5d\x72\x3c\x15\x95\xbe\x7d\xff\xfe\xf2\xfc\xe7\xb4\xac\x97\x55\x5d\xa6\xfb\xaa\x5f\xa5\xbb\xfe\xf6\xbf\x67\xcb\xb2\x2e\x5b\xe2\x71\x8b\x2a\xa5\x39\xd5\x12\x25\xa4\x44\xd8\xd2\xb9\x59\xd2\x75\x6b\x9a\xfb\x40\xef\xf5\xf5\xbb\xf4\x82\x51\xbc\xcd\xfb\x15\x1a\xd2\xaf\x92\xee\xb7\x35\xa3\xc8\x55\x78\xb3\x2a\x53\x50\x19\x80\x9a\x5b\xc3\x47\x5a\x68\x1b\x67\x49\xd9\xb6\x19\xb1\xa5\xfe\x90\x69\x66\x2d\x6f\x08\x29\x45\x10\xe9\xd4\x4d\x9f\xce\xcb\x14\x79\x66\x49\x62\x0d\x36\xec\x9e\x6e\xb7\xeb\x6a\x21\x73\xfd\xb5\xa4\x79\x44\xf3\x0a\xa2\x58\x0a\xe1\x80\x28\x4b\x0b\xd0\x45\xec\x99\xe7\x43\x1a\x31\x10\xe4\x5f\x95\xc4\x00\x57\xbb\xa5\xb0\xbd\x75\xb3\x2b\xbe\x01\xa5\x5a\xeb\x3d\xa1\xa6\x1f\x1a\x6a\x30\xb0\xe3\x00\x7c\x15\xa7\x44\x71\xbc\x68\xb5\xe5\xa6\x21\xbe\xe2\x88\xbd\x22\x82\xda\x57\x94\x48\x3d\xed\xf2\x7b\x9a\x6f\x7d\x93\xf6\xab\xaa\x4b\x0b\x22\xb6\x05\x17\x4c\x53\x63\x47\xcb\x85\x90\x05\x11\xa8\x90\x86\xc5\xc5\x63\x00\xa8\xcd\x8e\xa8\x69\x45\x85\xf1\x62\xc4\x2b\x27\x15\x39\xd5\x4e\x74\x89\xca\x01\x7d\x13\xe5\x36\xc4\x95\x99\x6f\x9e\x23\xa0\xdf\x61\xf9\xd4\xaa\xfc\xf6\x96\x5a\xd5\x11\x55\xbc\x49\x17\xeb\x86\x48\xea\xe3\x87\x77\x94\x79\xd5\xf7\xdb\x6c\xdb\xb4\x20\xe3\x9b\x9b\x2b\x9a\x1e\x6d\xef\x63\x03\x5c\x33\x4c\xbd\xdb\xcc\xe9\x6b\xbf\xaa\x88\x09\xe4\xc1\x00\x01\x15\x6b\x5e\xff\xea\xb4\xa9\x67\x18\xab\x5d\xbb\x1e\x0c\x23\x55\x69\x29\x47\x9a\xc7\x4d\x78\xc6\x3f\xd7\xbe\x95\xe8\x6e\x47\x42\xc2\x1e\x83\x4a\x5d\x2d\xb1\x0e\x11\x6d\x35\x5b\x2e\x37\x20\xae\x4b\x8d\xf0\x14\x85\xb5\xcb\xa5\xcb\x0a\x46\xa9\x10\x41\x02\x2e\xbc\xa1\x0e\xeb\x6c\xbe\xbe\x20\x34\x60\x4a\x23\xf6\xb6\x6d\x36\x14\xfb\x8a\xfe\x7c\x84\x6f\xfe\x05\x97\x07\x98\xbc\x28\x88\xcd\x74\x27\xe9\x87\x57\x67\xe9\x7f\xf9\xd3\x0f\x3f\xcc\xd2\xb7\x3d\x4f\x08\xa6\x91\xbf\xf3\xd8\x52\x50\x96\x52\x07\x4a\x33\xb7\xa7\xe1\x7f\xc4\x04\xfe\x28\x7d\x8e\xd4\xff\x51\xfe\x9e\x93\x18\x50\xce\x16\xcd\xe6\x25\x4f\xee\x4d\xde\xcf\x12\x4e\x21\xaa\x51\x72\xba\x2e\xeb\x82\x02\xba\x20\x6b\x5a\xc0\x75\x34\x3d\x58\x9e\x45\x38\xc9\x16\x4d\x7d\x5b\xb5\xdc\xa1\x5f\xea\x7c\x4e\x38\x31\xb1\x85\xd8\x31\x52\x6c\xd5\x23\xa4\xd1\x44\xae\x6e\x0f\x1e\x14\x5d\x7d\xcf\x91\x3a\xa0\x09\x8b\x72\x25\x2f\x47\x40\xa7\xc3\xf2\x35\xa2\x31\x6e\x97\xd4\xbd\xd6\xf0\xdd\x79\x84\x37\xb7\xb7\x6b\x62\x6c\xc6\xac\xb4\x86\x4b\x89\x15\xbe\x15\x82\x10\x31\x6e\x21\x78\x9d\x57\x1d\x20\xcf\xce\xdf\xa7\xe5\x3d\x51\x1b\x91\x03\xad\x94\xc5\x6e\x01\x0a\x63\xd8\x93\x94\x97\x09\xc2\x2f\x71\x86\x85\xb0\xb7\x60\xae\x72\xd3\x98\x21\x2c\x08\x88\xa6\x68\x21\xe5\x65\x82\xa0\xd6\x44\x10\xab\xe6\x9a\x65\xd7\x30\x6d\x32\xc3\xa8\x75\x18\xa5\x6e\x98\x97\x86\xbb\x5e\x1f\x52\xc8\x0b\xa0\x0b\x91\xe8\x4c\xf4\xec\x66\x89\xae\x55\x26\xc0\x66\xf7\x15\x84\x3d\x37\x54\x48\x35\x69\x96\xd9\xc3\xaf\x0c\xc0\x52\x64\x37\x99\xd7\x35\xec\x92\x2b\xee\x9c\xa0\xc7\xed\xeb\xd0\x04\xd4\xc0\xd2\x28\x11\xe3\x7d\x05\x4e\xa3\xc8\x42\x5b\x09\x63\xa8\x9a\xaa\xea\xca\x12\x25\x50\xfe\x67\x54\x26\xf2\xcc\x54\xf8\x51\x79\xc4\xd6\x5d\x92\x49\xd2\xa2\x49\x79\x21\x00\x3b\xa3\xdc\xd6\xd5\x5a\xbb\xaf\x7d\x4e\xdb\x6a\xb9\x22\xbe\xd2\xec\x4f\x04\x69\xfb\x55\x53\x32\xed\xbc\x3d\x7f\xf1\xbd\xb4\x63\xc9\xcc\xcd\x65\x62\xb6\x98\xef\xfa\x86\xe9\x54\x87\x50\x9a\xe0\x96\x17\x40\x8e\xc4\x2c\x01\x1a\x0a\xb6\x26\xba\x8d\x57\x6b\x9d\x27\x61\x9a\x4e\x10\x0f\x23\xb9\x07\xc2\xb1\x4a\x31\xd9\xb2\x81\x78\x66\x52\x0b\xb3\x6a\x92\xf4\xbb\x3e\x5b\x56\x7d\x76\xcb\x13\x96\xcb\x7c\xc5\x79\x79\xe5\xa0\x94\xf4\x09\x25\x3d\x49\x69\xd6\x93\xcc\x59\xfc\x98\x3e\xbe\xd7\xe5\xfa\x4f\x3c\x13\xb3\xfc\x9e\x60\x31\x18\x2a\xf4\xb5\xa5\x48\x0b\xa6\x5d\x14\x0d\xd1\x39\xe3\xbc\xdb\x6d\xc1\xd1\x75\x85\x3e\x49\xb7\x02\x58\x34\xfb\x7a\xdd\xe4\x05\x58\x0e\xcd\xae\x0a\xba\xd1\xbc\xaa\x73\x5a\x5d\xac\x14\xb0\xb2\xc7\x44\x0d\xef\x2f\x6f\x00\xb8\x6c\xe6\xbb\x6a\x5d\x18\xc0\x8c\x7a\x78\x9f\xaf\xab\x82\xe5\x2c\x1d\xf7\x50\xa6\xb1\xa8\x4a\xda\xb2\x68\x5a\x5e\x0e\xd1\x1b\xcb\x78\x64\x1d\x6e\x79\x7d\x43\x34\xe5\x55\x58\xe4\x73\x4b\x26\xa3\x81\x06\x1e\x02\x28\x2f\xa8\xa0\x98\xaa\xab\x9f\xf4\x68\xe9\x62\x47\x75\xd1\xa0\x73\x34\x65\xec\xd2\xa7\x2f\xe9\x37\xe1\xe5\x59\xf8\xde\x72\x8c\x78\x4e\x4c\x25\x71\x27\xb3\x34\x6a\x6a\x44\xde\x8e\xba\x8c\x78\x83\xbe\x86\xed\x35\x12\xe8\x76\x42\xaf\xac\x08\xae\x69\x58\xcb\x6f\x28\xf0\x84\x26\xf0\x72\x8d\x41\xc8\x21\xbd\x90\x18\xd7\x10\xde\x98\x40\x4e\x64\xba\xdc\x52\xd7\x98\x77\xf6\xf9\x1d\xb5\x2d\x6f\x49\x08\x4b\x3e\xb1\xb2\xfc\x39\xd9\x89\x00\xd4\xac\x0b\x27\x6c\x82\xa6\x9b\x76\xa8\x9c\x79\x20\x47\xaf\x1d\x49\x91\x8b\x55\xe6\x54\x6d\x46\x4a\x5f\xfe\x8e\x35\x0f\x49\x5e\xf3\x66\x62\xe7\xa4\x64\x73\xc0\x70\x71\x27\x2e\x0e\x7e\xb4\x48\xfc\xa1\x29\x42\x22\xfa\xbc\x61\xac\xdd\x97\x0e\xea\x2c\x8c\x8d\x33\x50\x59\x24\xa8\x69\x51\xb1\x0e\x45\x49\xa2\xe8\x69\xaa\x28\x7b\xa4\x8a\x7c\x52\x13\xc0\xe7\xc4\x2a\x88\x8a\x4c\x3e\x11\x33\x20\xbd\xc4\xeb\xc6\x99\x0d\x8e\xd3\x91\x59\xa5\x53\x7e\xe0\xd7\xc1\x55\xb9\xe5\x25\x73\xd3\x61\x54\xd7\x04\x59\x1c\x54\xf6\x72\xe3\xfb\x93\x70\x5a\x1a\x70\xe2\x4f\xdf\x98\x71\xe1\x0f\x16\xf1\x73\x45\x23\x89\xfc\xf1\xca\x21\x0a\x3b\xc9\xc8\xb0\x52\xb4\xed\xe1\x24\x8d\xd6\xa0\x15\xe9\xe6\xf3\x92\x16\x38\xcd\x56\xcc\x4c\x3b\xe0\x51\xcb\x17\x42\xf2\x30\x34\x80\x48\x25\x67\xd3\x0e\x97\x34\x6e\xa1\x30\x28\xad\xc5\x2d\xf8\x58\xce\xc3\x55\x7f\xa2\x4e\x42\xd8\xa6\x64\x99\x2f\xdb\x88\x6e\x2f\x5f\xe9\x45\x99\x90\x60\xb2\xa4\xf9\x68\xf4\xf6\x82\x55\xb2\x25\x24\x54\x25\x37\x06\x28\xfb\x90\x83\x2a\x84\xc5\xfc\x64\x06\x15\x9a\xd8\x7b\xe8\xab\x34\x35\x47\xe8\xa7\xb5\x86\x92\x67\xc6\x91\x65\xc1\x85\x7c\xd2\xd1\x64\xf7\x48\x3c\x65\x63\x48\x1a\x42\xa9\x9c\xe8\xbb\xc5\x19\x78\xd2\x3f\x9f\xbf\x7c\xdc\x3d\x7f\x36\x7f\xe9\x58\xe3\x62\x55\x2e\xee\x44\x97\xa8\xea\x79\xf3\x3b\x14\x2e\x1a\x78\xc6\x71\xcd\x53\xe4\x71\x91\xae\x28\x15\x32\x39\x4d\x65\xca\x46\x88\xe7\xd4\x68\xd0\xa8\x31\x3c\xe3\x67\x66\x9a\x72\x8b\x83\x11\x12\xe5\x46\x25\xd2\xb2\x84\x86\x91\xe7\x0e\x74\x7a\x4f\xb7\xa7\x1c\xcb\x94\x0b\x36\xef\x49\x17\xfd\x5d\x57\x9b\xaa\x1f\x91\x0e\xf3\x91\x5c\x49\x50\xf5\x7c\xc3\x25\xca\x02\x36\xd0\x16\xe2\xc6\x54\x0c\xad\x9b\x46\x4e\xfb\x9c\xd4\x9b\x3f\xa5\x44\x42\x3b\x5a\x85\xb8\x4f\xd4\x4c\x62\xc7\x39\x2f\xbc\xa4\x20\xe4\x5d\xb6\xab\x15\xad\x65\x61\xc4\xf4\xa6\xc2\x22\xc1\xf5\x1a\xc9\x07\x50\x86\x79\x95\x73\xd3\x6f\x1d\xc6\xbf\x23\xa1\xf8\xd6\x65\x63\xce\xcd\x0d\xaa\x58\x26\xcb\x27\x07\x8f\x38\x5b\x5d\x8a\x7a\x05\x0c\x30\x1c\x0f\x34\x29\x07\x7e\xf4\x48\xc3\xb8\xa3\x18\x0c\xc8\x7c\xd7\xf7\x0d\xcb\xdc\x6b\xa6\x1a\xc9\x63\xad\x3e\x03\x20\xd4\x08\x5f\x1e\x06\x24\xc4\x93\x8c\x4d\x69\x32\x70\xe6\x8d\x84\xaa\xad\x0c\x7a\xa7\x4b\x9d\x03\x2b\x44\x5d\xcf\xeb\x83\x91\x32\x11\x04\xb7\x82\x2b\xec\xa7\xdb\xf2\x6d\x5b\x7e\xe7\x5b\xe3\xe6\x0c\x72\x58\x8b\x24\x7b\x30\x9f\x3e\x20\x55\xcc\x43\x36\xeb\x6c\xe5\x52\x23\x8b\xa7\x8f\x36\x46\x2f\xd2\x79\x66\x10\x83\x25\xb1\xb1\x00\xa2\xa9\x17\xc8\x3d\x1b\xd4\xe5\xd5\x9d\x31\x06\xfb\xb8\xc9\x7e\x01\xea\x9b\x26\xeb\x56\xa2\x5a\x5a\xf3\xd2\x75\x59\x2f\x23\x33\x01\x4c\xc4\x20\xba\xff\xca\xcb\x1c\x09\xf0\xf9\xfa\x73\x72\x80\x3d\xea\xaf\xc4\xe1\x6b\x58\xfa\x9a\x84\x12\x44\x19\xb9\x40\x80\x40\x59\x33\xfa\x9c\xf0\x12\xf8\x7e\x20\xd6\xf1\x12\xa1\x71\x81\x7c\x81\xa4\x5f\x22\x69\xcd\x86\x30\xb9\x9a\x10\x01\x3f\x94\xde\xa2\x89\x90\xeb\x22\x29\xd1\x37\xa6\xea\x90\x3e\x7d\x57\x6a\xe1\x6f\x48\x6d\xee\x3e\x42\xed\x15\x1d\x96\x15\xde\xab\xfc\xc0\x42\x97\x44\xeb\x07\x12\x6e\xca\x7c\xa3\xad\xe4\xa0\x14\x71\x4a\xcb\x99\x46\x72\x90\x56\xb9\xc0\xaa\x91\x40\xfc\xb0\x2e\x88\x2c\xa2\xcb\xbe\x13\xff\x4b\x35\x97\xfe\x6d\x64\x8a\xf9\x5b\x92\xaf\xb7\xab\x1c\xeb\x7f\x00\x06\xab\x03\x01\x61\xe0\x53\x80\x80\x16\x76\x9b\xb2\xad\x16\x1c\xe4\x0c\xdf\x3e\xcd\xbe\x83\xc1\x89\x26\x0a\x09\x82\x71\x61\x05\x4d\x92\x7f\xaa\x40\x0e\xb3\x90\x18\x96\xdb\x55\xff\xb0\x5e\x44\xc5\x71\x3c\xf1\x1c\x82\x80\x48\xe6\xa1\x1c\x10\x16\x46\x16\xcf\xfa\x94\xf9\x42\xcf\x22\x60\x54\xf4\x26\xff\xfd\x4b\x19\x37\xcd\x44\x3e\x61\x05\x3e\x93\x4d\x78\xed\x62\xcc\x0e\x08\x9e\xed\x1b\x47\xa1\x69\xe8\x19\xa4\xbe\xa3\x55\xad\x76\x60\x1f\xe5\x3b\xc5\xf7\x8f\x66\x3c\xa7\x25\x44\x05\xe8\xd4\x99\xd1\x69\x71\x2e\x98\x6f\x42\x10\x9e\xf9\xe9\x16\x0a\xc7\x8e\x9c\x59\x8c\x34\x95\xdf\x31\x0e\x92\x28\x45\x4f\x20\x92\x9a\x79\x8b\x7f\xc6\x6b\x64\xc6\x42\x67\x1d\x8a\x96\x6e\xf5\xb4\xf5\x05\x10\x62\xf7\xcd\xc6\xf9\x06\x13\xee\x68\x76\x12\x05\x26\x72\x5f\x8e\x0d\x79\x47\xf2\xf7\x34\x65\x26\x0a\x70\x33\xe9\x68\x46\x19\x4c\x64\xa2\x9e\x17\x23\x5e\x30\xce\xc8\x60\xa4\xf6\xac\xd7\xe5\x92\x4d\x4d\x56\x71\x54\x9b\x92\x10\x2d\x06\x02\x16\x12\x90\xc7\xb0\x1b\xac\x70\x5c\x43\x21\xde\x8d\x51\xac\x3e\x51\xab\x49\x1c\xa7\x20\xe7\x0c\x94\x28\x6d\x86\xae\xe4\x1b\xd6\x17\xba\x1d\xb3\x66\xd6\x2d\x44\x3a\x89\x47\x83\x17\x5e\x14\x55\xa2\x8a\xe3\xc5\x13\x2d\xb2\xc2\xf5\xa5\xf2\x01\xf6\x07\x8b\x0e\xd5\xed\x71\xc1\x5a\xb8\x03\x3a\x56\xac\x53\x08\xcb\xdf\x2b\x98\xed\x5e\x57\x6c\x0e\x82\x4a\xe8\x34\x61\xa4\xcd\x92\x35\x31\x03\x56\x3d\xa4\x57\x22\xc7\x36\xf7\xac\xb9\x71\x7d\x9c\x2a\xf9\xc4\x8c\xa7\x9d\xe2\x71\x56\xe5\x92\x94\xb9\x66\x5f\x16\x27\xb4\xc4\x73\x0e\x6a\x27\xd8\x46\xbe\xde\xe7\x87\x0e\x36\x12\xe3\x38\x6c\xb2\x94\xec\xcc\x4e\x48\x00\x58\xa2\x55\xa1\x7d\x9a\x66\x9c\x61\xa2\x23\xde\xc9\x8b\x87\x5b\xa6\xf7\x50\x0f\xc1\x2d\xd4\xea\x42\x5a\x37\x2f\x7b\x58\x62\x75\xad\x61\xd5\x96\x15\x41\x96\xf1\x25\x39\x28\x08\x5b\x1e\xca\xf9\x27\xf2\x9e\xb0\x78\x44\xd5\xb0\xb0\x42\xfc\x58\x70\x4d\xf2\x1f\x61\x16\x4d\x0a\x6c\x05\x3b\x2a\xff\xa9\xc8\xc5\x15\xe1\x90\xf5\x2c\xaf\x3e\xf3\xda\x44\xa3\x62\x86\x5d\x89\x87\xf2\x9b\x74\x3d\x4d\x01\xc6\xb4\x6d\xd3\xfd\x55\xe4\x2b\x55\x99\x39\x15\x53\x0c\x68\xea\x56\xd5\x36\x6d\x60\x2c\x0c\x51\xe8\xc9\x36\x10\x31\x09\x1b\x45\x09\xb9\x9b\xad\xa6\x6d\x5e\x77\xb7\x25\xcc\xa7\x9b\xf4\x96\x77\x82\x66\x5a\x35\x4b\xac\xb2\x5d\x77\xa4\x66\xd1\x61\x50\x75\xb8\x5a\x60\xec\x82\x81\x8a\xab\x26\x98\x7b\xd4\xac\x6d\x00\x56\x7d\x49\x9d\xb5\x81\xc9\x6c\x84\x02\x48\x8d\xd1\x26\x85\xb5\xe6\xbe\x0c\x11\x71\xfb\xcf\xf6\x3c\xc0\xba\x5a\x88\xc5\xac\x1e\x0f\x93\x54\x0a\x6b\x05\xf6\x98\xe6\x87\xb8\xf7\x9c\xd5\x51\x00\xef\x78\xdc\x97\x5a\x0b\x4f\x0c\x9e\x2b\x83\x02\x61\xa5\xf0\xba\x42\xd2\xe7\x50\xf9\xe6\xd4\xc4\xc5\x2a\x9a\x9d\x37\x48\x49\x25\x65\x34\x41\x93\x4f\x5c\x35\xa9\xf1\xab\xbc\x5e\x96\x6c\xea\xa2\x92\x78\xc9\xc3\xb7\x4a\xe8\x12\x49\x0d\x5e\xb6\x12\x66\x03\xb9\x65\x59\xd0\x84\x6c\x36\x0f\xe6\xac\x6a\x33\xd8\x74\xc9\xdf\x1b\x92\x21\x60\xe9\xfd\x33\x85\x58\xfa\xad\x93\x68\x6f\x67\x60\x67\x80\x7a\x50\xf5\x07\x6c\x3a\xcd\x49\x06\x16\x25\x8d\x62\x48\xcd\x05\x77\x80\xe5\xe2\x95\x85\x69\x3c\x72\x66\x7a\x3c\xb5\x25\xa4\x70\x62\x46\x7a\x65\xe1\x84\xb5\xe4\xcd\x0c\x8b\x03\x0b\xd3\x30\x4e\x07\x4b\xc2\x93\xc7\xdd\x13\x1e\x30\x4b\x9b\x05\xf0\xdb\xbc\x27\xb6\x58\x8b\x8a\x22\x1c\x2a\xcc\xaa\xc9\xae\x08\x70\x15\x01\x9b\x61\x47\x57\x50\xf1\x39\xf1\x1b\xcd\xb6\xc7\x3c\x65\x10\x55\x16\xd3\xa9\xcc\xfb\x2f\x14\x54\x8b\x48\xea\xdc\x2c\x54\x55\xc5\x36\x9e\x6d\xfa\x74\xf1\x1e\x50\x97\xa8\x09\x28\xb6\xff\x28\x79\xbf\x48\xcf\x25\x60\x4a\xef\xae\x42\x9f\xaa\x22\x49\xb6\xc0\x7b\xb0\x2d\xae\x03\xe1\x1a\xad\xee\x0f\xde\x06\xdd\x0e\x57\x76\xc2\x82\x94\x02\xc2\xb5\x2d\x01\x48\x01\xbc\x87\x1a\x28\x6c\x6c\x5c\x85\x26\x57\x07\xdb\x1d\xa4\xef\x72\x3e\x06\xdb\x97\xf3\x94\xcd\x9d\x44\x38\xa4\x17\x69\x47\x37\x39\xa9\x54\xf7\x55\xee\x2c\x33\x34\x5a\xbc\xf1\xae\xab\xe8\x2b\xde\x74\xc7\x4e\xe6\xd8\x43\x84\xf7\x23\x74\xeb\xe1\x9d\x06\x93\xdd\xb6\x60\x9b\x96\xef\xf0\x47\x44\xb8\x0e\xc7\xe9\x81\xb5\x11\x5d\xb7\x6c\x4e\x9a\x11\xf0\x22\x55\x38\x6e\xd9\x61\x66\xd3\x67\xc2\xeb\x43\xa7\x50\x31\x04\x09\x8d\xfc\x92\xa4\x4a\xab\x01\xcc\x84\xf7\x00\xbd\xb2\xaf\x07\x84\xd0\x5a\x99\xae\x9a\x7d\xba\xae\xea\xbb\x4e\xf1\xeb\xec\x21\xa6\x27\xa7\xe7\x88\x20\x60\xb1\xd4\xb0\x58\x55\xd5\xbb\xf2\xa7\xc4\x42\x62\x88\x47\x70\xec\xa7\x50\xca\xaa\x38\x64\x06\xba\x7f\x72\x86\xe8\xf4\x14\xd1\x93\xb0\x5e\xcf\xd5\x2c\xd8\xd1\x65\xf6\xab\x1b\x3b\xb7\x25\x0b\xd8\x60\x87\xaf\x95\x0b\x11\x7e\x9a\xa6\x53\xdb\xa3\x67\x3f\x1c\x07\x43\x85\x42\xe9\x68\x39\x08\x1d\x4c\x69\x8c\xed\x53\x10\x14\xab\x87\x24\x2c\x69\x7b\x30\xb7\xb3\x6a\x23\xae\x40\x1f\x35\x55\xb6\xec\x9d\x5e\x81\xe4\x19\x69\xca\x83\xce\x84\x3b\x06\xef\x09\x97\xd2\x7d\xe3\xa3\x96\x78\x62\xe2\x82\x20\x04\x8b\x7d\xd4\xd8\x21\x65\x69\x01\x66\xfc\xfe\x02\x81\x19\xf9\x84\x1b\x29\xc2\x9b\x1d\x6b\x69\xd6\x91\x50\x78\xa6\x66\x7c\x97\xce\x98\x0d\xd2\xdf\x63\xcb\x6b\x68\x6d\x88\x34\x25\x2d\xe1\xa8\x34\x3d\x68\xd3\x68\xee\x58\xbe\x3d\xf5\x2d\xec\x8e\x11\xfc\x4c\xa8\x3f\x87\x65\x58\x76\xc5\x76\x9d\xc8\x93\x5c\x15\xb6\xd4\xa4\x08\x42\x00\x14\x8e\xce\xeb\x19\xa7\xc2\x8d\xd8\x20\x2e\xbe\x45\x0e\x40\xdd\x8b\x62\x7d\xb2\xb4\x3d\xec\x90\xb1\x6d\x5b\x1a\x74\x5a\x78\x07\x96\xa8\x11\x4b\x8b\xd8\x17\xb8\x57\x83\x0d\x59\xcf\xb5\x48\x83\xd4\xb2\x98\xff\x23\x64\x31\xde\x7a\x59\xb2\x75\xcb\x2a\x55\x66\xed\x52\x85\x65\x27\xd4\x06\xcc\x81\xd2\x99\x27\x0a\x60\x22\x6e\x22\xc0\x42\x10\xb3\x84\x5a\x74\x16\xd9\x79\x61\xb1\xfd\x0f\xb3\xed\x46\x15\x3a\xdb\xae\x6f\xea\x80\x6c\xb8\x8d\x83\x15\x67\x44\x40\x94\x80\xf5\x57\x87\x3e\x58\x55\x75\xf0\xdd\xe2\xca\xd5\x88\x4c\xcf\x68\xa2\x28\x2c\xc1\x4a\x04\xe0\xb0\x2c\xe0\xc1\xe9\x02\x8e\x3b\x22\xe0\x77\x23\x33\x64\xcc\x5f\x4f\xa1\xc1\x10\x56\x04\x96\xe5\x01\x5e\xd0\x44\xfa\x53\x8d\x68\xc3\x88\x90\x6d\x57\xe7\x87\x72\x90\x1d\x47\x2f\x12\x9d\xa8\xda\xb0\xaa\x96\x2b\xea\x57\xb5\xe1\x2d\x47\x70\x6d\xdb\xd7\xf2\x5a\x1d\x7f\xd1\xc4\x6b\x96\x35\xdb\x70\xb8\x86\x19\x3a\xe3\xb8\xed\xf3\xae\x6f\x9b\x7a\xf9\xf2\xbc\x61\x75\x8b\x2d\x21\xbc\x54\xfc\xf4\xfc\x99\xc6\x13\xcb\xe0\x31\x64\x77\xcc\xd7\x55\xff\x66\x37\x7f\xd2\xa5\x4b\x92\x0d\xb0\x80\x3c\xcf\xd3\x55\x5b\xde\xbe\x78\xf4\xb8\x7b\xf4\x52\xf7\x99\xc5\x2b\x68\x5f\x3b\xb4\x3c\x7f\x96\xbf\x64\xe9\xb9\x6b\xd6\x24\xd4\xc6\x59\x9a\xcd\x46\xc6\x97\xd8\xdf\x46\x20\xd1\x7e\x6c\x4d\x97\x35\x30\x57\xb6\x8a\x1f\x2a\x70\xe6\x68\xdd\x8f\x8f\x0e\x9b\x89\x49\x91\x7d\x41\x05\x15\x06\xc6\x8e\x5b\xdd\x07\x4c\x93\x6d\x0b\xa9\xcb\x86\x05\x76\x9c\x0d\x03\xc9\xe6\x1a\x6f\xda\x30\xe3\x04\x24\x68\x94\x61\xf9\x29\x2b\xb5\x44\x24\x0d\x8e\xb3\x3a\x65\xe1\xa4\x90\x91\x56\x40\xbf\xcc\x53\xcd\x94\x09\x81\xd1\x1b\x41\x98\x60\x23\x1a\xfe\xc6\x18\x80\xf4\x3e\x98\xfe\x90\x5f\x4e\x91\x81\xe4\x17\x68\xdd\xda\x97\x77\xaa\x63\x23\x81\x16\xaa\x40\x9e\x7e\xdf\xe8\x9e\x44\x6a\x91\x68\x35\x09\xd0\x7d\x19\x91\x3b\x57\x47\x7f\x28\x85\x68\x13\x6a\xfb\x7f\x4b\x0b\x52\xc1\xfd\x74\x32\x81\x54\x27\xd3\xa9\x9f\x0b\x43\x11\x55\x77\xf3\x8e\xce\xa7\x60\x1a\x69\xa9\xce\x4d\x43\xcc\x07\x25\x04\xc1\x79\x55\x17\x32\x6d\x94\xea\xd5\xef\xc1\x91\x3b\x2d\xa6\x35\x03\xc1\xc6\xc7\x01\xfd\x0e\x90\x7f\x1d\x95\x1f\xd0\x06\x71\xab\x5d\x1d\x70\x0b\x99\x8e\x59\xdf\x88\xad\x4b\x3b\x79\x45\xfa\x06\x7c\x9e\x4e\xa5\xc0\x1b\x4e\xee\xd4\xef\x4e\x37\x45\x2d\xcb\x6b\x8d\xc4\x80\x03\x30\x41\x52\xe7\x10\x81\x2f\xaf\x7a\x5a\x29\xba\x5f\xad\xde\x4c\x18\x03\x9a\x7a\xc6\x1f\x56\xb2\x7f\x9d\x9e\x5e\xbd\x9d\x25\xae\x3e\x2b\xf3\x97\x9c\x64\x26\x69\xc1\xde\x69\xbd\x4c\x4a\x43\xfe\xe2\x76\x4b\x24\xbb\x19\xd9\x90\x13\xe4\xec\xfa\x34\xea\x8f\xf4\x25\x4e\x17\x14\x97\x5d\x60\x09\x90\xda\xd0\x92\x21\x67\x76\x3d\xfd\x86\x10\xeb\xec\x51\xbc\x22\x6c\x0f\xcc\xeb\x02\x4f\x95\x5c\x10\xb4\x07\xb7\x1a\xb8\xc8\x10\x24\xb4\xe1\x94\xe5\xdb\xd6\xcd\x15\x6b\xb0\xce\x96\x30\x36\xa0\x04\x90\xe1\xd6\xc6\x33\x6a\xaf\x5f\xe8\xc2\x46\x8b\x92\x3e\x98\x9f\xa9\xb0\x51\xd9\x7f\xe5\x76\x89\x64\xa6\x38\x0e\x55\x33\x2a\x73\x5f\xae\xd9\x93\x4e\x1b\xe4\x37\x21\x55\x11\x8b\xb6\x20\x15\xc8\x6d\x3e\xb2\xe7\xa2\x93\x24\x64\x6c\x43\xeb\x88\x15\x46\x10\x44\xc0\xd8\x75\x14\x0d\xca\xd8\xfd\xd9\xe9\xfb\xf7\x97\x37\x9e\xcb\x33\x65\xd5\x05\xad\x45\xdf\x38\xff\x9b\x51\xbb\xcc\x0b\x07\xed\x83\x43\x56\x04\xe1\xfd\x80\x34\xc7\x31\xb8\x70\xe2\x5b\xe9\x14\x5c\x36\x98\xcd\x0d\xb7\x45\x72\x14\x71\xfb\x8b\x63\x0a\x4a\xf2\x89\x97\xc7\xcf\x89\xd9\x18\x2f\xf9\x3f\x09\xcd\xb4\x81\x69\x1c\xd4\xec\x2d\xe8\xde\xdd\x94\x1a\xd0\x14\x23\xb3\x2d\xd8\xde\x2e\x87\x04\x4a\xb8\x6f\xc0\x48\x6f\x53\xec\xae\x9d\xb0\x15\xaa\x69\x41\x83\x8c\xdc\x5d\x5d\xfd\xb6\xc3\xfa\xce\xf2\x27\xc9\x2b\xec\xd6\x35\xaf\xd6\xc2\x6d\x7f\x75\x1f\x12\xcf\xa1\x81\x2f\x66\x50\x39\x7d\x3d\xef\xb6\xec\xa9\x46\xdc\xb6\x7b\xf1\x68\x57\xa5\x6c\xd4\x60\xcf\x90\x47\x2f\x49\x5a\xe4\x5d\x6a\x1a\x3e\x82\x78\xc9\x86\x89\x3b\xb3\x77\x0d\xfd\xeb\x91\x66\x8e\x94\x9c\x06\x6f\x4a\xc4\x4e\xb4\x42\x65\x6b\x31\x58\xf4\x62\xe9\x4a\x83\x5e\x30\x77\x66\xea\xbe\x2b\x43\x4c\xe9\x8e\x84\x8e\xeb\x39\xfd\xb5\x15\xbc\x41\x25\x9e\x4f\x54\xa4\xc1\x69\x0a\x17\xe9\xeb\xbd\xa6\xf1\x5e\xb0\x42\x35\x5b\x56\x3d\xc9\xf4\x7c\x86\x02\x9a\x36\x4d\x18\x62\x8a\x38\x8c\x21\x21\x8b\x99\xc8\x6b\xb0\xc8\x58\xd5\x55\x9f\xf1\x3a\xbd\x11\x0f\x76\x2a\x36\x5f\x8b\x0c\x14\x23\x5a\x36\x8c\xd3\x0f\xbf\x9c\x9e\x5f\xfc\x32\xdb\x14\xe6\xd0\xa2\xf8\x54\x4f\x96\x00\xa3\x45\x79\x9b\xef\xd6\x66\x6a\x43\x87\x11\x91\xfe\x8c\x08\x3d\x36\x41\x5a\x11\xe1\xef\x5e\x96\x44\x39\x48\xf1\xd6\x62\xbe\x65\x99\xf7\xbb\x23\x06\xa8\xe1\x2e\xce\x1f\xb7\x43\x0d\x4b\x78\xd8\x1c\xc5\x5b\xfc\x19\x1b\x17\x53\x75\x03\x89\x36\x3f\x13\x3d\xd6\x61\x4e\xf8\xee\x5c\x87\x78\xe1\x87\xa9\xc7\x69\xd9\x74\xa3\x3c\x26\x69\xd2\x81\xcb\x75\x8a\xdf\xa7\xf3\xf5\xae\xd4\x60\x9b\x17\xd5\x8e\x84\x43\xc1\xa3\xd1\xb8\xd5\xa4\xc3\x72\xa1\xa7\x4d\x82\x71\x51\x88\x19\xbc\x97\x33\x53\x03\x78\xdf\x9c\x45\x6c\x55\xfd\x1c\x94\x6d\x04\xc0\x1d\xd5\x5c\xe2\xde\x4a\xa4\xf8\xa8\xc2\x21\x0e\xb2\x76\x6c\x33\xb5\xed\xfa\x3c\xf4\x37\x4f\x64\x52\xd8\x4c\xd3\x29\x72\xeb\xe6\x1a\x3c\x97\xd9\x2d\x35\x9e\x64\x38\x18\x13\x60\x2a\x74\x26\x61\x6e\x56\x30\x3b\xde\x1e\x32\xb6\xdc\x80\x03\x6f\x0f\x09\x5c\x2e\x68\xfd\xca\xb0\x3c\x4a\x24\xf8\xe1\xba\xda\xca\xd9\x2d\x4a\xa8\x4a\xf1\x9b\x44\xe0\xf2\x5f\x12\x41\x8a\x1b\x21\x0c\x34\x0e\x74\x71\x02\xf1\xdd\x9f\xc0\x9e\x7a\x16\xcf\xc5\x92\xfc\xe2\x51\x36\xa7\x39\x7a\xf7\x28\x10\xd7\xf9\xe8\x17\xcb\xe8\xdf\x90\x20\xb5\xd7\xfd\xce\x8f\x12\x4a\xec\xfb\x2f\xf8\xda\xb1\x1f\x9e\x6c\xae\x72\x20\xd1\x2f\x36\xc8\x26\x7a\x18\x88\x99\x51\xc2\x02\xa9\xb2\x0d\x12\x46\x43\xce\xf1\xdb\x8e\x7b\x29\x9a\xc6\x8b\xf4\x5f\xf9\x2b\x7d\xcd\x5f\xda\x15\x9e\xc6\x6e\x8e\x62\x84\x07\x13\x3b\x74\x4c\x03\xc7\x51\xef\x4e\x3f\xa7\xc5\x9b\x25\xc0\xbe\xba\xb1\x18\x20\xbb\x40\x27\xdb\x1d\x6f\xd9\xf3\xb8\x5b\x6d\x57\x14\x03\x7f\x72\x8e\xe4\x25\x2b\x28\xc1\x59\xeb\xa3\x32\x12\xc7\x2a\x94\x45\xf4\x6d\x09\xf1\x8a\xfe\x34\x0d\x47\xc7\xfa\x1c\xf6\x59\x01\x22\x92\xfb\xcf\xe9\x0d\xc5\x28\x44\x19\x26\x25\x0a\x8a\xf4\xe1\x21\x22\x4c\xa3\x0e\x1c\x97\x03\x44\xf2\xeb\xb2\xeb\x09\x45\xd0\x75\xdd\x47\xc2\x6d\xac\x7a\xf1\x1c\x44\x28\x51\xbf\x56\xb1\xc1\x4b\x30\x81\x85\xb3\xcd\xd9\x4b\xec\x43\xbe\x97\x4f\xc2\xb4\x9e\x3a\x7a\x23\x21\x89\x86\xdf\xb3\x80\xc2\x3b\xda\xc1\x63\x19\x57\x1a\xbe\xb2\x70\x62\x0d\x98\x8d\x1b\x62\x29\x83\x43\x4f\xe9\x62\x90\x7e\x2b\xe2\xfd\x2b\x16\xee\x2d\x2e\x07\xff\x4a\xcd\x8b\xc3\xc5\x6f\x68\xfa\x8b\x31\xef\x42\x42\x2e\xa5\x10\x07\xa3\x73\x3e\xfe\x67\x71\xe6\xc2\x79\xc9\xff\x2e\x96\x08\x46\xe7\x0f\xfd\x27\x8a\xf9\x99\x9c\x0b\x64\xb9\x5e\x4e\x59\xf9\xe8\xd9\x70\x2c\x82\xa4\x9a\x17\xc1\x39\x8c\xa8\x44\xfb\x48\x0f\x93\x17\x84\xff\x36\x73\xf9\xcf\xf8\x53\x38\x64\x54\x8a\x1b\xdc\x70\x6c\x07\xd5\x84\x30\x54\xd5\x24\x98\x54\x17\x42\x4a\x8d\x9b\x29\x60\x92\x3c\xeb\x08\xf6\x92\x22\x42\xd2\x8a\x0a\x66\x99\x69\x50\x32\xc4\xa8\x69\x78\x5a\x1a\xd8\x59\x1e\x82\xa4\x06\xc7\xed\x0c\x80\xa4\x99\xf9\x04\x28\x2b\xbb\x1e\x8e\x3a\x3e\x04\x52\x8b\x85\x63\x08\xc3\xd1\xf3\xe3\x43\x43\x3b\x1c\x20\x49\xcc\xb6\xeb\x7c\x51\x3a\x87\x5f\x00\x61\xd5\xe5\xf3\x79\x51\x35\xae\x30\xad\x2c\x2a\x0f\x08\xed\xf3\x39\x25\x3f\x2e\x80\x4d\x97\x99\x71\xe5\x93\x04\x75\x96\x48\x93\x8b\xbd\x4c\xad\xe4\xa8\xc8\x30\x8d\x04\x04\x5e\x7c\xc4\x44\xfb\x9e\xb5\x25\x0e\xf3\x61\x8c\x89\x1c\x0f\x52\xd4\x10\xe6\x68\xc9\x23\xba\xd1\x9c\x0f\x0c\xaf\x42\xa8\xa4\x01\xf9\x62\x9c\x32\x63\xf7\x6e\xc7\xf1\x4e\xb1\xa9\x0a\xae\x37\x05\xda\xe9\x79\x5b\x5a\x2c\x79\x65\x75\x55\x16\xaa\xf7\x4e\x65\x92\xd1\x2a\xb2\xf9\x41\xf3\xc8\x78\x15\xbc\x65\x7b\x24\xcb\x86\xf7\x65\xb1\x8c\x6a\x96\x0b\x17\x11\x66\xe1\x41\x46\xc1\x04\x21\xe1\xf4\xf1\xa7\xef\x3f\x77\x5c\xb2\x33\x8b\x3d\x7b\xfc\xe9\x87\xcf\xb4\xd6\xe2\x8f\x17\x5b\xcb\xbd\x6d\xcb\xfb\xaa\xd9\xe1\x0c\xa9\x06\x3d\x35\xc2\x93\xfc\x3d\x7b\x8d\x6b\x94\x0c\xbb\x69\x64\x9e\x2c\xe3\xf4\x45\xb3\x6e\x3c\xd9\xe2\x6b\x08\x20\xaa\xdf\xe3\x62\xc0\x7a\x24\x19\x64\xeb\x06\xe3\x31\xb6\xe4\xea\xc1\x80\x08\x64\x59\x54\x5c\xce\x2f\xf4\x17\x27\x0c\xb6\x1f\xe3\x44\xe7\x79\x28\x0d\x84\xff\xa1\x1d\x80\x1a\x97\xa2\x9b\x78\x00\x75\xba\xe7\x24\x98\x57\x55\xd4\xe0\x4c\x92\x83\x4c\x22\x88\xaa\xba\xff\xce\x4b\x52\x55\xcb\x29\x30\x2e\x9b\xad\xb2\x48\x95\xfd\x49\x2d\xf9\xf8\xbe\xd9\x74\xd5\xde\xe4\x20\x2d\xf5\x9e\xdf\xaa\xf3\xc6\x06\x3f\x1c\x20\xc6\x12\xb9\xcd\xdb\x32\x93\x5d\x10\x5d\x2a\x39\x46\xb7\x74\xba\x69\x38\xeb\xa8\x01\xf7\xfb\x26\x75\xe2\x04\x4e\xa5\xb3\xbd\x25\x4f\x39\xb3\x79\x2f\x63\xf7\x42\xf3\xcf\xb4\x58\x9a\xe5\x24\x3d\x93\x92\xd3\x99\xd9\x50\x3e\x6e\xcd\x4a\xe6\x58\x79\xb0\x18\x7a\xe6\x11\x24\x4f\x70\xba\x20\x75\x9a\xdb\x0d\x01\x0a\xbf\x86\x3c\xee\xa2\xba\x49\x9a\xdc\x95\x99\xae\xe7\xd4\x4e\xfa\x4a\xf1\x35\x6c\x82\xae\x59\xa3\xa2\xad\xe4\x41\x8f\x68\xd4\xe6\x2b\x92\xca\xc5\x11\x57\x18\x78\x20\x56\xd1\xb0\xab\x8b\x89\xda\x5f\x74\xe8\xa3\xe2\x07\x8b\xcd\x24\x76\x6c\xc2\xc2\xc7\x35\x4c\x98\xd0\xad\xc3\x54\xdf\xe9\x73\xea\x31\x0b\x32\xe9\xb7\x76\x42\xf3\xbb\xb8\x93\xa5\xec\x92\xf2\x7f\x98\xe0\x8e\x16\x69\x51\x99\xd0\xbd\x96\x88\xc2\x35\xc6\x1f\xb9\x39\x71\x1e\xa2\x4f\x0e\x54\xdc\xd3\xcd\xe6\x69\x51\x3c\x99\xe8\x75\x40\xf4\xae\xdb\x03\x63\xb7\xb2\xdd\x01\xf5\x07\x25\x05\x1c\x64\x1a\x77\x0c\x10\x8d\xd3\x47\xf6\xb3\x29\x59\xf7\x4d\x0b\x8f\x37\x90\x77\x30\x76\x5d\x93\x6e\xcb\x66\x4b\x68\x77\x46\x45\xb6\x80\x89\xe7\x61\xd8\x93\xc1\x8e\x77\x90\x34\x70\x90\x7e\xb0\x79\x86\x07\x9d\xb6\x6c\x51\xd9\x1c\x41\x89\x1c\x6e\x3e\x8a\x90\x80\xe7\x79\xa4\x3a\xbe\x37\x01\x38\xc5\xf5\x7c\xdd\xff\x9e\x9c\x6f\xaa\xf2\x29\x12\xf8\x12\xef\x9b\xba\xa1\xc1\xe2\x66\x42\xdf\x70\x68\x91\x90\x4f\x0a\xce\x47\x01\x3f\x67\xe1\xb7\x07\x5b\x35\xcd\x9d\x9c\x11\x9b\x23\xe8\x53\x96\x55\x6f\x89\x7c\x04\xfd\x4d\x9c\x3a\xcf\xbb\x6a\x11\xde\x04\xf1\x33\x47\x4c\x34\xb1\xe0\x31\x6e\xb3\x7f\x88\x30\x75\x8e\xaf\xf4\x7f\x31\x61\x38\x10\xf5\x46\xb9\xb4\x33\x81\xd7\xec\x93\xe2\x52\xd5\x1b\x20\xa8\x4a\x9d\x17\xc6\x75\xe9\xc6\x3a\x2b\xa3\xd3\x46\x4f\xe7\x55\x72\x2c\x8b\xd1\xc7\xd0\x7e\xc4\xf6\x7a\xb7\xfb\x3e\x72\x30\x99\x72\x2c\x89\xfd\x5f\x1f\x20\x14\xd7\x14\xe7\x5a\xc7\x5a\xb1\x06\x2f\xcd\x3b\x6f\x0c\xe6\x6c\xc8\xde\x23\x2f\x36\x39\xf1\x0e\x49\x2d\x1b\xee\xf0\xca\x63\xef\x3d\x8e\x8a\x5d\x01\x89\xae\xe5\x40\xbd\x3f\x4c\x03\xcf\x7e\x6c\x38\xf0\x59\x22\xab\x17\xb7\x94\xc0\x2f\x97\x5d\x1c\x3b\x31\xd9\xa9\x7f\xa1\xf8\x9a\x88\xed\x39\x77\x67\xd1\x78\x43\x6b\x68\x65\x74\xdb\x88\xfe\x40\x99\x38\xab\x58\x53\x91\x16\x90\xcf\xc0\x35\x0b\xb8\x0f\x2c\x5e\x03\x40\x43\xca\x25\xf1\x27\xd9\x10\x93\x6c\x79\xe4\xda\x28\x5e\xb4\x30\x03\xaa\xc9\x7d\x9e\x2f\xee\x5c\x8b\x98\xfd\x95\x6d\x0f\xa7\xc2\x31\xda\xd9\xa9\x61\x01\xf1\xe3\xf9\xf6\xe5\x53\x58\xb2\xe4\xfe\x01\xf4\x42\x26\x78\x75\x1b\x20\x04\x1b\x7b\xbc\x51\x77\x5f\x15\x3b\x22\x6f\x1e\x8c\xd9\xf3\x67\xdb\x97\x71\x7e\xa2\x08\x58\x37\x8f\x96\x31\x18\x38\x16\x5d\x2a\x1c\x66\x62\xaf\x5d\xb8\x8f\xde\x7a\xaf\xe8\x0e\x35\x1c\x9d\x45\x01\x2b\x0a\x48\xdd\xd8\xc9\x17\x9c\x6a\xc6\x38\xb1\x5d\x07\xdc\x5f\x83\x9d\x07\x07\xc3\xd2\x55\x16\x90\x36\x76\xb7\x8c\x66\x27\x8a\x92\x5d\xb3\x81\x0d\xd7\x3b\xa9\xba\xa6\x59\x86\xf6\x78\xf3\xe2\x5d\x9c\x74\x62\xf7\xc6\x81\xf2\xfe\xb1\xe7\x98\x62\x3a\x29\x0a\xf4\xe7\x2c\x88\x3e\x9e\x61\xb0\x9b\x1d\x95\x15\xef\x66\x07\x0d\x94\xa5\xe6\x58\x39\x67\x93\x65\xe8\x9e\x5b\x50\x0a\x7c\xd1\x2b\x78\x1d\x67\x7a\x40\x52\xef\x5e\x1a\xba\xfd\x6a\xea\x7e\xd5\x04\xc7\x73\x64\x8b\x1d\x93\x35\x6c\xc8\x2c\xee\xeb\x5e\xd6\x07\xc5\x8b\xae\x16\x83\x65\xc4\x26\x9f\xad\x25\x38\xea\xb1\xd9\x11\x6f\x59\x57\x34\xe8\x58\x32\xf4\x9a\x8f\xcb\xeb\x1b\x5c\xa0\x40\xbc\x90\x18\xcd\x92\xe9\x35\xfd\xcb\x8a\xf4\x41\x76\xc6\xe6\xdb\x36\xd8\x47\x66\x99\x36\x8b\x05\x7b\xc6\x54\xb5\x1e\x50\xde\x97\xb6\x87\x5b\x17\x6b\xf1\x92\x09\x7d\x8c\x8c\xef\x8a\xf9\x36\xc5\x8d\x1a\xcc\x04\xba\x6d\xb9\x20\xa1\x64\x96\xbe\x23\x11\xad\xc6\x35\x54\x38\x0e\xc9\xbc\xe4\x41\x6b\xaf\xeb\x09\xcc\xae\xac\x8a\xce\xc6\x0b\xa4\xbb\xef\xc7\x56\x49\xf4\x7b\xcb\x9e\xb8\xa2\x32\x73\x02\x89\x13\xe5\xfa\x56\xbc\xaa\x79\x1b\x1b\xa2\x9c\x5c\x0e\xc1\x5b\x69\x72\x66\x9e\x0d\xd2\x28\x40\xfd\x83\xe0\x0d\x80\xa3\x84\xdc\xb3\x6d\xd9\xb2\x38\x62\x9e\x74\xa1\x13\xd5\xb0\x4d\xd0\x35\xad\x5d\x6f\x85\x2d\x60\xf8\x20\xb8\xca\xb9\xcf\x13\xe6\xc5\x2c\xf3\x99\x87\x86\x6d\x51\x6c\xe5\xac\x27\xaf\x74\x84\x2f\x1c\x54\x30\x10\x59\x3f\x70\xa0\x8b\x3d\xf6\x77\x3a\x1c\xe6\x9f\x08\x84\x72\x3d\x13\x2d\xd2\x05\x99\x11\x24\xfb\x8f\x23\x08\xef\x29\x02\x20\x73\x17\x19\xb2\x30\x05\xf7\x72\xc0\x9b\x88\x12\x75\x4e\xa1\xc4\xf0\x08\xbc\x90\xef\x03\xd3\x28\xa0\xf2\xe8\x06\x27\xf4\x50\x8f\x7e\x3e\xe7\x73\x8b\x2f\x99\x7a\x9f\x3f\x43\xd0\x29\x8c\x4a\x79\x7c\x61\x4c\x40\x71\x7c\x19\x48\x43\xf8\xc3\xd2\xd7\x96\xcb\xbc\x2d\xec\xdc\x87\x52\x3f\xbb\x35\x80\xca\x43\xb7\xbe\x7c\x4d\x12\xb9\x16\x41\xb3\x95\x40\xee\xd8\xc8\x4b\x84\xc2\xd7\x1d\x99\x12\xc2\x9c\xbf\x90\xa9\xc5\x1e\x53\x44\xf0\xbb\x2d\xcf\x01\x99\x50\x56\x0f\xba\xfd\xed\x9f\xaf\x2f\xdf\x9f\xa4\xbf\x3f\xdd\xef\xf7\x4f\x39\xfb\xd3\x5d\xbb\x66\xdf\xa2\x82\xcf\x95\xfc\xcf\x8b\x77\x27\x69\xd9\x2f\xbe\x9b\x91\xf4\x8e\xa9\xe1\xc5\x5e\x75\xb9\x80\x92\xcb\x64\xc9\x9a\xdd\x3f\x3f\x65\xb6\x72\x00\x51\x2f\xe7\x09\x8f\x23\x86\x4c\x9b\x87\xdd\x4c\x60\x4a\x05\x62\x0a\xf3\x12\x63\x49\xba\x12\x0e\x20\x23\xe0\x13\x80\x55\x1b\xbe\x8f\x8c\x0e\x11\x6e\x10\xdf\xf1\x96\xf5\x6e\x5d\x08\x9d\x1a\x47\xa3\xde\x29\xca\xca\xe2\xa7\x61\x49\xd8\xfa\xc0\x5d\x24\x2f\xd2\x3f\xb3\xa2\xc7\x28\x15\x2a\xe0\x24\xa3\x02\x00\x87\xb4\x84\x19\x96\xea\x61\xea\x72\x98\xe0\x37\xa1\xce\xcb\x1e\xde\x97\x53\xb4\x21\x2d\x77\x6d\xf3\xa3\x69\x13\x95\xd6\x35\x2a\xac\x15\xee\x2d\x9e\x14\x11\x35\x0f\xe6\x00\xaf\x4b\xfb\xe1\x3c\x18\x2e\x49\x3a\xc9\x3c\xbb\xd7\x49\x36\xe2\xf8\x0a\xf8\xa5\x79\xa6\x12\xc4\x48\xa2\x0b\x6a\x50\xc9\x6e\x54\x83\xf8\x65\x65\xda\x4b\x3b\x16\x01\x5f\xad\x73\x17\x17\x2f\x41\x46\x35\x60\x20\x31\xc9\x30\x42\xba\x35\x89\x79\x59\x38\xc3\x79\x31\x8b\xdc\xf1\xae\x19\x04\x4e\x78\xbc\x79\x6d\x1b\xbd\x23\x17\xc4\x50\xcc\x90\x52\xcd\xc5\x46\x5c\x81\x06\x89\xc3\x4b\xb2\x06\xc9\xac\x59\xc8\xfd\x7d\x67\x12\x0a\xb1\xb5\x5d\x37\x07\xf3\xd2\x3c\xc7\x97\x1e\x7f\x08\x7b\xe6\xc1\xb4\x53\x1e\x32\x90\xe0\x9b\x2c\x2e\xee\xaf\xc1\x41\x78\x15\x03\xea\x43\x2a\x30\xec\xc2\x11\x8a\x7a\x91\x55\x66\xa2\x79\x13\x8e\x7e\x0e\x6a\xe8\x92\x78\xee\x6a\x38\xe2\x92\x18\x67\x0d\xdd\x12\x83\xac\x5f\xe1\x96\x18\x23\x69\xec\x74\xe8\xbb\xfa\x15\x7e\x87\x53\x9d\x0e\x0c\x10\x4a\xc6\x53\x88\x9f\xc8\x30\x65\x88\x28\xc2\xbe\x79\x4b\x44\x68\x76\x10\xdd\xa0\xec\x60\xc1\x19\x28\x7c\x5f\xa3\x63\x4e\xb5\xc4\xa3\x24\x40\xee\x97\xcc\x12\x45\x75\x7b\x3b\x9b\xb7\xcd\xbe\x63\xbf\x47\x5c\x75\xc5\x5b\xb3\xfc\x9d\x5e\xe3\x5b\x40\xd8\xe4\x0a\xa2\x90\x80\x44\xca\x56\x22\x45\x4a\x40\x22\x79\x69\x1b\x5d\x35\x74\x4e\x29\xb8\xdd\x87\x6f\xfe\xe2\xe3\x0a\x92\x32\x93\x2c\xc4\xce\xf7\x19\x87\xe0\xaf\x09\x13\x09\xab\xe2\xc8\x74\xcd\x31\x0a\xc6\x41\x43\xb8\x79\x7f\xb1\x6d\xd5\x0e\x90\x40\x0e\xf3\x8e\x60\x20\x2c\x83\x23\x30\x22\x86\x0a\x82\x96\x07\x09\xfd\xc8\x08\xc2\x70\xe9\x21\x14\x41\x98\xf4\x3f\xbf\x7d\x2f\x9f\xd8\x1c\xd6\xe3\x34\xd8\x1d\x7e\xc5\x6e\x3a\xb6\xe5\x3c\x9b\xda\x7a\xb6\x34\xd9\xc2\x17\xfd\xd4\xee\x1e\xc5\x97\x83\x28\xda\xfc\x16\xb6\x4a\xfe\x77\xb1\x24\xcc\xf9\x6c\x57\x6d\xf9\x74\x98\x8d\x90\x23\xa8\xbe\x46\xc0\xc5\xab\xad\x91\xff\x5c\x5c\xce\x76\xc5\x00\x87\x8f\x0b\x8f\x11\xdb\xc0\x26\xba\x7b\x4c\x0b\x6d\xc5\x0a\xb8\x12\xe8\xa0\x42\x50\x87\xbf\x21\x02\xb4\x83\xdb\x38\x0d\xa2\xcf\x97\xce\xfb\x32\x5f\xca\x9e\x8d\x4f\x83\x68\x6f\x47\xfa\xa2\x3c\xfe\x9a\x08\x33\x29\x78\x07\x05\x4a\xc7\x7d\x77\x8b\xd0\xef\x81\x22\xd9\xe1\x01\xa7\xb2\xba\xd5\x6c\x38\x10\x6e\xef\x48\x71\x96\xe2\xdb\x41\x99\xa4\xc2\xe4\x92\x6d\x8a\x40\x58\x11\x02\x0a\x97\x95\x8b\xbc\xbd\xe3\x0b\xb0\xb0\x9b\x65\x05\xec\x5b\x3d\x86\xc5\xff\xe1\x88\xe9\xc5\x6b\x57\x12\x1a\x55\x18\xef\xb7\x22\x37\x74\x26\x63\xa6\x2e\x03\x4b\x57\x72\xe4\xef\x9d\x84\xe4\xc6\xd4\x21\x65\x8c\xdd\x90\x29\xed\xe9\x70\xdc\x02\x78\x87\xe8\xbf\x94\xff\xf7\x7f\xff\x1f\x62\x4f\xdb\x86\x56\x4b\x38\xc8\xeb\xd9\x6c\x3f\xee\xe6\x6d\xe5\xaf\xc9\x7b\x0a\x1e\x1d\x34\x44\xd0\x9f\xaa\xcf\x39\x85\x46\x34\xca\x77\x68\x19\x7d\x5f\xb3\x8d\x2a\x26\x72\x68\x3b\x9e\xcc\x61\x1f\x1f\x96\x61\x44\x95\xe9\x1a\xe1\xce\x86\xda\xe0\x62\xd0\xe4\xc4\x95\x12\xdd\xf4\x92\x92\x7c\x22\x9d\xfa\xb3\xbf\x41\xc0\x0d\x44\x74\x7b\x00\x54\x1c\x0f\x63\x08\x7b\xcd\xe4\x37\xbe\x30\x54\x54\x46\xb9\xae\x04\x5b\x52\xe6\x53\x29\x27\x7a\xe5\xbc\x87\x2b\x24\xac\xe8\x49\x67\x87\x3e\xf4\x26\x1b\x1c\xab\x98\x38\x79\x13\x9e\x26\x21\x8d\x51\x37\x25\xe4\xa4\xb2\x6e\xc7\x44\x37\x0f\xc3\x5f\xc8\xec\x3f\x26\x06\x16\x89\xee\x13\xb0\x0f\x0b\x07\xf8\x30\x39\xdf\xca\xca\xe4\x27\x16\xde\xb7\x88\xa0\x79\x8d\x08\x5c\x94\x00\x2f\x1d\xfe\x4f\x70\x3c\x55\x8d\x14\x1c\xab\x21\x8d\x1f\x1c\x81\x6d\xa3\xeb\xbe\xbc\x27\x13\x8e\xc6\x47\xf7\x6b\x71\xe1\x40\xd4\xc4\x16\xd1\xe8\xc2\x04\x8c\x0c\x62\x1f\x82\x8e\xfc\x41\x9f\xac\x61\xb5\xd3\xf3\x55\x5c\x16\x71\x39\xdd\xf1\x56\x92\xc1\x71\x7d\xbe\xd7\xa6\xe6\x9b\xea\x0c\xcb\xae\x9a\x60\xca\xac\x64\xff\xc8\x67\xe3\xf1\xca\xe7\x34\x79\x7e\x12\x78\xf6\x14\xaa\xba\x2e\x10\x12\x90\xc7\x47\xa7\x6b\x52\x10\xd6\x91\x32\x83\x82\x58\x94\xfb\xe9\x88\x4b\xe5\xf8\x6a\x8b\x3f\xee\x54\x39\x2e\xe3\x61\xb7\xca\x7f\x76\xeb\x62\xfa\xd8\xaa\x4b\x1e\x9f\x5f\x75\x49\x53\x07\x59\xff\x0d\x1b\x09\x44\x52\xda\x8c\xd1\xdc\x3e\xba\x93\xa0\x79\x9c\x21\xfa\xf8\x95\x22\x7f\x7c\x3f\x21\xba\xc8\xe1\x2b\xa4\xbd\xb8\xc7\x81\xa0\x17\xb5\xca\x21\x84\x0d\x56\xb1\x83\xff\x31\xed\xcd\x0b\xae\x11\xcf\x18\xea\x78\x23\x7f\x7e\xf4\xf4\xc1\x2c\xb1\x77\x7f\xd8\x4c\x67\x9e\xf2\xfe\xf0\x66\xc5\x11\xbf\x7e\x31\xe7\x7d\xd9\xb9\xff\x88\x7d\xf8\x21\x2f\xff\x61\x2b\x99\xd7\xb8\x4b\x7f\xc3\x46\x3e\x98\x23\x5c\x66\xe3\x3d\x98\x7f\x8b\xe7\xff\xb4\x0d\x96\x75\xc0\xbd\x99\x62\xb0\x28\x1b\xfe\xbc\x41\x81\x75\x08\xc3\x97\x28\x19\x9e\xe1\x7a\xcc\xed\x70\x97\x6f\x3f\x6c\x34\x7b\x3c\x08\xf7\x9e\xe9\xa9\x76\x3b\x33\x36\x88\xf7\xac\x0f\x8e\x16\x5b\xf1\xdb\xf7\x40\xf2\x0d\x71\x67\x32\x65\x98\x3f\xae\x23\x3e\xef\x60\xb1\xce\x0c\x7e\x81\x80\x8b\x27\xac\x2d\x4a\xf8\xa3\x9f\x49\xc8\xa5\xa8\xae\xa5\x97\xb3\xf8\x46\xc8\xc5\x1b\x2f\x60\x09\xf5\xb1\xba\xea\x29\xae\xd9\xa5\x97\x06\xe5\xb0\xe5\x21\xcc\xdd\x49\x74\x1e\x26\x01\x54\x71\x53\x5b\x05\x09\xf9\xc7\x61\x59\x72\x09\xa1\xae\x9e\xef\x9b\x7d\x22\x4b\xe7\x8c\xef\x8a\x48\xe5\xa2\x08\x8d\x89\x9b\x24\x71\x2c\xa3\xe8\x01\x2d\xf4\x81\xc4\x74\x39\x8f\x35\x4e\x1f\xf8\xa8\x63\xe5\x70\xde\xe9\x76\xef\x0b\x0b\xa0\x90\x1a\xe0\x56\xcc\x72\x7d\x48\x1c\x33\x2d\x15\x02\xac\xaf\x56\x24\xd1\xa8\xde\x10\xe2\x6b\x2a\xe6\x76\x8e\xaa\x3b\x31\xfb\x16\x8e\x01\xb3\xeb\xb1\xf0\xc3\x8d\xb5\x43\xee\x49\x75\xed\x70\x97\xf0\xfa\x76\x84\x10\x5f\xd3\x0e\xae\xe5\x19\x3c\x82\x78\x10\x1f\x6a\x0f\x29\x87\x7a\xaa\x39\xdc\x3d\xe9\x86\x4d\xf4\x4e\xde\x37\xc1\x7a\x8d\x1d\xc8\x62\x20\x7f\xb0\x79\x73\xbc\x70\x4a\x8a\x6c\x84\x4d\x88\x08\xb2\x51\x3c\x79\xb8\xed\xcb\x53\x9c\x47\x1a\x39\x1d\x68\xb0\x05\xec\xc1\xa6\x56\x21\x6d\x97\x17\xe9\x20\x63\x5d\xa8\x5c\x27\x89\x5f\x5e\x78\x05\xce\x8e\xa5\x89\x7c\x17\x2e\x19\x10\xf0\x6c\x24\x0b\xb9\x04\xcb\xcd\x71\x66\x75\x41\xad\xe3\xc2\x1c\xab\x06\x94\x63\xd1\x63\x38\xe3\x9d\xa1\x74\x16\x18\x5b\x99\x29\x9f\x98\xcc\x2a\xbb\xad\x06\xb5\xc9\x0f\xd1\x06\x30\x1f\xc7\x63\x8d\x2c\x9a\x35\xc7\x57\xec\x71\x53\xfc\x5a\x2d\x37\x4b\x39\x82\x39\x6a\x94\x99\x85\x53\x7d\x4c\x20\x9e\xec\x96\x6d\xce\xb6\x70\x1b\x6b\x66\x16\x01\x29\xa0\xc0\x1f\x5d\x2f\xdd\x2d\xdd\x9e\x1b\x60\x87\x8d\x0a\x7a\xf2\x10\x53\xf8\x03\x0d\x00\xdb\x78\xb8\x05\x60\x0b\x72\x3f\x16\x35\x23\x60\x01\x0f\x35\x44\xaf\xd7\xfe\xfa\x86\x80\x6f\x7c\x65\x43\x4e\xac\x15\x7a\x2b\x4b\x51\x4c\xce\xff\x87\xda\x37\x50\x77\x40\x9c\xd1\xb5\x3f\x03\x82\x8f\x9e\x3a\x71\x44\x1f\xf8\x42\x58\xb1\xd8\x00\x53\xdf\x0c\x5d\xce\x7c\x51\x35\x0d\x21\x54\xd9\xba\x0f\xfd\x37\xe2\x03\x38\xec\x51\xd0\xb7\x07\x15\x49\xb8\x73\xf1\xf9\x1f\x7f\xbb\x81\x28\x61\xd8\xcb\x94\xab\xa0\x3e\x01\xed\x9f\x8f\x3c\xa9\x24\x57\xbf\xcb\xf6\x74\x17\xbd\xbc\x33\xbe\x95\xe7\xc1\x1b\x91\xe2\x9b\xa0\x86\x57\x82\x75\x72\x82\x73\x69\xb2\x9c\xdd\xae\x9d\x78\xe7\x8d\xeb\x03\xe1\x60\x83\x07\x05\x16\x7c\x19\x46\x53\x57\xb2\xef\x7f\x21\x21\xbe\x0f\x85\x4d\x31\x6a\x87\xe1\x83\xc5\xde\xc3\xd8\xf7\x0e\xc6\x45\xb6\x31\xa9\x20\x20\xe1\x20\x3d\xb8\xa1\x07\xfe\x96\xad\xdd\x39\xe4\x4b\x40\x4b\x60\xc2\xdc\x05\x2d\xd3\x76\xa0\xd0\x5d\x37\x55\x63\xc6\x1b\x75\xa9\x6e\x53\xba\x87\x50\x98\x49\xf0\x35\x14\x05\x5f\x43\x21\x77\xed\x9f\x04\x11\x11\xce\xc3\x84\xad\x3b\xf0\x1f\x45\xc7\x0b\x9f\x8f\xc7\x61\xa7\x38\x8a\x4f\x38\x45\x11\xf9\x62\x54\x8b\x19\xb0\xc3\x38\xf1\xa5\x0b\x63\xd8\x98\xc8\x1b\x76\x51\xe9\xf1\x39\xf8\x30\x49\x2e\xb7\x8a\xa2\xf4\x3e\xef\xb8\x27\x62\x53\x0d\xe3\xd6\xcd\x92\x2f\xe6\x82\x11\x32\xee\x9e\xca\xce\x71\x99\xe6\xd2\x17\x15\x01\xa7\xf0\x30\x06\xfb\x5a\x7d\xde\xc5\xb9\x31\x05\xc3\x08\x3d\x17\x3d\x02\x24\x9d\x3a\x5f\xac\xd0\xff\xd9\x14\x21\x99\x6a\xec\x88\x49\x5f\xf2\x99\x80\x94\x3b\xd7\x53\xbb\x61\x7d\x12\x86\x9f\x72\xc1\x85\xf6\x41\x2a\xbb\xc8\xd6\x99\x5e\x15\xd0\xe8\xc9\x48\xf6\x97\x75\xd7\x02\xa4\x97\x98\x71\xdd\x83\x99\x82\x55\x8c\x4f\x29\xe8\x55\x04\x9a\x53\x24\x8e\x07\x96\x33\x5f\xb2\x2e\x8c\xea\xb9\x90\x7b\x5d\xad\xf3\x72\x02\x4b\x37\xe6\xda\xe0\x88\xe4\xab\xca\x18\xb4\xd2\x43\xb8\x62\xfe\x78\x53\x61\x3d\xe3\xe3\x5a\xb0\xc8\x45\x8d\x8c\xd8\x9a\x81\x7c\xa1\x84\x41\x13\x27\x8b\xf8\x03\x8d\xe4\x47\x20\x96\x0b\x77\x69\xfe\x39\xdf\xb7\xd2\xce\xf9\x60\x18\xaf\x61\xa5\x3c\x66\xd2\xd4\xb1\x05\x6e\x3a\xfb\x43\x2d\x43\x83\x58\xe7\x9e\x2a\xfe\x58\xdb\xda\xb2\x3b\xd4\x8b\x0c\x2f\x18\x74\x2b\xdd\xa8\xfc\x50\x8a\xad\xfc\xc9\x8c\xe2\x9e\xe5\x7a\x3a\xb7\xc4\x96\x5e\xf7\x44\x2e\xa4\xfa\x76\x41\xf1\x78\x41\x81\x96\xb8\xa7\xe0\x89\xc8\x6d\x02\x1c\x89\x67\xfd\x77\x0f\x56\x34\xe8\x4b\xc0\x10\x03\xdc\xb6\x68\x4a\x5f\x7e\x55\x0f\x82\x4d\xf2\xb0\x1b\x4c\x06\x3a\xfb\xc1\x2b\xc2\x9b\x17\x19\x71\xdf\xf2\x81\x64\xbe\x41\x87\x2f\xa6\x56\x77\x1f\x5d\xd0\xec\x85\x0a\x35\x1e\x1d\xe9\x50\x58\xef\x03\x23\xf4\x24\x6a\xc5\x97\xfb\x18\x2e\x42\xf2\xf6\xce\x6e\x8b\x07\xd0\xdc\xa3\x3b\x1f\xf1\x1d\x32\x05\xb9\x0c\x2b\x5b\x36\x6d\x43\xc3\x23\x67\xdf\xf4\x82\xac\xd7\x16\xd7\x4d\x64\x80\x09\xfc\x90\xed\xf4\xbc\xa2\xe5\xb9\x40\x34\xc9\x0f\x7c\x78\xd1\xe7\xea\x9b\x3e\x5f\x5b\x1e\xb6\x40\x2e\xd4\x6e\x7d\xc3\x09\x96\xeb\xd4\x12\x82\x9c\x9a\xa7\x99\xb3\xbf\x27\xb2\x28\xf0\xa5\xc6\x04\xb0\xd8\xe6\xe0\x03\x65\x84\xae\xdd\x36\xe3\xae\xe2\x2c\x92\x44\xa7\xef\x10\x9d\xde\x70\xf4\xb8\x06\x6b\x95\xcb\x36\x68\xd4\xb1\x7c\xb7\x6d\x39\xca\xf3\x8a\x0f\xcf\x0e\xe1\x0d\x73\xab\x32\xdf\x8e\xf0\xf6\x86\x22\x47\x58\x03\xe4\x18\x01\x80\x3d\x8e\x85\x30\x57\x55\x40\xb1\x0a\x73\xbc\xa5\xa8\x63\xd0\xf0\x00\x18\xc2\xe3\x69\xb2\x23\x39\x74\xcd\x1e\xb6\x4a\xf7\x6c\x46\xad\x6a\xe6\x7f\xc7\x43\x5e\x0a\x7d\x29\x9f\x01\xd4\xbc\x69\x7a\x7e\x2f\x61\xcb\xe2\xd6\xe2\xce\xa1\xe9\x67\x8b\x67\x71\x6b\x71\x37\xc2\x94\x40\x8f\x51\x25\xd0\xc7\x71\xb5\xe1\x93\xfb\x54\x57\xbb\x5b\xf4\x3b\x9a\xa0\xae\xc2\x8b\x6b\xbe\x05\xe0\xda\x25\x8c\x6a\x1c\xe5\x0c\x29\x74\x98\x79\xaa\xe6\x05\x09\x11\xe5\x64\xd5\x67\x9c\xf2\x60\xdd\xa3\xbc\x61\xe5\xa3\xec\x53\x33\x05\xf7\x3f\xb2\xd1\x79\xbe\x5b\xdc\x95\x3d\xfb\x8c\xaf\x32\xec\x30\x87\x65\x5d\x19\x58\xfa\x33\xc0\xd2\x37\x04\x96\xde\xc8\x6b\x5c\xe3\x52\x69\xd1\xd9\x94\x7d\x0e\x4f\x81\xa0\x94\xd7\x67\x34\x02\x1c\x5d\xe4\x53\xb9\x60\x9d\xc9\x54\xca\xd6\x59\xc8\x82\x4f\x50\x82\xbe\x13\x26\x82\xf7\xa9\x03\x99\x2a\x8d\xd5\x00\x59\xfd\x16\x87\x85\x5c\x6e\xc8\x8a\x01\xb5\xe1\x83\xc4\x04\xb0\xb8\x83\x8a\x60\x8d\x47\x62\x53\x1c\x97\x51\x11\xf8\x4d\xcc\x28\x85\x83\x79\x60\x61\x5c\x04\x77\x95\xef\xba\x49\xc0\x6d\x2e\x93\xe9\x28\xa4\x55\x6f\x80\x56\xf3\x10\x4e\x2b\xed\x04\x95\xc2\x56\x44\x53\x13\xdf\x62\xbd\xff\xc9\xde\x18\x85\x6b\xb1\xdd\xfe\x84\x97\x46\x05\xf6\x8b\xcf\xdf\x28\x98\x48\xaf\x90\x59\x25\xc6\xe4\x2d\x5c\xed\x6c\x61\x4b\x83\x25\x4a\x6d\x7a\x1a\x17\xbd\xc5\xa3\x71\x76\x76\xca\x9d\x55\xd5\xf8\xf0\xd0\xa5\x96\x08\xc1\xd4\x5c\x56\xe2\x67\x0e\xd4\x73\x45\x00\xe5\x06\x0c\xd9\x49\x5a\x87\x99\xa1\x34\xb8\x87\x22\xa3\x02\xde\x41\x9f\x08\xfa\x76\xf4\x9a\x54\xbb\x21\xe8\x2b\x6f\x4a\xf5\xbd\x09\x70\x8c\x8d\xee\x18\xbb\x55\x97\x85\xe8\x1c\x5e\x30\x94\x0f\xd0\xcb\xe0\x8a\xe1\x08\x14\x3b\xdf\xe1\xc3\x3e\xc1\xf6\xa3\xa1\x1c\x1b\x7d\x78\x50\x4c\x1d\xf9\x46\x25\x04\x79\x82\x57\xd8\xd8\x1d\x5a\xce\x1a\x4d\xa1\xc8\x5b\x07\x0d\x43\xee\xc6\x59\x40\x3f\xb8\xb5\x14\xe3\x62\xfa\x22\xec\xff\x2f\x77\x81\x87\x0d\xf0\x37\x82\x1f\xa9\xff\xdf\xe5\x46\xf0\xa1\x65\xd6\x5d\x09\x8e\x2b\x8f\x67\x38\x1c\x10\xcf\xe3\x68\xe3\x2a\x9a\xcf\xc8\x11\xce\x53\x44\xc4\x5b\xf9\x88\xf2\x66\x5f\xb3\xf8\x8a\xd5\x06\x53\x74\x58\x5f\x70\x9e\x23\xaa\x4d\x72\x8c\x2f\xae\x8a\x9b\x20\x31\xe3\xdd\x22\x89\x57\x6b\x44\xaa\x97\xaf\x94\x6a\x3d\x9a\xc1\x24\xa1\x5b\x34\x16\x37\x7a\x70\x98\x27\xb5\x4e\xed\x41\x93\xe3\xc9\x1d\xb5\x5a\x32\xc9\x49\x5f\x3b\x2a\x32\xc9\x4c\x14\x30\xe8\x8a\xc4\x84\x67\xfc\x25\x46\xae\xc0\xc5\x9b\x10\x12\xd2\xf8\xb1\x17\x46\xd0\x62\x2d\x26\xae\x3a\x28\x14\x40\x93\xbc\x2a\x68\xcb\xd0\x3f\x55\x62\xc3\xf7\x85\x25\x46\x9f\x6a\xc5\x2b\xad\x12\x33\x87\xff\x10\xbc\xdc\xd8\xf8\x74\xfe\xde\xaa\xed\xfb\xb6\x9a\xef\xfa\xe9\xcb\x9d\x5d\xea\x08\xda\xb6\xfd\x99\x76\xd3\x2f\xc0\x76\x3b\x2b\xf8\x7a\xf7\xa5\x72\x07\x0f\xef\x0c\xe0\xe4\x26\x83\xd4\xdd\xb1\xf2\x0a\xdf\x9a\xb8\x61\x1e\x99\x75\xfc\x96\xf8\x05\xb1\x98\x22\xbd\x3e\xd5\x14\x3c\xc8\xaa\xd6\x11\xbc\xdb\x7a\x74\x14\x18\x72\xf4\xc0\xab\x4f\x52\xbc\x22\x29\x40\xae\x5e\x12\xdd\xcb\xfd\xbd\x72\x41\xf2\xcd\xbb\x6b\x0a\x2e\xda\x83\x6c\x18\xe9\xb8\xf0\x8e\x81\x3e\x83\x6a\xaf\x66\x9c\x5e\xb8\x87\x66\x83\x91\xd6\x22\xf9\x11\xcb\x2c\x78\x3e\x5e\x0b\xa7\xf6\x37\xfa\x44\x9b\x1a\x4c\x95\x56\xf9\x89\x01\x76\xfe\xdd\x76\x56\x4e\x70\x14\x79\x40\xf6\x7a\x99\xb4\x8e\xc0\x68\x31\x8a\x2d\xb7\x58\x68\xdc\xa2\x14\xd2\x7b\xb8\x56\x46\x15\x7c\xe5\xd5\xcf\x61\x59\xc1\xa2\xf2\x40\x5b\x27\xcf\x1a\xc6\x57\x81\x85\x80\x99\xcc\x3f\xbb\xf1\x2f\x2a\xd8\x6d\x32\x8d\x33\x44\x57\xff\x45\x99\xa6\xdd\x00\x1e\xba\xf4\x4f\x8c\x02\xa6\x8c\x3b\x9b\xb7\x2a\xe3\xb1\xe9\x5b\x61\x1f\x7a\xe3\x3a\x00\xb9\x97\xad\xb5\x00\xe2\x57\x79\x81\x33\x04\x9a\x7e\x63\x59\x01\x86\x3c\x45\xa3\x07\x4f\xef\x46\x6f\xee\x5a\x4e\x7b\x42\xb0\xd9\x89\xb6\x8d\x27\x3e\xf5\x8c\xd1\x07\x44\xb2\xa0\x65\xe0\x53\xef\x5c\x07\x49\x5a\x11\x27\x85\x95\x60\x85\xe2\x47\x3f\x1f\x7c\x93\xdb\x10\xcc\x26\xf7\x45\x26\xf7\x40\x05\x79\x60\xf0\x5f\xc0\x8d\x77\x9c\x89\xda\x3d\xce\x41\xed\x3e\x02\x2e\x9b\xc0\xc6\xcf\xaf\xf1\x25\x2c\xc4\xb5\x98\x5d\xcb\x94\x8a\xac\xc3\x12\x37\x7c\x11\x25\xc4\x41\x31\xf7\x84\xe1\xde\x49\x9d\x24\x0d\xff\xce\x7c\x58\x2d\xbf\x10\x1f\x2c\x04\x3e\x36\x5c\xd2\x7c\x6c\xf8\x10\xbd\x8f\x9d\x7a\x19\x7e\x9c\xea\x77\xe6\xbf\x65\xdf\x94\x47\x5b\x79\x2c\xbf\x7b\x84\xe7\x80\xbf\x0b\x72\x84\xaf\xca\xc7\xb1\xc3\x32\xf4\x11\xdb\x41\x11\xc6\x2c\xa3\x29\x53\x2d\x8e\x20\xc6\xbd\x65\x19\xdd\x11\x0e\xf4\xcb\x9b\xc8\xba\xac\x44\x8f\x58\x0f\x89\xd9\x33\x5b\x47\xca\x21\xa3\xb5\x86\xb1\x4b\x7b\xf4\xba\xb3\xbe\x28\xa8\xbe\xed\xee\xfd\xcc\x9f\x11\xed\x5b\x38\xf9\x74\xf3\xf0\xcd\x66\x76\x3a\xb7\x2c\xf1\x23\xdb\xe3\xd7\xb5\x15\xcc\x1e\x2a\x80\x45\x60\xf4\xa6\x01\x4c\x01\xfa\xa4\x81\x31\x06\x39\xe2\xc4\xfe\xdd\xd9\x5a\xcd\xdf\x72\x0c\x0a\x5e\xde\xe9\x3b\xd8\xbb\x5d\xbb\xa3\x87\xfe\xa2\x4c\xf2\xbe\xa0\x7b\x4c\x6c\x9c\xd9\x4e\xeb\xb9\x41\xb4\xd3\x47\x93\x83\xf8\xdb\xae\xdc\x51\xe1\xf2\x02\x20\x5f\xa7\x47\x9f\xe9\x3b\x7c\xba\xb1\x92\x63\x45\xd0\x86\xd9\x99\xf9\x85\x1d\x34\x82\x52\x4c\x31\x6e\x94\xee\xaa\x2d\x2f\xcb\xfa\x02\x12\x0f\x0e\xc5\x60\x6d\xfe\x15\x31\x21\x92\x43\xce\x7c\x81\xef\xe9\x06\x2a\xec\x58\x0a\x8c\xd3\x8d\xa0\x88\xce\x9b\x80\x98\xde\xfc\xf2\xee\x72\x00\x39\x31\x41\x35\x65\x62\x42\xc7\x2f\xbc\x87\xd3\x57\xb6\x72\x5c\x17\xb0\x7d\x33\xdd\x03\x81\x3c\xda\x01\xa1\x21\xbf\x33\x0b\xe2\x99\x2c\x48\xa9\xad\xc8\xb7\x32\x63\x94\xce\xe4\x3b\x06\x0a\xee\x18\x15\x28\xbb\x62\x74\x54\x6b\x1d\xd6\x59\xcb\x36\x84\xe7\x07\xe2\x22\x10\xf0\x03\x71\xb5\x9d\x6c\x9e\x41\x93\xca\x7a\x5f\x15\x2a\x38\x0a\xfc\x95\x46\x19\xa8\x81\xf8\x92\x0d\x42\x8b\x76\xcd\x24\xc2\xad\x9c\xf4\x76\x86\xaf\x68\xe8\x74\x22\xf2\x7c\x11\x58\x3f\x0d\xf9\x85\x04\xc9\x61\xc0\xcb\x85\x43\x8c\x19\x94\x5e\x9f\xf9\xdb\x57\x61\x7b\x1a\x74\x66\x5d\xdd\x96\xce\x52\xa5\xbd\x79\x47\x71\x11\xf0\x8a\xdf\x98\xb4\x03\x91\xf2\xca\x24\x3f\xee\x3e\xe8\x44\x58\x94\xf6\x64\x54\xd2\xb6\x82\xf5\x30\xc0\x8b\x44\x4c\x63\xdc\xa0\x95\x6f\x07\xe0\xca\xb8\x87\xec\xd6\x5e\x69\x0a\x66\x88\x7f\x32\xc5\xaf\xcf\xae\x76\x5e\x97\x27\x6b\x66\x28\x5d\xb9\x18\x06\x2b\x97\x79\x0b\xcc\x16\xad\xdc\xad\xc2\x7f\x37\xbc\x8f\xeb\x52\xc2\xb9\x67\x71\x1d\xd1\x5e\xb1\x93\xc3\x36\x1a\xf4\xf0\xde\xbb\x40\xd0\x64\x09\x13\x77\x9e\xc5\x00\xe5\xef\xe5\x62\x17\x6c\x2b\xfc\x22\xdf\x6a\xc7\xf3\xc5\x34\xe6\x1c\xb8\xab\x71\x2b\xdb\x95\xc4\x04\x30\x53\x17\x2c\x59\xd3\xe1\xe2\x68\xae\x8e\x47\xeb\x77\xd5\x43\xfd\x61\x28\xf3\xb8\x30\x2f\x07\xf9\xcc\xd6\x72\xf6\x62\xe0\x84\x61\xb0\xa1\x14\x12\xc6\x65\xdf\x47\x72\x9a\x4b\x9b\x68\xb8\x25\x35\x5b\x66\x59\xdb\x59\x00\x0b\x51\x3c\xb8\xff\x5e\xda\x20\xe9\x5f\x72\xb1\x4a\x3e\x89\x4f\xc3\xe7\xc1\x15\xc9\x66\x7e\x0c\xdc\x68\xa2\xf3\x3f\x8f\xe5\x1e\x3b\x39\x24\x65\x99\xd8\x83\x48\xee\xe1\x0b\x60\x9f\x75\xed\xe2\xd9\xe3\xf0\xf6\x3b\xb6\x08\x79\x00\xbe\x2d\x8f\x13\xff\xa4\x57\xe3\x69\x3b\x60\xd4\xa0\x32\xff\xa6\xb7\xea\xc9\x77\x58\xae\x98\x3d\xa4\xe8\xee\x3f\xb9\xd2\xff\x96\xa8\xb3\x85\x2f\x42\x23\xf0\x5c\xc2\x1f\x29\xc8\xdd\xe1\xa1\xfd\xb3\xef\x01\x5e\x70\x64\x9a\x11\x22\x67\xa7\x87\x6f\x68\x28\xaa\x70\xf2\x9a\x4f\xe2\x78\x3c\xd1\xc7\xc3\x88\x8a\x8a\x1a\x21\x4a\xaf\x85\xfb\x21\xf3\x77\xad\xe2\x10\x9e\x24\x54\x9d\xde\x8b\x25\x0f\x94\xfc\xe0\xee\x59\x4d\x3e\xf5\x4d\xb3\xfe\x9c\xe4\x4b\xee\x13\xfd\x26\xb8\xc8\x58\xfc\x75\xe1\x93\x46\xc1\x44\x3e\x39\xf4\x3d\x17\xfc\x3d\x69\xa9\xc4\x40\x70\x39\xdb\xf7\x1b\x44\xc8\x13\xd7\x88\x58\x21\x82\x6f\xc0\xc6\x67\x81\xcf\x22\x3f\xe0\x6b\x8f\xaf\x7d\x59\xde\x49\x66\x70\x18\xca\x4e\x5a\xdf\x0a\x31\x07\x7c\xf3\x6d\x63\xfc\x29\xf5\xe8\xdd\x83\xf6\x81\x2b\xe1\xe4\x45\x6d\xc4\xdb\x07\xc5\xcb\x5b\x33\x2f\xfc\xb3\x33\x8f\x79\x7f\xec\xa0\x51\x08\x51\x0c\x57\xaf\x51\x12\x7c\x0c\x36\x41\xba\xac\x16\x28\x61\x8a\xe5\x76\x68\xa4\x04\x29\xae\xcd\xf7\x99\x6f\x97\x86\x10\xeb\x5b\xa5\xa1\xe4\xff\x05\x00\x00\xff\xff\x20\x7e\xb5\x4e\xb6\x8f\x00\x00") func confLocaleLocale_enUsIniBytes() ([]byte, error) { return bindataRead( @@ -787,7 +787,7 @@ func confLocaleLocale_enUsIni() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 36179, mode: os.FileMode(420), modTime: time.Unix(1439218683, 0)} + info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 36790, mode: os.FileMode(420), modTime: time.Unix(1439218861, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/modules/mailer/mail.go b/modules/mailer/mail.go index 9ed338ab..195f3d3e 100644 --- a/modules/mailer/mail.go +++ b/modules/mailer/mail.go @@ -156,7 +156,7 @@ func SendResetPasswdMail(r macaron.Render, u *models.User) { // SendIssueNotifyMail sends mail notification of all watchers of repository. func SendIssueNotifyMail(u, owner *models.User, repo *models.Repository, issue *models.Issue) ([]string, error) { - ws, err := models.GetWatchers(repo.Id) + ws, err := models.GetWatchers(repo.ID) if err != nil { return nil, errors.New("mail.NotifyWatchers(GetWatchers): " + err.Error()) } @@ -167,7 +167,7 @@ func SendIssueNotifyMail(u, owner *models.User, repo *models.Repository, issue * if u.Id == uid { continue } - u, err := models.GetUserById(uid) + u, err := models.GetUserByID(uid) if err != nil { return nil, errors.New("mail.NotifyWatchers(GetUserById): " + err.Error()) } diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index 12164632..c4c53c03 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -257,7 +257,7 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler { ctx.Data["HasAccess"] = true if repo.IsMirror { - ctx.Repo.Mirror, err = models.GetMirror(repo.Id) + ctx.Repo.Mirror, err = models.GetMirror(repo.ID) if err != nil { ctx.Handle(500, "GetMirror", err) return @@ -291,10 +291,34 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler { ctx.Data["Tags"] = tags ctx.Repo.Repository.NumTags = len(tags) - // Non-fork repository will not return error in this method. - if err = repo.GetForkRepo(); err != nil { - ctx.Handle(500, "GetForkRepo", err) - return + if repo.IsFork { + // Non-fork repository will not return error in this method. + if err = repo.GetBaseRepo(); err != nil { + ctx.Handle(500, "GetBaseRepo", err) + return + } else if repo.BaseRepo.GetOwner(); err != nil { + ctx.Handle(500, "BaseRepo.GetOwner", err) + return + } + + bsaeRepo := repo.BaseRepo + baseGitRepo, err := git.OpenRepository(models.RepoPath(bsaeRepo.Owner.Name, bsaeRepo.Name)) + if err != nil { + ctx.Handle(500, "OpenRepository", err) + return + } + if len(bsaeRepo.DefaultBranch) > 0 && baseGitRepo.IsBranchExist(bsaeRepo.DefaultBranch) { + ctx.Data["BaseDefaultBranch"] = bsaeRepo.DefaultBranch + } else { + baseBranches, err := baseGitRepo.GetBranches() + if err != nil { + ctx.Handle(500, "GetBranches", err) + return + } + if len(baseBranches) > 0 { + ctx.Data["BaseDefaultBranch"] = baseBranches[0] + } + } } ctx.Data["Title"] = u.Name + "/" + repo.Name @@ -327,8 +351,8 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler { } if ctx.IsSigned { - ctx.Data["IsWatchingRepo"] = models.IsWatching(ctx.User.Id, repo.Id) - ctx.Data["IsStaringRepo"] = models.IsStaring(ctx.User.Id, repo.Id) + ctx.Data["IsWatchingRepo"] = models.IsWatching(ctx.User.Id, repo.ID) + ctx.Data["IsStaringRepo"] = models.IsStaring(ctx.User.Id, repo.ID) } ctx.Data["TagName"] = ctx.Repo.TagName @@ -342,8 +366,8 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler { // If not branch selected, try default one. // If default branch doesn't exists, fall back to some other branch. - if ctx.Repo.BranchName == "" { - if ctx.Repo.Repository.DefaultBranch != "" && gitRepo.IsBranchExist(ctx.Repo.Repository.DefaultBranch) { + if len(ctx.Repo.BranchName) == 0 { + if len(ctx.Repo.Repository.DefaultBranch) > 0 && gitRepo.IsBranchExist(ctx.Repo.Repository.DefaultBranch) { ctx.Repo.BranchName = ctx.Repo.Repository.DefaultBranch } else if len(brs) > 0 { ctx.Repo.BranchName = brs[0] diff --git a/public/css/gogs.min.css b/public/css/gogs.min.css index 6d43f54a..08cca292 100644 --- a/public/css/gogs.min.css +++ b/public/css/gogs.min.css @@ -1 +1 @@ -@font-face{font-family:octicons;src:url(../fonts/octicons.eot?#iefix&v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('embedded-opentype'),url(../fonts/octicons.woff?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('woff'),url(../fonts/octicons.ttf?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('truetype'),url(../fonts/octicons.svg?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6#octicons)format('svg');font-weight:400;font-style:normal}.mega-octicon,.octicon{font:normal normal normal 16px/1 octicons;display:inline-block;text-decoration:none;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mega-octicon{font-size:32px}.octicon-alert:before{content:'\f02d'}.octicon-alignment-align:before{content:'\f08a'}.octicon-alignment-aligned-to:before{content:'\f08e'}.octicon-alignment-unalign:before{content:'\f08b'}.octicon-arrow-down:before{content:'\f03f'}.octicon-arrow-left:before{content:'\f040'}.octicon-arrow-right:before{content:'\f03e'}.octicon-arrow-small-down:before{content:'\f0a0'}.octicon-arrow-small-left:before{content:'\f0a1'}.octicon-arrow-small-right:before{content:'\f071'}.octicon-arrow-small-up:before{content:'\f09f'}.octicon-arrow-up:before{content:'\f03d'}.octicon-beer:before{content:'\f069'}.octicon-book:before{content:'\f007'}.octicon-bookmark:before{content:'\f07b'}.octicon-briefcase:before{content:'\f0d3'}.octicon-broadcast:before{content:'\f048'}.octicon-browser:before{content:'\f0c5'}.octicon-bug:before{content:'\f091'}.octicon-calendar:before{content:'\f068'}.octicon-check:before{content:'\f03a'}.octicon-checklist:before{content:'\f076'}.octicon-chevron-down:before{content:'\f0a3'}.octicon-chevron-left:before{content:'\f0a4'}.octicon-chevron-right:before{content:'\f078'}.octicon-chevron-up:before{content:'\f0a2'}.octicon-circle-slash:before{content:'\f084'}.octicon-circuit-board:before{content:'\f0d6'}.octicon-clippy:before{content:'\f035'}.octicon-clock:before{content:'\f046'}.octicon-cloud-download:before{content:'\f00b'}.octicon-cloud-upload:before{content:'\f00c'}.octicon-code:before{content:'\f05f'}.octicon-color-mode:before{content:'\f065'}.octicon-comment-add:before,.octicon-comment:before{content:'\f02b'}.octicon-comment-discussion:before{content:'\f04f'}.octicon-credit-card:before{content:'\f045'}.octicon-dash:before{content:'\f0ca'}.octicon-dashboard:before{content:'\f07d'}.octicon-database:before{content:'\f096'}.octicon-device-camera:before{content:'\f056'}.octicon-device-camera-video:before{content:'\f057'}.octicon-device-desktop:before{content:'\f27c'}.octicon-device-mobile:before{content:'\f038'}.octicon-diff:before{content:'\f04d'}.octicon-diff-added:before{content:'\f06b'}.octicon-diff-ignored:before{content:'\f099'}.octicon-diff-modified:before{content:'\f06d'}.octicon-diff-removed:before{content:'\f06c'}.octicon-diff-renamed:before{content:'\f06e'}.octicon-ellipsis:before{content:'\f09a'}.octicon-eye-unwatch:before,.octicon-eye-watch:before,.octicon-eye:before{content:'\f04e'}.octicon-file-binary:before{content:'\f094'}.octicon-file-code:before{content:'\f010'}.octicon-file-directory:before{content:'\f016'}.octicon-file-media:before{content:'\f012'}.octicon-file-pdf:before{content:'\f014'}.octicon-file-submodule:before{content:'\f017'}.octicon-file-symlink-directory:before{content:'\f0b1'}.octicon-file-symlink-file:before{content:'\f0b0'}.octicon-file-text:before{content:'\f011'}.octicon-file-zip:before{content:'\f013'}.octicon-flame:before{content:'\f0d2'}.octicon-fold:before{content:'\f0cc'}.octicon-gear:before{content:'\f02f'}.octicon-gift:before{content:'\f042'}.octicon-gist:before{content:'\f00e'}.octicon-gist-secret:before{content:'\f08c'}.octicon-git-branch-create:before,.octicon-git-branch-delete:before,.octicon-git-branch:before{content:'\f020'}.octicon-git-commit:before{content:'\f01f'}.octicon-git-compare:before{content:'\f0ac'}.octicon-git-merge:before{content:'\f023'}.octicon-git-pull-request-abandoned:before,.octicon-git-pull-request:before{content:'\f009'}.octicon-globe:before{content:'\f0b6'}.octicon-graph:before{content:'\f043'}.octicon-heart:before{content:'\2665'}.octicon-history:before{content:'\f07e'}.octicon-home:before{content:'\f08d'}.octicon-horizontal-rule:before{content:'\f070'}.octicon-hourglass:before{content:'\f09e'}.octicon-hubot:before{content:'\f09d'}.octicon-inbox:before{content:'\f0cf'}.octicon-info:before{content:'\f059'}.octicon-issue-closed:before{content:'\f028'}.octicon-issue-opened:before{content:'\f026'}.octicon-issue-reopened:before{content:'\f027'}.octicon-jersey:before{content:'\f019'}.octicon-jump-down:before{content:'\f072'}.octicon-jump-left:before{content:'\f0a5'}.octicon-jump-right:before{content:'\f0a6'}.octicon-jump-up:before{content:'\f073'}.octicon-key:before{content:'\f049'}.octicon-keyboard:before{content:'\f00d'}.octicon-law:before{content:'\f0d8'}.octicon-light-bulb:before{content:'\f000'}.octicon-link:before{content:'\f05c'}.octicon-link-external:before{content:'\f07f'}.octicon-list-ordered:before{content:'\f062'}.octicon-list-unordered:before{content:'\f061'}.octicon-location:before{content:'\f060'}.octicon-gist-private:before,.octicon-git-fork-private:before,.octicon-lock:before,.octicon-mirror-private:before{content:'\f06a'}.octicon-logo-github:before{content:'\f092'}.octicon-mail:before{content:'\f03b'}.octicon-mail-read:before{content:'\f03c'}.octicon-mail-reply:before{content:'\f051'}.octicon-mark-github:before{content:'\f00a'}.octicon-markdown:before{content:'\f0c9'}.octicon-megaphone:before{content:'\f077'}.octicon-mention:before{content:'\f0be'}.octicon-microscope:before{content:'\f089'}.octicon-milestone:before{content:'\f075'}.octicon-mirror-public:before,.octicon-mirror:before{content:'\f024'}.octicon-mortar-board:before{content:'\f0d7'}.octicon-move-down:before{content:'\f0a8'}.octicon-move-left:before{content:'\f074'}.octicon-move-right:before{content:'\f0a9'}.octicon-move-up:before{content:'\f0a7'}.octicon-mute:before{content:'\f080'}.octicon-no-newline:before{content:'\f09c'}.octicon-octoface:before{content:'\f008'}.octicon-organization:before{content:'\f037'}.octicon-package:before{content:'\f0c4'}.octicon-paintcan:before{content:'\f0d1'}.octicon-pencil:before{content:'\f058'}.octicon-person-add:before,.octicon-person-follow:before,.octicon-person:before{content:'\f018'}.octicon-pin:before{content:'\f041'}.octicon-playback-fast-forward:before{content:'\f0bd'}.octicon-playback-pause:before{content:'\f0bb'}.octicon-playback-play:before{content:'\f0bf'}.octicon-playback-rewind:before{content:'\f0bc'}.octicon-plug:before{content:'\f0d4'}.octicon-file-add:before,.octicon-file-directory-create:before,.octicon-gist-new:before,.octicon-plus:before,.octicon-repo-create:before{content:'\f05d'}.octicon-podium:before{content:'\f0af'}.octicon-primitive-dot:before{content:'\f052'}.octicon-primitive-square:before{content:'\f053'}.octicon-pulse:before{content:'\f085'}.octicon-puzzle:before{content:'\f0c0'}.octicon-question:before{content:'\f02c'}.octicon-quote:before{content:'\f063'}.octicon-radio-tower:before{content:'\f030'}.octicon-repo-delete:before,.octicon-repo:before{content:'\f001'}.octicon-repo-clone:before{content:'\f04c'}.octicon-repo-force-push:before{content:'\f04a'}.octicon-gist-fork:before,.octicon-repo-forked:before{content:'\f002'}.octicon-repo-pull:before{content:'\f006'}.octicon-repo-push:before{content:'\f005'}.octicon-rocket:before{content:'\f033'}.octicon-rss:before{content:'\f034'}.octicon-ruby:before{content:'\f047'}.octicon-screen-full:before{content:'\f066'}.octicon-screen-normal:before{content:'\f067'}.octicon-search-save:before,.octicon-search:before{content:'\f02e'}.octicon-server:before{content:'\f097'}.octicon-settings:before{content:'\f07c'}.octicon-log-in:before,.octicon-sign-in:before{content:'\f036'}.octicon-log-out:before,.octicon-sign-out:before{content:'\f032'}.octicon-split:before{content:'\f0c6'}.octicon-squirrel:before{content:'\f0b2'}.octicon-star-add:before,.octicon-star-delete:before,.octicon-star:before{content:'\f02a'}.octicon-steps:before{content:'\f0c7'}.octicon-stop:before{content:'\f08f'}.octicon-repo-sync:before,.octicon-sync:before{content:'\f087'}.octicon-tag-add:before,.octicon-tag-remove:before,.octicon-tag:before{content:'\f015'}.octicon-telescope:before{content:'\f088'}.octicon-terminal:before{content:'\f0c8'}.octicon-three-bars:before{content:'\f05e'}.octicon-thumbsdown:before{content:'\f0db'}.octicon-thumbsup:before{content:'\f0da'}.octicon-tools:before{content:'\f031'}.octicon-trashcan:before{content:'\f0d0'}.octicon-triangle-down:before{content:'\f05b'}.octicon-triangle-left:before{content:'\f044'}.octicon-triangle-right:before{content:'\f05a'}.octicon-triangle-up:before{content:'\f0aa'}.octicon-unfold:before{content:'\f039'}.octicon-unmute:before{content:'\f0ba'}.octicon-versions:before{content:'\f064'}.octicon-remove-close:before,.octicon-x:before{content:'\f081'}.octicon-zap:before{content:'\26A1'}body{font-family:'Helvetica Neue',Arial,Helvetica,sans-serif,'微软雅黑';background-color:#FAFAFA}img{border-radius:3px}.full.height{padding:0;margin:0 0 -80px 0;min-height:100%}.following.bar{z-index:900;left:0;width:100%}.following.bar.light{background-color:#fff;border-bottom:1px solid #DDD;box-shadow:0 2px 3px rgba(0,0,0,.04)}.following.bar .column .menu{margin-top:0}.following.bar .top.menu a.item.brand{padding-left:0}.following.bar .brand .ui.mini.image{width:30px}.following.bar .top.menu .dropdown.item.active,.following.bar .top.menu .dropdown.item:hover,.following.bar .top.menu a.item:hover{background-color:transparent}.following.bar .top.menu a.item:hover{color:rgba(0,0,0,.45)}.following.bar .head.link.item{padding-right:0!important}.following.bar .head.link.item .dropdown.icon,.following.bar .head.link.item .menu .octicon{margin-right:5px}.following.bar .avatar>.ui.image{margin-right:0}.following.bar .searchbox{background-color:#f4f4f4!important}.following.bar .searchbox:focus{background-color:#e9e9e9!important}.following.bar .octicon{width:16px;text-align:center}.ui.left{float:left}.ui.right{float:right}.ui .text.red{color:#d95c5c!important}.ui .message{text-align:center}footer{margin-top:40px!important;height:40px;background-color:#fff;border-top:1px solid #d6d6d6;clear:both;width:100%;color:#888}footer .container{padding-top:10px}footer .container .fa{width:16px;text-align:center;color:#428bca}footer .container .ui.language.dropdown{z-index:10000}footer .container .links>*{border-left:1px solid #d6d6d6;padding-left:8px;margin-left:5px}footer .container .links>:first-child{border-left:none}.hide{display:none}.center{text-align:center}.img-1{width:2px!important;height:2px!important}.img-2{width:4px!important;height:4px!important}.img-3{width:6px!important;height:6px!important}.img-4{width:8px!important;height:8px!important}.img-5{width:10px!important;height:10px!important}.img-6{width:12px!important;height:12px!important}.img-7{width:14px!important;height:14px!important}.img-8{width:16px!important;height:16px!important}.img-9{width:18px!important;height:18px!important}.img-10{width:20px!important;height:20px!important}.img-11{width:22px!important;height:22px!important}.img-12{width:24px!important;height:24px!important}.img-13{width:26px!important;height:26px!important}.img-14{width:28px!important;height:28px!important}.img-15{width:30px!important;height:30px!important}.img-16{width:32px!important;height:32px!important}.octicon.icon{font-family:octicons}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}.home{padding-bottom:120px}.home .logo{max-width:250px}.home .hero h1,.home .hero h2{font-family:'PT Sans Narrow',sans-serif}.home .hero h1{font-size:7em}.home .hero h2{font-size:4em}.home .hero .octicon{color:#d9453d;font-size:60px;margin-right:10px}.home .hero.header{font-size:24px}.home p.large{font-size:20px}.home .stackable{padding-top:30px}.home a{color:#d9453d}.install{padding-top:45px;padding-bottom:120px}.install form label{text-align:right;width:40%!important}.install form input{width:35%!important}.install form .field{text-align:left}.install form .field .help{margin-left:41%}.install form .field.optional .title{margin-left:38%}.install .ui .checkbox{margin-left:40%!important}.install .ui .checkbox label{width:auto!important}.form .help{color:#999;padding-top:.6em;padding-bottom:.6em;display:inline-block}.ui.attached.header{background:#f0f0f0}.ui.attached.header .right{margin-top:-5px}.repository.new.fork form{margin:auto;width:800px!important}.repository.new.fork form .ui.message{text-align:center}.repository.new.fork form .header{padding-left:270px!important}.repository.new.fork form .inline.field>label{text-align:right;width:250px!important;word-wrap:break-word}.repository.new.fork form .help{margin-left:260px!important}.repository.new.fork form .dropdown .dropdown.icon{margin-top:-7px!important}.repository.new.fork form .dropdown .text{margin-right:0!important}.repository.new.fork form .dropdown .text i{margin-right:0!important}.repository.new.fork form input,.repository.new.fork form textarea{width:50%!important}.repository{padding-top:15px;padding-bottom:120px}.repository .head{height:40px;background-color:#FCFCFC}.repository .head .mega-octicon{width:30px;font-size:30px}.repository .head .fork-flag,.repository .head a{font-weight:300}.repository .head .ui.label{margin-top:5px;vertical-align:top}.repository .head .fork-flag{margin-left:38px;display:block;font-size:11px;line-height:10px;white-space:nowrap}.repository .head .num{font-weight:700}.repository .filter.menu .label.color{margin-left:15px;padding:0 8px}.repository .filter.menu .octicon{float:left;margin-left:-5px;margin-right:-7px}.repository .filter.menu .menu{max-height:300px;overflow-x:auto;right:0!important;left:auto!important}.repository .filter.menu .menu .clickable .name{padding-left:15px!important}.repository .page.buttons{padding-top:15px}.repository .issue.list{list-style:none;padding-top:15px}.repository .issue.list>.item{padding-top:15px;padding-bottom:10px;border-bottom:1px dashed #AAA}.repository .issue.list>.item .title{color:#444;font-size:15px;font-weight:700;margin:0 6px}.repository .issue.list>.item .title:hover{color:#000}.repository .issue.list>.item .comment{padding-right:10px;color:#666}.repository .issue.list>.item .desc{padding-top:5px;color:#999}.repository .issue.list>.item .desc a.milestone{padding-left:5px;color:#999!important}.repository .issue.list>.item .desc a.milestone:hover{color:#000!important}.repository .label.list{list-style:none;padding-top:15px}.repository .label.list .item{padding-top:10px;padding-bottom:10px;border-bottom:1px dashed #AAA}.repository .label.list .item a{font-size:15px;padding-top:5px;padding-right:10px;color:#666}.repository .label.list .item a:hover{color:#000}.repository .label.list .item a.open-issues{margin-right:30px}.repository .milestone.list{list-style:none;padding-top:15px}.repository .milestone.list>.item{padding-top:10px;padding-bottom:10px;border-bottom:1px dashed #AAA}.repository .milestone.list>.item>a{padding-top:5px;padding-right:10px;color:#000}.repository .milestone.list>.item>a:hover{color:#4078c0}.repository .milestone.list>.item .ui.progress{width:40%;padding:0;border:0;margin:0}.repository .milestone.list>.item .ui.progress .bar{height:20px}.repository .milestone.list>.item .meta{color:#999;padding-top:5px}.repository .milestone.list>.item .meta .issue-stats .octicon{padding-left:5px}.repository .milestone.list>.item .meta .overdue{color:red}.repository .milestone.list>.item .operate{margin-top:-15px}.repository .milestone.list>.item .operate>a{font-size:15px;padding-top:5px;padding-right:10px;color:#666}.repository .milestone.list>.item .operate>a:hover{color:#000}.repository .milestone.list>.item .content{padding-top:10px}.repository.new.milestone textarea{height:200px}.repository.new.milestone #deadline{width:150px}.settings .key.list .item:not(:first-child){border-top:1px solid #eaeaea}.settings .key.list .ssh-key-state-indicator{float:left;color:gray;padding-left:10px;padding-top:10px}.settings .key.list .ssh-key-state-indicator.active{color:#6cc644}.settings .key.list .meta{padding-top:5px}.settings .key.list .print{color:#767676}.settings .key.list .activity{color:#666}.ui.vertical.menu .header.item{font-size:1.1em;background:#f0f0f0}.edit-label.modal .form .column,.new-label.segment .form .column{padding-right:0}.edit-label.modal .form .buttons,.new-label.segment .form .buttons{margin-left:auto;padding-top:15px}.edit-label.modal .form .color.picker.column,.new-label.segment .form .color.picker.column{width:auto}.edit-label.modal .form .color.picker.column .color-picker,.new-label.segment .form .color.picker.column .color-picker{height:35px;width:auto;padding-left:30px}.edit-label.modal .form .minicolors-swatch.minicolors-sprite,.new-label.segment .form .minicolors-swatch.minicolors-sprite{top:10px;left:10px;width:15px;height:15px}.edit-label.modal .form .precolors,.new-label.segment .form .precolors{padding-left:0;padding-right:0;margin:3px 10px auto 10px;width:120px}.edit-label.modal .form .precolors .color,.new-label.segment .form .precolors .color{float:left;width:15px;height:15px}
\ No newline at end of file +@font-face{font-family:octicons;src:url(../fonts/octicons.eot?#iefix&v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('embedded-opentype'),url(../fonts/octicons.woff?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('woff'),url(../fonts/octicons.ttf?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('truetype'),url(../fonts/octicons.svg?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6#octicons)format('svg');font-weight:400;font-style:normal}.mega-octicon,.octicon{font:normal normal normal 16px/1 octicons;display:inline-block;text-decoration:none;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mega-octicon{font-size:32px}.octicon-alert:before{content:'\f02d'}.octicon-alignment-align:before{content:'\f08a'}.octicon-alignment-aligned-to:before{content:'\f08e'}.octicon-alignment-unalign:before{content:'\f08b'}.octicon-arrow-down:before{content:'\f03f'}.octicon-arrow-left:before{content:'\f040'}.octicon-arrow-right:before{content:'\f03e'}.octicon-arrow-small-down:before{content:'\f0a0'}.octicon-arrow-small-left:before{content:'\f0a1'}.octicon-arrow-small-right:before{content:'\f071'}.octicon-arrow-small-up:before{content:'\f09f'}.octicon-arrow-up:before{content:'\f03d'}.octicon-beer:before{content:'\f069'}.octicon-book:before{content:'\f007'}.octicon-bookmark:before{content:'\f07b'}.octicon-briefcase:before{content:'\f0d3'}.octicon-broadcast:before{content:'\f048'}.octicon-browser:before{content:'\f0c5'}.octicon-bug:before{content:'\f091'}.octicon-calendar:before{content:'\f068'}.octicon-check:before{content:'\f03a'}.octicon-checklist:before{content:'\f076'}.octicon-chevron-down:before{content:'\f0a3'}.octicon-chevron-left:before{content:'\f0a4'}.octicon-chevron-right:before{content:'\f078'}.octicon-chevron-up:before{content:'\f0a2'}.octicon-circle-slash:before{content:'\f084'}.octicon-circuit-board:before{content:'\f0d6'}.octicon-clippy:before{content:'\f035'}.octicon-clock:before{content:'\f046'}.octicon-cloud-download:before{content:'\f00b'}.octicon-cloud-upload:before{content:'\f00c'}.octicon-code:before{content:'\f05f'}.octicon-color-mode:before{content:'\f065'}.octicon-comment-add:before,.octicon-comment:before{content:'\f02b'}.octicon-comment-discussion:before{content:'\f04f'}.octicon-credit-card:before{content:'\f045'}.octicon-dash:before{content:'\f0ca'}.octicon-dashboard:before{content:'\f07d'}.octicon-database:before{content:'\f096'}.octicon-device-camera:before{content:'\f056'}.octicon-device-camera-video:before{content:'\f057'}.octicon-device-desktop:before{content:'\f27c'}.octicon-device-mobile:before{content:'\f038'}.octicon-diff:before{content:'\f04d'}.octicon-diff-added:before{content:'\f06b'}.octicon-diff-ignored:before{content:'\f099'}.octicon-diff-modified:before{content:'\f06d'}.octicon-diff-removed:before{content:'\f06c'}.octicon-diff-renamed:before{content:'\f06e'}.octicon-ellipsis:before{content:'\f09a'}.octicon-eye-unwatch:before,.octicon-eye-watch:before,.octicon-eye:before{content:'\f04e'}.octicon-file-binary:before{content:'\f094'}.octicon-file-code:before{content:'\f010'}.octicon-file-directory:before{content:'\f016'}.octicon-file-media:before{content:'\f012'}.octicon-file-pdf:before{content:'\f014'}.octicon-file-submodule:before{content:'\f017'}.octicon-file-symlink-directory:before{content:'\f0b1'}.octicon-file-symlink-file:before{content:'\f0b0'}.octicon-file-text:before{content:'\f011'}.octicon-file-zip:before{content:'\f013'}.octicon-flame:before{content:'\f0d2'}.octicon-fold:before{content:'\f0cc'}.octicon-gear:before{content:'\f02f'}.octicon-gift:before{content:'\f042'}.octicon-gist:before{content:'\f00e'}.octicon-gist-secret:before{content:'\f08c'}.octicon-git-branch-create:before,.octicon-git-branch-delete:before,.octicon-git-branch:before{content:'\f020'}.octicon-git-commit:before{content:'\f01f'}.octicon-git-compare:before{content:'\f0ac'}.octicon-git-merge:before{content:'\f023'}.octicon-git-pull-request-abandoned:before,.octicon-git-pull-request:before{content:'\f009'}.octicon-globe:before{content:'\f0b6'}.octicon-graph:before{content:'\f043'}.octicon-heart:before{content:'\2665'}.octicon-history:before{content:'\f07e'}.octicon-home:before{content:'\f08d'}.octicon-horizontal-rule:before{content:'\f070'}.octicon-hourglass:before{content:'\f09e'}.octicon-hubot:before{content:'\f09d'}.octicon-inbox:before{content:'\f0cf'}.octicon-info:before{content:'\f059'}.octicon-issue-closed:before{content:'\f028'}.octicon-issue-opened:before{content:'\f026'}.octicon-issue-reopened:before{content:'\f027'}.octicon-jersey:before{content:'\f019'}.octicon-jump-down:before{content:'\f072'}.octicon-jump-left:before{content:'\f0a5'}.octicon-jump-right:before{content:'\f0a6'}.octicon-jump-up:before{content:'\f073'}.octicon-key:before{content:'\f049'}.octicon-keyboard:before{content:'\f00d'}.octicon-law:before{content:'\f0d8'}.octicon-light-bulb:before{content:'\f000'}.octicon-link:before{content:'\f05c'}.octicon-link-external:before{content:'\f07f'}.octicon-list-ordered:before{content:'\f062'}.octicon-list-unordered:before{content:'\f061'}.octicon-location:before{content:'\f060'}.octicon-gist-private:before,.octicon-git-fork-private:before,.octicon-lock:before,.octicon-mirror-private:before{content:'\f06a'}.octicon-logo-github:before{content:'\f092'}.octicon-mail:before{content:'\f03b'}.octicon-mail-read:before{content:'\f03c'}.octicon-mail-reply:before{content:'\f051'}.octicon-mark-github:before{content:'\f00a'}.octicon-markdown:before{content:'\f0c9'}.octicon-megaphone:before{content:'\f077'}.octicon-mention:before{content:'\f0be'}.octicon-microscope:before{content:'\f089'}.octicon-milestone:before{content:'\f075'}.octicon-mirror-public:before,.octicon-mirror:before{content:'\f024'}.octicon-mortar-board:before{content:'\f0d7'}.octicon-move-down:before{content:'\f0a8'}.octicon-move-left:before{content:'\f074'}.octicon-move-right:before{content:'\f0a9'}.octicon-move-up:before{content:'\f0a7'}.octicon-mute:before{content:'\f080'}.octicon-no-newline:before{content:'\f09c'}.octicon-octoface:before{content:'\f008'}.octicon-organization:before{content:'\f037'}.octicon-package:before{content:'\f0c4'}.octicon-paintcan:before{content:'\f0d1'}.octicon-pencil:before{content:'\f058'}.octicon-person-add:before,.octicon-person-follow:before,.octicon-person:before{content:'\f018'}.octicon-pin:before{content:'\f041'}.octicon-playback-fast-forward:before{content:'\f0bd'}.octicon-playback-pause:before{content:'\f0bb'}.octicon-playback-play:before{content:'\f0bf'}.octicon-playback-rewind:before{content:'\f0bc'}.octicon-plug:before{content:'\f0d4'}.octicon-file-add:before,.octicon-file-directory-create:before,.octicon-gist-new:before,.octicon-plus:before,.octicon-repo-create:before{content:'\f05d'}.octicon-podium:before{content:'\f0af'}.octicon-primitive-dot:before{content:'\f052'}.octicon-primitive-square:before{content:'\f053'}.octicon-pulse:before{content:'\f085'}.octicon-puzzle:before{content:'\f0c0'}.octicon-question:before{content:'\f02c'}.octicon-quote:before{content:'\f063'}.octicon-radio-tower:before{content:'\f030'}.octicon-repo-delete:before,.octicon-repo:before{content:'\f001'}.octicon-repo-clone:before{content:'\f04c'}.octicon-repo-force-push:before{content:'\f04a'}.octicon-gist-fork:before,.octicon-repo-forked:before{content:'\f002'}.octicon-repo-pull:before{content:'\f006'}.octicon-repo-push:before{content:'\f005'}.octicon-rocket:before{content:'\f033'}.octicon-rss:before{content:'\f034'}.octicon-ruby:before{content:'\f047'}.octicon-screen-full:before{content:'\f066'}.octicon-screen-normal:before{content:'\f067'}.octicon-search-save:before,.octicon-search:before{content:'\f02e'}.octicon-server:before{content:'\f097'}.octicon-settings:before{content:'\f07c'}.octicon-log-in:before,.octicon-sign-in:before{content:'\f036'}.octicon-log-out:before,.octicon-sign-out:before{content:'\f032'}.octicon-split:before{content:'\f0c6'}.octicon-squirrel:before{content:'\f0b2'}.octicon-star-add:before,.octicon-star-delete:before,.octicon-star:before{content:'\f02a'}.octicon-steps:before{content:'\f0c7'}.octicon-stop:before{content:'\f08f'}.octicon-repo-sync:before,.octicon-sync:before{content:'\f087'}.octicon-tag-add:before,.octicon-tag-remove:before,.octicon-tag:before{content:'\f015'}.octicon-telescope:before{content:'\f088'}.octicon-terminal:before{content:'\f0c8'}.octicon-three-bars:before{content:'\f05e'}.octicon-thumbsdown:before{content:'\f0db'}.octicon-thumbsup:before{content:'\f0da'}.octicon-tools:before{content:'\f031'}.octicon-trashcan:before{content:'\f0d0'}.octicon-triangle-down:before{content:'\f05b'}.octicon-triangle-left:before{content:'\f044'}.octicon-triangle-right:before{content:'\f05a'}.octicon-triangle-up:before{content:'\f0aa'}.octicon-unfold:before{content:'\f039'}.octicon-unmute:before{content:'\f0ba'}.octicon-versions:before{content:'\f064'}.octicon-remove-close:before,.octicon-x:before{content:'\f081'}.octicon-zap:before{content:'\26A1'}body{font-family:'Helvetica Neue',Arial,Helvetica,sans-serif,'微软雅黑';background-color:#FAFAFA}img{border-radius:3px}.full.height{padding:0;margin:0 0 -80px 0;min-height:100%}.following.bar{z-index:900;left:0;width:100%}.following.bar.light{background-color:#fff;border-bottom:1px solid #DDD;box-shadow:0 2px 3px rgba(0,0,0,.04)}.following.bar .column .menu{margin-top:0}.following.bar .top.menu a.item.brand{padding-left:0}.following.bar .brand .ui.mini.image{width:30px}.following.bar .top.menu .dropdown.item.active,.following.bar .top.menu .dropdown.item:hover,.following.bar .top.menu a.item:hover{background-color:transparent}.following.bar .top.menu a.item:hover{color:rgba(0,0,0,.45)}.following.bar .head.link.item{padding-right:0!important}.following.bar .head.link.item .dropdown.icon,.following.bar .head.link.item .menu .octicon{margin-right:5px}.following.bar .avatar>.ui.image{margin-right:0}.following.bar .searchbox{background-color:#f4f4f4!important}.following.bar .searchbox:focus{background-color:#e9e9e9!important}.following.bar .octicon{width:16px;text-align:center}.ui.left{float:left}.ui.right{float:right}.ui .text.red{color:#d95c5c!important}.ui .text.right{text-align:right}.ui .message{text-align:center}footer{margin-top:40px!important;height:40px;background-color:#fff;border-top:1px solid #d6d6d6;clear:both;width:100%;color:#888}footer .container{padding-top:10px}footer .container .fa{width:16px;text-align:center;color:#428bca}footer .container .ui.language.dropdown{z-index:10000}footer .container .links>*{border-left:1px solid #d6d6d6;padding-left:8px;margin-left:5px}footer .container .links>:first-child{border-left:none}.hide{display:none}.center{text-align:center}.img-1{width:2px!important;height:2px!important}.img-2{width:4px!important;height:4px!important}.img-3{width:6px!important;height:6px!important}.img-4{width:8px!important;height:8px!important}.img-5{width:10px!important;height:10px!important}.img-6{width:12px!important;height:12px!important}.img-7{width:14px!important;height:14px!important}.img-8{width:16px!important;height:16px!important}.img-9{width:18px!important;height:18px!important}.img-10{width:20px!important;height:20px!important}.img-11{width:22px!important;height:22px!important}.img-12{width:24px!important;height:24px!important}.img-13{width:26px!important;height:26px!important}.img-14{width:28px!important;height:28px!important}.img-15{width:30px!important;height:30px!important}.img-16{width:32px!important;height:32px!important}.octicon.icon{font-family:octicons}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}.markdown{overflow:hidden;font-family:"Helvetica Neue",Helvetica,"Segoe UI",Arial,freesans,sans-serif;font-size:16px;line-height:1.6;word-wrap:break-word}.markdown>:first-child{margin-top:0!important}.markdown>:last-child{margin-bottom:0!important}.markdown a:not([href]){color:inherit;text-decoration:none}.markdown .absent{color:#c00}.markdown .anchor{position:absolute;top:0;left:0;display:block;padding-right:6px;padding-left:30px;margin-left:-30px}.markdown .anchor:focus{outline:0}.markdown h1,.markdown h2,.markdown h3,.markdown h4,.markdown h5,.markdown h6{position:relative;margin-top:1em;margin-bottom:16px;font-weight:700;line-height:1.4}.markdown h1 .octicon-link,.markdown h2 .octicon-link,.markdown h3 .octicon-link,.markdown h4 .octicon-link,.markdown h5 .octicon-link,.markdown h6 .octicon-link{display:none;color:#000;vertical-align:middle}.markdown h1:hover .anchor,.markdown h2:hover .anchor,.markdown h3:hover .anchor,.markdown h4:hover .anchor,.markdown h5:hover .anchor,.markdown h6:hover .anchor{padding-left:8px;margin-left:-30px;text-decoration:none}.markdown h1:hover .anchor .octicon-link,.markdown h2:hover .anchor .octicon-link,.markdown h3:hover .anchor .octicon-link,.markdown h4:hover .anchor .octicon-link,.markdown h5:hover .anchor .octicon-link,.markdown h6:hover .anchor .octicon-link{display:inline-block}.markdown h1 code,.markdown h1 tt,.markdown h2 code,.markdown h2 tt,.markdown h3 code,.markdown h3 tt,.markdown h4 code,.markdown h4 tt,.markdown h5 code,.markdown h5 tt,.markdown h6 code,.markdown h6 tt{font-size:inherit}.markdown h1{padding-bottom:.3em;font-size:2.25em;line-height:1.2;border-bottom:1px solid #eee}.markdown h1 .anchor{line-height:1}.markdown h2{padding-bottom:.3em;font-size:1.75em;line-height:1.225;border-bottom:1px solid #eee}.markdown h2 .anchor{line-height:1}.markdown h3{font-size:1.5em;line-height:1.43}.markdown h3 .anchor{line-height:1.2}.markdown h4{font-size:1.25em}.markdown h4 .anchor{line-height:1.2}.markdown h5{font-size:1em}.markdown h5 .anchor{line-height:1.1}.markdown h6{font-size:1em;color:#777}.markdown h6 .anchor{line-height:1.1}.markdown blockquote,.markdown dl,.markdown ol,.markdown p,.markdown pre,.markdown table,.markdown ul{margin-top:0;margin-bottom:16px}.markdown hr{height:4px;padding:0;margin:16px 0;background-color:#e7e7e7;border:0 none}.markdown ol,.markdown ul{padding-left:2em}.markdown ol.no-list,.markdown ul.no-list{padding:0;list-style-type:none}.markdown ol ol,.markdown ol ul,.markdown ul ol,.markdown ul ul{margin-top:0;margin-bottom:0}.markdown ol ol,.markdown ul ol{list-style-type:lower-roman}.markdown li>p{margin-top:16px}.markdown dl{padding:0}.markdown dl dt{padding:0;margin-top:16px;font-size:1em;font-style:italic;font-weight:700}.markdown dl dd{padding:0 16px;margin-bottom:16px}.markdown blockquote{padding:0 15px;color:#777;border-left:4px solid #ddd}.markdown blockquote>:first-child{margin-top:0}.markdown blockquote>:last-child{margin-bottom:0}.markdown table{display:block;width:100%;overflow:auto;word-break:normal;word-break:keep-all}.markdown table th{font-weight:700}.markdown table td,.markdown table th{padding:6px 13px!important;border:1px solid #ddd}.markdown table tr{background-color:#fff;border-top:1px solid #ccc}.markdown table tr:nth-child(2n){background-color:#f8f8f8}.markdown img{max-width:100%;box-sizing:border-box}.markdown .emoji{max-width:none}.markdown span.frame{display:block;overflow:hidden}.markdown span.frame>span{display:block;float:left;width:auto;padding:7px;margin:13px 0 0;overflow:hidden;border:1px solid #ddd}.markdown span.frame span img{display:block;float:left}.markdown span.frame span span{display:block;padding:5px 0 0;clear:both;color:#333}.markdown span.align-center{display:block;overflow:hidden;clear:both}.markdown span.align-center>span{display:block;margin:13px auto 0;overflow:hidden;text-align:center}.markdown span.align-center span img{margin:0 auto;text-align:center}.markdown span.align-right{display:block;overflow:hidden;clear:both}.markdown span.align-right>span{display:block;margin:13px 0 0;overflow:hidden;text-align:right}.markdown span.align-right span img{margin:0;text-align:right}.markdown span.float-left{display:block;float:left;margin-right:13px;overflow:hidden}.markdown span.float-left span{margin:13px 0 0}.markdown span.float-right{display:block;float:right;margin-left:13px;overflow:hidden}.markdown span.float-right>span{display:block;margin:13px auto 0;overflow:hidden;text-align:right}.markdown code,.markdown tt{padding:0;padding-top:.2em;padding-bottom:.2em;margin:0;font-size:85%;background-color:rgba(0,0,0,.04);border-radius:3px}.markdown code:after,.markdown code:before,.markdown tt:after,.markdown tt:before{letter-spacing:-.2em;content:"\00a0"}.markdown code br,.markdown tt br{display:none}.markdown del code{text-decoration:inherit}.markdown pre>code{padding:0;margin:0;font-size:100%;word-break:normal;white-space:pre;background:0 0;border:0}.markdown .highlight{margin-bottom:16px}.markdown .highlight pre,.markdown pre{padding:16px;overflow:auto;font-size:85%;line-height:1.45;background-color:#f7f7f7;border-radius:3px}.markdown .highlight pre{margin-bottom:0;word-break:normal}.markdown pre{word-wrap:normal}.markdown pre code,.markdown pre tt{display:inline;max-width:initial;padding:0;margin:0;overflow:initial;line-height:inherit;word-wrap:normal;background-color:transparent;border:0}.markdown pre code:after,.markdown pre code:before,.markdown pre tt:after,.markdown pre tt:before{content:normal}.markdown kbd{display:inline-block;padding:3px 5px;font-size:11px;line-height:10px;color:#555;vertical-align:middle;background-color:#fcfcfc;border:solid 1px #ccc;border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.markdown .csv-data td,.markdown .csv-data th{padding:5px;overflow:hidden;font-size:12px;line-height:1;text-align:left;white-space:nowrap}.markdown .csv-data .blob-num{padding:10px 8px 9px;text-align:right;background:#fff;border:0}.markdown .csv-data tr{border-top:0}.markdown .csv-data th{font-weight:700;background:#f8f8f8;border-top:0}.pln{color:#333}@media screen{.str{color:#d14}.kwd{color:#333}.com{color:#998;font-style:italic}.typ{color:#458}.lit{color:#458}.pun{color:#333}.opn{color:#333}.clo{color:#333}.tag{color:navy}.atn{color:teal}.atv{color:#d14}.dec{color:#333}.var{color:teal}.fun{color:#900}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:700}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:700}.lit{color:#044}.clo,.opn,.pun{color:#440}.tag{color:#006;font-weight:700}.atn{color:#404}.atv{color:#060}}ol.linenums{margin-top:0;margin-bottom:0}.home{padding-bottom:120px}.home .logo{max-width:250px}.home .hero h1,.home .hero h2{font-family:'PT Sans Narrow',sans-serif}.home .hero h1{font-size:7em}.home .hero h2{font-size:4em}.home .hero .octicon{color:#d9453d;font-size:60px;margin-right:10px}.home .hero.header{font-size:24px}.home p.large{font-size:20px}.home .stackable{padding-top:30px}.home a{color:#d9453d}.install{padding-top:45px;padding-bottom:120px}.install form label{text-align:right;width:40%!important}.install form input{width:35%!important}.install form .field{text-align:left}.install form .field .help{margin-left:41%}.install form .field.optional .title{margin-left:38%}.install .ui .checkbox{margin-left:40%!important}.install .ui .checkbox label{width:auto!important}.form .help{color:#999;padding-top:.6em;padding-bottom:.6em;display:inline-block}.ui.attached.header{background:#f0f0f0}.ui.attached.header .right{margin-top:-5px}.repository.new.fork form{margin:auto;width:800px!important}.repository.new.fork form .ui.message{text-align:center}.repository.new.fork form .header{padding-left:280px!important}.repository.new.fork form .inline.field>label{text-align:right;width:250px!important;word-wrap:break-word}.repository.new.fork form .help{margin-left:260px!important}.repository.new.fork form .dropdown .dropdown.icon{margin-top:-7px!important}.repository.new.fork form .dropdown .text{margin-right:0!important}.repository.new.fork form .dropdown .text i{margin-right:0!important}.repository.new.fork form input,.repository.new.fork form textarea{width:50%!important}.repository{padding-top:15px;padding-bottom:120px}.repository .head{height:40px;background-color:#FCFCFC}.repository .head .mega-octicon{width:30px;font-size:30px}.repository .head .fork-flag,.repository .head a{font-weight:300}.repository .head .ui.label{margin-top:5px;vertical-align:top}.repository .head .fork-flag{margin-left:38px;display:block;font-size:11px;line-height:10px;white-space:nowrap}.repository .head .num{font-weight:700}.repository .metas .menu{max-height:300px;overflow-x:auto}.repository .metas .ui.list .ui.avatar.image{border-radius:0}.repository .metas .ui.list .hide{display:none!important}.repository .metas .ui.list .label.color{padding:0 8px;margin-right:5px}.repository .metas .ui.list a{padding-top:5px;padding-right:10px}.repository .metas .ui.list a .text{color:#444}.repository .metas .ui.list a .text:hover{color:#000}.repository .filter.menu .label.color{margin-left:15px;padding:0 8px}.repository .filter.menu .octicon{float:left;margin-left:-5px;margin-right:-7px}.repository .filter.menu .menu{max-height:300px;overflow-x:auto;right:0!important;left:auto!important}.repository .filter.menu .menu .clickable .name{padding-left:15px!important}.repository .page.buttons{padding-top:15px}.repository .issue.list{list-style:none;padding-top:15px}.repository .issue.list>.item{padding-top:15px;padding-bottom:10px;border-bottom:1px dashed #AAA}.repository .issue.list>.item .title{color:#444;font-size:15px;font-weight:700;margin:0 6px}.repository .issue.list>.item .title:hover{color:#000}.repository .issue.list>.item .comment{padding-right:10px;color:#666}.repository .issue.list>.item .desc{padding-top:5px;color:#999}.repository .issue.list>.item .desc a.milestone{padding-left:5px;color:#999!important}.repository .issue.list>.item .desc a.milestone:hover{color:#000!important}.repository .issue.list>.item .desc .assignee{margin-top:-5px}.repository.new.issue .comment.form .metas{min-width:220px}.repository.new.issue .comment.form .metas .filter.menu{max-height:300px;overflow-x:auto}.repository .comment.form .ui.comments{margin-top:-12px;max-width:750px!important}.repository .comment.form .content .field:first-child{clear:none}.repository .comment.form .content .tab.segment{border:none;padding:0;padding-top:10px}.repository .comment.form .content textarea{height:200px}.repository .label.list{list-style:none;padding-top:15px}.repository .label.list .item{padding-top:10px;padding-bottom:10px;border-bottom:1px dashed #AAA}.repository .label.list .item a{font-size:15px;padding-top:5px;padding-right:10px;color:#666}.repository .label.list .item a:hover{color:#000}.repository .label.list .item a.open-issues{margin-right:30px}.repository .milestone.list{list-style:none;padding-top:15px}.repository .milestone.list>.item{padding-top:10px;padding-bottom:10px;border-bottom:1px dashed #AAA}.repository .milestone.list>.item>a{padding-top:5px;padding-right:10px;color:#000}.repository .milestone.list>.item>a:hover{color:#4078c0}.repository .milestone.list>.item .ui.progress{width:40%;padding:0;border:0;margin:0}.repository .milestone.list>.item .ui.progress .bar{height:20px}.repository .milestone.list>.item .meta{color:#999;padding-top:5px}.repository .milestone.list>.item .meta .issue-stats .octicon{padding-left:5px}.repository .milestone.list>.item .meta .overdue{color:red}.repository .milestone.list>.item .operate{margin-top:-15px}.repository .milestone.list>.item .operate>a{font-size:15px;padding-top:5px;padding-right:10px;color:#666}.repository .milestone.list>.item .operate>a:hover{color:#000}.repository .milestone.list>.item .content{padding-top:10px}.repository.new.milestone textarea{height:200px}.repository.new.milestone #deadline{width:150px}.repository.compare.pull .choose.branch .octicon{padding-right:10px}.repository .filter.dropdown .menu{margin-top:1px!important}.repository .filter.dropdown .menu .items{max-height:300px;overflow-y:auto}.repository .filter.dropdown .menu .items .item{position:relative;cursor:pointer;display:block;border:none;height:auto;border-top:none;line-height:1em;color:rgba(0,0,0,.8);padding:.71428571em 1.14285714em!important;font-size:1rem;text-transform:none;font-weight:400;box-shadow:none;-webkit-touch-callout:none}.repository .filter.dropdown .menu .items .item.active{font-weight:700}.repository .filter.dropdown .menu .items .item:hover{background:rgba(0,0,0,.05);color:rgba(0,0,0,.8);z-index:13}.settings .key.list .item:not(:first-child){border-top:1px solid #eaeaea}.settings .key.list .ssh-key-state-indicator{float:left;color:gray;padding-left:10px;padding-top:10px}.settings .key.list .ssh-key-state-indicator.active{color:#6cc644}.settings .key.list .meta{padding-top:5px}.settings .key.list .print{color:#767676}.settings .key.list .activity{color:#666}.ui.vertical.menu .header.item{font-size:1.1em;background:#f0f0f0}.edit-label.modal .form .column,.new-label.segment .form .column{padding-right:0}.edit-label.modal .form .buttons,.new-label.segment .form .buttons{margin-left:auto;padding-top:15px}.edit-label.modal .form .color.picker.column,.new-label.segment .form .color.picker.column{width:auto}.edit-label.modal .form .color.picker.column .color-picker,.new-label.segment .form .color.picker.column .color-picker{height:35px;width:auto;padding-left:30px}.edit-label.modal .form .minicolors-swatch.minicolors-sprite,.new-label.segment .form .minicolors-swatch.minicolors-sprite{top:10px;left:10px;width:15px;height:15px}.edit-label.modal .form .precolors,.new-label.segment .form .precolors{padding-left:0;padding-right:0;margin:3px 10px auto 10px;width:120px}.edit-label.modal .form .precolors .color,.new-label.segment .form .precolors .color{float:left;width:15px;height:15px}
\ No newline at end of file diff --git a/public/js/gogs.js b/public/js/gogs.js index dbe791d8..cd804796 100644 --- a/public/js/gogs.js +++ b/public/js/gogs.js @@ -2,6 +2,107 @@ var csrf; +function initCommentForm() { + if ($('.comment.form').length == 0) { + return + } + + var $form = $('.comment.form'); + $form.find('.tabular.menu .item').tab(); + $form.find('.tabular.menu .item[data-tab="preview"]').click(function () { + var $this = $(this); + $.post($this.data('url'), { + "_csrf": csrf, + "mode": "gfm", + "context": $this.data('context'), + "text": $form.find('.tab.segment[data-tab="write"] textarea').val() + }, + function (data) { + $form.find('.tab.segment[data-tab="preview"]').html(data); + } + ); + }); + + // Labels + var $list = $('.ui.labels.list'); + var $no_select = $list.find('.no-select'); + $('.select-label .menu .item:not(.no-select)').click(function () { + if ($(this).hasClass('checked')) { + $(this).removeClass('checked') + $(this).find('.octicon').removeClass('octicon-check') + } else { + $(this).addClass('checked') + $(this).find('.octicon').addClass('octicon-check') + } + + var label_ids = ""; + $(this).parent().find('.item').each(function () { + if ($(this).hasClass('checked')) { + label_ids += $(this).data('id') + ","; + $($(this).data('id-selector')).removeClass('hide'); + } else { + $($(this).data('id-selector')).addClass('hide'); + } + }); + if (label_ids.length == 0) { + $no_select.removeClass('hide'); + } else { + $no_select.addClass('hide'); + } + $($(this).parent().data('id')).val(label_ids); + return false; + }); + $('.select-label .menu .no-select.item').click(function () { + $(this).parent().find('.item').each(function () { + $(this).removeClass('checked'); + $(this).find('.octicon').removeClass('octicon-check'); + }); + + $list.find('.item').each(function () { + $(this).addClass('hide'); + }); + $no_select.removeClass('hide'); + $($(this).parent().data('id')).val(''); + }); + + function selectItem(select_id, input_id) { + var $menu = $(select_id + ' .menu'); + var $list = $('.ui' + select_id + '.list') + $menu.find('.item:not(.no-select)').click(function () { + $(this).parent().find('.item').each(function () { + $(this).removeClass('selected active') + }); + + $(this).addClass('selected active'); + switch (input_id) { + case '#milestone_id': + $list.find('.selected').html('<a class="item" href=' + $(this).data('href') + '>' + + $(this).text() + '</a>'); + break; + case '#assignee_id': + $list.find('.selected').html('<a class="item" href=' + $(this).data('href') + '>' + + '<img class="ui avatar image" src=' + $(this).data('avatar') + '>' + + $(this).text() + '</a>'); + } + $('.ui' + select_id + '.list .no-select').addClass('hide'); + $(input_id).val($(this).data('id')); + }); + $menu.find('.no-select.item').click(function () { + $(this).parent().find('.item:not(.no-select)').each(function () { + $(this).removeClass('selected active') + }); + + $list.find('.selected').html(''); + $list.find('.no-select').removeClass('hide'); + $(input_id).val(''); + }); + } + + // Milestone and assignee + selectItem('.select-milestone', '#milestone_id'); + selectItem('.select-assignee', '#assignee_id'); +} + function initInstall() { if ($('.install').length == 0) { return; @@ -101,6 +202,18 @@ function initRepository() { $('#add-deploy-key-panel').show(); }); } + + // Pull request + if ($('.repository.compare.pull').length > 0) { + var $branch_dropdown = $('.choose.branch .dropdown') + $branch_dropdown.dropdown({ + fullTextSearch: true, + onChange: function (text, value, $choice) { + window.location.href = $choice.data('url'); + }, + message: {noResults: $branch_dropdown.data('no-results')} + }); + } }; $(document).ready(function () { @@ -131,6 +244,7 @@ $(document).ready(function () { } }); + // Helpers. $('.delete-button').click(function () { var $this = $(this); @@ -148,6 +262,7 @@ $(document).ready(function () { return false; }); + initCommentForm(); initInstall(); initRepository(); });
\ No newline at end of file diff --git a/public/less/_base.less b/public/less/_base.less index 97220ba3..388160a5 100644 --- a/public/less/_base.less +++ b/public/less/_base.less @@ -71,6 +71,9 @@ img { &.red { color: #d95c5c!important; } + &.right { + text-align: right; + } } .message { diff --git a/public/less/_form.less b/public/less/_form.less index e219637d..8d02ae5a 100644 --- a/public/less/_form.less +++ b/public/less/_form.less @@ -21,7 +21,7 @@ } @input-padding: 250px !important; .header { - padding-left: @input-padding+20px; + padding-left: @input-padding+30px; } .inline.field > label { text-align: right; diff --git a/public/less/_markdown.less b/public/less/_markdown.less new file mode 100644 index 00000000..d51c1afc --- /dev/null +++ b/public/less/_markdown.less @@ -0,0 +1,594 @@ +.markdown { + overflow:hidden; + font-family:"Helvetica Neue", Helvetica, "Segoe UI", Arial, freesans, sans-serif; + font-size:16px; + line-height:1.6; + word-wrap:break-word; + + >*:first-child { + margin-top:0 !important; + } + + >*:last-child { + margin-bottom:0 !important; + } + + a:not([href]) { + color:inherit; + text-decoration:none; + } + + .absent { + color:#c00; + } + + .anchor { + position:absolute; + top:0; + left:0; + display:block; + padding-right:6px; + padding-left:30px; + margin-left:-30px; + } + + .anchor:focus { + outline:none; + } + + h1, + h2, + h3, + h4, + h5, + h6 { + position:relative; + margin-top:1em; + margin-bottom:16px; + font-weight:bold; + line-height:1.4; + } + + h1 .octicon-link, + h2 .octicon-link, + h3 .octicon-link, + h4 .octicon-link, + h5 .octicon-link, + h6 .octicon-link { + display:none; + color:#000; + vertical-align:middle; + } + + h1:hover .anchor, + h2:hover .anchor, + h3:hover .anchor, + h4:hover .anchor, + h5:hover .anchor, + h6:hover .anchor { + padding-left:8px; + margin-left:-30px; + text-decoration:none; + } + + h1:hover .anchor .octicon-link, + h2:hover .anchor .octicon-link, + h3:hover .anchor .octicon-link, + h4:hover .anchor .octicon-link, + h5:hover .anchor .octicon-link, + h6:hover .anchor .octicon-link { + display:inline-block; + } + + h1 tt, + h1 code, + h2 tt, + h2 code, + h3 tt, + h3 code, + h4 tt, + h4 code, + h5 tt, + h5 code, + h6 tt, + h6 code { + font-size:inherit; + } + + h1 { + padding-bottom:0.3em; + font-size:2.25em; + line-height:1.2; + border-bottom:1px solid #eee; + } + + h1 .anchor { + line-height:1; + } + + h2 { + padding-bottom:0.3em; + font-size:1.75em; + line-height:1.225; + border-bottom:1px solid #eee; + } + + h2 .anchor { + line-height:1; + } + + h3 { + font-size:1.5em; + line-height:1.43; + } + + h3 .anchor { + line-height:1.2; + } + + h4 { + font-size:1.25em; + } + + h4 .anchor { + line-height:1.2; + } + + h5 { + font-size:1em; + } + + h5 .anchor { + line-height:1.1; + } + + h6 { + font-size:1em;color:#777; + } + + h6 .anchor { + line-height:1.1; + } + + p, + blockquote, + ul, + ol, + dl, + table, + pre { + margin-top:0; + margin-bottom:16px; + } + + hr { + height:4px; + padding:0; + margin:16px 0; + background-color:#e7e7e7; + border:0 none; + } + + ul, + ol { + padding-left:2em; + } + + ul.no-list, + ol.no-list { + padding:0; + list-style-type:none; + } + + ul ul, + ul ol, + ol ol, + ol ul { + margin-top:0; + margin-bottom:0; + } + + ol ol, + ul ol { + list-style-type: lower-roman; + } + + li>p { + margin-top:16px; + } + + dl { + padding:0; + } + + dl dt { + padding:0; + margin-top:16px; + font-size:1em; + font-style:italic; + font-weight:bold; + } + + dl dd { + padding:0 16px; + margin-bottom:16px; + } + + blockquote { + padding:0 15px; + color:#777; + border-left:4px solid #ddd; + } + + blockquote>:first-child { + margin-top:0; + } + + blockquote>:last-child { + margin-bottom:0; + } + + table { + display:block; + width:100%; + overflow:auto; + word-break:normal; + word-break:keep-all; + } + + table th { + font-weight:bold; + } + + table th, + table td { + padding:6px 13px !important; + border:1px solid #ddd; + } + + table tr { + background-color:#fff; + border-top:1px solid #ccc; + } + + table tr:nth-child(2n) { + background-color:#f8f8f8; + } + + img { + max-width:100%; + box-sizing:border-box; + } + + .emoji { + max-width:none; + } + + span.frame { + display:block; + overflow:hidden; + } + + span.frame>span { + display:block; + float:left; + width:auto; + padding:7px; + margin:13px 0 0; + overflow:hidden; + border:1px solid #ddd; + } + + span.frame span img { + display:block; + float:left; + } + + span.frame span span { + display:block; + padding:5px 0 0; + clear:both; + color:#333; + } + + span.align-center { + display:block; + overflow:hidden; + clear:both; + } + + span.align-center>span { + display:block; + margin:13px auto 0; + overflow:hidden; + text-align:center; + } + + span.align-center span img { + margin:0 auto; + text-align:center; + } + + span.align-right { + display:block; + overflow:hidden; + clear:both; + } + + span.align-right>span { + display:block; + margin:13px 0 0; + overflow:hidden; + text-align:right; + } + + span.align-right span img { + margin:0; + text-align:right; + } + + span.float-left { + display:block; + float:left; + margin-right:13px; + overflow:hidden; + } + + span.float-left span { + margin:13px 0 0; + } + + span.float-right { + display:block; + float:right; + margin-left:13px; + overflow:hidden; + } + + span.float-right>span { + display:block; + margin:13px auto 0; + overflow:hidden; + text-align:right; + } + + code, + tt { + padding:0; + padding-top:0.2em; + padding-bottom:0.2em; + margin:0; + font-size:85%; + background-color:rgba(0,0,0,0.04); + border-radius:3px; + } + + code:before, + code:after, + tt:before, + tt:after { + letter-spacing:-0.2em; + content:"\00a0"; + } + + code br, + tt br { + display:none; + } + + del code { + text-decoration:inherit; + } + + pre>code { + padding:0; + margin:0; + font-size:100%; + word-break:normal; + white-space:pre; + background:transparent; + border:0; + } + + .highlight { + margin-bottom:16px; + } + + .highlight pre, + pre { + padding:16px; + overflow:auto; + font-size:85%; + line-height:1.45; + background-color:#f7f7f7; + border-radius:3px; + } + + .highlight pre { + margin-bottom:0; + word-break:normal; + } + + pre { + word-wrap:normal; + } + + pre code, + pre tt { + display:inline; + max-width:initial; + padding:0; + margin:0; + overflow:initial; + line-height:inherit; + word-wrap:normal; + background-color:transparent; + border:0; + } + + pre code:before, + pre code:after, + pre tt:before, + pre tt:after { + content:normal; + } + + kbd { + display:inline-block; + padding:3px 5px; + font-size:11px; + line-height:10px; + color:#555; + vertical-align:middle; + background-color:#fcfcfc; + border:solid 1px #ccc; + border-bottom-color:#bbb; + border-radius:3px; + box-shadow:inset 0 -1px 0 #bbb; + } + + .csv-data td, + .csv-data th { + padding:5px; + overflow:hidden; + font-size:12px; + line-height:1; + text-align:left; + white-space:nowrap; + } + + .csv-data .blob-num { + padding:10px 8px 9px; + text-align:right; + background:#fff;border:0; + } + + .csv-data tr { + border-top:0; + } + + .csv-data th { + font-weight:bold; + background:#f8f8f8;border-top:0; + } + +} + +/* Author: jmblog */ + +/* Project: https://github.com/jmblog/color-themes-for-google-code-prettify */ + +/* GitHub Theme */ + +/* Pretty printing styles. Used with prettify.js. */ + +/* SPAN elements with the classes below are added by prettyprint. */ + +/* plain text */ + +.pln { + color: #333333; +} +@media screen { + /* string content */ + .str { + color: #dd1144; + } + /* a keyword */ + .kwd { + color: #333333; + } + /* a comment */ + .com { + color: #999988; + font-style: italic; + } + /* a type name */ + .typ { + color: #445588; + } + /* a literal value */ + .lit { + color: #445588; + } + /* punctuation */ + .pun { + color: #333333; + } + /* lisp open bracket */ + .opn { + color: #333333; + } + /* lisp close bracket */ + .clo { + color: #333333; + } + /* a markup tag name */ + .tag { + color: navy; + } + /* a markup attribute name */ + .atn { + color: teal; + } + /* a markup attribute value */ + .atv { + color: #dd1144; + } + /* a declaration */ + .dec { + color: #333333; + } + /* a variable name */ + .var { + color: teal; + } + /* a function name */ + .fun { + color: #990000; + } +} +/* Use higher contrast and text-weight for printable form. */ + +@media print, +projection { + .str { + color: #006600; + } + .kwd { + color: #006; + font-weight: bold; + } + .com { + color: #600; + font-style: italic; + } + .typ { + color: #404; + font-weight: bold; + } + .lit { + color: #004444; + } + .pun, + .opn, + .clo { + color: #444400; + } + .tag { + color: #006; + font-weight: bold; + } + .atn { + color: #440044; + } + .atv { + color: #006600; + } +} +/* Specify class=linenums on a pre to get line numbering */ + +ol.linenums { + margin-top: 0; + margin-bottom: 0; +}
\ No newline at end of file diff --git a/public/less/_repository.less b/public/less/_repository.less index 003192f8..96ae92a6 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -29,6 +29,34 @@ font-weight: bold; } } + .metas { + .menu { + max-height: 300px; + overflow-x: auto; + } + .ui.list { + .ui.avatar.image { + border-radius: 0; + } + .hide { + display: none!important; + } + .label.color { + padding: 0 8px; + margin-right: 5px; + } + a { + padding-top: 5px; + padding-right: 10px; + .text { + color: #444; + &:hover { + color: #000; + } + } + } + } + } .filter.menu { .label.color { margin-left: 15px; @@ -53,6 +81,7 @@ .page.buttons { padding-top: 15px; } + .issue.list { list-style: none; padding-top: 15px; @@ -83,6 +112,39 @@ color: #000!important; } } + .assignee { + margin-top: -5px; + } + } + } + } + &.new.issue { + .comment.form { + .metas { + min-width: 220px; + .filter.menu { + max-height: 300px; + overflow-x: auto; + } + } + } + } + .comment.form { + .ui.comments { + margin-top: -12px; + max-width: 750px!important; + } + .content { + .field:first-child { + clear: none; + } + .tab.segment { + border: none; + padding: 0; + padding-top: 10px; + } + textarea { + height: 200px; } } } @@ -168,6 +230,46 @@ width: 150px; } } + + &.compare.pull { + .choose.branch { + .octicon { + padding-right: 10px; + } + } + } + + .filter.dropdown .menu { + margin-top: 1px!important; + .items { + max-height: 300px; + overflow-y: auto; + .item { + position: relative; + cursor: pointer; + display: block; + border: none; + height: auto; + border-top: none; + line-height: 1em; + color: rgba(0,0,0,.8); + padding: .71428571em 1.14285714em!important; + font-size: 1rem; + text-transform: none; + font-weight: 400; + box-shadow: none; + -webkit-touch-callout: none; + &.active { + font-weight: 700; + } + &:hover { + background: rgba(0,0,0,.05); + color: rgba(0,0,0,.8); + z-index: 13; + } + } + } + } } .settings .key.list { diff --git a/public/less/gogs.less b/public/less/gogs.less index 28ad7c63..54fc4094 100644 --- a/public/less/gogs.less +++ b/public/less/gogs.less @@ -1,5 +1,6 @@ @import "_octicons"; @import "_base"; +@import "_markdown"; @import "_home"; @import "_install"; @import "_form"; diff --git a/routers/admin/users.go b/routers/admin/users.go index 12c52236..2af3cdbc 100644 --- a/routers/admin/users.go +++ b/routers/admin/users.go @@ -139,9 +139,9 @@ func EditUser(ctx *middleware.Context) { return } - u, err := models.GetUserById(uid) + u, err := models.GetUserByID(uid) if err != nil { - ctx.Handle(500, "GetUserById", err) + ctx.Handle(500, "GetUserByID", err) return } @@ -166,7 +166,7 @@ func EditUserPost(ctx *middleware.Context, form auth.AdminEditUserForm) { return } - u, err := models.GetUserById(uid) + u, err := models.GetUserByID(uid) if err != nil { ctx.Handle(500, "GetUserById", err) return @@ -219,9 +219,9 @@ func DeleteUser(ctx *middleware.Context) { return } - u, err := models.GetUserById(uid) + u, err := models.GetUserByID(uid) if err != nil { - ctx.Handle(500, "GetUserById", err) + ctx.Handle(500, "GetUserByID", err) return } diff --git a/routers/api/v1/repo.go b/routers/api/v1/repo.go index fdf05c05..c6dabfcb 100644 --- a/routers/api/v1/repo.go +++ b/routers/api/v1/repo.go @@ -28,7 +28,7 @@ func ToApiRepository(owner *models.User, repo *models.Repository, permission api log.Error(4, "CloneLink: %v", err) } return &api.Repository{ - Id: repo.Id, + Id: repo.ID, Owner: *ToApiUser(owner), FullName: owner.Name + "/" + repo.Name, Private: repo.IsPrivate, @@ -55,7 +55,7 @@ func SearchRepos(ctx *middleware.Context) { if ctx.User.Id == opt.Uid { opt.Private = true } else { - u, err := models.GetUserById(opt.Uid) + u, err := models.GetUserByID(opt.Uid) if err != nil { ctx.JSON(500, map[string]interface{}{ "ok": false, @@ -89,7 +89,7 @@ func SearchRepos(ctx *middleware.Context) { return } results[i] = &api.Repository{ - Id: repos[i].Id, + Id: repos[i].ID, FullName: path.Join(repos[i].Owner.Name, repos[i].Name), } } @@ -111,7 +111,7 @@ func createRepo(ctx *middleware.Context, owner *models.User, opt api.CreateRepoO } else { log.Error(4, "CreateRepository: %v", err) if repo != nil { - if err = models.DeleteRepository(ctx.User.Id, repo.Id, ctx.User.Name); err != nil { + if err = models.DeleteRepository(ctx.User.Id, repo.ID, ctx.User.Name); err != nil { log.Error(4, "DeleteRepository: %v", err) } } @@ -172,7 +172,7 @@ func MigrateRepo(ctx *middleware.Context, form auth.MigrateRepoForm) { ctxUser := u // Not equal means current user is an organization. if form.Uid != u.Id { - org, err := models.GetUserById(form.Uid) + org, err := models.GetUserByID(form.Uid) if err != nil { if models.IsErrUserNotExist(err) { ctx.HandleAPI(422, err) @@ -219,7 +219,7 @@ func MigrateRepo(ctx *middleware.Context, form auth.MigrateRepoForm) { repo, err := models.MigrateRepository(ctxUser, form.RepoName, form.Description, form.Private, form.Mirror, remoteAddr) if err != nil { if repo != nil { - if errDelete := models.DeleteRepository(ctxUser.Id, repo.Id, ctxUser.Name); errDelete != nil { + if errDelete := models.DeleteRepository(ctxUser.Id, repo.ID, ctxUser.Name); errDelete != nil { log.Error(4, "DeleteRepository: %v", errDelete) } } diff --git a/routers/api/v1/repo_hooks.go b/routers/api/v1/repo_hooks.go index afe18a00..0348c683 100644 --- a/routers/api/v1/repo_hooks.go +++ b/routers/api/v1/repo_hooks.go @@ -17,7 +17,7 @@ import ( // GET /repos/:username/:reponame/hooks // https://developer.github.com/v3/repos/hooks/#list-hooks func ListRepoHooks(ctx *middleware.Context) { - hooks, err := models.GetWebhooksByRepoId(ctx.Repo.Repository.Id) + hooks, err := models.GetWebhooksByRepoId(ctx.Repo.Repository.ID) if err != nil { ctx.JSON(500, &base.ApiJsonErr{"GetWebhooksByRepoId: " + err.Error(), base.DOC_URL}) return @@ -67,7 +67,7 @@ func CreateRepoHook(ctx *middleware.Context, form api.CreateHookOption) { } w := &models.Webhook{ - RepoId: ctx.Repo.Repository.Id, + RepoId: ctx.Repo.Repository.ID, Url: form.Config["url"], ContentType: models.ToHookContentType(form.Config["content_type"]), Secret: form.Config["secret"], diff --git a/routers/home.go b/routers/home.go index dd604ec7..14a123f1 100644 --- a/routers/home.go +++ b/routers/home.go @@ -57,7 +57,7 @@ func Explore(ctx *middleware.Context) { } for _, repo := range repos { if err = repo.GetOwner(); err != nil { - ctx.Handle(500, "GetOwner", fmt.Errorf("%d: %v", repo.Id, err)) + ctx.Handle(500, "GetOwner", fmt.Errorf("%d: %v", repo.ID, err)) return } } diff --git a/routers/repo/http.go b/routers/repo/http.go index 45b0ec59..54ea91ca 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -122,7 +122,7 @@ func Http(ctx *middleware.Context) { } return } - authUser, err = models.GetUserById(token.Uid) + authUser, err = models.GetUserByID(token.Uid) if err != nil { ctx.Handle(500, "GetUserById", err) return @@ -191,7 +191,7 @@ func Http(ctx *middleware.Context) { // FIXME: handle error. if err = models.Update(refName, oldCommitId, newCommitId, authUsername, username, reponame, authUser.Id); err == nil { - models.HookQueue.AddRepoID(repo.Id) + models.HookQueue.AddRepoID(repo.ID) } } diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 9d59d19a..9181d5bd 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -27,9 +27,9 @@ import ( ) const ( - ISSUES base.TplName = "repo/issue/list" - ISSUE_CREATE base.TplName = "repo/issue/create" - ISSUE_VIEW base.TplName = "repo/issue/view" + ISSUES base.TplName = "repo/issue/list" + ISSUE_NEW base.TplName = "repo/issue/new" + ISSUE_VIEW base.TplName = "repo/issue/view" LABELS base.TplName = "repo/issue/labels" @@ -44,7 +44,7 @@ var ( ) func RetrieveLabels(ctx *middleware.Context) { - labels, err := models.GetLabels(ctx.Repo.Repository.Id) + labels, err := models.GetLabelsByRepoID(ctx.Repo.Repository.ID) if err != nil { ctx.Handle(500, "RetrieveLabels.GetLabels: %v", err) return @@ -95,7 +95,7 @@ func Issues(ctx *middleware.Context) { selectLabels := ctx.Query("labels") milestoneID := ctx.QueryInt64("milestone") isShowClosed := ctx.Query("state") == "closed" - issueStats := models.GetIssueStats(repo.Id, uid, com.StrTo(selectLabels).MustInt64(), milestoneID, isShowClosed, filterMode) + issueStats := models.GetIssueStats(repo.ID, uid, com.StrTo(selectLabels).MustInt64(), milestoneID, isShowClosed, filterMode) page := ctx.QueryInt("page") if page <= 1 { @@ -111,17 +111,17 @@ func Issues(ctx *middleware.Context) { ctx.Data["Page"] = paginater.New(total, setting.IssuePagingNum, page, 5) // Get issues. - issues, err := models.Issues(uid, assigneeID, repo.Id, posterID, milestoneID, + issues, err := models.Issues(uid, assigneeID, repo.ID, posterID, milestoneID, page, isShowClosed, filterMode == models.FM_MENTION, selectLabels, ctx.Query("sortType")) if err != nil { - ctx.Handle(500, "GetIssues: %v", err) + ctx.Handle(500, "Issues: %v", err) return } - // Get issue-user pairs. - pairs, err := models.GetIssueUserPairs(repo.Id, posterID, isShowClosed) + // Get issue-user relations. + pairs, err := models.GetIssueUsers(repo.ID, posterID, isShowClosed) if err != nil { - ctx.Handle(500, "GetIssueUserPairs: %v", err) + ctx.Handle(500, "GetIssueUsers: %v", err) return } @@ -153,7 +153,7 @@ func Issues(ctx *middleware.Context) { ctx.Data["Issues"] = issues // Get milestones. - miles, err := models.GetAllRepoMilestones(repo.Id) + miles, err := models.GetAllRepoMilestones(repo.ID) if err != nil { ctx.Handle(500, "GetAllRepoMilestones: %v", err) return @@ -174,167 +174,194 @@ func Issues(ctx *middleware.Context) { ctx.HTML(200, ISSUES) } -func CreateIssue(ctx *middleware.Context) { - ctx.Data["Title"] = "Create issue" - ctx.Data["IsRepoToolbarIssues"] = true - ctx.Data["IsRepoToolbarIssuesList"] = false - ctx.Data["AttachmentsEnabled"] = setting.AttachmentEnabled +func NewIssue(ctx *middleware.Context) { + ctx.Data["Title"] = ctx.Tr("repo.issues.new") + ctx.Data["PageIsIssueList"] = true + ctx.Data["IsAttachmentEnabled"] = setting.AttachmentEnabled + ctx.Data["AttachmentAllowedTypes"] = setting.AttachmentAllowedTypes + + if ctx.User.IsAdmin { + var ( + repo = ctx.Repo.Repository + err error + ) + ctx.Data["Labels"], err = models.GetLabelsByRepoID(repo.ID) + if err != nil { + ctx.Handle(500, "GetLabelsByRepoID: %v", err) + return + } - var ( - repo = ctx.Repo.Repository - err error - ) - // Get all milestones. - ctx.Data["OpenMilestones"], err = models.GetMilestones(repo.Id, -1, false) - if err != nil { - ctx.Handle(500, "GetMilestones.1: %v", err) - return - } - ctx.Data["ClosedMilestones"], err = models.GetMilestones(repo.Id, -1, true) - if err != nil { - ctx.Handle(500, "GetMilestones.2: %v", err) - return - } + ctx.Data["OpenMilestones"], err = models.GetMilestones(repo.ID, -1, false) + if err != nil { + ctx.Handle(500, "GetMilestones: %v", err) + return + } + ctx.Data["ClosedMilestones"], err = models.GetMilestones(repo.ID, -1, true) + if err != nil { + ctx.Handle(500, "GetMilestones: %v", err) + return + } - us, err := repo.GetCollaborators() - if err != nil { - ctx.Handle(500, "GetCollaborators", err) - return + ctx.Data["Assignees"], err = repo.GetAssignees() + if err != nil { + ctx.Handle(500, "GetAssignees: %v", err) + return + } } - ctx.Data["AllowedTypes"] = setting.AttachmentAllowedTypes - ctx.Data["Collaborators"] = us - - ctx.HTML(200, ISSUE_CREATE) + ctx.HTML(200, ISSUE_NEW) } -func CreateIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) { - send := func(status int, data interface{}, err error) { - if err != nil { - log.Error(4, "issue.CreateIssuePost(?): %s", err) +func NewIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) { + ctx.Data["Title"] = ctx.Tr("repo.issues.new") + ctx.Data["PageIsIssueList"] = true + ctx.Data["IsAttachmentEnabled"] = setting.AttachmentEnabled + ctx.Data["AttachmentAllowedTypes"] = setting.AttachmentAllowedTypes - ctx.JSON(status, map[string]interface{}{ - "ok": false, - "status": status, - "error": err.Error(), - }) - } else { - ctx.JSON(status, map[string]interface{}{ - "ok": true, - "status": status, - "data": data, - }) + var ( + repo = ctx.Repo.Repository + labelIDs []int64 + milestoneID int64 + assigneeID int64 + ) + if ctx.User.IsAdmin { + // Check labels. + labelIDs = base.StringsToInt64s(strings.Split(form.LabelIDs, ",")) + labelIDMark := base.Int64sToMap(labelIDs) + labels, err := models.GetLabelsByRepoID(repo.ID) + if err != nil { + ctx.Handle(500, "GetLabelsByRepoID: %v", err) + return } - } + hasSelected := false + for i := range labels { + if labelIDMark[labels[i].ID] { + labels[i].IsChecked = true + hasSelected = true + } + } + ctx.Data["HasSelectedLabel"] = hasSelected + ctx.Data["label_ids"] = form.LabelIDs + ctx.Data["Labels"] = labels - var err error - // Get all milestones. - _, err = models.GetMilestones(ctx.Repo.Repository.Id, -1, false) - if err != nil { - send(500, nil, err) - return - } - _, err = models.GetMilestones(ctx.Repo.Repository.Id, -1, true) - if err != nil { - send(500, nil, err) - return - } + // Check milestone. + milestoneID = form.MilestoneID + ctx.Data["OpenMilestones"], err = models.GetMilestones(repo.ID, -1, false) + if err != nil { + ctx.Handle(500, "GetMilestones: %v", err) + return + } + ctx.Data["ClosedMilestones"], err = models.GetMilestones(repo.ID, -1, true) + if err != nil { + ctx.Handle(500, "GetMilestones: %v", err) + return + } + ctx.Data["Milestone"], err = repo.GetMilestoneByID(milestoneID) + if err != nil { + ctx.Handle(500, "GetMilestoneByID: %v", err) + return + } + ctx.Data["milestone_id"] = milestoneID - _, err = ctx.Repo.Repository.GetCollaborators() - if err != nil { - send(500, nil, err) - return + // Check assignee. + assigneeID = form.AssigneeID + ctx.Data["Assignees"], err = repo.GetAssignees() + if err != nil { + ctx.Handle(500, "GetAssignees: %v", err) + return + } + ctx.Data["Assignee"], err = repo.GetAssigneeByID(assigneeID) + if err != nil { + ctx.Handle(500, "GetAssigneeByID: %v", err) + return + } + ctx.Data["assignee_id"] = assigneeID } if ctx.HasError() { - send(400, nil, errors.New(ctx.Flash.ErrorMsg)) + ctx.HTML(200, ISSUE_NEW) return } - // Only collaborators can assign. - if !ctx.Repo.IsOwner() { - form.AssigneeId = 0 - } issue := &models.Issue{ - RepoID: ctx.Repo.Repository.Id, - Index: int64(ctx.Repo.Repository.NumIssues) + 1, - Name: form.IssueName, + RepoID: ctx.Repo.Repository.ID, + Index: int64(repo.NumIssues) + 1, + Name: form.Title, PosterID: ctx.User.Id, - MilestoneID: form.MilestoneId, - AssigneeID: form.AssigneeId, - LabelIds: form.Labels, + MilestoneID: milestoneID, + AssigneeID: assigneeID, Content: form.Content, } - if err := models.NewIssue(issue); err != nil { - send(500, nil, err) - return - } else if err := models.NewIssueUserPairs(ctx.Repo.Repository, issue.ID, ctx.Repo.Owner.Id, - ctx.User.Id, form.AssigneeId); err != nil { - send(500, nil, err) + if err := models.NewIssue(repo, issue, labelIDs); err != nil { + ctx.Handle(500, "NewIssue", err) return } - if setting.AttachmentEnabled { - uploadFiles(ctx, issue.ID, 0) - } - - // Update mentions. - ms := base.MentionPattern.FindAllString(issue.Content, -1) - if len(ms) > 0 { - for i := range ms { - ms[i] = ms[i][1:] - } - - if err := models.UpdateMentions(ms, issue.ID); err != nil { - send(500, nil, err) - return - } - } - - act := &models.Action{ - ActUserID: ctx.User.Id, - ActUserName: ctx.User.Name, - ActEmail: ctx.User.Email, - OpType: models.CREATE_ISSUE, - Content: fmt.Sprintf("%d|%s", issue.Index, issue.Name), - RepoID: ctx.Repo.Repository.Id, - RepoUserName: ctx.Repo.Owner.Name, - RepoName: ctx.Repo.Repository.Name, - RefName: ctx.Repo.BranchName, - IsPrivate: ctx.Repo.Repository.IsPrivate, - } - // Notify watchers. - if err := models.NotifyWatchers(act); err != nil { - send(500, nil, err) - return - } - - // Mail watchers and mentions. - if setting.Service.EnableNotifyMail { - tos, err := mailer.SendIssueNotifyMail(ctx.User, ctx.Repo.Owner, ctx.Repo.Repository, issue) - if err != nil { - send(500, nil, err) - return - } - - tos = append(tos, ctx.User.LowerName) - newTos := make([]string, 0, len(ms)) - for _, m := range ms { - if com.IsSliceContainsStr(tos, m) { - continue - } - - newTos = append(newTos, m) - } - if err = mailer.SendIssueMentionMail(ctx.Render, ctx.User, ctx.Repo.Owner, - ctx.Repo.Repository, issue, models.GetUserEmailsByNames(newTos)); err != nil { - send(500, nil, err) - return - } - } - log.Trace("%d Issue created: %d", ctx.Repo.Repository.Id, issue.ID) + ctx.Redirect(ctx.Repo.RepoLink + "/issues/" + com.ToStr(issue.Index)) +} - send(200, fmt.Sprintf("%s/%s/%s/issues/%d", setting.AppSubUrl, ctx.Params(":username"), ctx.Params(":reponame"), issue.Index), nil) +func CreateIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) { + // if setting.AttachmentEnabled { + // uploadFiles(ctx, issue.ID, 0) + // } + + // // Update mentions. + // ms := base.MentionPattern.FindAllString(issue.Content, -1) + // if len(ms) > 0 { + // for i := range ms { + // ms[i] = ms[i][1:] + // } + + // if err := models.UpdateMentions(ms, issue.ID); err != nil { + // send(500, nil, err) + // return + // } + // } + + // act := &models.Action{ + // ActUserID: ctx.User.Id, + // ActUserName: ctx.User.Name, + // ActEmail: ctx.User.Email, + // OpType: models.CREATE_ISSUE, + // Content: fmt.Sprintf("%d|%s", issue.Index, issue.Name), + // RepoID: ctx.Repo.Repository.ID, + // RepoUserName: ctx.Repo.Owner.Name, + // RepoName: ctx.Repo.Repository.Name, + // RefName: ctx.Repo.BranchName, + // IsPrivate: ctx.Repo.Repository.IsPrivate, + // } + // // Notify watchers. + // if err := models.NotifyWatchers(act); err != nil { + // send(500, nil, err) + // return + // } + + // // Mail watchers and mentions. + // if setting.Service.EnableNotifyMail { + // tos, err := mailer.SendIssueNotifyMail(ctx.User, ctx.Repo.Owner, ctx.Repo.Repository, issue) + // if err != nil { + // send(500, nil, err) + // return + // } + + // tos = append(tos, ctx.User.LowerName) + // newTos := make([]string, 0, len(ms)) + // for _, m := range ms { + // if com.IsSliceContainsStr(tos, m) { + // continue + // } + + // newTos = append(newTos, m) + // } + // if err = mailer.SendIssueMentionMail(ctx.Render, ctx.User, ctx.Repo.Owner, + // ctx.Repo.Repository, issue, models.GetUserEmailsByNames(newTos)); err != nil { + // send(500, nil, err) + // return + // } + // } + // log.Trace("%d Issue created: %d", ctx.Repo.Repository.ID, issue.ID) + + // send(200, fmt.Sprintf("%s/%s/%s/issues/%d", setting.AppSubUrl, ctx.Params(":username"), ctx.Params(":reponame"), issue.Index), nil) } func checkLabels(labels, allLabels []*models.Label) { @@ -357,7 +384,7 @@ func ViewIssue(ctx *middleware.Context) { return } - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, idx) + issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, idx) if err != nil { if err == models.ErrIssueNotExist { ctx.Handle(404, "GetIssueByIndex", err) @@ -372,7 +399,7 @@ func ViewIssue(ctx *middleware.Context) { ctx.Handle(500, "GetLabels", err) return } - labels, err := models.GetLabels(ctx.Repo.Repository.Id) + labels, err := models.GetLabelsByRepoID(ctx.Repo.Repository.ID) if err != nil { ctx.Handle(500, "GetLabels.2", err) return @@ -394,12 +421,12 @@ func ViewIssue(ctx *middleware.Context) { } // Get all milestones. - ctx.Data["OpenMilestones"], err = models.GetMilestones(ctx.Repo.Repository.Id, -1, false) + ctx.Data["OpenMilestones"], err = models.GetMilestones(ctx.Repo.Repository.ID, -1, false) if err != nil { ctx.Handle(500, "GetMilestones.1: %v", err) return } - ctx.Data["ClosedMilestones"], err = models.GetMilestones(ctx.Repo.Repository.Id, -1, true) + ctx.Data["ClosedMilestones"], err = models.GetMilestones(ctx.Repo.Repository.ID, -1, true) if err != nil { ctx.Handle(500, "GetMilestones.2: %v", err) return @@ -439,7 +466,7 @@ func ViewIssue(ctx *middleware.Context) { // Get posters. for i := range comments { - u, err := models.GetUserById(comments[i].PosterId) + u, err := models.GetUserByID(comments[i].PosterId) if err != nil { ctx.Handle(500, "GetUserById.2: %v", err) return @@ -469,7 +496,7 @@ func UpdateIssue(ctx *middleware.Context, form auth.CreateIssueForm) { return } - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, idx) + issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, idx) if err != nil { if err == models.ErrIssueNotExist { ctx.Handle(404, "issue.UpdateIssue", err) @@ -484,7 +511,7 @@ func UpdateIssue(ctx *middleware.Context, form auth.CreateIssueForm) { return } - issue.Name = form.IssueName + issue.Name = form.Title //issue.MilestoneId = form.MilestoneId //issue.AssigneeId = form.AssigneeId //issue.LabelIds = form.Labels @@ -517,7 +544,7 @@ func UpdateIssueLabel(ctx *middleware.Context) { return } - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, idx) + issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, idx) if err != nil { if err == models.ErrIssueNotExist { ctx.Handle(404, "issue.UpdateIssueLabel(GetIssueByIndex)", err) @@ -529,10 +556,10 @@ func UpdateIssueLabel(ctx *middleware.Context) { isAttach := ctx.Query("action") == "attach" labelStrId := ctx.Query("id") - labelId := com.StrTo(labelStrId).MustInt64() - label, err := models.GetLabelById(labelId) + labelID := com.StrTo(labelStrId).MustInt64() + label, err := models.GetLabelByID(labelID) if err != nil { - if err == models.ErrLabelNotExist { + if models.IsErrLabelNotExist(err) { ctx.Handle(404, "issue.UpdateIssueLabel(GetLabelById)", err) } else { ctx.Handle(500, "issue.UpdateIssueLabel(GetLabelById)", err) @@ -540,16 +567,21 @@ func UpdateIssueLabel(ctx *middleware.Context) { return } - isHad := strings.Contains(issue.LabelIds, "$"+labelStrId+"|") isNeedUpdate := false if isAttach { - if !isHad { - issue.LabelIds += "$" + labelStrId + "|" + if !issue.HasLabel(labelID) { + if err = issue.AddLabel(labelID); err != nil { + ctx.Handle(500, "AddLabel", err) + return + } isNeedUpdate = true } } else { - if isHad { - issue.LabelIds = strings.Replace(issue.LabelIds, "$"+labelStrId+"|", "", -1) + if issue.HasLabel(labelID) { + if err = issue.RemoveLabel(labelID); err != nil { + ctx.Handle(500, "RemoveLabel", err) + return + } isNeedUpdate = true } } @@ -615,7 +647,7 @@ func UpdateIssueMilestone(ctx *middleware.Context) { // Not check for invalid milestone id and give responsibility to owners. issue.MilestoneID = mid - if err = models.ChangeMilestoneAssign(oldMid, mid, issue); err != nil { + if err = models.ChangeMilestoneAssign(oldMid, issue); err != nil { ctx.Handle(500, "issue.UpdateIssueMilestone(ChangeMilestoneAssign)", err) return } else if err = models.UpdateIssue(issue); err != nil { @@ -653,7 +685,7 @@ func UpdateAssignee(ctx *middleware.Context) { aid := com.StrTo(ctx.Query("assigneeid")).MustInt64() // Not check for invalid assignee id and give responsibility to owners. issue.AssigneeID = aid - if err = models.UpdateIssueUserPairByAssignee(aid, issue.ID); err != nil { + if err = models.UpdateIssueUserByAssignee(issue.ID, aid); err != nil { ctx.Handle(500, "UpdateIssueUserPairByAssignee: %v", err) return } else if err = models.UpdateIssue(issue); err != nil { @@ -762,7 +794,7 @@ func Comment(ctx *middleware.Context) { return } - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, index) + issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, index) if err != nil { if err == models.ErrIssueNotExist { send(404, nil, err) @@ -820,7 +852,7 @@ func Comment(ctx *middleware.Context) { cmtType = models.COMMENT_TYPE_REOPEN } - if _, err = models.CreateComment(ctx.User.Id, ctx.Repo.Repository.Id, issue.ID, 0, 0, cmtType, "", nil); err != nil { + if _, err = models.CreateComment(ctx.User.Id, ctx.Repo.Repository.ID, issue.ID, 0, 0, cmtType, "", nil); err != nil { send(200, nil, err) return } @@ -836,7 +868,7 @@ func Comment(ctx *middleware.Context) { if len(content) > 0 || len(ctx.Req.MultipartForm.File["attachments"]) > 0 { switch ctx.Params(":action") { case "new": - if comment, err = models.CreateComment(ctx.User.Id, ctx.Repo.Repository.Id, issue.ID, 0, 0, models.COMMENT_TYPE_COMMENT, content, nil); err != nil { + if comment, err = models.CreateComment(ctx.User.Id, ctx.Repo.Repository.ID, issue.ID, 0, 0, models.COMMENT_TYPE_COMMENT, content, nil); err != nil { send(500, nil, err) return } @@ -872,7 +904,7 @@ func Comment(ctx *middleware.Context) { ActEmail: ctx.User.Email, OpType: models.COMMENT_ISSUE, Content: fmt.Sprintf("%d|%s", issue.Index, strings.Split(content, "\n")[0]), - RepoID: ctx.Repo.Repository.Id, + RepoID: ctx.Repo.Repository.ID, RepoUserName: ctx.Repo.Owner.LowerName, RepoName: ctx.Repo.Repository.LowerName, IsPrivate: ctx.Repo.Repository.IsPrivate, @@ -927,7 +959,7 @@ func NewLabel(ctx *middleware.Context, form auth.CreateLabelForm) { } l := &models.Label{ - RepoId: ctx.Repo.Repository.Id, + RepoID: ctx.Repo.Repository.ID, Name: form.Title, Color: form.Color, } @@ -939,10 +971,10 @@ func NewLabel(ctx *middleware.Context, form auth.CreateLabelForm) { } func UpdateLabel(ctx *middleware.Context, form auth.CreateLabelForm) { - l, err := models.GetLabelById(form.ID) + l, err := models.GetLabelByID(form.ID) if err != nil { - switch err { - case models.ErrLabelNotExist: + switch { + case models.IsErrLabelNotExist(err): ctx.Error(404) default: ctx.Handle(500, "UpdateLabel", err) @@ -960,7 +992,7 @@ func UpdateLabel(ctx *middleware.Context, form auth.CreateLabelForm) { } func DeleteLabel(ctx *middleware.Context) { - if err := models.DeleteLabel(ctx.Repo.Repository.Id, ctx.QueryInt64("id")); err != nil { + if err := models.DeleteLabel(ctx.Repo.Repository.ID, ctx.QueryInt64("id")); err != nil { ctx.Flash.Error("DeleteLabel: " + err.Error()) } else { ctx.Flash.Success(ctx.Tr("repo.issues.label_deletion_success")) @@ -977,7 +1009,7 @@ func Milestones(ctx *middleware.Context) { ctx.Data["PageIsMilestones"] = true isShowClosed := ctx.Query("state") == "closed" - openCount, closedCount := models.MilestoneStats(ctx.Repo.Repository.Id) + openCount, closedCount := models.MilestoneStats(ctx.Repo.Repository.ID) ctx.Data["OpenCount"] = openCount ctx.Data["ClosedCount"] = closedCount @@ -994,7 +1026,7 @@ func Milestones(ctx *middleware.Context) { } ctx.Data["Page"] = paginater.New(total, setting.IssuePagingNum, page, 5) - miles, err := models.GetMilestones(ctx.Repo.Repository.Id, page, isShowClosed) + miles, err := models.GetMilestones(ctx.Repo.Repository.ID, page, isShowClosed) if err != nil { ctx.Handle(500, "GetMilestones", err) return @@ -1043,7 +1075,7 @@ func NewMilestonePost(ctx *middleware.Context, form auth.CreateMilestoneForm) { } if err = models.NewMilestone(&models.Milestone{ - RepoID: ctx.Repo.Repository.Id, + RepoID: ctx.Repo.Repository.ID, Name: form.Title, Content: form.Content, Deadline: deadline, diff --git a/routers/repo/pull.go b/routers/repo/pull.go index a4ebb91a..c035cc8c 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -5,26 +5,31 @@ package repo import ( + "fmt" + "strings" + "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/base" + "github.com/gogits/gogs/modules/git" "github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/middleware" "github.com/gogits/gogs/modules/setting" ) const ( - FORK base.TplName = "repo/pulls/fork" - PULLS base.TplName = "repo/pulls" + FORK base.TplName = "repo/pulls/fork" + COMPARE_PULL base.TplName = "repo/pulls/compare" + PULLS base.TplName = "repo/pulls" ) func getForkRepository(ctx *middleware.Context) *models.Repository { - forkRepo, err := models.GetRepositoryById(ctx.ParamsInt64(":repoid")) + forkRepo, err := models.GetRepositoryByID(ctx.ParamsInt64(":repoid")) if err != nil { if models.IsErrRepoNotExist(err) { - ctx.Handle(404, "GetRepositoryById", nil) + ctx.Handle(404, "GetRepositoryByID", nil) } else { - ctx.Handle(500, "GetRepositoryById", err) + ctx.Handle(500, "GetRepositoryByID", err) } return nil } @@ -78,7 +83,7 @@ func ForkPost(ctx *middleware.Context, form auth.CreateRepoForm) { return } - repo, has := models.HasForkedRepo(ctxUser.Id, forkRepo.Id) + repo, has := models.HasForkedRepo(ctxUser.Id, forkRepo.ID) if has { ctx.Redirect(setting.AppSubUrl + "/" + ctxUser.Name + "/" + repo.Name) return @@ -110,10 +115,56 @@ func ForkPost(ctx *middleware.Context, form auth.CreateRepoForm) { return } - log.Trace("Repository forked[%d]: %s/%s", forkRepo.Id, ctxUser.Name, repo.Name) + log.Trace("Repository forked[%d]: %s/%s", forkRepo.ID, ctxUser.Name, repo.Name) ctx.Redirect(setting.AppSubUrl + "/" + ctxUser.Name + "/" + repo.Name) } +func CompareAndPullRequest(ctx *middleware.Context) { + // Get compare information. + infos := strings.Split(ctx.Params("*"), "...") + if len(infos) != 2 { + ctx.Handle(404, "CompareAndPullRequest", nil) + return + } + + baseBranch := infos[0] + ctx.Data["BaseBranch"] = baseBranch + + headInfos := strings.Split(infos[1], ":") + if len(headInfos) != 2 { + ctx.Handle(404, "CompareAndPullRequest", nil) + return + } + headUser := headInfos[0] + headBranch := headInfos[1] + ctx.Data["HeadBranch"] = headBranch + + // TODO: check if branches are valid. + fmt.Println(baseBranch, headUser, headBranch) + + // TODO: add organization support + // Check if current user has fork of repository. + headRepo, has := models.HasForkedRepo(ctx.User.Id, ctx.Repo.Repository.ID) + if !has { + ctx.Handle(404, "HasForkedRepo", nil) + return + } + + headGitRepo, err := git.OpenRepository(models.RepoPath(ctx.User.Name, headRepo.Name)) + if err != nil { + ctx.Handle(500, "OpenRepository", err) + return + } + headBranches, err := headGitRepo.GetBranches() + if err != nil { + ctx.Handle(500, "GetBranches", err) + return + } + ctx.Data["HeadBranches"] = headBranches + + ctx.HTML(200, COMPARE_PULL) +} + func Pulls(ctx *middleware.Context) { ctx.Data["IsRepoToolbarPulls"] = true ctx.HTML(200, PULLS) diff --git a/routers/repo/release.go b/routers/repo/release.go index 52d78b19..30d5f60b 100644 --- a/routers/repo/release.go +++ b/routers/repo/release.go @@ -29,7 +29,7 @@ func Releases(ctx *middleware.Context) { return } - rels, err := models.GetReleasesByRepoId(ctx.Repo.Repository.Id) + rels, err := models.GetReleasesByRepoId(ctx.Repo.Repository.ID) if err != nil { ctx.Handle(500, "GetReleasesByRepoId", err) return @@ -45,7 +45,7 @@ func Releases(ctx *middleware.Context) { continue } if rel.TagName == rawTag { - rel.Publisher, err = models.GetUserById(rel.PublisherId) + rel.Publisher, err = models.GetUserByID(rel.PublisherId) if err != nil { ctx.Handle(500, "GetUserById", err) return @@ -105,7 +105,7 @@ func Releases(ctx *middleware.Context) { continue } - rel.Publisher, err = models.GetUserById(rel.PublisherId) + rel.Publisher, err = models.GetUserByID(rel.PublisherId) if err != nil { ctx.Handle(500, "GetUserById", err) return @@ -185,7 +185,7 @@ func NewReleasePost(ctx *middleware.Context, form auth.NewReleaseForm) { } rel := &models.Release{ - RepoId: ctx.Repo.Repository.Id, + RepoId: ctx.Repo.Repository.ID, PublisherId: ctx.User.Id, Title: form.Title, TagName: form.TagName, @@ -217,7 +217,7 @@ func EditRelease(ctx *middleware.Context) { } tagName := ctx.Params(":tagname") - rel, err := models.GetRelease(ctx.Repo.Repository.Id, tagName) + rel, err := models.GetRelease(ctx.Repo.Repository.ID, tagName) if err != nil { if err == models.ErrReleaseNotExist { ctx.Handle(404, "GetRelease", err) @@ -240,7 +240,7 @@ func EditReleasePost(ctx *middleware.Context, form auth.EditReleaseForm) { } tagName := ctx.Params(":tagname") - rel, err := models.GetRelease(ctx.Repo.Repository.Id, tagName) + rel, err := models.GetRelease(ctx.Repo.Repository.ID, tagName) if err != nil { if err == models.ErrReleaseNotExist { ctx.Handle(404, "GetRelease", err) diff --git a/routers/repo/repo.go b/routers/repo/repo.go index dde8b584..533bd569 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -33,7 +33,7 @@ func checkContextUser(ctx *middleware.Context, uid int64) *models.User { return ctx.User } - org, err := models.GetUserById(uid) + org, err := models.GetUserByID(uid) if models.IsErrUserNotExist(err) { return ctx.User } @@ -112,7 +112,7 @@ func CreatePost(ctx *middleware.Context, form auth.CreateRepoForm) { } if repo != nil { - if errDelete := models.DeleteRepository(ctxUser.Id, repo.Id, ctxUser.Name); errDelete != nil { + if errDelete := models.DeleteRepository(ctxUser.Id, repo.ID, ctxUser.Name); errDelete != nil { log.Error(4, "DeleteRepository: %v", errDelete) } } @@ -209,7 +209,7 @@ func MigratePost(ctx *middleware.Context, form auth.MigrateRepoForm) { } if repo != nil { - if errDelete := models.DeleteRepository(ctxUser.Id, repo.Id, ctxUser.Name); errDelete != nil { + if errDelete := models.DeleteRepository(ctxUser.Id, repo.ID, ctxUser.Name); errDelete != nil { log.Error(4, "DeleteRepository: %v", errDelete) } } @@ -239,13 +239,13 @@ func Action(ctx *middleware.Context) { var err error switch ctx.Params(":action") { case "watch": - err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.Id, true) + err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.ID, true) case "unwatch": - err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.Id, false) + err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.ID, false) case "star": - err = models.StarRepo(ctx.User.Id, ctx.Repo.Repository.Id, true) + err = models.StarRepo(ctx.User.Id, ctx.Repo.Repository.ID, true) case "unstar": - err = models.StarRepo(ctx.User.Id, ctx.Repo.Repository.Id, false) + err = models.StarRepo(ctx.User.Id, ctx.Repo.Repository.ID, false) case "desc": if !ctx.Repo.IsOwner() { ctx.Error(404) diff --git a/routers/repo/setting.go b/routers/repo/setting.go index 1d5e0702..551ba115 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -160,7 +160,7 @@ func SettingsPost(ctx *middleware.Context, form auth.RepoSettingForm) { return } - if err := models.DeleteRepository(ctx.Repo.Owner.Id, ctx.Repo.Repository.Id, ctx.Repo.Owner.Name); err != nil { + if err := models.DeleteRepository(ctx.Repo.Owner.Id, ctx.Repo.Repository.ID, ctx.Repo.Owner.Name); err != nil { ctx.Handle(500, "DeleteRepository", err) return } @@ -262,7 +262,7 @@ func Webhooks(ctx *middleware.Context) { return } - ws, err := models.GetWebhooksByRepoId(ctx.Repo.Repository.Id) + ws, err := models.GetWebhooksByRepoId(ctx.Repo.Repository.ID) if err != nil { ctx.Handle(500, "GetWebhooksByRepoId", err) return @@ -569,7 +569,7 @@ func getOrgRepoCtx(ctx *middleware.Context) (*OrgRepoCtx, error) { if _, ok := ctx.Data["RepoLink"]; ok { return &OrgRepoCtx{ OrgId: int64(0), - RepoId: ctx.Repo.Repository.Id, + RepoId: ctx.Repo.Repository.ID, Link: ctx.Repo.RepoLink, NewTemplate: HOOK_NEW, }, nil @@ -605,7 +605,7 @@ func TriggerHook(ctx *middleware.Context) { } return } - models.HookQueue.AddRepoID(repo.Id) + models.HookQueue.AddRepoID(repo.ID) } func GitHooks(ctx *middleware.Context) { @@ -663,7 +663,7 @@ func SettingsDeployKeys(ctx *middleware.Context) { ctx.Data["Title"] = ctx.Tr("repo.settings") ctx.Data["PageIsSettingsKeys"] = true - keys, err := models.ListDeployKeys(ctx.Repo.Repository.Id) + keys, err := models.ListDeployKeys(ctx.Repo.Repository.ID) if err != nil { ctx.Handle(500, "ListDeployKeys", err) return @@ -695,7 +695,7 @@ func SettingsDeployKeysPost(ctx *middleware.Context, form auth.AddSSHKeyForm) { } } - if err = models.AddDeployKey(ctx.Repo.Repository.Id, form.Title, content); err != nil { + if err = models.AddDeployKey(ctx.Repo.Repository.ID, form.Title, content); err != nil { ctx.Data["HasError"] = true switch { case models.IsErrKeyAlreadyExist(err): @@ -710,7 +710,7 @@ func SettingsDeployKeysPost(ctx *middleware.Context, form auth.AddSSHKeyForm) { return } - log.Trace("Deploy key added: %d", ctx.Repo.Repository.Id) + log.Trace("Deploy key added: %d", ctx.Repo.Repository.ID) ctx.Flash.Success(ctx.Tr("repo.settings.add_key_success", form.Title)) ctx.Redirect(ctx.Repo.RepoLink + "/settings/keys") } diff --git a/routers/user/home.go b/routers/user/home.go index c38dba52..1c9e82c6 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -104,7 +104,7 @@ func Dashboard(ctx *middleware.Context) { for _, act := range actions { if act.IsPrivate { // This prevents having to retrieve the repository for each action - repo := &models.Repository{Id: act.RepoID, IsPrivate: true} + repo := &models.Repository{ID: act.RepoID, IsPrivate: true} if act.RepoUserName != ctx.User.LowerName { if has, _ := models.HasAccess(ctx.User, repo, models.ACCESS_MODE_READ); !has { continue @@ -212,7 +212,7 @@ func Profile(ctx *middleware.Context) { continue } // This prevents having to retrieve the repository for each action - repo := &models.Repository{Id: act.RepoID, IsPrivate: true} + repo := &models.Repository{ID: act.RepoID, IsPrivate: true} if act.RepoUserName != ctx.User.LowerName { if has, _ := models.HasAccess(ctx.User, repo, models.ACCESS_MODE_READ); !has { continue @@ -295,21 +295,21 @@ func Issues(ctx *middleware.Context) { continue } - repoIds = append(repoIds, repo.Id) + repoIds = append(repoIds, repo.ID) repo.NumOpenIssues = repo.NumIssues - repo.NumClosedIssues issueStats.AllCount += int64(repo.NumOpenIssues) if isShowClosed { if repo.NumClosedIssues > 0 { if filterMode == models.FM_CREATE { - repo.NumClosedIssues = int(models.GetIssueCountByPoster(ctx.User.Id, repo.Id, isShowClosed)) + repo.NumClosedIssues = int(models.GetIssueCountByPoster(ctx.User.Id, repo.ID, isShowClosed)) } showRepos = append(showRepos, repo) } } else { if repo.NumOpenIssues > 0 { if filterMode == models.FM_CREATE { - repo.NumOpenIssues = int(models.GetIssueCountByPoster(ctx.User.Id, repo.Id, isShowClosed)) + repo.NumOpenIssues = int(models.GetIssueCountByPoster(ctx.User.Id, repo.ID, isShowClosed)) } showRepos = append(showRepos, repo) } @@ -339,18 +339,18 @@ func Issues(ctx *middleware.Context) { issues := make([]*models.Issue, len(ius)) for i := range ius { - issues[i], err = models.GetIssueById(ius[i].IssueId) + issues[i], err = models.GetIssueById(ius[i].IssueID) if err != nil { if err == models.ErrIssueNotExist { - log.Warn("user.Issues(GetIssueById #%d): issue not exist", ius[i].IssueId) + log.Warn("user.Issues(GetIssueById #%d): issue not exist", ius[i].IssueID) continue } else { - ctx.Handle(500, fmt.Sprintf("user.Issues(GetIssueById #%d)", ius[i].IssueId), err) + ctx.Handle(500, fmt.Sprintf("user.Issues(GetIssueById #%d)", ius[i].IssueID), err) return } } - issues[i].Repo, err = models.GetRepositoryById(issues[i].RepoID) + issues[i].Repo, err = models.GetRepositoryByID(issues[i].RepoID) if err != nil { if models.IsErrRepoNotExist(err) { log.Warn("GetRepositoryById[%d]: repository not exist", issues[i].RepoID) diff --git a/templates/.VERSION b/templates/.VERSION index b039250b..50ad739b 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.6.4.0809 Beta
\ No newline at end of file +0.6.4.0810 Beta
\ No newline at end of file diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index 981e2ef7..5747ccec 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -17,7 +17,7 @@ <table class="table table-striped"> <thead> <tr> - <th>Id</th> + <th>ID</th> <th>{{.i18n.Tr "admin.repos.owner"}}</th> <th>{{.i18n.Tr "admin.repos.name"}}</th> <th>{{.i18n.Tr "admin.repos.private"}}</th> @@ -30,7 +30,7 @@ <tbody> {{range .Repos}} <tr> - <td>{{.Id}}</td> + <td>{{.ID}}</td> <td><a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a></td> <td><a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">{{.Name}}</a></td> <td><i class="fa fa{{if .IsPrivate}}-check{{end}}-square-o"></i></td> diff --git a/templates/base/head_old.tmpl b/templates/base/head_old.tmpl index fc2a8678..9a4665de 100644 --- a/templates/base/head_old.tmpl +++ b/templates/base/head_old.tmpl @@ -28,8 +28,6 @@ {{end}} <link href="{{AppSubUrl}}/css/todc-bootstrap.min.css" rel="stylesheet" /> - <link href="{{AppSubUrl}}/css/datepicker3.css" rel="stylesheet" /> - <link href="{{AppSubUrl}}/css/bootstrap-colorpicker.min.css" rel="stylesheet" /> <link href="{{AppSubUrl}}/css/markdown.css" rel="stylesheet" /> <link href="{{AppSubUrl}}/css/gogs.css" rel="stylesheet" /> diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 4566c385..66e88a05 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -6,7 +6,7 @@ <div class="divider"> / </div> <a href="{{$.RepoLink}}">{{.Name}}</a> {{if .IsMirror}}<div class="ui label">{{$.i18n.Tr "mirror"}}</div>{{end}} - {{if .IsFork}}<div class="fork-flag">{{$.i18n.Tr "repo.forked_from"}} <a href="{{.ForkRepo.RepoLink}}">{{SubStr .ForkRepo.RepoLink 1 -1}}</a></div>{{end}} + {{if .IsFork}}<div class="fork-flag">{{$.i18n.Tr "repo.forked_from"}} <a href="{{.BaseRepo.RepoLink}}">{{SubStr .BaseRepo.RepoLink 1 -1}}</a></div>{{end}} </div> <div class="ui right"> <a class="ui black basic button" href="{{$.RepoLink}}/action/{{if $.IsWatchingRepo}}un{{end}}watch?redirect_to={{$.Link}}"> @@ -17,7 +17,7 @@ <i class="fa fa-star{{if not $.IsStaringRepo}}-o{{end}}"></i> {{if $.IsStaringRepo}}{{$.i18n.Tr "repo.unstar"}}{{else}}{{$.i18n.Tr "repo.star"}}{{end}} <span class="num">{{.NumStars}}</span> </a> - <a class="ui black basic button {{if $.IsRepositoryOwner}}poping up{{end}}" {{if not $.IsRepositoryOwner}}href="{{AppSubUrl}}/repo/fork/{{.Id}}"{{end}} {{if $.IsRepositoryOwner}}data-content="{{$.i18n.Tr "repo.fork_from_self"}}" data-position="top right"{{end}}> + <a class="ui black basic button {{if $.IsRepositoryOwner}}poping up{{end}}" {{if not $.IsRepositoryOwner}}href="{{AppSubUrl}}/repo/fork/{{.ID}}"{{end}} {{if $.IsRepositoryOwner}}data-content="{{$.i18n.Tr "repo.fork_from_self"}}" data-position="top right"{{end}}> <i class="octicon octicon-repo-forked"></i> {{$.i18n.Tr "repo.fork"}} <span class="num">{{.NumForks}}</span> </a> diff --git a/templates/repo/header_old.tmpl b/templates/repo/header_old.tmpl index 420cd125..ecf9ed3a 100644 --- a/templates/repo/header_old.tmpl +++ b/templates/repo/header_old.tmpl @@ -7,7 +7,7 @@ <span class="divider">/</span> <a class="repo text-bold" href="{{$.RepoLink}}">{{.Name}}</a> {{if .IsMirror}}<span class="label label-gray">{{$.i18n.Tr "mirror"}}</span>{{end}} - {{if .IsFork}}<span class="fork-flag">forked from <a href="{{.ForkRepo.RepoLink}}">{{SubStr .ForkRepo.RepoLink 1 -1}}</a></span>{{end}} + {{if .IsFork}}<span class="fork-flag">forked from <a href="{{.BaseRepo.RepoLink}}">{{SubStr .BaseRepo.RepoLink 1 -1}}</a></span>{{end}} </h1> <ul id="repo-header-meta" class="right menu menu-line"> <li id="repo-header-download" class="drop"> @@ -49,7 +49,7 @@ </a> </li> <li id="repo-header-fork"> - <a id="repo-header-fork-btn" {{if or (not $.IsRepositoryAdmin) $.Owner.IsOrganization}}href="{{AppSubUrl}}/repo/fork/{{.Id}}"{{end}}> + <a id="repo-header-fork-btn" {{if or (not $.IsRepositoryAdmin) $.Owner.IsOrganization}}href="{{AppSubUrl}}/repo/fork/{{.ID}}"{{end}}> <button class="btn btn-gray text-bold btn-radius"> <i class="octicon octicon-repo-forked"></i>{{$.i18n.Tr "repo.fork"}} <span class="num">{{.NumForks}}</span> diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 831a3962..72d30fd7 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -9,11 +9,14 @@ <a class="link" href="{{.Repository.Website}}">{{.Repository.Website}}</a> </p> <ul id="repo-file-nav" class="clear menu menu-line"> + {{if and .IsRepositoryAdmin .Repository.BaseRepo}} + {{ $baseRepo := .Repository.BaseRepo}} <!-- <li> - <a href="#"> + <a href="{{AppSubUrl}}/{{$baseRepo.Owner.Name}}/{{$baseRepo.Name}}/compare/{{$.BaseDefaultBranch}}...{{$.Owner.Name}}:{{$.BranchName}}"> <button class="btn btn-green btn-small btn-radius" id="repo-compare-btn"><i class="octicon octicon-git-compare"></i></button> </a> </li> --> + {{end}} <li id="repo-branch-switch" class="down drop"> <a> <button class="btn btn-gray btn-medium btn-radius"> diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index fa3f660f..640112e4 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -87,11 +87,14 @@ <p class="desc"> {{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.Name|Str2html}} {{if .Milestone}} - {{with .Milestone}} - <a class="milestone" href="{{$.RepoLink}}/issues?type={{$.ViewType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.ID}}"> - <span class="octicon octicon-milestone"></span> {{.Name}} + <a class="milestone" href="{{$.RepoLink}}/issues?type={{$.ViewType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.Milestone.ID}}"> + <span class="octicon octicon-milestone"></span> {{.Milestone.Name}} + </a> + {{end}} + {{if .Assignee}} + <a class="ui right assignee poping up" href="{{.Assignee.HomeLink}}" data-content="{{.Assignee.Name}}" data-variation="inverted" data-position="left center"> + <img class="ui avatar image" src="{{.Assignee.AvatarLink}}"> </a> - {{end}} {{end}} </p> </li> diff --git a/templates/repo/issue/new.tmpl b/templates/repo/issue/new.tmpl new file mode 100644 index 00000000..bb45c3b7 --- /dev/null +++ b/templates/repo/issue/new.tmpl @@ -0,0 +1,12 @@ +{{template "base/head" .}} +<div class="repository new issue"> + {{template "repo/header" .}} + <div class="ui container"> + <div class="navbar"> + {{template "repo/issue/navbar" .}} + </div> + <div class="ui divider"></div> + {{template "repo/issue/new_form" .}} + </div> +</div> +{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl new file mode 100644 index 00000000..2d7a3ede --- /dev/null +++ b/templates/repo/issue/new_form.tmpl @@ -0,0 +1,130 @@ +<form class="ui comment form grid" action="{{.Link}}" method="post"> + {{.CsrfTokenHtml}} + {{if .Flash}} + <div class="sixteen wide column"> + {{template "base/alert" .}} + </div> + {{end}} + <div class="twelve wide column"> + <div class="ui comments"> + <div class="comment"> + <a class="avatar" href="{{.SignedUser.HomeLink}}"> + <img src="{{.SignedUser.AvatarLink}}"> + </a> + <div class="ui segment content"> + <div class="field"> + <input name="title" placeholder="{{.i18n.Tr "repo.milestones.title"}}" value="{{.title}}" autofocus required> + </div> + <div class="field"> + <div class="ui top attached tabular menu"> + <a class="active item" data-tab="write">{{.i18n.Tr "repo.release.write"}}</a> + <a class="item" data-tab="preview" data-url="/api/v1/markdown" data-context="{{.RepoLink}}">{{.i18n.Tr "repo.release.preview"}}</a> + </div> + <div class="ui bottom attached active tab segment" data-tab="write"> + <textarea name="content"></textarea> + </div> + <div class="ui bottom attached tab segment markdown" data-tab="preview"> + {{.i18n.Tr "repo.release.loading"}} + </div> + </div> + <div class="text right"> + <button class="ui green button"> + {{.i18n.Tr "repo.issues.create"}} + </button> + </div> + </div> + </div> + </div> + </div> + + {{if .IsRepositoryAdmin}} + <div class="four wide column"> + <div class="ui segment metas"> + <input id="label_ids" name="label_ids" type="hidden" value="{{.label_ids}}"> + <div class="ui {{if not .Labels}}disabled{{end}} jump select-label dropdown"> + <span class="text"> + <strong>{{.i18n.Tr "repo.issues.new.labels"}}</strong> + <span class="octicon octicon-gear"></span> + </span> + <div class="filter menu" data-id="#label_ids"> + <div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_labels"}}</div> + {{range .Labels}} + <a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon {{if .IsChecked}}octicon-check{{end}}"></span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name}}</a> + {{end}} + </div> + </div> + <div class="ui labels list"> + <span class="no-select item {{if .HasSelectedLabel}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_label"}}</span> + {{range .Labels}} + <a class="{{if not .IsChecked}}hide{{end}} item" id="label_{{.ID}}" href="{{$.RepoLink}}/issues?labels={{.ID}}"><span class="label color" style="background-color: {{.Color}}"></span> <span class="text">{{.Name}}</span></a> + {{end}} + </div> + + <div class="ui divider"></div> + + <input id="milestone_id" name="milestone_id" type="hidden" value="{{.milestone_id}}"> + <div class="ui {{if not (or .OpenMilestones .ClosedMilestones)}}disabled{{end}} jump select-milestone dropdown"> + <span class="text"> + <strong>{{.i18n.Tr "repo.issues.new.milestone"}}</strong> + <span class="octicon octicon-gear"></span> + </span> + <div class="menu"> + <div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_milestone"}}</div> + {{if .OpenMilestones}} + <div class="divider"></div> + <div class="header"> + <i class="octicon octicon-milestone"></i> + {{.i18n.Tr "repo.issues.new.open_milestone"}} + </div> + {{range .OpenMilestones}} + <div class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}"> {{.Name}}</div> + {{end}} + {{end}} + {{if .ClosedMilestones}} + <div class="divider"></div> + <div class="header"> + <i class="octicon octicon-milestone"></i> + {{.i18n.Tr "repo.issues.new.closed_milestone"}} + </div> + {{range .ClosedMilestones}} + <a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}"> {{.Name}}</a> + {{end}} + {{end}} + </div> + </div> + <div class="ui select-milestone list"> + <span class="no-select item {{if .Milestone}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_milestone"}}</span> + <div class="selected"> + {{if .Milestone}} + <a class="item" href="{{.RepoLink}}/issues?milestone={{.Milestone.ID}}"> {{.Milestone.Name}}</a> + {{end}} + </div> + </div> + + <div class="ui divider"></div> + + <input id="assignee_id" name="assignee_id" type="hidden" value="{{.assignee_id}}"> + <div class="ui {{if not .Assignees}}disabled{{end}} jump select-assignee dropdown"> + <span class="text"> + <strong>{{.i18n.Tr "repo.issues.new.assignee"}}</strong> + <span class="octicon octicon-gear"></span> + </span> + <div class="menu"> + <div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_assignee"}}</div> + {{range .Assignees}} + <div class="item" data-id="{{.Id}}" data-href="{{.HomeLink}}" data-avatar="{{.AvatarLink}}"><img src="{{.AvatarLink}}"> {{.Name}}</div> + {{end}} + </div> + </div> + <div class="ui select-assignee list"> + <span class="no-select item {{if .Assignee}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_assignee"}}</span> + <div class="selected"> + {{if .Assignee}} + <a class="item" href="{{.Assignee.HomeLink}}"><img class="ui avatar image" src="{{.Assignee.AvatarLink}}"> {{.Assignee.Name}}</a> + {{end}} + </div> + </div> + </div> + </div> + {{end}} +</form>
\ No newline at end of file diff --git a/templates/repo/pulls/compare.tmpl b/templates/repo/pulls/compare.tmpl new file mode 100644 index 00000000..798210db --- /dev/null +++ b/templates/repo/pulls/compare.tmpl @@ -0,0 +1,52 @@ +{{template "base/head" .}} +<div class="repository compare pull"> + {{template "repo/header" .}} + <div class="ui container"> + <div class="sixteen wide column page grid"> + <h2 class="ui header"> + {{.i18n.Tr "repo.pulls.compare_changes"}} + <div class="sub header">{{.i18n.Tr "repo.pulls.compare_changes_desc"}}</div> + </h2> + <div class="ui segment choose branch"> + <span class="octicon octicon-git-compare"></span> + <div class="ui floating filter dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}"> + <div class="ui basic small button"> + <span class="text">base: {{$.BaseBranch}}</span> + <i class="dropdown icon"></i> + </div> + <div class="menu"> + <div class="ui icon search input"> + <i class="filter icon"></i> + <input name="search" placeholder="Filter branch..."> + </div> + <div class="items"> + {{range .Branches}} + <div class="{{if eq $.BaseBranch .}}active selected{{end}} item" data-url="{{$.RepoLink}}/compare/{{.}}...{{$.SignedUser.Name}}:{{$.HeadBranch}}">{{.}}</div> + {{end}} + </div> + </div> + </div> + ... + <div class="ui floating filter dropdown"> + <div class="ui basic small button"> + <span class="text">compare: {{$.HeadBranch}}</span> + <i class="dropdown icon"></i> + </div> + <div class="menu"> + <div class="ui icon search input"> + <i class="filter icon"></i> + <input name="search" placeholder="Filter branch..."> + </div> + <div class="items"> + {{range .HeadBranches}} + <div class="{{if eq $.HeadBranch .}}active selected{{end}} item" data-url="{{$.RepoLink}}/compare/{{$.BaseBranch}}...{{$.SignedUser.Name}}:{{.}}">{{.}}</div> + {{end}} + </div> + </div> + </div> + </div> + {{template "repo/issue/new_form" .}} + </div> + </div> +</div> +{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/user/issues.tmpl b/templates/user/issues.tmpl index 2eb393ff..677f9d14 100644 --- a/templates/user/issues.tmpl +++ b/templates/user/issues.tmpl @@ -12,7 +12,7 @@ <li><a href="{{AppSubUrl}}/issues?type=created_by&repoid={{.RepoId}}&state={{.State}}" class="radius{{if eq .ViewType "created_by"}} active{{end}}">Created by you <strong class="pull-right">{{.IssueStats.CreateCount}}</strong></a></li> <li><hr/></li> {{range .Repos}} - <li><a href="{{AppSubUrl}}/issues?type={{$.ViewType}}{{if eq $.RepoId .Id}}{{else}}&repoid={{.Id}}{{end}}&state={{$.State}}" class="radius{{if eq $.RepoId .Id}} active{{end}}">{{$.SignedUser.Name}}/{{.Name}} <strong class="pull-right">{{if $.IsShowClosed}}{{.NumClosedIssues}}{{else}}{{.NumOpenIssues}}{{end}}</strong></a></li> + <li><a href="{{AppSubUrl}}/issues?type={{$.ViewType}}{{if eq $.RepoId .ID}}{{else}}&repoid={{.ID}}{{end}}&state={{$.State}}" class="radius{{if eq $.RepoId .ID}} active{{end}}">{{$.SignedUser.Name}}/{{.Name}} <strong class="pull-right">{{if $.IsShowClosed}}{{.NumClosedIssues}}{{else}}{{.NumOpenIssues}}{{end}}</strong></a></li> {{end}} </ul> </div> |