Captain.B
|
948f6fc9d2
|
refactor: 尝试解决jetty后台报错的问题
|
2020-09-29 10:46:02 +08:00 |
|
Captain.B
|
08a0408b5f
|
Merge remote-tracking branch 'origin/v1.3' into v1.3
|
2020-09-29 10:23:25 +08:00 |
|
Captain.B
|
436914947b
|
refactor: 继续重构通知部分
|
2020-09-29 10:21:55 +08:00 |
chenjianxing
|
2659818d95
|
merge v1.3
|
2020-09-29 10:05:54 +08:00 |
fit2-zhao
|
2e70bab362
|
style(接口测试): 去除多余import
|
2020-09-28 15:43:41 +08:00 |
|
fit2-zhao
|
bc94f1cedb
|
fix(接口测试): 保持线程变量的生命周期一致性
|
2020-09-28 15:41:38 +08:00 |
shiziyuan9527
|
d95ded1f38
|
refactor: i18n
|
2020-09-28 15:04:31 +08:00 |
|
fit2-zhao
|
ce7eb2391e
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2020-09-28 15:02:21 +08:00 |
|
fit2-zhao
|
abcd4b299b
|
refactor(接口测试): 重写提取方法
|
2020-09-28 15:02:12 +08:00 |
|
chenjianxing
|
3ca92d1a9c
|
fix(测试跟踪): 测试计划开始结束时间无法修改
|
2020-09-28 11:59:12 +08:00 |
|
fit2-zhao
|
34a0f005f3
|
fix(接口测试): 完善提取功能
|
2020-09-28 10:48:05 +08:00 |
|
fit2-zhao
|
ccd209880f
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2020-09-28 10:46:49 +08:00 |
wenyann
|
39f1d77464
|
fix:评审内容修改
|
2020-09-27 21:02:12 +08:00 |
|
chenjianxing
|
20b88800e0
|
merge origin
|
2020-09-27 20:36:54 +08:00 |
|
chenjianxing
|
7e97818cf2
|
Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3
|
2020-09-27 20:35:37 +08:00 |
|
chenjianxing
|
8770ed47f9
|
fix(测试跟踪): 用例导入导出国际化问题
|
2020-09-27 20:35:24 +08:00 |
|
fit2-zhao
|
5f8c7ef45d
|
fix(接口测试): 修复提取变量相关问题
|
2020-09-27 19:42:13 +08:00 |
|
shiziyuan9527
|
95293a7377
|
Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3
|
2020-09-27 18:43:44 +08:00 |
|
shiziyuan9527
|
5e8e533c93
|
refactor(用例评审): 修改多选样式
|
2020-09-27 18:43:24 +08:00 |
|
Captain.B
|
6b53db6a7e
|
Merge branch 'v1.3' of github.com:metersphere/metersphere into v1.3
|
2020-09-27 18:14:27 +08:00 |
|
Captain.B
|
d44cc8d16e
|
refactor: 使用StringUtils对比字符串
|
2020-09-27 18:14:19 +08:00 |
|
fit2-zhao
|
a934214100
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2020-09-27 18:03:02 +08:00 |
|
fit2-zhao
|
7bccd9f502
|
fix(测试跟踪): 修复未能导入没有用例的空模块问题
|
2020-09-27 18:00:34 +08:00 |
|
fit2-zhao
|
3ab95127c1
|
refactor(接口测试): 重构提取方法
|
2020-09-27 17:08:16 +08:00 |
|
wenyann
|
977182a193
|
Merge remote-tracking branch 'origin/v1.3' into v1.3
|
2020-09-27 16:47:22 +08:00 |
|
wenyann
|
6916b376d0
|
fix: 链接类型修改
|
2020-09-27 16:47:02 +08:00 |
|
chenjianxing
|
479528d6a7
|
fix: 解决v1.3.0升级报错
|
2020-09-27 16:07:41 +08:00 |
|
chenjianxing
|
02cffc3447
|
Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3
|
2020-09-27 15:09:23 +08:00 |
|
chenjianxing
|
85e320910e
|
fix(接口测试): 修复请求头删除报错
|
2020-09-27 15:09:07 +08:00 |
|
Captain.B
|
7d91d48fa4
|
refactor: 重构邮件通知部分
|
2020-09-27 14:57:53 +08:00 |
|
Captain.B
|
6fa096f319
|
refactor: 重构邮件通知部分
|
2020-09-27 14:45:57 +08:00 |
|
Captain.B
|
ecd95efb6a
|
Merge remote-tracking branch 'origin/v1.3' into v1.3
|
2020-09-27 14:41:40 +08:00 |
|
Captain.B
|
5ae9f9a2df
|
refactor: 重构邮件通知部分
|
2020-09-27 14:41:04 +08:00 |
|
shiziyuan9527
|
5927f0fc2b
|
Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3
|
2020-09-27 14:16:08 +08:00 |
|
Captain.B
|
22b0a423bd
|
fix: 修复notice没有主键及相关问题
|
2020-09-27 14:14:17 +08:00 |
|
shiziyuan9527
|
b63eef6e87
|
Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3
|
2020-09-27 14:10:58 +08:00 |
|
fit2-zhao
|
561ece01e8
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2020-09-27 14:10:55 +08:00 |
|
fit2-zhao
|
364c008351
|
refactor(接口测试): 重构提取内容相关方法
|
2020-09-27 14:10:47 +08:00 |
|
shiziyuan9527
|
10c9d73b5d
|
fix(测试计划): 修复关闭缺陷时会把缺陷删除的问题
|
2020-09-27 14:09:44 +08:00 |
|
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 |
|
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 |
|
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 |