Commit Graph

1393 Commits

Author SHA1 Message Date
fit2-zhao 6ebac26151 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-27 11:29:26 +08:00
fit2-zhao 3476c93bea feat(接口测试): 添加提取变量的结果数据展示 2020-09-27 11:29:17 +08:00
wenyann d30cb9246a Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-27 11:26:52 +08:00
wenyann 666532bd8c fix: 重构邮箱代码,修复一键运行报错 2020-09-27 11:26:28 +08:00
chenjianxing fa307f8be3 merge master 2020-09-25 20:53:54 +08:00
chenjianxing 5275a708b3 fix(测试跟踪): 关联接口测试报错 2020-09-25 20:39:18 +08:00
q4speed e7f8c25a70 feat(接口测试): 报告里增加请求开始时间 2020-09-25 17:25:13 +08:00
shiziyuan9527 9e8a8d9caf fix(用例评审): 修复用例评审获取评论时会出现的空指针问题 2020-09-25 14:59:45 +08:00
shiziyuan9527 236e572d9b fix(测试计划): 修改测试计划所属项目 2020-09-25 14:46:43 +08:00
Captain.B f7acb158a0 Merge remote-tracking branch 'origin/master' into master 2020-09-25 14:03:23 +08:00
Captain.B cdfadc7091 refactor: 去掉不用的类 2020-09-25 14:03:08 +08:00
chenjianxing 7b69571840 Merge branch 'master' of https://github.com/metersphere/server 2020-09-25 13:59:54 +08:00
chenjianxing 3813cdc120 fix(接口测试): 修复文件上传参数值勾选等问题 2020-09-25 13:59:45 +08:00
wenyann 6edbd5af27 fix: 修改类的位置 2020-09-25 13:13:16 +08:00
wenyann 8cd9371b3d fix: 修复冲突 2020-09-25 11:42:42 +08:00
wenyann b9f4fa628b fix: 修复冲突 2020-09-25 11:40:53 +08:00
wenyann e145abc57e Merge remote-tracking branch 'origin/master'
# Conflicts:
#	backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
#	backend/src/main/java/io/metersphere/notice/controller/NoticeController.java
#	backend/src/main/java/io/metersphere/notice/service/MailService.java
#	backend/src/main/java/io/metersphere/notice/service/NoticeService.java
2020-09-25 11:25:35 +08:00
wenyann 761ceaf186 fix: 添加评审和报告链接,增加性能测试通知功能 2020-09-25 11:02:24 +08:00
Captain.B fe019babdf refactor: 发送邮件代码重构 2020-09-25 10:44:01 +08:00
Captain.B c4f1e23291 refactor: 发送邮件代码重构 2020-09-25 10:23:08 +08:00
Captain.B b5ea0a3d50 refactor: 发送邮件代码重构 2020-09-25 10:22:18 +08:00
Captain.B 7c04ac5f92 refactor: 发送邮件代码重构 2020-09-25 10:01:01 +08:00
BugKing cbcc5b0c84 fix(flyway): 修复版本冲突 2020-09-25 09:34:48 +08:00
chenjianxing cc364cf1fc Merge branch 'master' of https://github.com/metersphere/server 2020-09-24 18:42:18 +08:00
chenjianxing 4093f39b58 feat(系统设置): 增加当前站点配置 2020-09-24 18:42:05 +08:00
wenyann 6aa78a33af fix: 修复邮件变量没有替换的问题 2020-09-24 17:54:04 +08:00
BugKing aeccceca76 feat(测试跟踪): 增加测试计划相关flyway 2020-09-24 17:54:04 +08:00
fit2-zhao f9d7e09d1f refactor(测试跟踪): 相关校验进行重构 2020-09-24 17:54:04 +08:00
xuxm 399df44978 update:增加test_plan表插入新增实际字段的逻辑 2020-09-24 17:54:04 +08:00
xuxm 96dc485e77 update:增加test_plan增加字段的定义 2020-09-24 17:54:04 +08:00
xuxm 8da67954ea update:增加test_plan表增加字段的维护 2020-09-24 17:54:04 +08:00
xuxm f0bc93176e update:增加test_plan增加字段的定义 2020-09-24 17:54:04 +08:00
wenyann 5212d4b723 fix: 修复邮件变量没有替换的问题 2020-09-24 17:50:04 +08:00
wenyann 117786310e fix: 修改邮件发送空指针异常 2020-09-24 16:56:35 +08:00
Captain.B 7f28d4b8aa refactor: 发送邮件代码重构 2020-09-24 16:17:55 +08:00
Captain.B e944120624 Merge branch 'temp' into master 2020-09-24 16:12:58 +08:00
Captain.B a3e9059e24 refactor: 发送邮件代码重构 2020-09-24 16:12:16 +08:00
shiziyuan9527 fdb593be58 feat(用例评审): 非用例评审人员不可取消或关联用例 2020-09-24 15:15:38 +08:00
wenyann c04a4049c5 fix: i18n 2020-09-24 11:39:42 +08:00
q4speed b34e279269 fix(接口测试): 修复dubbo和sql请求不能添加控制器的bug 2020-09-23 16:49:10 +08:00
wenyann 94748c71c0 Merge remote-tracking branch 'origin/master' 2020-09-23 16:06:03 +08:00
wenyann 72e653ae41 feat: 测试评审任务添加评论通知用例维护人 2020-09-23 16:05:28 +08:00
shiziyuan9527 8028fdcd5f fix(用例评审): 修复开始评审后按钮不可点击的问题 2020-09-23 14:01:16 +08:00
chenjianxing 7338513ec2 refactor: 代码优化 2020-09-23 11:55:15 +08:00
wenyann 8e19cc9ca3 Merge remote-tracking branch 'origin/master' 2020-09-23 11:47:09 +08:00
wenyann f73a81da66 feat: 测试评审任务添加评论和完成通知 2020-09-23 11:46:49 +08:00
q4speed 5b5a8a7acd refactor(XPack): update submodule 2020-09-23 11:40:21 +08:00
fit2-zhao 5ad828ec05 fix(XPack): 修复被重构丢失的代码引发的问题 2020-09-23 09:59:33 +08:00
fit2-zhao f28e0c7229 fix(XPack): 恢复被误删的类 2020-09-23 09:41:09 +08:00
q4speed 569b01f589 refactor(XPack): License接口都放到XPack内 2020-09-22 21:29:53 +08:00