astaxie
c8bbfb75f0
Merge pull request #1782 from JessonChan/some_wip
...
BeeLogger can be the writer of http server's log
2016-03-14 14:47:29 +08:00
youngsterxyf
549a39c478
fix issue1789: when testing, load config explicitly and forcibly
2016-03-14 11:26:26 +08:00
astaxie
e4066d820d
Merge pull request #1790 from miraclesu/feature/orm_inline_struct
...
orm: inline struct relate test case
2016-03-14 10:35:00 +08:00
astaxie
cc2b5f5b62
Merge pull request #1792 from youngsterxyf/issue1787
...
fix issue#1787: if `/m` is a static path mapping to a static dir，and we set `beego.BConfig.WebConfig.DirectoryIndex = true`, then it should redirect to `/m/`
2016-03-14 10:33:47 +08:00
JessonChan
c92c3fc8b5
make the BeegoLogger a adapter of http server ErrorLog
2016-03-14 10:21:07 +08:00
youngsterxyf
9aa2e5b575
fix issue#1787: The cause is that if the url is /m，and we set beego.BConfig.WebConfig.DirectoryIndex = true, then it should redirect to /m/
2016-03-13 21:39:26 +08:00
miraclesu
dcfcb2789e
orm: inline struct relate test case
2016-03-13 21:04:39 +08:00
astaxie
d90195061f
fix #1783
2016-03-13 11:16:19 +08:00
astaxie
474bdd2e6b
Merge pull request #1785 from KilledKenny/pathError
...
Fixed infinite loop in ini config adapter
2016-03-12 21:11:04 +08:00
ysqi
1642cbd420
Merge branch 'astaxie/develop' into develop
2016-03-12 14:51:24 +08:00
ysqi
b2a06c5fa0
Update config suport environment variable logic
2016-03-12 14:32:39 +08:00
lcbluestorm
cfef97175e
change import sort
2016-03-12 12:34:54 +08:00
Simon Rawet
8b0957cf2e
Fixed infinite loop in ini config adapter
...
If parseFile recived a directory it would go into a infinit loop
2016-03-12 00:20:19 +01:00
astaxie
88816348b9
window console can't output colorful
2016-03-11 15:29:52 +08:00
saturn4er
66423f6935
Fix formatting with gofmt
...
Rename BeeTemplateEngines->beeTemplateEngines. Create templateHandler function type
Fix var name in comment BeeTemplatePreprocessors -> beeTemplatePreprocessors
Rename TemplateI -> TemplateRenderer
2016-03-11 08:40:54 +02:00
JessonChan
9872041f12
timeDur is used only when need
2016-03-11 14:14:58 +08:00
astaxie
83fe43f331
gofmt -s -w
2016-03-11 13:00:58 +08:00
astaxie
40b41cc121
fix the misspell99
2016-03-11 12:14:18 +08:00
astaxie
1aeb3d9051
release 1.6.1
2016-03-11 11:35:24 +08:00
astaxie
778a5a11ac
Merge pull request #1781 from JessonChan/develop
...
duplicate adapter logger bug fixed
2016-03-11 11:19:07 +08:00
JessonChan
4801099675
duplicate adapter logger bug fixed
2016-03-11 10:12:17 +08:00
astaxie
420cd507b2
update output information
2016-03-11 10:07:44 +08:00
astaxie
22196d7841
add mis function NSHandler
2016-03-11 09:21:13 +08:00
astaxie
571f9b4b65
Merge pull request #1780 from goodloop/develop
...
fix static pattern match for leaf
2016-03-11 09:07:53 +08:00
astaxie
1f0a65f0a2
fix the orm test
2016-03-10 22:21:21 +08:00
Gavin Fang
90e7d252a7
fix static pattern match for leaf
2016-03-10 22:16:41 +08:00
astaxie
31f7524dae
fix the golint travis
2016-03-10 21:47:50 +08:00
astaxie
3a12e238cc
support oracle
2016-03-10 21:23:13 +08:00
ysqi
86c7f1db9e
Merge branch 'astaxie/develop' into environmentVar
...
# Conflicts:
# config/fake.go
# config/xml/xml_test.go
# config/yaml/yaml_test.go
2016-03-10 19:57:16 +08:00
astaxie
f45b271b96
Merge pull request #1723 from miraclesu/feature/orm_inline_struct
...
orm: inline struct support
2016-03-10 14:31:44 +08:00
astaxie
589616b303
Merge pull request #1768 from aolu11/master
...
fix json extra newline
2016-03-09 21:11:20 +08:00
astaxie
65b13eddad
Merge pull request #1719 from JessonChan/err_ctrler
...
multiple response.WriteHeader calls
2016-03-09 19:18:09 +08:00
astaxie
686d2e834e
Merge pull request #1765 from saturn4er/fix_layout_rebuild_in_dev
...
Add layout rebuilding on each request in dev mode
2016-03-09 19:02:46 +08:00
saturn4er
adbae18e8c
Fix formatting with gofmt
2016-03-09 10:47:09 +02:00
JessonChan
f21cff0166
some typo fixed
2016-03-09 16:00:52 +08:00
JessonChan
3dd9020249
Merge remote-tracking branch 'remotes/upstream/develop' into err_ctrler
2016-03-09 15:59:13 +08:00
JessonChan
9a2696d216
accept asta's idea see the talk
...
https://github.com/astaxie/beego/pull/1719
2016-03-09 15:56:18 +08:00
miraclesu
64e0858d44
orm: add inline struct test case
2016-03-08 22:24:38 +08:00
astaxie
d86ab2ed31
Merge pull request #1721 from JessonChan/log_enhancement
...
Log enhancement
2016-03-08 21:35:31 +08:00
JessonChan
b2f071395b
rename files to mulitfile
2016-03-08 18:44:39 +08:00
JessonChan
54b5120a64
rename files to mulitfile
2016-03-08 18:43:09 +08:00
aolu
5e2384e95a
fix json extra newline
2016-03-08 17:04:14 +08:00
astaxie
adb41eb299
Merge pull request #1761 from lcbluestorm/develop
...
add ssdb cache adapter
2016-03-08 15:47:45 +08:00
liuchun
bd04be4470
move time to the top
2016-03-08 14:44:37 +08:00
liuchun
ef59a0ed63
fix travis.yml
2016-03-08 14:03:33 +08:00
liuchun
14be252d2a
fix travis.yml
2016-03-08 14:01:33 +08:00
astaxie
5698b5dc92
Merge pull request #1709 from mlgd/develop
...
Fix cookies in accordance with the "net / http" and Flash usage
2016-03-08 13:53:43 +08:00
liuchun
0a0fc351e7
fix ssdb_test
2016-03-08 12:59:19 +08:00
liuchun
662bea352f
modify travis
2016-03-08 12:45:54 +08:00
astaxie
2f18b9103b
Merge pull request #1679 from ysqi/emptybodyfix
...
fix #1669 and return IO error
2016-03-08 09:48:17 +08:00
