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 |
|
Captain.B
|
4eff4dc4b1
|
Merge branch 'v1.3' into master
|
2020-09-25 09:50:11 +08:00 |
BugKing
|
cbcc5b0c84
|
fix(flyway): 修复版本冲突
|
2020-09-25 09:34:48 +08:00 |
|
Captain.B
|
14d1d29245
|
refactor: 修改用例评审评论页面高度设置
|
2020-09-24 21:59:14 +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 |
|
BugKing
|
e280635f2a
|
Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3
|
2020-09-24 18:34:30 +08:00 |
|
BugKing
|
5e0a79f6a3
|
Merge branch 'master' of https://github.com/metersphere/metersphere into master
|
2020-09-24 18:31:01 +08:00 |
|
BugKing
|
05fd5655c4
|
fix(测试跟踪): 修改测试计划时间选择器样式
|
2020-09-24 18:30:36 +08:00 |
|
wenyann
|
cb646ae95e
|
Merge remote-tracking branch 'origin/master'
|
2020-09-24 17:59:11 +08:00 |
shiziyuan9527
|
305478cd35
|
refactor(测试计划): 修改测试计划所属项目展示样式
|
2020-09-24 17:56:44 +08:00 |
|
wenyann
|
6aa78a33af
|
fix: 修复邮件变量没有替换的问题
|
2020-09-24 17:54:04 +08:00 |
|
BugKing
|
32a723f121
|
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 |
|
xuxm
|
176c038122
|
update：test_plan增加4个字段：planned_start_time、planned_end_time、actual_start_time、actual_end_time
|
2020-09-24 17:54:04 +08:00 |
|
xuxm
|
651ac89cee
|
update：测试计划表单页面增加‘计划开始’，‘计划结束’时间字段
|
2020-09-24 17:54:04 +08:00 |
|
xuxm
|
ea4ce9e276
|
update：增加测试计划列表页面显示“计划开始”，“计划结束”，“实际开始”，“实际结束”
|
2020-09-24 17:54:04 +08:00 |
|
wenyann
|
5212d4b723
|
fix: 修复邮件变量没有替换的问题
|
2020-09-24 17:50:04 +08:00 |
|
shiziyuan9527
|
02dc5331f7
|
fix: 修改测试计划所属项目
|
2020-09-24 17:48:08 +08:00 |
|
BugKing
|
d0d894811d
|
fix(测试跟踪): 修改测试计划时间选择样式
|
2020-09-24 17:24:37 +08:00 |
|
BugKing
|
3575f9db9b
|
feat(测试跟踪): 增加测试计划相关flyway
|
2020-09-24 17:23:45 +08:00 |
|
BugKing
|
6ff237baa7
|
Merge branch 'master' of https://github.com/metersphere/metersphere into master
|
2020-09-24 17:18:01 +08:00 |
|
BugKing
|
6811ac187a
|
feat(测试跟踪): Merge pull request #430 from feiyu0316/master
实现https://github.com/metersphere/metersphere/issues/405
|
2020-09-24 17:17:16 +08:00 |
|
fit2-zhao
|
3e0604c62f
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2020-09-24 17:03:55 +08:00 |
|
fit2-zhao
|
2881767975
|
refactor(测试跟踪): 相关校验进行重构
|
2020-09-24 17:03:23 +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 |
|
BugKing
|
5d17ed6348
|
Merge remote-tracking branch 'temp/master' into master
|
2020-09-24 16:09:59 +08:00 |
|
shiziyuan9527
|
56491903de
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2020-09-24 15:16:33 +08:00 |
|
shiziyuan9527
|
fdb593be58
|
feat(用例评审): 非用例评审人员不可取消或关联用例
|
2020-09-24 15:15:38 +08:00 |
|
Captain.B
|
c6a46ff51b
|
fix: 修复创建新用户偶尔无法登录的报错
|
2020-09-24 15:13:01 +08:00 |
|
Captain.B
|
c0dd85866b
|
Merge remote-tracking branch 'origin/master' into master
|
2020-09-24 14:46:06 +08:00 |
|
Captain.B
|
b9701ab241
|
refactor(性能测试): 性能测试jmeter镜像添加数据库连接的jar
|
2020-09-24 14:45:46 +08:00 |
|
wenyann
|
0954149d62
|
Merge remote-tracking branch 'origin/master'
|
2020-09-24 14:38:51 +08:00 |
|
wenyann
|
4898f1ed53
|
fix:字体字号统一
|
2020-09-24 14:38:13 +08:00 |
|
chenjianxing
|
366265db36
|
fix(接口测试): 场景下无请求控制台报错
|
2020-09-24 14:14:14 +08:00 |
|
chenjianxing
|
b7a4db923c
|
Merge branch 'master' of https://github.com/metersphere/server
|
2020-09-24 13:14:25 +08:00 |