diff --git a/.gopmfile b/.gopmfile
index ae92d45e3f58..d3f0b3ca3c91 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 6061f5a7158a..ede1894ad015 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 e66f607a14e6..9b5e46413ef7 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 8d9159d6a866..13b9d377d32c 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 426e6b0be78d..ed47ff209d0b 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 1ec3b29520c8..2196eae84f35 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 dfcae93147f0..56b77a5d605e 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 b99fc8fdfcea..eee6b916cad7 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 088d65ddae88..6612b95a810b 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 a6d6b4cce74e..da2a7fd1a27d 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 0ba0675f205a..059663e1a2e2 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 032af4802057..48c1b5e1345f 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 8e8b93c9eabf..279fc169f816 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 08930e22dfa2..872ed0d60048 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 000000000000..11861f4e208b
--- /dev/null
+++ b/templates/mail/auth/reset_passwd.tmpl
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>{{.User.Name}}, please reset your password</title>
+</head>
+<body style="background:#eee;">
+<div style="color:#333; font:12px/1.5 Tahoma,Arial,sans-serif;; text-shadow:1px 1px #fff; padding:0; margin:0;">
+ <div style="width:600px;margin:0 auto; padding:40px 0 20px;">
+ <div style="border:1px solid #d9d9d9;border-radius:3px; background:#fff; box-shadow: 0px 2px 5px rgba(0, 0, 0,.05); -webkit-box-shadow: 0px 2px 5px rgba(0, 0, 0,.05);">
+ <div style="padding: 20px 15px;">
+ <h1 style="font-size:20px; padding:10px 0 20px; margin:0; border-bottom:1px solid #ddd;"><img src="{{.AppUrl}}/{{.AppLogo}}" style="height: 32px; margin-bottom: -10px;"> <a style="color:#333;text-decoration:none;" target="_blank" href="{{.AppUrl}}">{{.AppName}}</a></h1>
+ <div style="padding:40px 15px;">
+ <div style="font-size:16px; padding-bottom:30px; font-weight:bold;">
+ Hi <span style="color: #00BFFF;">{{.User.Name}}</span>,
+ </div>
+ <div style="font-size:14px; padding:0 15px;">
+ <p style="margin:0;padding:0 0 9px 0;">Please click following link to reset your password within <b>{{.ActiveCodeLives}} hours</b>.</p>
+ <p style="margin:0;padding:0 0 9px 0;">
+ <a href="{{.AppUrl}}user/reset_password?code={{.Code}}">{{.AppUrl}}user/reset_password?code={{.Code}}</a>
+ </p>
+ <p style="margin:0;padding:0 0 9px 0;">Copy and paste it to your browser if the link is not working.</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div style="color:#aaa;padding:10px;text-align:center;">
+ © 2014 <a style="color:#888;text-decoration:none;" target="_blank" href="http://gogits.org">Gogs: Go Git Service</a>
+ </div>
+ </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/templates/mail/auth/reset_password.html b/templates/mail/auth/reset_password.html
deleted file mode 100644
index 40a9efa85504..000000000000
--- a/templates/mail/auth/reset_password.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{{template "mail/base.html" .}}
-{{define "title"}}
- {{if eq .Lang "zh-CN"}}
- {{.User.NickName}}，重置账户密码
- {{end}}
- {{if eq .Lang "en-US"}}
- {{.User.NickName}}, reset your password
- {{end}}
-{{end}}
-{{define "body"}}
- {{if eq .Lang "zh-CN"}}
- <p style="margin:0;padding:0 0 9px 0;">点击链接重置密码，{{.ResetPwdCodeLives}} 分钟内有效</p>
- <p style="margin:0;padding:0 0 9px 0;">
- <a href="{{.AppUrl}}reset/{{.Code}}">{{.AppUrl}}reset/{{.Code}}</a>
- </p>
- <p style="margin:0;padding:0 0 9px 0;">如果链接点击无反应，请复制到浏览器打开。</p>
- {{end}}
- {{if eq .Lang "en-US"}}
- <p style="margin:0;padding:0 0 9px 0;">Please click following link to reset your password in {{.ResetPwdCodeLives}} hours</p>
- <p style="margin:0;padding:0 0 9px 0;">
- <a href="{{.AppUrl}}reset/{{.Code}}">{{.AppUrl}}reset/{{.Code}}</a>
- </p>
- <p style="margin:0;padding:0 0 9px 0;">Copy and paste it to your browser if it's not working.</p>
- {{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 000000000000..fe5aa179c9eb
--- /dev/null
+++ b/templates/release/new.tmpl
@@ -0,0 +1,66 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+{{template "repo/nav" .}}
+{{template "repo/toolbar" .}}
+<div id="body" class="container">
+ <div id="release">
+ <h4 id="release-head">New Release</h4>
+ <form id="release-new-form" action="" class="form form-inline">
+ <div class="form-group">
+ <input id="release-tag-name" type="text" class="form-control" placeholder="tag name"/>
+ <span class="target-at">@</span>
+ <div class="btn-group" id="release-new-target-select">
+ <button type="button" class="btn btn-default"><i class="fa fa-code-fork fa-lg fa-m"></i>
+ <span class="target-text">Target : </span>
+ <strong id="release-new-target-name"> master</strong>
+ </button>
+ <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+ <span class="caret"></span>
+ </button>
+ <div class="dropdown-menu clone-group-btn" id="release-new-target-branch-list">
+ <ul class="list-group">
+ <li class="list-group-item">
+ <a href="#" rel="master"><i class="fa fa-code-fork"></i>master</a>
+ </li>
+ </ul>
+ </div>
+ </div>
+ <p class="help-block">Choose an existing tag without release notes</p>
+ </div>
+ <div class="form-group" style="display: block">
+ <input class="form-control input-lg" id="release-new-title" name="title" type="text" placeholder="release title"/>
+ </div>
+ <div class="form-group col-md-8" style="display: block" id="release-new-content-div">
+ <div class="md-help pull-right">
+ Content with <a href="https://help.github.com/articles/markdown-basics">Markdown</a>
+ </div>
+ <ul class="nav nav-tabs" data-init="tabs">
+ <li class="release-write active"><a href="#release-textarea" data-toggle="tab">Write</a></li>
+ <li class="release-preview"><a href="#release-preview" data-toggle="tab" data-ajax="/api/v1/markdown?repo=repo_id&release=new" data-ajax-name="release-preview" data-ajax-method="post" data-preview="#release-preview">Preview</a></li>
+ </ul>
+ <div class="tab-content">
+ <div class="tab-pane active" id="release-textarea">
+ <div class="form-group">
+ <textarea class="form-control" name="content" id="release-new-content" rows="10" placeholder="Write some content" data-ajax-rel="release-preview" data-ajax-val="val" data-ajax-field="content"></textarea>
+ </div>
+ </div>
+ <div class="tab-pane release-preview-content" id="release-preview">loading...</div>
+ </div>
+ </div>
+ <div class="text-right form-group col-md-8" style="display: block">
+ <hr/>
+ <label for="release-new-pre-release">
+ <input id="release-new-pre-release" type="checkbox" name="is-pre-release" value="true"/>
+ <strong>This is a pre-release</strong>
+ </label>
+ <p class="help-block">We’ll point out that this release is identified as non-production ready.</p>
+ </div>
+ <div class="text-right form-group col-md-8" style="display: block">
+ <input type="hidden" value="id" name="repo-id">
+ <button class="btn-success btn">Publish release</button>
+ <input class="btn btn-default" type="submit" name="is-draft" value="Save Draft"/>
+ </div>
+ </form>
+ </div>
+</div>
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/repo/setting.tmpl b/templates/repo/setting.tmpl
index 6e2d3bec8b9c..85d08c5973db 100644
--- a/templates/repo/setting.tmpl
+++ b/templates/repo/setting.tmpl
@@ -23,9 +23,10 @@
{{.CsrfTokenHtml}}
<input type="hidden" name="action" value="update">
<div class="form-group">
- <label class="col-md-3 text-right">Name</label>
+ <label class="col-md-3 text-right" for="repo-setting-name">Name</label>
<div class="col-md-9">
- <input class="form-control" name="name" value="{{.Repository.Name}}" title="{{.Repository.Name}}" />
+ <input class="form-control" name="name" value="{{.Repository.Name}}" title="{{.Repository.Name}}" id="repo-setting-name"/>
+ <p class="help-block hidden"><span class="text-danger">Cautious : </span>your repository name is changing !</p>
</div>
</div>
diff --git a/templates/repo/toolbar.tmpl b/templates/repo/toolbar.tmpl
index 548420483249..d8ab26214c20 100644
--- a/templates/repo/toolbar.tmpl
+++ b/templates/repo/toolbar.tmpl
@@ -15,7 +15,7 @@
{{end}}
<li class="{{if .IsRepoToolbarReleases}}active{{end}}"><a href="{{.RepoLink}}/releases">{{if .Repository.NumReleases}}<span class="badge">{{.Repository.NumReleases}}</span> {{end}}Releases</a></li>
{{if .IsRepoToolbarReleases}}
- <li class="tmp"><a href="{{.RepoLink}}/releases/new"><button class="btn btn-primary btn-sm">New Release</button></a></li>
+ <li class="tmp">{{if not .IsRepoReleaseNew}}<a href="{{.RepoLink}}/releases/new"><button class="btn btn-primary btn-sm">New Release</button></a>{{end}}</li>
{{end}}
<!-- <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">More <b class="caret"></b></a>
diff --git a/templates/user/forgot_passwd.tmpl b/templates/user/forgot_passwd.tmpl
new file mode 100644
index 000000000000..ff25406fd0d2
--- /dev/null
+++ b/templates/user/forgot_passwd.tmpl
@@ -0,0 +1,30 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div id="body" class="container">
+ <form action="/user/forget_password" method="post" class="form-horizontal card" id="login-card">
+ {{.CsrfTokenHtml}}
+ <h3>Reset Your Password</h3>
+ <div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>
+ {{if .IsResetSent}}
+ <p>A confirmation e-mail has been sent to <b>{{.Email}}</b>, please check your inbox within {{.Hours}} hours.</p>
+ <hr/>
+ <a href="http://{{Mail2Domain .Email}}" class="btn btn-lg btn-success">Sign in to your e-mail</a>
+ {{else if .IsResetRequest}}
+ <div class="form-group {{if .Err_Email}}has-error has-feedback{{end}}">
+ <label class="col-md-3 control-label">Email: </label>
+ <div class="col-md-7">
+ <input name="email" class="form-control" placeholder="Type your e-mail address" required="required">
+ </div>
+ </div>
+ <hr/>
+ <div class="form-group">
+ <div class="col-md-offset-4 col-md-6">
+ <button type="submit" class="btn btn-lg btn-primary">Click here to send reset confirmation e-mail</button>
+ </div>
+ </div>
+ {{else if .IsResetDisable}}
+ <p>Sorry, mail service is not enabled.</p>
+ {{end}}
+ </form>
+</div>
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/user/reset_passwd.tmpl b/templates/user/reset_passwd.tmpl
new file mode 100644
index 000000000000..9190c7c13c48
--- /dev/null
+++ b/templates/user/reset_passwd.tmpl
@@ -0,0 +1,26 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div id="body" class="container">
+ <form action="/user/reset_password?code={{.Code}}" method="post" class="form-horizontal card" id="login-card">
+ {{.CsrfTokenHtml}}
+ <h3>Reset Your Pasword</h3>
+ <div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>
+ {{if .IsResetForm}}
+ <div class="form-group">
+ <label class="col-md-4 control-label">Password: </label>
+ <div class="col-md-6">
+ <input name="passwd" type="password" class="form-control" placeholder="Type your password" required="required">
+ </div>
+ </div>
+ <hr/>
+ <div class="form-group">
+ <div class="col-md-offset-4 col-md-6">
+ <button type="submit" class="btn btn-lg btn-primary">Click here to reset your password</button>
+ </div>
+ </div>
+ {{else}}
+ <p>Sorry, your confirmation code has been exipired or not valid.</p>
+ {{end}}
+ </form>
+</div>
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/user/setting.tmpl b/templates/user/setting.tmpl
index b32689fe1287..d582833870b4 100644
--- a/templates/user/setting.tmpl
+++ b/templates/user/setting.tmpl
@@ -10,9 +10,10 @@
{{if .IsSuccess}}<p class="alert alert-success">Your profile has been successfully updated.</p>{{else if .HasError}}<p class="alert alert-danger form-error">{{.ErrorMsg}}</p>{{end}}
<p>Your Email will be public and used for Account related notifications and any web based operations made via the web.</p>
<div class="form-group">
- <label class="col-md-2 control-label">Username<strong class="text-danger">*</strong></label>
+ <label class="col-md-2 control-label" for="user-setting-username">Username<strong class="text-danger">*</strong></label>
<div class="col-md-8">
- <input name="username" class="form-control" placeholder="Type your user name" required="required" value="{{.SignedUser.Name}}" title="{{.SignedUser.Name}}">
+ <input name="username" class="form-control" placeholder="Type your user name" required="required" value="{{.SignedUser.Name}}" title="{{.SignedUser.Name}}" id="user-setting-username">
+ <p class="help-block hidden"><span class="text-danger">Cautious : </span>your username is changing !</p>
</div>
</div>
diff --git a/templates/user/signin.tmpl b/templates/user/signin.tmpl
index b6c39af1b85f..43f47e412180 100644
--- a/templates/user/signin.tmpl
+++ b/templates/user/signin.tmpl
@@ -33,7 +33,7 @@
<div class="form-group">
<div class="col-md-offset-4 col-md-6">
<button type="submit" class="btn btn-lg btn-primary">Log In</button>
- <a href="/forget-password/">Forgot your password?</a>
+ <a href="/user/forget_password/">Forgot your password?</a>
</div>
</div>
diff --git a/web.go b/web.go
index 153d876464d2..a7a80436a0f3 100644
--- a/web.go
+++ b/web.go
@@ -11,8 +11,6 @@ import (
"github.com/codegangsta/cli"
"github.com/go-martini/martini"
- // "github.com/martini-contrib/oauth2"
- // "github.com/martini-contrib/sessions"
"github.com/gogits/binding"
@@ -21,6 +19,7 @@ import (
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/middleware"
+ "github.com/gogits/gogs/modules/oauth2"
"github.com/gogits/gogs/routers"
"github.com/gogits/gogs/routers/admin"
"github.com/gogits/gogs/routers/api/v1"
@@ -59,19 +58,17 @@ func runWeb(*cli.Context) {
// Middlewares.
m.Use(middleware.Renderer(middleware.RenderOptions{Funcs: []template.FuncMap{base.TemplateFuncs}}))
-
- // scope := "https://api.github.com/user"
- // oauth2.PathCallback = "/oauth2callback"
- // m.Use(sessions.Sessions("my_session", sessions.NewCookieStore([]byte("secret123"))))
- // m.Use(oauth2.Github(&oauth2.Options{
- // ClientId: "09383403ff2dc16daaa1",
- // ClientSecret: "5f6e7101d30b77952aab22b75eadae17551ea6b5",
- // RedirectURL: base.AppUrl + oauth2.PathCallback,
- // Scopes: []string{scope},
- // }))
-
m.Use(middleware.InitContext())
+ scope := "https://api.github.com/user"
+ oauth2.PathCallback = "/oauth2callback"
+ m.Use(oauth2.Github(&oauth2.Options{
+ ClientId: "09383403ff2dc16daaa1",
+ ClientSecret: "5f6e7101d30b77952aab22b75eadae17551ea6b5",
+ RedirectURL: base.AppUrl + oauth2.PathCallback,
+ Scopes: []string{scope},
+ }))
+
reqSignIn := middleware.Toggle(&middleware.ToggleOptions{SignInRequire: true})
ignSignIn := middleware.Toggle(&middleware.ToggleOptions{SignInRequire: base.Service.RequireSignInView})
reqSignOut := middleware.Toggle(&middleware.ToggleOptions{SignOutRequire: true})
@@ -95,6 +92,8 @@ func runWeb(*cli.Context) {
r.Any("/login/github", user.SocialSignIn)
r.Any("/login", binding.BindIgnErr(auth.LogInForm{}), user.SignIn)
r.Any("/sign_up", binding.BindIgnErr(auth.RegisterForm{}), user.SignUp)
+ r.Any("/forget_password", user.ForgotPasswd)
+ r.Any("/reset_password", user.ResetPasswd)
}, reqSignOut)
m.Group("/user", func(r martini.Router) {
r.Any("/logout", user.SignOut)
@@ -148,6 +147,7 @@ func runWeb(*cli.Context) {
r.Get("/issues", repo.Issues)
r.Get("/issues/:index", repo.ViewIssue)
r.Get("/releases", repo.Releases)
+ r.Any("/releases/new",repo.ReleasesNew)
r.Get("/pulls", repo.Pulls)
r.Get("/branches", repo.Branches)
}, ignSignIn, middleware.RepoAssignment(true))