489 Commits

Author SHA1 Message Date
lichengyin
631cbaf353 feature: use async render method in nunjucks template 2016-01-22 15:42:22 +08:00
lichengyin
0245186611 feature: support trim for validate data 2016-01-21 19:34:25 +08:00
lichengyin
735f6a7524 feature: support default value for model when update 2016-01-21 19:28:34 +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
8c754c5986 fix: fix test error on windows 2016-01-19 09:06:37 +08:00
lichengyin
2e8bb7be8b Fix: fix extend options.where error when options.where is string 2016-01-18 17:09:24 +08:00
lichengyin
775c2a81b7 use parseModuleFromPath method to get module 2016-01-18 11:43:38 +08:00
lichengyin
37cb6d6890 remove , to ; hack 2016-01-18 11:27:16 +08:00
lichengyin
36dc8be0b8 Fix: fix get model default value when default is null, fix #246 2016-01-18 09:54:52 +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
30d7c93214 fix validate type boolean error 2016-01-13 15:57:49 +08:00
lichengyin
3ecfbda918 separate checker to util/checker.js file 2016-01-13 13:17:36 +08:00
lichengyin
f710891f40 fix test error 2016-01-13 09:56:22 +08:00
lichengyin
4a08c7a89f use Babel Compiling after TypeScript Compiled for ts files 2016-01-12 16:54:22 +08:00
lichengyin
36c1332cf0 fix test error 2016-01-11 18:43:48 +08:00
lichengyin
5525965f21 fix test error 2016-01-11 18:39:30 +08:00
lichengyin
8b99e301ee add test cases 2016-01-11 18:15:03 +08:00
lichengyin
9834c41d76 add watch compile test cases 2016-01-11 17:56:22 +08:00
lichengyin
1b6504395e add test cases 2016-01-11 12:40:48 +08:00
lichengyin
7e178563aa add think_adapter file, separate from think.js 2016-01-11 11:49:59 +08:00
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