Commit Graph

743 Commits

Author SHA1 Message Date
qitmac000249
2511bf880b fix: style 2017-07-27 18:19:17 +08:00
suxiaoxin
d40650a8a8 feat: add server_ip 2017-07-27 18:01:20 +08:00
suxiaoxin
e3b39c061c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 18:00:47 +08:00
suxiaoxin
bb9c05f035 feat: add server_ip 2017-07-27 18:00:43 +08:00
zwjamnsss
05bb97b91f opti: 返回结果样式 2017-07-27 17:34:46 +08:00
zwjamnsss
997a716164 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 17:16:29 +08:00
zwjamnsss
ae4b7e1513 opti: 请求接口loading 2017-07-27 17:16:23 +08:00
waliang.wang
07d0e44207 erge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 16:48:36 +08:00
waliang.wang
2190a3aef1 feat: 添加项目成员 2017-07-27 16:48:30 +08:00
qitmac000249
585c414c6a Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-27 16:35:53 +08:00
qitmac000249
0316e16e8f fix: 更改github地址 2017-07-27 16:35:48 +08:00
wenbo.dong
7bd125baca opti: 设置页面最小高度 2017-07-27 16:29:28 +08:00
yhui.yang
71b852708f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 16:24:54 +08:00
yhui.yang
85b2a7c4a0 fix: 修改搜索框颜色 2017-07-27 16:23:58 +08:00
zwjamnsss
ca8496f656 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 15:55:16 +08:00
zwjamnsss
88b4893c5a fix: 删除分组改用气泡弹窗 2017-07-27 15:55:11 +08:00
wenbo.dong
1d979619f5 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 15:54:57 +08:00
wenbo.dong
fc26a65751 docs: 文案修改 2017-07-27 15:54:54 +08:00
qitmac000249
e781bd3071 fix: 修改user页面细节 2017-07-27 15:50:04 +08:00
qitmac000249
deb85bd81c fix: 用户管理弹出框文本更改 2017-07-27 15:17:46 +08:00
祝鑫奔
bde9340d6f opti: 代码格式优化 2017-07-27 15:06:42 +08:00
suxiaoxin
655274a20e Merge branch 'dev' into 'master'
Dev

See merge request !19
2017-07-27 14:59:07 +08:00
suxiaoxin
3743e3301f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 14:58:38 +08:00
suxiaoxin
b604295a07 fix: package 2017-07-27 14:58:32 +08:00
wenbo.dong
0f9db7d219 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 14:46:59 +08:00
yhui.yang
4e923f2c5a Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 14:46:13 +08:00
yhui.yang
befb197bea fix: 个人中心样式修改 2017-07-27 14:45:51 +08:00
suxiaoxin
020d0b495b Merge branch 'dev' into 'master'
Dev

See merge request !18
2017-07-27 14:44:23 +08:00
suxiaoxin
4af9881113 fix: add eslint in the package 2017-07-27 14:42:15 +08:00
wenbo.dong
2c2d9b47e7 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 14:35:29 +08:00
wenbo.dong
9477559b4a opti: 统一两列布局比例 2017-07-27 14:35:27 +08:00
suxiaoxin
07b331dec6 Merge branch 'dev' into 'master'
Dev

See merge request !17
2017-07-27 14:24:25 +08:00
suxiaoxin
2729f42520 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 14:21:26 +08:00
suxiaoxin
3517bf0959 feat: ops 2017-07-27 14:21:22 +08:00
祝鑫奔
2d18b83bad opti: 修复缩进和代码风格 2017-07-27 14:12:43 +08:00
yhui.yang
ffdea2ac82 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 14:08:16 +08:00
yhui.yang
c3705d8593 fix: 修复首页最大最小宽度显示问题 2017-07-27 14:08:07 +08:00
zwjamnsss
8f9f5f4a94 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 12:13:34 +08:00
zwjamnsss
9bad28a820 fix: 请求接口 url 样式 2017-07-27 12:13:18 +08:00
suxiaoxin
46f0023a37 Merge branch 'dev' into 'master'
Dev to master

See merge request !16
2017-07-27 12:04:02 +08:00
suxiaoxin
a81face47e Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 12:03:23 +08:00
suxiaoxin
4c1eff6404 chore: ops 2017-07-27 12:03:18 +08:00
qitmac000249
df18193c5f Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-27 12:02:04 +08:00
qitmac000249
8ef143a25f fix: user 样式修改 2017-07-27 12:01:56 +08:00
suxiaoxin
90a058ee93 Merge branch 'dev' into 'master'
Dev to master

See merge request !15
2017-07-27 11:57:29 +08:00
suxiaoxin
8d6de5d3f2 feat: 因部署修改runtime路径 2017-07-27 11:50:15 +08:00
zwjamnsss
604213d825 fix: 解决冲突 2017-07-27 11:34:03 +08:00
zwjamnsss
cdfd52a219 fix: group 搜索框宽度窄超出 2017-07-27 11:29:12 +08:00
qitmac000249
567909d946 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-27 11:23:55 +08:00
qitmac000249
0c2515caa8 fix: 修改添加分组和search为响应式及footer样式 2017-07-27 11:23:48 +08:00