Commit Graph

784 Commits

Author SHA1 Message Date
qitmac000249
fa5c4c283e Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-22 16:37:37 +08:00
qitmac000249
b2ffb69fa3 fix: modify 2017-08-22 16:37:24 +08:00
suxiaoxin
5499507c43 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-22 16:07:00 +08:00
suxiaoxin
79257b9169 docs: opti docs 2017-08-22 16:06:56 +08:00
wenbo.dong
b32357a415 feat: card布局 2017-08-22 16:03:39 +08:00
wenbo.dong
783bbe8f47 feat: 主题定制 2017-08-22 13:56:12 +08:00
wenbo.dong
6b5d7d5374 feat: 主题定制 2017-08-22 12:20:33 +08:00
qitmac000249
9918ab0cbb Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-22 11:23:15 +08:00
qitmac000249
052dd68f5a fix: 预览页修改 2017-08-22 11:23:00 +08:00
zwjamnsss
2cfa1d8762 feat: postman 2017-08-22 10:51:39 +08:00
suxiaoxin
cc9a0c6db7 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-22 10:43:44 +08:00
suxiaoxin
c8707f6c16 feat: use less 2017-08-22 10:43:40 +08:00
zwjamnsss
574376f2fd fix: env 2017-08-22 10:02:50 +08:00
zwjamnsss
1f5b0e58db Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-22 09:43:38 +08:00
zwjamnsss
ded98eccbc feat: postman 2017-08-22 09:43:33 +08:00
zwjamnsss
9e38e42105 feat: postman 2017-08-22 09:41:20 +08:00
suxiaoxin
9ac3411da3 docs: opti docs 2017-08-21 21:18:29 +08:00
wenbo.dong
2dd3fdf1a9 feat: footer改版 2017-08-21 18:10:54 +08:00
zwjamnsss
bb8e72735b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-21 15:57:08 +08:00
zwjamnsss
3aa4a66f7d feat: col-content 2017-08-21 15:57:04 +08:00
wenbo.dong
008dac033f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-21 15:13:55 +08:00
wenbo.dong
63056cb4b2 feat: 首页mock介绍 2017-08-21 15:13:52 +08:00
suxiaoxin
3aa1a96d28 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-21 12:05:21 +08:00
suxiaoxin
f908267d20 opti: optimize interface edit 2017-08-21 12:05:18 +08:00
zwjamnsss
52c9d04a38 fix: 接口 集合tab切换 2017-08-21 10:38:16 +08:00
suxiaoxin
fc2b8b50ae feat: optimize project router 2017-08-21 10:18:56 +08:00
suxiaoxin
97c6ceff1a feat: 完善接口列表 2017-08-20 22:13:46 +08:00
wenbo.dong
5d9ce94d22 feat: 登陆后跳转首页 2017-08-20 18:57:27 +08:00
wenbo.dong
3307e2f6a9 feat: 新登录页 2017-08-20 18:56:31 +08:00
wenbo.dong
117fc2929c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-20 17:22:07 +08:00
wenbo.dong
42859114e8 feat: 新首页 2017-08-20 17:22:04 +08:00
suxiaoxin
049634f33a fix: interfaceMenu defaultkeys bug 2017-08-19 19:43:04 +08:00
suxiaoxin
0fcece73e9 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-19 19:06:12 +08:00
suxiaoxin
713791097b feat: add interface cat component 2017-08-19 19:06:09 +08:00
wenbo.dong
1c2db9f692 feat: 取消收藏功能 2017-08-19 15:18:55 +08:00
zwjamnsss
513ebf0527 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 21:11:12 +08:00
zwjamnsss
7da321a260 feat: col menu 2017-08-18 21:11:09 +08:00
suxiaoxin
adab2b48fa Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 20:35:34 +08:00
suxiaoxin
649bedf1e9 feat: add interface cat 2017-08-18 20:35:31 +08:00
wenbo.dong
8a4620911b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 19:47:06 +08:00
wenbo.dong
649ba0bff9 feat: 删除项目的二次确认 2017-08-18 19:47:02 +08:00
zwjamnsss
2367517863 feat: col menu 2017-08-18 18:13:33 +08:00
zwjamnsss
2fa62938f1 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 17:56:32 +08:00
zwjamnsss
e752b87233 feat: col-menu 2017-08-18 17:56:26 +08:00
qitmac000249
077d557875 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-18 17:49:47 +08:00
qitmac000249
4980723dcd fix: 修改预览页加载不显示 2017-08-18 17:49:37 +08:00
zwjamnsss
61407711ab Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 17:31:53 +08:00
zwjamnsss
c27ceb5d12 feat: case menu 2017-08-18 17:31:48 +08:00
wenbo.dong
2f979a0e98 feat: 项目setting成员设置 2017-08-18 17:08:37 +08:00
wenbo.dong
53154d244a feat: 项目设置中的分组成员展示 2017-08-18 15:58:40 +08:00
wenbo.dong
9282f128d9 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 15:25:30 +08:00
wenbo.dong
42a6dba6ac feat: addproject接口添加groupname字段 2017-08-18 15:25:27 +08:00
suxiaoxin
e8f5808d06 fix: fix empty edit interface info 2017-08-18 12:37:32 +08:00
suxiaoxin
05ee224be8 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 12:07:18 +08:00
suxiaoxin
aae26b96ca fix: interfaceContent bug 2017-08-18 12:07:14 +08:00
zwjamnsss
7b265c91d0 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 12:00:36 +08:00
zwjamnsss
5fc4a9d89c feat: col menu 2017-08-18 12:00:21 +08:00
wenbo.dong
a6b88f4472 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 11:39:46 +08:00
wenbo.dong
08a91f7c41 feat: setting页面布局 2017-08-18 11:39:08 +08:00
qitmac000249
ba8b735f92 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-18 11:34:18 +08:00
qitmac000249
cbc6458819 fix: 添加ErrMsg到log 2017-08-18 11:34:06 +08:00
zwjamnsss
7b3d9ac4d1 feat: col menu 2017-08-18 11:33:37 +08:00
suxiaoxin
c561ede4cb fix: mockEditor bug 2017-08-18 11:23:04 +08:00
suxiaoxin
3f05be9660 fix: route bug 2017-08-18 11:05:33 +08:00
wenbo.dong
d2e2c486a4 opti: Errmsg组件 2017-08-17 23:07:23 +08:00
wenbo.dong
42afd5a23f feat: 错误提示组件 2017-08-17 23:00:32 +08:00
wenbo.dong
3b37371b80 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 22:20:01 +08:00
wenbo.dong
1cc8f3d43a feat: 编辑项目 2017-08-17 22:19:58 +08:00
zwjamnsss
b40816fba7 feat: menu 2017-08-17 20:58:43 +08:00
zwjamnsss
29376a5cbb feat: 解决冲突 2017-08-17 20:25:44 +08:00
zwjamnsss
d482d3b967 feat: col-menu 2017-08-17 20:24:07 +08:00
qitmac000249
b7d87a4f0e Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-17 20:08:30 +08:00
qitmac000249
157f175035 fix: 继续修改user页的显示 2017-08-17 20:08:10 +08:00
suxiaoxin
b574604717 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 18:00:11 +08:00
suxiaoxin
485b8d6821 fix: fix route some bug 2017-08-17 18:00:02 +08:00
qitmac000249
428adc9e1d Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-17 16:56:09 +08:00
qitmac000249
5a1dc04905 fix: user 权限显示 2017-08-17 16:55:52 +08:00
suxiaoxin
bd85dbbd42 fix: interface up bug 2017-08-17 16:40:58 +08:00
zwjamnsss
a02b4e585a Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 16:10:49 +08:00
zwjamnsss
9748f17f8b feat: componetWillMount 2017-08-17 16:10:43 +08:00
zwjamnsss
a953d27d2f feat: componetWillMount 2017-08-17 16:10:34 +08:00
wenbo.dong
7d73241dc8 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 15:35:05 +08:00
wenbo.dong
5893041ff6 docs: 文档文案修改 2017-08-17 15:34:43 +08:00
suxiaoxin
729fa3828c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 15:19:50 +08:00
suxiaoxin
cd96e99231 feat: perfect websocket 2017-08-17 15:19:47 +08:00
wenbo.dong
61c9e50e8d feat: project setting layout 2017-08-17 14:35:00 +08:00
zwjamnsss
8f96c51614 feat: col-menu 2017-08-17 12:19:56 +08:00
qitmac000249
679642ce53 fix: 为log添加头像 2017-08-17 12:16:53 +08:00
qitmac000249
95f915a816 fix: 为log添加头像 2017-08-17 12:14:58 +08:00
wenbo.dong
d643904fd6 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 12:09:11 +08:00
wenbo.dong
8b4327a442 feat: 空项目组提示 2017-08-17 12:09:08 +08:00
suxiaoxin
57d15ef7f3 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 12:03:58 +08:00
suxiaoxin
92a1be59e5 fix: add koa-route 2017-08-17 12:03:55 +08:00
zwjamnsss
3e46079446 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 11:41:04 +08:00
zwjamnsss
e1c4f8c55a feat: 添加用例 2017-08-17 11:40:59 +08:00
wenbo.dong
ca17299f92 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 11:34:35 +08:00
wenbo.dong
ecc2ca518a docs: UsernameAutoComplete注释 2017-08-17 11:31:57 +08:00
suxiaoxin
f064df4863 feat: merge dev to local 2017-08-17 11:26:20 +08:00
suxiaoxin
0d3d8a251b feat: add websocket to solve interface edit and add addMember role and add case req_params 2017-08-17 11:24:46 +08:00
zwjamnsss
d02c02d76e Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 10:17:55 +08:00