Commit Graph

227 Commits

Author SHA1 Message Date
waliang.wang
a2a376e2f6 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-26 17:22:18 +08:00
waliang.wang
8ed2e5f36e feat: 删除确认框 2017-07-26 17:22:12 +08:00
qitmac000249
ad0b2e5cde Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-26 16:49:52 +08:00
qitmac000249
91849a558f fix: 修改project 样式 2017-07-26 16:49:46 +08:00
yhui.yang
5268854b30 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-26 16:45:28 +08:00
yhui.yang
6fc86e8078 fix: 加上未登录提示 2017-07-26 16:45:21 +08:00
qitmac000249
f4a96ea3fd Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-26 16:37:56 +08:00
qitmac000249
3d5091b50f fix: user页样式修改 2017-07-26 16:37:51 +08:00
waliang.wang
cb25bbebe0 解决冲突 2017-07-26 16:29:13 +08:00
waliang.wang
ad7a8e820a feat: 复制mock URL 2017-07-26 16:25:34 +08:00
yhui.yang
cfaca47d82 fix: 修改footer定位问题 2017-07-26 16:20:20 +08:00
yhui.yang
ea812875d4 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-26 16:07:11 +08:00
yhui.yang
4e60d62e19 opti: 修改首页样式 2017-07-26 16:06:54 +08:00
wenbo.dong
9b88c378a5 opti: 修改接口详情页样式 2017-07-26 15:38:34 +08:00
wenbo.dong
aa59f526d6 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-26 15:02:53 +08:00
wenbo.dong
f86561f97c fix: 修改项目时只有最后一项有删除按钮 2017-07-26 15:02:51 +08:00
zwjamnsss
b5718ea742 opti: 接口页面样式 2017-07-26 14:56:13 +08:00
zwjamnsss
0c7ee1c03b opti: group 接口页面 样式 2017-07-26 14:54:14 +08:00
qitmac000249
2b8eb63fbf fix: interface 最小高度设置 2017-07-26 13:07:12 +08:00
waliang.wang
2771f99b02 合并代码,解决冲突 2017-07-26 12:40:58 +08:00
waliang.wang
4f8dfa7dd6 feat - 调试接口 2017-07-26 12:31:42 +08:00
wenbo.dong
9f802acf94 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-26 12:13:25 +08:00
wenbo.dong
a8307cfd47 fix: 创建项目时protocol显示异常的bug 2017-07-26 12:13:22 +08:00
qitmac000249
303a8e84bd fix: project页最小高度设置 2017-07-26 12:10:22 +08:00
qitmac000249
496c166243 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-26 11:17:14 +08:00
qitmac000249
2459386719 fix: 修改user页 样式 2017-07-26 11:17:07 +08:00
zwjamnsss
cb1a0dd0ba Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-26 10:26:24 +08:00
zwjamnsss
3ee8cc356f fix: 项目简介多行文本溢出 2017-07-26 10:26:15 +08:00
wenbo.dong
ef66b566dd fix: 处理添加项目的环境配置时点击删除会删除多个配置的bug 2017-07-25 22:35:47 +08:00
zwjamnsss
a59696c565 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 21:30:24 +08:00
zwjamnsss
f9b2bf7c3c feat: 接口测试部分 2017-07-25 21:25:40 +08:00
qitmac000249
ef55513a6e Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-25 21:12:35 +08:00
qitmac000249
7b63a92426 fix: 修改编辑分组TextArea 2017-07-25 21:12:30 +08:00
yhui.yang
2259c072de Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 21:04:19 +08:00
yhui.yang
c1b00c88ac fix: 解决刷新页面后取不到uid,搜索框为中文 2017-07-25 21:04:11 +08:00
qitmac000249
fb38d68bf1 fix: 修改projectList路径 2017-07-25 20:57:54 +08:00
zwjamnsss
7138bcd9cb Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 18:21:16 +08:00
yhui.yang
c0446b2ef2 fix: 添加footer,修正高度问题 2017-07-25 18:11:53 +08:00
yhui.yang
66e2c3e664 fix: 首页和header一些小bug 2017-07-25 17:56:04 +08:00
waliang.wang
015e9c63c8 解决冲突 2017-07-25 17:51:48 +08:00
waliang.wang
ee31f5cb4c feat - 修改路由参数 2017-07-25 17:41:58 +08:00
zwjamnsss
8839b4e4a8 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 17:09:55 +08:00
qitmac000249
e052fe12d5 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-25 16:18:07 +08:00
qitmac000249
4384e78a53 fix: 继续修复group bug 2017-07-25 16:18:00 +08:00
wenbo.dong
ecdb636a53 fix: 处理reg.js的缩进问题 2017-07-25 16:16:32 +08:00
wenbo.dong
ab1cd8b9ef feat: 注册的email添加正则判断 2017-07-25 16:06:26 +08:00
wenbo.dong
8b1f37077b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 16:02:20 +08:00
wenbo.dong
e3e6a97c72 fix: login错误处理 2017-07-25 16:02:18 +08:00
qitmac000249
494f62baf7 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-25 15:54:02 +08:00
qitmac000249
13dc04b71a fix: 修复group路由问题 2017-07-25 15:53:55 +08:00