Commit Graph

6241 Commits

Author SHA1 Message Date
shiziyuan9527 b08a524f2a fix: 修复顶部菜单样式 2021-03-11 17:31:57 +08:00
Captain.B 4557e1905d fix(性能测试): 查看报告的时候不能点击线程类型 2021-03-11 17:26:18 +08:00
Captain.B 84895e7d34 chore: sync 2021-03-11 17:22:03 +08:00
Captain.B f49e0ce771 Merge remote-tracking branch 'origin/master' 2021-03-11 17:21:12 +08:00
Captain.B d92f04c1bd refactor(性能测试): 性能测试压力预览图修改 2021-03-11 17:20:50 +08:00
fit2-zhao 7dfa50d348 fix(接口定义): 保存用例最后执行环境 2021-03-11 17:03:29 +08:00
shiziyuan9527 6500e0cf4a Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	frontend/src/business/components/xpack
2021-03-11 16:46:58 +08:00
shiziyuan9527 56e9399595 feat(系统设置): 修改配色 2021-03-11 16:38:40 +08:00
song.tianyang 9f33d88d3a Merge remote-tracking branch 'origin/master' 2021-03-11 16:36:42 +08:00
song.tianyang 2a29e611b5 feat: 接口自动化模块Har文件导入
接口自动化模块Har文件导入
2021-03-11 16:34:14 +08:00
wenyann 0d1d1acd3d fix:修复测试报告不存在 2021-03-11 16:32:47 +08:00
fit2-zhao be133b3cc6 fix(接口自动化,接口定义): 修复列表数据放到回收站再恢复时状态错误问题 2021-03-11 15:56:54 +08:00
wenyann 6b46f3120b Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 14:14:29 +08:00
Captain.B b9be1ddd0e refactor(性能测试): 增加上传资源文件的类型, 合并 csv 和 jar 的保存方式统一使用 resourceFiles 2021-03-11 14:12:49 +08:00
wenyann 8fd1ddbf2b Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 14:10:33 +08:00
Captain.B b93fac0ee5 Merge remote-tracking branch 'origin/master' 2021-03-11 14:08:40 +08:00
wenyann c4c33921b9 fix: 创建测试用例修改 2021-03-11 14:07:08 +08:00
Captain.B 353e6bed77 refactor(性能测试): 增加上传资源文件的类型, 合并 csv 和 jar 的保存方式统一使用 resourceFiles 2021-03-11 14:05:52 +08:00
wenyann 0e3a26cbb5 fix:创建测试用例修改 2021-03-11 14:05:32 +08:00
fit2-zhao aef40557cb Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 14:03:49 +08:00
fit2-zhao ae7de6edd1 refactor(接口定义): 删除无用js文件 2021-03-11 14:01:09 +08:00
Captain.B 496816d288 chore: sync 2021-03-11 13:56:58 +08:00
Captain.B db8e075f9e refactor(性能测试): 增加上传资源文件的类型 2021-03-11 13:56:31 +08:00
fit2-zhao 448c14138b Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 13:51:07 +08:00
fit2-zhao 6b76d62bdb fix(接口自动化): 每个请求显示执行结果 2021-03-11 13:30:37 +08:00
Captain.B 3392ae6cb3 fix: socket 链接不用经过csrf 2021-03-11 11:47:20 +08:00
fit2-zhao 5bd68a8234 fix: 恢复误提交引用 2021-03-11 11:40:42 +08:00
song.tianyang 0380567fe4 feat: Har文件导入
Har文件导入
2021-03-11 11:40:15 +08:00
Captain.B 061966ce36 fix: socket 链接不用经过csrf 2021-03-11 11:28:01 +08:00
Captain.B 511278843d Merge remote-tracking branch 'origin/master' 2021-03-11 10:57:57 +08:00
Captain.B 0f5d79fb52 feat(性能测试): 提供手动设置报告聚合时间 2021-03-11 10:55:36 +08:00
chenjianxing dc0cc7425a feat: 添加脑图 2021-03-10 21:35:19 +08:00
chenjianxing e3bb866969 refactor: 抽取tabButton组件 2021-03-10 20:54:47 +08:00
shiziyuan9527 82b2a6cf6a fix(接口自动化): 执行调试前检查环境配置 2021-03-10 18:05:18 +08:00
Captain.B e11e59a256 fix: 不设置csrfToken提示错误 2021-03-10 17:48:38 +08:00
Captain.B cc16006b37 Merge remote-tracking branch 'origin/master' 2021-03-10 17:30:53 +08:00
Captain.B 808f9de68b fix: 跳转到 / 不用校验csrf 2021-03-10 17:30:13 +08:00
shiziyuan9527 75c4e672f6 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-10 17:23:03 +08:00
shiziyuan9527 78db8d3b59 fix(接口自动化): 自定义请求环境配置问题 2021-03-10 17:21:38 +08:00
Captain.B 7c40fa3377 fix: 没有登录不需要校验csrf 2021-03-10 16:56:19 +08:00
Captain.B 9de992a91c chore: sync 2021-03-10 15:49:43 +08:00
Captain.B 5a632c7141 Merge remote-tracking branch 'origin/master' 2021-03-10 15:48:33 +08:00
Captain.B 076baff321 refactor: 使用csrf拦截器过滤请求, 如果配置了 referer.urls 则同时校验 referer
Closes #1088
2021-03-10 15:27:17 +08:00
Captain.B 7e6a08bef2 refactor: 使用csrf拦截器过滤请求
Closes #1088
2021-03-10 15:02:30 +08:00
shiziyuan9527 e1d18909e2 fix(接口自动化): 添加场景到测试计划时未选择环境 2021-03-10 14:15:01 +08:00
fit2-zhao 842cf07ccf refactor(XPack): 报表路由同样命名 2021-03-10 13:48:57 +08:00
fit2-zhao 0a0fe75c86 fix: 解决控制台mouseleave 时警告问题 2021-03-10 11:29:44 +08:00
fit2-zhao f511b38e91 fix(场景自动化): 修复循环控制器不能添加引用场景问题 2021-03-10 11:25:22 +08:00
fit2-zhao b9d43558bc Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-10 11:15:29 +08:00
fit2-zhao c5d58d40c3 feat(接口定义): JSONpath 断言增加操作符 2021-03-10 11:14:31 +08:00