266 Commits

Author SHA1 Message Date
welefen
19e339ad73 Release 2.2.8 2016-08-04 10:35:30 +08:00
welefen
3989c5e929 Use node-mysql instead 2016-08-01 11:09:22 +08:00
welefen
d4191d3858 Release 2.2.7 2016-07-28 16:04:21 +08:00
welefen
c864398d46 Release 2.2.6 2016-07-28 09:54:09 +08:00
lichengyin
a51c4c5c84 Release 2.2.5 2016-06-17 15:55:12 +08:00
lichengyin
c814ad4402 Upgrade thinkit version 2016-06-03 18:44:32 +08:00
lichengyin
c9873b4d11 Release 2.2.4 2016-05-25 14:42:42 +08:00
lichengyin
b85b76d2af Release 2.2.3 2016-05-05 17:48:35 +08:00
lichengyin
782569da58 Add babel-preset-es2015 dependency 2016-04-27 20:13:27 +08:00
lichengyin
7c1368a595 Release 2.2.2 2016-04-27 19:13:02 +08:00
lichengyin
1f668d92e8 Upgrade dependency version 2016-04-27 18:53:44 +08:00
lichengyin
9b9e6a3446 Use node-mysql2 to replace node-mysql, fix #308 2016-04-26 11:58:55 +08:00
lichengyin
51dd66e9cd Release 2.2.1 2016-03-30 19:07:06 +08:00
lichengyin
96134cf436 Release 2.2.0 2016-03-30 09:39:36 +08:00
lichengyin
0baf5a2bdc Optimize session, when session cookie not exist, ignore fetch data 2016-03-29 10:27:12 +08:00
lichengyin
e60e80c743 Add source-map in devDependencies 2016-03-25 16:15:47 +08:00
lichengyin
3bc0686906 Change test timeout to 50s 2016-03-25 14:53:55 +08:00
lichengyin
38f188611d Fea: get message under src when has error 2016-03-16 20:02:14 +08:00
lichengyin
3e5e04a243 upgrade thinkit to 4.8.0 2016-03-15 17:24:39 +08:00
lichengyin
1f7959b9e0 release 2.1.8 2016-03-15 11:24:55 +08:00
lichengyin
dbedf55d53 release 2.1.7 2016-03-01 16:31:32 +08:00
lichengyin
9dde4d9cd6 Fea: upgrade dependency thinkit to 4.7.0 2016-02-28 16:53:18 +08:00
lichengyin
ee76c7e1bf release 2.1.6 2016-02-24 16:48:27 +08:00
lichengyin
c15284e38f release 2.1.5 2016-02-04 11:22:12 +08:00
lichengyin
d30e304495 fea: upgrade eslint & babel-eslint version 2016-02-03 11:10:14 +08:00
lichengyin
4b7b033c70 fea: upgrade thinkit version to 4.6.0 2016-02-03 09:42:39 +08:00
lichengyin
8071045387 Change test exec max time to 20s to avoid timeout on windows 2016-01-25 09:29:22 +08:00
lichengyin
b22431b78a release 2.1.4 2016-01-22 18:13:00 +08:00
lichengyin
8e5f899896 upgrade dependency thinkit to 4.5.0 2016-01-21 18:13:22 +08:00
lichengyin
8d6fcd202e release 2.1.3 2016-01-19 09:01:22 +08:00
lichengyin
0f485a8a7e release 2.1.2 2016-01-15 18:40:08 +08:00
lichengyin
c926ad1db2 release 2.1.1 2016-01-15 15:42:10 +08:00
lichengyin
b4ec86ea83 add isCli method for http 2016-01-14 07:51:20 +08:00
lichengyin
f409880257 change typescript dependency version to @next 2016-01-13 09:37:29 +08:00
lichengyin
5525965f21 fix test error 2016-01-11 18:39:30 +08:00
lichengyin
9834c41d76 add watch compile test cases 2016-01-11 17:56:22 +08:00
lichengyin
2231ee3d28 upgrade thinkit to 4.4.0 2016-01-07 18:31:38 +08:00
lichengyin
c59c3b5edd upgrade thinkit dependency to 4.3.0 2016-01-05 17:16:24 +08:00
lichengyin
eb81d7e78e fix test error 2016-01-04 20:33:52 +08:00
lichengyin
100a4dfc85 upgrade Babel to 6 2016-01-02 15:11:43 +08:00
lichengyin
63c5ada503 move some methods to thinkit package 2015-12-30 11:06:00 +08:00
lichengyin
7b9b29ca3d update package.son 2015-12-29 15:16:04 +08:00
lichengyin
436400c665 fix parse module in model.model method 2015-12-29 15:14:46 +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
8dd9ec5a61 release 2.0.15 2015-12-25 17:38:02 +08:00
lichengyin
d24c3db6b6 release 2.0.14 2015-12-25 12:51:40 +08:00
lichengyin
ebb85e4f1a avoid http._file changed when change file data 2015-12-17 10:28:06 +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
286b6b6517 fix model test error 2015-12-09 17:10:44 +08:00
lichengyin
71c7721702 release 2.0.13 2015-12-08 09:05:54 +08:00