Commit Graph

4118 Commits

Author SHA1 Message Date
chenjianxing 992b367f53 fix: 解决冲突 2020-12-16 17:04:45 +08:00
chenjianxing 7d1296b6d0 refactor: 重构apicaselist 2020-12-16 17:01:31 +08:00
wenyann 8342b10f0a Merge remote-tracking branch 'origin/master' 2020-12-16 16:38:59 +08:00
wenyann 09fabf35f2 fix:placeholder 2020-12-16 16:38:22 +08:00
fit2-zhao 3d1b39e592 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-16 16:38:03 +08:00
fit2-zhao ee82f669c3 refactor(接口定义): 接口执行历史保留 2020-12-16 16:37:42 +08:00
shiziyuan9527 1bfeaa2c07 fix: 修复路由跳转 2020-12-16 16:07:58 +08:00
shiziyuan9527 d4f28df3b9 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-16 15:44:09 +08:00
fit2-zhao daaf8eb0d2 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-16 15:31:15 +08:00
fit2-zhao 48e6e82451 fix(接口自动化): 测试报告优化 2020-12-16 15:30:34 +08:00
wenyann 98459d6d5e fix:placeholder 2020-12-16 14:44:08 +08:00
shiziyuan9527 62b02eeb81 refactor: 删除无用代码 2020-12-16 14:38:13 +08:00
shiziyuan9527 0b38df4576 fix: 修复切换项目后路由跳转问题 2020-12-16 14:35:30 +08:00
fit2-zhao a73b202551 feat(接口自动化): 增加外部导入到场景功能 2020-12-16 14:27:35 +08:00
fit2-zhao 86c6254d48 feat(接口自动化): 增加外部导入到场景功能 2020-12-16 14:14:00 +08:00
fit2-zhao 00415e6084 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-16 13:02:13 +08:00
fit2-zhao 0ff2be302d feat(接口定义): 增加批量方法 2020-12-16 13:01:39 +08:00
BugKing 1e73fd61cc refactor: 去掉 jmeter 镜像相关内容移到单独仓库
https://github.com/metersphere/jmeter-image
2020-12-16 11:40:43 +08:00
shiziyuan9527 8fb6dad103 refactor: 切换项目组件 2020-12-16 10:54:14 +08:00
chenjianxing c3ae4e9e02 fix: 场景编辑报错 2020-12-16 10:31:09 +08:00
chenjianxing 884fc213dd fix: 接口自动化报错 2020-12-15 20:42:06 +08:00
chenjianxing 1344e94e94 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-15 20:22:07 +08:00
chenjianxing 5d29fc6730 fix: 测试计划用例列表报错 2020-12-15 20:21:52 +08:00
fit2-zhao 4bda8a0daa Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-15 19:26:49 +08:00
fit2-zhao dc84ec2542 feat(接口自动化): 外部导入 2020-12-15 19:26:30 +08:00
wenyann 804b264acd fix:x-pack 2020-12-15 19:10:31 +08:00
fit2-zhao 4adb65bb61 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-15 19:02:54 +08:00
fit2-zhao 43fbccb2a6 fix(接口自动化): 修复创建场景问题 2020-12-15 19:02:35 +08:00
chenjianxing aac346b226 fix: 解决冲突 2020-12-15 18:19:23 +08:00
chenjianxing 07d3ae45d0 refactor: 接口自动化模块树重构 2020-12-15 18:17:23 +08:00
fit2-zhao ff9ecf6ec3 fix(接口自动化): 修复报告问题 2020-12-15 17:43:42 +08:00
Captain.B a0c9e3db79 chore: 同步模块 2020-12-15 16:48:14 +08:00
chenjianxing 43a7912fc9 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-15 16:25:21 +08:00
chenjianxing 77ea5d43fd refactor: 接口定义模块树重构 2020-12-15 16:25:00 +08:00
fit2-zhao 880add8544 fix(接口自动化): 请求校验 2020-12-15 15:33:50 +08:00
shiziyuan9527 e5b007764f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-15 15:10:39 +08:00
shiziyuan9527 66b9962919 refactor: 创建测试时选中默认项目 2020-12-15 15:08:59 +08:00
wenyann 0590e92890 Merge remote-tracking branch 'origin/master' 2020-12-15 15:07:52 +08:00
wenyann 97bb62a9c4 fix: 修复模版为空时保存报错 2020-12-15 15:07:16 +08:00
Captain.B 18310dcec3 Merge remote-tracking branch 'origin/master' into master 2020-12-15 15:00:27 +08:00
Captain.B 9d3aec66a8 refactor: 修改执行脚本 2020-12-15 14:59:51 +08:00
fit2-zhao a3ccde7ea6 fix(接口自动化): 修复执行选择环境问题 2020-12-15 14:40:39 +08:00
fit2-zhao cdbaa1c208 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-15 14:22:05 +08:00
fit2-zhao c85cd23fc0 fix(接口自动化): 部分缺陷修复 2020-12-15 14:21:13 +08:00
wenyann df142d65f4 fix: 修复嵌套弹出框被遮罩层挡住 2020-12-15 14:18:05 +08:00
wenyann e6f51717a2 Merge remote-tracking branch 'origin/master' 2020-12-15 14:02:44 +08:00
wenyann bf5b4fc4c6 feat(API):修改切回新旧版按钮显隐 2020-12-15 14:02:00 +08:00
Captain.B 23aaaa54ba Merge remote-tracking branch 'origin/master' into master 2020-12-15 13:57:25 +08:00
Captain.B e32ff12d22 refactor: 使用k8s资源池 2020-12-15 13:56:23 +08:00
fit2-zhao f51af8a0ff Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-15 11:43:35 +08:00