Commit Graph

1444 Commits

Author SHA1 Message Date
wenyann f3e8667fbf fix: 重构邮箱代码,修复一键运行报错
(cherry picked from commit 666532bd8c)
2020-09-27 13:19:11 +08:00
Captain.B 45779f5480 Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-09-27 11:44:18 +08:00
Captain.B 6cc36f69bd refactor: 用户密码字段脱敏 2020-09-27 11:43:59 +08:00
shiziyuan9527 7bca400593 Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3 2020-09-27 11:32:11 +08:00
shiziyuan9527 228bac8277 fix(测试计划): 修复选中一条用例时不显示更多操作按钮的问题 2020-09-27 11:31:44 +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
q4speed 22020e48d0 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-22 21:10:32 +08:00
fit2-zhao 8f807044ad fix(XPack): license 验证缺陷修复 2020-09-22 19:48:44 +08:00
shiziyuan9527 d370a5bb7b fix(用例评审): 编辑用例评审时出现的问题 2020-09-22 18:37:18 +08:00
wenyann 4d374fcc4f fix:修复一键运行报错 2020-09-22 18:05:05 +08:00
q4speed 8bdfeced41 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-22 17:13:13 +08:00
shiziyuan9527 c128021dc3 fix(测试跟踪): 删除测试用例时删除关联的评论 2020-09-22 15:32:04 +08:00
wenyann 24bfb51f79 Merge remote-tracking branch 'origin/master' 2020-09-22 15:02:33 +08:00
wenyann 629ec87958 feat: 测试评审任务发起通知 2020-09-22 15:01:41 +08:00
chenjianxing 1d2ef25f39 Merge branch 'master' of https://github.com/metersphere/server 2020-09-22 14:56:36 +08:00
chenjianxing 968ff5f470 feat(性能测试): 导出性能测试报告 2020-09-22 14:56:25 +08:00
q4speed 6eaec2972a Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-22 14:39:18 +08:00
q4speed 3b2059de14 refactor(XPack): update submodule 2020-09-22 14:39:08 +08:00
shiziyuan9527 178e22dca8 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-22 14:35:54 +08:00
shiziyuan9527 a88f81de2e fix(用例评审): 删除评审时删除关联的用例 2020-09-22 14:35:25 +08:00
fit2-zhao c46b8dccb6 style(测试跟踪): 统一util对象 2020-09-22 14:33:17 +08:00
q4speed a52ae19526 Merge remote-tracking branch 'origin/master' 2020-09-22 14:27:21 +08:00
fit2-zhao fa9aec151f style(XPack): 代码写法规范化 2020-09-22 14:19:36 +08:00
fit2-zhao b65a571a51 style(测试跟踪): 优化格式 2020-09-22 13:32:01 +08:00
fit2-zhao 9e785552cb fix(XPack): dto引用修改 2020-09-22 13:00:47 +08:00
fit2-zhao c089e27ff9 Merge remote-tracking branch 'origin/master' 2020-09-22 12:35:50 +08:00
fit2-zhao e50a952944 refactor(XPack): 认证机制重构,权限修改 2020-09-22 12:35:07 +08:00
shiziyuan9527 9845acf786 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-22 11:45:51 +08:00
shiziyuan9527 74878cd806 refactor: i18n 2020-09-22 11:45:20 +08:00
fit2-zhao 421b522cc6 refactor(测试跟踪): 重构pojo 2020-09-22 11:04:27 +08:00
fit2-zhao 5a385c6d34 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-22 11:03:41 +08:00
fit2-zhao 1e7a1aa83f refactor(测试跟踪): 重构xmind 导入方法 2020-09-22 11:03:14 +08:00
shiziyuan9527 c91ef4b982 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-22 10:51:28 +08:00
shiziyuan9527 d9a9d96342 fix(用例评审): 用例评审列表发起人显示用户名 2020-09-22 10:50:16 +08:00
q4speed 18d3694b3e Merge remote-tracking branch 'origin/master'
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
#	frontend/src/business/components/xpack
2020-09-22 10:49:28 +08:00
q4speed 625a870629 refactor(XPack): update submodule 2020-09-22 10:49:03 +08:00
Captain.B 81bf333e29 Merge branch 'v1.3' into master 2020-09-22 10:41:20 +08:00
chenjianxing c347c1d56d Merge branch 'master' of https://github.com/metersphere/server 2020-09-22 10:36:23 +08:00
chenjianxing e00265b577 feat(测试跟踪): 测试计划报告导出 2020-09-22 10:35:59 +08:00
shiziyuan9527 1c51bc57e9 feat: 测试评审修改评审人和所属项目 2020-09-21 21:19:58 +08:00
q4speed fd24ed1246 refactor(XPack): 同步submodule 2020-09-21 18:02:50 +08:00
wenyann c045db32a5 fix:修改缺陷处理人 2020-09-21 14:09:04 +08:00
BugKing 7d2b2a4cc9 refactor: 修改版本号 2020-09-21 10:28:24 +08:00
shiziyuan9527 3751cebd7e feat: 用例评审flyway 2020-09-20 12:17:37 +08:00
shiziyuan9527 18a68f3041 feat(测试跟踪): 测试跟踪首页我的评审 2020-09-20 09:48:25 +08:00
shiziyuan9527 ef33833794 feat(测试跟踪): 用例评审 2020-09-19 23:52:09 +08:00
shiziyuan9527 b9579d61a0 feat(测试跟踪): 保存评审结果 2020-09-19 11:52:49 +08:00
shiziyuan9527 3135bf3406 feat(测试跟踪): 用例评审关联测试用例 2020-09-18 23:56:43 +08:00
shiziyuan9527 95b722e86c fix(测试计划): 测试计划修改所属项目时的提示问题 2020-09-18 17:04:50 +08:00
fit2-zhao 1786fb23ec fix(XPack): 合并丢失的I18n提示 2020-09-18 15:12:10 +08:00
chenjianxing 5badcc3a21 Merge branch 'master' of https://github.com/metersphere/server 2020-09-18 11:50:16 +08:00
chenjianxing e3b437827b refactor(接口测试): 支持提取接口到变量 2020-09-18 11:48:46 +08:00
fit2-zhao c5d52a6906 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-18 11:41:25 +08:00
fit2-zhao 56db0e077b refactor(XPack): license增强校验,并对过期时间进行展示 2020-09-18 11:14:44 +08:00
shiziyuan9527 7a6151ab79 feat(测试计划): 测试计划可以修改所属项目 2020-09-18 11:09:37 +08:00