1
0
mirror of https://github.com/astaxie/beego.git synced 2024-11-25 15:40:55 +00:00
Commit Graph

3950 Commits

Author SHA1 Message Date
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
JessonChan
d963bb79bd avoid map-lock delete 2015-11-16 10:31:27 +08:00
JessonChan
bc2195b07f code simplify 2015-11-12 16:59:07 +08:00
JessonChan
46fbeaadad refactor accept encoder ,simplify the struct 2015-11-12 12:03:53 +08:00
JessonChan
214030fad4 bytes reader replace string reader 2015-11-12 11:44:29 +08:00
JessonChan
f8db8ae9c3 add some comments 2015-11-12 10:48:36 +08:00
JessonChan
a9881388f7 accept encoder header setting fixed 2015-11-12 10:08:57 +08:00
JessonChan
1200b7c347 method refactor 2015-11-11 18:06:18 +08:00
JessonChan
b25a1355f9 remove old code 2015-11-11 16:27:41 +08:00
JessonChan
d2c60619fa new static file support code 2015-11-11 16:22:40 +08:00
JessonChan
82c50b972d new test file 2015-11-11 16:22:05 +08:00
JessonChan
15b0b9b66d delete old static file code 2015-11-11 16:21:04 +08:00
JessonChan
e4c6e5d2e1 change package 2015-11-11 13:47:47 +08:00
JessonChan
f457ea0fe9 refactor encoder package 2015-11-11 13:47:36 +08:00
JessonChan
7ef9b3d55b runnable typo fixed 2015-11-10 14:07:26 +08:00
JessonChan
39e29caf9b refactor to fix encoder type bug 2015-11-10 13:42:10 +08:00
JessonChan
7ccf049a50 bug fixed 2015-11-10 13:27:33 +08:00
JessonChan
7964f7f163 test bug fixed 2015-11-10 13:16:16 +08:00
JessonChan
8603127c81 beego package file path rewrite 2015-11-10 13:10:42 +08:00
JessonChan
07c93cd32c mem zip file test ,add license 2015-11-10 11:59:32 +08:00
JessonChan
83ec39d02e refactor max age cookies setting 2015-11-10 11:47:10 +08:00
JessonChan
8f42193610 better compress func design 2015-11-10 11:32:18 +08:00
JessonChan
891be34fc6 encoding should be specify 2015-11-10 11:20:13 +08:00
JessonChan
0bc70e88f0 ignore the other compress method 2015-11-10 11:00:29 +08:00
JessonChan
3872c48349 accept encoding refactor and bug fixed 2015-11-10 10:55:47 +08:00
JessonChan
dc28e37606 Merge branch 'develop' into fargo 2015-11-09 17:18:00 +08:00
astaxie
821b2f832e fix the type assert 2015-11-09 11:03:57 +08:00
astaxie
9b725c73c3 Merge pull request #1376 from JessonChan/develop
static file code refactor and bug fixed
2015-11-08 23:21:16 +08:00
JessonChan
860568cb6c modified as astaxie reviews
https://github.com/astaxie/beego/pull/1376
2015-11-06 18:51:53 +08:00
astaxie
dc3e324f38 Merge pull request #1418 from ElvizLai/patch-1
Update context.go
2015-11-05 22:39:34 +08:00
Yongzheng Lai
b8fc42d38d Update context.go
all this status was setting in error.go, this line will cause multi-resp
2015-11-05 21:20:57 +08:00
astaxie
a26dee556d fix #1335 2015-11-05 00:19:09 +08:00
astaxie
fd4630c6dd impove the ResponseWriter. fix #1410 2015-11-04 23:52:42 +08:00
astaxie
e3120226fa Merge pull request #1414 from FlamingTree/develop
bugfix: graceful failed when both enable http and https
2015-11-04 23:27:27 +08:00
astaxie
25bec8bbe9 Merge pull request #1381 from ADone/m2m_reverse_bug
fix #671
2015-11-04 23:20:22 +08:00