1177 Commits

Author SHA1 Message Date
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
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
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
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
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
welefen
08fa2962da Write config to file APP_PATH/config/[env].json when config loaded 2017-07-15 21:57:01 +08:00
welefen
45a2eb873e Optimize remove cookie 2017-07-15 10:11:03 +08:00
welefen
66d633334d Return __after value in action method 2017-07-14 16:08:42 +08:00
zhengqingxin
7a907e6431 move action func into controller from think 2017-07-13 14:20:35 +08:00
zhengqingxin
443fa45937 fix eslint error 2017-07-13 13:46:33 +08:00
zhengqingxin
b835fd5459 add controller.action func 2017-07-13 13:45:13 +08:00
welefen
8b0324b7a5 Fix eslint errors 2017-07-12 14:12:21 +08:00
welefen
5989e11b98 Fix eslint errors 2017-07-12 12:21:39 +08:00
welefen
b12fe71adb Store cookie setted value for next will get 2017-07-12 11:33:23 +08:00
welefen
d0aaa6b283 Fix remove cookie not support domain 2017-07-07 20:16:53 +08:00
welefen
070719af54 Optimize isCli method 2017-07-06 21:33:19 +08:00
huangxiaolu
b37014f5dc Remove the third param when new Loader
Because  Loader only accept 2 params
2017-07-06 19:30:55 +08:00
zhengqingxin
5d20a37ad3 Add app args for createServer 2017-07-06 14:15:37 +08:00
welefen
7dd1c6135d Merge branch '3.0' of github.com:thinkjs/thinkjs into 3.0 2017-07-06 12:31:36 +08:00
welefen
3e4e8e971c Add app args for createServer 2017-07-06 12:31:16 +08:00
lizheming
ad7f945a28 fix status write error 2017-07-05 18:15:12 +08:00
lizheming
0e9020e131 Merge branch '3.0' of github.com:thinkjs/thinkjs into 3.0 2017-07-05 10:31:22 +08:00
lizheming
274cf6f6ff change set type function in controller 2017-07-05 10:31:18 +08:00
welefen
a12d347fd4 Merge branch '3.0' of github.com:thinkjs/thinkjs into 3.0 2017-07-05 10:23:43 +08:00
welefen
c6ea1fef38 Get message from think.app.validators.messages in fail method 2017-07-05 10:23:02 +08:00
lizheming
a899390ac4 fix controller miss comma 2017-07-05 09:47:23 +08:00
lizheming
52d8eabacd add type set for controller 2017-07-04 22:39:45 +08:00
lizheming
5570e27442 add status for controller 2017-07-04 22:33:27 +08:00
welefen
9ec850aa06 Add copy data for post, file 2017-07-02 15:52:09 +08:00
welefen
88b48624e9 Remove deprecated in controller.get method 2017-06-28 09:20:44 +08:00