Commit Graph

748 Commits

Author SHA1 Message Date
qitmac000249
d1e7304f6d fix: 修复用户管理显示及view的样式 2017-08-15 16:55:46 +08:00
zwjamnsss
77a9d58ad8 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-15 16:34:59 +08:00
zwjamnsss
600d7da21c feat: run 2017-08-15 16:34:41 +08:00
sean
2eb5f420dc feat: edit interface add auto header 2017-08-15 14:49:02 +08:00
qitmac000249
f91db88593 fix: 解决view页面的冲突 2017-08-15 12:15:07 +08:00
zwjamnsss
f67f0f2c4f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-15 12:09:34 +08:00
zwjamnsss
7dabd12b3e feat: run 2017-08-15 12:09:29 +08:00
qitmac000249
acdbd3837c fix: 添加接口view页 2017-08-15 12:08:59 +08:00
qitmac000249
ae39da3fe5 fix: 添加接口view页 2017-08-15 12:07:52 +08:00
sean
fe76f992f0 fix: mongodb auth bug and perfect mockServer 2017-08-15 12:05:22 +08:00
sean
c00b55af53 feat: del prd_host and perfect the interface edit style 2017-08-15 11:12:39 +08:00
sean
f504acdec8 feat: 完善edit interface 功能 2017-08-14 23:01:20 +08:00
sean
bc2904826c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-14 21:43:09 +08:00
sean
be6abeedf8 feat: edit interface ci 2017-08-14 21:43:06 +08:00
zwjamnsss
8e90284be9 fix: 解决冲突 2017-08-14 21:23:57 +08:00
zwjamnsss
129708f264 feat: run 2017-08-14 21:22:18 +08:00
zwjamnsss
57f2b872c3 Merge branch 'dev' into run 2017-08-14 20:09:57 +08:00
sean
04791fa39e fix: message login when guest open site 2017-08-14 20:09:47 +08:00
sean
fa510e9608 feat: add interface res some module 2017-08-14 19:58:33 +08:00
zwjamnsss
56a19f8a15 fix: 解决冲突 2017-08-14 19:34:04 +08:00
zwjamnsss
ff0f9b575c feat: run 部分 2017-08-14 19:23:20 +08:00
zwjamnsss
231c603629 feat: 接口集合菜单 2017-08-14 17:32:49 +08:00
sean
d160f68f16 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-14 16:30:38 +08:00
sean
5c91366f3a fix: col list bug 2017-08-14 16:30:30 +08:00
wenbo.dong
6ff320aecc feat: 我的关注页面 2017-08-14 15:41:58 +08:00
qitmac000249
e222f7113e fix: 加入动态页面及bug修改 2017-08-14 15:17:05 +08:00
sean
1a2e1dbfc0 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-14 13:44:55 +08:00
sean
cad46617b8 feat: add interface list and edit module 2017-08-14 13:44:49 +08:00
zwjamnsss
56f3b6e376 feat: 接口集合 2017-08-11 21:10:54 +08:00
qitmac000249
517a80ec22 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-11 20:22:00 +08:00
qitmac000249
60dc73b1e5 fix: 头像样式修改 2017-08-11 20:21:56 +08:00
wenbo.dong
b0c6a6baba fix: 处理冲突 2017-08-11 19:37:44 +08:00
wenbo.dong
3373833ece feat: 项目列表页改版 2017-08-11 19:30:12 +08:00
sean
207d6d202f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 18:58:02 +08:00
sean
7827657be0 feat: interface list 2017-08-11 18:57:58 +08:00
qitmac000249
093dd70f12 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-11 17:49:52 +08:00
qitmac000249
4143aa15d7 fix: modify 很多 2017-08-11 17:49:47 +08:00
wenbo.dong
aa18293b98 feat: 项目广场布局 2017-08-11 17:47:25 +08:00
sean
ed748674b3 fix: interface import 2017-08-11 17:29:37 +08:00
sean
d32742ac80 feat: add project 2017-08-11 17:25:57 +08:00
sean
08e148d723 feat: add project module 2017-08-11 17:24:50 +08:00
zwjamnsss
41f91f67a7 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 16:31:00 +08:00
zwjamnsss
53934e6655 feat: 项目页面 2017-08-11 16:30:52 +08:00
wenbo.dong
6675eec66f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 16:21:34 +08:00
wenbo.dong
49ac460408 feat: AddProject移动到上一层目录 2017-08-11 16:21:07 +08:00
zwjamnsss
d58b723a31 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 16:20:42 +08:00
zwjamnsss
a1f4c32f16 opti: ignorge tags 2017-08-11 16:20:27 +08:00
wenbo.dong
319e5a6308 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 16:10:51 +08:00
wenbo.dong
7ec0d7ac87 feat: 添加项目改版 2017-08-11 16:10:49 +08:00
zwjamnsss
93cfee57c8 opti: 路由 2017-08-11 16:03:11 +08:00
zwjamnsss
30b8a8ec6b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 15:02:10 +08:00
zwjamnsss
8bdbf092e6 opti: 路由 2017-08-11 15:02:07 +08:00
wenbo.dong
34d588d6bf feat: header样式调整 2017-08-11 14:22:20 +08:00
qitmac000249
4c525dcc17 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-11 12:19:38 +08:00
qitmac000249
f1e81ead26 fix: 个人信息页修改 2017-08-11 12:19:31 +08:00
wenbo.dong
8b3761ee1d Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:40:57 +08:00
wenbo.dong
82e50fa9f7 fix: 登录接口加api前缀 2017-08-11 11:40:53 +08:00
wenbo.dong
2b7dd3192e Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:36:53 +08:00
zwjamnsss
e17f9714eb Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:36:50 +08:00
zwjamnsss
da14f317e3 opti: 路由 2017-08-11 11:34:55 +08:00
sean
6ed74e8ae1 fix: create and app bug 2017-08-11 11:33:40 +08:00
sean
ea640b2fd6 fix: create and app bug 2017-08-11 11:32:20 +08:00
zwjamnsss
ce0bdc55f8 fix: contaimer 2017-08-11 11:31:21 +08:00
zwjamnsss
3a22fe3765 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:26:53 +08:00
zwjamnsss
966953d3a7 fix: eslint 2017-08-11 11:26:49 +08:00
sean
005224b54e Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:26:13 +08:00
sean
a490324085 feat: fix redus-tools bug 2017-08-11 11:26:07 +08:00
wenbo.dong
5115f9d6e2 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-11 11:05:34 +08:00
zwjamnsss
d030c9fbaf opti: 优化路由结构 2017-08-11 10:58:15 +08:00
zwjamnsss
bb826f9a1c fix: 解决冲突 2017-08-11 10:56:38 +08:00
zwjamnsss
9394d20be9 feat: 项目页面路由 2017-08-11 10:44:45 +08:00
sean
0649c47338 feat: merge to local and fix some bug 2017-08-11 10:31:26 +08:00
sean
fcc35d924a feat: 优化url,去掉#,后端接口统一使用/api前缀 2017-08-11 10:25:19 +08:00
qitmac000249
ad72fd9b38 fix: modify 2017-08-11 10:16:50 +08:00
wenbo.dong
e84c9cc74d Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 21:23:50 +08:00
wenbo.dong
749ee60b77 feat: 新建项目页布局 2017-08-10 21:23:47 +08:00
qitmac000249
eaa27df43f feat: 头像上传 2017-08-10 21:20:57 +08:00
qitmac000249
0f17d0b625 feat: 头像上传 2017-08-10 21:20:23 +08:00
zwjamnsss
aadebabc44 opti: 隐藏无用路由 2017-08-10 21:03:22 +08:00
zwjamnsss
8c04198eb2 feat: 项目路由 2017-08-10 20:56:30 +08:00
zwjamnsss
fca3a9865d Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 20:08:52 +08:00
zwjamnsss
3969693c43 opti: 将login改成user 2017-08-10 20:08:23 +08:00
sean
87220f2182 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 18:54:35 +08:00
sean
cdd11d3293 feat: add user/project and fix ykit commonsChunk bug 2017-08-10 18:54:32 +08:00
wenbo.dong
196d77922a feat: 新建项目页面初始化 2017-08-10 18:26:46 +08:00
zwjamnsss
1ea95bbdf8 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 16:00:57 +08:00
zwjamnsss
1687b21029 opti: 晚上目录结构 2017-08-10 16:00:52 +08:00
qitmac000249
35608e6c7c fix: projectBox 2017-08-10 15:37:20 +08:00
qitmac000249
bd367fb86f fix: projectBox 2017-08-10 15:36:35 +08:00
sean
cdb5c57365 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 15:24:22 +08:00
sean
d5b2790f89 feat: add avatar module 2017-08-10 15:22:42 +08:00
qitmac000249
6dde3a846c feat: 添加follow 后端接口 2017-08-10 12:14:35 +08:00
qitmac000249
e69ab5a223 feat: 添加follow 后端接口 2017-08-10 12:13:32 +08:00
qitmac000249
58e4885aff feat: 前端添加avatar 2017-08-09 20:09:59 +08:00
qitmac000249
8f705397a3 fix: 完善动态页 2017-08-09 18:00:45 +08:00
qitmac000249
3bb92c45ff Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-09 16:08:44 +08:00
qitmac000249
5c4449805a feat: 添加动态页面 2017-08-09 16:08:37 +08:00
zwjamnsss
c31f401a37 refactor: 将异步then 转换成 async await 2017-08-09 13:48:06 +08:00
zwjamnsss
ad644b332c feat: 增加async await 写法支持 2017-08-09 11:54:40 +08:00
wenbo.dong
ba04185750 opti: header样式优化 2017-08-08 20:46:19 +08:00
wenbo.dong
0a24570923 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-08 20:27:21 +08:00
wenbo.dong
c09ba88ee9 feat: header重构 2017-08-08 20:27:18 +08:00
sean
5547462236 feat: server col and case , client use babel-plugin-import load antd 2017-08-08 19:18:12 +08:00
wenbo.dong
f1acb0d660 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-08 16:21:35 +08:00
wenbo.dong
7dc6616491 feat: 二级导航路由跳转 2017-08-08 16:21:32 +08:00
zwjamnsss
768af9709e Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-08 15:41:12 +08:00
zwjamnsss
f1245b6989 feat: 增加全局错误提示 2017-08-08 15:41:07 +08:00
wenbo.dong
feef01ecb4 fix: 删除reducer中user文件引用的错误 2017-08-08 15:29:59 +08:00
wenbo.dong
f954877bf2 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-08 15:25:29 +08:00
wenbo.dong
f79cc13b1c feat: 二级导航布局 2017-08-08 15:25:12 +08:00
sean
ad4acf33b4 feat: auth and merge 2017-08-08 14:46:08 +08:00
sean
98d205bdca feat: add server auth 2017-08-08 14:45:19 +08:00
zwjamnsss
39c0dd82da opti: 优化代码结构添加错误统一提示 2017-08-08 14:25:33 +08:00
zwjamnsss
20f2ca0bf3 opti: 优化代码结构 2017-08-08 10:07:55 +08:00
zwjamnsss
3b29f5dafb fix: 解决冲突 2017-08-07 20:04:47 +08:00
zwjamnsss
f4232ff31a opti: 优化redux结构 2017-08-07 19:34:34 +08:00
qitmac000249
98566dbf64 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-07 16:50:55 +08:00
qitmac000249
e00257c908 feat: 添加MockDoc组件、parseMock方法 2017-08-07 16:50:47 +08:00
zwjamnsss
e5b99b40cb fix: 文件名大小写 2017-08-07 15:57:15 +08:00
zwjamnsss
eb97de3669 fix: 改文件名大小写 2017-08-07 15:55:32 +08:00
zwjamnsss
70aa69a351 test: 该文件名 2017-08-07 15:52:46 +08:00
zwjamnsss
b1ee3575c6 fix: none 2017-08-07 15:41:41 +08:00
zwjamnsss
6f0ee6bba6 fix: 恢复文件名大小 2017-08-07 15:40:21 +08:00
zwjamnsss
8dd5f5924a fix: 修改文件夹大小 2017-08-07 15:39:15 +08:00
zwjamnsss
77ad483f94 fix: 恢复正确命名 2017-08-07 15:32:39 +08:00
zwjamnsss
3ab875c36c fix: 修改文件名大小写 2017-08-07 15:31:37 +08:00
zwjamnsss
1799c2ac58 opti: 改文件名 2017-08-04 17:59:44 +08:00
zwjamnsss
fe06942703 opti: redux-devtools 默认关闭 2017-08-04 17:47:31 +08:00
zwjamnsss
cf544d4a0e fix: 去掉多余的 babel-polyfill 2017-08-04 15:15:28 +08:00
zwjamnsss
2efcd4841e feat: add redux-devtools 2017-08-04 12:15:45 +08:00
qitmac000249
fff8a8befd fix: 封装regexp_parse 2017-08-02 18:32:01 +08:00
qitmac000249
b0745dd616 fix: mock支持RegExp 2017-08-02 16:55:13 +08:00
sean
7abd0b8816 fix: edit project basepath is empaty bug 2017-08-01 17:15:55 +08:00
sean
e2ad8b718c fix: project edit index bug 2017-08-01 16:35:31 +08:00
sean
0a8c8ce6ab Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-01 16:07:16 +08:00
sean
cd57d6dc61 fix: 项目编辑basepath bug 2017-08-01 16:07:10 +08:00
qitmac000249
a93e379875 fix: 修改user页面 2017-08-01 16:00:24 +08:00
qitmac000249
28dc341bff Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-01 15:55:37 +08:00
zwjamnsss
86be98c721 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-01 15:53:49 +08:00
zwjamnsss
2329ec8ea3 fix: 编辑 path query转成数组 2017-08-01 15:53:41 +08:00
qitmac000249
8645aeb4c0 fix: modify 2017-08-01 15:52:28 +08:00
sean
81e2179875 feat: basepath is unrequired and fix auth bug 2017-08-01 15:37:07 +08:00
waliang.wang
e278079411 fix: 接口页面宽度 2017-08-01 15:34:01 +08:00
waliang.wang
50c6ef7b93 解决冲突 2017-08-01 15:12:07 +08:00
waliang.wang
15b8e5aa42 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-01 15:10:43 +08:00
waliang.wang
491d726177 fix: 添加loading 2017-08-01 15:10:39 +08:00
qitmac000249
15853b39ee fix: 修改project的显示 2017-08-01 15:03:34 +08:00
qitmac000249
d021a06986 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-01 14:09:02 +08:00
qitmac000249
10f7a47aa2 fix: 修改样式及用户管理只在admin时展示 2017-08-01 14:08:51 +08:00
zwjamnsss
a3e05aa727 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-01 14:02:10 +08:00
zwjamnsss
a97bea6b41 feat: 接口测试文件上传 2017-08-01 14:02:06 +08:00
sean
8b38c5af69 fix: fix add interface errmsg bug 2017-08-01 13:58:07 +08:00
waliang.wang
c73bc6d532 fix: 文案提示 2017-08-01 12:43:13 +08:00
waliang.wang
ade433ccea fix: 添加请求头 2017-08-01 12:26:13 +08:00
waliang.wang
064e38ade7 fix: 失败loading 2017-08-01 12:08:56 +08:00
sean
037bc2790c docs: 使用文档 2017-08-01 10:48:11 +08:00
sean
d8d44560ae feat: add default resParams reqParams 2017-08-01 09:49:11 +08:00
sean
ff06fdb3f8 feat: 设置默认的method 2017-07-31 21:41:49 +08:00
sean
63c3fa86e0 fix: server_ip 2017-07-31 21:18:14 +08:00
sean
6c4aa8b9fd Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-31 21:07:28 +08:00
sean
c943ceba56 feat: add autocomplete 2017-07-31 21:07:24 +08:00
waliang.wang
f9f32f90c0 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-31 19:43:12 +08:00
waliang.wang
5a1eb3be5d feat: 跳转新连接,复制内容 2017-07-31 19:43:08 +08:00
wenbo.dong
10dc4d90ab opti: 布局统一 2017-07-31 18:20:43 +08:00
wenbo.dong
75cd50d0c8 opti: 主内容区添加24px的水平内边距以在宽度较小时留出呼吸空间 2017-07-31 16:57:07 +08:00
wenbo.dong
14f46dd0c5 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-31 16:27:58 +08:00
wenbo.dong
b7f98b3aab docs: 删除console.log 2017-07-31 16:27:55 +08:00
waliang.wang
fd67518d7e fix 2017-07-31 13:59:18 +08:00
waliang.wang
7d42637363 fix 2017-07-31 13:52:31 +08:00
waliang.wang
60d305061e Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-31 11:26:36 +08:00
waliang.wang
f2a2cc7476 fix 2017-07-31 11:26:23 +08:00
waliang.wang
b1271b6237 fix 2017-07-31 11:19:42 +08:00
wenbo.dong
e805fdabe8 fix: merge 2017-07-31 11:17:24 +08:00
wenbo.dong
6eabac06b4 feat: 面包屑导航 2017-07-31 11:16:36 +08:00
waliang.wang
c3376b3601 fix 2017-07-31 11:11:23 +08:00
waliang.wang
fc39fb7c02 fix 2017-07-31 11:08:49 +08:00
waliang.wang
afcced36c1 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-31 11:07:53 +08:00
waliang.wang
8a99a22dfd fix 2017-07-31 11:07:47 +08:00
sean
3d5032b107 feat: 修改文案 2017-07-31 10:59:53 +08:00
wenbo.dong
fd1476ab7b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-31 10:56:25 +08:00
wenbo.dong
234edd6524 fix: 暂时隐藏Breadcrumb 2017-07-31 10:56:22 +08:00
zwjamnsss
1c716cece6 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-31 10:55:05 +08:00
waliang.wang
28280b1c8d fix 2017-07-31 10:49:40 +08:00
waliang.wang
3ad17de1df fix 2017-07-31 10:47:29 +08:00
zwjamnsss
8dd18f15c6 feat: 接口测试 2017-07-31 10:34:05 +08:00
zwjamnsss
3d21342922 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-30 17:12:52 +08:00
zwjamnsss
4037a2ba5c feat: 完善接口测试功能 2017-07-30 17:12:21 +08:00
wenbo.dong
4d5a237c57 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-30 15:06:48 +08:00
wenbo.dong
68fe3168ce feat: 面包屑导航功能 2017-07-30 15:06:28 +08:00
zwjamnsss
a6bc82179a feat: query增删 2017-07-30 11:10:33 +08:00
yhui.yang
df16eecbb9 opti: header添加文档 2017-07-28 21:19:45 +08:00
wenbo.dong
b0b5de804a Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-28 21:16:49 +08:00
wenbo.dong
b4dbf651d8 feat: 面包屑异步逻辑 2017-07-28 21:16:47 +08:00
yhui.yang
18d1f3a2cd fix: 修改首页文案 2017-07-28 20:35:44 +08:00
wenbo.dong
0077b731d3 docs: 删除console 2017-07-28 17:45:45 +08:00
wenbo.dong
f3721d7a7a fix: 正确获取interfaceId 2017-07-28 17:44:28 +08:00
wenbo.dong
e4aa7fa037 fix: 首页隐藏面包屑 2017-07-28 17:42:19 +08:00
wenbo.dong
56c4617017 fix: 修改news路由为小写 2017-07-28 17:35:14 +08:00
wenbo.dong
81c93b1c60 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-28 17:30:58 +08:00
wenbo.dong
3289d7828d fix: 修改路由名称 2017-07-28 17:30:56 +08:00