Commit Graph

3231 Commits

Author SHA1 Message Date
song.tianyang dc1ef10180 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
#	frontend/src/i18n/en-US.js
#	frontend/src/i18n/zh-CN.js
#	frontend/src/i18n/zh-TW.js
2021-03-23 17:28:07 +08:00
song.tianyang d83df6e1cc feat: ESB接口导入和模板下载
ESB接口导入和模板下载
2021-03-23 17:25:20 +08:00
shiziyuan9527 79e11e651a fix(场景自动化): 查看场景时报空指针异常 2021-03-23 17:03:00 +08:00
Captain.B 8c965b2486 refactor: 使用shiro的session过期方式 2021-03-23 15:56:33 +08:00
Captain.B ed39f30328 fix: 修复编辑测试计划没有更新tags的bug 2021-03-23 15:53:05 +08:00
fit2-zhao 00af593531 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-23 15:07:12 +08:00
fit2-zhao 27f9f34be3 fix(接口定义): 批量执行记录最后执行环境 2021-03-23 15:06:57 +08:00
shiziyuan9527 a072f3992d fix(测试计划): 失败用例统计未包含阻塞用例 2021-03-23 14:39:31 +08:00
fit2-zhao 6761a96f15 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-23 13:54:22 +08:00
fit2-zhao 1be8ab1cac fix(接口自动化,接口定义): 回收站增加批量恢复功能 2021-03-23 13:54:04 +08:00
shiziyuan9527 39f48e3583 fix(测试跟踪): 修复首页跳转 2021-03-23 11:40:52 +08:00
fit2-zhao 4978b9381f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-23 11:11:24 +08:00
fit2-zhao 5b87b34071 fix(接口自动化): 解决while循环 超时时间影响后一个请求不执行问题修复 2021-03-23 11:11:08 +08:00
shiziyuan9527 6351bd9f26 fix(测试跟踪): 修复首页数据展示 2021-03-23 10:56:25 +08:00
shiziyuan9527 d8dd87f356 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-23 10:25:38 +08:00
wenyann 9a7f3cca3b fix:表格错位问题,添加逐条评审 2021-03-23 10:24:46 +08:00
shiziyuan9527 41bf5c6b15 fix(测试跟踪): 修复附件预览失败的问题 2021-03-23 10:24:29 +08:00
wenyann 8bc9bdc6bc Merge remote-tracking branch 'origin/master' 2021-03-23 10:23:53 +08:00
wenyann 56b58ce9cd fix:表格错位问题,添加逐条评审 2021-03-23 10:23:31 +08:00
Captain.B e740efadf2 Merge remote-tracking branch 'origin/master' 2021-03-23 10:13:56 +08:00
chenjianxing f1bcddd0ce Merge branch 'master' of github.com:metersphere/metersphere 2021-03-23 10:12:20 +08:00
Captain.B 3c05d1c486 fix: 修复CSRF-TOKEN过期时没有跳转到登录页的问题 2021-03-23 10:12:19 +08:00
chenjianxing 42023ee85a refactor: swagger2.0 增加base-url 2021-03-23 10:12:08 +08:00
Ambitiousliga 9b87e41ec6
fix(测试跟踪):关联用例后增加“责任人”字段,便于识别用例原本的责任人。 (#1684)
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
2021-03-22 21:59:05 +08:00
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 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 6ee30d97bf fix: 修复XStream安全漏洞
Closes #1671
2021-03-22 18:28:20 +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
shiziyuan9527 a0d6e056a2 fix(测试跟踪): 修复首页数据不正确 2021-03-22 17:58:52 +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
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