1
0
mirror of https://github.com/astaxie/beego.git synced 2024-11-16 01:30:55 +00:00
Commit Graph

3897 Commits

Author SHA1 Message Date
Jia Li Ong
d0c1936922 Merge branch 'master' of https://github.com/jialijelly/beego 2017-06-22 19:18:49 +08:00
Jia Li Ong
338a23a12b Merge branch 'master' of https://github.com/jialijelly/beego 2017-06-22 19:18:34 +08:00
Jia Li Ong
932def1ed2 Merge branch 'master' of https://github.com/jialijelly/beego 2017-06-22 18:55:37 +08:00
Jia Li Ong
16b5a11484 Merge branch 'master' of https://github.com/jialijelly/beego 2017-06-22 18:55:25 +08:00
Jia Li Ong
547fbce86c Merge branch 'master' of https://github.com/jialijelly/beego 2017-06-22 18:53:29 +08:00
Jia Li Ong
5a2eea07cb Provide permission to access old log files to everyone 2017-06-22 18:51:52 +08:00
miraclesu
2231841d74 validation: support int64 int32 int16 and int8 type 2017-06-21 14:13:30 +08:00
astaxie
805a674825 Merge pull request #2712 from eyalpost/develop
incorrect error rendering (wrong status)
2017-06-16 13:34:28 +08:00
astaxie
f2925978f1 Merge pull request #2717 from huwenbo/master
fix panic sync: negative WaitGroup counter
2017-06-16 13:26:36 +08:00
astaxie
fe3a224a23 Merge pull request #2724 from JessonChan/develop
AddAPPStartHook func modify
2017-06-16 08:20:45 +08:00
astaxie
2754edc849 Merge pull request #2726 from moqiancong/develop
fix cache/memory fatal error: concurrent map iteration and map write
2017-06-16 08:20:03 +08:00
moqiancong
79f60274a0 fix cache/memory fatal error: concurrent map iteration and map write 2017-06-16 01:26:55 +08:00
JessonChan
a87c1c5e8e AddAPPStartHook func modify 2017-06-15 17:36:37 +08:00
huwenbo
2b00b7d66d fix panic: sync: negative WaitGroup counter 2017-06-13 20:15:43 +08:00
huwenbo
3d9286f089 fix panic: sync: negative WaitGroup counter 2017-06-13 15:34:57 +08:00
huwenbo
55e6c15073 fix panic: sync: negative WaitGroup counter 2017-06-13 15:19:51 +08:00
eyalpost
8b504e7d51 incorrect error rendering (wrong status) 2017-06-12 21:05:40 +03:00
Илья Маслов
47ef2b343e Fix run controller if it set by RumController and RunMethod in Filterfunc 2017-06-09 15:53:03 +03:00
Илья Маслов
80dcdb8645 Fix run controller if it set by RumController and RunMethod in FilterFunc 2017-06-09 15:27:26 +03:00
astaxie
d1c3bd8416 Merge pull request #2701 from eyalpost/develop
correctly handle multiple params with same type
2017-06-09 15:33:37 +08:00
eyalpost
0240e182c6 correctly handle multiple params with same type 2017-06-09 10:15:36 +03:00
Gerson Alexander Pardo Gamez
7f2e3feb3c added pattern to FilterMonitorFunc 2017-06-05 18:21:31 -05:00
Gerson Alexander Pardo Gamez
d15dd2795c added statusCode in FilterMonitorFunc 2017-06-03 15:24:45 -05:00
Jia Li Ong
0ea34fff27 Provide permission to access old log files to everyone 2017-06-02 10:56:55 +08:00
xhzhang
4e8f212069 refactor: #1899 redis cache module refactor
redis cache module refactor, to view the discussion:

  https://github.com/astaxie/beego/issues/1899
2017-05-20 19:56:38 +08:00
xhzhang
eb71d0ea7f Merge remote-tracking branch 'upstream/master' 2017-05-20 19:39:24 +08:00
BorisBorshevsky
b24ddb953c merge from upstram + resolve conflicts 2017-05-20 02:42:00 +03:00
BorisBorshevsky
12f8fbe37f Allow injecting dependencies to controllers 2017-05-20 02:06:28 +03:00
astaxie
5e8312bc23 Merge pull request #2654 from casbin/master
Fix the new repo address for casbin.
2017-05-19 23:34:58 +08:00
Yang Luo
88d07058a5 Fix the new repo address for casbin. 2017-05-19 22:19:31 +08:00
astaxie
cab8458c1c Merge pull request #2651 from astaxie/develop
v1.8.3
2017-05-19 21:19:18 +08:00
astaxie
f0b95c552b Merge pull request #2315 from sch00lb0y/master
issue no:#2261 fix for xsrf panic error
2017-05-19 18:50:56 +08:00
பாலாஜி
ce677202e5 issue no:#2261 fix for xsrf panic error 2017-05-19 14:02:14 +05:30
astaxie
720c323e20 Merge pull request #2652 from gouyang/gouyang/dev
Support timeformat "2006-01-02T15:04:05"
2017-05-19 09:48:35 +08:00
Guohua Ouyang
47e351e11d Support timeformat "2006-01-02T15:04:05"
Fixes #2649

Signed-off-by: Guohua Ouyang <guohuaouyang@gmail.com>
2017-05-19 09:22:27 +08:00
astaxie
248beab557 v1.8.3 2017-05-18 22:55:10 +08:00
astaxie
388a5610fa Merge pull request #2365 from chesedo/RequiredValidationCatchSpaces
[WIP]Have Required validator trim strings to fix #2361
2017-05-18 22:44:15 +08:00
astaxie
41498758fe Merge pull request #2620 from hsluoyz/authz
Add an authorization plugin that supports ACL, RBAC based on casbin.
2017-05-18 18:18:12 +08:00
astaxie
655484b4df Merge pull request #2586 from eyalpost/develop
Automatic Parameter Router
2017-05-18 18:14:49 +08:00
Eyal Post
11b4bf8aaa move to context 2017-05-18 10:38:12 +03:00
Eyal Post
2513bcf584 remove Redirect to avoid confusion 2017-05-18 10:32:51 +03:00
Eyal Post
3e51823c0f move response 2017-05-18 09:05:49 +03:00
Eyal Post
e32a18203b fix gosimple 2017-05-17 21:27:32 +03:00
Eyal Post
ee1d8bc30e fix gosimple 2017-05-17 20:50:41 +03:00
Eyal Post
828cbbdf5d Refactor a bit to consolidate packages 2017-05-17 20:38:59 +03:00
Eyal Post
d54cd4fa5f Merge remote-tracking branch 'upstream/develop' into develop 2017-05-17 20:02:40 +03:00
astaxie
7747e9ec8b Merge branch 'develop' of https://github.com/astaxie/beego into develop 2017-05-17 20:52:53 +08:00
astaxie
9765519f38 Merge pull request #2637 from alexsunxl/develop
allow o.Raw(sql).QueryRows(&container) pass nested struct
2017-05-17 16:45:14 +08:00
astaxie
69f0b94745 fix gosimple 2017-05-16 22:21:43 +08:00
astaxie
3c9b6c99b7 Merge pull request #2643 from rbw0/master
Spelling fixes
2017-05-16 11:26:16 +08:00