archive-gh-me/thinkjs
1
0
Fork 0
mirror of https://github.com/thinkjs/thinkjs.git synced 2026-01-25 14:42:47 +00:00
Code Issues Projects Releases Wiki Activity
2,297 Commits 13 Branches 87 Tags
Commit Graph

466 Commits

Author SHA1 Message Date
lichengyin
9dfe473f5b support default & readonly for model 2016-01-09 14:24:51 +08:00
lichengyin
dc214e473c add test cases 2016-01-09 13:09:47 +08:00
lichengyin
c4618a38fd add test cases 2016-01-09 12:37:55 +08:00
lichengyin
44034d18d9 add test cases 2016-01-09 11:32:44 +08:00
lichengyin
cf83cf79e0 fix error when field is keyword in count, sum, min methods. fix #236 2016-01-08 14:19:04 +08:00
lichengyin
1e1545fbc5 rename check_csrf to csrf 2016-01-08 13:45:32 +08:00
lichengyin
d35b53e2d7 fix not exec logic when is rest api, fix #234 2016-01-08 10:09:46 +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
6e9e3bd504 refactoring think.validate 2016-01-06 17:22:41 +08:00
lichengyin
a008be8f8f optimise think.validate 2016-01-05 18:23:55 +08:00
lichengyin
de5151c34a change think.cli type to string 2016-01-05 16:26:31 +08:00
lichengyin
fef8765325 add render method for controller, alias of display 2016-01-05 09:05:46 +08:00
lichengyin
eb81d7e78e fix test error 2016-01-04 20:33:52 +08:00
lichengyin
2e8b363dda fix test error 2016-01-04 13:18:22 +08:00
lichengyin
1117cec81f rename parseFilename method to basename 2016-01-04 09:42:19 +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
31c209701f fix test error on windows 2015-12-29 16:24:00 +08:00
lichengyin
12c30f0107 fix path sep error on windows 2015-12-29 15:25:03 +08:00
lichengyin
436400c665 fix parse module in model.model method 2015-12-29 15:14:46 +08:00
lichengyin
616723e102 optimise think.lookClass support sub controller 2015-12-29 14:52:23 +08:00
lichengyin
4d3b401ff1 localte_template middleware support sub controller 2015-12-29 14:30:24 +08:00
lichengyin
45d344b06b update test case 2015-12-29 11:06:58 +08:00
lichengyin
945ffb01c7 remove think.mode_mini 2015-12-29 10:59:26 +08:00
lichengyin
8f341c6de7 optimise think.route method 2015-12-28 18:44:10 +08:00
lichengyin
5678b23656 move middlewares to src/middleware path 2015-12-28 16:24:02 +08:00
lichengyin
1764f8def3 move middleware to src/middleware 2015-12-28 16:06:36 +08:00
lichengyin
0bc1d1c773 move parse_form_payload to src/middleware 2015-12-28 11:51:26 +08:00
lichengyin
c5040236b6 move output_resource middleware to src/middleware 2015-12-28 09:50:45 +08:00
lichengyin
3d0f08480f move rewite_pathname to src/middleware path 2015-12-28 09:32:43 +08:00
lichengyin
99561bb412 move subdomain_deploy middleware to src/middleware path 2015-12-27 21:20:32 +08:00
lichengyin
01347dcc0d optimise exec method 2015-12-27 21:12:04 +08:00
lichengyin
04b2d98c4f add clearData method 2015-12-25 18:39:21 +08:00
lichengyin
75555a7b72 replace thinkCache.MIDDLEWARE with thinkData.middleware 2015-12-25 18:23:48 +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
9be83eab65 move thinkCache.ALIAS to thinkData.alias, thinkCache.ALIAS_EXPORT to thinkData.export 2015-12-25 14:48:22 +08:00
lichengyin
d6c554ef74 optimize think.config 2015-12-24 20:40:47 +08:00
lichengyin
1a89b994f0 optimise think.hook, move hook data to thinkData.hook 2015-12-24 19:32:31 +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
edba52f7eb remove subdomain & check csrf middleware for default hook config 2015-12-23 18:19:10 +08:00
lichengyin
0972602e34 remove http._type property 2015-12-23 10:58:47 +08:00
lichengyin
a8f6de4af0 add think.hook.exec & think.middleware.exec method 2015-12-23 09:09:00 +08:00
lichengyin
9f9b0532c8 http object not inherit EventEmitter 2015-12-22 16:25:12 +08:00
lichengyin
bdba0dcb72 remove html cache config transform 2015-12-22 14:47:22 +08:00