Commit Graph

6274 Commits

Author SHA1 Message Date
chenjianxing 352c74d090 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-22 21:57:24 +08:00
chenjianxing b3c6e17cf7 fix: 脑图bug 2021-03-22 21:57:12 +08:00
shiziyuan9527 6fe9101144 fix(测试计划): 去除执行页面无用的字段展示 2021-03-22 21:24:50 +08:00
shiziyuan9527 2fb76d69e8 fix: 修复表格样式 2021-03-22 21:14:56 +08:00
shiziyuan9527 b2eb55d03f fix(系统设置): 修复测试资源池重名检查 2021-03-22 20:36:47 +08:00
song.tianyang a106b22faf Merge remote-tracking branch 'origin/master' 2021-03-22 19:37:51 +08:00
song.tianyang 55488bed12 fix: 更改后台document路径的处理方法值
更改后台document路径的处理方法值
2021-03-22 19:37:40 +08:00
wenyann f2e36b64b8 Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	backend/src/main/resources/db/migration/V78__v1.8_release.sql
2021-03-22 19:13:15 +08:00
wenyann 954b58161e fix: 修复jenkins调用测试计划报告不更新问题 2021-03-22 19:10:12 +08:00
song.tianyang 730f52c5e7 Merge remote-tracking branch 'origin/master' 2021-03-22 18:41:16 +08:00
song.tianyang fdc5fcdcb6 Merge remote-tracking branch 'origin/master' 2021-03-22 18:31:58 +08:00
shiziyuan9527 02a8c2a2e5 fix(测试跟踪): 首页跳转 2021-03-22 18:31:47 +08:00
song.tianyang 8e49e466a5 fix: 场景导入esb案例 报文格式问题处理
场景导入esb案例 报文格式问题处理
2021-03-22 18:31:37 +08:00
Captain.B daac32fb2a Merge remote-tracking branch 'origin/master' 2021-03-22 18:28:36 +08:00
Captain.B 6ee30d97bf fix: 修复XStream安全漏洞
Closes #1671
2021-03-22 18:28:20 +08:00
chenjianxing 30f8e26146 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-22 18:25:43 +08:00
chenjianxing 62959225a1 fix: 脑图创建模块报错提示 2021-03-22 18:25:14 +08:00
Captain.B a1fd1af3f5 Merge remote-tracking branch 'origin/master' 2021-03-22 18:24:01 +08:00
Captain.B d5a0772237 fix: 修复CSRF-TOKEN过期时没有跳转到登录页的问题 2021-03-22 18:23:45 +08:00
chenjianxing 3f04d930d6 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-22 18:16:40 +08:00
shiziyuan9527 a0d6e056a2 fix(测试跟踪): 修复首页数据不正确 2021-03-22 17:58:52 +08:00
chenjianxing 4e10b2eec7 fix: 脑图优先级显示错误 2021-03-22 17:45:06 +08:00
fit2-zhao 5e15166c92 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-22 17:39:21 +08:00
fit2-zhao c532baf241 fix(xPack): 报表筛选条件优化 2021-03-22 17:39:07 +08:00
shiziyuan9527 f0b9b631b5 fix: i18n 2021-03-22 17:33:19 +08:00
fit2-zhao a2bf684ade Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-22 17:23:47 +08:00
fit2-zhao 1619cf2956 fix(xPack): 报表筛选条件优化 2021-03-22 17:23:42 +08:00
Captain.B de139c134a chore: sync 2021-03-22 17:07:56 +08:00
BugKing 05dc583719 Merge branch 'master' of https://github.com/metersphere/metersphere into master 2021-03-22 16:54:45 +08:00
BugKing 3e6c44add8 refactor(测试跟踪): 修改用例列表文本提示 2021-03-22 16:54:34 +08:00
Captain.B c3368ecc82 Merge remote-tracking branch 'origin/master' 2021-03-22 16:48:14 +08:00
Captain.B 8fe70457a5 refactor(性能测试): 加载已有的文件支持查询 2021-03-22 16:47:53 +08:00
fit2-zhao 0fa3c27123 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-22 16:18:39 +08:00
fit2-zhao 2d8423556c fix(场景自动化): 修复添加自定义请求问题,场景变量查看问题 2021-03-22 16:18:29 +08:00
shiziyuan9527 fa0a57a6af feat(测试计划): 执行用例时显示关联测试 2021-03-22 15:44:00 +08:00
Captain.B bb4f30a9a1 fix(性能测试): 修复计算总线程数没有排除禁用的线程组的bug 2021-03-22 15:32:00 +08:00
Captain.B 2e16938c31 Merge remote-tracking branch 'origin/master' 2021-03-22 15:13:50 +08:00
Captain.B 5ca42da5ce refactor(性能测试): k8s job设置反亲和性 2021-03-22 15:13:26 +08:00
BugKing 10f9bdc23c refactor: 规范部分页面文本大小写 2021-03-22 14:47:52 +08:00
chenjianxing 254aa4e63d Merge branch 'master' of github.com:metersphere/metersphere 2021-03-22 14:28:12 +08:00
chenjianxing c41a2950fa fix: 接口定义导入带用例 2021-03-22 14:28:02 +08:00
fit2-zhao 02558f6d66 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-22 14:11:59 +08:00
fit2-zhao ec6a019b62 fix(接口自动化): 修复历史数据升级条件控制器丢失问题 2021-03-22 14:11:40 +08:00
Captain.B 58d7ddbdd5 chore: sync 2021-03-22 14:11:16 +08:00
Captain.B 190c4966b2 Merge remote-tracking branch 'origin/master' 2021-03-22 14:10:39 +08:00
Captain.B 783766220d refactor(性能测试): 增加k8s资源池单pod线程数的配置 2021-03-22 14:10:07 +08:00
song.tianyang 4a12fd797b Merge remote-tracking branch 'origin/master' 2021-03-22 13:55:55 +08:00
song.tianyang bdb3a62e05 fix: 导入har文件优化
使用url进行接口名称命名时,进行转码
2021-03-22 13:49:49 +08:00
Captain.B 82da6b28e3 chore: sync 2021-03-22 13:48:24 +08:00
song.tianyang 75798db693 fix: 导入用户模版优化
导入用户模版优化-修改组织成员所属组织的表达名称
2021-03-22 12:50:58 +08:00