Commit Graph

175 Commits

Author SHA1 Message Date
qitmac000249
acdbd3837c fix: 添加接口view页 2017-08-15 12:08:59 +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
qitmac000249
eaa27df43f feat: 头像上传 2017-08-10 21:20:57 +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
d5b2790f89 feat: add avatar module 2017-08-10 15:22:42 +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
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
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
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
d1db6e9e0a feat: add user nav info 2017-07-28 17:29:17 +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
祝鑫奔
4fe4bf3334 opti: 修复缩进和代码风格 2017-07-27 14:12: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
2ba86e272b feat: params trim 2017-07-26 14:22:59 +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
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
李放
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