diff --git a/conf/app.ini b/conf/app.ini index 79f440dd4d..ed4a1b6219 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -70,8 +70,6 @@ ENABLE_CACHE_AVATAR = false ENABLE_NOTIFY_MAIL = false ; More detail: https://github.com/gogits/gogs/issues/165 ENABLE_REVERSE_PROXY_AUTHENTICATION = false -; Repository Git hooks -ENABLE_GIT_HOOKS = false [webhook] ; Cron task interval in minutes diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index f99a9e7285..4b85143a43 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -41,7 +41,7 @@ cancel = Cancel [install] install = Installation title = Install Steps For First-time Run -requite_db_desc = Gogs requires MySQL, PostgreSQL or SQLite3, but SQLite3 is usually available in the official binary version. +requite_db_desc = Gogs requires MySQL, PostgreSQL or SQLite3, but SQLite3. db_type = Database Type host = Host user = User diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini index 0c17f2d7f9..a5bccb5576 100644 --- a/conf/locale/locale_zh-CN.ini +++ b/conf/locale/locale_zh-CN.ini @@ -41,7 +41,7 @@ cancel = 取消 [install] install = 安装页面 title = 首次运行安装程序 -requite_db_desc = Gogs 允许后端数据库为 MySQL、PostgreSQL 或 SQLite3,但是 SQLite3 一般只有官方二进制发行版才支持。 +requite_db_desc = Gogs 允许后端数据库为 MySQL、PostgreSQL 或 SQLite3。 db_type = 数据库类型 host = 数据库主机 user = 数据库用户 diff --git a/gogs.go b/gogs.go index 82a3ae685f..3f66c4361b 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.5.6.1025 Beta" +const APP_VER = "0.5.6.1027 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/public/ng/css/ui.css b/public/ng/css/ui.css index e659180d65..a6c218ad89 100644 --- a/public/ng/css/ui.css +++ b/public/ng/css/ui.css @@ -4,7 +4,7 @@ } html { font-size: 13px; - font-family: Helvetica, "Microsoft Yahei", Menlo, Monaco, Consolas, "Courier New", monospace; + font-family: Helvetica, "Microsoft Yahei", Arial, sans-serif; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; line-height: 24px; @@ -16,7 +16,7 @@ textarea, select, option, button { - font-family: Helvetica, "Microsoft Yahei", Menlo, Monaco, Consolas, "Courier New", monospace; + font-family: Helvetica, "Microsoft Yahei", Arial, sans-serif; } article, aside, @@ -151,7 +151,7 @@ code, kbd, pre, samp { - font-family: monospace, monospace; + font-family: monospace; font-size: 1em; } .text-left { diff --git a/public/ng/less/ui/reset.less b/public/ng/less/ui/reset.less index 0e7a50e408..d6abb0e536 100644 --- a/public/ng/less/ui/reset.less +++ b/public/ng/less/ui/reset.less @@ -7,7 +7,7 @@ html { font-size: @baseFontSize+1; - font-family: Helvetica, "Microsoft Yahei", Menlo, Monaco, Consolas, "Courier New", monospace; + font-family: Helvetica, "Microsoft Yahei", Arial, sans-serif; // make sure min font size -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; @@ -23,7 +23,7 @@ textarea, select, option, button { - font-family: Helvetica, "Microsoft Yahei", Menlo, Monaco, Consolas, "Courier New", monospace; + font-family: Helvetica, "Microsoft Yahei", Arial, sans-serif; } // html5 block elements @@ -193,7 +193,7 @@ code, kbd, pre, samp { - font-family: monospace, monospace; + font-family: monospace; font-size: 1em; } diff --git a/templates/.VERSION b/templates/.VERSION index 3e75e45dc3..151da6063b 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.5.6.1025 Beta \ No newline at end of file +0.5.6.1027 Beta \ No newline at end of file