Commit Graph

391 Commits

Author SHA1 Message Date
zwjamnsss
4800a13ff7 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 17:09:55 +08:00
sean
0c9c929ba9 fix: ykit prd 2017-07-25 17:06:49 +08:00
sean
94ebc21daf Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 16:25:01 +08:00
sean
254e069d6a fix: ignore prd 2017-07-25 16:24:56 +08:00
yhui.yang
22c839bebb fix: 修改跳转路由 2017-07-25 16:24:46 +08:00
qitmac000249
bd70fe6c7a Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-25 16:18:07 +08:00
qitmac000249
cbbe26296c fix: 继续修复group bug 2017-07-25 16:18:00 +08:00
wenbo.dong
93886c1240 fix: 处理reg.js的缩进问题 2017-07-25 16:16:32 +08:00
wenbo.dong
f53cf6ab65 fix: 修改profile路由 2017-07-25 16:12:10 +08:00
wenbo.dong
b0f654eebe feat: 注册的email添加正则判断 2017-07-25 16:06:26 +08:00
wenbo.dong
6cd4df8b6e fix: login的reducer文件正确返回 2017-07-25 16:04:45 +08:00
wenbo.dong
3d5e384563 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 16:02:20 +08:00
wenbo.dong
f42ef229a1 fix: login错误处理 2017-07-25 16:02:18 +08:00
qitmac000249
1f6603f70e Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-25 15:54:02 +08:00
qitmac000249
901c80846c fix: 修复group路由问题 2017-07-25 15:53:55 +08:00
sean
2879fe7002 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 15:42:19 +08:00
sean
0067d23e64 fix qsso first login params bug 2017-07-25 15:42:05 +08:00
yhui.yang
5201007554 fix: add rc-queque-anim,rc-scroll-anim in the package.json 2017-07-25 15:40:23 +08:00
yhui.yang
50aa0d1bec opti: 首页添加动画,修改header 2017-07-25 15:35:23 +08:00
zwjamnsss
8ed6a757a0 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 15:30:44 +08:00
sean
fc5abce8d8 fix: add fast-sass in the package.json 2017-07-25 15:13:15 +08:00
sean
7eaddc905f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 15:08:02 +08:00
sean
b644d83c92 fix: ykit build bug 2017-07-25 15:07:55 +08:00
waliang.wang
a96b53917e Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 14:35:51 +08:00
waliang.wang
b31460bfb5 接口ui修改 2017-07-25 14:35:46 +08:00
wenbo.dong
755ce8b0bd feat: QSSO登录添加分割线 2017-07-25 14:24:47 +08:00
sean
ca13f3b70c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 14:19:00 +08:00
sean
dd864994cc feat: add client devops and change local domain yapi.local.qunar.com 2017-07-25 14:18:57 +08:00
qitmac000249
a8cabdd3ef fix: 修改history导致的warm 2017-07-25 13:46:37 +08:00
zwjamnsss
bc7bf75b65 feat: 接口测完完成部分 2017-07-25 13:34:48 +08:00
qitmac000249
de24799c40 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-25 13:18:00 +08:00
qitmac000249
edd82fd3a8 fix: 优化分组页的路由 2017-07-25 13:17:54 +08:00
wenbo.dong
62bf3bd22e feat: 登录后跳转到首页 2017-07-25 11:22:42 +08:00
wenbo.dong
e61933bcf4 feat: 在variable.js文件中添加列最大宽度与最小宽度 2017-07-25 11:10:09 +08:00
wenbo.dong
871c833df0 fix: merge 2017-07-25 10:50:33 +08:00
wenbo.dong
ca32cd934d feat: 修改项目的环境域名添加了http/https的选择功能 2017-07-25 10:49:19 +08:00
qitmac000249
66b23b2440 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-25 10:31:29 +08:00
qitmac000249
693d2cd667 fix: 修改添加分组处最小宽度以及添加分组的描述框为textarea 2017-07-25 10:31:19 +08:00
sean
b6fca96979 fix qsso login need click double and delete project auth bug 2017-07-25 10:22:45 +08:00
zwjamnsss
fa0cc83cae Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 09:27:29 +08:00
zwjamnsss
f4ec75c7c3 fix: 修复Safari样式 2017-07-25 09:27:25 +08:00
waliang.wang
9e6f7d5caf 解决冲突 2017-07-24 19:44:46 +08:00
waliang.wang
601a0a8360 feat - mock 2017-07-24 19:43:13 +08:00
wenbo.dong
59c7eb1bfe fix: 处理新建或修改项目时basepath验证错误的问题 2017-07-24 19:35:15 +08:00
qitmac000249
a009337b73 fix: footer内容添加 2017-07-24 18:35:06 +08:00
qitmac000249
c01f59936b fix: 样式修改 2017-07-24 18:17:30 +08:00
wenbo.dong
57c15c2148 opti: Login样式修改 2017-07-24 17:30:25 +08:00
wenbo.dong
a88d388a40 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-24 17:21:14 +08:00
wenbo.dong
25e90111af opti: Login样式修改 2017-07-24 17:21:10 +08:00
qitmac000249
659b32d136 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-24 16:56:31 +08:00