Commit Graph

531 Commits

Author SHA1 Message Date
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
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
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
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
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