3268 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
astaxie	b0e2bbce2a	Merge pull request #3391 from astaxie/develop ... V1.11.0	2018-11-19 14:40:43 +08:00
astaxie	7a50ea7e36	Merge pull request #3395 from astaxie/AddTestForSnakeString ... #3192 AddTestSnakeString	2018-11-18 21:59:48 +08:00
astaxie	3070cfc60b	Merge pull request #3396 from astaxie/FixAnnotationOnSnakeString ... Fix #3192	2018-11-18 21:59:35 +08:00
Dennis	c4c3067a31	Update utils.go	2018-11-15 15:16:41 +08:00
Dennis	81346fe641	Update utils_test.go	2018-11-15 14:50:38 +08:00
astaxie	1a66ad56c6	Merge pull request #3317 from HSoshiant/master ... Lock	2018-11-14 19:24:23 +08:00
astaxie	31f2adb79d	Update session.go	2018-11-14 19:24:10 +08:00
astaxie	f514ae309b	Update session.go	2018-11-14 19:23:10 +08:00
astaxie	277d3d98e3	v1.11.0	2018-11-14 17:01:12 +08:00
astaxie	2c46877b36	Merge pull request #3390 from astaxie/FixDataRaceOnCache ... Fix #3354	2018-11-14 15:58:20 +08:00
astaxie	cfe54a02c5	Merge pull request #3388 from s00500/develop ... Closes #2515 Autodetect timezone in NewOrmWithDB()	2018-11-13 16:48:18 +08:00
astaxie	55f390d08a	Merge pull request #3387 from wuyumin/master ... dynamically add task #2708	2018-11-13 14:51:41 +08:00
astaxie	cf31222643	Merge pull request #3386 from DennisMao/AddTransportSetting ... add transport setting	2018-11-13 14:50:28 +08:00
Dennis	9e036bcab5	Update memory.go	2018-11-13 14:43:23 +08:00
Lukas Bachschwell	d02170e3cb	Closes #2515 Autodetect timezone in NewOrmWithDB()	2018-11-12 10:18:05 +01:00
Yumin Wu	2d6f1af1a5	dynamically add task	2018-11-12 17:17:06 +08:00
Dennis	430457609f	Update httplib_test.go	2018-11-12 13:04:17 +08:00
astaxie	0333e26b3e	Merge pull request #3382 from lxShaDoWxl/add_custom_fs_template ... Add custom fs template	2018-11-10 22:44:28 +08:00
Viktor Vassilyev	d0d28566b9	chore(GoMod): add dependency go-bindata-assetfs in vendor dir	2018-11-10 13:41:47 +06:00
Viktor Vassilyev	872b787e6c	refactor(FileSystem): add comments function	2018-11-10 12:34:53 +06:00
Viktor Vassilyev	01a99edf80	chore(GoMod): add dependency go-bindata-assetfs	2018-11-10 12:26:19 +06:00
Viktor Vassilyev	6050d37d2a	Merge remote-tracking branch 'me/develop' into add_custom_fs_template	2018-11-10 11:39:28 +06:00
astaxie	876dce8e54	fix the routerInfo is nil	2018-11-09 18:03:26 +08:00
astaxie	24885c28f2	fix the comments update	2018-11-09 17:54:20 +08:00
astaxie	5ea04bdfd3	update mod	2018-11-09 12:37:28 +08:00
astaxie	9fdc1eaf3a	Merge pull request #3352 from SongLiangChen/develop ... add sessionid prefix	2018-11-08 23:29:05 +08:00
astaxie	6b5a70d246	Merge pull request #3378 from nukc/develop ... orm: support filter raw sql	2018-11-08 23:28:30 +08:00
astaxie	8391d26220	Merge pull request #3383 from LockGit/develop ... security question, fix arbitrary file read	2018-11-08 23:21:18 +08:00
Viktor Vassilyev	f193e313a3	refactor(FileSystem): using single-line if	2018-11-07 20:21:34 +06:00
Viktor Vassilyev	9ac4928113	refactor(Template): a detailed description of the error	2018-11-07 20:20:10 +06:00
lock	9865779f14	security question, fix arbitrary file read	2018-11-07 11:31:27 +08:00
Viktor Vassilyev	aa6d0f9f0b	fix(Template): correct check error	2018-11-06 21:40:43 +06:00
Viktor Vassilyev	68b0bd98fd	fix(Template): error handling when reading files	2018-11-06 20:41:05 +06:00
Viktor Vassilyev	3447798494	fix(Template): dependencies in travis	2018-11-06 20:18:48 +06:00
Viktor Vassilyev	ca1b96f986	feat(Template): use interface http.FileSystem	2018-11-06 20:06:21 +06:00
Viktor Vassilyev	771fe35431	feat(Template): testing fs bindata	2018-11-05 22:58:59 +06:00
Viktor Vassilyev	2f00ad1602	fix(Template): close open file	2018-11-05 22:51:20 +06:00
Viktor Vassilyev	f740b71ded	fix(Template): remove duplicate check open/exists	2018-11-05 21:08:03 +06:00
Viktor Vassilyev	7aae58a543	feat(Template): create interface FileSystem for to create custom fs	2018-11-05 21:05:19 +06:00
SongLiang	c8da875f83	add sessionId prefix	2018-11-05 09:51:27 +08:00
SongLiang	501d8a97f6	add sessionId prefix	2018-11-05 09:50:19 +08:00
nukc	736e66fcda	orm: support filter raw sql	2018-11-05 03:47:21 +08:00
SongLiang	d3ad810f16	add sessionId prefix	2018-10-29 13:35:31 +08:00
SongLiang	abc8b78065	add sessionId prefix	2018-10-29 12:18:06 +08:00
astaxie	f64e6b72e9	Merge pull request #3362 from SmartBrave/develop ... modify qbs to qps	2018-10-28 20:01:23 +08:00
astaxie	4e83b4400a	Merge pull request #3371 from HaraldNordgren/go_versions ... Bump Go versions and use 1.n.x to get latest minor versions	2018-10-28 19:49:27 +08:00
Harald Nordgren	f6f61513a1	Bump Go versions and use 1.n.x to get latest minor versions	2018-10-28 00:58:36 +02:00
yangzhiyong	8217817a0b	modify qbs to qps	2018-10-24 10:38:59 +08:00
astaxie	833f54d818	Merge pull request #3319 from Colstuwjx/annotated-filter ... Annotated filter	2018-10-23 13:45:18 +08:00
astaxie	706c086bc5	Merge pull request #3345 from dingyuanhong/develop ... fix / can use dynamic directory	2018-10-23 13:43:45 +08:00