Commit Graph

333 Commits

Author SHA1 Message Date
zwjamnsss
b770d95c77 fix: 解决冲突 2017-07-26 15:55:33 +08:00
zwjamnsss
456e861431 opti: 上传测试按钮 2017-07-26 15:53:22 +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
534ba5d2a8 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 18:12:00 +08:00
yhui.yang
c0446b2ef2 fix: 添加footer,修正高度问题 2017-07-25 18:11:53 +08:00
qitmac000249
3a5619c5b2 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-25 18:08:19 +08:00
qitmac000249
9c810178ab fix: 修改路由warm 2017-07-25 18:08:12 +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
yhui.yang
48b0d0eba7 fix: 修改跳转路由 2017-07-25 16:24:46 +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
3e0f978db8 fix: 修改profile路由 2017-07-25 16:12:10 +08:00
wenbo.dong
ab1cd8b9ef feat: 注册的email添加正则判断 2017-07-25 16:06:26 +08:00
wenbo.dong
2ea2eab379 fix: login的reducer文件正确返回 2017-07-25 16:04:45 +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
yhui.yang
a39645d403 fix: add rc-queque-anim,rc-scroll-anim in the package.json 2017-07-25 15:40:23 +08:00
yhui.yang
cab350259f opti: 首页添加动画,修改header 2017-07-25 15:35:23 +08:00
zwjamnsss
30c6d6226b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 15:30:44 +08:00
waliang.wang
fc3ccf2540 feat - 最新代码 2017-07-25 15:11:43 +08:00
waliang.wang
15bb3df095 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 14:35:51 +08:00
waliang.wang
9fdf3a44db 接口ui修改 2017-07-25 14:35:46 +08:00
wenbo.dong
b6e1e9fa21 feat: QSSO登录添加分割线 2017-07-25 14:24:47 +08:00
qitmac000249
d7f5be93a8 fix: 修改history导致的warm 2017-07-25 13:46:37 +08:00
zwjamnsss
8399b0305c feat: 接口测完完成部分 2017-07-25 13:34:48 +08:00
qitmac000249
d76b0cc678 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-25 13:18:00 +08:00
qitmac000249
af6680b589 fix: 优化分组页的路由 2017-07-25 13:17:54 +08:00
wenbo.dong
7d100b5b68 feat: 登录后跳转到首页 2017-07-25 11:22:42 +08:00
wenbo.dong
d349a43184 feat: 在variable.js文件中添加列最大宽度与最小宽度 2017-07-25 11:10:09 +08:00
wenbo.dong
da411971e9 fix: merge 2017-07-25 10:50:33 +08:00
wenbo.dong
e41937037d feat: 修改项目的环境域名添加了http/https的选择功能 2017-07-25 10:49:19 +08:00
qitmac000249
237a53ded6 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-25 10:31:29 +08:00
qitmac000249
60ae8e073f fix: 修改添加分组处最小宽度以及添加分组的描述框为textarea 2017-07-25 10:31:19 +08:00
suxiaoxin
a0aa06f46a fix qsso login need click double and delete project auth bug 2017-07-25 10:22:45 +08:00
zwjamnsss
cb17d51f54 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 09:27:29 +08:00
zwjamnsss
97244db900 fix: 修复Safari样式 2017-07-25 09:27:25 +08:00
waliang.wang
cde8e44d68 解决冲突 2017-07-24 19:44:46 +08:00
waliang.wang
a9598f6de4 feat - mock 2017-07-24 19:43:13 +08:00
qitmac000249
7cf0d94c55 fix: footer内容添加 2017-07-24 18:35:06 +08:00
qitmac000249
80433f68b8 fix: 样式修改 2017-07-24 18:17:30 +08:00
wenbo.dong
1ab001d6a3 opti: Login样式修改 2017-07-24 17:30:25 +08:00
wenbo.dong
d6090778aa Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-24 17:21:14 +08:00
wenbo.dong
c484ae0f5a opti: Login样式修改 2017-07-24 17:21:10 +08:00
qitmac000249
e320308393 fix: 修改footer样式 2017-07-24 16:41:11 +08:00
yhui.yang
a4a824031a fix: 修复未登录时的路由地址未改变 2017-07-24 11:35:31 +08:00
waliang.wang
4d8f1aa4df 合并代码,解决冲突 2017-07-24 11:14:30 +08:00
waliang.wang
c9ed7902a0 put 接口 2017-07-24 11:10:23 +08:00
yhui.yang
1a3015a8c4 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-24 11:04:56 +08:00
yhui.yang
bd2164deac fix: rename App->Application 2017-07-24 11:04:51 +08:00
waliang.wang
e638bddd12 feat - 编辑接口 2017-07-24 10:59:17 +08:00
wenbo.dong
a2358c7670 feat: 登录模块添加状态提示 2017-07-23 18:24:46 +08:00
wenbo.dong
ff1d162d0e Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-23 17:32:28 +08:00
wenbo.dong
ff44b9b129 fix: 修复修改项目表单显示异常的bug 2017-07-23 17:31:14 +08:00
yhui.yang
5449517f4c fix: merge 2017-07-21 12:29:53 +08:00
yhui.yang
ab732c5cf6 fix: 修改action,去掉登录退出的强制刷新 2017-07-21 12:27:24 +08:00
suxiaoxin
c3ad652c84 fix: import app to App 2017-07-21 10:12:49 +08:00
suxiaoxin
77f6943456 删除app.js 2017-07-21 10:04:03 +08:00
suxiaoxin
fbdd7d8bef fix: fix project interface bug and change app.js to App.js 2017-07-21 10:03:34 +08:00
wenbo.dong
f38106e91b opti: 样式微调 2017-07-20 22:24:31 +08:00
wenbo.dong
375769b257 feat: 修改项目的环境配置功能 2017-07-20 22:08:09 +08:00
wenbo.dong
b6524a6ced Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 21:37:00 +08:00
yhui.yang
63f18dad65 opti: add skip of menu 2017-07-20 21:30:35 +08:00
yhui.yang
39e0221587 fix: 为了刷新app.js的路由,在登录退出时加上强制刷新 2017-07-20 20:52:04 +08:00
yhui.yang
e39240fb27 feat: 添加header上的搜索,修改路由,修改登录页面样式,merge文件 2017-07-20 20:31:20 +08:00
wenbo.dong
dc8632c69a Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 20:24:09 +08:00
wenbo.dong
0fcd2486d7 fix: 处理冲突文件 2017-07-20 20:24:06 +08:00
yhui.yang
3e2f7b90f7 feat: 添加header上的搜索,修改路由,修改登录页面样式 2017-07-20 19:59:49 +08:00
suxiaoxin
22f0f557bd fix: fix interface up bug 2017-07-20 19:47:10 +08:00
waliang.wang
af754fe234 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev2 2017-07-20 19:26:14 +08:00
waliang.wang
e303f5f218 feat : 调试保存接口 2017-07-20 19:26:04 +08:00
suxiaoxin
5e096d1e67 feat: change some user style 2017-07-20 18:15:45 +08:00