Commit Graph

750 Commits

Author SHA1 Message Date
suxiaoxin
cd96e99231 feat: perfect websocket 2017-08-17 15:19:47 +08:00
wenbo.dong
61c9e50e8d feat: project setting layout 2017-08-17 14:35:00 +08:00
zwjamnsss
8f96c51614 feat: col-menu 2017-08-17 12:19:56 +08:00
qitmac000249
679642ce53 fix: 为log添加头像 2017-08-17 12:16:53 +08:00
qitmac000249
95f915a816 fix: 为log添加头像 2017-08-17 12:14:58 +08:00
wenbo.dong
d643904fd6 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 12:09:11 +08:00
wenbo.dong
8b4327a442 feat: 空项目组提示 2017-08-17 12:09:08 +08:00
suxiaoxin
57d15ef7f3 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 12:03:58 +08:00
suxiaoxin
92a1be59e5 fix: add koa-route 2017-08-17 12:03:55 +08:00
zwjamnsss
3e46079446 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 11:41:04 +08:00
zwjamnsss
e1c4f8c55a feat: 添加用例 2017-08-17 11:40:59 +08:00
wenbo.dong
ca17299f92 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 11:34:35 +08:00
wenbo.dong
ecc2ca518a docs: UsernameAutoComplete注释 2017-08-17 11:31:57 +08:00
suxiaoxin
f064df4863 feat: merge dev to local 2017-08-17 11:26:20 +08:00
suxiaoxin
0d3d8a251b feat: add websocket to solve interface edit and add addMember role and add case req_params 2017-08-17 11:24:46 +08:00
zwjamnsss
d02c02d76e Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 10:17:55 +08:00
zwjamnsss
d1d8172f64 feat: 添加到集合 2017-08-17 10:17:48 +08:00
wenbo.dong
fdb2e7efc0 feat: 修改组成员权限的功能 2017-08-16 21:29:01 +08:00
suxiaoxin
1227086a2c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 20:43:51 +08:00
wenbo.dong
4a181c563a feat: 项目成员列表删除功能 2017-08-16 20:31:59 +08:00
suxiaoxin
2485eff17e Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 18:04:19 +08:00
suxiaoxin
dd06dfe5fc feat: add interface and col route 2017-08-16 18:04:16 +08:00
qitmac000249
6adbdc3516 fix: log保存封装 2017-08-16 17:13:14 +08:00
qitmac000249
ed66c3c0fa fix: 预览页完善 2017-08-16 17:12:01 +08:00
zwjamnsss
5f9b5daffe Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 14:28:06 +08:00
zwjamnsss
24aa12160a feat: run 2017-08-16 14:28:02 +08:00
suxiaoxin
cfdf623f1c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 12:31:17 +08:00
suxiaoxin
96bd038d99 feat: 修复删除项目bug和完善删除分组功能 2017-08-16 12:31:11 +08:00
wenbo.dong
53f62aab22 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 12:24:57 +08:00
wenbo.dong
d9a1d65186 feat: UsernameAutoComplete组件 2017-08-16 12:24:54 +08:00
suxiaoxin
a0aa538983 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 12:19:56 +08:00
suxiaoxin
9574987647 feat: 修复删除项目bug和完善删除分组功能 2017-08-16 12:19:53 +08:00
zwjamnsss
9039fa9395 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 11:48:20 +08:00
zwjamnsss
ef50e4f90a feat: run pathparam 2017-08-16 11:48:15 +08:00
wenbo.dong
a2d0cb1931 fix: 成员列表table中col的key值 2017-08-16 11:35:47 +08:00
wenbo.dong
f4c28a59ab Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 11:06:27 +08:00
wenbo.dong
3d89efe86a feat: 添加项目成员 2017-08-16 11:06:24 +08:00
suxiaoxin
ad27733165 feat: optimize auth 2017-08-16 10:56:42 +08:00
zwjamnsss
4ed04d7b60 feat: run 2017-08-15 21:35:34 +08:00
zwjamnsss
916defd719 feat: ru 2017-08-15 21:14:00 +08:00
zwjamnsss
c83184df45 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-15 21:13:15 +08:00
zwjamnsss
b0b79ed9ec feat: run 2017-08-15 21:13:11 +08:00
wenbo.dong
7ae873cb6c feat: 分组成员列表添加权限判断(仅组长和admin可设置) 2017-08-15 20:27:41 +08:00
wenbo.dong
e5a3e0441f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-15 18:23:33 +08:00
wenbo.dong
d24f748ade feat: 分组成员管理页面 2017-08-15 18:23:30 +08:00
qitmac000249
8116220e79 fix: 修改view 2017-08-15 17:54:06 +08:00
zwjamnsss
fcd310b054 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-15 17:41:59 +08:00
zwjamnsss
ec82dfbeef feat: run 2017-08-15 17:41:55 +08:00
suxiaoxin
533588c68f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-15 17:38:25 +08:00
suxiaoxin
7ab03e0142 feat: fix group member some bug and perfect 2017-08-15 17:38:22 +08:00
qitmac000249
2b3c56a0c1 fix: 修改view 2017-08-15 17:02:54 +08:00
qitmac000249
6610c01513 fix: 修复用户管理显示及view的样式 2017-08-15 16:57:50 +08:00
qitmac000249
7ed167d75f fix: 修复用户管理显示及view的样式 2017-08-15 16:55:46 +08:00
zwjamnsss
1c105c3079 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-15 16:34:59 +08:00
zwjamnsss
f81f94b8bd feat: run 2017-08-15 16:34:41 +08:00
suxiaoxin
17fcb8c418 feat: edit interface add auto header 2017-08-15 14:49:02 +08:00
qitmac000249
f8bb4335ef fix: 解决view页面的冲突 2017-08-15 12:15:07 +08:00
zwjamnsss
2e477ca2ec Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-15 12:09:34 +08:00
zwjamnsss
58ba775298 feat: run 2017-08-15 12:09:29 +08:00
qitmac000249
a90de7968b fix: 添加接口view页 2017-08-15 12:08:59 +08:00
qitmac000249
c56caae762 fix: 添加接口view页 2017-08-15 12:07:52 +08:00
suxiaoxin
2f0a733776 fix: mongodb auth bug and perfect mockServer 2017-08-15 12:05:22 +08:00
suxiaoxin
aabc83ac57 feat: del prd_host and perfect the interface edit style 2017-08-15 11:12:39 +08:00
suxiaoxin
9bba7a6ec1 feat: 完善edit interface 功能 2017-08-14 23:01:20 +08:00
suxiaoxin
bdff46ce17 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-14 21:43:09 +08:00
suxiaoxin
ac7f1f09f5 feat: edit interface ci 2017-08-14 21:43:06 +08:00
zwjamnsss
4af8846935 fix: 解决冲突 2017-08-14 21:23:57 +08:00
zwjamnsss
1f514260be feat: run 2017-08-14 21:22:18 +08:00
zwjamnsss
7237bb7f98 Merge branch 'dev' into run 2017-08-14 20:09:57 +08:00
suxiaoxin
5d1ceafc39 fix: message login when guest open site 2017-08-14 20:09:47 +08:00
suxiaoxin
a7e4845ada feat: add interface res some module 2017-08-14 19:58:33 +08:00
zwjamnsss
53f304447e fix: 解决冲突 2017-08-14 19:34:04 +08:00
zwjamnsss
8cc6754f1e feat: run 部分 2017-08-14 19:23:20 +08:00
zwjamnsss
69c8e447ed feat: 接口集合菜单 2017-08-14 17:32:49 +08:00
suxiaoxin
3cf804e832 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-14 16:30:38 +08:00
suxiaoxin
6b942ace9b fix: col list bug 2017-08-14 16:30:30 +08:00
wenbo.dong
71cd6c3b1b feat: 我的关注页面 2017-08-14 15:41:58 +08:00
qitmac000249
6a5b588196 fix: 加入动态页面及bug修改 2017-08-14 15:17:05 +08:00
suxiaoxin
5ccd051817 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-14 13:44:55 +08:00
suxiaoxin
7b60aab44f feat: add interface list and edit module 2017-08-14 13:44:49 +08:00
zwjamnsss
76df380a6c feat: 接口集合 2017-08-11 21:10:54 +08:00
qitmac000249
1d5d10e726 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-11 20:22:00 +08:00
qitmac000249
dfbaceea12 fix: 头像样式修改 2017-08-11 20:21:56 +08:00
wenbo.dong
6391618a39 fix: 处理冲突 2017-08-11 19:37:44 +08:00
wenbo.dong
5892ecea7e feat: 项目列表页改版 2017-08-11 19:30:12 +08:00
suxiaoxin
99fe95614d Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 18:58:02 +08:00
suxiaoxin
021e683103 feat: interface list 2017-08-11 18:57:58 +08:00
qitmac000249
80d7f1daa2 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-11 17:49:52 +08:00
qitmac000249
fa0765b6bc fix: modify 很多 2017-08-11 17:49:47 +08:00
wenbo.dong
eb931166ef feat: 项目广场布局 2017-08-11 17:47:25 +08:00
suxiaoxin
ade494a983 fix: interface import 2017-08-11 17:29:37 +08:00
suxiaoxin
b6cd3eea3b feat: add project 2017-08-11 17:25:57 +08:00
suxiaoxin
322a3bb2cf feat: add project module 2017-08-11 17:24:50 +08:00
zwjamnsss
0adc1c51f6 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 16:31:00 +08:00
zwjamnsss
32a0704bf5 feat: 项目页面 2017-08-11 16:30:52 +08:00
wenbo.dong
465d40f355 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 16:21:34 +08:00
wenbo.dong
6980eef06f feat: AddProject移动到上一层目录 2017-08-11 16:21:07 +08:00
zwjamnsss
a5763cece5 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 16:20:42 +08:00
zwjamnsss
ca4d4c95a3 opti: ignorge tags 2017-08-11 16:20:27 +08:00
wenbo.dong
fcba2f35fe Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 16:10:51 +08:00
wenbo.dong
96b682c092 feat: 添加项目改版 2017-08-11 16:10:49 +08:00
zwjamnsss
16a57c563f opti: 路由 2017-08-11 16:03:11 +08:00
zwjamnsss
989b2dc83f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 15:02:10 +08:00
zwjamnsss
d4fc53614c opti: 路由 2017-08-11 15:02:07 +08:00
wenbo.dong
b5585b9ba0 feat: header样式调整 2017-08-11 14:22:20 +08:00
qitmac000249
22627aab67 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-11 12:19:38 +08:00
qitmac000249
b80b75dfdf fix: 个人信息页修改 2017-08-11 12:19:31 +08:00
wenbo.dong
11b8df5b04 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:40:57 +08:00
wenbo.dong
469c6216d0 fix: 登录接口加api前缀 2017-08-11 11:40:53 +08:00
wenbo.dong
39099acb4c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:36:53 +08:00
zwjamnsss
b637fc6412 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:36:50 +08:00
zwjamnsss
f67c69b866 opti: 路由 2017-08-11 11:34:55 +08:00
suxiaoxin
7e25bfd0fe fix: create and app bug 2017-08-11 11:33:40 +08:00
suxiaoxin
9e79bee968 fix: create and app bug 2017-08-11 11:32:20 +08:00
zwjamnsss
2d8df12dd0 fix: contaimer 2017-08-11 11:31:21 +08:00
zwjamnsss
734adb9251 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:26:53 +08:00
zwjamnsss
e242eb8715 fix: eslint 2017-08-11 11:26:49 +08:00
suxiaoxin
aa8d1f4b2a Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:26:13 +08:00
suxiaoxin
3f46d6881a feat: fix redus-tools bug 2017-08-11 11:26:07 +08:00
wenbo.dong
e255712852 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:05:34 +08:00
zwjamnsss
8599d8b795 opti: 优化路由结构 2017-08-11 10:58:15 +08:00
zwjamnsss
b64e736746 fix: 解决冲突 2017-08-11 10:56:38 +08:00
zwjamnsss
300cdf23c6 feat: 项目页面路由 2017-08-11 10:44:45 +08:00
suxiaoxin
6360e6722d feat: merge to local and fix some bug 2017-08-11 10:31:26 +08:00
suxiaoxin
368a2f280a feat: 优化url,去掉#,后端接口统一使用/api前缀 2017-08-11 10:25:19 +08:00
qitmac000249
a4bebf74cd fix: modify 2017-08-11 10:16:50 +08:00
wenbo.dong
dd8f48587f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 21:23:50 +08:00
wenbo.dong
65fc1ae7ac feat: 新建项目页布局 2017-08-10 21:23:47 +08:00
qitmac000249
613d33268b feat: 头像上传 2017-08-10 21:20:57 +08:00
qitmac000249
f8425ba5af feat: 头像上传 2017-08-10 21:20:23 +08:00
zwjamnsss
84f84732fd opti: 隐藏无用路由 2017-08-10 21:03:22 +08:00
zwjamnsss
20971295f0 feat: 项目路由 2017-08-10 20:56:30 +08:00
zwjamnsss
94d4bf2378 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 20:08:52 +08:00
zwjamnsss
ab2e15f297 opti: 将login改成user 2017-08-10 20:08:23 +08:00
suxiaoxin
d2d3f0efe2 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 18:54:35 +08:00
suxiaoxin
6c1bbf295d feat: add user/project and fix ykit commonsChunk bug 2017-08-10 18:54:32 +08:00
wenbo.dong
f52a576e25 feat: 新建项目页面初始化 2017-08-10 18:26:46 +08:00
zwjamnsss
5ccce99b23 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 16:00:57 +08:00
zwjamnsss
3d66d5389b opti: 晚上目录结构 2017-08-10 16:00:52 +08:00
qitmac000249
05a53498b1 fix: projectBox 2017-08-10 15:37:20 +08:00
qitmac000249
f93df49229 fix: projectBox 2017-08-10 15:36:35 +08:00
suxiaoxin
cda4d0ffd3 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 15:24:22 +08:00
suxiaoxin
f5ea25e00b feat: add avatar module 2017-08-10 15:22:42 +08:00
qitmac000249
6679e6e478 feat: 添加follow 后端接口 2017-08-10 12:14:35 +08:00
qitmac000249
739597e234 feat: 添加follow 后端接口 2017-08-10 12:13:32 +08:00
qitmac000249
d30fcf240a feat: 前端添加avatar 2017-08-09 20:09:59 +08:00
qitmac000249
140be1848c fix: 完善动态页 2017-08-09 18:00:45 +08:00
qitmac000249
1d8f582380 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-09 16:08:44 +08:00
qitmac000249
51d852a793 feat: 添加动态页面 2017-08-09 16:08:37 +08:00
zwjamnsss
8697c26b84 refactor: 将异步then 转换成 async await 2017-08-09 13:48:06 +08:00