1
0
mirror of https://github.com/astaxie/beego.git synced 2024-06-01 08:03:28 +00:00
Commit Graph

2474 Commits

Author SHA1 Message Date
ysqi
2e0bcf611c go fmt 2016-06-01 19:57:08 +08:00
ysqi
2ebf3cd450 Merge branch 'astaxie/develop' into develop 2016-06-01 19:54:35 +08:00
astaxie
1fe2226c11 Merge pull request #1968 from wy65701436/develop
modify the error log for registerModel.
2016-05-30 10:41:46 +08:00
wy65701436
d4d7621942 modify the error log for registerModel to tell user the default hard code PK is 'id'. 2016-05-27 02:03:58 -07:00
astaxie
7b051e7ad1 Merge pull request #1940 from MachineShop-IOT/develop
More flexible support for template engines
2016-05-24 11:54:39 +08:00
Mark Mindenhall
24b8870637 move paren to new line 2016-05-23 21:43:18 -06:00
astaxie
cef91db28e Merge pull request #1956 from gitchs/master
Ctx.Redirect patch
2016-05-23 13:50:59 +08:00
astaxie
2165fb6e67 Merge pull request #1938 from wincss/develop
fix #1936
2016-05-22 21:29:32 +08:00
astaxie
05e929ed8c Merge pull request #1948 from nullne/develop
fix bug with file permission in log module
2016-05-22 21:25:17 +08:00
tinyproxy
f32392e956 net/http will do it better 2016-05-21 15:19:21 +08:00
astaxie
e21b425957 Merge pull request #1953 from lcbluestorm/master
add ssdb session provider
2016-05-20 22:53:23 +08:00
lcbluestorm
e77a591a6c delete test file 2016-05-20 17:25:22 +08:00
lcbluestorm
4890dd708c clear code 2016-05-20 10:27:18 +08:00
lcbluestorm
6234b50111 test done 2016-05-19 21:00:04 +08:00
nullne
2c12383263 remove attribute perm to make it more brief 2016-05-17 10:29:05 +08:00
lcbluestorm
e50f4f5631 complete sess_ssdb.go 2016-05-15 12:15:40 +08:00
nullne
d679a4b865 fix bug with file permission in log module 2016-05-14 10:54:09 +08:00
Mark Mindenhall
153d76e200 More flexible support for template engines 2016-05-10 22:54:33 -06:00
lcbluestorm
0e4b9563ae add test file 2016-05-10 20:08:15 +08:00
lcbluestorm
27be1e7ca3 add ssdb-session interface 2016-05-10 19:56:45 +08:00
wincss
a4d4b8de77 fix #1936 2016-05-10 17:45:06 +08:00
astaxie
dae2a36eb5 Merge pull request #1924 from ysqi/develop
implement some features
2016-05-06 13:58:29 +08:00
ysqi
7ceff43db6 Fixed error in window os 2016-05-06 13:26:48 +08:00
astaxie
85a8c5c4f4 Merge pull request #1927 from JessonChan/log_daily_rotate
file rotate by day
2016-05-06 12:55:21 +08:00
JessonChan
b28581a463 make daily rotate 2016-05-06 12:11:14 +08:00
JessonChan
fa8d94fa69 file rotate by day test 2016-05-06 12:09:00 +08:00
ysqi
3c8ed9adfc Merge branch 'astaxie/develop' into develop
# Conflicts:
#	parser.go
2016-05-05 19:30:31 +08:00
ysqi
8210fd12d1 Fixed router fileName error in window 2016-05-05 19:28:09 +08:00
ysqi
77ff15ee33 Implement Error interface for validation error 2016-05-05 19:26:03 +08:00
astaxie
4d8e1f93ff Merge pull request #1909 from albertma/master
Start timer task Multiple times
2016-04-29 11:34:52 +08:00
albertma
e607be6fa6 gofmt the code 2016-04-29 10:28:10 +08:00
astaxie
73f499948a Merge pull request #1906 from Maxgis/issue_redundancy
remove redundancy code and add port confict tip
2016-04-28 09:59:47 +08:00
astaxie
a7452388d9 Merge pull request #1912 from ysqi/issue02
Fixed some bug
2016-04-28 09:44:08 +08:00
ysqi
2a2b433e19 go fmt 2016-04-27 23:57:36 +08:00
ysqi
272271f588 Change comment router file info 2016-04-27 23:57:22 +08:00
ysqi
fa7416452e Change set test mode way 2016-04-27 22:26:32 +08:00
ysqi
245664010c Go Vet 2016-04-27 22:18:22 +08:00
ysqi
9e17f518b8 Fixed print format error info 2016-04-27 22:17:53 +08:00
ysqi
830985b90b QueryEscape Download File Name 2016-04-27 22:05:31 +08:00
albertma
a271d67ba4 1.fix blank issue 2016-04-26 18:13:52 +08:00
albertma
710c7c79d4 1.fix start task twice issue 2016-04-26 18:11:49 +08:00
maxin[马鑫]
5402c753fb remove redundancy code and add port confict tip 2016-04-26 10:16:53 +08:00
astaxie
520a417cca Merge pull request #1874 from Maxgis/master
change limit 1000 to 1,reduce the amount the data
2016-04-26 09:56:44 +08:00
maxin[马鑫]
56dc9bf622 add return ErrMultiRows 2016-04-25 15:51:12 +08:00
astaxie
e89f562396 Merge pull request #1897 from yuyongsheng/develop
add/get session id into/from http header, check the session name in http header
2016-04-21 13:04:28 +08:00
yuyongsheng
5aa085bf41 1. remove the invalid comments.
2. allow the user to config "Enable" store/get sessionId into/from http header
3. allow the user to config "Enable" get sessionId from Url query
4. when enable sessionId in http header, check the sessionName format as CanonicalMIMRHeaderKey, then panic if not.
2016-04-21 09:57:44 +08:00
astaxie
70f3f6b8b1 Merge pull request #1883 from JessonChan/config_improve
Config improve
2016-04-20 13:19:47 +08:00
astaxie
86e18bf6f9 Merge pull request #1882 from miraclesu/fix/orm_multi_insert
orm: fix multi insert panic
2016-04-20 13:06:47 +08:00
astaxie
14159eaa7e Merge pull request #1891 from gitchs/develop
fix spell error
2016-04-20 09:49:11 +08:00
Leon Chan
df27c96102 fix spell error 2016-04-18 19:37:38 +08:00