Commit Graph

6764 Commits

Author SHA1 Message Date
Captain.B b00576b670 chore: sync 2021-03-29 15:50:00 +08:00
fit2-zhao 7e9e3f5a7b Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-29 15:46:57 +08:00
fit2-zhao 82def4f5b5 style(场景自动化): 调整步骤样式,默认显示复制按钮 2021-03-29 15:46:51 +08:00
wenyann ae391e54ce Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-29 15:29:32 +08:00
wenyann 7502bdcc7a fix:删除无用代码 2021-03-29 15:29:10 +08:00
fit2-zhao 8d635743bc Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-29 15:01:25 +08:00
fit2-zhao a3b1c4f4d5 feat(场景自动化,测试用例): 默认选中树节点添加对应功能 2021-03-29 15:01:18 +08:00
Captain.B a70958865e Merge branch 'v1.8' 2021-03-29 14:59:18 +08:00
Captain.B 980190c6bf refactor(性能测试): 资源池校验修改,停止容器错误处理 2021-03-29 14:58:51 +08:00
fit2-zhao d3fccb25d6 feat(场景自动化,测试用例,): 测试用例、 接口定义、场景自动化 增加“默认模块” 创建测试用例、接口定义、场景时 所属模块默认值为“默认模块” 2021-03-29 14:43:25 +08:00
Captain.B 3ea6c015d1 Merge branch 'v1.8' 2021-03-29 13:44:58 +08:00
Captain.B 1d90a1b56c chore: sync 2021-03-29 13:44:41 +08:00
Captain.B 4e70646a01 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-29 13:43:47 +08:00
Captain.B 6f18b5426f refactor(性能测试): 修改kafka默认的acks为0 2021-03-29 13:42:29 +08:00
fit2-zhao e2ead6e002 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8
# Conflicts:
#	frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
2021-03-29 13:31:50 +08:00
fit2-zhao fddad77ace Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8
# Conflicts:
#	frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
2021-03-29 13:31:42 +08:00
fit2-zhao 49097dc7b6 feat(接口定义): 接口定义、增加“默认模块” 创建接口定义所属模块默认值为“默认模块” 2021-03-29 13:19:59 +08:00
Captain.B 223b88cfbb Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-29 12:32:37 +08:00
Captain.B 4c5bcb6307 feat(性能测试): 修复场景名称过长导致样式出错的问题 2021-03-29 12:32:21 +08:00
shiziyuan9527 033a4a69f0 refactor(场景自动化): 运行环境优化 2021-03-29 12:03:14 +08:00
chenjianxing 9c96088006 Merge commit 'cc5ff944d1ed0ac524591553486cdc6a6effaadf' into v1.8 2021-03-29 12:00:19 +08:00
chenjianxing 28ed11d09b fix: 脑图全屏下拉框无法显示 2021-03-29 11:51:51 +08:00
Captain.B b5e3077544 Merge branch 'v1.8' 2021-03-29 10:57:10 +08:00
Captain.B fd89aff698 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-29 10:56:31 +08:00
Captain.B c5e977b091 fix: 尝试修复表格固定列之后错乱的问题 2021-03-29 10:56:14 +08:00
shiziyuan9527 74c1fafb71 fix(测试跟踪): 去掉评审关联用例时的权限控制 2021-03-29 10:47:30 +08:00
Ambitiousliga 999f55985d
feat(测试跟踪):通过Excel导入导出时有ID字段,可通过Excel导入来更新用例。 (#1727)
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
2021-03-29 09:35:12 +08:00
shiziyuan9527 fd34e063ff refactor(场景自动化): 运行环境优化 2021-03-27 19:11:12 +08:00
Captain.B 0e1991ae28 fix(性能测试): 修复报告对比bug 2021-03-26 19:07:23 +08:00
wenyann 6fd9b1aaa4 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-26 19:02:54 +08:00
wenyann 9818ea20fe fix: jenkins触发的测试测试计划进度和场景报告更新 2021-03-26 18:59:34 +08:00
Captain.B 8e8ce9a90d Merge branch 'v1.8' 2021-03-26 18:39:02 +08:00
Captain.B 44e1cf16fa Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-26 18:38:35 +08:00
Captain.B 4214e63b71 refactor: 增强验证csrftoken 2021-03-26 18:38:16 +08:00
song.tianyang ae3d1adf33 Merge remote-tracking branch 'origin/v1.8' into v1.8
# Conflicts:
#	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
2021-03-26 18:33:52 +08:00
Captain.B cd13e58cb0 feat(性能测试): 测试报告支持对比 2021-03-26 18:24:04 +08:00
Captain.B 39187a0cba Merge branch 'v1.8' 2021-03-26 18:20:51 +08:00
Captain.B 9bfaf7588e Revert "feat(性能测试): 测试报告支持对比" 2021-03-26 18:20:18 +08:00
Captain.B a162fe4f45 Revert "feat(性能测试): 测试报告支持对比"
This reverts commit e26561e4
2021-03-26 18:16:54 +08:00
Captain.B 1f5fc92233 Revert "refactor(性能测试): 报告对比将当前报告的标记写在名称前边"
This reverts commit 34be7ce2
2021-03-26 18:16:43 +08:00
Captain.B 8b36c3b150 Merge branch 'v1.8' 2021-03-26 18:13:18 +08:00
wenyann ca67a3ed56 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-26 18:13:08 +08:00
wenyann 5ac89f8410 fix: 表头修改 2021-03-26 18:12:25 +08:00
Captain.B 34be7ce27f refactor(性能测试): 报告对比将当前报告的标记写在名称前边 2021-03-26 18:10:00 +08:00
Captain.B 40870f3d65 Merge remote-tracking branch 'origin/master' 2021-03-26 18:06:03 +08:00
Captain.B f29cad3cf0 chore: sync 2021-03-26 18:05:21 +08:00
Captain.B e6f889b16e Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-26 18:04:41 +08:00
Captain.B cd80921632 Merge branch 'compare' into v1.8 2021-03-26 18:04:17 +08:00
Captain.B e26561e464 feat(性能测试): 测试报告支持对比 2021-03-26 18:03:58 +08:00
fit2-zhao 8f06031cec fix(测试跟踪): 点击树菜单,列表恢复到列表 2021-03-26 18:03:00 +08:00