Commit Graph

501 Commits

Author SHA1 Message Date
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
880f2c61cf Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 17:56:10 +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
suxiaoxin
70c4f36b90 fix: ykit prd 2017-07-25 17:06:49 +08:00
suxiaoxin
1cd866e490 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 16:25:01 +08:00
suxiaoxin
7e209ca45d fix: ignore prd 2017-07-25 16:24:56 +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
suxiaoxin
350a824901 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 15:42:19 +08:00
suxiaoxin
f7109a10bd fix qsso first login params bug 2017-07-25 15:42:05 +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
73795893c5 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 15:16:46 +08:00
suxiaoxin
5f355a4de9 fix: add fast-sass in the package.json 2017-07-25 15:13:15 +08:00
waliang.wang
96c0e1ec34 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 15:11:48 +08:00
waliang.wang
fc3ccf2540 feat - 最新代码 2017-07-25 15:11:43 +08:00
suxiaoxin
10f2a78bbb Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 15:08:02 +08:00
suxiaoxin
58a51b457e fix: ykit build bug 2017-07-25 15:07:55 +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
suxiaoxin
2b361459c1 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 14:19:00 +08:00
suxiaoxin
3df7f38b42 feat: add client devops and change local domain yapi.local.qunar.com 2017-07-25 14:18:57 +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