Commit Graph

849 Commits

Author SHA1 Message Date
zwjamnsss
96f0515e72 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 21:11:12 +08:00
zwjamnsss
c8502d871f feat: col menu 2017-08-18 21:11: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
cb6fede8f4 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 19:47:06 +08:00
wenbo.dong
a07551d159 feat: 删除项目的二次确认 2017-08-18 19:47:02 +08:00
zwjamnsss
5dc40d7ede feat: col menu 2017-08-18 18:13:33 +08:00
zwjamnsss
92e41b626b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 17:56:32 +08:00
zwjamnsss
a9160f570b feat: col-menu 2017-08-18 17:56:26 +08:00
qitmac000249
2ce7cf3690 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-18 17:49:47 +08:00
qitmac000249
68af11e6f2 fix: 修改预览页加载不显示 2017-08-18 17:49:37 +08:00
zwjamnsss
f3778da554 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 17:31:53 +08:00
zwjamnsss
584640a7f2 feat: case menu 2017-08-18 17:31:48 +08:00
wenbo.dong
3c8b75a9d4 feat: 项目setting成员设置 2017-08-18 17:08:37 +08:00
wenbo.dong
98d8a41e83 feat: 项目设置中的分组成员展示 2017-08-18 15:58:40 +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
sean
4158855022 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 12:07:18 +08:00
sean
9bec5d6bb4 fix: interfaceContent bug 2017-08-18 12:07:14 +08:00
zwjamnsss
97ad5a5b0f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 12:00:36 +08:00
zwjamnsss
8021b055d8 feat: col menu 2017-08-18 12:00:21 +08:00
wenbo.dong
74a2c20099 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 11:39:46 +08:00
wenbo.dong
2572cf37d1 feat: setting页面布局 2017-08-18 11:39:08 +08:00
qitmac000249
a78a83c3e5 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-18 11:34:18 +08:00
qitmac000249
1be17b9144 fix: 添加ErrMsg到log 2017-08-18 11:34:06 +08:00
zwjamnsss
05b13df731 feat: col menu 2017-08-18 11:33:37 +08:00
sean
2c9a57b357 fix: mockEditor bug 2017-08-18 11:23:04 +08:00
sean
a4147e8e86 fix: route bug 2017-08-18 11:05:33 +08:00
wenbo.dong
40071ce301 opti: Errmsg组件 2017-08-17 23:07:23 +08:00
wenbo.dong
56486b782f feat: 错误提示组件 2017-08-17 23:00:32 +08:00
wenbo.dong
e337210b3b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 22:20:01 +08:00
wenbo.dong
e7366e3de1 feat: 编辑项目 2017-08-17 22:19:58 +08:00
zwjamnsss
47a78e8c30 feat: menu 2017-08-17 20:58:43 +08:00
zwjamnsss
ac0947aa88 feat: 解决冲突 2017-08-17 20:25:44 +08:00
zwjamnsss
8e4422a327 feat: col-menu 2017-08-17 20:24:07 +08:00
qitmac000249
3f83dc175f Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-17 20:08:30 +08:00
qitmac000249
66ba6549b0 fix: 继续修改user页的显示 2017-08-17 20:08:10 +08:00
sean
502b68e112 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 18:00:11 +08:00
sean
fb4ebde34d fix: fix route some bug 2017-08-17 18:00:02 +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
sean
4ac0abe3c1 fix: interface up bug 2017-08-17 16:40:58 +08:00
zwjamnsss
c111bafc9c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 16:10:49 +08:00
zwjamnsss
5135a27d7b feat: componetWillMount 2017-08-17 16:10:43 +08:00
zwjamnsss
ba57b53a5f feat: componetWillMount 2017-08-17 16:10:34 +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
wenbo.dong
d3849735ba feat: project setting layout 2017-08-17 14:35:00 +08:00
zwjamnsss
8d2a3e4c47 feat: col-menu 2017-08-17 12:19:56 +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
wenbo.dong
05fc8bc000 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 12:09:11 +08:00
wenbo.dong
300ab79ee3 feat: 空项目组提示 2017-08-17 12:09:08 +08:00
sean
adbe2f7c6b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 12:03:58 +08:00
sean
c129e68abb fix: add koa-route 2017-08-17 12:03:55 +08:00
zwjamnsss
14311f1637 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 11:41:04 +08:00
zwjamnsss
c2427937da feat: 添加用例 2017-08-17 11:40:59 +08:00
wenbo.dong
a035f7ae85 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 11:34:35 +08:00
wenbo.dong
129454ef37 docs: UsernameAutoComplete注释 2017-08-17 11:31:57 +08:00
sean
f71b210839 feat: merge dev to local 2017-08-17 11:26:20 +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
zwjamnsss
39bcc16c44 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 10:17:55 +08:00
zwjamnsss
be1703b12c feat: 添加到集合 2017-08-17 10:17:48 +08:00
wenbo.dong
60be2902ed feat: 修改组成员权限的功能 2017-08-16 21:29:01 +08:00
sean
b2c2d3d657 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 20:43:51 +08:00
wenbo.dong
61cbda430e feat: 项目成员列表删除功能 2017-08-16 20:31:59 +08:00
sean
0a5f3ad3af Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 18:04:19 +08:00
sean
00e2710d1c feat: add interface and col route 2017-08-16 18:04:16 +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
zwjamnsss
a1a03084a0 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 14:28:06 +08:00
zwjamnsss
489b5cebc1 feat: run 2017-08-16 14:28:02 +08:00
sean
7330d603b5 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 12:31:17 +08:00
sean
4759e4bf91 feat: 修复删除项目bug和完善删除分组功能 2017-08-16 12:31:11 +08:00
wenbo.dong
204676312b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 12:24:57 +08:00
wenbo.dong
26c347bb76 feat: UsernameAutoComplete组件 2017-08-16 12:24:54 +08:00
sean
99721ace01 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 12:19:56 +08:00
sean
3afc7a2dff feat: 修复删除项目bug和完善删除分组功能 2017-08-16 12:19:53 +08:00
zwjamnsss
53f1e949e3 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 11:48:20 +08:00
zwjamnsss
8fb662dd1c feat: run pathparam 2017-08-16 11:48:15 +08:00
wenbo.dong
15a57a2db0 fix: 成员列表table中col的key值 2017-08-16 11:35:47 +08:00
wenbo.dong
4517370b8b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 11:06:27 +08:00
wenbo.dong
37764bfa67 feat: 添加项目成员 2017-08-16 11:06:24 +08:00
sean
5ae5fb8789 feat: optimize auth 2017-08-16 10:56:42 +08:00
zwjamnsss
96626f5c6f feat: run 2017-08-15 21:35:34 +08:00
zwjamnsss
470102231f feat: ru 2017-08-15 21:14:00 +08:00
zwjamnsss
ec3b10054d Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-15 21:13:15 +08:00
zwjamnsss
75585198f0 feat: run 2017-08-15 21:13:11 +08:00
wenbo.dong
c2227c7615 feat: 分组成员列表添加权限判断(仅组长和admin可设置) 2017-08-15 20:27:41 +08:00
wenbo.dong
5c63df5bb4 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-15 18:23:33 +08:00
wenbo.dong
f08a707ae1 feat: 分组成员管理页面 2017-08-15 18:23:30 +08:00
qitmac000249
73e2ccb05b fix: 修改view 2017-08-15 17:54:06 +08:00
zwjamnsss
e80c41cbaa Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-15 17:41:59 +08:00
zwjamnsss
2254258d4d feat: run 2017-08-15 17:41:55 +08:00
sean
f389bd5db4 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-15 17:38:25 +08:00
sean
78a45a8419 feat: fix group member some bug and perfect 2017-08-15 17:38:22 +08:00
qitmac000249
c82ad5d498 fix: 修改view 2017-08-15 17:02:54 +08:00
qitmac000249
a799be07ac fix: 修复用户管理显示及view的样式 2017-08-15 16:57:50 +08:00
qitmac000249
d1e7304f6d fix: 修复用户管理显示及view的样式 2017-08-15 16:55:46 +08:00
zwjamnsss
77a9d58ad8 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-15 16:34:59 +08:00
zwjamnsss
600d7da21c feat: run 2017-08-15 16:34:41 +08:00
sean
2eb5f420dc feat: edit interface add auto header 2017-08-15 14:49:02 +08:00
qitmac000249
f91db88593 fix: 解决view页面的冲突 2017-08-15 12:15:07 +08:00
zwjamnsss
f67f0f2c4f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-15 12:09:34 +08:00
zwjamnsss
7dabd12b3e feat: run 2017-08-15 12:09:29 +08:00
qitmac000249
acdbd3837c fix: 添加接口view页 2017-08-15 12:08:59 +08:00
qitmac000249
ae39da3fe5 fix: 添加接口view页 2017-08-15 12:07:52 +08:00
sean
fe76f992f0 fix: mongodb auth bug and perfect mockServer 2017-08-15 12:05:22 +08:00
sean
c00b55af53 feat: del prd_host and perfect the interface edit style 2017-08-15 11:12:39 +08:00
sean
f504acdec8 feat: 完善edit interface 功能 2017-08-14 23:01:20 +08:00
sean
bc2904826c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-14 21:43:09 +08:00
sean
be6abeedf8 feat: edit interface ci 2017-08-14 21:43:06 +08:00
zwjamnsss
8e90284be9 fix: 解决冲突 2017-08-14 21:23:57 +08:00
zwjamnsss
129708f264 feat: run 2017-08-14 21:22:18 +08:00
zwjamnsss
57f2b872c3 Merge branch 'dev' into run 2017-08-14 20:09:57 +08:00
sean
04791fa39e fix: message login when guest open site 2017-08-14 20:09:47 +08:00
sean
fa510e9608 feat: add interface res some module 2017-08-14 19:58:33 +08:00
zwjamnsss
56a19f8a15 fix: 解决冲突 2017-08-14 19:34:04 +08:00
zwjamnsss
ff0f9b575c feat: run 部分 2017-08-14 19:23:20 +08:00
zwjamnsss
231c603629 feat: 接口集合菜单 2017-08-14 17:32:49 +08:00
sean
d160f68f16 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-14 16:30:38 +08:00
sean
5c91366f3a fix: col list bug 2017-08-14 16:30:30 +08:00
wenbo.dong
6ff320aecc feat: 我的关注页面 2017-08-14 15:41:58 +08:00
qitmac000249
e222f7113e fix: 加入动态页面及bug修改 2017-08-14 15:17:05 +08:00
sean
1a2e1dbfc0 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-14 13:44:55 +08:00
sean
cad46617b8 feat: add interface list and edit module 2017-08-14 13:44:49 +08:00
zwjamnsss
56f3b6e376 feat: 接口集合 2017-08-11 21:10:54 +08:00
qitmac000249
517a80ec22 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-11 20:22:00 +08:00
qitmac000249
60dc73b1e5 fix: 头像样式修改 2017-08-11 20:21:56 +08:00
wenbo.dong
b0c6a6baba fix: 处理冲突 2017-08-11 19:37:44 +08:00
wenbo.dong
3373833ece feat: 项目列表页改版 2017-08-11 19:30:12 +08:00
sean
207d6d202f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 18:58:02 +08:00
sean
7827657be0 feat: interface list 2017-08-11 18:57:58 +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
wenbo.dong
aa18293b98 feat: 项目广场布局 2017-08-11 17:47:25 +08:00
sean
ed748674b3 fix: interface import 2017-08-11 17:29:37 +08:00
sean
d32742ac80 feat: add project 2017-08-11 17:25:57 +08:00
sean
08e148d723 feat: add project module 2017-08-11 17:24:50 +08:00
zwjamnsss
41f91f67a7 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 16:31:00 +08:00
zwjamnsss
53934e6655 feat: 项目页面 2017-08-11 16:30:52 +08:00
wenbo.dong
6675eec66f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 16:21:34 +08:00
wenbo.dong
49ac460408 feat: AddProject移动到上一层目录 2017-08-11 16:21:07 +08:00
zwjamnsss
d58b723a31 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 16:20:42 +08:00
zwjamnsss
a1f4c32f16 opti: ignorge tags 2017-08-11 16:20:27 +08:00
wenbo.dong
319e5a6308 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 16:10:51 +08:00
wenbo.dong
7ec0d7ac87 feat: 添加项目改版 2017-08-11 16:10:49 +08:00
zwjamnsss
93cfee57c8 opti: 路由 2017-08-11 16:03:11 +08:00
zwjamnsss
30b8a8ec6b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 15:02:10 +08:00
zwjamnsss
8bdbf092e6 opti: 路由 2017-08-11 15:02:07 +08:00
wenbo.dong
34d588d6bf feat: header样式调整 2017-08-11 14:22:20 +08:00
qitmac000249
4c525dcc17 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-11 12:19:38 +08:00
qitmac000249
f1e81ead26 fix: 个人信息页修改 2017-08-11 12:19:31 +08:00
wenbo.dong
8b3761ee1d Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:40:57 +08:00
wenbo.dong
82e50fa9f7 fix: 登录接口加api前缀 2017-08-11 11:40:53 +08:00
wenbo.dong
2b7dd3192e Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:36:53 +08:00
zwjamnsss
e17f9714eb Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:36:50 +08:00
zwjamnsss
da14f317e3 opti: 路由 2017-08-11 11:34:55 +08:00
sean
6ed74e8ae1 fix: create and app bug 2017-08-11 11:33:40 +08:00
sean
ea640b2fd6 fix: create and app bug 2017-08-11 11:32:20 +08:00
zwjamnsss
ce0bdc55f8 fix: contaimer 2017-08-11 11:31:21 +08:00
zwjamnsss
3a22fe3765 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:26:53 +08:00
zwjamnsss
966953d3a7 fix: eslint 2017-08-11 11:26:49 +08:00
sean
005224b54e Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:26:13 +08:00
sean
a490324085 feat: fix redus-tools bug 2017-08-11 11:26:07 +08:00
wenbo.dong
5115f9d6e2 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:05:34 +08:00
zwjamnsss
d030c9fbaf opti: 优化路由结构 2017-08-11 10:58:15 +08:00
zwjamnsss
bb826f9a1c fix: 解决冲突 2017-08-11 10:56:38 +08:00
zwjamnsss
9394d20be9 feat: 项目页面路由 2017-08-11 10:44:45 +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
ad72fd9b38 fix: modify 2017-08-11 10:16:50 +08:00
wenbo.dong
e84c9cc74d Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 21:23:50 +08:00
wenbo.dong
749ee60b77 feat: 新建项目页布局 2017-08-10 21:23:47 +08:00
qitmac000249
eaa27df43f feat: 头像上传 2017-08-10 21:20:57 +08:00
qitmac000249
0f17d0b625 feat: 头像上传 2017-08-10 21:20:23 +08:00
zwjamnsss
aadebabc44 opti: 隐藏无用路由 2017-08-10 21:03:22 +08:00
zwjamnsss
8c04198eb2 feat: 项目路由 2017-08-10 20:56:30 +08:00
zwjamnsss
fca3a9865d Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 20:08:52 +08:00
zwjamnsss
3969693c43 opti: 将login改成user 2017-08-10 20:08:23 +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
196d77922a feat: 新建项目页面初始化 2017-08-10 18:26:46 +08:00
zwjamnsss
1ea95bbdf8 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 16:00:57 +08:00
zwjamnsss
1687b21029 opti: 晚上目录结构 2017-08-10 16:00:52 +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
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
58e4885aff feat: 前端添加avatar 2017-08-09 20:09:59 +08:00
qitmac000249
8f705397a3 fix: 完善动态页 2017-08-09 18:00:45 +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
zwjamnsss
c31f401a37 refactor: 将异步then 转换成 async await 2017-08-09 13:48:06 +08:00
zwjamnsss
ad644b332c feat: 增加async await 写法支持 2017-08-09 11:54:40 +08:00