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

578 Commits

Author SHA1 Message Date
lushijie
322dc7ee1d add scope for logic 2017-08-20 19:30:22 +08:00
welefen
ee3beceacc Remove unused files 2017-08-14 15:54:08 +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
lushijie
71ce2c71fb think.env case 2017-08-11 14:08:38 +08:00
welefen
b97f560d34 Support sticky cluster 2017-08-07 18:08:29 +08:00
zhengqingxin
fdc5e34e39 add test case 2017-07-29 16:56:02 +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
3ee00e4cb5 Remove think.controller method 2017-07-26 17:25:58 +08:00
welefen
94c92f9f30 Fix download method 2017-07-26 13:46:46 +08:00
zhengqingxin
cdc050bda4 add test case 2017-07-26 12:39:08 +08:00
zhengqingxin
b0e8a2bcac add test case 2017-07-17 16:47:55 +08:00
zhengqingxin
4770db11ea mock console error function 2017-07-14 16:21:08 +08:00
welefen
d5c55fe2d2 Fix download file with Chinese chars in filename, fix #668 2017-07-13 09:27:52 +08:00
zhengqingxin
e92db0b2f8 add test case 2017-07-12 17:28:28 +08:00
zhengqingxin
acbd5d48a0 add test case 2017-07-10 16:33:05 +08:00
zhengqingxin
2a9c7c7b04 update test case 2017-07-10 10:47:55 +08:00
zhengqingxin
5d20a37ad3 Add app args for createServer 2017-07-06 14:15:37 +08:00
zhengqingxin
6c5dc5453e add controller test case 2017-07-06 14:02:15 +08:00
zhengqingxin
196b4445ef add test case 2017-07-05 16:56:34 +08:00
welefen
dc98292a2a Change default db config, fix #682 2017-07-04 18:06:28 +08:00
zhengqingxin
ec9801dd0e add test case 2017-07-03 17:59:21 +08:00
zhengqingxin
3d0cc4abd6 add test case 2017-07-03 14:51:35 +08:00
zhengqingxin
3427aad0b8 fix test case 2017-07-01 16:45:44 +08:00
zhengqingxin
a0862b2e8a add test case 2017-07-01 16:13:24 +08:00
zhengqingxin
e95bbebab5 add test case 2017-06-30 19:27:28 +08:00
zhengqingxin
80b89923db init unit test 2017-06-30 16:37:37 +08:00
welefen
3dd9c7df6c Support get/set multi name, fix #665 2017-06-05 17:13:40 +08:00
welefen
fc117b335e Allow 0 when set validate type to int 2017-06-05 17:07:47 +08:00
JerryQu
5c69cec2a6 fixed #616 2017-04-20 20:23:59 +08:00
zero0-1one
ec2107902c 1. 解决 think.parallel_limit 与文档意图不一致的行为 
https://thinkjs.org/zh-cn/doc/2.2/api_think.html#toc-0a1
并不能达到同时执行数量限制的作用.  'clip_image' 没用当成 key
2. 解决只有一个参数 callback 的情况下没有起到任何限制作用的bug
 2017-04-04 12:29:17 +08:00
zero0-1one
96376a8ec5 解决 当使用相同 key 多次调用 think.parallelLimit, 总是执行第一次传递的 callback, 而导致不能得到预期结果 2017-04-04 11:14:02 +08:00
welefen
22d38bfdac Fix typescript test error 2017-03-12 09:56:16 +08:00
welefen
f0440586e4 Add some files 2017-02-15 18:34:56 +08:00
welefen
aea9c4ac90 Remove files 2017-02-15 18:11:59 +08:00
welefen
ae7c5c80ed fix test error 2017-02-07 16:01:59 +08:00
Welefen Lee
93b341cd5b Merge pull request #527 from ruanzhijun/master 
把find和select方法里面的参数改成true
 2016-12-20 09:56:44 +08:00
june
aca57347fe 优化写法 2016-12-16 01:16:49 +08:00
june
f45b18512f 优化写法 2016-12-16 01:13:05 +08:00
june
6eff47bf6c 修改 2016-12-15 22:47:06 +08:00
Welefen Lee
2d848e7a32 Merge pull request #524 from ruanzhijun/master 
修复数据库返回字段只有下划线（aa_bb_cc）方式的问题
 2016-12-15 10:10:30 +08:00
june
58ffa9198a 修复eslint的错误并完善think.snakeCase的单元测试 2016-12-14 23:44:24 +08:00
snadn
b7d21beb2e 更新babel依赖 2016-12-14 14:26:15 +08:00
Evgeniy Kulikov
f7ad6b49f6 parseKey function with AS 2016-10-15 07:04:02 +03:00
Evgeniy Kulikov
b0ba8dd189 fix #472 2016-10-15 07:00:53 +03:00
Evgeniy Kulikov
75834be0d9 fix unmerged 2016-10-13 12:35:51 +03:00
Evgeniy Kulikov
20e3e821c8 fix problems from PR #473 2016-10-13 12:21:28 +03:00
welefen
bc58b758bf Merge branch 'feature/472+470_workaround' of https://github.com/im-kulikov/thinkjs into im-kulikov-feature/472+470_workaround 
# Conflicts:
#	test/core/think.js
#	test/model/base.js
#	test/model/mongo.js
#	test/model/relation.js
 2016-10-13 17:08:45 +08:00
Evgeniy Kulikov
a0ef0c781d fix #470 #472 issues, fixed test cases 2016-10-13 11:58:18 +03:00
welefen
f835a92b5e Fix test error when change table prefix default value to '' 2016-10-13 15:30:29 +08:00