Commit Graph

449 Commits

Author SHA1 Message Date
wenbo.dong
ef66b566dd fix: 处理添加项目的环境配置时点击删除会删除多个配置的bug 2017-07-25 22:35:47 +08:00
zwjamnsss
a59696c565 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 21:30:24 +08:00
zwjamnsss
f9b2bf7c3c feat: 接口测试部分 2017-07-25 21:25:40 +08:00
qitmac000249
ef55513a6e Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-25 21:12:35 +08:00
qitmac000249
7b63a92426 fix: 修改编辑分组TextArea 2017-07-25 21:12:30 +08:00
yhui.yang
2259c072de Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 21:04:19 +08:00
yhui.yang
c1b00c88ac fix: 解决刷新页面后取不到uid,搜索框为中文 2017-07-25 21:04:11 +08:00
qitmac000249
fb38d68bf1 fix: 修改projectList路径 2017-07-25 20:57:54 +08:00
zwjamnsss
7138bcd9cb Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 18:21:16 +08:00
yhui.yang
c0446b2ef2 fix: 添加footer,修正高度问题 2017-07-25 18:11:53 +08:00
yhui.yang
66e2c3e664 fix: 首页和header一些小bug 2017-07-25 17:56:04 +08:00
waliang.wang
015e9c63c8 解决冲突 2017-07-25 17:51:48 +08:00
waliang.wang
ee31f5cb4c feat - 修改路由参数 2017-07-25 17:41:58 +08:00
zwjamnsss
8839b4e4a8 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 17:09:55 +08:00
qitmac000249
e052fe12d5 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-25 16:18:07 +08:00
qitmac000249
4384e78a53 fix: 继续修复group bug 2017-07-25 16:18:00 +08:00
wenbo.dong
ecdb636a53 fix: 处理reg.js的缩进问题 2017-07-25 16:16:32 +08:00
wenbo.dong
ab1cd8b9ef feat: 注册的email添加正则判断 2017-07-25 16:06:26 +08:00
wenbo.dong
8b1f37077b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 16:02:20 +08:00
wenbo.dong
e3e6a97c72 fix: login错误处理 2017-07-25 16:02:18 +08:00
qitmac000249
494f62baf7 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-25 15:54:02 +08:00
qitmac000249
13dc04b71a fix: 修复group路由问题 2017-07-25 15:53:55 +08:00
yhui.yang
a39645d403 fix: add rc-queque-anim,rc-scroll-anim in the package.json 2017-07-25 15:40:23 +08:00
yhui.yang
cab350259f opti: 首页添加动画,修改header 2017-07-25 15:35:23 +08:00
zwjamnsss
30c6d6226b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 15:30:44 +08:00
waliang.wang
fc3ccf2540 feat - 最新代码 2017-07-25 15:11:43 +08:00
waliang.wang
15bb3df095 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 14:35:51 +08:00
waliang.wang
9fdf3a44db 接口ui修改 2017-07-25 14:35:46 +08:00
wenbo.dong
b6e1e9fa21 feat: QSSO登录添加分割线 2017-07-25 14:24:47 +08:00
qitmac000249
d7f5be93a8 fix: 修改history导致的warm 2017-07-25 13:46:37 +08:00
zwjamnsss
8399b0305c feat: 接口测完完成部分 2017-07-25 13:34:48 +08:00
qitmac000249
d76b0cc678 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-25 13:18:00 +08:00
qitmac000249
af6680b589 fix: 优化分组页的路由 2017-07-25 13:17:54 +08:00
wenbo.dong
da411971e9 fix: merge 2017-07-25 10:50:33 +08:00
wenbo.dong
e41937037d feat: 修改项目的环境域名添加了http/https的选择功能 2017-07-25 10:49:19 +08:00
qitmac000249
237a53ded6 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-25 10:31:29 +08:00
qitmac000249
60ae8e073f fix: 修改添加分组处最小宽度以及添加分组的描述框为textarea 2017-07-25 10:31:19 +08:00
suxiaoxin
a0aa06f46a fix qsso login need click double and delete project auth bug 2017-07-25 10:22:45 +08:00
zwjamnsss
cb17d51f54 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-25 09:27:29 +08:00
zwjamnsss
97244db900 fix: 修复Safari样式 2017-07-25 09:27:25 +08:00
waliang.wang
cde8e44d68 解决冲突 2017-07-24 19:44:46 +08:00
waliang.wang
a9598f6de4 feat - mock 2017-07-24 19:43:13 +08:00
wenbo.dong
1ab001d6a3 opti: Login样式修改 2017-07-24 17:30:25 +08:00
wenbo.dong
d6090778aa Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-24 17:21:14 +08:00
wenbo.dong
c484ae0f5a opti: Login样式修改 2017-07-24 17:21:10 +08:00
qitmac000249
e320308393 fix: 修改footer样式 2017-07-24 16:41:11 +08:00
waliang.wang
c9ed7902a0 put 接口 2017-07-24 11:10:23 +08:00
waliang.wang
e638bddd12 feat - 编辑接口 2017-07-24 10:59:17 +08:00
wenbo.dong
a2358c7670 feat: 登录模块添加状态提示 2017-07-23 18:24:46 +08:00
wenbo.dong
ff44b9b129 fix: 修复修改项目表单显示异常的bug 2017-07-23 17:31:14 +08:00
wenbo.dong
f38106e91b opti: 样式微调 2017-07-20 22:24:31 +08:00
wenbo.dong
375769b257 feat: 修改项目的环境配置功能 2017-07-20 22:08:09 +08:00
wenbo.dong
b6524a6ced Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 21:37:00 +08:00
yhui.yang
63f18dad65 opti: add skip of menu 2017-07-20 21:30:35 +08:00
yhui.yang
e39240fb27 feat: 添加header上的搜索,修改路由,修改登录页面样式,merge文件 2017-07-20 20:31:20 +08:00
wenbo.dong
dc8632c69a Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 20:24:09 +08:00
wenbo.dong
0fcd2486d7 fix: 处理冲突文件 2017-07-20 20:24:06 +08:00
yhui.yang
3e2f7b90f7 feat: 添加header上的搜索,修改路由,修改登录页面样式 2017-07-20 19:59:49 +08:00
suxiaoxin
22f0f557bd fix: fix interface up bug 2017-07-20 19:47:10 +08:00
waliang.wang
af754fe234 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev2 2017-07-20 19:26:14 +08:00
waliang.wang
e303f5f218 feat : 调试保存接口 2017-07-20 19:26:04 +08:00
suxiaoxin
5e096d1e67 feat: change some user style 2017-07-20 18:15:45 +08:00
wenbo.dong
0a167b24d0 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 17:57:43 +08:00
wenbo.dong
45a3776f28 fix: 修改project/add&up接口参数 2017-07-20 17:53:28 +08:00
waliang.wang
3516b98c96 文件大小写 2017-07-20 17:20:30 +08:00
wenbo.dong
7d3e86bf97 feat: 项目列表显示创建人 2017-07-20 17:08:29 +08:00
waliang.wang
fa6cd2ab22 git 忽略大小写 文件夹修改 2017-07-20 16:57:21 +08:00
suxiaoxin
f148273f3a Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 16:56:48 +08:00
suxiaoxin
d80dfea9aa feat: user style 2017-07-20 16:44:41 +08:00
waliang.wang
689e4d2081 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 16:38:56 +08:00
waliang.wang
76c436a3ac feat - 接口页面布局 2017-07-20 16:38:50 +08:00
waliang.wang
669aca8320 合并代码 解决冲突 2017-07-20 16:35:33 +08:00
waliang.wang
ee3322fa4e feat - 添加接口详情 测试 mock 2017-07-20 16:34:46 +08:00
qitmac000249
692a84a880 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-20 16:31:03 +08:00
qitmac000249
d6f0c102ae fix: 消息页修改为日志也 2017-07-20 16:30:55 +08:00
wenbo.dong
524fd9faa1 feat: 项目列表跳转到接口页 2017-07-20 16:03:36 +08:00
wenbo.dong
1e279c2eef feat: QSSO登录 2017-07-20 15:49:36 +08:00
waliang.wang
4544ecb23b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 15:38:30 +08:00
waliang.wang
a9521b7606 feat - 接口列表数据 2017-07-20 15:38:25 +08:00
wenbo.dong
e638f71bea Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 15:31:45 +08:00
suxiaoxin
33f77c2a05 feat: project prd_host add protocol field 2017-07-20 15:26:26 +08:00
wenbo.dong
c2bb1e2a06 fix: 处理项目列表接口请求参数错误的bug 2017-07-20 14:57:19 +08:00
waliang.wang
26e7f441f8 feat - 合并最新代码 解决冲突 2017-07-20 14:52:42 +08:00
waliang.wang
51fd3c8e70 feat - 创建接口 2017-07-20 14:48:29 +08:00
wenbo.dong
c6a866975c feat: 创建或求该项目表单的校验 2017-07-20 14:41:38 +08:00
wenbo.dong
35ec0a0437 feat: 项目创建时间格式化 2017-07-20 11:32:21 +08:00
wenbo.dong
9011aedbb2 docs: 修改login-wrap文件名 2017-07-20 10:51:31 +08:00
wenbo.dong
f74425045b fix: Login文件删除未使用的变量 2017-07-20 10:48:03 +08:00
wenbo.dong
dd607ecafe fix: 恢复误删的Login文件夹 2017-07-20 10:41:12 +08:00
wenbo.dong
0735db2846 fix: 删除login组件小写的文件 2017-07-20 10:28:22 +08:00
wenbo.dong
58d9673114 feat: 取消cookie记录用户密码的操作 2017-07-20 00:29:25 +08:00
wenbo.dong
a8f67cb42f feat: 修改项目信息可配置环境信息 2017-07-20 00:17:48 +08:00
wenbo.dong
d21eacc5ea fix: 统一文件大小写 2017-07-19 22:36:04 +08:00
wenbo.dong
f4a3a22292 feat: 实现项目列表的分页功能 2017-07-19 22:31:18 +08:00
wenbo.dong
fbc1489fb5 fix: 修改创建项目的错误提示 2017-07-19 21:32:44 +08:00
wenbo.dong
524448c4bf feat: 项目表格的loading状态由state转到store存储 2017-07-19 21:21:40 +08:00
wenbo.dong
62a9683c39 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-19 21:00:04 +08:00
wenbo.dong
0fdb804f1d feat: 修改项目功能 2017-07-19 20:59:59 +08:00
waliang.wang
564fb32972 feat - 优化文档部分UI 2017-07-19 20:27:44 +08:00
waliang.wang
a56a6c8f82 feat: 新增手动编辑样式 2017-07-19 19:29:18 +08:00
yhui.yang
c3c44ec3ca opti: modify home 2017-07-19 17:53:39 +08:00
zwjamnsss
494beb11a2 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-19 17:18:48 +08:00
zwjamnsss
631371b65c feat: 搜索分组 2017-07-19 17:17:07 +08:00
qitmac000249
4048b070ff fix: 修改消息页 2017-07-19 16:15:51 +08:00
zwjamnsss
faca641755 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-19 15:33:06 +08:00
zwjamnsss
db920c84a9 feat: 删除分组 2017-07-19 15:32:51 +08:00
waliang.wang
dc8420805a 添加 删除 接口 2017-07-19 15:12:10 +08:00
wenbo.dong
c5da772403 opti: 样式修改 2017-07-19 15:02:51 +08:00
zwjamnsss
9ddac64fee feat: 编辑分组 2017-07-19 14:53:51 +08:00
yhui.yang
9435ec127e opti: modify home and merge header 2017-07-19 14:14:47 +08:00
yhui.yang
70812ae499 opti: 添加登录后的首页 2017-07-19 14:08:24 +08:00
suxiaoxin
91da8de350 feat: merge to local 2017-07-19 14:00:29 +08:00
suxiaoxin
deeccfa44e feat: user module in the client 2017-07-19 13:58:12 +08:00
zwjamnsss
8945e71308 fix: 分组切换 2017-07-19 11:09:21 +08:00
zwjamnsss
ab33a9e97e feat: 分组切换 2017-07-19 11:05:22 +08:00
zwjamnsss
723e40a4ec Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-19 10:40:01 +08:00
zwjamnsss
dcfce6559b refactor: 修改添加分组Modal样式 2017-07-19 10:39:59 +08:00
wenbo.dong
fa7f90bb3b feat: 删除项目功能 2017-07-18 22:08:01 +08:00
wenbo.dong
a76c606f0b fix: 获取项目列表字段调整 2017-07-18 21:11:32 +08:00
suxiaoxin
8700012957 fix: fix ignore bug 2017-07-18 19:50:43 +08:00
suxiaoxin
0f8cfdae79 feat: user client module 2017-07-18 19:47:38 +08:00
zwjamnsss
62a9f7ea8d feat: merge 2017-07-18 18:56:47 +08:00
zwjamnsss
1764c4a0ea feat: add style 2017-07-18 18:55:13 +08:00
yhui.yang
612e75575f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-18 18:26:07 +08:00
yhui.yang
a4fd0e3480 opti: modify layout and header 2017-07-18 18:25:53 +08:00
wenbo.dong
d87027382e fix: 解决merge冲突 2017-07-18 17:47:47 +08:00
wenbo.dong
a25f67168d feat: 添加项目显示在项目列表中 2017-07-18 17:46:09 +08:00
zwjamnsss
8935cb3bcd style 2017-07-18 17:32:32 +08:00
suxiaoxin
5576cd7284 feat: user module 2017-07-18 17:15:29 +08:00
suxiaoxin
73bf7b3d17 feat: merge to local 2017-07-18 15:38:26 +08:00
suxiaoxin
66f2eb6390 feat: uesr management module and fix some server bug 2017-07-18 15:35:32 +08:00
zwjamnsss
54e84763a5 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-18 15:06:33 +08:00
zwjamnsss
abb8e03966 feat: add group 2017-07-18 15:06:12 +08:00
wenbo.dong
fba8c0eef2 feat: 新建项目传入当前分组id 2017-07-18 14:58:57 +08:00
wenbo.dong
9205e40660 feat: 添加项目线上域名选项添加option选项 2017-07-18 14:30:33 +08:00
waliang.wang
26daae1ded feat: 优化合并代码 2017-07-18 12:53:53 +08:00
qitmac000249
76252d91f3 feat: 增加消息也获取更多方法 2017-07-18 10:17:07 +08:00
yhui.yang
0665bdadfb Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-17 21:12:06 +08:00
yhui.yang
4a05eaf2b1 opti: modify style of header and home 2017-07-17 21:11:58 +08:00
zwjamnsss
98ba76b7f5 initsate 2017-07-17 19:27:20 +08:00
qitmac000249
cbf050fb08 feat: 增加时间轴样式 2017-07-17 18:15:55 +08:00
suxiaoxin
68d0c65a55 feat: modify db config 2017-07-17 16:24:00 +08:00
suxiaoxin
7771fbd9ab feat: merge 2017-07-17 15:51:39 +08:00
suxiaoxin
de689bc921 feat: modify db config_dev 2017-07-17 15:51:15 +08:00
qitmac000249
aa760275da refactor: 修改container的index.js 2017-07-17 15:32:10 +08:00
suxiaoxin
c3c232694f feat: merge to local 2017-07-17 13:49:25 +08:00
qitmac000249
627bc885d0 feat: 增加消息页面 2017-07-17 12:15:21 +08:00
suxiaoxin
a525c435d4 feat: merge to local 2017-07-17 11:01:50 +08:00
suxiaoxin
c93447256b feat: user module client 2017-07-17 11:01:05 +08:00
zwjamnsss
a19f37bdbe Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-17 10:18:26 +08:00
zwjamnsss
246a651c87 feat group 2017-07-17 10:17:37 +08:00
suxiaoxin
3e2e489e66 feat: merge to local 2017-07-14 19:47:38 +08:00
suxiaoxin
d047389d97 feat: add user module 2017-07-14 19:47:12 +08:00
yhui.yang
5ec15e8663 feat: 添加首页,将登录注册移至首页 2017-07-14 19:20:52 +08:00
wenbo.dong
dba1d60d26 feat: 创建项目请求 2017-07-14 18:02:01 +08:00
wenbo.dong
4334a1b0d1 feat: 新建项目功能 2017-07-14 16:54:20 +08:00
zwjamnsss
e321e45952 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-14 15:16:04 +08:00
zwjamnsss
93acde85b0 feat group api 2017-07-14 15:15:59 +08:00
waliang.wang
0127e9e5b6 修改首页路由 2017-07-14 14:44:32 +08:00
waliang.wang
68079e102e 接口展现页面 项目成员管理 2017-07-14 11:27:34 +08:00
wenbo.dong
29d26944a5 docs: 修改登录页注释 2017-07-14 11:07:39 +08:00
waliang.wang
27c48c5ece 管理项目成员模块 2017-07-13 20:09:04 +08:00
wenbo.dong
b6fe780097 feat: 登录时记住密码 2017-07-13 16:58:39 +08:00
wenbo.dong
809f2835a7 feat: 记住密码到cookie中 2017-07-13 16:48:20 +08:00
qitmac000068
a64ea192a3 fix:修改了header和登录框的逻辑 2017-07-12 21:13:22 +08:00
wenbo.dong
ac9296c4b4 add: 修改文件大小写 2017-07-12 17:03:15 +08:00
wenbo.dong
72df36d58b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 16:39:42 +08:00
zwjamnsss
7e80d4cc7d example 2017-07-12 16:38:42 +08:00
wenbo.dong
c0e5d95ac1 add: 登录与注册逻辑 2017-07-12 16:38:10 +08:00
wenbo.dong
196fbf7c98 add: 登录/注册逻辑 2017-07-12 16:26:35 +08:00
zwjamnsss
c2b317442c addGroup 2017-07-12 15:41:11 +08:00
zwjamnsss
61b493a820 sonar 2017-07-12 14:18:17 +08:00
waliang.wang
53cfb4d606 文件名称 2017-07-12 12:20:01 +08:00
waliang.wang
81bbbc22e6 修改按钮颜色状态 2017-07-12 12:17:43 +08:00
zwjamnsss
403d6eb552 none 2017-07-12 11:43:10 +08:00
zwjamnsss
c774df54d2 none 2017-07-12 11:43:04 +08:00
wenbo.dong
480ffc8da8 t puMerge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 10:17:59 +08:00
wenbo.dong
0e06915cbd add: 项目页布局 2017-07-12 10:17:57 +08:00
waliang.wang
13e566d99d 添加接口静态页面 2017-07-11 19:13:12 +08:00
zwjamnsss
82a4b74105 添加样式 2017-07-11 14:37:20 +08:00
waliang.wang
4ced44a934 添加connect 2017-07-11 12:30:26 +08:00
waliang.wang
1d5c960417 解决冲突 2017-07-11 12:13:11 +08:00
wenbo.dong
798d91aed6 add: 处理sonar提示的语法错误 2017-07-11 11:03:34 +08:00
wenbo.dong
45e7df07c7 add: 登录页布局 2017-07-11 10:54:10 +08:00
zwjamnsss
80cadec422 polyfill 2017-07-11 10:22:06 +08:00
zwjamnsss
f33830da75 eslint 2017-07-10 21:55:21 +08:00
zwjamnsss
88bc75ae72 merge 2017-07-10 21:45:46 +08:00
zwjamnsss
0c07622181 添加 eslint 2017-07-10 21:29:03 +08:00
zwjamnsss
a37ffc87ea add groups 2017-07-10 20:27:06 +08:00
waliang.wang
acee8a6df0 创建 client文件夹 2017-07-10 19:50:11 +08:00
waliang.wang
8bc875890a 创建reducer文件 2017-07-10 11:50:56 +08:00
waliang.wang
68dd0b4c96 添加react-redux、redux 2017-07-09 21:33:21 +08:00
waliang.wang
7dfb9489cb 添加首页导航 2017-07-07 17:26:31 +08:00
waliang.wang
d9f4900463 创建分组页面 2017-07-06 17:47:27 +08:00
waliang.wang
dbcf9ed02c 添加common.scss 2017-07-06 17:01:48 +08:00
zwjamnsss
c556fc6c0f lint 2017-07-06 01:15:06 +08:00
zwjamnsss
a03f8db868 antd ok 2017-07-05 21:08:51 +08:00
waliang.wang
79334996bd 添加ykit 2017-07-05 19:31:58 +08:00
waliang.wang
770a70f5e3 创建YAPI 2017-07-05 19:31:58 +08:00