Commit Graph

4580 Commits

Author SHA1 Message Date
Captain.B 89714f530e Merge remote-tracking branch 'origin/master' 2020-12-29 11:04:20 +08:00
Captain.B 1f611e3f5c Merge branch 'v1.6' 2020-12-29 11:03:58 +08:00
Captain.B 1154b3ce80 fix: 修改k8s资源池节点验证信息 2020-12-29 11:03:24 +08:00
Captain.B c52fddbe19 refactor: 国际化 not support key 显示具体的key 2020-12-29 10:54:08 +08:00
fit2-zhao 16163203d9 Merge branch 'v1.6' 2020-12-29 10:18:31 +08:00
fit2-zhao 711c787f8d fix(接口自动化): 添加执行时 mock 处理 2020-12-29 09:56:26 +08:00
fit2-zhao f5ea7d25b9 fix(接口自动化): 执行场景非变量的参数不做处理 2020-12-28 19:36:58 +08:00
chenjianxing 8f7a32698f Merge branch 'v1.6' 2020-12-28 17:46:30 +08:00
Captain.B 5d9da617be Merge branch 'v1.6' 2020-12-28 16:52:50 +08:00
fit2-zhao bee13b6b94 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-28 16:14:16 +08:00
fit2-zhao fbeb1ded75 fix(接口自动化): 修复执行单个步骤无公共参数问题 2020-12-28 16:12:55 +08:00
chenjianxing 883fff3808 全局左右拖拽组件 2020-12-28 16:04:52 +08:00
shiziyuan9527 be1779c546 refactor(性能测试): 修改性能测试执行页面文本描述
Closes #939
2020-12-28 15:06:40 +08:00
chenjianxing 8e1d3a3da7 fix: 更新提交 2020-12-28 14:44:46 +08:00
shiziyuan9527 06706736db refactor: sql 2020-12-28 14:29:03 +08:00
Captain.B 271275f4bd chore: Sync 2020-12-28 14:25:07 +08:00
chenjianxing 85b90f3226 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-28 14:20:51 +08:00
chenjianxing f323e737e1 fix: 性能测试列表为空 2020-12-28 14:20:26 +08:00
chenjianxing 5f1adb6d34 fix: 性能测试列表为空 2020-12-28 14:19:49 +08:00
Captain.B 6ee91faf9e Merge remote-tracking branch 'origin/master' 2020-12-28 14:14:28 +08:00
Captain.B d62345fc66 Merge branch 'v1.6' 2020-12-28 14:13:58 +08:00
Captain.B 6dfda405ec Revert "refactor: 用户首次登录后跳转到跟踪页面"
回退提交,如果用户没有权限会陷入死循环

This reverts commit 84208e12
2020-12-28 14:13:31 +08:00
Guan 0163e8673e
refactor(接口测试):接口测试列表宽度改为可拖拽 (#914) 2020-12-28 13:54:52 +08:00
Captain.B 2df5199e64 Merge remote-tracking branch 'origin/master' 2020-12-28 13:50:48 +08:00
luoylove 24e89c2c57
swaggerParser RefProperty bug fix (#994)
Co-authored-by: luoyoujun <luoyoujun3712@dingtalk.com>
2020-12-28 13:47:25 +08:00
Captain.B 0a72802884 fix(性能测试): 测试文件大小用kb计算
Closes #852
2020-12-28 13:43:40 +08:00
Captain.B 79d34a1825 fix(接口测试): 接口测试 url encoder
Closes #872
2020-12-28 13:04:18 +08:00
Captain.B 758677beb5 Merge remote-tracking branch 'origin/v1.6' into v1.6 2020-12-28 12:55:13 +08:00
Captain.B 4cc0fd0e24 fix(接口测试): 接口测试 url encoder
Closes #872
2020-12-28 12:54:48 +08:00
chenjianxing 965f43d9fc Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-28 12:50:58 +08:00
chenjianxing 8696347f4a fix: 测试计划进度没有统计到接口测试用例 2020-12-28 12:49:40 +08:00
Captain.B 84208e1230 refactor: 用户首次登录后跳转到跟踪页面
Closes #96
2020-12-28 11:19:32 +08:00
Captain.B ad982b5e09 fix: 修复火狐icon不能显示的问题 2020-12-28 11:08:17 +08:00
Captain.B dd5b0d9cab chore: Sync 2020-12-28 10:50:01 +08:00
chenjianxing 007ede7069 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-28 10:43:31 +08:00
chenjianxing 08b75e5ddb 解决${}变量请求体格式化问题 2020-12-28 10:43:03 +08:00
shiziyuan9527 e6f5b717b4 feat(接口): 接口相关列表添加ID列 2020-12-25 21:52:52 +08:00
chenjianxing 0d037a9165 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-25 18:24:22 +08:00
fit2-zhao de716c32ab fix(接口自动化): 修复拖拽问题 2020-12-25 18:23:31 +08:00
chenjianxing 7f52b22864 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-25 18:23:19 +08:00
chenjianxing 1c5f83a1b3 refactor: 导出带模块,导入自动生成模块 2020-12-25 18:22:55 +08:00
fit2-zhao 76b3624aac Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-25 18:00:30 +08:00
fit2-zhao ee27fa0c5e fix(接口自动化): 模块同级别排序 2020-12-25 18:00:05 +08:00
fit2-zhao 1e180af32d feat(接口测试): 添加控制台 2020-12-25 16:42:41 +08:00
Captain.B fa5a693d1f refactor: 去掉 $$get 方法 2020-12-25 15:40:28 +08:00
Captain.B 414674d833 fix: 下载jtl国际化的key失败 2020-12-25 14:53:55 +08:00
Captain.B bed8216258 Merge remote-tracking branch 'origin/v1.6' into v1.6 2020-12-25 14:47:15 +08:00
chenjianxing f7a0463eb2 fix: 接口导入 2020-12-25 14:45:35 +08:00
Captain.B f33b3b5343 Merge remote-tracking branch 'origin/v1.6' into v1.6 2020-12-25 14:43:43 +08:00
Captain.B ad550fcab8 fix: 只读用户不能删除报告 2020-12-25 14:42:18 +08:00