112 Commits

Author	SHA1	Message	Date
welefen	53e484c871	Fix mongo socket test error	2016-08-16 15:30:34 +08:00
lichengyin	460c5b4b90	Add try when has error on mysql socket, fix #371	2016-06-17 15:49:04 +08:00
lichengyin	8f447d493a	remove default value when get table schema	2016-03-17 18:36:04 +08:00
lichengyin	8d5ad98849	Fix: fix parseGroup error when has expression	2016-03-14 11:47:50 +08:00
lichengyin	48b885a594	Fix: fix parse join when table name has keyword	2016-02-24 16:14:10 +08:00
lichengyin	2cce1d77b8	fix: check template content empty before cached	2016-02-03 09:56:00 +08:00
lichengyin	631cbaf353	feature: use async render method in nunjucks template	2016-01-22 15:42:22 +08:00
lichengyin	d8b294edfc	feature: add global think, JSON, eval for nunjucks template	2016-01-21 11:44:33 +08:00
lichengyin	61a6f7a21a	Fix: fix test error on Node.js 0.12	2016-01-20 12:07:43 +08:00
lichengyin	a7a7533a78	Fix: fix sqlite already use name key for config, replace to database	2016-01-20 10:27:13 +08:00
lichengyin	2e8bb7be8b	Fix: fix extend options.where error when options.where is string	2016-01-18 17:09:24 +08:00
lichengyin	427cb5973a	revert to ejs support pretender	2016-01-13 17:10:06 +08:00
lichengyin	64167f6268	remove prerender for ejs	2016-01-13 17:07:49 +08:00
lichengyin	1b6504395e	add test cases	2016-01-11 12:40:48 +08:00
lichengyin	44034d18d9	add test cases	2016-01-09 11:32:44 +08:00
lichengyin	1ed41c91ce	Merge branch 'master' into 2.1 ... * master: release 2.0.16 add context for think.parseConfig Conflicts: package.json src/adapter/cache/memcache.js src/adapter/cache/redis.js	2016-01-07 19:29:40 +08:00
lichengyin	7e61ac7075	add context for think.parseConfig	2016-01-07 19:23:50 +08:00
lichengyin	100a4dfc85	upgrade Babel to 6	2016-01-02 15:11:43 +08:00
lichengyin	376c005972	rename config key pwd to password in db	2016-01-01 06:51:42 +08:00
lichengyin	1b435f1526	change fields property to schema	2015-12-30 19:00:38 +08:00
lichengyin	418779604e	rename config db.name to db.database	2015-12-29 18:04:37 +08:00
lichengyin	2a6639c1da	fix test error on windows	2015-12-29 17:00:35 +08:00
lichengyin	a899320f19	Merge branch 'master' into 2.1 ... * master: release 2.0.15 fix error in nunjucks template, add tests fix error in nunjucks template release 2.0.14 Conflicts: src/adapter/template/nunjucks.js	2015-12-25 17:39:37 +08:00
lichengyin	dedc9d60a7	fix error in nunjucks template, add tests	2015-12-25 17:37:13 +08:00
lichengyin	f7c1dfeb31	Merge branch 'master' into 2.1 ... * master: only set root_path for nunjucks template when templateFile startWith root_path support multi host for mongo Update README_zh-CN.md	2015-12-24 17:39:08 +08:00
lichengyin	3fd9231cd0	support multi host for mongo	2015-12-24 17:36:38 +08:00
lichengyin	c8a1537ed9	fix windows test error	2015-12-17 20:05:38 +08:00
lichengyin	4d386c6f99	fix windows test error	2015-12-17 16:10:40 +08:00
lichengyin	9a3143d087	fix windows test error	2015-12-17 16:08:36 +08:00
lichengyin	3f28342192	fix windows test error	2015-12-17 15:55:21 +08:00
lichengyin	834ad2611b	use async to get template file content	2015-12-09 19:02:46 +08:00
lichengyin	49b816e2e6	Merge branch 'master' into 2.1 ... * master: release 2.0.13 clear bootstrap files cache before load fix parseConfig error when has adapter config fix error when use alias in countSelect method open auto escape in nunjucks fix test error 修复update的时候因为误删了id字段导致不能关联更新的bug cache adapter的bug修复 release 2.0.12 fix auto reload fail in windows Conflicts: src/core/think.js src/index.js src/model/base.js test/model/base.js	2015-12-09 17:29:14 +08:00
lichengyin	c4ba0241ea	change position of runtime path	2015-12-04 21:59:33 +08:00
lichengyin	e793908e3f	fix nunjucks test error	2015-12-04 18:52:03 +08:00
lichengyin	4d7525c55a	fix test error	2015-11-27 14:13:20 +08:00
lichengyin	c85e023074	update	2015-11-27 13:23:38 +08:00
lichengyin	dcebaebfc2	improve test case	2015-11-27 10:17:54 +08:00
lichengyin	df0a5d4daf	fix appveyor build error	2015-11-27 09:28:11 +08:00
lichengyin	350983d1da	fix test error	2015-11-19 18:12:11 +08:00
lichengyin	597e8350e0	fix redis session test error	2015-11-12 09:48:23 +08:00
lichengyin	14c14187d7	optimize get socket instance	2015-11-11 10:59:25 +08:00
lichengyin	afa2b170c4	update test case	2015-11-08 08:44:19 +08:00
lichengyin	f600991ab1	optimize redis session	2015-11-07 22:07:46 +08:00
lichengyin	eb6e5a78d9	add parseConfig method to think.adapter.base, optimize redis & memcache cache	2015-11-07 22:00:56 +08:00
lichengyin	2c8e58bf38	remove view.options config, use view.adapter instead	2015-11-07 21:40:32 +08:00
lichengyin	28b7d59276	refactory adapter	2015-11-07 20:39:16 +08:00
lichengyin	ade5397a14	fix test case error	2015-11-06 09:25:35 +08:00
lichengyin	485d876e7b	update file store test case	2015-11-03 10:59:51 +08:00
lichengyin	3a2a00b160	fix template test errors	2015-11-01 21:57:09 +08:00
lichengyin	590c2a84fe	check where condition when update db data	2015-11-01 09:31:45 +08:00