lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-12-23 11:40:49 +00:00
Code Issues Releases Activity
2,246 Commits 3 Branches 32 Tags 9.4 MiB
589616b303
Commit Graph

2246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
astaxie
795092bdd2 Merge pull request #1751 from FlamingTree/develop 
Update phone regexp
 2016-03-05 20:41:52 +08:00
astaxie
524446c857 Merge pull request #1752 from JessonChan/ab_lock_race 
fix template  read-write lock race
 2016-03-05 20:40:14 +08:00
JessonChan
f5adec31c6 improve the template reader function 2016-03-04 14:49:16 +08:00
JessonChan
6747c55a81 remove unused cache 2016-03-04 12:01:04 +08:00
JessonChan
1f46c1d231 add template read lock when dev mode 2016-03-04 12:00:43 +08:00
FlamingTree
8bd1be8e29 Update validators.go 
增加178号段
 2016-03-04 11:16:47 +08:00
JessonChan
226e54e0d8 static file map race bug fixed 2016-03-04 10:54:54 +08:00
JessonChan
3379a2b7ed remove file bug fixed 
remove file by filename and file suffix
 2016-03-04 10:43:57 +08:00
ysqi
19d921d3f5 Return nil not empty []string{} 
Return nil if config value does not exist or is empty
 2016-03-03 20:03:23 +08:00
astaxie
4b99e41880 Merge pull request #1688 from ysqi/configIssue 
fixed handle config issue
 2016-03-03 09:50:14 +08:00
ysqi
8ff74e71cb Fixed #1735 Return empty []string 
Need return empty []string  if config value is empty.

split `“”` ==> []string{}, Not []string{“”}
 2016-03-02 22:44:20 +08:00
JessonChan
2a148473e9 Merge remote-tracking branch 'remotes/upstream/develop' into log_enhancement 2016-03-02 13:34:37 +08:00
JessonChan
b30ce768f8 Merge remote-tracking branch 'remotes/upstream/develop' into err_ctrler 2016-03-02 13:34:00 +08:00
astaxie
70e63570f5 Merge pull request #1731 from math345/develop 
fix bug: session id undecoded when destroy and sesssion memory provider push wrong
 2016-03-02 13:26:57 +08:00
astaxie
36e3160904 add go1.6.0 and remove 1.3.3 2016-03-01 21:41:44 +08:00
JessonChan
ca3c57fbc6 add a line of comment 2016-03-01 17:13:50 +08:00
JessonChan
387dd6ec0e add a line of comment 2016-03-01 17:12:21 +08:00