test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,339 Commits 42 Branches 174 Tags 409 MiB
Commit Graph

2247 Commits

Author SHA1 Message Date
chenjianxing fa307f8be3 merge master 2020-09-25 20:53:54 +08:00
chenjianxing 5275a708b3 fix(测试跟踪): 关联接口测试报错 2020-09-25 20:39:18 +08:00
q4speed 302a754f5b fix(接口测试): 修复删除最后一个场景后弹出已有场景列表的bug 2020-09-25 18:20:52 +08:00
Captain.B dd2c688a23 Merge remote-tracking branch 'origin/master' into master 2020-09-25 17:46:10 +08:00
Captain.B 315bd84118 refactor(接口测试): 接口测试保存按钮上加上Tips Ctrl + S 2020-09-25 17:45:44 +08:00
q4speed d082d8b4e9 Merge remote-tracking branch 'origin/master' 2020-09-25 17:25:49 +08:00
q4speed e7f8c25a70 feat(接口测试): 报告里增加请求开始时间 2020-09-25 17:25:13 +08:00
Captain.B 0426e34b44 Merge remote-tracking branch 'origin/master' into master 2020-09-25 17:17:44 +08:00
Captain.B dac8ef1e48 feat(接口测试): 接口测试保存可以按 Ctrl+S 
Closes 481
 2020-09-25 17:17:30 +08:00
wenyann ea9a2cef59 fix:switch颜色修改 2020-09-25 17:16:25 +08:00
fit2-zhao 2b2ebb6823 fix(接口测试): 修复切换报告右侧没刷新问题 2020-09-25 15:26:39 +08:00
fit2-zhao 6ec08c0ec5 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-25 15:20:25 +08:00
fit2-zhao 3c6b839efd fix(接口测试): 修复切换报告右侧没刷新问题 2020-09-25 15:20:01 +08:00
chenjianxing 7b69571840 Merge branch 'master' of https://github.com/metersphere/server 2020-09-25 13:59:54 +08:00
chenjianxing 3813cdc120 fix(接口测试): 修复文件上传参数值勾选等问题 2020-09-25 13:59:45 +08:00
Captain.B 4eff4dc4b1 Merge branch 'v1.3' into master 2020-09-25 09:50:11 +08:00
Captain.B 14d1d29245 refactor: 修改用例评审评论页面高度设置 2020-09-24 21:59:14 +08:00
chenjianxing cc364cf1fc Merge branch 'master' of https://github.com/metersphere/server 2020-09-24 18:42:18 +08:00
chenjianxing 4093f39b58 feat(系统设置): 增加当前站点配置 2020-09-24 18:42:05 +08:00
BugKing 5e0a79f6a3 Merge branch 'master' of https://github.com/metersphere/metersphere into master 2020-09-24 18:31:01 +08:00
BugKing 05fd5655c4 fix(测试跟踪): 修改测试计划时间选择器样式 2020-09-24 18:30:36 +08:00
shiziyuan9527 305478cd35 refactor(测试计划): 修改测试计划所属项目展示样式 2020-09-24 17:56:44 +08:00
BugKing d0d894811d fix(测试跟踪): 修改测试计划时间选择样式 2020-09-24 17:24:37 +08:00
BugKing 5d17ed6348 Merge remote-tracking branch 'temp/master' into master 2020-09-24 16:09:59 +08:00
shiziyuan9527 56491903de Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-24 15:16:33 +08:00
shiziyuan9527 fdb593be58 feat(用例评审): 非用例评审人员不可取消或关联用例 2020-09-24 15:15:38 +08:00
Captain.B c6a46ff51b fix: 修复创建新用户偶尔无法登录的报错 2020-09-24 15:13:01 +08:00
wenyann 0954149d62 Merge remote-tracking branch 'origin/master' 2020-09-24 14:38:51 +08:00
wenyann 4898f1ed53 fix:字体字号统一 2020-09-24 14:38:13 +08:00
chenjianxing 366265db36 fix(接口测试): 场景下无请求控制台报错 2020-09-24 14:14:14 +08:00
chenjianxing b5a9f2cf0f fix: 测试报告导出样式 2020-09-24 13:14:11 +08:00
chenjianxing 896fd7f9ce Merge branch 'master' of https://github.com/metersphere/server 2020-09-23 20:31:24 +08:00
chenjianxing ae8e2605a4 fix(接口测试): 场景加载环境异常 2020-09-23 20:31:08 +08:00
Captain.B 299abdb705 Merge remote-tracking branch 'origin/master' into master 2020-09-23 18:49:48 +08:00
Captain.B 80e5b2c4f5 fix(性能测试): 修复性能测试图表上的legend 太多不显示的问题 2020-09-23 18:49:27 +08:00
fit2-zhao 70ce2eae17 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-23 18:15:21 +08:00
fit2-zhao 30ae0e5ce4 fix(XPack): 认证过后再次登陆菜单显示问题修复 2020-09-23 18:14:51 +08:00
chenjianxing dced33e977 Merge branch 'master' of https://github.com/metersphere/server 2020-09-23 18:06:30 +08:00
chenjianxing 75778440cc fix: 国际化 2020-09-23 18:06:16 +08:00
chenjianxing 105115de01 fix(接口测试): 环境中没有填写环境域名提示 2020-09-23 18:03:18 +08:00
q4speed 777dfa18fe refactor(接口测试): 修改操作符 2020-09-23 17:00:19 +08:00
q4speed 7e0f378938 Merge remote-tracking branch 'origin/master' 2020-09-23 16:49:22 +08:00
q4speed b34e279269 fix(接口测试): 修复dubbo和sql请求不能添加控制器的bug 2020-09-23 16:49:10 +08:00
q4speed d7a9d7df1a fix(接口测试): 修复条件控制器的值不能修改的bug 2020-09-23 16:48:19 +08:00
chenjianxing ff2fcd620b Merge branch 'master' of https://github.com/metersphere/server 2020-09-23 16:18:36 +08:00
chenjianxing 9d8d77ef9a fix: 场景下无请求是保存报错 2020-09-23 16:18:16 +08:00
q4speed c0fe259276 Merge remote-tracking branch 'origin/master' 2020-09-23 16:12:09 +08:00
q4speed 0b3e1bfe71 fix(接口测试): 修复引用SQL仍然可编辑的bug 2020-09-23 16:11:54 +08:00
chenjianxing c050331e4b feat: 登入后跳转 2020-09-23 16:08:00 +08:00
chenjianxing 2e13831daa Merge branch 'master' of https://github.com/metersphere/server 2020-09-23 16:03:32 +08:00
chenjianxing a609ca7638 feat: 登入后跳转至原地址 2020-09-23 16:03:14 +08:00
q4speed 4c9b68ddd5 Merge remote-tracking branch 'origin/master' 2020-09-23 15:30:31 +08:00
q4speed b8b9e9ac64 feat(接口测试): 条件控制器增加空和非空操作符 2020-09-23 15:30:17 +08:00
fit2-zhao e85aa875d1 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-23 14:37:38 +08:00
fit2-zhao 1ba55315c4 fix(测试跟踪): 修复xmind模版下载无法自动打开问题 2020-09-23 14:36:31 +08:00
shiziyuan9527 8028fdcd5f fix(用例评审): 修复开始评审后按钮不可点击的问题 2020-09-23 14:01:16 +08:00
Captain.B 5efef14133 style(接口测试): 任务通知页面修改 2020-09-23 13:12:27 +08:00
chenjianxing 37f07b473e Merge branch 'master' of https://github.com/metersphere/server 2020-09-23 11:55:29 +08:00
chenjianxing 7338513ec2 refactor: 代码优化 2020-09-23 11:55:15 +08:00
q4speed a31cd2e8bc Merge remote-tracking branch 'origin/master' 2020-09-23 11:49:03 +08:00
q4speed 2f0882c7f8 refactor: 删除无用代码 2020-09-23 11:48:44 +08:00
chenjianxing 9f8a937d50 Merge branch 'master' of https://github.com/metersphere/server 2020-09-23 11:47:39 +08:00
chenjianxing d4473116fd fit: 测试报告导出格式优化 2020-09-23 11:45:14 +08:00
shiziyuan9527 7f6fd6d013 refactor(用例评审): i18n 2020-09-23 11:15:11 +08:00
shiziyuan9527 e3a6fdfecc Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-23 11:07:59 +08:00
fit2-zhao 5afdfac40c style(测试跟踪): 去除多余日志 2020-09-23 11:03:52 +08:00
fit2-zhao 4b1c6a4a8a fix(测试跟踪): 修复firefox下载模版缺陷 2020-09-23 11:02:32 +08:00
shiziyuan9527 f825b009d7 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-23 10:42:44 +08:00
fit2-zhao 3dfab4b13f fix(XPack): 添加加载校验 2020-09-23 10:11:06 +08:00
fit2-zhao b8b1cc97ce Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-23 09:38:04 +08:00
fit2-zhao f3e3e70658 fix(XPack): 修复认证缓存内容 2020-09-23 09:37:56 +08:00
chenjianxing 06f7531969 fix: 报告导出后缀 2020-09-22 21:54:23 +08:00
chenjianxing a13c187537 Merge branch 'master' of https://github.com/metersphere/server 2020-09-22 21:48:25 +08:00
chenjianxing b0faae20b5 feat(接口测试): 接口测试报告导出 2020-09-22 21:48:11 +08:00
q4speed 569b01f589 refactor(XPack): License接口都放到XPack内 2020-09-22 21:29:53 +08:00
shiziyuan9527 9a10123bc4 refactor(用例评审): 添加loading 2020-09-22 21:14:02 +08:00
q4speed 22020e48d0 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-22 21:10:32 +08:00
fit2-zhao 1dfbd16144 fix(XPack): 第一次登陆认证失效问题修复 2020-09-22 20:12:38 +08:00
fit2-zhao 37f4384321 fix(XPack): license 验证缺陷修复 2020-09-22 19:50:47 +08:00
fit2-zhao 52297235a9 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-22 19:49:16 +08:00
fit2-zhao 8f807044ad fix(XPack): license 验证缺陷修复 2020-09-22 19:48:44 +08:00
shiziyuan9527 7713b24506 fix(用例评审): 修改样式 2020-09-22 18:58:37 +08:00
wenyann ddf1e7a5bf Merge remote-tracking branch 'origin/master' 2020-09-22 18:05:28 +08:00
wenyann 4d374fcc4f fix:修复一键运行报错 2020-09-22 18:05:05 +08:00
chenjianxing 3674320e9b fix(接口测试): 数据库配置添加必填项 2020-09-22 17:48:30 +08:00
shiziyuan9527 37ced87b76 feat(用例评审): 批量取消用例关联 2020-09-22 17:23:07 +08:00
q4speed 8bdfeced41 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-22 17:13:13 +08:00
wenyann 6e2069e011 Merge remote-tracking branch 'origin/master' 2020-09-22 15:36:32 +08:00
wenyann e14af29232 fix:修复执行测试计划，提示关联有测试 2020-09-22 15:36:09 +08:00
shiziyuan9527 c128021dc3 fix(测试跟踪): 删除测试用例时删除关联的评论 2020-09-22 15:32:04 +08:00
Captain.B ed8a2f6d5f Merge branch 'master' of github.com:metersphere/metersphere into master 2020-09-22 15:20:31 +08:00
Captain.B b788091622 refactor(测试跟踪): 评审页面的样式 2020-09-22 15:20:13 +08:00
chenjianxing 1d2ef25f39 Merge branch 'master' of https://github.com/metersphere/server 2020-09-22 14:56:36 +08:00
chenjianxing 968ff5f470 feat(性能测试): 导出性能测试报告 2020-09-22 14:56:25 +08:00
q4speed 3b2059de14 refactor(XPack): update submodule 2020-09-22 14:39:08 +08:00
q4speed a52ae19526 Merge remote-tracking branch 'origin/master' 2020-09-22 14:27:21 +08:00
fit2-zhao c089e27ff9 Merge remote-tracking branch 'origin/master' 2020-09-22 12:35:50 +08:00
fit2-zhao e50a952944 refactor(XPack): 认证机制重构，权限修改 2020-09-22 12:35:07 +08:00
chenjianxing 7977e92e9f Merge branch 'master' of https://github.com/metersphere/server 2020-09-22 12:03:30 +08:00
chenjianxing aa646931dc Merge branch 'master' of https://github.com/metersphere/server 2020-09-22 11:46:24 +08:00
chenjianxing 014ce229f1 fix(接口测试): 复制环境 2020-09-22 11:46:02 +08:00
shiziyuan9527 74878cd806 refactor: i18n 2020-09-22 11:45:20 +08:00
q4speed 18d3694b3e Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
#	frontend/src/business/components/xpack
 2020-09-22 10:49:28 +08:00
q4speed 625a870629 refactor(XPack): update submodule 2020-09-22 10:49:03 +08:00
Captain.B 81bf333e29 Merge branch 'v1.3' into master 2020-09-22 10:41:20 +08:00
chenjianxing c347c1d56d Merge branch 'master' of https://github.com/metersphere/server 2020-09-22 10:36:23 +08:00
chenjianxing e00265b577 feat(测试跟踪): 测试计划报告导出 2020-09-22 10:35:59 +08:00
shiziyuan9527 bebc97d867 fix(用例评审): 修改评审人为必填项 2020-09-22 10:30:03 +08:00
shiziyuan9527 1c51bc57e9 feat: 测试评审修改评审人和所属项目 2020-09-21 21:19:58 +08:00
q4speed fd24ed1246 refactor(XPack): 同步submodule 2020-09-21 18:02:50 +08:00
shiziyuan9527 0274d1eb3d Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-21 17:51:46 +08:00
shiziyuan9527 6289043772 refactor(用例评审): 测试评审测试用例列表去掉缺陷列 2020-09-21 17:51:31 +08:00
Captain.B 01cf93bf45 refactor(性能测试): 响应时间默认为空 2020-09-21 17:50:32 +08:00
q4speed 5f22162ce6 Merge remote-tracking branch 'origin/master' 2020-09-21 15:16:18 +08:00
q4speed 0713f58f09 fix(配额管理): 修复压测时长没有显示单位的bug 2020-09-21 14:56:58 +08:00
wenyann 16a4bd9cb5 Merge remote-tracking branch 'origin/master' 2020-09-21 14:08:15 +08:00
wenyann e27e763da3 fix:修改缺陷处理人 2020-09-21 14:07:56 +08:00
BugKing e13ae20766 refactor: Merge branch 'master' into v1.3 2020-09-21 12:57:40 +08:00
shiziyuan9527 38ef329ba0 fix: 修复关联用例页面筛选失败的问题 2020-09-21 11:37:07 +08:00
BugKing 7d2b2a4cc9 refactor: 修改版本号 2020-09-21 10:28:24 +08:00
Captain.B 5744103f79 refactor: 修改性能测试上传文件数量的限制判断 2020-09-21 10:10:20 +08:00
shiziyuan9527 b9509e3725 refactor: 删除无用代码 2020-09-20 12:42:07 +08:00
shiziyuan9527 b7507b8cfd refactor: 修改用例评论样式 2020-09-20 12:12:04 +08:00
shiziyuan9527 18a68f3041 feat(测试跟踪): 测试跟踪首页我的评审 2020-09-20 09:48:25 +08:00
shiziyuan9527 ef33833794 feat(测试跟踪): 用例评审 2020-09-19 23:52:09 +08:00
shiziyuan9527 b9579d61a0 feat(测试跟踪): 保存评审结果 2020-09-19 11:52:49 +08:00
shiziyuan9527 3135bf3406 feat(测试跟踪): 用例评审关联测试用例 2020-09-18 23:56:43 +08:00
shiziyuan9527 95b722e86c fix(测试计划): 测试计划修改所属项目时的提示问题 2020-09-18 17:04:50 +08:00
chenjianxing da23e9cc46 Merge branch 'master' of https://github.com/metersphere/server 2020-09-18 16:53:39 +08:00
chenjianxing 57b62ded31 fix(接口测试): 数据库密码框 2020-09-18 16:53:15 +08:00
Captain.B 106b9f65d0 Merge remote-tracking branch 'origin/master' into master 2020-09-18 16:33:26 +08:00
Captain.B cfe8393fee refactor: 修改性能测试上传文件数量的限制判断 2020-09-18 16:32:58 +08:00
chenjianxing 7a867e80d1 fix(接口测试): GET 请求参数错误 2020-09-18 15:58:24 +08:00
chenjianxing 4887585838 merger master 2020-09-18 15:27:32 +08:00
q4speed e917b844b6 Merge remote-tracking branch 'origin/master' 2020-09-18 15:12:39 +08:00
q4speed ae8bf4dc40 fix(接口测试): 修复逻辑控制器禁用状态初始化无效的bug 2020-09-18 15:12:21 +08:00
chenjianxing 648f1fa2d0 fix(接口测试): 接口测试保存无反应 2020-09-18 15:06:19 +08:00
wenyann fed9519fce Merge remote-tracking branch 'origin/master' 2020-09-18 14:57:19 +08:00
wenyann a363074c16 fix:执行时间定时刷新 2020-09-18 14:56:58 +08:00
chenjianxing a646f5f4d8 refactor(接口测试): 修改数据库配置样式 2020-09-18 14:48:56 +08:00
xuxm 1d2d7128d9 update：test_plan增加4个字段：planned_start_time、planned_end_time、actual_start_time、actual_end_time 2020-09-18 13:59:18 +08:00
xuxm 2062b14a17 update：测试计划表单页面增加‘计划开始’，‘计划结束’时间字段 2020-09-18 13:54:38 +08:00
xuxm 89b2bb9525 update：增加测试计划列表页面显示“计划开始”，“计划结束”，“实际开始”，“实际结束” 2020-09-18 13:52:08 +08:00
chenjianxing 6383750485 fix(接口测试): 场景折叠问题 2020-09-18 13:05:22 +08:00
chenjianxing 5badcc3a21 Merge branch 'master' of https://github.com/metersphere/server 2020-09-18 11:50:16 +08:00
chenjianxing e3b437827b refactor(接口测试): 支持提取接口到变量 2020-09-18 11:48:46 +08:00
fit2-zhao c5d52a6906 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-18 11:41:25 +08:00
fit2-zhao 56db0e077b refactor(XPack): license增强校验，并对过期时间进行展示 2020-09-18 11:14:44 +08:00
shiziyuan9527 7a6151ab79 feat(测试计划): 测试计划可以修改所属项目 2020-09-18 11:09:37 +08:00
chenjianxing 18c300f85e Merge branch 'master' of https://github.com/metersphere/server 2020-09-17 21:45:50 +08:00
chenjianxing fbbd943990 feat(接口测试): GET 请求支持 body 2020-09-17 21:45:31 +08:00
shiziyuan9527 89e5c55add fix(测试计划): 提缺陷时同步实际结果 2020-09-17 21:41:52 +08:00
shiziyuan9527 5c9c645016 fix(系统设置): 修复创建用户时ID含中文可以创建的问题 2020-09-17 21:27:02 +08:00
chenjianxing 7b0045d1a7 refactor: 解决冲突 2020-09-17 18:37:38 +08:00
chenjianxing e40ce93182 refactor(测试跟踪): 功能测试支持选择自动方式 2020-09-17 18:36:13 +08:00
q4speed 92d9db0d52 feat(接口测试): 修复搜索条件缺少Success的bug 2020-09-17 18:21:11 +08:00
chenjianxing 6e72c03e2e fix: ScenarioModel.js 报错 2020-09-17 18:16:53 +08:00
q4speed 2e2fdebe1e fix: 去掉console.log 2020-09-17 18:15:51 +08:00
q4speed 7ab46caa36 Merge remote-tracking branch 'origin/master' 2020-09-17 18:13:39 +08:00
q4speed 8cee5b816d fix: 删除重复代码 2020-09-17 18:13:26 +08:00
chenjianxing 94a549cf8e Merge branch 'master' of https://github.com/metersphere/server 2020-09-17 18:12:10 +08:00
chenjianxing 1488109f23 feat(测试跟踪): 执行步骤复制 2020-09-17 18:11:39 +08:00
q4speed d4199e85b4 Merge remote-tracking branch 'origin/master' 2020-09-17 18:09:28 +08:00
q4speed 3994e346b5 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/api/test/model/ScenarioModel.js
 2020-09-17 18:08:37 +08:00
shiziyuan9527 4766813ae4 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-17 18:07:36 +08:00
q4speed 4e9a2f084f feat(接口测试): 增加逻辑控制器 2020-09-17 18:04:51 +08:00
shiziyuan9527 ed43ef4dc4 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-17 18:03:32 +08:00
shiziyuan9527 92f91fcb48 feat(测试跟踪): 用例评审CURD 2020-09-17 18:03:05 +08:00
chenjianxing 78b0b348a0 feat(接口测试): 场景点图标才折叠 2020-09-17 18:02:46 +08:00
chenjianxing 884ae86d91 fix(接口测试): http请求页面报错 2020-09-17 17:51:16 +08:00
chenjianxing 1b36e3302a Merge branch 'master' of https://github.com/metersphere/server 2020-09-17 17:17:35 +08:00
fit2-zhao 3a8e477d7e style(测试跟踪): 修改图片清晰度 2020-09-17 17:16:05 +08:00
chenjianxing b454b09f9e fix(接口): 兼容旧版本参数勾选 2020-09-17 17:15:46 +08:00
fit2-zhao 05f43a0f7f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-17 16:54:41 +08:00
fit2-zhao 30164c6591 fix(测试跟踪): 导入xmind 相关缺陷修复 2020-09-17 16:54:20 +08:00
chenjianxing 4001c981ff Merge branch 'master' of https://github.com/metersphere/server 2020-09-17 16:43:44 +08:00
chenjianxing f9e288550d fix(接口测试): 场景折叠 2020-09-17 16:43:34 +08:00
wenyann be136e99e8 Merge remote-tracking branch 'origin/master' 2020-09-17 16:15:00 +08:00
wenyann 167dd8d0e8 fix:添加保存 2020-09-17 16:14:38 +08:00
Captain.B dd0b474959 Merge branch 'master' of github.com:fit2cloudrd/metersphere-server into master 2020-09-17 16:05:47 +08:00
Captain.B f0198ccb68 chore: 同步submodule 2020-09-17 16:05:37 +08:00
Captain.B eecc351061 refactor(性能测试): 页面可配置响应超时时间 2020-09-17 15:52:17 +08:00
chenjianxing 5fd8a424d6 fix(接口测试): 接口顺序执行 2020-09-17 15:16:58 +08:00
chenjianxing e1eba35e13 feat(接口测试): 支持 Oracle 2020-09-17 15:11:00 +08:00
chenjianxing d4439f01ad feat(接口测试): 支持 postgresql 2020-09-17 13:03:33 +08:00
chenjianxing 5ef0f5a629 fix(接口测试):引用环境url显示问题 2020-09-17 11:34:17 +08:00
chenjianxing dc41ddc683 Merge branch 'master' of https://github.com/metersphere/server 2020-09-17 11:02:27 +08:00
chenjianxing 21ad96c691 feat(接口测试): 支持sqlserver 2020-09-17 11:02:16 +08:00
fit2-zhao 4d983fd071 fix(接口调试): 修复host不匹配时开启DnsCache缺陷 2020-09-17 11:01:08 +08:00
wenyann ed5232f5d0 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-16 22:13:48 +08:00
wenyann 3bd398debf fix:导出全部用例 2020-09-16 22:13:18 +08:00
chenjianxing 9918d77e51 fix: 解决冲突 2020-09-16 20:48:40 +08:00
chenjianxing fccababb39 feat(接口测试): 支持连接Mysql 2020-09-16 20:45:09 +08:00
fit2-zhao 4ad35dcf7d Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-16 19:32:31 +08:00
fit2-zhao 95b44e7fd0 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	backend/pom.xml
 2020-09-16 19:32:11 +08:00
fit2-zhao 76b09b4751 feat(测试跟踪): 支持思维导图导入用例 2020-09-16 18:47:04 +08:00
fit2-zhao d71969b2fa fix(接口调试): 修复场景中自定义变量和请求头不能选择问题 2020-09-16 16:43:44 +08:00
wenyann 43bfebfcaa Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	backend/src/main/resources/i18n/messages_en_US.properties
	backend/src/main/resources/i18n/messages_zh_CN.properties
	backend/src/main/resources/i18n/messages_zh_TW.properties
 2020-09-16 10:03:31 +08:00
wenyann b221a51d4c feat: 定时任务通知 2020-09-16 09:57:55 +08:00
shiziyuan9527 a325a18139 feat(测试跟踪): tapd提交缺陷时增加处理人信息 2020-09-15 16:54:50 +08:00
chenjianxing 14531a571a Merge branch 'master' of https://github.com/metersphere/server 2020-09-15 11:29:12 +08:00
chenjianxing cbb1976f77 feat(接口测试): sql 请求 2020-09-15 11:26:29 +08:00
shiziyuan9527 84c891419f refactor: Jira id 替换为 key 2020-09-15 10:51:52 +08:00
fit2-zhao 776d17833b style(XPack): 修复 认证页面样式 2020-09-15 10:32:44 +08:00
fit2-zhao ae3cbd298a style(XPack): 授权认证页面样式调整 2020-09-14 20:41:30 +08:00
shiziyuan9527 5c400f616c Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-14 16:51:01 +08:00
shiziyuan9527 54b72c017e feat(测试计划): 测试报告中列表增加所属项目列 2020-09-14 16:50:49 +08:00
fit2-zhao 3445ac4656 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-14 15:57:20 +08:00
chenjianxing 37bf65ce07 Merge branch 'master' of https://github.com/metersphere/server 2020-09-14 15:55:24 +08:00
chenjianxing 1eb9b3c45f feat(接口测试): 场景数据库配置页面 2020-09-14 15:55:01 +08:00
fit2-zhao 1644a03cf6 feat(XPack): 【企业版】【公共】License 认证机制 2020-09-14 15:51:37 +08:00
shiziyuan9527 3b439edaeb feat(测试计划): 关联测试用例切换项目页列表分页 2020-09-14 15:14:19 +08:00
shiziyuan9527 b55ca479a4 feat(测试计划): 测试计划下测试用例增加所属项目列 2020-09-08 18:28:37 +08:00
chenjianxing fdde95218d Merge branch 'master' of https://github.com/metersphere/server 2020-09-08 17:26:22 +08:00
chenjianxing 2deec48cd5 fix(接口测试): python 执行失败 2020-09-08 17:25:57 +08:00
shiziyuan9527 fbce41bb3e refactor(测试计划): 删除测试计划时同时删除相关联数据 2020-09-08 15:20:30 +08:00
wenyann 913ff44480 fix: 任务通知设置 2020-09-08 14:52:44 +08:00
shiziyuan9527 dad8ad2be9 feat: 测试计划关联用例支持跨项目 2020-09-07 22:30:38 +08:00
q4speed c1dfe05e87 Merge remote-tracking branch 'origin/master' 2020-09-07 16:11:23 +08:00
fit2-zhao ab4be0a23b style(接口调试): 格式化内容 2020-09-07 16:11:06 +08:00
q4speed c9cf9b8e8f feat(接口测试): 请求支持跨场景拖拽 2020-09-07 16:11:06 +08:00
fit2-zhao 2b462c4f1c fix(接口调试): 修复body内容无法传递问题 2020-09-07 15:59:44 +08:00
fit2-zhao 20f89c0017 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	frontend/src/business/components/api/test/ApiTestConfig.vue
 2020-09-07 13:44:40 +08:00
fit2-zhao a92db96844 fix(接口测试): 加强host列表校验 2020-09-07 13:42:21 +08:00
q4speed 7f296f453c Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/api/test/components/ApiScenarioConfig.vue
#	frontend/src/business/components/api/test/components/request/ApiHttpRequestForm.vue
 2020-09-07 13:29:37 +08:00
q4speed d6459dfa73 feat(接口测试): 增加场景拼接 2020-09-07 13:20:27 +08:00
fit2-zhao 92c5215349 fix(接口测试): 加强host列表校验 2020-09-07 11:41:57 +08:00
fit2-zhao ce579fe143 fix(接口调试): 修复调试未勾选参数加入执行缺陷 2020-09-07 10:23:25 +08:00
fit2-zhao 59aeb11fa1 feat(接口测试): 环境配置增加hosts 2020-09-04 19:35:50 +08:00
fit2-zhao 60961c0a27 style(接口测试): 规范化提交内容 2020-09-03 16:17:15 +08:00
fit2-zhao 82cf5b25c4 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	frontend/src/business/components/api/test/components/ApiVariable.vue
 2020-09-03 15:11:05 +08:00
fit2-zhao ed4b773bd8 feat(接口调试): 参数增加启用/禁用勾选项 2020-09-03 14:59:12 +08:00
chenjianxing 765d0941c3 Merge branch 'v1.2' 2020-09-03 13:31:01 +08:00
chenjianxing 306773ddcd fix(接口测试): 兼容旧版本beanshell 2020-09-03 13:28:58 +08:00
wenyann 3e14fd3d6b Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/common/components/MsScheduleEdit.vue
 2020-09-03 10:36:44 +08:00
wenyann 6785e58d10 feat: 任务通知 2020-09-03 10:34:13 +08:00
Captain.B ec931d038c refactor: 修改 Header 上注册事件的方式 2020-09-03 10:02:51 +08:00
chenjianxing 5b750fe55f refact: 解决冲突 2020-09-02 19:33:38 +08:00
chenjianxing 86098dee8a refactor: merge v1.2 2020-09-02 19:32:31 +08:00
chenjianxing 9f9210bb87 fix(接口测试): 修复环境删除时，测试保存无反应 2020-09-02 19:18:37 +08:00
chenjianxing dc6e777bb6 Merge branch 'v1.2' of https://github.com/metersphere/server into v1.2 2020-09-02 18:19:41 +08:00
chenjianxing 7a0535b6b3 fix(接口测试): dubbo 禁用保存不生效 2020-09-02 18:19:15 +08:00
Captain.B 32d8054304 Merge branch 'v1.2' into master 2020-09-02 17:06:56 +08:00
Captain.B e9c79676c1 chore: 去掉不用的文件 2020-09-02 17:03:08 +08:00
wenyann af53cf7c47 Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	frontend/src/business/components/common/components/MsScheduleEdit.vue
 2020-09-02 16:24:27 +08:00
wenyann 2dbe00bf23 fix: 任务通知设置 2020-09-02 16:21:40 +08:00
chenjianxing d0e8cf0a49 Merge branch 'v1.2' of https://github.com/metersphere/server into v1.2 2020-09-02 15:29:17 +08:00
chenjianxing 7d6cf859df feat(接口测试): 支持python脚本 2020-09-02 15:29:01 +08:00
Captain.B 738311dc86 Merge branch 'v1.2' into master 2020-09-02 10:51:09 +08:00
Captain.B 1ae6ab2b88 refactor(接口测试): 修改高级参数设置按钮样式 2020-09-02 10:42:52 +08:00
Captain.B da8c52e6e3 refactor: 合并代码修改部分页面显示 2020-09-01 18:02:47 +08:00
Captain.B 5aa7019bb0 Merge branch 'v1.2' into master 
# Conflicts:
#	frontend/src/business/components/common/components/MsScheduleEdit.vue
 2020-09-01 17:54:53 +08:00
shiziyuan9527 1a9fcf0d7b feat: 性能测试报告批量删除 2020-09-01 16:22:58 +08:00
Captain.B 4c18b8d29a feat(性能测试): 支持上传多个csv 2020-09-01 10:21:24 +08:00
Captain.B 7d156c4399 Merge branch 'v1.2' of github.com:fit2cloudrd/metersphere-server into v1.2 2020-09-01 10:08:31 +08:00
chenjianxing 4fa973eff1 Merge branch 'master' of https://github.com/metersphere/server 2020-08-31 23:37:04 +08:00
chenjianxing 286439c56d refactor(接口测试): 后置处理器可以获取提取后的变量 2020-08-31 20:28:46 +08:00
chenjianxing 05979450fd Merge branch 'v1.2' of https://github.com/metersphere/server into v1.2 2020-08-31 20:15:04 +08:00
chenjianxing 31d7fa36f3 feat(接口测试): 跟随重定向配置 2020-08-31 20:14:49 +08:00
wenyann 53ba48b468 Merge remote-tracking branch 'origin/master' 2020-08-31 17:41:24 +08:00
wenyann 8d88ff7f6e feat: 增加帮助文档跳转 2020-08-31 17:40:56 +08:00
Captain.B 6bcb7aa16b refactor: 调整js代码 2020-08-31 17:27:57 +08:00
shiziyuan9527 4203707ef5 feat: 接口测试报告批量删除 2020-08-31 17:18:25 +08:00
Captain.B 708c3deb1a refactor: 页面样式修改 2020-08-31 17:06:27 +08:00
shiziyuan9527 63fc4c0f1e refactor: 保存jira认证信息时补全地址 2020-08-31 15:15:35 +08:00
Captain.B 336020322d refactor: track home 页面样式调整 2020-08-31 14:06:19 +08:00
wenyann 02d5aa8bc7 Merge branch 'v1.2' of https://github.com/metersphere/metersphere into v1.2 2020-08-29 12:00:55 +08:00
wenyann f22bc72602 fix:测试用例备注字符修改为500 2020-08-29 12:00:33 +08:00
shiziyuan9527 b88e3d5bff fix: jira 提交缺陷失败的问题 2020-08-28 18:16:27 +08:00
Captain.B a7a53241ba Merge branch 'v1.2' of github.com:fit2cloudrd/metersphere-server into v1.2 2020-08-28 17:56:07 +08:00
Captain.B c29dd93243 fix(性能测试): 点击再次执行时查询时间状态检测 2020-08-28 17:55:56 +08:00
q4speed 7714805698 refactor: 优化代码 2020-08-28 17:10:17 +08:00
wenyann 5353d7a04a Merge remote-tracking branch 'origin/v1.2' into v1.2 2020-08-28 16:39:23 +08:00
wenyann c2cef4bd70 fix: 用例导出优化 2020-08-28 16:38:44 +08:00
Captain.B 8298781148 fix: 修复切换路由之后执行时间没有查询的问题 2020-08-28 16:26:18 +08:00
Captain.B 0757d0f6ab fix: 修复资源池下拉框显示uuid的问题 2020-08-28 16:03:09 +08:00
wenyann 082c634611 Merge branch 'v1.2' of https://github.com/metersphere/metersphere into v1.2 2020-08-28 13:35:54 +08:00
chenjianxing 46cab70f36 refactor: 对话框不点击外部自动关闭 2020-08-28 12:10:54 +08:00
chenjianxing 0dc6e10529 Merge branch 'master' of https://github.com/metersphere/server 2020-08-28 11:39:06 +08:00
chenjianxing 2548bad565 Merge branch 'v1.2' 2020-08-28 11:38:35 +08:00
q4speed ac3093641f refactor: 优化代码 2020-08-28 11:26:32 +08:00
wenyann f529d7f6bb Merge branch 'master' into v1.2 2020-08-28 10:38:55 +08:00
wenyann 00c269ff8d fix:创建测试用例点击窗口外区域不关闭当前窗口 
fix:测试名称校验
 2020-08-28 10:30:42 +08:00
chenjianxing b0f720bb1e fix(接口测试): 代码模版添加undefined问题 2020-08-27 17:58:48 +08:00
chenjianxing e07f24b817 fix(测试跟踪): 测试步骤列表高度问题 2020-08-27 17:50:13 +08:00
wenyann 98b0391234 fix: 一键运行同一项目报错提示 2020-08-27 15:51:44 +08:00
wenyann d8094b3907 fix: 一键运行同一项目报错提示 2020-08-27 14:59:18 +08:00
Captain.B 788e020168 fix: 修复 this 绑定偶现的问题 2020-08-27 10:26:16 +08:00
Captain.B 117a1c0e98 Merge remote-tracking branch 'origin/master' into master 2020-08-27 10:17:45 +08:00
Captain.B c7e04f2f32 fix: 修复 echart title 消失的问题 2020-08-27 10:17:27 +08:00
wenyann 7ddd9f23d2 fix: 测试结果统计图页面修改 2020-08-27 10:15:40 +08:00
chenjianxing 9d88665a1a fix: Login.vue 控制台报错 2020-08-26 21:31:39 +08:00
chenjianxing 6604834cbf Merge branch 'master' of https://github.com/metersphere/server 2020-08-26 18:49:12 +08:00
chenjianxing 2bf023ecac fix(接口测试): 请求超时时间限制最小值 2020-08-26 18:48:45 +08:00
shiziyuan9527 00acafbcdc Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-26 18:05:52 +08:00
shiziyuan9527 a68990a27d refactor: 修改测试计划搜索框的提示 2020-08-26 18:05:24 +08:00
chenjianxing 8dc66e9268 fix(接口测试): 禁用场景不校验 2020-08-26 17:57:34 +08:00
chenjianxing 8eeb51258f Merge branch 'master' of https://github.com/metersphere/server 2020-08-26 17:48:57 +08:00
chenjianxing 1f6fffad2c refactor: 复制测试可填写测试名称 2020-08-26 17:20:56 +08:00
Captain.B 395344b53c Merge branch 'master' of github.com:fit2cloudrd/metersphere-server into master 2020-08-26 16:59:02 +08:00