lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-23 06:30:54 +00:00
Code Issues Releases Activity
1,701 Commits 3 Branches 32 Tags 9.4 MiB
b7fcd4f0b9
Commit Graph

1701 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
astaxie
b7fcd4f0b9 Revert "Adding support for junction tables with other fields which arent FK and PK." 2015-11-24 23:00:07 +08:00
astaxie
e48e09a4ab Merge pull request #1439 from gobenon/master 
Adding support for junction tables with other fields which arent FK and PK.
 2015-11-24 23:00:04 +08:00
gobenon
efd30bdba7 Update orm_querym2m.go 2015-11-19 16:46:14 +02:00
gobenon
01aa1085e0 Merge pull request #1 from gobenon/gobenon-m2mpatch-1 
Update orm_querym2m.go
 2015-11-19 14:32:24 +02:00
gobenon
ca37557a26 Update orm_querym2m.go 2015-11-19 14:30:14 +02:00
astaxie
a89f14d80d Merge pull request #1227 from oiooj/develop 
fix FilterHandler crash issue
 2015-06-19 11:43:15 +08:00
MrLee.Kun
87e8bcc9be fix FilterHandler crash issue 
Filter Handler will crash with error assignment to entry in nil map , params from function Tree.Match() maybe nil.
 2015-06-19 11:19:35 +08:00
MrLee.Kun
31e5edbdcf Merge pull request #2 from astaxie/develop 
pull from stable
 2015-06-19 11:09:11 +08:00
astaxie
f7f390dfec fix #1221 2015-06-16 14:53:38 +08:00
astaxie
8f7246e17b change to version 1.5.0 2015-06-15 23:49:13 +08:00
astaxie
c8f6e0f156 remove the hardcode in runtime.Caller 2015-06-15 20:53:49 +08:00
astaxie
0207caab6f keep the shortname for logs info/warn/debug 2015-06-15 20:44:14 +08:00
astaxie
d629c1d3d0 change the comments 2015-06-15 20:22:05 +08:00
astaxie
817650aa33 keep the short name for logs 2015-06-15 20:20:37 +08:00
astaxie
ba1232dfaf filter should be always the same 2015-06-14 18:35:46 +08:00
astaxie
64d4f6518b fix #1213 2015-06-14 18:10:10 +08:00
astaxie
9f05db8475 Merge pull request #1212 from astaxie/revert-1211-revert-1210-develop 
Revert "Revert "fix multiple filters execute issue""
 2015-06-14 01:14:42 +08:00
astaxie
b275d7c6f5 Revert "Revert "fix multiple filters execute issue"" 2015-06-14 01:14:33 +08:00
astaxie
73770fbe22 Merge pull request #1211 from astaxie/revert-1210-develop 
Revert "fix multiple filters execute issue"
 2015-06-14 01:13:42 +08:00
astaxie
fc11169ee3 Revert "fix multiple filters execute issue" 2015-06-14 01:13:34 +08:00
astaxie
b54589fa9d Merge pull request #1210 from oiooj/develop 
fix multiple filters execute issue
 2015-06-14 01:08:51 +08:00
MrLee.Kun
2af0c569a5 The last filterFunc with returnOnOutput=ture won't be executed 
ex:
	beego.InsertFilter("/*", beego.BeforeExec, FilterLoginCheck1,false)
	beego.InsertFilter("/*", beego.BeforeExec, FilterLoginCheck2)

In function  FilterLoginCheck1 , I'll write data via ResponseWriter, and w.started = true
FilterLoginCheck2 won't be executed, it should be.
 2015-06-14 01:02:41 +08:00
MrLee.Kun
27b7a8f743 Merge pull request #1 from astaxie/develop 
Develop
 2015-06-14 00:35:38 +08:00
astaxie
c143a6ec19 fix #1090 add Getfiles to support mulit file upload 2015-06-13 16:20:26 +08:00
astaxie
e619d83990 fix the filter router issues 2015-06-13 12:47:01 +08:00
astaxie
27b452cd95 Merge branch 'develop' of https://github.com/astaxie/beego into develop 2015-06-13 11:15:44 +08:00
astaxie
b776e43962 merge bat/httplib to httplib 2015-06-13 11:15:13 +08:00
astaxie
cb89cd577d Merge pull request #1201 from kongjian/develop 
support eq&ne for orm
 2015-06-13 10:54:47 +08:00
astaxie
6b777f0c5e Merge pull request #1207 from oiooj/develop 
Don't overwrite the params from function  ValidRouter
 2015-06-13 09:16:07 +08:00
MrLee.Kun
491238ce7d Don't overwrite the params from function ValidRouter 
just add new params to context.Input.Params
 2015-06-13 01:04:46 +08:00
astaxie
d9bb1a3592 logs support elasticsearch adapter 2015-06-13 00:25:48 +08:00
astaxie
9c6775c22c log default use synchro, and support async 2015-06-13 00:25:21 +08:00
astaxie
4d70b22f96 Merge pull request #1157 from ziyel/master 
Let filter function get more params info from ctx.Input.Params
 2015-06-11 14:38:19 +08:00
ziyel
d943d16d52 gofmt 2015-06-10 21:26:04 +08:00
空见
bbb6f31f16 support eq&ne for orm 2015-06-09 10:18:21 +08:00
astaxie
364cacf659 record the critical logs in Prod 2015-06-08 22:00:28 +08:00
astaxie
21586586ba Merge pull request #1198 from kongjian/develop 
remove space after int()& add sort for commentsRouter file
 2015-06-08 20:20:40 +08:00
空见
e1d7bc8826 remove space after int()& add sort for commentsRouter file 2015-06-08 17:25:46 +08:00
astaxie
499ee09d4b Merge pull request #1194 from zieckey/GetMulti 
Add GetMulti method for Cache interface
 2015-06-08 08:36:20 +08:00
weizili.build17
970f0b460c Add GetMulti method for Cache interface 2015-06-07 21:33:01 +08:00
astaxie
9280683935 Merge pull request #1193 from zieckey/auth 
Execute AUTH command when the "password" is configured
 2015-06-07 20:34:32 +08:00
weizili.laptop
a58c8180e8 Execute AUTH command when the "password" is configured 2015-06-07 16:26:23 +08:00
astaxie
b9852df51c Merge pull request #1190 from xboston/patch-1 
fix session table
 2015-06-04 22:09:26 +08:00
Nikolay Kirsh
8e71d31dbe fix session table 2015-06-04 18:40:10 +05:00
astaxie
db06e954b5 fix the session memcache bug 2015-05-28 12:04:19 +08:00
astaxie
3abd01799d split into small files 2015-05-27 23:46:45 +08:00
astaxie
ae37689314 fix #1176 grace support windows 2015-05-27 23:22:05 +08:00
astaxie
40974365e6 Merge branch 'develop' of https://github.com/astaxie/beego into develop 2015-05-25 09:10:59 +08:00
astaxie
edbaa080f1 update the string 2015-05-25 09:10:38 +08:00
astaxie
d56491ab3a sync beeApp.Server to graceful 2015-05-25 09:10:38 +08:00