Commit Graph

910 Commits

Author SHA1 Message Date
suxiaoxin
ab08cae0b3 fix: group/up bug 2017-08-25 16:25:34 +08:00
wenbo.dong
fc944b6252 docs: 首页文案更新 2017-08-25 16:15:40 +08:00
wenbo.dong
5ebdbc736c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-25 16:00:44 +08:00
wenbo.dong
2fbc207f54 opti: 首页布局优化 2017-08-25 16:00:42 +08:00
suxiaoxin
5e3c699822 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-25 15:55:23 +08:00
suxiaoxin
7b9334dbf3 fix: websocket bug 2017-08-25 15:55:19 +08:00
wenbo.dong
20cb902340 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-25 14:39:05 +08:00
wenbo.dong
16b564e11e opti: html布局容器调整 2017-08-25 14:38:46 +08:00
suxiaoxin
0f02d4df50 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-25 14:19:38 +08:00
suxiaoxin
5514c1eeb6 fix: 修改websocket domain bug 2017-08-25 14:18:22 +08:00
wenbo.dong
a2f565adf1 fix: 登录错误提示重复弹出的bug 2017-08-25 12:20:41 +08:00
qitmac000249
9566222bb3 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-25 11:57:16 +08:00
qitmac000249
7015d18171 fix: modify 2017-08-25 11:57:01 +08:00
wenbo.dong
ea011b3305 opti: 两列布局等高处理 2017-08-25 11:48:42 +08:00
wenbo.dong
81901beb14 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-25 11:33:22 +08:00
wenbo.dong
580f2d29b6 fix: 修改环境域名的正则条件 2017-08-25 11:33:12 +08:00
zwjamnsss
acb8c1e025 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-25 11:29:48 +08:00
zwjamnsss
777357a874 feat: 无插件禁止发送 2017-08-25 11:29:43 +08:00
wenbo.dong
ef7ebe7d18 fix: 项目环境修改后发送project/get请求 2017-08-25 11:26:31 +08:00
wenbo.dong
0343b4578d Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-25 11:22:28 +08:00
wenbo.dong
6826b18a92 opti: 我的关注也样式调整 2017-08-25 11:22:24 +08:00
qitmac000249
41164ef611 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-25 11:20:20 +08:00
qitmac000249
78fbddb27c fix: modify 2017-08-25 11:20:05 +08:00
wenbo.dong
8e5af29a8e feat: 注册后跳转到group列表 2017-08-25 11:18:41 +08:00
suxiaoxin
f2ea668fbd Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-25 11:18:33 +08:00
suxiaoxin
f56de4dcea feat: fix interface bug 2017-08-25 11:18:29 +08:00
wenbo.dong
aa62e7895b docs: 删除项目的文案修改 2017-08-25 11:12:37 +08:00
qitmac000249
a729750e79 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-25 11:11:12 +08:00
qitmac000249
74acbc54f4 fix: modify 2017-08-25 11:11:00 +08:00
zwjamnsss
9a43a3a9f0 feat: 手动下载安装插件 2017-08-25 10:28:46 +08:00
zwjamnsss
99a2f38352 opti: 改中文 2017-08-25 09:58:26 +08:00
zwjamnsss
ee2d87132b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-25 09:49:07 +08:00
zwjamnsss
4870462c16 opti: raw 2017-08-25 09:49:02 +08:00
wenbo.dong
1ca761d790 fix: 修复项目陈孤雁设置里,分组成员显示'我'定位错误 2017-08-24 21:57:53 +08:00
wenbo.dong
6781fc9330 fix: 修复我的关注页面跳转projectid传递错误的bug 2017-08-24 21:53:49 +08:00
wenbo.dong
25fb457d07 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 21:48:56 +08:00
wenbo.dong
481e951d57 feat: flag图标更换为beta 2017-08-24 21:48:53 +08:00
suxiaoxin
d402f8cd26 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 21:18:19 +08:00
suxiaoxin
7f050f45fb fix: interface path icon 2017-08-24 21:18:12 +08:00
zwjamnsss
be5e2077e9 fix: 解决冲突 2017-08-24 21:09:37 +08:00
zwjamnsss
6554c04643 feat: textarea 显示其他类型 2017-08-24 21:07:49 +08:00
suxiaoxin
90645685e1 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 20:58:35 +08:00
suxiaoxin
4c57b11eae feat: add chrome ctx 2017-08-24 20:58:30 +08:00
qitmac000249
14e975d0bf Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-24 19:28:03 +08:00
qitmac000249
8331214e5d fix: modify 2017-08-24 19:27:48 +08:00
wenbo.dong
0352b32e70 opti: 编辑项目页布局调整 2017-08-24 18:31:16 +08:00
wenbo.dong
64896e380d Mergebranch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 18:06:40 +08:00
wenbo.dong
39a741f8e3 opti: 布局调整 2017-08-24 18:06:38 +08:00
zwjamnsss
fed679d3aa Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 17:16:02 +08:00
zwjamnsss
fa021960c4 feat: other-editor 2017-08-24 17:15:58 +08:00
wenbo.dong
b961394719 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 17:13:04 +08:00
wenbo.dong
627ffe1d7f Met purge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 17:12:58 +08:00
suxiaoxin
b2e39a07ef docs: opti 2017-08-24 17:12:55 +08:00
wenbo.dong
20e861a4c4 feat: 更换首页图片 2017-08-24 17:12:55 +08:00
zwjamnsss
57d1eccd92 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 17:04:00 +08:00
zwjamnsss
e1539d495d feat: body-other-editor 2017-08-24 17:02:39 +08:00
suxiaoxin
13d0a1478b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 16:37:49 +08:00
suxiaoxin
70cc28270a docs: opti docs 2017-08-24 16:37:45 +08:00
wenbo.dong
0f642bd170 feat: 更换header 中的logo图片 2017-08-24 15:51:17 +08:00
wenbo.dong
511ede4f25 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 15:41:03 +08:00
wenbo.dong
a32b09a721 feat: 新建项目成员时选择成员权限 2017-08-24 15:41:01 +08:00
qitmac000249
cbcc2b37e7 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-24 15:39:35 +08:00
qitmac000249
2bf12d1e29 fix: 修改user样式 2017-08-24 15:39:22 +08:00
wenbo.dong
138b246973 feat: 新建分组成员时选择成员权限 2017-08-24 15:39:05 +08:00
wenbo.dong
3fde003c9c feat: 删除登录后的首页 2017-08-24 15:28:39 +08:00
wenbo.dong
935512fc4c fix: merge 2017-08-24 15:21:54 +08:00
wenbo.dong
9688ddcbfc feat: 首页引导注册 2017-08-24 15:20:40 +08:00
zwjamnsss
33e4126e52 opti: 样式 2017-08-24 14:38:31 +08:00
suxiaoxin
788a8be353 feat: merge to local 2017-08-24 14:18:44 +08:00
suxiaoxin
1682da97a6 feat: add auth check 2017-08-24 14:17:19 +08:00
wenbo.dong
ea1049a9ab Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 14:13:25 +08:00
wenbo.dong
eda0bce733 opti: 阴影调整 2017-08-24 14:13:22 +08:00
qitmac000249
c1586b8088 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-24 13:55:17 +08:00
qitmac000249
be4ef09c92 fix: 修改user页 2017-08-24 13:55:08 +08:00
suxiaoxin
a62f795ddc Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 12:16:46 +08:00
suxiaoxin
318d770f04 fix: interface filter bug 2017-08-24 12:16:43 +08:00
zwjamnsss
a99dfb63a1 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 12:14:17 +08:00
zwjamnsss
80070e61d2 feat: pretty 返回结果 2017-08-24 12:14:06 +08:00
zwjamnsss
bf5f59b687 feat: pretty 返回结果 2017-08-24 12:13:44 +08:00
qitmac000249
b71a8543f4 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-24 11:13:16 +08:00
qitmac000249
79fea88d39 fix: 修改user页 2017-08-24 11:13:02 +08:00
zwjamnsss
50a97e65d2 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 11:11:42 +08:00
zwjamnsss
912b552080 feat: 更新用例 2017-08-24 11:11:38 +08:00
qitmac000249
400974f4bd fix: modify 2017-08-24 11:04:53 +08:00
qitmac000249
99a824df7a fix: modify 2017-08-24 11:00:10 +08:00
zwjamnsss
192514fdc0 fix: 解决冲突 2017-08-24 10:47:23 +08:00
zwjamnsss
ff621418b6 feat: 返回header 2017-08-24 10:44:02 +08:00
suxiaoxin
4915041a19 feat: add up_case interface 2017-08-24 10:33:17 +08:00
wenbo.dong
039b146445 fix: 二级导航偏移的bug 2017-08-23 22:04:05 +08:00
wenbo.dong
179b204f0c opti: footer布局调整 2017-08-23 21:08:16 +08:00
wenbo.dong
6714f706d3 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-23 21:01:53 +08:00
wenbo.dong
46891fe732 opti: 设置页布局调整 2017-08-23 21:01:50 +08:00
suxiaoxin
7d79be6deb chore: opti build 2017-08-23 20:41:47 +08:00
suxiaoxin
0f02f6cc65 chore: add npm-shrinkwrap 2017-08-23 19:45:49 +08:00
suxiaoxin
bed8d4fa28 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-23 18:24:33 +08:00
suxiaoxin
313807368b opti: ykit build 2017-08-23 18:24:29 +08:00
wenbo.dong
25fa82348c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-23 17:23:58 +08:00
wenbo.dong
2ce89d122e opti: 项目卡片布局调整 2017-08-23 17:23:54 +08:00
suxiaoxin
b41f67319f fix: group router bug 2017-08-23 16:49:07 +08:00
wenbo.dong
a30e82cffb opti: 样式微调 2017-08-23 16:08:26 +08:00