JessonChan
e63d24637d
go test fixed
2015-12-15 14:08:58 +08:00
astaxie
7dcbcf0748
Merge branch 'develop' of https://github.com/astaxie/beego into develop
2015-12-15 14:05:58 +08:00
astaxie
1576add9a2
Merge pull request #1488 from astaxie/revert-1487-develop
...
Revert "compress method fixed"
2015-12-15 14:05:43 +08:00
astaxie
58aa0545b6
Revert "compress method fixed"
2015-12-15 14:05:33 +08:00
astaxie
10cbe7a867
Merge branch 'develop' of https://github.com/astaxie/beego into develop
2015-12-15 13:18:09 +08:00
astaxie
d6f23afdbb
Merge pull request #1487 from JessonChan/develop
...
compress method fixed
2015-12-15 11:49:19 +08:00
JessonChan
499e2b59e4
compress method fixed
...
in http,the deflate is zlib compress method accoding to the sec
http://tools.ietf.org/html/rfc2616#section-3.5
The "zlib" format defined in RFC 1950 [31] in combination with
the "deflate" compression mechanism described in RFC 1951 [29].
2015-12-15 11:34:26 +08:00
nkbai
d99c62df1f
Merge remote-tracking branch 'upstream/develop' into develop
2015-12-14 15:09:06 +08:00
nkbai
b079456fcf
add comments for orm/types.go
2015-12-14 15:04:17 +08:00
fuxiaohei
a06022f75c
clean compliated codes, refactor if sections in app.go
2015-12-12 14:10:02 +08:00
astaxie
2b651fbae2
reuse map in tree.Match
2015-12-11 13:51:01 +08:00
astaxie
80bc372f17
pool.Put
2015-12-11 00:20:17 +08:00
astaxie
f70f338025
use sync.Pool to reuse Context
2015-12-10 21:59:54 +08:00
astaxie
f2edfbe7ae
make the other three beauty
2015-12-10 00:12:52 +08:00
astaxie
4f829af7aa
gofmt the config default
2015-12-10 00:11:24 +08:00
astaxie
9f2a2507fd
fmt it and remove the init var
2015-12-09 23:47:44 +08:00
astaxie
be60f47488
Merge pull request #1455 from nkbai/develop
...
windows下静态文件映射找不到问题以及 grace init延后
2015-12-09 23:44:45 +08:00
astaxie
d1bba02958
refact beego config
2015-12-09 23:35:04 +08:00
nkbai
e8fe859a58
格式调整
2015-12-09 09:03:10 +08:00
nkbai
82e0105d22
Revert "windows下静态文件映射找不到问题,"
...
windows下路径需要filepath.ToSlash
This reverts commit 2c8cb5693e
2015-12-04 23:15:06 +08:00
nkbai
ff0762cc19
Merge remote-tracking branch 'upstream/develop' into develop
2015-12-03 15:50:21 +08:00
astaxie
3d4ad560f8
Merge pull request #1423 from JessonChan/fargo
...
fix the accept encoding
2015-12-02 21:08:34 +08:00
astaxie
36664634f9
Merge pull request #1467 from astaxie/revert-1464-master
...
Revert "Update orm_querym2m.go"
2015-12-02 16:35:44 +08:00
astaxie
ed99c013a6
Revert "Update orm_querym2m.go"
2015-12-02 16:35:36 +08:00
astaxie
a1d5f958c5
Merge pull request #1464 from gobenon/master
...
Update orm_querym2m.go
2015-12-02 16:35:05 +08:00
astaxie
5d902264e5
Merge pull request #1459 from ryanchapman/develop
...
Log config parsing errors
2015-12-02 16:34:35 +08:00
gobenon
50f8f3bd20
Update orm_querym2m.go
2015-11-30 18:23:58 +02:00
nkbai
74ebcd28b2
grace init中的工作可以延后进行
...
实际上如果没有使用graceful启动,这些init的工作完全没用
当然其他模块也应该存在这样的工作,比如session中的sess_utils.go中的init工作
2015-11-30 16:15:35 +08:00
Ryan A. Chapman
7151b96465
Log config parsing errors
...
Beego currently handles the case of "conf/app.conf"
not existing, but all other errors are not logged.
This fixes that.
I ran into an issue where beego was not listening on the
correct port, and it turned out that the conf/app.conf file
had a colon ":" instead of an equal sign "=" (confusion of
INI vs YAML formats). When there was a parsing error, beego
would give up on parsing app.conf and not log anything to the
console.
2015-11-29 15:09:28 -07:00
nkbai
2c8cb5693e
windows下静态文件映射找不到问题,
...
path.Clean和filepath.Clean是有区别的
2015-11-27 12:10:39 +08:00
nkbai
d693ecf046
Revert "这种if型的初始化是有问题的"
...
This reverts commit 50132df809
2015-11-26 20:37:36 +08:00
nkbai
6aaca2eca8
router.go Header 毫无用处
...
context/output.go 简化一下代码,更清晰
2015-11-26 14:56:39 +08:00
nkbai
f0474214fe
GetInt等函数稍微简化一下,这样看上去更合理一些
2015-11-25 23:39:26 +08:00
astaxie
2c94d9eab2
Merge pull request #1451 from gobenon/master
...
fix issue 1438 opened by Ayelet Regev
2015-11-25 09:29:28 +08:00
JessonChan
40700a8532
Merge remote-tracking branch 'remotes/upstream/develop' into fargo
...
# Conflicts:
# memzipfile.go
2015-11-25 09:11:32 +08:00
astaxie
fb7314f8ac
Merge pull request #1450 from astaxie/revert-1439-master
...
Revert "Adding support for junction tables with other fields which arent FK and PK."
2015-11-24 23:00:15 +08:00
astaxie
b7fcd4f0b9
Revert "Adding support for junction tables with other fields which arent FK and PK."
2015-11-24 23:00:07 +08:00
astaxie
e48e09a4ab
Merge pull request #1439 from gobenon/master
...
Adding support for junction tables with other fields which arent FK and PK.
2015-11-24 23:00:04 +08:00
astaxie
235b58504a
Merge pull request #1449 from nkbai/master
...
controller_test.go 既然叫test，那就按照go的规则进行test吧
2015-11-24 15:54:46 +08:00
nkbai
5e915cb614
controller_test.go 既然叫test，那就按照go的规则进行test吧
2015-11-24 14:55:59 +08:00
JessonChan
9170b91075
go style format (remove the blank after comments)
2015-11-21 08:46:19 +08:00
astaxie
25320bf86a
Merge pull request #1441 from nkbai/master
...
fix #1433
2015-11-20 21:50:55 +08:00
nkbai
50132df809
这种if型的初始化是有问题的
2015-11-20 21:34:01 +08:00
nkbai
83696a40f6
fix #1433
2015-11-20 11:18:45 +08:00
gobenon
efd30bdba7
Update orm_querym2m.go
2015-11-19 16:46:14 +02:00
gobenon
01aa1085e0
Merge pull request #1 from gobenon/gobenon-m2mpatch-1
...
Update orm_querym2m.go
2015-11-19 14:32:24 +02:00
gobenon
ca37557a26
Update orm_querym2m.go
2015-11-19 14:30:14 +02:00
astaxie
5a1e821a42
Merge pull request #1434 from WnP/pg-fix
...
fix postgres syntax error during migration
2015-11-19 12:25:21 +08:00
Steeve Chailloux
29ac961c10
fix postgres syntax error during migration
2015-11-18 06:46:44 -06:00
JessonChan
5d01afe3a6
isOk to check whether the file is latest
2015-11-16 14:05:05 +08:00
