Merge branch 'dev' of github.com:gogits/gogs into dev

README.md

@@ -9,7 +9,7 @@ Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language
 
 ### NOTICES
 
-- Due to testing purpose, data of [try.gogits.org](http://try.gogits.org) has been reset in **April 6, 2014** and will reset multiple times after. Please do **NOT** put your important data on the site.
+- Due to testing purpose, data of [try.gogits.org](http://try.gogits.org) has been reset in **April 14, 2014** and will reset multiple times after. Please do **NOT** put your important data on the site.
 - Demo site [try.gogits.org](http://try.gogits.org) is running under `dev` branch.
 
 #### Other language version
@@ -35,7 +35,7 @@ More importantly, Gogs only needs one binary to setup your own project hosting o
 - SSH/HTTP(S) protocol support.
 - Register/delete/rename account.
 - Create/migrate/mirror/delete/watch/rename/transfer public/private repository.
-- Repository viewer/issue tracker.
+- Repository viewer/release/issue tracker.
 - Gravatar and cache support.
 - Mail service(register, issue).
 - Administration panel.

README_ZH.md

@@ -26,7 +26,7 @@ Gogs 完全使用 Go 语言来实现对 Git 数据的操作，实现 **零** 依
 - SSH/HTTP(S) 协议支持
 - 注册/删除/重命名用户
 - 创建/迁移/镜像/删除/关注/重命名/转移 公开/私有 仓库
-- 仓库 浏览器/Bug 追踪
+- 仓库 浏览器/发布/缺陷追踪
 - Gravatar 以及缓存支持
 - 邮件服务（注册、Issue）
 - 管理员面板

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.9.0413 Alpha"
+const APP_VER = "0.2.9.0414 Alpha"
 
 func init() {
 	base.AppVer = APP_VER

templates/admin/config.tmpl

@@ -115,7 +115,7 @@
                     <dd><i class="fa fa{{if .Oauther.Tencent}}-check{{end}}-square-o"></i></dd>
                     <dt>Weibo</dt>
                     <dd><i class="fa fa{{if .Oauther.Weibo}}-check{{end}}-square-o"></i></dd>
-                    <dd>{{.Mailer.User}}</dd>{{end}}
+                    {{end}}
                 </dl>
             </div>
         </div>

templates/repo/nav.tmpl

@@ -24,10 +24,10 @@
                             </span>
                         </div>
                         <p class="help-block text-center">Need help cloning? Visit <a href="#">Help</a>!</p>
-                        <!-- <hr/>
+                        <hr/>
                         <div class="clone-zip text-center">
-                            <a class="btn btn-success btn-lg" href="#"><i class="fa fa-suitcase"></i>Download ZIP</a>
+                            <a class="btn btn-success btn-lg" href="{{.RepoLink}}/archive/{{.BranchName}}/{{.Repository.Name}}.zip"><i class="fa fa-suitcase"></i>Download ZIP</a>
-                        </div> -->
+                        </div>
                     </div>
                 </div>
                 <div class="btn-group {{if .IsRepositoryWatching}}watching{{else}}no-watching{{end}}" id="repo-watching" data-watch="/{{.Owner.Name}}/{{.Repository.Name}}/action/watch" data-unwatch="/{{.Owner.Name}}/{{.Repository.Name}}/action/unwatch">

templates/repo/toolbar.tmpl

@@ -14,9 +14,9 @@
                     </a>{{end}}</li>
                     {{end}}
                     <li class="{{if .IsRepoToolbarReleases}}active{{end}}"><a href="{{.RepoLink}}/releases">{{if .Repository.NumTags}}<span class="badge">{{.Repository.NumTags}}</span> {{end}}Releases</a></li>
-                    {{if .IsRepoToolbarReleases}}
+                    {{if .IsRepoToolbarReleases}}{{if .IsRepositoryOwner}}{{if not .IsRepoReleaseNew}}
-                    <li class="tmp">{{if not .IsRepoReleaseNew}}<a href="{{.RepoLink}}/releases/new"><button class="btn btn-primary btn-sm">New Release</button></a>{{end}}</li>
+                    <li class="tmp"><a href="{{.RepoLink}}/releases/new"><button class="btn btn-primary btn-sm">New Release</button></a></li>
-                    {{end}}
+                    {{end}}{{end}}{{end}}
                     <!-- <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">More <b class="caret"></b></a>
                         <ul class="dropdown-menu">