Commit Graph

4208 Commits

Author SHA1 Message Date
wenyann a76a5c3067 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-14 18:12:00 +08:00
BugKing d984d83d05 Merge branch 'master' of https://github.com/metersphere/metersphere into master 2020-12-14 18:07:13 +08:00
wenyann 860a499811 feat(API):添加消息通知默认模版 2020-12-14 18:07:02 +08:00
wenyann cbd94afb45 feat(API):添加消息通知默认模版 2020-12-14 18:06:56 +08:00
BugKing 06a45cbbda fix: 修复查看已有性能测试 SQL 问题 2020-12-14 18:06:55 +08:00
shiziyuan9527 4e2af4a8f5 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-14 18:04:24 +08:00
shiziyuan9527 35ba4f68b9 fix: 修复sql 2020-12-14 18:04:06 +08:00
fit2-zhao 441747a6c2 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-14 18:00:37 +08:00
fit2-zhao 5b378b4475 fix(接口定义): 修改复制名称问题 2020-12-14 18:00:21 +08:00
shiziyuan9527 80a652813f fix: 修复切换项目缺陷 2020-12-14 17:43:57 +08:00
fit2-zhao fd3c8052fc fix(接口定义): 修复执行相关缺陷 2020-12-14 17:35:16 +08:00
fit2-zhao d1e029cdcc fix(接口定义): 修复执行环境缺失问题 2020-12-14 17:21:33 +08:00
fit2-zhao 36acba4121 fix(接口定义): 修复执行环境缺失问题 2020-12-14 17:16:56 +08:00
Captain.B 3314483424 Merge remote-tracking branch 'origin/master' into master 2020-12-14 17:01:10 +08:00
Captain.B a5a8f94cbe fix: 指定注入的 rest template 2020-12-14 17:00:51 +08:00
fit2-zhao 6254ed1fea Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-14 16:58:00 +08:00
fit2-zhao 82248b22da fix(接口定义): 修改Tree 样式问题 2020-12-14 16:57:42 +08:00
shiziyuan9527 7992567189 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-14 16:19:25 +08:00
shiziyuan9527 3af1825a26 feat: 切换项目后显示项目名 2020-12-14 16:17:45 +08:00
Captain.B f1f7472758 Merge remote-tracking branch 'origin/master' into master 2020-12-14 16:15:32 +08:00
Captain.B f10b154a8a fix: 指定注入的 rest template 2020-12-14 16:14:45 +08:00
fit2-zhao 6672c7756e Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-14 16:08:15 +08:00
fit2-zhao 97db3909e8 fix(接口定义): 批量更新完成 2020-12-14 16:07:48 +08:00
Captain.B 2f99251deb fix: 避免前端打包缺少文件 2020-12-14 15:57:56 +08:00
Captain.B 6eb0a46edd Merge remote-tracking branch 'origin/master' into master
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
2020-12-14 15:39:25 +08:00
Captain.B 723d5aa462 fix: 修复开源版显示图片的问题 2020-12-14 15:38:38 +08:00
BugKing 60fc50cf07
docs: 更新 roadmap 2020-12-14 15:02:45 +08:00
fit2-zhao 1efe5b0c2d fix(接口定义): 部分缺陷修复 2020-12-14 14:35:32 +08:00
fit2-zhao cd16ed684b Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-14 12:21:50 +08:00
fit2-zhao 469802030c fix(接口定义): 部分缺陷修复 2020-12-14 12:19:35 +08:00
Captain.B e071f33dbd feat(性能测试-xPack): 增加k8s资源池 2020-12-14 11:42:07 +08:00
fit2-zhao 0bd4675886 feat(接口定义): 案例执行失败详情查看 2020-12-11 19:14:54 +08:00
fit2-zhao 683e4d6b3a Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-11 18:24:41 +08:00
fit2-zhao 9ff168a539 feat(接口自动化): 统一报告头 2020-12-11 18:24:25 +08:00
BugKing 204cf502b5 Merge branch 'master' of https://github.com/metersphere/metersphere into master 2020-12-11 18:14:05 +08:00
BugKing d9d91ebd71 docs: 更新 readme 2020-12-11 18:13:51 +08:00
fit2-zhao 2d381a14fb feat(接口自动化): 统一执行方式 2020-12-11 18:10:18 +08:00
fit2-zhao 4402fcd010 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-11 18:02:51 +08:00
fit2-zhao 7d74605533 fix(接口定义): 缺陷修复 2020-12-11 18:01:38 +08:00
shiziyuan9527 721206ac7f fix: 删除项目后切换当前项目值 2020-12-11 17:33:48 +08:00
fit2-zhao b6401b776f fix(接口定义): 修复执行缺陷 2020-12-11 16:50:49 +08:00
chenjianxing f6d4f6257a Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-11 15:53:26 +08:00
chenjianxing f8a5f249ed refactor: 滚动条样式 2020-12-11 15:52:55 +08:00
fit2-zhao 7da53d84d6 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-11 15:41:48 +08:00
fit2-zhao d4ff468cf9 fix(接口定义): 修复用例加载缺陷 2020-12-11 15:41:33 +08:00
chenjianxing 934db9d33c fix(): 按钮边框颜色调整 2020-12-11 15:18:49 +08:00
chenjianxing d97bcef1a3 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-11 14:42:34 +08:00
chenjianxing 12f6fa6c91 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-11 14:37:03 +08:00
chenjianxing 4b217861af fix: 解决修改请求头后 body 显示错位 2020-12-11 14:36:49 +08:00
shiziyuan9527 928f7bcf7c fix: 登录后未保存当前项目值 2020-12-11 14:36:12 +08:00