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

2922 Commits

Author SHA1 Message Date
astaxie
14cd9e51ac revert the sort map for reset 2014-08-14 11:54:15 +08:00
astaxie
886bb782a5 sort the reset 2014-08-14 11:44:10 +08:00
astaxie
d2119f715c update the migrations 2014-08-14 11:39:59 +08:00
astaxie
f98b1810ab update the reset 2014-08-14 10:56:49 +08:00
astaxie
55a7711017 migration: skip reset 2014-08-14 10:19:55 +08:00
astaxie
436edda926 Merge branch 'master' into develop 2014-08-13 20:39:14 +08:00
astaxie
1f1190fbc3 Merge pull request #738 from smallfish/master
Add CustomAbort() for Controller, support status code and body
2014-08-13 20:16:36 +08:00
smallfish
20463fa725 Add CustomAbort() for Controller, support status code and body 2014-08-13 17:26:22 +08:00
astaxie
ae37f95239 migration: delete the unique key for name 2014-08-13 16:42:16 +08:00
astaxie
da6726f3da Merge pull request #737 from ZhengYang/develop
change time format for migration module
2014-08-13 16:37:13 +08:00
Zheng Yang
32469cd69d change time format 2014-08-13 16:09:13 +08:00
astaxie
e572f45296 update the error output 2014-08-13 14:50:32 +08:00
astaxie
efcaa3d934 update the migration database time format 2014-08-13 11:16:19 +08:00
astaxie
5ecfe0c335 beego hook change the path & fix the migration bug 2014-08-13 10:43:05 +08:00
astaxie
d325a66fee update the error info 2014-08-12 16:35:59 +08:00
astaxie
fe9017c819 update the description 2014-08-12 15:50:28 +08:00
astaxie
b97279a74f update the migration 2014-08-12 15:49:30 +08:00
astaxie
6a78898bb1 beego: fix the tree for addtree & add testcase 2014-08-12 15:09:12 +08:00
astaxie
f201859fa7 beego: fix the addTree 2014-08-12 00:15:39 +08:00
astaxie
52fdfc5665 beego: fix the tree addTree for regexp 2014-08-12 00:02:27 +08:00
astaxie
8ed6d06572 fix the regexps bugs 2014-08-11 22:40:55 +08:00
astaxie
b5a2347e1d Merge pull request #733 from liulixiang1988/develop
improve the 'geturl'
2014-08-11 22:25:53 +08:00
liulixiang1988
118e07158e improve the 'geturl'
If we have a url mapping like this:
`beego.Router(“/test”, &controllers.WeightController{},
"get:GetDetails”)`
when u use `UrlFor(“WeightController.GetDetails”, “foo”, 1, “bar”, 2 `,
it should return `/test?foo=1&bar=2` rather than `/test`.
2014-08-11 22:19:59 +08:00
astaxie
7a376c32be delete forms 2014-08-11 22:13:57 +08:00
astaxie
3d74a1a436 make the getconfig public
// Getconfig throw the Runmode
// [dev]
// name = astaixe
// IsEnable = false
// [prod]
// name = slene
// IsEnable = true
//
// usage:
// GetConfig("string", "name")
// GetConfig("bool", "IsEnable")
2014-08-11 22:13:18 +08:00
astaxie
00eac0e4cb Merge pull request #729 from francoishill/patch-9
Update captcha.go
2014-08-11 21:41:22 +08:00
Francois
58ac0d5ea4 Update captcha.go
Captcha must be deleted if the user entered a "challenge" with a different length than the captcha.
2014-08-09 15:35:29 +02:00
astaxie
2773fda883 session:change the driver from beego to bradfitz 2014-08-08 16:43:39 +08:00
astaxie
99c03a2b9c fix the nil judge 2014-08-08 13:16:51 +08:00
astaxie
b1b4dbb0e4 fix the nil judge 2014-08-08 12:02:44 +08:00
astaxie
77e1f26dd4 Merge pull request #728 from nizsheanez/null_pointer_panic_improve
[orm] improve null pointer panic message
2014-08-08 09:01:51 +08:00
astaxie
2820f630c8 config: add more method
DefaultString(key string, defaultval string) string      // support
section::key type in key string when using ini and json type;
Int,Int64,Bool,Float,DIY are same.
	DefaultStrings(key string, defaultval []string) []string //get string
slice
	DefaultInt(key string, defaultval int) int
	DefaultInt64(key string, defaultval int64) int64
	DefaultBool(key string, defaultval bool) bool
	DefaultFloat(key string, defaultval float64) float64
	DIY(key string) (interface{}, error)
	GetSection(section string) (map[string]string, error)
	SaveConfigFile(filename string) error
2014-08-07 17:24:21 +08:00
astaxie
1f6c5599aa migration: version 1 2014-08-07 16:30:28 +08:00
Alexey Sharov
df8c73b23a improve null pointer panic message 2014-08-07 12:14:10 +07:00
astaxie
ea6982fcea beego: template fund when the start> len(bt) 2014-08-05 23:52:06 +08:00
astaxie
a3f40234ca Merge branch 'develop' of https://github.com/astaxie/beego into develop 2014-08-05 08:56:34 +08:00
astaxie
2c420573d4 fix #703 2014-08-05 08:56:04 +08:00
astaxie
c0d3cc6fc5 beego: fix the domain string 2014-08-05 08:55:46 +08:00
astaxie
3f7ecea089 beego: Display function move from toolbox to utils 2014-08-04 20:52:18 +08:00
astaxie
f4147058fc fix when delete the commentsRouter.go 2014-08-04 17:39:14 +08:00
astaxie
1fb24aca34 beego: commentsrouter use the workPath fix #708 2014-08-04 17:34:52 +08:00
astaxie
885c0678ff move filter wrong http method 2014-08-04 16:21:34 +08:00
astaxie
d7a5281bda session: support cookie domain 2014-08-04 16:21:06 +08:00
astaxie
474a16a7a0 beego: improve the static file server 2014-08-04 15:31:27 +08:00
astaxie
1d36b19cab Merge branch 'develop' of https://github.com/astaxie/beego into develop 2014-08-04 15:00:42 +08:00
astaxie
deed251794 Merge pull request #720 from MicroMoon/patch-1
revise the comment of SliceIntersect
2014-08-02 23:28:08 +08:00
Stan Sun
22ba252c8f fix the comment of SliceIntersect
The implementations of SliceDiff and SliceIntersect are the same.
However, the comments of them are opposite.
The former is (slice1 - slice2) while the latter is (slice2- slice1)
2014-08-02 17:54:57 +08:00
astaxie
289f050c04 cache: fix comments the return err 2014-08-02 10:12:03 +08:00
astaxie
bbd31131a4 beego:parse judge weather the commentsRouter exist 2014-08-02 10:11:45 +08:00
astaxie
008ae39ff6 Merge branch 'master' into develop 2014-08-01 17:04:22 +08:00