Commit Graph

6763 Commits

Author SHA1 Message Date
fit2-zhao b918df0e15 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-31 14:33:11 +08:00
fit2-zhao 2279c17d73 fix(接口自动化): 修改转场景测试名称 2021-03-31 14:33:04 +08:00
chenjianxing bc602eb668 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-31 14:24:39 +08:00
chenjianxing 2c6ab9fe8d fix: 解决冲突 2021-03-31 14:24:26 +08:00
chenjianxing 57bddf4bd0 fix: 测试用例导入标签 2021-03-31 14:21:56 +08:00
chenjianxing 5dd39b60e5 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-31 13:44:02 +08:00
chenjianxing d55bbc6dd8 fix: 接口导出没有带路径 2021-03-31 13:43:43 +08:00
fit2-zhao 9d987dc0e6 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-31 13:25:18 +08:00
fit2-zhao 0cb2188cd2 fix(接口自动化): 恢复xpack 2021-03-31 13:24:50 +08:00
Captain.B 201027d432 Merge branch 'v1.8' 2021-03-31 13:24:02 +08:00
Captain.B 4045f5546f chore: sync 2021-03-31 13:23:26 +08:00
fit2-zhao d62391e6ca fix(接口自动化): 注释全路径校验 2021-03-31 13:20:53 +08:00
fit2-zhao ed3e076a01 fix(接口自动化): 放开全路径校验 2021-03-31 13:17:05 +08:00
fit2-zhao e092a7a130 fix(接口自动化): 放开全路径校验 2021-03-31 13:03:33 +08:00
fit2-zhao 1221bb8d66 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-31 13:00:04 +08:00
fit2-zhao 4811432acc fix(接口自动化): 修复csv 分隔符不能编辑问题 2021-03-31 12:59:48 +08:00
Captain.B 6d857da2f4 Merge branch 'v1.8' 2021-03-31 12:24:54 +08:00
Captain.B 8c7e941ee4 chore: sync 2021-03-31 12:24:38 +08:00
Captain.B 8d90e427a9 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-31 12:22:33 +08:00
Captain.B 71c512174d fix(性能测试): 修复上传测试文件偶尔会传多个的bug 2021-03-31 12:22:14 +08:00
shiziyuan9527 a21c611d35 fix(场景自动化): 运行环境显示问题 2021-03-31 12:12:13 +08:00
fit2-zhao a555ddd334 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-31 12:03:54 +08:00
fit2-zhao eed1a5e167 fix(接口自动化): 修复导入jmx 超时时间丢失问题 2021-03-31 12:03:26 +08:00
fit2-zhao b20a870581 fix(接口自动化): 修复jsonPathAssrtion 5.2 版本升级后问题 2021-03-31 11:25:17 +08:00
chenjianxing e0461fda3b fix: 解决冲突 2021-03-31 10:55:27 +08:00
chenjianxing e04d82d117 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-31 10:53:14 +08:00
Ambitiousliga b2d3b81bc5 fix(测试跟踪):Excel导入用例时标签有内容会报错 (#1747)
* fix(测试跟踪):Excel导入用例时标签有内容报错

* fix(测试跟踪):excel导入只有新增用例且和错误用例时,关闭窗口会自动刷新。

Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
2021-03-31 10:49:39 +08:00
Ambitiousliga 5ea0cde526 fix: 解决冲突 2021-03-31 10:49:12 +08:00
Captain.B 13386da0af Merge branch 'v1.8' into master 2021-03-31 08:17:27 +08:00
Captain.B c1f00d8257 fix: 尝试修复表格固定列之后错乱的问题 2021-03-31 08:17:00 +08:00
Captain.B bdc0127207 chore: sync 2021-03-30 22:07:53 +08:00
fit2-zhao db11b495d0 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 19:54:35 +08:00
fit2-zhao 5d78d51091 fix(接口自动化): 检查场景步骤是否都是全路径 2021-03-30 19:54:18 +08:00
Captain.B 5cc4e709fe Merge branch 'v1.8' 2021-03-30 19:22:50 +08:00
Captain.B 1a858c619d fix: 尝试修复表格固定列之后错乱的问题 2021-03-30 19:20:39 +08:00
Captain.B 9aa93bb7a0 Merge remote-tracking branch 'origin/master' 2021-03-30 19:15:29 +08:00
Captain.B 6d8873ca5c Merge branch 'v1.8' 2021-03-30 19:15:04 +08:00
Captain.B 9257eb55cc chore: sync 2021-03-30 19:14:50 +08:00
Captain.B 75fb21ca4b Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-30 19:14:07 +08:00
Captain.B 10a24e60a5 fix: 尝试修复表格固定列之后错乱的问题 2021-03-30 19:13:44 +08:00
chenjianxing 1439bf6135 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-30 18:47:06 +08:00
chenjianxing c02f437661 Merge branch 'v1.8' 2021-03-30 18:46:51 +08:00
fit2-zhao 6313a66662 refactor(接口定义): 默认模块校验公共方法提取 2021-03-30 18:44:44 +08:00
fit2-zhao cc13993abc fix(接口定义): 默认模块校验问题修改 2021-03-30 18:41:22 +08:00
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