2994 Commits

Author SHA1 Message Date
SijieCai
75ccabf692 add validator in logic 2017-08-30 19:14:53 +08:00
SijieCai
0d403e7399 add typescript support 2017-08-30 15:55:31 +08:00
zhengqingxin
8e57533335 remove default host config 2017-08-25 15:36:17 +08:00
welefen
72e50f8eac Add stickyCluster config 2017-08-25 09:27:06 +08:00
welefen
264f419f36 Remove loadExtend in master, fix #804 2017-08-25 09:21:15 +08:00
SijieCai
2952c3896a support ts add export think 2017-08-22 10:33:58 +08:00
lushijie
322dc7ee1d add scope for logic 2017-08-20 19:30:22 +08:00
welefen
3fa88f8665 Remove publish tag, change version 3.0.0 2017-08-16 18:55:48 +08:00
lizheming
4df51f3d68 update ci script to coverall 2017-08-15 10:47:57 +08:00
lizheming
83434e3259 up README 2017-08-14 19:35:24 +08:00
lizheming
e8f4c6300c up README 2017-08-14 19:12:50 +08:00
lizheming
a96a735440 update README 2017-08-14 19:10:36 +08:00
lizheming
c612a58ae7 mv template md to .github 2017-08-14 19:00:11 +08:00
welefen
bbcfd48354 Optimize code 2017-08-14 15:58:03 +08:00
welefen
ee3beceacc Remove unused files 2017-08-14 15:54:08 +08:00
welefen
9a3029df3d Remove unused files 2017-08-14 15:51:40 +08:00
welefen
aec4decb9c Remove adapter.production.js 2017-08-14 15:49:53 +08:00
welefen
e31a797985 Merge branch '3.0'
# Conflicts:
#	.gitignore
#	README.md
#	package.json
#	src/adapter/db/_parse.js
#	src/adapter/db/_parse_mongo.js
#	src/adapter/socket/postgresql.js
#	src/adapter/websocket/socket.io.js
#	src/config/db.js
#	src/config/env/development.js
#	src/config/package.js
#	src/controller/base.js
#	src/core/http.js
#	src/core/think.js
#	src/index.js
#	src/middleware/check_resource.js
#	src/middleware/output_resource.js
#	src/model/base.js
#	src/model/mongo.js
#	src/util/parallel_limit.js
#	src/util/validator.js
#	src/util/watch_compile.js
#	template/package_test_ts.json
#	template/package_ts.json
#	test/adapter/db/_parse.js
#	test/controller/base.js
#	test/core/http.js
#	test/core/think.js
#	test/model/base.js
#	test/util/watch_compile.js
2017-08-14 15:47:44 +08:00
lizheming
1e5162e217 rm cache and session default extend 2017-08-14 12:21:42 +08:00
lizheming
7f98f9319a rm default think-logger config 2017-08-14 12:18:49 +08:00
lushijie
71ce2c71fb think.env case 2017-08-11 14:08:38 +08:00
lushijie
cabb511b2c Merge branch '3.0' of github.com:thinkjs/thinkjs into 3.0 2017-08-11 14:03:24 +08:00
lushijie
a7adbe741e fix think.env bug 2017-08-11 13:41:33 +08:00
welefen
b97f560d34 Support sticky cluster 2017-08-07 18:08:29 +08:00
lushijie
2d2d910f0d fix logic allowMethod bug 2017-08-03 09:22:34 +08:00
welefen
b2e1060cbf Add exitOnEnd options for cli invoke 2017-08-02 17:24:38 +08:00
welefen
1bfce1fd05 Release 3.0.0-beta4 3.0.0-beta4 2017-08-02 10:57:57 +08:00
welefen
182f8d304b optimize context, controller code 2017-08-02 10:43:44 +08:00
welefen
cba58cb3bc Optimize env, service method 2017-08-02 10:41:06 +08:00
zhengqingxin
dc4b5a12e5 Merge branch '3.0' of https://github.com/thinkjs/thinkjs into 3.0 2017-07-29 16:56:36 +08:00
zhengqingxin
fdc5e34e39 add test case 2017-07-29 16:56:02 +08:00
welefen
09f5e2036a Optimize action method 2017-07-28 18:34:03 +08:00
zhengqingxin
1c192c7171 move ctx.controller to controller 2017-07-28 16:20:36 +08:00
welefen
d89f0a7f93 Remove think.isCli property 2017-07-27 16:36:30 +08:00
welefen
b8e5df6703 Optimize download method 2017-07-27 09:29:07 +08:00
welefen
587b459a96 Optimize download method 2017-07-27 09:24:33 +08:00
welefen
3ee00e4cb5 Remove think.controller method 2017-07-26 17:25:58 +08:00
welefen
6367767249 Add think.Service class 2017-07-26 16:27:03 +08:00
welefen
94c92f9f30 Fix download method 2017-07-26 13:46:46 +08:00
zhengqingxin
de8bf9444d add download function 2017-07-26 12:39:41 +08:00
zhengqingxin
cdc050bda4 add test case 2017-07-26 12:39:08 +08:00
welefen
5d3f74a79d 2.2.21 v2.2.21 2017-07-24 14:53:45 +08:00
welefen
2dd35c19b7 Remove some default db configs 2017-07-24 14:51:22 +08:00
welefen
10dbdcf7a6 Fix log sql config 2017-07-24 14:34:53 +08:00
welefen
67ad97ce1b Fix log_sql config 2017-07-24 14:30:27 +08:00
welefen
0eeace8b07 Merge branch 'master' of github.com:thinkjs/thinkjs 2017-07-19 14:03:32 +08:00
welefen
8742599f32 Upgrade pg version to 7.0.1 2017-07-19 14:03:04 +08:00
zhengqingxin
894d1e963f Merge branch '3.0' of https://github.com/thinkjs/thinkjs into 3.0 2017-07-17 16:48:28 +08:00
zhengqingxin
b0e8a2bcac add test case 2017-07-17 16:47:55 +08:00
welefen
08fa2962da Write config to file APP_PATH/config/[env].json when config loaded 2017-07-15 21:57:01 +08:00