8 Commits

Author	SHA1	Message	Date
lichengyin	3f28342192	fix windows test error	2015-12-17 15:55:21 +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	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	afa2b170c4	update test case	2015-11-08 08:44:19 +08:00
welefen	c938c07840	add file session test case	2015-07-25 20:44:57 +08:00