Commit Graph

752 Commits

Author SHA1 Message Date
sean
587e592d82 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-19 19:06:12 +08:00
sean
b04c988def feat: add interface cat component 2017-08-19 19:06:09 +08:00
wenbo.dong
a366ef05e5 feat: 取消收藏功能 2017-08-19 15:18:55 +08:00
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