test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
6,726 Commits 43 Branches 170 Tags 411 MiB
Commit Graph

6726 Commits

Author SHA1 Message Date
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 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
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 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
song.tianyang 64263c2cdb 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:02:08 +08:00
song.tianyang c1416fe407 fix: 测试用例，选中【选择所有数据】，翻页后发现第2页之后的数据并没有被选中 
测试用例，选中【选择所有数据】，翻页后发现第2页之后的数据并没有被选中
 2021-03-26 17:47:43 +08:00
wenyann d12ec06066 fix: 测试跟踪用例重复显示 2021-03-26 17:16:08 +08:00
chenjianxing cc5ff944d1 refactor: 重构模式搜索框 2021-03-26 17:06:22 +08:00
fit2-zhao 12f1c60a0f Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-26 16:29:35 +08:00
fit2-zhao dda1217c1a fix(接口自动化): 修复导入场景步骤请求 ip 和端口 是变量的问题 2021-03-26 16:29:18 +08:00
Captain.B b29d302ad2 refactor(性能测试): 测试报告统计标题 KO -> FAIL 2021-03-26 14:21:13 +08:00
shiziyuan9527 f5796eb602 fix(测试跟踪): 修复首页跳转问题 2021-03-26 14:14:40 +08:00
Captain.B 371628ba54 fix: 处理冲突 2021-03-26 14:10:04 +08:00
Captain.B cb4ad5bca4 Merge branch 'master' into compare 
# Conflicts:
#	frontend/src/i18n/en-US.js
#	frontend/src/i18n/zh-CN.js
#	frontend/src/i18n/zh-TW.js
 2021-03-26 14:04:21 +08:00
Captain.B 6fcc8536d0 chore: sync 2021-03-26 14:00:34 +08:00
wenyann deaf05dd5f fix:修复编辑用例js报错 2021-03-26 13:14:43 +08:00
fit2-zhao e903441002 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-26 11:21:52 +08:00
fit2-zhao ba76c82851 fix(接口自动化): 修复复制场景，场景变量不能编辑问题 2021-03-26 11:21:38 +08:00
Captain.B 5ebe6756df Merge branch 'v1.8' 2021-03-26 09:52:39 +08:00
Captain.B 767faf9dfe fix: 尝试修复表格固定列之后错乱的问题 2021-03-26 09:52:03 +08:00
fit2-zhao 6257fce4a9 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-25 19:34:48 +08:00
Captain.B 4cf1dd112b Merge branch 'v1.8' 2021-03-25 19:26:55 +08:00
Captain.B ef6c7ae83c chore: sync 2021-03-25 19:26:42 +08:00
Captain.B 612d8438c9 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-25 19:25:24 +08:00
Captain.B b4bb64f9da fix(性能测试): 修复最大并发数没有按照资源池来限制的bug 
Closes #1708
 2021-03-25 19:25:08 +08:00
fit2-zhao 0bbd35a493 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-25 18:40:17 +08:00
fit2-zhao 12a32b8bc4 fix(接口自动化): 修复场景移动后，移动到的模块名称不能修改问题 2021-03-25 18:40:11 +08:00
shiziyuan9527 a8b54c9d74 refactor: 打开环境配置时默认选中当前配置 2021-03-25 18:33:03 +08:00
song.tianyang dfc24d96a4 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-25 18:25:33 +08:00
song.tianyang e3e799acf9 fix: 接口定义请求内容为 XML RAW 格式时文档模式报错 
接口定义请求内容为 XML RAW 格式时文档模式报错
 2021-03-25 18:25:21 +08:00
fit2-zhao 150cb57836 fix(接口自动化): 修复 csv 路径校验问题 2021-03-25 18:19:42 +08:00
fit2-zhao c5ab6d6395 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-25 18:14:23 +08:00
Captain.B 6c89cc6296 Merge remote-tracking branch 'origin/master' 2021-03-25 18:14:00 +08:00
fit2-zhao d6a0feb4fa fix(接口自动化): 修复jmx导入其他选项不能编辑问题 2021-03-25 18:13:53 +08:00
Captain.B 1879984912 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-25 18:12:14 +08:00
Captain.B 683430ec8d refactor: jmeter 版本升级 2021-03-25 18:11:58 +08:00
fit2-zhao c43a258780 fix(接口自动化): 修复jmx导出消息体数据类型设置错误问题 2021-03-25 17:53:26 +08:00
fit2-zhao 5379c8b763 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-25 17:23:45 +08:00
fit2-zhao f0492e1346 fix(接口自动化): 修改场景报告名称长度 2021-03-25 17:23:30 +08:00
song.tianyang 24c9b5d0a1 fix: 文档不超过5个数据时下滚出现问题 
文档不超过5个数据时下滚出现问题
 2021-03-25 17:02:59 +08:00
wenyann 8f4870dd84 Merge remote-tracking branch 'origin/master' 2021-03-25 17:02:55 +08:00