3807 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
astaxie	f25893832f	Merge pull request #3142 from amitash1109/fix_response_http_code ... Fix response http code	2018-07-20 15:18:54 +08:00
astaxie	af73a2d515	Merge branch 'develop' into fix_response_http_code	2018-07-20 15:18:30 +08:00
astaxie	67a6b8723c	Merge pull request #3146 from Wang-Kai/master ... Add code style for logs README	2018-07-20 15:17:31 +08:00
astaxie	fdccd85330	Merge pull request #3152 from joshtechnologygroup/staticfile_unexpected_eof_bug_gix ... [#2973] Fix Unexpected EOF bug in staticfile	2018-07-20 15:09:07 +08:00
astaxie	ca394fc8ab	Merge pull request #3182 from GNURub/feature/autobind ... Add method to set the data depending on the accepted	2018-07-20 15:05:28 +08:00
astaxie	9c9ba0129f	Merge pull request #3226 from jianjianzhu/master ... Fix the wrong status code in prod	2018-07-20 14:53:08 +08:00
astaxie	b61c91d93d	remove unnecessary conversion	2018-07-20 14:47:11 +08:00
astaxie	f15732798f	Merge pull request #3239 from wilhelmguo/develop ... add session redis IdleTimeout config	2018-07-20 14:44:07 +08:00
astaxie	efbe655d6a	Merge pull request #3245 from 0x0400/patch-1 ... fix typo	2018-07-20 14:43:38 +08:00
astaxie	27ced1d9c3	Merge pull request #3247 from mohan2808/develop ... send ErrNoRows if the query returns zero rows ... in method orm_query…	2018-07-20 14:34:23 +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
mohan2808	293b54192f	send ErrNoRows if the query returns zero rows ... in method orm_queryset.All()	2018-07-19 18:51:16 +05:30
Xingang Zhang	0e0718d110	fix typo ... hasReuired --> hasRequired	2018-07-17 23:32:11 +08:00
guoshaowei	6fec0a7831	add session redis IdleTimeout config	2018-07-12 10:48:50 +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
zhujianjian	464d080518	fix httpcode in prod	2018-07-02 11:21:06 +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