API fix

diff --git a/conf/app.ini b/conf/app.ini
index 2aab7178e43c935b2eff45446acf932dbd608110..7dbbf600533a3ff6b0d56e9935913304003ce1ab 100644 (file)
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -9,7 +9,7 @@ RUN_MODE = dev
 [repository]
 ROOT = 
 SCRIPT_TYPE = bash
-LANG_IGNS = Google Go|C|C++|Python|Ruby|C Sharp|Java|Objective-C
+LANG_IGNS = Google Go|C|C++|Python|Ruby|C Sharp|Java|Objective-C|Android
 LICENSES = Apache v2 License|GPL v2|MIT License|Affero GPL|Artistic License 2.0|BSD (3-Clause) License
 
 [server]

diff --git a/conf/gitignore/Android b/conf/gitignore/Android
new file mode 100644 (file)
index 0000000..37e8cf6
--- /dev/null
+++ b/conf/gitignore/Android
@@ -0,0 +1,23 @@
+# Built application files
+*.apk
+*.ap_
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
\ No newline at end of file

diff --git a/gogs.go b/gogs.go
index c9d78acb94de4594ea1d7667e21b612e465dbdad..73555adab7a41835ec107e59c4ff4f1c7c67a42e 100644 (file)
--- 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.3.0.0420 Alpha"
+const APP_VER = "0.3.0.0421 Alpha"
 
 func init() {
        base.AppVer = APP_VER

diff --git a/models/models.go b/models/models.go
index 1eb418bac73851732fdf23bb8c97f3807d0d3218..216084f1b8399e2f5a6acc5c9a332d30a15ca514 100644 (file)
--- a/models/models.go
+++ b/models/models.go
@@ -120,7 +120,7 @@ func SetEngine() (err error) {
        if err != nil {
                return fmt.Errorf("models.init(fail to create xorm.log): %v", err)
        }
-       orm.Logger = f
+       orm.Logger = xorm.NewSimpleLogger(f)
 
        orm.ShowSQL = true
        orm.ShowDebug = true