Commit Graph

784 Commits

Author SHA1 Message Date
zwjamnsss
4af8846935 fix: 解决冲突 2017-08-14 21:23:57 +08:00
zwjamnsss
1f514260be feat: run 2017-08-14 21:22:18 +08:00
zwjamnsss
7237bb7f98 Merge branch 'dev' into run 2017-08-14 20:09:57 +08:00
suxiaoxin
5d1ceafc39 fix: message login when guest open site 2017-08-14 20:09:47 +08:00
suxiaoxin
a7e4845ada feat: add interface res some module 2017-08-14 19:58:33 +08:00
zwjamnsss
53f304447e fix: 解决冲突 2017-08-14 19:34:04 +08:00
zwjamnsss
8cc6754f1e feat: run 部分 2017-08-14 19:23:20 +08:00
zwjamnsss
69c8e447ed feat: 接口集合菜单 2017-08-14 17:32:49 +08:00
suxiaoxin
3cf804e832 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-14 16:30:38 +08:00
suxiaoxin
6b942ace9b fix: col list bug 2017-08-14 16:30:30 +08:00
wenbo.dong
71cd6c3b1b feat: 我的关注页面 2017-08-14 15:41:58 +08:00
qitmac000249
6a5b588196 fix: 加入动态页面及bug修改 2017-08-14 15:17:05 +08:00
suxiaoxin
5ccd051817 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-14 13:44:55 +08:00
suxiaoxin
7b60aab44f feat: add interface list and edit module 2017-08-14 13:44:49 +08:00
zwjamnsss
76df380a6c feat: 接口集合 2017-08-11 21:10:54 +08:00
qitmac000249
1d5d10e726 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-11 20:22:00 +08:00
qitmac000249
dfbaceea12 fix: 头像样式修改 2017-08-11 20:21:56 +08:00
wenbo.dong
6391618a39 fix: 处理冲突 2017-08-11 19:37:44 +08:00
wenbo.dong
5892ecea7e feat: 项目列表页改版 2017-08-11 19:30:12 +08:00
suxiaoxin
99fe95614d Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 18:58:02 +08:00
suxiaoxin
021e683103 feat: interface list 2017-08-11 18:57:58 +08:00
qitmac000249
80d7f1daa2 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-11 17:49:52 +08:00
qitmac000249
fa0765b6bc fix: modify 很多 2017-08-11 17:49:47 +08:00
wenbo.dong
eb931166ef feat: 项目广场布局 2017-08-11 17:47:25 +08:00
suxiaoxin
ade494a983 fix: interface import 2017-08-11 17:29:37 +08:00
suxiaoxin
b6cd3eea3b feat: add project 2017-08-11 17:25:57 +08:00
suxiaoxin
322a3bb2cf feat: add project module 2017-08-11 17:24:50 +08:00
zwjamnsss
0adc1c51f6 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 16:31:00 +08:00
zwjamnsss
32a0704bf5 feat: 项目页面 2017-08-11 16:30:52 +08:00
wenbo.dong
465d40f355 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 16:21:34 +08:00
wenbo.dong
6980eef06f feat: AddProject移动到上一层目录 2017-08-11 16:21:07 +08:00
zwjamnsss
a5763cece5 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 16:20:42 +08:00
zwjamnsss
ca4d4c95a3 opti: ignorge tags 2017-08-11 16:20:27 +08:00
wenbo.dong
fcba2f35fe Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 16:10:51 +08:00
wenbo.dong
96b682c092 feat: 添加项目改版 2017-08-11 16:10:49 +08:00
zwjamnsss
16a57c563f opti: 路由 2017-08-11 16:03:11 +08:00
zwjamnsss
989b2dc83f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 15:02:10 +08:00
zwjamnsss
d4fc53614c opti: 路由 2017-08-11 15:02:07 +08:00
wenbo.dong
b5585b9ba0 feat: header样式调整 2017-08-11 14:22:20 +08:00
qitmac000249
22627aab67 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-11 12:19:38 +08:00
qitmac000249
b80b75dfdf fix: 个人信息页修改 2017-08-11 12:19:31 +08:00
wenbo.dong
11b8df5b04 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:40:57 +08:00
wenbo.dong
469c6216d0 fix: 登录接口加api前缀 2017-08-11 11:40:53 +08:00
wenbo.dong
39099acb4c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:36:53 +08:00
zwjamnsss
b637fc6412 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:36:50 +08:00
zwjamnsss
f67c69b866 opti: 路由 2017-08-11 11:34:55 +08:00
suxiaoxin
7e25bfd0fe fix: create and app bug 2017-08-11 11:33:40 +08:00
suxiaoxin
9e79bee968 fix: create and app bug 2017-08-11 11:32:20 +08:00
zwjamnsss
2d8df12dd0 fix: contaimer 2017-08-11 11:31:21 +08:00
zwjamnsss
734adb9251 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:26:53 +08:00
zwjamnsss
e242eb8715 fix: eslint 2017-08-11 11:26:49 +08:00
suxiaoxin
aa8d1f4b2a Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:26:13 +08:00
suxiaoxin
3f46d6881a feat: fix redus-tools bug 2017-08-11 11:26:07 +08:00
wenbo.dong
e255712852 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:05:34 +08:00
zwjamnsss
8599d8b795 opti: 优化路由结构 2017-08-11 10:58:15 +08:00
zwjamnsss
b64e736746 fix: 解决冲突 2017-08-11 10:56:38 +08:00
zwjamnsss
300cdf23c6 feat: 项目页面路由 2017-08-11 10:44:45 +08:00
suxiaoxin
6360e6722d feat: merge to local and fix some bug 2017-08-11 10:31:26 +08:00
suxiaoxin
368a2f280a feat: 优化url,去掉#,后端接口统一使用/api前缀 2017-08-11 10:25:19 +08:00
qitmac000249
a4bebf74cd fix: modify 2017-08-11 10:16:50 +08:00
wenbo.dong
dd8f48587f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 21:23:50 +08:00
wenbo.dong
65fc1ae7ac feat: 新建项目页布局 2017-08-10 21:23:47 +08:00
qitmac000249
613d33268b feat: 头像上传 2017-08-10 21:20:57 +08:00
qitmac000249
f8425ba5af feat: 头像上传 2017-08-10 21:20:23 +08:00
zwjamnsss
84f84732fd opti: 隐藏无用路由 2017-08-10 21:03:22 +08:00
zwjamnsss
20971295f0 feat: 项目路由 2017-08-10 20:56:30 +08:00
zwjamnsss
94d4bf2378 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 20:08:52 +08:00
zwjamnsss
ab2e15f297 opti: 将login改成user 2017-08-10 20:08:23 +08:00
suxiaoxin
d2d3f0efe2 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 18:54:35 +08:00
suxiaoxin
6c1bbf295d feat: add user/project and fix ykit commonsChunk bug 2017-08-10 18:54:32 +08:00
wenbo.dong
f52a576e25 feat: 新建项目页面初始化 2017-08-10 18:26:46 +08:00
zwjamnsss
5ccce99b23 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 16:00:57 +08:00
zwjamnsss
3d66d5389b opti: 晚上目录结构 2017-08-10 16:00:52 +08:00
qitmac000249
05a53498b1 fix: projectBox 2017-08-10 15:37:20 +08:00
qitmac000249
f93df49229 fix: projectBox 2017-08-10 15:36:35 +08:00
suxiaoxin
cda4d0ffd3 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 15:24:22 +08:00
suxiaoxin
f5ea25e00b feat: add avatar module 2017-08-10 15:22:42 +08:00
qitmac000249
6679e6e478 feat: 添加follow 后端接口 2017-08-10 12:14:35 +08:00
qitmac000249
739597e234 feat: 添加follow 后端接口 2017-08-10 12:13:32 +08:00
qitmac000249
d30fcf240a feat: 前端添加avatar 2017-08-09 20:09:59 +08:00
qitmac000249
140be1848c fix: 完善动态页 2017-08-09 18:00:45 +08:00
qitmac000249
1d8f582380 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-09 16:08:44 +08:00
qitmac000249
51d852a793 feat: 添加动态页面 2017-08-09 16:08:37 +08:00
zwjamnsss
8697c26b84 refactor: 将异步then 转换成 async await 2017-08-09 13:48:06 +08:00
zwjamnsss
653ab17d6b feat: 增加async await 写法支持 2017-08-09 11:54:40 +08:00
wenbo.dong
32f59a6b34 opti: header样式优化 2017-08-08 20:46:19 +08:00
wenbo.dong
93de0a586b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-08 20:27:21 +08:00
wenbo.dong
21349034b9 feat: header重构 2017-08-08 20:27:18 +08:00
suxiaoxin
b9d687b0cb feat: server col and case , client use babel-plugin-import load antd 2017-08-08 19:18:12 +08:00
wenbo.dong
7d8455165a Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-08 16:21:35 +08:00
wenbo.dong
bda0a39e17 feat: 二级导航路由跳转 2017-08-08 16:21:32 +08:00
zwjamnsss
71b3971112 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-08 15:41:12 +08:00
zwjamnsss
80be4a089c feat: 增加全局错误提示 2017-08-08 15:41:07 +08:00
wenbo.dong
d5588bdd99 fix: 删除reducer中user文件引用的错误 2017-08-08 15:29:59 +08:00
wenbo.dong
9abdc36aa0 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-08 15:25:29 +08:00
wenbo.dong
7760a6379d feat: 二级导航布局 2017-08-08 15:25:12 +08:00
suxiaoxin
0f851dc8d0 feat: auth and merge 2017-08-08 14:46:08 +08:00
suxiaoxin
5dcd1bbdc8 feat: add server auth 2017-08-08 14:45:19 +08:00
zwjamnsss
5d5c63f8ec opti: 优化代码结构添加错误统一提示 2017-08-08 14:25:33 +08:00
zwjamnsss
5ceae0f44b opti: 优化代码结构 2017-08-08 10:07:55 +08:00
zwjamnsss
15f5315c0c fix: 解决冲突 2017-08-07 20:04:47 +08:00
zwjamnsss
48bb7babd1 opti: 优化redux结构 2017-08-07 19:34:34 +08:00
qitmac000249
a6197753a2 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-07 16:50:55 +08:00
qitmac000249
1f29f77370 feat: 添加MockDoc组件、parseMock方法 2017-08-07 16:50:47 +08:00
zwjamnsss
c7a8bc4810 fix: 文件名大小写 2017-08-07 15:57:15 +08:00
zwjamnsss
d4425d8c5c fix: 改文件名大小写 2017-08-07 15:55:32 +08:00
zwjamnsss
bcb348bea8 test: 该文件名 2017-08-07 15:52:46 +08:00
zwjamnsss
2e10294e45 fix: none 2017-08-07 15:41:41 +08:00
zwjamnsss
f9f628c54f fix: 恢复文件名大小 2017-08-07 15:40:21 +08:00
zwjamnsss
a4a3ed2090 fix: 修改文件夹大小 2017-08-07 15:39:15 +08:00
zwjamnsss
263251634d fix: 恢复正确命名 2017-08-07 15:32:39 +08:00
zwjamnsss
8ba6badfee fix: 修改文件名大小写 2017-08-07 15:31:37 +08:00
zwjamnsss
9e83be75b2 opti: 改文件名 2017-08-04 17:59:44 +08:00
zwjamnsss
8890907723 opti: redux-devtools 默认关闭 2017-08-04 17:47:31 +08:00
zwjamnsss
1f28bd6fd3 fix: 去掉多余的 babel-polyfill 2017-08-04 15:15:28 +08:00
zwjamnsss
418e6647bc feat: add redux-devtools 2017-08-04 12:15:45 +08:00
qitmac000249
54a81e5a53 fix: 封装regexp_parse 2017-08-02 18:32:01 +08:00
qitmac000249
90b962d2c8 fix: mock支持RegExp 2017-08-02 16:55:13 +08:00
suxiaoxin
fc9753ce73 fix: edit project basepath is empaty bug 2017-08-01 17:15:55 +08:00
suxiaoxin
f4749ba743 fix: project edit index bug 2017-08-01 16:35:31 +08:00
suxiaoxin
cc9fa087bf Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-01 16:07:16 +08:00
suxiaoxin
1932d8eac2 fix: 项目编辑basepath bug 2017-08-01 16:07:10 +08:00
qitmac000249
092bb88db5 fix: 修改user页面 2017-08-01 16:00:24 +08:00
qitmac000249
eeba1ce796 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-01 15:55:37 +08:00
zwjamnsss
764bb6da20 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-01 15:53:49 +08:00
zwjamnsss
04596eb9fa fix: 编辑 path query转成数组 2017-08-01 15:53:41 +08:00
qitmac000249
f85ba9983d fix: modify 2017-08-01 15:52:28 +08:00
suxiaoxin
596e20d0a8 feat: basepath is unrequired and fix auth bug 2017-08-01 15:37:07 +08:00
waliang.wang
d7d8040bac fix: 接口页面宽度 2017-08-01 15:34:01 +08:00
waliang.wang
fc3531cb66 解决冲突 2017-08-01 15:12:07 +08:00
waliang.wang
978cfe28d6 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-01 15:10:43 +08:00
waliang.wang
d4ade16845 fix: 添加loading 2017-08-01 15:10:39 +08:00
qitmac000249
18442ed387 fix: 修改project的显示 2017-08-01 15:03:34 +08:00
qitmac000249
4d035a434b Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-01 14:09:02 +08:00
qitmac000249
34c3043ef8 fix: 修改样式及用户管理只在admin时展示 2017-08-01 14:08:51 +08:00
zwjamnsss
f296079b62 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-01 14:02:10 +08:00
zwjamnsss
e77fe96f61 feat: 接口测试文件上传 2017-08-01 14:02:06 +08:00
suxiaoxin
4d864d4ecf fix: fix add interface errmsg bug 2017-08-01 13:58:07 +08:00
waliang.wang
0ebe9b5dc9 fix: 文案提示 2017-08-01 12:43:13 +08:00
waliang.wang
089b3774d1 fix: 添加请求头 2017-08-01 12:26:13 +08:00
waliang.wang
63be9d5401 fix: 失败loading 2017-08-01 12:08:56 +08:00
suxiaoxin
7b32272367 docs: 使用文档 2017-08-01 10:48:11 +08:00
suxiaoxin
36178f64ee feat: add default resParams reqParams 2017-08-01 09:49:11 +08:00
suxiaoxin
2d1cd4b609 feat: 设置默认的method 2017-07-31 21:41:49 +08:00
suxiaoxin
80c6423b41 fix: server_ip 2017-07-31 21:18:14 +08:00
suxiaoxin
5d1f382189 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-31 21:07:28 +08:00
suxiaoxin
f544501373 feat: add autocomplete 2017-07-31 21:07:24 +08:00
waliang.wang
fdef03b38a Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-31 19:43:12 +08:00
waliang.wang
6215d66df5 feat: 跳转新连接,复制内容 2017-07-31 19:43:08 +08:00
wenbo.dong
6e43d9c0ea opti: 布局统一 2017-07-31 18:20:43 +08:00
wenbo.dong
4515772d99 opti: 主内容区添加24px的水平内边距以在宽度较小时留出呼吸空间 2017-07-31 16:57:07 +08:00
wenbo.dong
14304ce2a9 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-31 16:27:58 +08:00
wenbo.dong
857eca39ee docs: 删除console.log 2017-07-31 16:27:55 +08:00
waliang.wang
9d31a3bd32 fix 2017-07-31 13:59:18 +08:00
waliang.wang
cd8b6b00f3 fix 2017-07-31 13:52:31 +08:00
waliang.wang
6bffe1797a Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-31 11:26:36 +08:00
waliang.wang
5d130e9c84 fix 2017-07-31 11:26:23 +08:00
waliang.wang
536fa19ce3 fix 2017-07-31 11:19:42 +08:00
wenbo.dong
762e26d5d0 fix: merge 2017-07-31 11:17:24 +08:00
wenbo.dong
e68998cda1 feat: 面包屑导航 2017-07-31 11:16:36 +08:00
waliang.wang
2d097c9961 fix 2017-07-31 11:11:23 +08:00
waliang.wang
2eb470b72a fix 2017-07-31 11:08:49 +08:00
waliang.wang
15c1601994 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-31 11:07:53 +08:00
waliang.wang
e61602ef70 fix 2017-07-31 11:07:47 +08:00
suxiaoxin
f1655abaad feat: 修改文案 2017-07-31 10:59:53 +08:00
wenbo.dong
14def380bb Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-31 10:56:25 +08:00
wenbo.dong
9ef75f4b68 fix: 暂时隐藏Breadcrumb 2017-07-31 10:56:22 +08:00
zwjamnsss
1fa28f73d9 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-31 10:55:05 +08:00
waliang.wang
1e68fd0dc4 fix 2017-07-31 10:49:40 +08:00
waliang.wang
bce52c43c4 fix 2017-07-31 10:47:29 +08:00
zwjamnsss
3a9f3a3bb9 feat: 接口测试 2017-07-31 10:34:05 +08:00
zwjamnsss
bd9d5b7381 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-30 17:12:52 +08:00
zwjamnsss
c186b62f5c feat: 完善接口测试功能 2017-07-30 17:12:21 +08:00
wenbo.dong
4271710fc1 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-30 15:06:48 +08:00
wenbo.dong
ea083184d6 feat: 面包屑导航功能 2017-07-30 15:06:28 +08:00
zwjamnsss
f8f419197f feat: query增删 2017-07-30 11:10:33 +08:00
yhui.yang
60fe53f9f0 opti: header添加文档 2017-07-28 21:19:45 +08:00
wenbo.dong
9a880c0d3d Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-28 21:16:49 +08:00
wenbo.dong
434bced9d1 feat: 面包屑异步逻辑 2017-07-28 21:16:47 +08:00
yhui.yang
cd9a06b853 fix: 修改首页文案 2017-07-28 20:35:44 +08:00
wenbo.dong
0f732d2990 docs: 删除console 2017-07-28 17:45:45 +08:00
wenbo.dong
b983ac538a fix: 正确获取interfaceId 2017-07-28 17:44:28 +08:00
wenbo.dong
789f62b0c7 fix: 首页隐藏面包屑 2017-07-28 17:42:19 +08:00
wenbo.dong
cd701cd7fc fix: 修改news路由为小写 2017-07-28 17:35:14 +08:00
wenbo.dong
89c080ec94 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-28 17:30:58 +08:00
wenbo.dong
2d794159d1 fix: 修改路由名称 2017-07-28 17:30:56 +08:00
zwjamnsss
b9f65873a2 opti: remove disabled 2017-07-28 17:29:42 +08:00
zwjamnsss
eb12eb9751 fix: query decode 2017-07-28 17:28:32 +08:00
yhui.yang
71dfa80ee8 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-28 17:21:23 +08:00
yhui.yang
b35fd83e77 fix: 修复firefox下的样式问题 2017-07-28 17:21:16 +08:00
waliang.wang
bc0ea1ead6 feat: 保存按钮样式 2017-07-28 16:16:53 +08:00
waliang.wang
0e3a4ace02 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-28 15:12:59 +08:00
waliang.wang
6c7bf055bd fix: 成员项目管理 下拉 2017-07-28 15:12:55 +08:00
yhui.yang
35c1bb9702 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-28 14:56:33 +08:00
yhui.yang
073a381dbe fix: 修复header中搜索框跳转问题 2017-07-28 14:56:22 +08:00
wenbo.dong
ca12115f5c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-28 14:40:56 +08:00
waliang.wang
7ed959c9be fix: 接口页面样式微调 2017-07-28 13:50:58 +08:00
wenbo.dong
13ee24cd62 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-28 12:07:12 +08:00
suxiaoxin
484ff4a1c7 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-28 12:05:46 +08:00
waliang.wang
66ef388a8f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-28 12:06:19 +08:00
waliang.wang
131e3f574d fix : 接口tag展示逻辑 2017-07-28 12:06:11 +08:00
suxiaoxin
9b89a4192d feat: add headers and fix worker-json bug 2017-07-28 12:05:42 +08:00
wenbo.dong
8a311c4624 opti: 两列布局分别设置最小高度 2017-07-28 12:04:29 +08:00
wenbo.dong
6256e261ec fix: merge 2017-07-28 11:22:47 +08:00
wenbo.dong
c4e0c38bb9 feat: LOGO添加alpha的徽标 2017-07-28 11:22:25 +08:00
waliang.wang
ce43455478 fix 接口页面UI布局 2017-07-28 10:55:38 +08:00
suxiaoxin
f9f305e265 feat: add mock host 2017-07-28 10:29:20 +08:00
waliang.wang
accf5eef99 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 21:10:26 +08:00
waliang.wang
06271ba18e fix 2017-07-27 21:10:22 +08:00
zwjamnsss
1aad3096c8 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 20:59:58 +08:00
zwjamnsss
6b7d1dbc0c fix: 接口测试样式 2017-07-27 20:59:54 +08:00
yhui.yang
62c669efb3 fix: 加判断修复进不了页面问题 2017-07-27 20:54:58 +08:00
waliang.wang
d048c34a3b fix 2017-07-27 20:47:12 +08:00
waliang.wang
534ddee867 解决冲突 2017-07-27 20:35:56 +08:00
waliang.wang
4b4251e7e7 feat: 文本框样式 2017-07-27 20:35:19 +08:00
wenbo.dong
a84d4c278d Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 20:28:32 +08:00
wenbo.dong
518e079250 opti: 个人资料中title不换行 2017-07-27 20:28:29 +08:00
zwjamnsss
3b24412daa Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 20:25:00 +08:00
zwjamnsss
c391ed2973 opti: 请求真实接口提示 2017-07-27 20:24:56 +08:00
yhui.yang
f0535b4551 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 20:11:00 +08:00
yhui.yang
5cc9237c3d fix: 修改页面布局导致右边空白的错误 2017-07-27 20:10:51 +08:00
waliang.wang
106b2d62d0 feat: UI样式调整 2017-07-27 20:06:49 +08:00
suxiaoxin
b2b112292c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 19:32:14 +08:00
suxiaoxin
fc6d2f13fc feat: add ace editor 2017-07-27 19:32:08 +08:00
wenbo.dong
1010d3838c opti: 个人信息页样式微调 2017-07-27 19:08:40 +08:00
qitmac000249
890fdd44f8 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-27 18:19:22 +08:00
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
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
befb197bea fix: 个人中心样式修改 2017-07-27 14:45:51 +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