Commit Graph

6819 Commits

Author SHA1 Message Date
Captain.B 058ff22195 Merge branch 'v1.8' 2021-03-30 18:33:56 +08:00
fit2-zhao c23a31400e Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 18:32:39 +08:00
Captain.B 5a205b9c1f fix(性能测试): 修复最大并发数没有按照资源池来限制的bug 2021-03-30 18:31:56 +08:00
fit2-zhao 5ed35abe59 fix(接口定义): 修复环境地址不是标准域名问题 2021-03-30 18:31:33 +08:00
song.tianyang cb9bbe26ea fix: 接口定义列表错位方法优化代码回退
接口定义列表错位方法优化代码回退
2021-03-30 17:39:22 +08:00
song.tianyang 812735696a Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-30 17:29:27 +08:00
fit2-zhao 78b06d18ee Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 17:28:06 +08:00
Captain.B 9358a91fcd Merge remote-tracking branch 'origin/master' 2021-03-30 17:27:51 +08:00
fit2-zhao 233cceec73 fix(场景自动化): 删除单个场景问题修复 2021-03-30 17:27:43 +08:00
Captain.B 5dbafb8770 Merge branch 'v1.8' 2021-03-30 17:27:15 +08:00
Captain.B 43f6bc09dd chore: sync 2021-03-30 17:23:02 +08:00
song.tianyang e63a56257c Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-30 17:16:49 +08:00
song.tianyang 71f883a377 fix: 解决接口定义点击api/case/文档不变色的问题;更新1.8的frontend-xpack版本号
解决接口定义点击api/case/文档不变色的问题;更新1.8的frontend-xpack版本号
2021-03-30 17:14:38 +08:00
fit2-zhao 63d1e2e640 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 17:05:16 +08:00
fit2-zhao 3243e5fb68 fix(场景自动化): 修复场景名称过长显示问题 2021-03-30 17:04:33 +08:00
chenjianxing 6a5b022ac4 Merge branch 'v1.8' 2021-03-30 17:01:29 +08:00
chenjianxing 3fa9673d92 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 17:00:03 +08:00
chenjianxing af3d54b82f refactor: jsonpath推荐关闭按钮优化 2021-03-30 16:59:45 +08:00
fit2-zhao 52ce3f288b Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 16:45:58 +08:00
fit2-zhao 0a7ce73e6a fix(测试用例): 导入xmind 模版 模块名称长度修改 2021-03-30 16:45:26 +08:00
chenjianxing 01480fc6f2 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 16:42:06 +08:00
chenjianxing 32b26efc73 refactor: 导入用例重复提示优化 2021-03-30 16:41:44 +08:00
fit2-zhao c5362840fc Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 16:38:47 +08:00
fit2-zhao 9abc90150d fix(接口自动化): 修复重定向接口内容重复问题 2021-03-30 16:38:30 +08:00
song.tianyang 60136a3e02 fix: ESB导入增加xpack判断,ESB导入模板去掉"是否必填"列,ESB请求参数去掉"是否必填"列
ESB导入增加xpack判断,ESB导入模板去掉"是否必填"列,ESB请求参数去掉"是否必填"列
2021-03-30 16:33:45 +08:00
song.tianyang cc99108e28 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-30 16:29:10 +08:00
Ambitiousliga ab98740321 fix(测试跟踪):使只读用户不能删除测试计划报告 (#1758)
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
2021-03-30 16:20:22 +08:00
Ambitiousliga 2534eafcf0 fix(测试跟踪):修复用例excel导入时重复校验不准确问题。 (#1756)
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com>
2021-03-30 16:20:22 +08:00
Ambitiousliga ce8547300f
fix(测试跟踪):修复用例excel导入时重复校验不准确问题。 (#1756)
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com>
2021-03-30 16:19:23 +08:00
Ambitiousliga bd9b47ca33
fix(测试跟踪):使只读用户不能删除测试计划报告 (#1758)
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
2021-03-30 16:17:08 +08:00
chenjianxing 971c96b08f Merge branch 'master' of github.com:metersphere/metersphere 2021-03-30 16:10:02 +08:00
chenjianxing 89e28ea3df Merge branch 'v1.8' 2021-03-30 16:09:27 +08:00
chenjianxing 5c70925360 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 16:08:34 +08:00
chenjianxing 87221dfda2 groovy脚本无法使用jar包 2021-03-30 16:08:17 +08:00
fit2-zhao 6db8a133de fix(接口自动化): 修复端口是变量的问题 2021-03-30 15:52:25 +08:00
Captain.B 7185961ad2 Merge branch 'v1.8' 2021-03-30 15:43:52 +08:00
fit2-zhao 22b63d03df Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 15:35:39 +08:00
fit2-zhao 81645d4387 fix(接口自动化): 选中模块创建数据,默认放到当前选择的模块下 2021-03-30 15:35:11 +08:00
Captain.B 3a11fd16eb chore: sync 2021-03-30 15:31:27 +08:00
Captain.B 1847fbbf5d fix: 修复文件名过短导致场景无法引入 2021-03-30 15:31:02 +08:00
Captain.B 02af3f1fe9 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-30 15:29:45 +08:00
Captain.B d556c722ad fix(性能测试): 修复预热时间没有适配单位的bug 2021-03-30 15:28:16 +08:00
fit2-zhao 2a70396bf8 fix: 恢复被覆盖的sql 2021-03-30 15:25:23 +08:00
fit2-zhao a05d1a773a fix(测试用例,接口定义,接口自动化): 默认添加的模块,不能编辑也不能删除。 2021-03-30 15:20:34 +08:00
fit2-zhao 015c665bcf Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 15:03:46 +08:00
fit2-zhao cff32b828c fix(测试用例,接口定义,接口自动化): 增加默认模块,默认创建用例都放到默认模块下 2021-03-30 15:03:31 +08:00
Captain.B 575cc7dbed Merge branch 'v1.8' 2021-03-30 14:53:13 +08:00
Captain.B 0f1676166c fix: 修复文件名过短导致场景无法引入,文件重复弹框提示优化 2021-03-30 14:52:34 +08:00
Captain.B 6bc2601bc7 Merge branch 'v1.8' 2021-03-30 14:11:52 +08:00
Captain.B b54ed5c92e Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-30 14:11:05 +08:00