aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUnknwon <joe2010xtmf@163.com>2015-02-12 12:38:44 -0500
committerUnknwon <joe2010xtmf@163.com>2015-02-12 12:38:44 -0500
commit67a9416ae55ea765e3f405e00d89b0b8f3899330 (patch)
treedb88d32b6fec764172100cd6f73ca5a264a536e3
parent0af74b36add865445ed1d6cd649910d8bb82fe5e (diff)
templates/user/auth/signin.tmpl: hide sign up prompt when registration is disabled #884
-rw-r--r--gogs.go2
-rw-r--r--models/models.go8
-rw-r--r--templates/.VERSION2
-rw-r--r--templates/user/auth/signin.tmpl2
4 files changed, 8 insertions, 6 deletions
diff --git a/gogs.go b/gogs.go
index eac59362..76c6c71f 100644
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)
-const APP_VER = "0.5.13.0211 Beta"
+const APP_VER = "0.5.13.0212 Beta"
func init() {
runtime.GOMAXPROCS(runtime.NumCPU())
diff --git a/models/models.go b/models/models.go
index 3eeeabda..35e80383 100644
--- a/models/models.go
+++ b/models/models.go
@@ -15,7 +15,7 @@ import (
"github.com/go-xorm/xorm"
_ "github.com/lib/pq"
- "github.com/gogits/gogs/models/migrations"
+ // "github.com/gogits/gogs/models/migrations"
"github.com/gogits/gogs/modules/setting"
)
@@ -136,9 +136,9 @@ func NewEngine() (err error) {
return err
}
- if err = migrations.Migrate(x); err != nil {
- return err
- }
+ // if err = migrations.Migrate(x); err != nil {
+ // return err
+ // }
if err = x.StoreEngine("InnoDB").Sync2(tables...); err != nil {
return fmt.Errorf("sync database struct error: %v\n", err)
diff --git a/templates/.VERSION b/templates/.VERSION
index 2aad3653..6d13155b 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.5.13.0211 Beta \ No newline at end of file
+0.5.13.0212 Beta \ No newline at end of file
diff --git a/templates/user/auth/signin.tmpl b/templates/user/auth/signin.tmpl
index 78d6febb..455df63a 100644
--- a/templates/user/auth/signin.tmpl
+++ b/templates/user/auth/signin.tmpl
@@ -26,10 +26,12 @@
<button class="btn btn-green btn-large btn-radius">{{.i18n.Tr "sign_in"}}</button>&nbsp;&nbsp;&nbsp;&nbsp;
{{if not .IsSocialLogin}}<a href="{{AppSubUrl}}/user/forget_password">{{.i18n.Tr "auth.forget_password"}}</a>{{end}}
</div>
+ {{if .ShowRegistrationButton}}
<div class="field">
<label></label>
<a href="{{AppSubUrl}}/user/sign_up">{{.i18n.Tr "auth.sign_up_now" | Str2html}}</a>
</div>
+ {{end}}
{{if and (not .IsSocialLogin) .OauthEnabled}}
<hr/>
<div id="sign-social" class="text-center social-buttons">