1
0
mirror of https://github.com/astaxie/beego.git synced 2024-11-16 12:40:54 +00:00
Commit Graph

2745 Commits

Author SHA1 Message Date
ysqi
484ca3a643 fixed test code error 2016-01-27 21:13:11 +08:00
ysqi
cd31c816cc Config support get environment variable
get environment variable if config item  has prefix "$ENV_" .
e.g.
```ini
[demo]
password = $ENV_MyPWD
```
2016-01-27 20:46:30 +08:00
youngsterxyf
31ef4ae507 rename AppConfigPath, AppConfigProvider to appConfigPath, appConfigProvider, make public to private 2016-01-27 16:43:01 +08:00
youngsterxyf
ccce566ba7 accept @astaxie suggestion: change the sequence adapterName and configPath 2016-01-27 16:19:10 +08:00
youngsterxyf
e357f6846b accept @ysqi suggestion 2016-01-27 13:30:34 +08:00
youngsterxyf
321bcc606a fix bug of test case 2016-01-27 12:26:37 +08:00
youngsterxyf
e549d0fd9c move some code piece 2016-01-27 12:13:26 +08:00
youngsterxyf
c59a029ce7 Merge branch 'develop' into config-logic 2016-01-27 10:58:38 +08:00
astaxie
4ce094a29a Merge branch 'master' into develop 2016-01-27 10:14:34 +08:00
astaxie
fbb98fbe1f Merge pull request #1631 from yunkai/issue1
Fix regression caused by commit ad65479
2016-01-27 10:13:30 +08:00
youngsterxyf
20efd5236e fix bug 2016-01-27 00:42:07 +08:00
youngsterxyf
330b3b1931 enhancement code 2016-01-27 00:17:56 +08:00
youngsterxyf
d9e6250d08 fix config logic 2016-01-27 00:10:21 +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 #1608 from ysqi/iniSaveErrorFix
Fixed #1607
2016-01-26 21:46:31 +08:00
astaxie
6aeff53d8c Merge pull request #1625 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 #1626 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 #1615 from ysqi/routerErrorFix
Fixed #1586
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 #1616 from coseyo/path_patch
fix path issue #1613
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 #1609 from youngsterxyf/fix-issue1566
fix issue #1566
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 #1623 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 #1585 2016-01-25 21:08:29 +08:00
astaxie
87650ce8bc make golint happy 2016-01-25 20:57:41 +08:00
astaxie
fdce4af9c8 fix #1619 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 #1606 from ysqi/configWork
Support Parse Bool with more diffrent values
2016-01-23 23:03:03 +08:00
astaxie
fd7473466b Merge pull request #1581 from hbejgel/patch-2
Checks if index is greater than the length of the wildcards. #1580
2016-01-23 23:01:22 +08:00
ysqi
007af6224e Fixed #1586 2016-01-23 19:13:19 +08:00
youngsterxyf
cbc7f43e88 fix issue #1601 2016-01-23 17:12:46 +08:00
youngsterxyf
ecf24640fd fix issue #1566 2016-01-23 16:56:54 +08:00