lbsadmin
/
Beego
mirror of https://github.com/astaxie/beego.git
1
0
Fork 0
Code Issues Releases Activity
3,183 Commits 3 Branches 32 Tags 9.4 MiB
Commit Graph

3183 Commits

Author SHA1 Message Date
astaxie 053a075344
Merge pull request #3271 from astaxie/develop 
add vendor gopkg.in/yaml.v2
 2018-07-31 21:18:48 +08:00
astaxie 9dd7d19ce7 add vendor gopkg.in/yaml.v2 2018-07-31 21:18:07 +08:00
astaxie efe0f67388
Merge pull request #3267 from astaxie/develop 
beego 1.10.1
 2018-07-31 20:52:47 +08:00
astaxie de66d2bdfd beego 1.10.1 2018-07-31 20:09:08 +08:00
astaxie 0e4fe4d177
Merge pull request #3270 from astaxie/revert-3269-master 
Revert "hible"
 2018-07-31 20:07:18 +08:00
astaxie 6d84db1e93
Revert "hible" 2018-07-31 20:07:03 +08:00
astaxie 2486f3826a
Merge pull request #3269 from 514366607/master 
hible
 2018-07-31 20:06:55 +08:00
astaxie d7b8aa8b52 only add golang.org vendor 2018-07-31 19:25:43 +08:00
hible c7c0b01ec5 hible 
cache add function
// IncrBy increase counter by num.
IncrBy(key string, num int)
// DecrBy decrease counter by num.
DecrBy(key string, num int)
 2018-07-31 17:19:09 +08:00
astaxie 6d69047fff update go vet 2018-07-30 15:13:04 +08:00
astaxie 787ab12605 Merge branch 'develop' of https://github.com/astaxie/beego into develop 2018-07-30 15:01:58 +08:00
astaxie f4112accef update go vet 2018-07-30 15:01:49 +08:00
astaxie 42c394e28b
Merge pull request #3263 from guomao545/master 
Support return middle level value
 2018-07-30 12:27:05 +08:00
astaxie 5051d902fb
Merge pull request #2986 from oxgo/hourlylog 
add hourly log rotate
 2018-07-30 12:26:37 +08:00
astaxie 48acfa08be add vendor 2018-07-30 12:05:51 +08:00
guomao545 39fc30b8b2
Support return middle level value 
fix multilevel yaml config can't correct return middle level value bug
 2018-07-27 15:33:24 +08:00
two 046cb248e0 edit test case 2018-07-26 15:08:14 +08:00
two 31c746d9d7 fix all confict 2018-07-26 14:34:25 +08:00
two 38a2f32252 fix one confict 2018-07-26 14:29:26 +08:00
astaxie d55f54a8ab
Merge pull request #3149 from liaoishere/feature/support-begintx 
Support DB.BeginTx in go 1.8
 2018-07-23 20:25:17 +08:00
Penghui Liao feb0e67fd7 upgrade go version from 1.9.2 to 1.9.7 in test env. 
upgrade to avoid bug: https://github.com/golang/go/issues/22976

Signed-off-by: Penghui Liao <liaoishere@gmail.com>
 2018-07-23 15:58:12 +08:00
astaxie a09bafbf2a
Merge pull request #3233 from astaxie/develop 
beego 1.10.0
 2018-07-21 15:55:28 +08:00
astaxie 03de7456ca
Merge pull request #3250 from 0x0400/develop 
acquire lock when access config data
 2018-07-21 15:25:23 +08:00
Xingang Zhang 78f2fd8d14 acquire lock when access config data 2018-07-21 14:56:09 +08:00
astaxie a048ed51a7 ready to release 1.10.0 2018-07-21 09:29:00 +08:00
astaxie 164a9231e8
Merge pull request #3249 from GNURub/feature/autocert 
Feature/autocert
 2018-07-21 09:20:07 +08:00
Ruben Cid aaa7e33778 Autocert ok 2018-07-20 19:54:25 +02:00
Ruben Cid f7008e2877 Removed patch 2018-07-20 19:02:09 +02:00
Ruben Cid cf6e825547 Domains 2018-07-20 18:59:45 +02:00
Ruben Cid 38f9a3c49e AutoCert 2018-07-20 18:53:57 +02:00
astaxie f18283a517
Merge pull request #3181 from GNURub/feature/YAML 
Feature/yaml
 2018-07-20 23:41:15 +08:00
astaxie 61aec396e0
Update .travis.yml 2018-07-20 23:40:11 +08:00
astaxie 5ba9e63086
Merge branch 'develop' into feature/YAML 2018-07-20 23:24:51 +08:00
astaxie 5acc56648d
Merge branch 'develop' into feature/support-begintx 2018-07-20 23:16:12 +08:00
astaxie bc773039ca
Merge pull request #2997 from DennisMao/master 
fix the model can not be registered correctly on Ubuntu 32bit
 2018-07-20 23:14:41 +08:00
astaxie 868fc2a29f fix go1.10.3 orm test failed 2018-07-20 22:45:44 +08:00
astaxie 81f69f12ab Merge branch 'develop' of https://github.com/astaxie/beego into develop 2018-07-20 22:30:25 +08:00
astaxie 0711c3289f fix the orm test 2018-07-20 19:58:56 +08:00
Penghui Liao b8868d6d2d remove unnecessary conversion 
Signed-off-by: Penghui Liao <liaoishere@gmail.com>
 2018-07-20 17:07:17 +08:00
Penghui Liao 30bbc81a2e fix test case that calls All() 
Signed-off-by: Penghui Liao <liaoishere@gmail.com>
 2018-07-20 16:51:36 +08:00
Penghui Liao 1a3f1d66c1 rename orm_go18.go to orm.go 
Signed-off-by: Penghui Liao <liaoishere@gmail.com>
 2018-07-20 16:36:06 +08:00
Penghui Liao 6bdd152d91 upgrade postgres in travis 
Signed-off-by: Penghui Liao <liaoishere@gmail.com>
 2018-07-20 16:36:06 +08:00
Penghui Liao 443c77b303 support DB.BeginTx of golang 1.8 
Signed-off-by: Penghui Liao <liaoishere@gmail.com>
 2018-07-20 16:36:06 +08:00
Penghui Liao 0dff771707 fix unquoted identifier that may be misleading in postgres 
Signed-off-by: Penghui Liao <liaoishere@gmail.com>
 2018-07-20 16:36:06 +08:00
astaxie c9b6e4f825
Merge pull request #2981 from TankTheFrank/fix_template_render_with_automatic_parameter_routing 
fixes template rendering with automatic mapped parameters (see #2979)
 2018-07-20 15:39:10 +08:00
astaxie abd02c7de4
Merge pull request #2985 from terryding77/fix_orm_Field_SetRaw_function_error_judge_problem 
fix orm fields SetRaw function error judge problem
 2018-07-20 15:36:40 +08:00
astaxie eb4e0e4030
Merge pull request #3022 from chenpeiyuan/develop 
do html escape before display path, avoid xss
 2018-07-20 15:33:12 +08:00
astaxie 96dffcd27f
Merge pull request #3105 from ckahi/hotfix_log_dir 
auto create log dir
 2018-07-20 15:32:42 +08:00
astaxie 0d0d87f600 Merge branch 'develop' of https://github.com/astaxie/beego into develop 2018-07-20 15:25:04 +08:00
astaxie 2c779a4287
Merge pull request #3141 from gadelkareem/patch-2 
Improve access log
 2018-07-20 15:20:15 +08:00