UPDATE README

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 17a3ebe68ffddf2041ea5ae0257df07d7bd414ac..cfc6c14f21d4b7b6caa8e23bf347dd8e70f45395 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 > Thanks [drone](https://github.com/drone/drone) because this guidelines sheet is forked from its [CONTRIBUTING.md](https://github.com/drone/drone/blob/master/CONTRIBUTING.md).
 
-**This document is pre^3 release, we're not ready for receiving contribution until v0.5.0 release.**
+**This document is pre^2 release, we're not ready for receiving contribution until v0.5.0 release.**
 
 Want to hack on Gogs? Awesome! Here are instructions to get you started. They are probably not perfect, please let us know if anything feels wrong or incomplete.
 

diff --git a/README.md b/README.md
index d30e81356a2cd4a742ff2df07033592cf1d6f3d7..37a2b9e2f0e70874b4add2005501769604ba6185 100644 (file)
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ More importantly, Gogs only needs one binary to setup your own project hosting o
 
 Make sure you install [Prerequirements](https://github.com/gogits/gogs/wiki/Prerequirements) first.
 
-There are two ways to install Gogs:
+There are 3 ways to install Gogs:
 
 - [Install from binary](https://github.com/gogits/gogs/wiki/Install-from-binary): **STRONGLY RECOMMENDED**
 - [Install from source](https://github.com/gogits/gogs/wiki/Install-from-source)

diff --git a/README_ZH.md b/README_ZH.md
index 43303cdf5c60ba658d62cf43f3170f8451db1f0d..b16e7a58f7233db1820421a2cbc24a986009cd54 100644 (file)
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -37,7 +37,7 @@ Gogs 完全使用 Go 语言来实现对 Git 数据的操作，实现 **零** 依
 
 在安装 Gogs 之前，您需要先安装 [基本环境](https://github.com/gogits/gogs/wiki/Prerequirements)。
 
-然后，您可以通过以下两种方式来安装 Gogs：
+然后，您可以通过以下 3 种方式来安装 Gogs：
 
 - [二进制安装](https://github.com/gogits/gogs/wiki/Install-from-binary): **强烈推荐**
 - [源码安装](https://github.com/gogits/gogs/wiki/Install-from-source)

diff --git a/models/models.go b/models/models.go
index ee96207d10d5b33b64ade33ff063b18bacb5b321..b380d0e0f2425e98991efbb0b177ab6b0c075a70 100644 (file)
--- a/models/models.go
+++ b/models/models.go
@@ -32,7 +32,7 @@ var (
 
 func init() {
        tables = append(tables, new(User), new(PublicKey), new(Repository), new(Watch),
-               new(Action), new(Access), new(Issue), new(Comment), new(Oauth2))
+               new(Action), new(Access), new(Issue), new(Comment), new(Oauth2), new(Follow))
 }
 
 func LoadModelsConfig() {

diff --git a/models/user.go b/models/user.go
index b2fddd0a1d5e5687b796fb0e5b328a39d12dd481..5274970fa09971ce4cf9f88614e432bba97b6d95 100644 (file)
--- a/models/user.go
+++ b/models/user.go
@@ -294,6 +294,8 @@ func DeleteUser(user *User) error {
                return err
        }
 
+       // Delete oauth2.
+
        // Delete all feeds.
        if _, err = orm.Delete(&Action{UserId: user.Id}); err != nil {
                return err

diff --git a/templates/base/navbar.tmpl b/templates/base/navbar.tmpl
index 8d6ca47e9cfe303d22099f327a06a25dd7126bd1..e74fd3160c84c50ecdc645f64af079bfffece25f 100644 (file)
--- a/templates/base/navbar.tmpl
+++ b/templates/base/navbar.tmpl
@@ -4,19 +4,19 @@
             <a id="nav-logo" class="nav-item pull-left{{if .PageIsHome}} active{{end}}" href="/"><img src="/img/favicon.png" alt="Gogs Logo" id="logo"></a>
             <a class="nav-item pull-left{{if .PageIsUserDashboard}} active{{end}}" href="/">Dashboard</a>
             <a class="nav-item pull-left{{if .PageIsHelp}} active{{end}}" href="https://github.com/gogits/gogs/wiki">Help</a>{{if .IsSigned}}
-            {{if .Repository}}<form class="nav-item pull-left{{if .PageIsNewRepo}} active{{end}}" id="nav-search-form">
+            <form class="nav-item pull-left{{if .PageIsNewRepo}} active{{end}}" id="nav-search-form">
                 <div class="input-group">
                     <div class="input-group-btn">
-                        <button type="button" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown">All Repositories <span class="caret"></span></button>
+                        <button type="button" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown">{{if .Repository}}This Repository{{else}}All Repositories{{end}} <span class="caret"></span></button>
                         <ul class="dropdown-menu">
+                            {{if .Repository}}<li><a href="#">This Repository</a></li>
+                            <li class="divider"></li>{{end}}
                             <li><a href="#">All Repositories</a></li>
-                            <li class="divider"></li>
-                            <li><a href="#">This Repository</a></li>
                         </ul>
                     </div>
                     <input type="search" class="form-control input-sm" name="q" placeholder="search code, commits and issues"/>
                 </div>
-            </form>{{end}}
+            </form>
             <a id="nav-out" class="nav-item navbar-right navbar-btn btn btn-danger" href="/user/logout/"><i class="fa fa-power-off fa-lg"></i></a>
             <a id="nav-avatar" class="nav-item navbar-right{{if .PageIsUserProfile}} active{{end}}" href="{{.SignedUser.HomeLink}}" data-toggle="tooltip" data-placement="bottom" title="{{.SignedUserName}}">
                 <img src="{{.SignedUser.AvatarLink}}?s=28" alt="user-avatar" title="username"/>
@@ -29,7 +29,7 @@
                     <ul class="list-unstyled">
                         <li><a href="/repo/create"><i class="fa fa-book"></i>Repository</a></li>
                         <li><a href="/repo/mirror"><i class="fa fa-clipboard"></i>Mirror</a></li>
-                        <li><a href="#"><i class="fa fa-users"></i>Organization</a></li>
+                        <!-- <li><a href="#"><i class="fa fa-users"></i>Organization</a></li> -->
                     </ul>
                 </div>
             </div>

diff --git a/templates/user/dashboard.tmpl b/templates/user/dashboard.tmpl
index e2d7a5093f01083240d0e45a397b896c347b0908..efa78d88079ebf1f1a2e163a3eb74ca6f3212abb 100644 (file)
--- a/templates/user/dashboard.tmpl
+++ b/templates/user/dashboard.tmpl
@@ -35,7 +35,7 @@
                        <ul class="list-unstyled">
                            <li><a href="/repo/create"><i class="fa fa-book"></i>Repository</a></li>
                            <li><a href="/repo/mirror"><i class="fa fa-clipboard"></i>Mirror</a></li>
-                           <li><a href="#"><i class="fa fa-users"></i>Organization</a></li>
+                           <!-- <li><a href="#"><i class="fa fa-users"></i>Organization</a></li> -->
                        </ul>
                     </div>
                 </div>