Commit Graph

2264 Commits

Author SHA1 Message Date
astaxie 88c5dfa6ea update issue template 2016-03-23 17:05:40 +08:00
astaxie b78de2b440 add ISSUE_TEMPLATE 2016-03-23 16:56:40 +08:00
astaxie 88816348b9 window console can't output colorful 2016-03-11 15:29:52 +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
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
saturn4er 2c5ef8ccc8 Add layout rebuilding on each request in dev mode 2016-03-07 23:24:52 +02:00
liuchun 1ddb1ce2fe add ssdb travis 2016-03-07 15:50:13 +08:00
liuchun 9ddc2f5474 fix panic err 2016-03-07 15:00:03 +08:00
liuchun e29f4b57a3 fix travis.yml 2016-03-07 14:53:36 +08:00
liuchun 0caadb9b66 rename vars 2016-03-07 14:45:45 +08:00
liuchun 22e3900403 add .travis.yml 2016-03-07 14:34:40 +08:00
liuchun b39830dff3 add .travis.yml 2016-03-07 10:31:56 +08:00
liuchun be23c42674 Merge branches 'master' and 'develop' of lcbluestorm.github.com:lcbluestorm/beego into develop 2016-03-07 10:19:55 +08:00
ysqi 90344a7b8f fix conflicts 2016-03-06 21:25:43 +08:00
ysqi 920862884d Merge branch 'astaxie/develop' into emptybodyfix
# Conflicts:
#	config.go
2016-03-06 21:19:04 +08:00
liuchun 48ec7f736e fix GetMulti bug 2016-03-06 14:46:13 +08:00
liuchun 292d8f2c00 add ssdb cache adapter 2016-03-06 13:17:16 +08:00
astaxie f6f34306ee Merge pull request #1740 from ysqi/configer
Fixed #1735 Return nil if config value does not exist or is empty
2016-03-05 22:05:43 +08:00
astaxie a40c0dd156 Merge pull request #1750 from JessonChan/staticfile_map_race
static file map race bug fixed
2016-03-05 20:43:00 +08:00