Commit Graph

885 Commits

Author SHA1 Message Date
sean
0e4dc60ad8 fix: interface filter bug 2017-08-24 12:16:43 +08:00
zwjamnsss
256afe332c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 12:14:17 +08:00
zwjamnsss
1767dd7882 feat: pretty 返回结果 2017-08-24 12:14:06 +08:00
zwjamnsss
82c29e8ba8 feat: pretty 返回结果 2017-08-24 12:13:44 +08:00
qitmac000249
1799088ac8 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-24 11:13:16 +08:00
qitmac000249
acbc024b90 fix: 修改user页 2017-08-24 11:13:02 +08:00
zwjamnsss
9a3f1ab239 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 11:11:42 +08:00
zwjamnsss
f7b945ba08 feat: 更新用例 2017-08-24 11:11:38 +08:00
qitmac000249
b3b5fe3976 fix: modify 2017-08-24 11:04:53 +08:00
qitmac000249
15c78db2e0 fix: modify 2017-08-24 11:00:10 +08:00
zwjamnsss
cd68abf810 fix: 解决冲突 2017-08-24 10:47:23 +08:00
zwjamnsss
4ad00a5928 feat: 返回header 2017-08-24 10:44:02 +08:00
sean
c5c6dfee27 feat: add up_case interface 2017-08-24 10:33:17 +08:00
wenbo.dong
2b7ffc7530 fix: 二级导航偏移的bug 2017-08-23 22:04:05 +08:00
wenbo.dong
423f306d62 opti: footer布局调整 2017-08-23 21:08:16 +08:00
wenbo.dong
9550ef4a46 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-23 21:01:53 +08:00
wenbo.dong
06606c306e opti: 设置页布局调整 2017-08-23 21:01:50 +08:00
sean
c5f9d4abc5 chore: opti build 2017-08-23 20:41:47 +08:00
sean
00cdf9622d chore: add npm-shrinkwrap 2017-08-23 19:45:49 +08:00
sean
ae82034245 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-23 18:24:33 +08:00
sean
7a8a57c303 opti: ykit build 2017-08-23 18:24:29 +08:00
wenbo.dong
85adf4e284 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-23 17:23:58 +08:00
wenbo.dong
3442e0aee6 opti: 项目卡片布局调整 2017-08-23 17:23:54 +08:00
sean
f5ce87f83b fix: group router bug 2017-08-23 16:49:07 +08:00
wenbo.dong
1fd9b81a2b opti: 样式微调 2017-08-23 16:08:26 +08:00
zwjamnsss
eeaa42fb47 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-23 15:52:15 +08:00
zwjamnsss
d4cb38ced8 feat: 用例运行 2017-08-23 15:50:07 +08:00
wenbo.dong
34058b612f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-23 15:25:37 +08:00
wenbo.dong
2d42c8b334 feat: 完成项目头像设置 2017-08-23 15:25:35 +08:00
zwjamnsss
04e0a7b101 feat: 保存用例 2017-08-23 15:20:09 +08:00
qitmac000249
44688dfff4 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-23 12:23:33 +08:00
qitmac000249
00b9efc3a5 fix: 修改动态页的样式 2017-08-23 12:23:20 +08:00
zwjamnsss
12ca51bece Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-23 11:41:51 +08:00
zwjamnsss
1be9f282fb feat: domain设置 2017-08-23 11:41:46 +08:00
wenbo.dong
e162fecb86 feat: 新建与删除项目的跳转 2017-08-23 10:52:12 +08:00
wenbo.dong
fec132b423 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-23 10:38:19 +08:00
wenbo.dong
8ea87172d9 feat: 修改项目头像布局 2017-08-23 10:36:24 +08:00
sean
9d2afee91c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-22 20:44:36 +08:00
sean
4e7211c945 fix: add cat bug 2017-08-22 20:44:33 +08:00
wenbo.dong
e8bd68b231 feat: 项目关注防抖 2017-08-22 20:44:16 +08:00
wenbo.dong
4319055a5d opti: 修改收藏按钮点击区域 2017-08-22 20:08:21 +08:00
wenbo.dong
8213122197 feat: 添加关注与取消关注 2017-08-22 20:04:15 +08:00
zwjamnsss
b70bb57384 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-22 19:59:01 +08:00
zwjamnsss
e710921f20 feat: 删除用例 2017-08-22 19:57:39 +08:00
sean
9d501aaf8c fix: add cat bug 2017-08-22 19:46:00 +08:00
zwjamnsss
52eeb29dcb feat: 删除集合 2017-08-22 18:21:05 +08:00
zwjamnsss
66a980d6cf feat: 解决冲突 2017-08-22 18:13:14 +08:00
zwjamnsss
4e14ef147b feat: 删除集合 2017-08-22 18:05:20 +08:00
wenbo.dong
b39a6d0f40 feat: 卡片布局调整 2017-08-22 17:26:53 +08:00
zwjamnsss
b85f9437de Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-22 16:50:24 +08:00
zwjamnsss
dd0a0c1698 feat: 修改集合名 2017-08-22 16:50:15 +08:00
qitmac000249
be04f17cdc Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-22 16:37:37 +08:00
qitmac000249
af559c31f9 fix: modify 2017-08-22 16:37:24 +08:00
sean
ce26d7bd59 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-22 16:07:00 +08:00
sean
25cc70f655 docs: opti docs 2017-08-22 16:06:56 +08:00
wenbo.dong
afd1fdb3eb feat: card布局 2017-08-22 16:03:39 +08:00
wenbo.dong
47ea68206e feat: 主题定制 2017-08-22 13:56:12 +08:00
wenbo.dong
a014e010b2 feat: 主题定制 2017-08-22 12:20:33 +08:00
qitmac000249
89bfe7abae Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-22 11:23:15 +08:00
qitmac000249
741844a504 fix: 预览页修改 2017-08-22 11:23:00 +08:00
zwjamnsss
d7583ebfd6 feat: postman 2017-08-22 10:51:39 +08:00
sean
5713b91735 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-22 10:43:44 +08:00
sean
a695302118 feat: use less 2017-08-22 10:43:40 +08:00
zwjamnsss
db494d324b fix: env 2017-08-22 10:02:50 +08:00
zwjamnsss
b5b53001ec Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-22 09:43:38 +08:00
zwjamnsss
687339ea8d feat: postman 2017-08-22 09:43:33 +08:00
zwjamnsss
6a4d1a34aa feat: postman 2017-08-22 09:41:20 +08:00
sean
26f3b8cf84 docs: opti docs 2017-08-21 21:18:29 +08:00
wenbo.dong
4d3591a8ad feat: footer改版 2017-08-21 18:10:54 +08:00
zwjamnsss
7ec9f122b7 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-21 15:57:08 +08:00
zwjamnsss
74ebf29a4c feat: col-content 2017-08-21 15:57:04 +08:00
wenbo.dong
9bbec027ce Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-21 15:13:55 +08:00
wenbo.dong
644a90327d feat: 首页mock介绍 2017-08-21 15:13:52 +08:00
sean
0540f49b21 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-21 12:05:21 +08:00
sean
9e419165ed opti: optimize interface edit 2017-08-21 12:05:18 +08:00
zwjamnsss
4f095094c5 fix: 接口 集合tab切换 2017-08-21 10:38:16 +08:00
sean
4984e5eb0a feat: optimize project router 2017-08-21 10:18:56 +08:00
sean
1922ef3859 feat: 完善接口列表 2017-08-20 22:13:46 +08:00
wenbo.dong
38f9e0aa1a feat: 登陆后跳转首页 2017-08-20 18:57:27 +08:00
wenbo.dong
223df4ac47 feat: 新登录页 2017-08-20 18:56:31 +08:00
wenbo.dong
eabba79b2e Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-20 17:22:07 +08:00
wenbo.dong
f1f8085295 feat: 新首页 2017-08-20 17:22:04 +08:00
sean
44930f3161 fix: interfaceMenu defaultkeys bug 2017-08-19 19:43:04 +08:00
sean
587e592d82 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-19 19:06:12 +08:00
sean
b04c988def feat: add interface cat component 2017-08-19 19:06:09 +08:00
wenbo.dong
a366ef05e5 feat: 取消收藏功能 2017-08-19 15:18:55 +08:00
zwjamnsss
96f0515e72 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 21:11:12 +08:00
zwjamnsss
c8502d871f feat: col menu 2017-08-18 21:11:09 +08:00
sean
d9594744c8 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 20:35:34 +08:00
sean
91965fd468 feat: add interface cat 2017-08-18 20:35:31 +08:00
wenbo.dong
cb6fede8f4 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 19:47:06 +08:00
wenbo.dong
a07551d159 feat: 删除项目的二次确认 2017-08-18 19:47:02 +08:00
zwjamnsss
5dc40d7ede feat: col menu 2017-08-18 18:13:33 +08:00
zwjamnsss
92e41b626b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 17:56:32 +08:00
zwjamnsss
a9160f570b feat: col-menu 2017-08-18 17:56:26 +08:00
qitmac000249
2ce7cf3690 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-18 17:49:47 +08:00
qitmac000249
68af11e6f2 fix: 修改预览页加载不显示 2017-08-18 17:49:37 +08:00
zwjamnsss
f3778da554 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 17:31:53 +08:00
zwjamnsss
584640a7f2 feat: case menu 2017-08-18 17:31:48 +08:00
wenbo.dong
3c8b75a9d4 feat: 项目setting成员设置 2017-08-18 17:08:37 +08:00
wenbo.dong
98d8a41e83 feat: 项目设置中的分组成员展示 2017-08-18 15:58:40 +08:00
wenbo.dong
e5eb0f6ec4 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 15:25:30 +08:00
wenbo.dong
7e06189313 feat: addproject接口添加groupname字段 2017-08-18 15:25:27 +08:00
sean
2805ea0b82 fix: fix empty edit interface info 2017-08-18 12:37:32 +08:00
sean
4158855022 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 12:07:18 +08:00
sean
9bec5d6bb4 fix: interfaceContent bug 2017-08-18 12:07:14 +08:00
zwjamnsss
97ad5a5b0f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 12:00:36 +08:00
zwjamnsss
8021b055d8 feat: col menu 2017-08-18 12:00:21 +08:00
wenbo.dong
74a2c20099 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 11:39:46 +08:00
wenbo.dong
2572cf37d1 feat: setting页面布局 2017-08-18 11:39:08 +08:00
qitmac000249
a78a83c3e5 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-18 11:34:18 +08:00
qitmac000249
1be17b9144 fix: 添加ErrMsg到log 2017-08-18 11:34:06 +08:00
zwjamnsss
05b13df731 feat: col menu 2017-08-18 11:33:37 +08:00
sean
2c9a57b357 fix: mockEditor bug 2017-08-18 11:23:04 +08:00
sean
a4147e8e86 fix: route bug 2017-08-18 11:05:33 +08:00
wenbo.dong
40071ce301 opti: Errmsg组件 2017-08-17 23:07:23 +08:00
wenbo.dong
56486b782f feat: 错误提示组件 2017-08-17 23:00:32 +08:00
wenbo.dong
e337210b3b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 22:20:01 +08:00
wenbo.dong
e7366e3de1 feat: 编辑项目 2017-08-17 22:19:58 +08:00
zwjamnsss
47a78e8c30 feat: menu 2017-08-17 20:58:43 +08:00
zwjamnsss
ac0947aa88 feat: 解决冲突 2017-08-17 20:25:44 +08:00
zwjamnsss
8e4422a327 feat: col-menu 2017-08-17 20:24:07 +08:00
qitmac000249
3f83dc175f Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-17 20:08:30 +08:00
qitmac000249
66ba6549b0 fix: 继续修改user页的显示 2017-08-17 20:08:10 +08:00
sean
502b68e112 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 18:00:11 +08:00
sean
fb4ebde34d fix: fix route some bug 2017-08-17 18:00:02 +08:00
qitmac000249
83739b3a4e Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-17 16:56:09 +08:00
qitmac000249
db3dd1526b fix: user 权限显示 2017-08-17 16:55:52 +08:00
sean
4ac0abe3c1 fix: interface up bug 2017-08-17 16:40:58 +08:00
zwjamnsss
c111bafc9c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 16:10:49 +08:00
zwjamnsss
5135a27d7b feat: componetWillMount 2017-08-17 16:10:43 +08:00
zwjamnsss
ba57b53a5f feat: componetWillMount 2017-08-17 16:10:34 +08:00
wenbo.dong
c109cc8557 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 15:35:05 +08:00
wenbo.dong
d05561f778 docs: 文档文案修改 2017-08-17 15:34:43 +08:00
sean
8fc4da40aa Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 15:19:50 +08:00
sean
99ef07342c feat: perfect websocket 2017-08-17 15:19:47 +08:00
wenbo.dong
d3849735ba feat: project setting layout 2017-08-17 14:35:00 +08:00
zwjamnsss
8d2a3e4c47 feat: col-menu 2017-08-17 12:19:56 +08:00
qitmac000249
1570af0fef fix: 为log添加头像 2017-08-17 12:16:53 +08:00
qitmac000249
f6c94d698f fix: 为log添加头像 2017-08-17 12:14:58 +08:00
wenbo.dong
05fc8bc000 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 12:09:11 +08:00
wenbo.dong
300ab79ee3 feat: 空项目组提示 2017-08-17 12:09:08 +08:00
sean
adbe2f7c6b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 12:03:58 +08:00
sean
c129e68abb fix: add koa-route 2017-08-17 12:03:55 +08:00
zwjamnsss
14311f1637 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 11:41:04 +08:00
zwjamnsss
c2427937da feat: 添加用例 2017-08-17 11:40:59 +08:00
wenbo.dong
a035f7ae85 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 11:34:35 +08:00
wenbo.dong
129454ef37 docs: UsernameAutoComplete注释 2017-08-17 11:31:57 +08:00
sean
f71b210839 feat: merge dev to local 2017-08-17 11:26:20 +08:00
sean
6db3fafacf feat: add websocket to solve interface edit and add addMember role and add case req_params 2017-08-17 11:24:46 +08:00