diff --git a/.gopmfile b/.gopmfile
index ae92d45e3f..d3f0b3ca3c 100644
--- a/.gopmfile
+++ b/.gopmfile
@@ -1,28 +1,26 @@
[target]
-path=github.com/gogits/gogs
+path = github.com/gogits/gogs
[deps]
-github.com/codegangsta/cli=
-github.com/go-martini/martini=
-github.com/Unknwon/com=
-github.com/Unknwon/cae=
-github.com/Unknwon/goconfig=
-github.com/dchest/scrypt=
-github.com/nfnt/resize=
-github.com/lunny/xorm=
-github.com/go-sql-driver/mysql=
-github.com/lib/pq=
-github.com/gogits/logs=
-github.com/gogits/binding=
-github.com/gogits/git=
-github.com/gogits/gfm=
-github.com/gogits/cache=
-github.com/gogits/session=
-github.com/gogits/webdav=
-github.com/martini-contrib/oauth2=
-github.com/martini-contrib/sessions=
-code.google.com/p/goauth2=
+github.com/codegangsta/cli =
+github.com/go-martini/martini =
+github.com/Unknwon/com =
+github.com/Unknwon/cae =
+github.com/Unknwon/goconfig =
+github.com/dchest/scrypt =
+github.com/nfnt/resize =
+github.com/lunny/xorm =
+github.com/go-sql-driver/mysql =
+github.com/lib/pq =
+github.com/gogits/logs =
+github.com/gogits/binding =
+github.com/gogits/git =
+github.com/gogits/gfm =
+github.com/gogits/cache =
+github.com/gogits/session =
+github.com/gogits/webdav =
+code.google.com/p/goauth2 =
[res]
-include=templates|public|conf
+include = templates|public|conf
diff --git a/README.md b/README.md
index 6061f5a715..ede1894ad0 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language
-##### Current version: 0.2.0 Alpha
+##### Current version: 0.2.1 Alpha
#### Due to testing purpose, data of [try.gogits.org](http://try.gogits.org) has been reset in March 29, 2014 and will reset multiple times after. Please do NOT put your important data on the site.
@@ -31,7 +31,7 @@ More importantly, Gogs only needs one binary to setup your own project hosting o
- Activity timeline
- SSH/HTTPS(Clone only) protocol support.
- Register/delete/rename account.
-- Create/delete/watch/rename public repository.
+- Create/delete/watch/rename/transfer public repository.
- Repository viewer.
- Issue tracker.
- Gravatar and cache support.
diff --git a/README_ZH.md b/README_ZH.md
index e66f607a14..9b5e46413e 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -5,7 +5,7 @@ Gogs(Go Git Service) 是一个由 Go 语言编写的自助 Git 托管服务。
-##### 当前版本：0.2.0 Alpha
+##### 当前版本：0.2.1 Alpha
## 开发目的
@@ -25,7 +25,7 @@ Gogs 完全使用 Go 语言来实现对 Git 数据的操作，实现 **零** 依
- 活动时间线
- SSH/HTTPS（仅限 Clone） 协议支持
- 注册/删除/重命名用户
-- 创建/删除/关注/重命名公开仓库
+- 创建/删除/关注/重命名/转移公开仓库
- 仓库浏览器
- Bug 追踪系统
- Gravatar 以及缓存支持
diff --git a/gogs.go b/gogs.go
index 8d9159d6a8..13b9d377d3 100644
--- a/gogs.go
+++ b/gogs.go
@@ -19,7 +19,7 @@ import (
// Test that go1.2 tag above is included in builds. main.go refers to this definition.
const go12tag = true
-const APP_VER = "0.2.0.0404 Alpha"
+const APP_VER = "0.2.1.0405 Alpha"
func init() {
base.AppVer = APP_VER
diff --git a/models/publickey.go b/models/publickey.go
index 426e6b0be7..ed47ff209d 100644
--- a/models/publickey.go
+++ b/models/publickey.go
@@ -78,7 +78,7 @@ func init() {
type PublicKey struct {
Id int64
OwnerId int64 `xorm:"unique(s) index not null"`
- Name string `xorm:"unique(s) not null"` //UNIQUE(s)
+ Name string `xorm:"unique(s) not null"`
Fingerprint string
Content string `xorm:"TEXT not null"`
Created time.Time `xorm:"created"`
diff --git a/models/user.go b/models/user.go
index 1ec3b29520..2196eae84f 100644
--- a/models/user.go
+++ b/models/user.go
@@ -367,6 +367,21 @@ func GetUserByName(name string) (*User, error) {
return user, nil
}
+// GetUserByEmail returns the user object by given e-mail if exists.
+func GetUserByEmail(email string) (*User, error) {
+ if len(email) == 0 {
+ return nil, ErrUserNotExist
+ }
+ user := &User{Email: strings.ToLower(email)}
+ has, err := orm.Get(user)
+ if err != nil {
+ return nil, err
+ } else if !has {
+ return nil, ErrUserNotExist
+ }
+ return user, nil
+}
+
// LoginUserPlain validates user by raw user name and password.
func LoginUserPlain(name, passwd string) (*User, error) {
user := User{LowerName: strings.ToLower(name), Passwd: passwd}
diff --git a/modules/base/template.go b/modules/base/template.go
index dfcae93147..56b77a5d60 100644
--- a/modules/base/template.go
+++ b/modules/base/template.go
@@ -67,6 +67,10 @@ var TemplateFuncs template.FuncMap = map[string]interface{}{
"DateFormat": DateFormat,
"List": List,
"Mail2Domain": func(mail string) string {
+ if !strings.Contains(mail, "@") {
+ return "try.gogits.org"
+ }
+
suffix := strings.SplitN(mail, "@", 2)[1]
domain, ok := mailDomains[suffix]
if !ok {
diff --git a/modules/mailer/mail.go b/modules/mailer/mail.go
index b99fc8fdfc..eee6b916ca 100644
--- a/modules/mailer/mail.go
+++ b/modules/mailer/mail.go
@@ -86,7 +86,27 @@ func SendActiveMail(r *middleware.Render, user *models.User) {
}
msg := NewMailMessage([]string{user.Email}, subject, body)
- msg.Info = fmt.Sprintf("UID: %d, send email verify mail", user.Id)
+ msg.Info = fmt.Sprintf("UID: %d, send active mail", user.Id)
+
+ SendAsync(&msg)
+}
+
+// Send reset password email.
+func SendResetPasswdMail(r *middleware.Render, user *models.User) {
+ code := CreateUserActiveCode(user, nil)
+
+ subject := "Reset your password"
+
+ data := GetMailTmplData(user)
+ data["Code"] = code
+ body, err := r.HTMLString("mail/auth/reset_passwd", data)
+ if err != nil {
+ log.Error("mail.SendResetPasswdMail(fail to render): %v", err)
+ return
+ }
+
+ msg := NewMailMessage([]string{user.Email}, subject, body)
+ msg.Info = fmt.Sprintf("UID: %d, send reset password email", user.Id)
SendAsync(&msg)
}
diff --git a/modules/oauth2/oauth2.go b/modules/oauth2/oauth2.go
index 088d65ddae..6612b95a81 100644
--- a/modules/oauth2/oauth2.go
+++ b/modules/oauth2/oauth2.go
@@ -26,7 +26,10 @@ import (
"code.google.com/p/goauth2/oauth"
"github.com/go-martini/martini"
- "github.com/martini-contrib/sessions"
+
+ "github.com/gogits/session"
+
+ "github.com/gogits/gogs/modules/middleware"
)
const (
@@ -142,23 +145,23 @@ func NewOAuth2Provider(opts *Options) martini.Handler {
Transport: http.DefaultTransport,
}
- return func(s sessions.Session, c martini.Context, w http.ResponseWriter, r *http.Request) {
- if r.Method == "GET" {
- switch r.URL.Path {
+ return func(c martini.Context, ctx *middleware.Context) {
+ if ctx.Req.Method == "GET" {
+ switch ctx.Req.URL.Path {
case PathLogin:
- login(transport, s, w, r)
+ login(transport, ctx)
case PathLogout:
- logout(transport, s, w, r)
+ logout(transport, ctx)
case PathCallback:
- handleOAuth2Callback(transport, s, w, r)
+ handleOAuth2Callback(transport, ctx)
}
}
- tk := unmarshallToken(s)
+ tk := unmarshallToken(ctx.Session)
if tk != nil {
// check if the access token is expired
if tk.IsExpired() && tk.Refresh() == "" {
- s.Delete(keyToken)
+ ctx.Session.Delete(keyToken)
tk = nil
}
}
@@ -172,49 +175,49 @@ func NewOAuth2Provider(opts *Options) martini.Handler {
// Sample usage:
// m.Get("/login-required", oauth2.LoginRequired, func() ... {})
var LoginRequired martini.Handler = func() martini.Handler {
- return func(s sessions.Session, c martini.Context, w http.ResponseWriter, r *http.Request) {
- token := unmarshallToken(s)
+ return func(c martini.Context, ctx *middleware.Context) {
+ token := unmarshallToken(ctx.Session)
if token == nil || token.IsExpired() {
- next := url.QueryEscape(r.URL.RequestURI())
- http.Redirect(w, r, PathLogin+"?next="+next, codeRedirect)
+ next := url.QueryEscape(ctx.Req.URL.RequestURI())
+ ctx.Redirect(PathLogin+"?next="+next, codeRedirect)
}
}
}()
-func login(t *oauth.Transport, s sessions.Session, w http.ResponseWriter, r *http.Request) {
- next := extractPath(r.URL.Query().Get(keyNextPage))
- if s.Get(keyToken) == nil {
+func login(t *oauth.Transport, ctx *middleware.Context) {
+ next := extractPath(ctx.Req.URL.Query().Get(keyNextPage))
+ if ctx.Session.Get(keyToken) == nil {
// User is not logged in.
- http.Redirect(w, r, t.Config.AuthCodeURL(next), codeRedirect)
+ ctx.Redirect(t.Config.AuthCodeURL(next), codeRedirect)
return
}
// No need to login, redirect to the next page.
- http.Redirect(w, r, next, codeRedirect)
+ ctx.Redirect(next, codeRedirect)
}
-func logout(t *oauth.Transport, s sessions.Session, w http.ResponseWriter, r *http.Request) {
- next := extractPath(r.URL.Query().Get(keyNextPage))
- s.Delete(keyToken)
- http.Redirect(w, r, next, codeRedirect)
+func logout(t *oauth.Transport, ctx *middleware.Context) {
+ next := extractPath(ctx.Req.URL.Query().Get(keyNextPage))
+ ctx.Session.Delete(keyToken)
+ ctx.Redirect(next, codeRedirect)
}
-func handleOAuth2Callback(t *oauth.Transport, s sessions.Session, w http.ResponseWriter, r *http.Request) {
- next := extractPath(r.URL.Query().Get("state"))
- code := r.URL.Query().Get("code")
+func handleOAuth2Callback(t *oauth.Transport, ctx *middleware.Context) {
+ next := extractPath(ctx.Req.URL.Query().Get("state"))
+ code := ctx.Req.URL.Query().Get("code")
tk, err := t.Exchange(code)
if err != nil {
// Pass the error message, or allow dev to provide its own
// error handler.
- http.Redirect(w, r, PathError, codeRedirect)
+ ctx.Redirect(PathError, codeRedirect)
return
}
// Store the credentials in the session.
val, _ := json.Marshal(tk)
- s.Set(keyToken, val)
- http.Redirect(w, r, next, codeRedirect)
+ ctx.Session.Set(keyToken, val)
+ ctx.Redirect(next, codeRedirect)
}
-func unmarshallToken(s sessions.Session) (t *token) {
+func unmarshallToken(s session.SessionStore) (t *token) {
if s.Get(keyToken) == nil {
return
}
diff --git a/public/css/gogs.css b/public/css/gogs.css
index a6d6b4cce7..da2a7fd1a2 100755
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -1304,4 +1304,74 @@ html, body {
#release .release-item .info .avatar {
vertical-align: middle;
+}
+
+#release-new-form {
+ margin-top: 24px;
+}
+
+#release-new-form .target-at {
+ margin: 0 1em;
+}
+
+#release-new-form .target-text {
+ color: #888;
+}
+
+#release-new-target-branch-list {
+ padding-top: 0;
+ padding-bottom: 0;
+ min-width: 200px;
+}
+
+#release-new-target-branch-list ul {
+ margin-bottom: 0;
+}
+
+#release-new-target-branch-list li {
+ padding: 8px 20px;
+}
+
+#release-new-target-branch-list li a {
+ margin-left: 0;
+ background-color: transparent;
+ padding: 0;
+}
+
+#release-new-target-branch-list li a:hover {
+ background-image: none;
+}
+
+#release-new-target-branch-list li:hover {
+ background-color: #0093c4;
+}
+
+#release-new-target-branch-list li:hover a {
+ color: #FFF;
+}
+
+#release-new-title {
+ width: 50%;
+}
+
+#release-new-content-div {
+ margin-top: 16px;
+ padding-left: 0;
+}
+
+#release-new-content-div .md-help {
+ margin-top: 6px;
+}
+
+#release-textarea .form-group {
+ display: block;
+}
+
+#release-new-content {
+ width: 100%;
+ margin: 16px 0;
+}
+
+#release-preview{
+ margin: 6px 0;
}
\ No newline at end of file
diff --git a/public/js/app.js b/public/js/app.js
index 0ba0675f20..059663e1a2 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -354,6 +354,7 @@ function initRegister() {
}
function initUserSetting() {
+ // ssh confirmation
$('#ssh-keys .delete').confirmation({
singleton: true,
onConfirm: function (e, $this) {
@@ -366,6 +367,18 @@ function initUserSetting() {
});
}
});
+
+ // profile form
+ (function () {
+ $('#user-setting-username').on("keyup", function () {
+ var $this = $(this);
+ if ($this.val() != $this.attr('title')) {
+ $this.next('.help-block').toggleShow();
+ } else {
+ $this.next('.help-block').toggleHide();
+ }
+ });
+ }())
}
function initRepository() {
@@ -383,7 +396,7 @@ function initRepository() {
$clone.find('span.clone-url').text($this.data('link'));
}
}).eq(0).trigger("click");
- $("#repo-clone").on("shown.bs.dropdown",function () {
+ $("#repo-clone").on("shown.bs.dropdown", function () {
Gogits.bindCopy("[data-init=copy]");
});
Gogits.bindCopy("[data-init=copy]:visible");
@@ -438,6 +451,18 @@ function initRepository() {
$item.find(".bar .add").css("width", addPercent + "%");
});
}());
+
+ // repo setting form
+ (function () {
+ $('#repo-setting-name').on("keyup", function () {
+ var $this = $(this);
+ if ($this.val() != $this.attr('title')) {
+ $this.next('.help-block').toggleShow();
+ } else {
+ $this.next('.help-block').toggleHide();
+ }
+ });
+ }())
}
function initInstall() {
@@ -520,6 +545,23 @@ function initIssue() {
}
+function initRelease() {
+// release new ajax preview
+ (function () {
+ $('[data-ajax-name=release-preview]').on("click", function () {
+ var $this = $(this);
+ $this.toggleAjax(function (json) {
+ if (json.ok) {
+ $($this.data("preview")).html(json.content);
+ }
+ })
+ });
+ $('.release-write a[data-toggle]').on("click", function () {
+ $('.release-preview-content').html("loading...");
+ });
+ }())
+}
+
(function ($) {
$(function () {
initCore();
@@ -539,5 +581,8 @@ function initIssue() {
if ($('#issue').length) {
initIssue();
}
+ if ($('#release').length) {
+ initRelease();
+ }
});
})(jQuery);
diff --git a/routers/install.go b/routers/install.go
index 032af48020..48c1b5e134 100644
--- a/routers/install.go
+++ b/routers/install.go
@@ -183,6 +183,7 @@ func Install(ctx *middleware.Context, form auth.InstallForm) {
if _, err := models.RegisterUser(&models.User{Name: form.AdminName, Email: form.AdminEmail, Passwd: form.AdminPasswd,
IsAdmin: true, IsActive: true}); err != nil {
if err != models.ErrUserAlreadyExist {
+ base.InstallLock = false
ctx.RenderWithErr("Admin account setting is invalid: "+err.Error(), "install", &form)
return
}
diff --git a/routers/repo/release.go b/routers/repo/release.go
index 8e8b93c9ea..279fc169f8 100644
--- a/routers/repo/release.go
+++ b/routers/repo/release.go
@@ -12,6 +12,7 @@ import (
func Releases(ctx *middleware.Context) {
ctx.Data["Title"] = "Releases"
ctx.Data["IsRepoToolbarReleases"] = true
+ ctx.Data["IsRepoReleaseNew"] = false
tags, err := models.GetTags(ctx.Repo.Owner.Name, ctx.Repo.Repository.Name)
if err != nil {
ctx.Handle(404, "repo.Releases(GetTags)", err)
@@ -20,3 +21,10 @@ func Releases(ctx *middleware.Context) {
ctx.Data["Releases"] = tags
ctx.HTML(200, "release/list")
}
+
+func ReleasesNew(ctx *middleware.Context) {
+ ctx.Data["Title"] = "New Release"
+ ctx.Data["IsRepoToolbarReleases"] = true
+ ctx.Data["IsRepoReleaseNew"] = true
+ ctx.HTML(200, "release/new")
+}
diff --git a/routers/user/user.go b/routers/user/user.go
index 08930e22df..872ed0d600 100644
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -403,9 +403,12 @@ func Activate(ctx *middleware.Context) {
if user := models.VerifyUserActiveCode(code); user != nil {
user.IsActive = true
user.Rands = models.GetUserSalt()
- models.UpdateUser(user)
+ if err := models.UpdateUser(user); err != nil {
+ ctx.Handle(404, "user.Activate", err)
+ return
+ }
- log.Trace("%s User activated: %s", ctx.Req.RequestURI, user.LowerName)
+ log.Trace("%s User activated: %s", ctx.Req.RequestURI, user.Name)
ctx.Session.Set("userId", user.Id)
ctx.Session.Set("userName", user.Name)
@@ -416,3 +419,80 @@ func Activate(ctx *middleware.Context) {
ctx.Data["IsActivateFailed"] = true
ctx.HTML(200, "user/active")
}
+
+func ForgotPasswd(ctx *middleware.Context) {
+ ctx.Data["Title"] = "Forgot Password"
+
+ if base.MailService == nil {
+ ctx.Data["IsResetDisable"] = true
+ ctx.HTML(200, "user/forgot_passwd")
+ return
+ }
+
+ ctx.Data["IsResetRequest"] = true
+ if ctx.Req.Method == "GET" {
+ ctx.HTML(200, "user/forgot_passwd")
+ return
+ }
+
+ email := ctx.Query("email")
+ u, err := models.GetUserByEmail(email)
+ if err != nil {
+ if err == models.ErrUserNotExist {
+ ctx.RenderWithErr("This e-mail address does not associate to any account.", "user/forgot_passwd", nil)
+ } else {
+ ctx.Handle(404, "user.ResetPasswd(check existence)", err)
+ }
+ return
+ }
+
+ mailer.SendResetPasswdMail(ctx.Render, u)
+ ctx.Data["Email"] = email
+ ctx.Data["Hours"] = base.Service.ActiveCodeLives / 60
+ ctx.Data["IsResetSent"] = true
+ ctx.HTML(200, "user/forgot_passwd")
+}
+
+func ResetPasswd(ctx *middleware.Context) {
+ code := ctx.Query("code")
+ if len(code) == 0 {
+ ctx.Error(404)
+ return
+ }
+ ctx.Data["Code"] = code
+
+ if ctx.Req.Method == "GET" {
+ ctx.Data["IsResetForm"] = true
+ ctx.HTML(200, "user/reset_passwd")
+ return
+ }
+
+ if u := models.VerifyUserActiveCode(code); u != nil {
+ // Validate password length.
+ passwd := ctx.Query("passwd")
+ if len(passwd) < 6 || len(passwd) > 30 {
+ ctx.Data["IsResetForm"] = true
+ ctx.RenderWithErr("Password length should be in 6 and 30.", "user/reset_passwd", nil)
+ return
+ }
+
+ u.Passwd = passwd
+ if err := u.EncodePasswd(); err != nil {
+ ctx.Handle(404, "user.ResetPasswd(EncodePasswd)", err)
+ return
+ }
+
+ u.Rands = models.GetUserSalt()
+ if err := models.UpdateUser(u); err != nil {
+ ctx.Handle(404, "user.ResetPasswd(UpdateUser)", err)
+ return
+ }
+
+ log.Trace("%s User password reset: %s", ctx.Req.RequestURI, u.Name)
+ ctx.Redirect("/user/login")
+ return
+ }
+
+ ctx.Data["IsResetFailed"] = true
+ ctx.HTML(200, "user/reset_passwd")
+}
diff --git a/templates/mail/auth/reset_passwd.tmpl b/templates/mail/auth/reset_passwd.tmpl
new file mode 100644
index 0000000000..11861f4e20
--- /dev/null
+++ b/templates/mail/auth/reset_passwd.tmpl
@@ -0,0 +1,33 @@
+
+
+
+
+{{.User.Name}}, please reset your password
+
+
+
+
+
+
+
+
+
+ Hi {{.User.Name}},
+
+
+
+
+
+
+
+
点击链接重置密码，{{.ResetPwdCodeLives}} 分钟内有效
-
- {{.AppUrl}}reset/{{.Code}}
-
- 如果链接点击无反应，请复制到浏览器打开。
- {{end}}
- {{if eq .Lang "en-US"}}
- Please click following link to reset your password in {{.ResetPwdCodeLives}} hours
-
- {{.AppUrl}}reset/{{.Code}}
-
- Copy and paste it to your browser if it's not working.
- {{end}}
-{{end}}
\ No newline at end of file
diff --git a/templates/release/new.tmpl b/templates/release/new.tmpl
new file mode 100644
index 0000000000..fe5aa179c9
--- /dev/null
+++ b/templates/release/new.tmpl
@@ -0,0 +1,66 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+{{template "repo/nav" .}}
+{{template "repo/toolbar" .}}
+
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/repo/setting.tmpl b/templates/repo/setting.tmpl
index 6e2d3bec8b..85d08c5973 100644
--- a/templates/repo/setting.tmpl
+++ b/templates/repo/setting.tmpl
@@ -23,9 +23,10 @@
{{.CsrfTokenHtml}}
diff --git a/templates/repo/toolbar.tmpl b/templates/repo/toolbar.tmpl
index 5484204832..d8ab26214c 100644
--- a/templates/repo/toolbar.tmpl
+++ b/templates/repo/toolbar.tmpl
@@ -15,7 +15,7 @@
{{end}}
{{if .Repository.NumReleases}}{{.Repository.NumReleases}} {{end}}Releases
{{if .IsRepoToolbarReleases}}
-
+ {{if not .IsRepoReleaseNew}}{{end}}
{{end}}
{{.AppName}}