mirror/yapi
2
0
Fork 0
mirror of https://github.com/YMFE/yapi.git synced 2025-01-06 12:45:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,283 Commits 44 Branches 81 Tags 310 MiB
3dccd7ac1d
Commit Graph

445 Commits

Author SHA1 Message Date
sean
533e6e664d feat: getCase list select all field 2017-08-21 15:52:22 +08:00
sean
9e419165ed opti: optimize interface edit 2017-08-21 12:05:18 +08:00
sean
1922ef3859 feat: 完善接口列表 2017-08-20 22:13:46 +08:00
sean
b04c988def feat: add interface cat component 2017-08-19 19:06:09 +08:00
sean
d9594744c8 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 20:35:34 +08:00
sean
91965fd468 feat: add interface cat 2017-08-18 20:35:31 +08:00
wenbo.dong
fa6c10a261 docs: 文档 2017-08-18 17:15:02 +08:00
wenbo.dong
3c8b75a9d4 feat: 项目setting成员设置 2017-08-18 17:08:37 +08:00
wenbo.dong
e5eb0f6ec4 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 15:25:30 +08:00
wenbo.dong
7e06189313 feat: addproject接口添加groupname字段 2017-08-18 15:25:27 +08:00
sean
2805ea0b82 fix: fix empty edit interface info 2017-08-18 12:37:32 +08:00
wenbo.dong
2e8e99cf4d fix: 删除项目后端少引入函数的bug 2017-08-18 11:39:43 +08:00
qitmac000249
66ba6549b0 fix: 继续修改user页的显示 2017-08-17 20:08:10 +08:00
qitmac000249
83739b3a4e Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-17 16:56:09 +08:00
qitmac000249
db3dd1526b fix: user 权限显示 2017-08-17 16:55:52 +08:00
wenbo.dong
c109cc8557 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 15:35:05 +08:00
wenbo.dong
d05561f778 docs: 文档文案修改 2017-08-17 15:34:43 +08:00
sean
8fc4da40aa Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 15:19:50 +08:00
sean
99ef07342c feat: perfect websocket 2017-08-17 15:19:47 +08:00
qitmac000249
1570af0fef fix: 为log添加头像 2017-08-17 12:16:53 +08:00
qitmac000249
f6c94d698f fix: 为log添加头像 2017-08-17 12:14:58 +08:00
sean
c129e68abb fix: add koa-route 2017-08-17 12:03:55 +08:00
sean
6db3fafacf feat: add websocket to solve interface edit and add addMember role and add case req_params 2017-08-17 11:24:46 +08:00
qitmac000249
191656b1e5 fix: 解决commons冲突 2017-08-16 17:16:39 +08:00
qitmac000249
9e6f6568a7 fix: log保存封装 2017-08-16 17:13:14 +08:00
qitmac000249
4e7f5959d2 fix: 预览页完善 2017-08-16 17:12:01 +08:00
sean
3afc7a2dff feat: 修复删除项目bug和完善删除分组功能 2017-08-16 12:19:53 +08:00
sean
5ae5fb8789 feat: optimize auth 2017-08-16 10:56:42 +08:00
sean
5c7726c5c4 feat: user auth 2017-08-15 18:38:36 +08:00
sean
d7c2517d7b feat: user auth perfect 2017-08-15 18:36:48 +08:00
wenbo.dong
f08a707ae1 feat: 分组成员管理页面 2017-08-15 18:23:30 +08:00
qitmac000249
fca124dc8d fix: 修改view 2017-08-15 17:55:52 +08:00
sean
78a45a8419 feat: fix group member some bug and perfect 2017-08-15 17:38:22 +08:00
qitmac000249
acdbd3837c fix: 添加接口view页 2017-08-15 12:08:59 +08:00
qitmac000249
e222f7113e fix: 加入动态页面及bug修改 2017-08-14 15:17:05 +08:00
wenbo.dong
b0c6a6baba fix: 处理冲突 2017-08-11 19:37:44 +08:00
qitmac000249
093dd70f12 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-11 17:49:52 +08:00
qitmac000249
4143aa15d7 fix: modify 很多 2017-08-11 17:49:47 +08:00
sean
08e148d723 feat: add project module 2017-08-11 17:24:50 +08:00
wenbo.dong
2b31b4f383 docs: 更新文档 2017-08-11 16:35:53 +08:00
sean
aaab0725ba chore: add category 2017-08-11 11:54:11 +08:00
sean
b17f008bc0 fix: fix login bug 2017-08-11 11:42:52 +08:00
qitmac000249
85b2c98338 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-11 10:36:31 +08:00
qitmac000249
8fa47ef285 fix: 解决header冲突 2017-08-11 10:36:00 +08:00
sean
0649c47338 feat: merge to local and fix some bug 2017-08-11 10:31:26 +08:00
sean
fcc35d924a feat: 优化url，去掉#,后端接口统一使用/api前缀 2017-08-11 10:25:19 +08:00
sean
87220f2182 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 18:54:35 +08:00
sean
cdd11d3293 feat: add user/project and fix ykit commonsChunk bug 2017-08-10 18:54:32 +08:00
wenbo.dong
1255f29e12 fix: 下载模板多余分号 2017-08-10 17:22:55 +08:00
wenbo.dong
56661e15dd feat: mock下载功能模板 2017-08-10 17:20:03 +08:00
wenbo.dong
774d456dbd fix: merge 2017-08-10 17:08:39 +08:00
qitmac000249
8054a95cd5 fix: 完善log、follow接口注释 2017-08-10 15:47:33 +08:00
qitmac000249
35608e6c7c fix: projectBox 2017-08-10 15:37:20 +08:00
qitmac000249
bd367fb86f fix: projectBox 2017-08-10 15:36:35 +08:00
sean
7e83f903e4 feat: add avatar module 2017-08-10 15:26:05 +08:00
sean
cdb5c57365 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 15:24:22 +08:00
sean
cb8dcf1c89 feat: add avatar module 2017-08-10 15:24:16 +08:00
sean
d5b2790f89 feat: add avatar module 2017-08-10 15:22:42 +08:00
qitmac000249
c204913521 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-10 12:14:40 +08:00
qitmac000249
6dde3a846c feat: 添加follow 后端接口 2017-08-10 12:14:35 +08:00
qitmac000249
e69ab5a223 feat: 添加follow 后端接口 2017-08-10 12:13:32 +08:00
wenbo.dong
dfa0b0f6a7 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 10:24:27 +08:00
wenbo.dong
8fbdfd7eaa feat: 添加project/download接口 2017-08-10 10:24:24 +08:00
qitmac000249
d2d1ebf4b3 feat: 前端添加avatar 2017-08-09 20:11:39 +08:00
sean
c2e78e6efb Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-09 20:01:54 +08:00
sean
860e10ed55 feat: add col and case module 2017-08-09 20:01:51 +08:00
qitmac000249
8f705397a3 fix: 完善动态页 2017-08-09 18:00:45 +08:00
sean
5dd297366a feat: add col and case module 2017-08-09 16:21:49 +08:00
sean
369a1f9b1a Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-09 16:16:41 +08:00
sean
a558d640e4 feat: add col and case module 2017-08-09 16:16:35 +08:00
qitmac000249
3bb92c45ff Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-09 16:08:44 +08:00
qitmac000249
5c4449805a feat: 添加动态页面 2017-08-09 16:08:37 +08:00
sean
ef0475b66c chore: client dev env path 2017-08-08 19:47:36 +08:00
sean
51b428b074 feat: server col and case , client use babel-plugin-import load antd 2017-08-08 19:18:34 +08:00
sean
5547462236 feat: server col and case , client use babel-plugin-import load antd 2017-08-08 19:18:12 +08:00
sean
98d205bdca feat: add server auth 2017-08-08 14:45:19 +08:00
sean
2ab8ce325d fix: edit project basepath is empaty bug 2017-08-01 17:10:26 +08:00
sean
4acde5b091 fix: fix mockserver bug if basepath is empty 2017-08-01 15:47:06 +08:00
sean
81e2179875 feat: basepath is unrequired and fix auth bug 2017-08-01 15:37:07 +08:00
qitmac000249
15853b39ee fix: 修改project的显示 2017-08-01 15:03:34 +08:00
sean
c943ceba56 feat: add autocomplete 2017-07-31 21:07:24 +08:00
sean
e9d95ebbc9 feat: mockServer add crossRequest and change autoincrement num 2017-07-31 10:15:16 +08:00
sean
b1e1670805 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-28 17:29:22 +08:00
sean
d1db6e9e0a feat: add user nav info 2017-07-28 17:29:17 +08:00
waliang.wang
ccde80fb4c fix: 成员项目管理 下拉 2017-07-28 15:12:55 +08:00
sean
5453b555e8 fix: config.json path 2017-07-27 20:22:54 +08:00
祝鑫奔
9ffd37de85 opti: 修复eslint错误 2017-07-27 19:49:26 +08:00
sean
7027cc0e3e Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 18:00:47 +08:00
sean
784b233464 feat: add server_ip 2017-07-27 18:00:43 +08:00
祝鑫奔
a7692a6b4f opti: 代码格式优化 2017-07-27 15:06:42 +08:00
sean
ef0d6d0c55 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 14:21:26 +08:00
sean
20db695cfc feat: ops 2017-07-27 14:21:22 +08:00
祝鑫奔
4fe4bf3334 opti: 修复缩进和代码风格 2017-07-27 14:12:43 +08:00
sean
e0fb864b9c chore: ops 2017-07-27 12:03:18 +08:00
sean
75fb32b252 feat: 因部署修改runtime路径 2017-07-27 11:50:15 +08:00
sean
81b0a66f57 fix: install init runtime bug 2017-07-27 10:04:57 +08:00
sean
b977d0806f feat: merge to local and fix some conflict 2017-07-27 09:17:02 +08:00
sean
5905b4a399 fix: install init runtime path bug 2017-07-27 09:11:43 +08:00
祝鑫奔
1f2423ea9a fix: 添加eslint并修复部分格式问题 2017-07-26 22:03:18 +08:00
sean
c817c8c391 fix: veriry interface unique bug 2017-07-26 17:56:51 +08:00
sean
6f4411504c fix: mockserver init ver bug 2017-07-26 15:31:16 +08:00
sean
2ba86e272b feat: params trim 2017-07-26 14:22:59 +08:00
sean
e058da4cf7 fix: path add \. rule 2017-07-26 11:34:25 +08:00
sean
a486469e02 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-26 11:26:32 +08:00
sean
1fb2111c3c feat: 因部署从git删除runtime,改为每次安装自动生成runtime/config.json配置 2017-07-26 11:26:28 +08:00
wenbo.dong
9db330d1dd fix: 修改项目线上玉米和基本路径无法修改的bug 2017-07-25 21:51:14 +08:00
sean
0067d23e64 fix qsso first login params bug 2017-07-25 15:42:05 +08:00
sean
b6fca96979 fix qsso login need click double and delete project auth bug 2017-07-25 10:22:45 +08:00
waliang.wang
9e6f7d5caf 解决冲突 2017-07-24 19:44:46 +08:00
wenbo.dong
59c7eb1bfe fix: 处理新建或修改项目时basepath验证错误的问题 2017-07-24 19:35:15 +08:00
sean
19c826aa19 fix: fix project/list uids bug 2017-07-24 16:28:58 +08:00
sean
d8208fbb5c fix: fix userModel uids bug 2017-07-24 16:01:53 +08:00
李放
3d46e72106 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-24 12:26:01 +08:00
李放
2ecbc84610 docs: log的save功能注释 2017-07-24 12:25:46 +08:00
sean
e0fdafe3fc feat: 完善path验证规则 2017-07-24 11:24:08 +08:00
waliang.wang
9d9b7cd444 put 接口 2017-07-24 11:10:23 +08:00
waliang.wang
a6b29de66f feat - 编辑接口 2017-07-24 10:59:17 +08:00
sean
4592c344a2 feat: doc and fix some bug 2017-07-21 11:46:44 +08:00
sean
6d4948503e fix: fix project interface bug and change app.js to App.js 2017-07-21 10:03:34 +08:00
李放
95a485f7be Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 20:30:28 +08:00
李放
a8774cb5ca opti: 去除log多余接口 2017-07-20 20:30:24 +08:00
sean
9d1a4fc83e Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 19:47:16 +08:00
sean
d6fb9e160e fix: fix interface up bug 2017-07-20 19:47:10 +08:00
李放
347fde14bc Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 19:22:03 +08:00
李放
2fd9ab85a4 feat: 添加node的model及基本增删查改功能接口 2017-07-20 19:21:46 +08:00
sean
a1bb3932fd fix: group_id to project_id in the interface model 2017-07-20 18:37:00 +08:00
sean
02023733cb feat: interface add title field 2017-07-20 16:14:20 +08:00
sean
cb61d2a2ee feat: merge to local 2017-07-20 15:28:21 +08:00
sean
bb856df4ca feat: project prd_host add protocol field 2017-07-20 15:26:26 +08:00
李放
4e56f2f624 fix: 修改model listCount没有筛选条件 2017-07-20 11:19:39 +08:00
sean
a14d0c3f31 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-19 20:01:35 +08:00
sean
4427c175ed fix: count project bug 2017-07-19 20:01:29 +08:00
李放
432a995e4a opti: 优化list接口返回total字段 2017-07-19 19:55:25 +08:00
sean
ffe94bb826 feat: group add permisition 2017-07-19 19:38:48 +08:00
sean
3c537590c8 feat: user module in the client 2017-07-19 13:58:12 +08:00
sean
7ce6def425 feat: user client module 2017-07-18 19:47:38 +08:00
sean
3dd91589d5 feat: user 2017-07-18 17:18:16 +08:00
sean
01d215d7a5 feat: user module 2017-07-18 17:15:29 +08:00
李放
03004ac92a fix: merge code 2017-07-18 16:46:19 +08:00
李放
6e0e7a3ad8 opti: 优化分页查询逻辑 2017-07-18 16:37:28 +08:00
sean
ed978f2473 fix: merge to local 2017-07-18 15:50:07 +08:00
sean
5d11a7b2d3 fix: fix some bug 2017-07-18 15:48:05 +08:00
祝鑫奔
e356727125 chore: remove files in server_dist/ 2017-07-18 15:47:06 +08:00
祝鑫奔
7af682c88a Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-18 15:41:38 +08:00
祝鑫奔
52f97df53f fix: 解决merge留下的问题 2017-07-18 15:41:18 +08:00
sean
20a9374ee8 feat: merge to local 2017-07-18 15:39:50 +08:00
sean
094d17a196 feat: merge to local 2017-07-18 15:38:26 +08:00
祝鑫奔
0eba4c2854 fix: 修复用户搜索返回值字段问题 2017-07-18 15:37:21 +08:00
sean
7749672f26 feat: uesr management module and fix some server bug 2017-07-18 15:35:32 +08:00
祝鑫奔
165101c4ec fix: 修复用户搜索返回密码和盐及过滤项目搜索字段 2017-07-18 15:31:41 +08:00
李放
461f82c7df feat: 给list接口添加分页功能 2017-07-18 15:13:47 +08:00
sean
ef1a26c222 feat: modify db config 2017-07-17 16:24:00 +08:00
sean
2a4867e5c0 feat: modify db config_dev 2017-07-17 15:51:15 +08:00
sean
00e4f3e23e chore: modify dev config 2017-07-17 13:47:46 +08:00
sean
8be7c6e8a3 feat: user module client 2017-07-17 11:01:05 +08:00
李放
d222205d20 docs: 增加修改密码和获取项目成员列表返回示例 2017-07-14 18:08:05 +08:00
李放
e896cc5d69 #fix: Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 
# Conflicts:
#	server/controllers/project.js
#	server/router.js
#	server_dist/controllers/project.js
#	server_dist/router.js
 2017-07-14 17:42:03 +08:00
李放
0126784857 add: 修改密码功能和获取项目成员列表功能 2017-07-14 17:37:26 +08:00
祝鑫奔
cb8ab8a762 docs: 增加搜索文档返回示例 2017-07-14 17:00:30 +08:00
祝鑫奔
b6656a10d2 feat: 增加用户名／email／组／项目模糊搜索 2017-07-14 16:41:14 +08:00
sean
2777297027 fix: login username bug 2017-07-13 16:13:47 +08:00
sean
3312c7d3ec add chrome_ext 2017-07-12 20:47:20 +08:00
sean
55e519bfe7 add third qunar sso login 2017-07-12 17:01:27 +08:00
sean
6240eac465 yapi add help info 2017-07-12 12:22:10 +08:00
sean
daefcada6f add user and interface document 2017-07-11 18:22:20 +08:00
sean
8f9dfa7e4c add sendMail and install 2017-07-11 16:53:14 +08:00
sean
24651b423a add sendMail and install website 2017-07-11 16:50:17 +08:00
waliang.wang
f3e736671a Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into wangliang 2017-07-11 12:41:27 +08:00
sean
20a8b18bdb add user login and reg 2017-07-11 12:13:38 +08:00
waliang.wang
70c4942678 解决冲突 2017-07-11 12:13:11 +08:00
sean
8311f6021c user login and reg 2017-07-11 12:12:43 +08:00
lwg
6014f8b524 user 2017-07-11 10:17:44 +08:00
zwjamnsss
cd5dff1045 merge 2017-07-10 21:45:46 +08:00
lwg
8de4d10e8d 用户分组 2017-07-10 21:17:49 +08:00
lwg
5144e13f6e 登录注册 2017-07-10 20:51:04 +08:00
sean
e83d42a673 interface module 2017-07-10 20:02:44 +08:00
sean
fb58f369dc fix createAction singer bug 2017-07-10 11:59:13 +08:00
sean
72dae6a52f add interface module 2017-07-10 11:56:53 +08:00
lwg
5739bbde76 userligin 2017-07-10 11:11:35 +08:00
lwg
3e245114fc user_up 2017-07-07 12:04:14 +08:00
lwg
6c27b2d68a Merge branch 'dev' into yapilwg 2017-07-06 20:55:36 +08:00
lwg
ef32cc6114 user 2017-07-06 20:55:02 +08:00
sean
832f58baef add example code 2017-07-06 20:53:26 +08:00
lwg
874d333df9 user 2017-07-06 19:56:45 +08:00
lwg
e2e4b7f7dc Merge branch 'dev' into yapilwg 2017-07-06 19:48:25 +08:00
sean
6343355b66 add ydoc config and add project module 2017-07-06 19:21:54 +08:00
lwg
ab15fb7053 用户登录 2017-07-06 18:25:53 +08:00
zwjamnsss
cd4a7ff052 lint 2017-07-06 01:15:06 +08:00
lwg
35e24e44ea user 2017-07-05 17:59:53 +08:00
sean
bebd11d715 add baseController 2017-07-05 17:47:51 +08:00
sean
904918b11b add getInst method that create model singleton 2017-07-05 16:52:48 +08:00
sean
ce399f4096 controller and model change to class and can extend parent class 2017-07-05 16:17:58 +08:00
sean
0662eeda86 add group controller and models 2017-07-04 17:19:20 +08:00
sean
42edf679c9 abandon global var and use import yapi method 2017-07-04 16:43:07 +08:00
sean
bb6e1b41f1 init project path 2017-07-03 16:16:05 +08:00