Commit Graph

677 Commits

Author SHA1 Message Date
zwjamnsss
7b265c91d0 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 12:00:36 +08:00
zwjamnsss
5fc4a9d89c feat: col menu 2017-08-18 12:00:21 +08:00
wenbo.dong
a6b88f4472 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 11:39:46 +08:00
wenbo.dong
08a91f7c41 feat: setting页面布局 2017-08-18 11:39:08 +08:00
zwjamnsss
7b3d9ac4d1 feat: col menu 2017-08-18 11:33:37 +08:00
suxiaoxin
c561ede4cb fix: mockEditor bug 2017-08-18 11:23:04 +08:00
suxiaoxin
3f05be9660 fix: route bug 2017-08-18 11:05:33 +08:00
wenbo.dong
d2e2c486a4 opti: Errmsg组件 2017-08-17 23:07:23 +08:00
wenbo.dong
42afd5a23f feat: 错误提示组件 2017-08-17 23:00:32 +08:00
wenbo.dong
3b37371b80 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 22:20:01 +08:00
wenbo.dong
1cc8f3d43a feat: 编辑项目 2017-08-17 22:19:58 +08:00
zwjamnsss
b40816fba7 feat: menu 2017-08-17 20:58:43 +08:00
zwjamnsss
29376a5cbb feat: 解决冲突 2017-08-17 20:25:44 +08:00
zwjamnsss
d482d3b967 feat: col-menu 2017-08-17 20:24:07 +08:00
qitmac000249
b7d87a4f0e Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-17 20:08:30 +08:00
qitmac000249
157f175035 fix: 继续修改user页的显示 2017-08-17 20:08:10 +08:00
suxiaoxin
b574604717 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 18:00:11 +08:00
suxiaoxin
485b8d6821 fix: fix route some bug 2017-08-17 18:00:02 +08:00
qitmac000249
428adc9e1d Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-17 16:56:09 +08:00
qitmac000249
5a1dc04905 fix: user 权限显示 2017-08-17 16:55:52 +08:00
suxiaoxin
bd85dbbd42 fix: interface up bug 2017-08-17 16:40:58 +08:00
zwjamnsss
a02b4e585a Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 16:10:49 +08:00
zwjamnsss
9748f17f8b feat: componetWillMount 2017-08-17 16:10:43 +08:00
zwjamnsss
a953d27d2f feat: componetWillMount 2017-08-17 16:10:34 +08:00
wenbo.dong
7d73241dc8 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 15:35:05 +08:00
wenbo.dong
5893041ff6 docs: 文档文案修改 2017-08-17 15:34:43 +08:00
suxiaoxin
729fa3828c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 15:19:50 +08:00
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