Fix #54

diff --git a/routers/install.go b/routers/install.go
index b9e8bb290784e6cfadb11c1da7edb9773fda7742..5d6c65ef9beff1316f657f2d1ff004ddb47424f9 100644 (file)
--- a/routers/install.go
+++ b/routers/install.go
@@ -7,6 +7,7 @@ package routers
 import (
        "errors"
        "os"
+       "os/exec"
        "strings"
 
        "github.com/Unknwon/goconfig"
@@ -103,6 +104,11 @@ func Install(ctx *middleware.Context, form auth.InstallForm) {
                return
        }
 
+       if _, err := exec.LookPath("git"); err != nil {
+               ctx.RenderWithErr("Fail to test 'git' command: "+err.Error(), "install", &form)
+               return
+       }
+
        // Pass basic check, now test configuration.
        // Test database setting.
        dbTypes := map[string]string{"mysql": "mysql", "pgsql": "postgres", "sqlite": "sqlite3"}

diff --git a/routers/user/social.go b/routers/user/social.go
index 7b4d232987f8dc3ede25d22143c61f1ce2beaa98..a35da549311edd3288a4d0239b79260a62c2b466 100644 (file)
--- a/routers/user/social.go
+++ b/routers/user/social.go
@@ -110,7 +110,7 @@ func SocialSignIn(ctx *middleware.Context, tokens oauth2.Tokens) {
        case models.ErrOauth2NotAssociatedWithUser:
                // pass
        default:
-               log.Error(err) // FIXME: handle error page
+               log.Error(err.Error()) // FIXME: handle error page
                return
        }
        ctx.Session.Set("socialId", oa.Id)

diff --git a/templates/install.tmpl b/templates/install.tmpl
index 1fbc74bc7d6b5b6098c3cc4548e6d28b8e5b2d01..c70cfa3e6bba9048cd0fefb77c54a4b3729cf7ac 100644 (file)
--- a/templates/install.tmpl
+++ b/templates/install.tmpl
@@ -156,11 +156,11 @@
                             <label class="col-md-3 control-label">SMTP Host: </label>
 
                             <div class="col-md-8">
-                                <input name="smtp_host" type="text" class="form-control" placeholder="Type SMTP host address" value="{{.smtp_host}}">
+                                <input name="smtp_host" type="text" class="form-control" placeholder="Type SMTP host address and port" value="{{.smtp_host}}">
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="col-md-3 control-label">Email: </label>
+                            <label class="col-md-3 control-label">Username: </label>
 
                             <div class="col-md-8">
                                 <input name="mailer_user" type="text" class="form-control" placeholder="Type SMTP user e-mail address" value="{{.mailer_user}}">