Commit Graph

577 Commits

Author SHA1 Message Date
zwjamnsss
53f304447e fix: 解决冲突 2017-08-14 19:34:04 +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
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