1
0
mirror of https://github.com/astaxie/beego.git synced 2024-11-25 20:51:29 +00:00
Commit Graph

3098 Commits

Author SHA1 Message Date
astaxie
b61c91d93d remove unnecessary conversion 2018-07-20 14:47:11 +08:00
astaxie
8f6bce3b87 fix test case 2018-07-20 14:26:43 +08:00
astaxie
be75f93d43 add miss dep 2018-07-20 12:14:27 +08:00
astaxie
541fb181fe Merge branch 'master' into develop 2018-07-20 12:00:53 +08:00
astaxie
654ebebe3c
Merge pull request #3217 from jinxjinxagain/develop
fix: When multiply comment routers on one func
2018-07-08 16:13:21 +08:00
astaxie
08c3ca642e
Merge pull request #3230 from Colstuwjx/fix/correct-httplib-maxidleconnection-default-value
Fix: correct MaxIdleConnsPerHost value to net/http default 100.
2018-07-08 16:11:35 +08:00
Colstuwjx
b3c46a87ac Fix: correct MaxIdleConnsPerHost value to net/http default 100. 2018-07-05 19:15:42 +08:00
jinxjinxagain
227c04c9e6 fix: When multiply comment routers on one func, only generates the last one controller 2018-06-28 15:54:17 +08:00
astaxie
e5d68aceed
Merge pull request #3185 from kaka89/master
Fix defaut value bug, and add config for maxfiles
2018-06-23 22:54:35 +08:00
astaxie
67d9241abc
Merge pull request #3171 from whomm/master
debug stringsToJSON
2018-06-23 22:50:11 +08:00
astaxie
110dbcb31f
Merge pull request #3208 from hurisheng/qs_forupdate
add 'FOR UPDATE' support for querySet
2018-06-23 22:49:01 +08:00
astaxie
740bf72f0c
Merge pull request #3202 from openset/develop
Update: Htmlquote Htmlunquote
2018-06-23 22:43:53 +08:00
astaxie
6b3b8607a0
Merge branch 'develop' into develop 2018-06-23 22:43:45 +08:00
astaxie
b21c59ee70
Merge pull request #3206 from whilei/gofmt-2018-Jun-17-00-39
gofmt
2018-06-23 22:38:07 +08:00
hurisheng
fc2c96a177 add 'FOR UPDATE' support for querySet 2018-06-23 22:25:05 +08:00
ia
87ba3f3cd3 all: gofmt
Run standard gofmt command on project root.

- go version go1.10.3 darwin/amd64

Signed-off-by: ia <isaac.ardis@gmail.com>
2018-06-17 00:47:51 +02:00
Openset
b80b7b06fc Update: Redundant semicolon disableEscapeHTML 2018-06-14 11:55:07 +08:00
Openset
ad6c97ec1b Update: Htmlquote Htmlunquote 2018-06-13 15:43:01 +08:00
astaxie
d3d97de312
Merge pull request #3200 from openset/master
Update: use PathEscape replace QueryEscape
2018-06-12 22:45:14 +08:00
Sandy
bf915c3280
Update: use PathEscape replace QueryEscape
If filename contain space(" "), QueryEscape use "+" instead.
2018-06-12 16:15:20 +08:00
astaxie
19c5cd130d
Merge pull request #3190 from NSObjects/develop
add field comment on create table
2018-06-07 11:06:23 +08:00
lintao
1df2662924 add field comment on create table 2018-06-06 12:33:28 +08:00
umasuo
f979050a45
Fix defaut value bug, and add default maxfiles
1. add default value for maxlines(100000), maxsize(1 << 28)
2. add maxfiles for configure, just like `maxlines` & maxsize
2018-06-03 23:08:03 +08:00
astaxie
cc2c98c112 update travis 2018-05-30 22:01:59 +08:00
astaxie
c3c0adbf55
Merge pull request #3175 from mo0feng/master
Create redis_cluster.go
2018-05-28 16:48:06 +08:00
jz
04c305f273
fix use it comments
fix  use it comments
2018-05-24 15:14:56 +08:00
jz
8c8cf46b55
Create redis_cluster.go
super redis cluster
2018-05-23 17:30:13 +08:00
whomm
e96ae0c24a debug stringsToJSON
json char: \u four-hex-digits number(http://json.org/)
2018-05-21 15:18:18 +08:00
astaxie
3d3f2ed4c5
Merge pull request #3127 from kaka89/master
Refactor yaml config for support multilevel
2018-05-03 14:07:59 +08:00
astaxie
a40899e6be
Merge pull request #3145 from gadelkareem/develop
Allow log prefix
2018-05-03 11:27:50 +08:00
Waleed Gadelkareem
a9a15e2c54 Allow log prefix 2018-05-02 00:24:09 +02:00
umasuo
ccaa2dd9e0
Update yaml.go
delete white line.
2018-04-20 19:44:22 +08:00
astaxie
507ea757d7
Merge pull request #3039 from cloudzhou/patch-1
execElem.FieldByName as local variable
2018-04-20 19:41:07 +08:00
astaxie
9d526dfd50
Merge pull request #3100 from godcong/master
change github.com/garyburd/redigo to newest branch github.com/gomodul…
2018-04-20 19:40:30 +08:00
umasuo
ba89253e4a
Update yaml.go
add support for multilevel yaml config
2018-04-20 19:40:06 +08:00
astaxie
0d6f190e72
Merge pull request #3107 from sergeylanzman/patch-1
Update .travis.yml golang 1.10
2018-04-20 19:33:50 +08:00
astaxie
91b9a65db0
Merge pull request #3109 from Jeff885/Jeff885-patch-1
When log maxSize set big int,FileWrite Init fail
2018-04-20 19:33:33 +08:00
astaxie
e96a5fb3ca
Merge pull request #3115 from m4grio/minor-typo
Amend a very minor typo in a variable name
2018-04-20 19:26:42 +08:00
astaxie
f5f70f386d
Merge pull request #3126 from aruhi/master
In dev mode, template parse error cause program lock
2018-04-20 19:26:24 +08:00
astaxie
242efcf7fa
Merge pull request #3103 from qshuai/master
fix typo
2018-04-20 19:26:00 +08:00
aruhi
51cc6fc257
Update template.go 2018-04-20 19:42:50 +09:00
Mario Álvarez
5fb29cb772
Amend a very minor typo in a variable name 2018-04-10 12:19:50 +08:00
MinJie Gu
2da894d4a7
When log maxSize set big int,FileWrite Init fail
example:
beego.SetLogger("multifile", {"filename":"logs/liverelay.log","separate":[ "emergency", "error", "info", "debug"],"maxsize":250000000}).

json: cannot unmarshal number 2.5e+08 into Go value of type int

The err should return and show the developer.
2018-04-06 00:50:35 +08:00
Sergey Lanzman
2623b15ce0
Update .travis.yml 2018-04-05 16:30:08 +03:00
qshuai
889408136b fix typo 2018-03-28 00:26:06 +08:00
godcong
886fefe738 change github.com/garyburd/redigo to newest branch github.com/gomodule/redigo 2018-03-26 16:59:01 +08:00
astaxie
768406f134
Merge pull request #3076 from gadelkareem/patch-1
Set default Beego RunMode to production
2018-03-11 16:26:00 +08:00
astaxie
075e63b2bd
Merge pull request #2999 from moririnson/fix_unable_to_add_column
fix the issue #2998
2018-03-11 16:18:50 +08:00
astaxie
0057c08a90
Merge pull request #3085 from WUMUXIAN/swagger
Swagger: Allow example values with different types, allow example for enum.
2018-03-11 10:48:48 +08:00
WUMUXIAN
09b073356d Swagger:
1. Allow example value to be given based on the field type, previously it's a string.
2. Allow to give example values for Enum values.

This is for the beego/bee pull request to work well.
2018-03-10 17:15:24 +08:00