Commit Graph

408 Commits

Author SHA1 Message Date
waliang.wang
cdd2d24bd8 合并代码,解决冲突 2017-07-26 12:40:58 +08:00
waliang.wang
a8f544250a feat - 调试接口 2017-07-26 12:31:42 +08:00
wenbo.dong
a1c4c0ca7a Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-26 12:13:25 +08:00
wenbo.dong
087d874186 fix: 创建项目时protocol显示异常的bug 2017-07-26 12:13:22 +08:00
qitmac000249
2f5731107c fix: project页最小高度设置 2017-07-26 12:10:22 +08:00
qitmac000249
4c2253f7c9 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-26 11:17:14 +08:00
qitmac000249
f522ae8526 fix: 修改user页 样式 2017-07-26 11:17:07 +08:00
zwjamnsss
03bfc92a16 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-26 10:26:24 +08:00
zwjamnsss
53dad4f54a fix: 项目简介多行文本溢出 2017-07-26 10:26:15 +08:00
wenbo.dong
0d2597568f fix: 处理添加项目的环境配置时点击删除会删除多个配置的bug 2017-07-25 22:35:47 +08:00
zwjamnsss
2466c4ebf4 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 21:30:24 +08:00
zwjamnsss
a7237be90b feat: 接口测试部分 2017-07-25 21:25:40 +08:00
qitmac000249
b35012afbb Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-25 21:12:35 +08:00
qitmac000249
183cac4c28 fix: 修改编辑分组TextArea 2017-07-25 21:12:30 +08:00
yhui.yang
20b8a31660 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 21:04:19 +08:00
yhui.yang
5c175b6e90 fix: 解决刷新页面后取不到uid,搜索框为中文 2017-07-25 21:04:11 +08:00
qitmac000249
8915a9cd1b fix: 修改projectList路径 2017-07-25 20:57:54 +08:00
zwjamnsss
78d2c68036 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 18:21:16 +08:00
yhui.yang
b478e57f63 fix: 添加footer,修正高度问题 2017-07-25 18:11:53 +08:00
yhui.yang
c2643cd918 fix: 首页和header一些小bug 2017-07-25 17:56:04 +08:00
waliang.wang
580b979cfe 解决冲突 2017-07-25 17:51:48 +08:00
waliang.wang
0493e550ea feat - 修改路由参数 2017-07-25 17:41:58 +08:00
zwjamnsss
4800a13ff7 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 17:09:55 +08:00
qitmac000249
bd70fe6c7a Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-25 16:18:07 +08:00
qitmac000249
cbbe26296c fix: 继续修复group bug 2017-07-25 16:18:00 +08:00
wenbo.dong
93886c1240 fix: 处理reg.js的缩进问题 2017-07-25 16:16:32 +08:00
wenbo.dong
b0f654eebe feat: 注册的email添加正则判断 2017-07-25 16:06:26 +08:00
wenbo.dong
3d5e384563 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 16:02:20 +08:00
wenbo.dong
f42ef229a1 fix: login错误处理 2017-07-25 16:02:18 +08:00
qitmac000249
1f6603f70e Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-25 15:54:02 +08:00
qitmac000249
901c80846c fix: 修复group路由问题 2017-07-25 15:53:55 +08:00
yhui.yang
5201007554 fix: add rc-queque-anim,rc-scroll-anim in the package.json 2017-07-25 15:40:23 +08:00
yhui.yang
50aa0d1bec opti: 首页添加动画,修改header 2017-07-25 15:35:23 +08:00
zwjamnsss
8ed6a757a0 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 15:30:44 +08:00
waliang.wang
fac37d56a4 feat - 最新代码 2017-07-25 15:11:43 +08:00
waliang.wang
a96b53917e Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 14:35:51 +08:00
waliang.wang
b31460bfb5 接口ui修改 2017-07-25 14:35:46 +08:00
wenbo.dong
755ce8b0bd feat: QSSO登录添加分割线 2017-07-25 14:24:47 +08:00
qitmac000249
a8cabdd3ef fix: 修改history导致的warm 2017-07-25 13:46:37 +08:00
zwjamnsss
bc7bf75b65 feat: 接口测完完成部分 2017-07-25 13:34:48 +08:00
qitmac000249
de24799c40 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-25 13:18:00 +08:00
qitmac000249
edd82fd3a8 fix: 优化分组页的路由 2017-07-25 13:17:54 +08:00
wenbo.dong
871c833df0 fix: merge 2017-07-25 10:50:33 +08:00
wenbo.dong
ca32cd934d feat: 修改项目的环境域名添加了http/https的选择功能 2017-07-25 10:49:19 +08:00
qitmac000249
66b23b2440 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-25 10:31:29 +08:00
qitmac000249
693d2cd667 fix: 修改添加分组处最小宽度以及添加分组的描述框为textarea 2017-07-25 10:31:19 +08:00
sean
b6fca96979 fix qsso login need click double and delete project auth bug 2017-07-25 10:22:45 +08:00
zwjamnsss
fa0cc83cae Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 09:27:29 +08:00
zwjamnsss
f4ec75c7c3 fix: 修复Safari样式 2017-07-25 09:27:25 +08:00
waliang.wang
9e6f7d5caf 解决冲突 2017-07-24 19:44:46 +08:00
waliang.wang
601a0a8360 feat - mock 2017-07-24 19:43:13 +08:00
wenbo.dong
57c15c2148 opti: Login样式修改 2017-07-24 17:30:25 +08:00
wenbo.dong
a88d388a40 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-24 17:21:14 +08:00
wenbo.dong
25e90111af opti: Login样式修改 2017-07-24 17:21:10 +08:00
qitmac000249
358459d9a8 fix: 修改footer样式 2017-07-24 16:41:11 +08:00
waliang.wang
9d9b7cd444 put 接口 2017-07-24 11:10:23 +08:00
waliang.wang
a6b29de66f feat - 编辑接口 2017-07-24 10:59:17 +08:00
wenbo.dong
61a62017dd feat: 登录模块添加状态提示 2017-07-23 18:24:46 +08:00
wenbo.dong
1517e7ddd1 fix: 修复修改项目表单显示异常的bug 2017-07-23 17:31:14 +08:00
wenbo.dong
2f8a53d139 opti: 样式微调 2017-07-20 22:24:31 +08:00
wenbo.dong
3014ea607b feat: 修改项目的环境配置功能 2017-07-20 22:08:09 +08:00
wenbo.dong
bcd9f61d04 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 21:37:00 +08:00
yhui.yang
bf0a04e2a9 opti: add skip of menu 2017-07-20 21:30:35 +08:00
yhui.yang
bb5c140e17 feat: 添加header上的搜索,修改路由,修改登录页面样式,merge文件 2017-07-20 20:31:20 +08:00
wenbo.dong
df084b3eb7 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 20:24:09 +08:00
wenbo.dong
d7a9473fbd fix: 处理冲突文件 2017-07-20 20:24:06 +08:00
yhui.yang
5c9914f367 feat: 添加header上的搜索,修改路由,修改登录页面样式 2017-07-20 19:59:49 +08:00
sean
d6fb9e160e fix: fix interface up bug 2017-07-20 19:47:10 +08:00
waliang.wang
50fbe6396c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev2 2017-07-20 19:26:14 +08:00
waliang.wang
8fde9d38b4 feat : 调试保存接口 2017-07-20 19:26:04 +08:00
sean
d2af9afb25 feat: change some user style 2017-07-20 18:15:45 +08:00
wenbo.dong
2e54c48d5d Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 17:57:43 +08:00
wenbo.dong
c2e377aade fix: 修改project/add&up接口参数 2017-07-20 17:53:28 +08:00
waliang.wang
c8f60498cf 文件大小写 2017-07-20 17:20:30 +08:00
wenbo.dong
566865f95a feat: 项目列表显示创建人 2017-07-20 17:08:29 +08:00
waliang.wang
8b3b4db34e git 忽略大小写 文件夹修改 2017-07-20 16:57:21 +08:00
sean
6cf33797b1 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 16:56:48 +08:00
sean
70a9660db3 feat: user style 2017-07-20 16:44:41 +08:00
waliang.wang
143e0950df Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 16:38:56 +08:00
waliang.wang
d54d47b55a feat - 接口页面布局 2017-07-20 16:38:50 +08:00
waliang.wang
74b739c0ec 合并代码 解决冲突 2017-07-20 16:35:33 +08:00
waliang.wang
1798766d88 feat - 添加接口详情 测试 mock 2017-07-20 16:34:46 +08:00
qitmac000249
f300d22e17 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-20 16:31:03 +08:00
qitmac000249
be166770c4 fix: 消息页修改为日志也 2017-07-20 16:30:55 +08:00
wenbo.dong
62338530da feat: 项目列表跳转到接口页 2017-07-20 16:03:36 +08:00
wenbo.dong
460108f6e0 feat: QSSO登录 2017-07-20 15:49:36 +08:00
waliang.wang
a46e18ce97 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 15:38:30 +08:00
waliang.wang
f34d5af35b feat - 接口列表数据 2017-07-20 15:38:25 +08:00
wenbo.dong
7b73ab4968 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 15:31:45 +08:00
sean
bb856df4ca feat: project prd_host add protocol field 2017-07-20 15:26:26 +08:00
wenbo.dong
76451b614b fix: 处理项目列表接口请求参数错误的bug 2017-07-20 14:57:19 +08:00
waliang.wang
62d22f8f35 feat - 合并最新代码 解决冲突 2017-07-20 14:52:42 +08:00
waliang.wang
d784d98b50 feat - 创建接口 2017-07-20 14:48:29 +08:00
wenbo.dong
220fa53bc7 feat: 创建或求该项目表单的校验 2017-07-20 14:41:38 +08:00
wenbo.dong
74a3819d89 feat: 项目创建时间格式化 2017-07-20 11:32:21 +08:00
wenbo.dong
c1683d2ae0 docs: 修改login-wrap文件名 2017-07-20 10:51:31 +08:00
wenbo.dong
0c760d8443 fix: Login文件删除未使用的变量 2017-07-20 10:48:03 +08:00
wenbo.dong
8d62cc36cd fix: 恢复误删的Login文件夹 2017-07-20 10:41:12 +08:00
wenbo.dong
d9a3ed5a2f fix: 删除login组件小写的文件 2017-07-20 10:28:22 +08:00
wenbo.dong
f28773fe57 feat: 取消cookie记录用户密码的操作 2017-07-20 00:29:25 +08:00
wenbo.dong
e00e6d7975 feat: 修改项目信息可配置环境信息 2017-07-20 00:17:48 +08:00
wenbo.dong
b39f09b77c fix: 统一文件大小写 2017-07-19 22:36:04 +08:00
wenbo.dong
4d2f4e1790 feat: 实现项目列表的分页功能 2017-07-19 22:31:18 +08:00
wenbo.dong
4677b7c89d fix: 修改创建项目的错误提示 2017-07-19 21:32:44 +08:00
wenbo.dong
ce6dbd36f3 feat: 项目表格的loading状态由state转到store存储 2017-07-19 21:21:40 +08:00
wenbo.dong
23833bda1d Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-19 21:00:04 +08:00
wenbo.dong
bb30647f06 feat: 修改项目功能 2017-07-19 20:59:59 +08:00
waliang.wang
d9163d562b feat - 优化文档部分UI 2017-07-19 20:27:44 +08:00
waliang.wang
d3e36b19b8 feat: 新增手动编辑样式 2017-07-19 19:29:18 +08:00
yhui.yang
67aae53b6f opti: modify home 2017-07-19 17:53:39 +08:00
zwjamnsss
bcf9abca1d Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-19 17:18:48 +08:00
zwjamnsss
0920e02be1 feat: 搜索分组 2017-07-19 17:17:07 +08:00
qitmac000249
06a811ee40 fix: 修改消息页 2017-07-19 16:15:51 +08:00
zwjamnsss
9d92bcbe34 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-19 15:33:06 +08:00
zwjamnsss
34575b2c89 feat: 删除分组 2017-07-19 15:32:51 +08:00
waliang.wang
19e97e9b67 添加 删除 接口 2017-07-19 15:12:10 +08:00
wenbo.dong
0a9b820bd0 opti: 样式修改 2017-07-19 15:02:51 +08:00
zwjamnsss
2f687a21f6 feat: 编辑分组 2017-07-19 14:53:51 +08:00
yhui.yang
95ccc44740 opti: modify home and merge header 2017-07-19 14:14:47 +08:00
yhui.yang
9e5fd01458 opti: 添加登录后的首页 2017-07-19 14:08:24 +08:00
sean
01bad2a59f feat: merge to local 2017-07-19 14:00:29 +08:00
sean
3c537590c8 feat: user module in the client 2017-07-19 13:58:12 +08:00
zwjamnsss
72f829390e fix: 分组切换 2017-07-19 11:09:21 +08:00
zwjamnsss
eb3b77674d feat: 分组切换 2017-07-19 11:05:22 +08:00
zwjamnsss
7c700e1ab7 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-19 10:40:01 +08:00
zwjamnsss
74e3e68ad4 refactor: 修改添加分组Modal样式 2017-07-19 10:39:59 +08:00
wenbo.dong
84ad54a2df feat: 删除项目功能 2017-07-18 22:08:01 +08:00
wenbo.dong
357b8648f5 fix: 获取项目列表字段调整 2017-07-18 21:11:32 +08:00
sean
f771006ea0 fix: fix ignore bug 2017-07-18 19:50:43 +08:00
sean
7ce6def425 feat: user client module 2017-07-18 19:47:38 +08:00
zwjamnsss
539285877c feat: merge 2017-07-18 18:56:47 +08:00
zwjamnsss
b760261efd feat: add style 2017-07-18 18:55:13 +08:00
yhui.yang
6b0b4e9fb1 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-18 18:26:07 +08:00
yhui.yang
f7fc1f617d opti: modify layout and header 2017-07-18 18:25:53 +08:00
wenbo.dong
7661609a80 fix: 解决merge冲突 2017-07-18 17:47:47 +08:00
wenbo.dong
277580a867 feat: 添加项目显示在项目列表中 2017-07-18 17:46:09 +08:00
zwjamnsss
e28f9c2b41 style 2017-07-18 17:32:32 +08:00
sean
01d215d7a5 feat: user module 2017-07-18 17:15:29 +08:00
sean
094d17a196 feat: merge to local 2017-07-18 15:38:26 +08:00
sean
7749672f26 feat: uesr management module and fix some server bug 2017-07-18 15:35:32 +08:00
zwjamnsss
bcfb052ae4 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-18 15:06:33 +08:00
zwjamnsss
3d64753fd4 feat: add group 2017-07-18 15:06:12 +08:00
wenbo.dong
d84063a5c2 feat: 新建项目传入当前分组id 2017-07-18 14:58:57 +08:00
wenbo.dong
6752f812ba feat: 添加项目线上域名选项添加option选项 2017-07-18 14:30:33 +08:00
waliang.wang
735ff13df9 feat: 优化合并代码 2017-07-18 12:53:53 +08:00
qitmac000249
a33dfe6503 feat: 增加消息也获取更多方法 2017-07-18 10:17:07 +08:00
yhui.yang
9261cff925 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-17 21:12:06 +08:00
yhui.yang
087cd39469 opti: modify style of header and home 2017-07-17 21:11:58 +08:00
zwjamnsss
ecaba6585f initsate 2017-07-17 19:27:20 +08:00
qitmac000249
29783a98f7 feat: 增加时间轴样式 2017-07-17 18:15:55 +08:00
sean
ef1a26c222 feat: modify db config 2017-07-17 16:24:00 +08:00
sean
553d3faca0 feat: merge 2017-07-17 15:51:39 +08:00
sean
2a4867e5c0 feat: modify db config_dev 2017-07-17 15:51:15 +08:00
qitmac000249
13df766546 refactor: 修改container的index.js 2017-07-17 15:32:10 +08:00
sean
64baf1486f feat: merge to local 2017-07-17 13:49:25 +08:00
qitmac000249
57ff141f29 feat: 增加消息页面 2017-07-17 12:15:21 +08:00
sean
825a3033be feat: merge to local 2017-07-17 11:01:50 +08:00
sean
8be7c6e8a3 feat: user module client 2017-07-17 11:01:05 +08:00
zwjamnsss
3c6330b04e Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-17 10:18:26 +08:00
zwjamnsss
22159a5b64 feat group 2017-07-17 10:17:37 +08:00
sean
2d3412b924 feat: merge to local 2017-07-14 19:47:38 +08:00
sean
dab9394974 feat: add user module 2017-07-14 19:47:12 +08:00
yhui.yang
7183e5f740 feat: 添加首页,将登录注册移至首页 2017-07-14 19:20:52 +08:00
wenbo.dong
2183e825d5 feat: 创建项目请求 2017-07-14 18:02:01 +08:00
wenbo.dong
37762a109d feat: 新建项目功能 2017-07-14 16:54:20 +08:00
zwjamnsss
1084679611 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-14 15:16:04 +08:00
zwjamnsss
0a7568dcbc feat group api 2017-07-14 15:15:59 +08:00
waliang.wang
a090ebf19f 修改首页路由 2017-07-14 14:44:32 +08:00
waliang.wang
87b4775fa0 接口展现页面 项目成员管理 2017-07-14 11:27:34 +08:00
wenbo.dong
1a36d4ef61 docs: 修改登录页注释 2017-07-14 11:07:39 +08:00
waliang.wang
5951e55f80 管理项目成员模块 2017-07-13 20:09:04 +08:00
wenbo.dong
c8e98c7a9a feat: 登录时记住密码 2017-07-13 16:58:39 +08:00
wenbo.dong
739a2fb11f feat: 记住密码到cookie中 2017-07-13 16:48:20 +08:00
qitmac000068
719d6fcb25 fix:修改了header和登录框的逻辑 2017-07-12 21:13:22 +08:00
wenbo.dong
822ba2f746 add: 修改文件大小写 2017-07-12 17:03:15 +08:00
wenbo.dong
eda0ed95dc Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 16:39:42 +08:00
zwjamnsss
3ffb7895f8 example 2017-07-12 16:38:42 +08:00
wenbo.dong
46d62bc9e1 add: 登录与注册逻辑 2017-07-12 16:38:10 +08:00
wenbo.dong
035db2f357 add: 登录/注册逻辑 2017-07-12 16:26:35 +08:00
zwjamnsss
af5b8c26e8 addGroup 2017-07-12 15:41:11 +08:00
zwjamnsss
b2a990a3b9 sonar 2017-07-12 14:18:17 +08:00
waliang.wang
642e2272a1 文件名称 2017-07-12 12:20:01 +08:00
waliang.wang
2efd747caa 修改按钮颜色状态 2017-07-12 12:17:43 +08:00
zwjamnsss
b0377ea353 none 2017-07-12 11:43:10 +08:00
zwjamnsss
04f5ba3e14 none 2017-07-12 11:43:04 +08:00
wenbo.dong
9b6ac607f3 t puMerge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 10:17:59 +08:00
wenbo.dong
6767adcb13 add: 项目页布局 2017-07-12 10:17:57 +08:00
waliang.wang
2eeac22a48 添加接口静态页面 2017-07-11 19:13:12 +08:00
zwjamnsss
9d4939643c 添加样式 2017-07-11 14:37:20 +08:00
waliang.wang
cf488810e7 添加connect 2017-07-11 12:30:26 +08:00
waliang.wang
70c4942678 解决冲突 2017-07-11 12:13:11 +08:00
wenbo.dong
68828ebd3b add: 处理sonar提示的语法错误 2017-07-11 11:03:34 +08:00
wenbo.dong
dd8caa3409 add: 登录页布局 2017-07-11 10:54:10 +08:00
zwjamnsss
3dfb387285 polyfill 2017-07-11 10:22:06 +08:00
zwjamnsss
d2b2692ee1 eslint 2017-07-10 21:55:21 +08:00
zwjamnsss
cd5dff1045 merge 2017-07-10 21:45:46 +08:00
zwjamnsss
0970534f65 添加 eslint 2017-07-10 21:29:03 +08:00
zwjamnsss
a21ff2a3ce add groups 2017-07-10 20:27:06 +08:00
waliang.wang
f5a112c468 创建 client文件夹 2017-07-10 19:50:11 +08:00
waliang.wang
77ce038cec 创建reducer文件 2017-07-10 11:50:56 +08:00
waliang.wang
704e262b51 添加react-redux、redux 2017-07-09 21:33:21 +08:00
waliang.wang
f5d98a46b9 添加首页导航 2017-07-07 17:26:31 +08:00
waliang.wang
b8019f0f69 创建分组页面 2017-07-06 17:47:27 +08:00
waliang.wang
51d951e9f1 添加common.scss 2017-07-06 17:01:48 +08:00
zwjamnsss
cd4a7ff052 lint 2017-07-06 01:15:06 +08:00
zwjamnsss
a02970f4ad antd ok 2017-07-05 21:08:51 +08:00
waliang.wang
b1043111f0 添加ykit 2017-07-05 19:31:58 +08:00
waliang.wang
d65f5881b2 创建YAPI 2017-07-05 19:31:58 +08:00