1
0
mirror of https://github.com/astaxie/beego.git synced 2025-03-10 01:34:57 +00:00

2134 Commits

Author SHA1 Message Date
astaxie
5cd1ed8106 add test for tip 2016-01-29 00:01:04 +08:00
astaxie
4ce094a29a Merge branch 'master' into develop 2016-01-27 10:14:34 +08:00
astaxie
fbb98fbe1f Merge pull request from yunkai/issue1
Fix regression caused by commit ad65479
2016-01-27 10:13:30 +08:00
Yunkai Zhang
e3810b599d Fix regression caused by commit ad65479
Commit ad65479 will cause "Method Not Allow" in preflight response
when enable CORS plugin.

The root cause is that CORS plugin didn't generate http output after applied
commit ad65479, so the value of `ctx.ResponseWriter.Started` will be keep
`false`, and then later filter chains will be go on to run when CORS filter
finished.

This path will both fix "Method Not Allow" and the original bug
"multiple response.WriteHeader calls".

Signed-off-by: Yunkai Zhang <qiushu.zyk@taobao.com>
2016-01-26 23:27:26 +08:00
astaxie
e1f9491aed Merge pull request from ysqi/iniSaveErrorFix
Fixed 
2016-01-26 21:46:31 +08:00
astaxie
6aeff53d8c Merge pull request from miraclesu/fix/mail_from
Fix utils mail some bugs
2016-01-26 21:42:21 +08:00
miraclesu
bf870eb9a2 mv mime.QEncoding.Encode logic to mail
it is named qEncode
2016-01-26 20:50:03 +08:00
miraclesu
f26d360ec9 Fix vet fail 2016-01-26 14:54:36 +08:00
astaxie
f73eaf6393 Merge pull request from JessonChan/develop
log file name bug fixed
2016-01-26 13:42:47 +08:00
JessonChan
e11d150e8b replace \t with space 2016-01-26 09:35:39 +08:00
JessonChan
f2567bc114 some typo fixed 2016-01-26 09:29:04 +08:00
JessonChan
b5a07c6ba8 log file name bug fixed
this bug happens when daily rotate. ex,when it is 2016-01-22 23:59:59 and need a rotate,the file name should named with 2016-01-22 but named with 2016-01-23(next day)
2016-01-26 09:20:49 +08:00
astaxie
01ccc75d6b Merge pull request from ysqi/routerErrorFix
Fixed 
2016-01-26 00:31:01 +08:00
astaxie
b19f9bf88c Merge branch 'develop' of https://github.com/astaxie/beego into develop 2016-01-26 00:27:44 +08:00
astaxie
6cc3d4470a Merge pull request from coseyo/path_patch
fix path issue 
2016-01-26 00:27:34 +08:00
astaxie
61e9dc74c9 make sure the memcache testing success 2016-01-26 00:27:02 +08:00
astaxie
8611862fd7 Merge pull request from youngsterxyf/fix-issue1566
fix issue 
2016-01-26 00:07:43 +08:00
coseyo
d1481ea659 move assignment to init 2016-01-25 23:00:09 +08:00
miraclesu
5930f27da7 Fix mail Chinese subject garbled bug 2016-01-25 22:55:40 +08:00
miraclesu
4de91f675d show from when Config from is empty 2016-01-25 22:29:45 +08:00
astaxie
15e9ba19c0 fix the range only used in Go 1.4 fix 2016-01-25 21:39:44 +08:00
astaxie
f8004b69ad fix the go vet 2016-01-25 21:33:57 +08:00
astaxie
3dac344ff6 fix the vet url 2016-01-25 21:20:10 +08:00
astaxie
e7d4452af0 add golint and go test 2016-01-25 21:13:56 +08:00
astaxie
7e3ad5bcb0 fix 2016-01-25 21:08:29 +08:00
astaxie
87650ce8bc make golint happy 2016-01-25 20:57:41 +08:00
astaxie
fdce4af9c8 fix 2016-01-25 20:53:52 +08:00
youngsterxyf
bcac4bb8e3 accept @JessonChan suggestion 2016-01-25 20:53:25 +08:00
youngsterxyf
0e17e2a3d2 accept @JessonChan suggestion 2016-01-25 20:20:53 +08:00
miraclesu
a80feb00b8 Fix utils mail from field can't including Chinese bug 2016-01-25 18:15:08 +08:00
ysqi
cf055c9db2 Merge branch 'astaxie/develop' into iniSaveErrorFix
# Conflicts:
#	config/ini_test.go
2016-01-24 11:37:43 +08:00
ysqi
3d7354b9d2 import reset 2016-01-24 11:10:04 +08:00
coseyo
09d3d89c6f fix test error again 2016-01-24 00:47:37 +08:00
coseyo
3031bdd176 fix test error 2016-01-24 00:40:03 +08:00
coseyo
4c1cfc1386 fix path issue 2016-01-24 00:18:16 +08:00
astaxie
57d522a96a Merge pull request from ysqi/configWork
Support Parse Bool with more diffrent values
2016-01-23 23:03:03 +08:00
astaxie
fd7473466b Merge pull request from hbejgel/patch-2
Checks if index is greater than the length of the wildcards. 
2016-01-23 23:01:22 +08:00
ysqi
007af6224e Fixed 2016-01-23 19:13:19 +08:00
youngsterxyf
ecf24640fd fix issue 2016-01-23 16:56:54 +08:00
ysqi
51ae45a799 Fixed 2016-01-23 14:53:52 +08:00
ysqi
be544f963e Support Parse Bool with more diffrent values
ParseBool returns the boolean value represented by the string.
It accepts 1, 1.0, t, T, TRUE, true, True, YES, yes, Yes,Y, y, ON, on,
On,
 0, 0.0, f, F, FALSE, false, False, NO, no, No, N,n, OFF, off, Off.
Any other value returns an error.
2016-01-23 11:02:40 +08:00
astaxie
af346e871b Merge pull request from coseyo/remote_develop
fix conf load bug
2016-01-22 20:34:46 +08:00
coseyo
cb5fd49612 fix conf load bug 2016-01-22 18:03:02 +08:00
astaxie
0f85c82a21 Merge pull request from nemtsevp/patch-2
Exceptions in controller methods
2016-01-21 14:57:02 +08:00
nemtsevp
93b04e8a3b Exceptions in controller methods
Exceptions in methods names should be changed according to controller.go
2016-01-21 09:44:17 +03:00
astaxie
07937dea9a Merge pull request from Kavin-Cao/master
template.go 的beegoTplFuncMap注释有误
2016-01-20 14:18:35 +08:00
bradycao
5757e6548e template.go 的urlfor Func注释有误
template.go 的urlfor Func注释有误
2016-01-19 10:14:16 +08:00
bradycao
b48f251043 Merge remote-tracking branch 'refs/remotes/astaxie/master' 2016-01-19 09:43:43 +08:00
Henrique Bejgel
35e340b937 Checks if index is greater than the length of the wildcards. 2016-01-18 21:35:14 -02:00
astaxie
befeac5b61 Merge branch 'develop' of https://github.com/astaxie/beego into develop 2016-01-18 23:30:12 +08:00