230 Commits

Author SHA1 Message Date
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
lichengyin
4cc6e7bd94 rename bin/index.js to src/command.js 2015-12-03 12:06:20 +08:00
lichengyin
ca6822a7f4 ignore hidden files, fix #216 2015-12-03 10:42:22 +08:00
lichengyin
c444f7f1aa update thinkit version to 3.3.0 2015-12-03 10:24:03 +08:00
lichengyin
33d8bf50fa release 2.0.12 2015-12-02 17:00:14 +08:00
lichengyin
5448f3337c update thinkit dependency version 2015-12-02 15:02:42 +08:00
lichengyin
5dd297b7e0 add eslint for devDependencies 2015-12-01 20:12:15 +08:00
lichengyin
7bf5643124 add test-all command 2015-12-01 13:52:57 +08:00
lichengyin
259fbdd5a4 release 2.0.11 2015-11-27 12:29:08 +08:00
lichengyin
965b9f563c release 2.0.10 2015-11-20 17:57:28 +08:00
lichengyin
a68c45309a release 2.0.9 2015-11-15 08:07:43 +08:00
lichengyin
5da77e7019 release 2.0.8 2015-11-14 15:25:55 +08:00
lichengyin
6641921a71 release 2.0.7 2015-11-13 22:01:13 +08:00
lichengyin
b20aab3bc9 release 2.0.6 2015-11-08 08:55:50 +08:00
lichengyin
28b7d59276 refactory adapter 2015-11-07 20:39:16 +08:00
lichengyin
4164abde71 update test-cov command 2015-11-07 09:21:43 +08:00
lichengyin
13721ab12a add file auto compile 2015-11-05 11:12:54 +08:00
lichengyin
251ef5bedc update package.son 2015-11-05 08:58:42 +08:00
lichengyin
7530ae3320 optimize think.session & session config 2015-11-04 09:51:09 +08:00
lichengyin
850ba2546a release 2.0.5 2015-11-02 13:40:52 +08:00
lichengyin
571a95248a update devDependencies version 2015-10-30 14:51:31 +08:00
lichengyin
2b15811562 add node env 2015-10-30 10:18:05 +08:00
lichengyin
612d28b0e6 remove .gitignore when create application 2015-10-30 09:56:57 +08:00
lichengyin
ce3cdfa222 release 2.0.2 2015-10-30 09:53:08 +08:00
lichengyin
cc9d2f7ccd release 2.0.1 2015-10-30 09:49:12 +08:00
lichengyin
51d99080e7 update doc 2015-10-30 09:29:46 +08:00
lichengyin
4dce495bb4 update dependencies version 2015-10-22 11:17:20 +08:00
lichengyin
c70e374ba5 update thinkit dependence version to 3.x.x 2015-10-20 16:07:02 +08:00
lichengyin
cc06e9c429 support nunjucks template 2015-10-16 09:59:16 +08:00
lichengyin
d7a0687f22 merge es6 branch 2015-10-09 19:01:42 +08:00
lichengyin
6422633f66 merge 2015-10-09 18:57:27 +08:00
lichengyin
510e4dd612 pub 1.2.10 2015-09-17 19:07:02 +08:00
lichengyin
b8e45d9cd2 change default template engine to ejs 2015-08-27 12:47:02 +08:00
welefen
ba06bdd259 update dependencies 2015-08-25 18:35:32 +08:00
welefen
bbb7bcd41a add bin file 2015-08-10 10:54:25 +08:00
welefen
9f544a09b0 refactoring validator 2015-08-06 10:52:49 +08:00
welefen
abd99efaec pub v1.2.9 2015-07-30 15:55:59 +08:00