Commit Graph

3254 Commits

Author SHA1 Message Date
q4speed 15af40cc6f Merge remote-tracking branch 'origin/master' 2020-10-13 11:17:47 +08:00
q4speed c13baa2f70 fix(接口测试): 修复TCP配置被场景配置覆盖的bug 2020-10-13 11:17:35 +08:00
wenyann 3f73ecd5da Merge remote-tracking branch 'origin/master' 2020-10-12 18:43:35 +08:00
wenyann 55c06e0ff0 fix:修复预览详情字段显示 2020-10-12 18:42:33 +08:00
wenyann 4ed7802bea Merge branch 'v1.3' 2020-10-12 18:09:31 +08:00
wenyann 369d35e3a5 Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-10-12 18:06:51 +08:00
wenyann 3f8e5c58d3 fix:添加预览详情 2020-10-12 18:06:17 +08:00
q4speed fea3738797 Merge remote-tracking branch 'origin/master' 2020-10-12 17:39:35 +08:00
q4speed 7fdb637948 refactor(接口测试): 补充提交 2020-10-12 17:39:20 +08:00
shiziyuan9527 a4ee354778 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-12 17:37:42 +08:00
shiziyuan9527 05c1e619ef fix(测试计划): 修复查询测试计划时出现的数据不一致问题 2020-10-12 17:36:31 +08:00
shiziyuan9527 797c9f0776 feat(测试计划): 测试计划结果为通过时自动跳转到下一用例 2020-10-12 17:35:19 +08:00
q4speed bb7d3f7b5a Merge remote-tracking branch 'origin/master' 2020-10-12 17:23:30 +08:00
q4speed f2bf1e0d21 feat(接口测试): TCPSampler 增加环境配置和场景配置 2020-10-12 17:23:18 +08:00
shiziyuan9527 1c79468b00 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-12 16:23:34 +08:00
shiziyuan9527 63bd7f1fe3 refactor(测试跟踪): 格式化代码 2020-10-12 16:22:50 +08:00
chenjianxing f138d0271b Merge branch 'v1.3' 2020-10-12 16:07:26 +08:00
chenjianxing d4c762bfe4 Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3 2020-10-12 16:03:40 +08:00
chenjianxing 9b1ff67b7f fix(接口测试): 测试用例导入表头提示优化 2020-10-12 16:03:17 +08:00
wenyann 6d265b55db Merge branch 'v1.3' of https://github.com/metersphere/metersphere 2020-10-12 14:21:50 +08:00
Captain.B 5803eccc2b refactor: 表格又边框设置为0
(cherry picked from commit fed5d15589)
2020-10-12 13:26:24 +08:00
Captain.B fed5d15589 refactor: 表格又边框设置为0 2020-10-12 13:25:43 +08:00
Captain.B 00424b0255 revert: 回退td的底部border
(cherry picked from commit ff7454f6ef)
2020-10-12 13:18:56 +08:00
Captain.B ff7454f6ef revert: 回退td的底部border 2020-10-12 13:18:02 +08:00
Captain.B b6a064e5cc refactor: 表格边框hover之后的颜色修改
(cherry picked from commit 6d1fb1583f)
2020-10-12 13:14:21 +08:00
Captain.B 9f2eeda276 refactor: 表格边框hover之后的颜色修改
(cherry picked from commit d524f76549)
2020-10-12 13:14:18 +08:00
q4speed 43c05ee5fd Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-12 13:10:53 +08:00
q4speed 53ced104fe Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-10-12 13:09:52 +08:00
q4speed 62a6af8758 fix(接口测试): 修复条件控制器判断bug 2020-10-12 13:09:40 +08:00
Captain.B 6d1fb1583f refactor: 表格边框hover之后的颜色修改 2020-10-12 13:08:19 +08:00
wenyann e4dde84d15 Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-10-12 13:05:31 +08:00
wenyann a043722a05 fix: 导出测试用例加备注 2020-10-12 13:05:07 +08:00
q4speed fc55a685d0 style: 调整样式 2020-10-12 13:04:29 +08:00
chenjianxing dbf18cde4a Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3 2020-10-12 11:34:57 +08:00
chenjianxing 70d677c4fc fit(接口测试): 导入测试请求参数未勾选 2020-10-12 11:34:38 +08:00
q4speed 6d15cfb6e1 Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-10-12 10:15:19 +08:00
q4speed 27e50e9ff0 fix(接口测试): 修复跨场景拼接无法多次复制同一场景的bug
Closes #509
2020-10-12 10:15:06 +08:00
chenjianxing 47344ab909 Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3 2020-10-12 10:09:44 +08:00
chenjianxing 827d43c4e5 fix(接口测试): swagger导入报错 2020-10-12 10:08:47 +08:00
Captain.B e64518fb79 Merge remote-tracking branch 'origin/master' into master 2020-10-12 09:55:11 +08:00
Captain.B d524f76549 refactor: 表格边框hover之后的颜色修改 2020-10-12 09:54:28 +08:00
fit2-zhao 9e154c6d87 Merge branch 'v1.3' 2020-10-12 09:43:54 +08:00
fit2-zhao 90e857b105 fix(接口测试): hosts 列表执行缺陷修复 2020-10-10 19:52:39 +08:00
Captain.B 3e1ca62e62 Merge branch 'v1.3' into master 2020-10-10 17:55:33 +08:00
Captain.B 80fdee00b9 Merge branch 'v1.3' of github.com:metersphere/metersphere into v1.3 2020-10-10 17:51:53 +08:00
Captain.B 4cfaa9a1bb fix: 修复用例表中维护人字段长度不够的bug
Closes 531
2020-10-10 17:51:46 +08:00
shiziyuan9527 c4674abd4c Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3 2020-10-10 17:05:28 +08:00
shiziyuan9527 0a57ff4940 fix: 修复登录用户可以查看其他工作空间的bug 2020-10-10 17:05:19 +08:00
Captain.B 77e16e2ace refactor: 加上 progress bar 2020-10-10 15:30:28 +08:00
wenyann fbfb29074e Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-10-10 15:29:43 +08:00