Commit Graph

3204 Commits

Author SHA1 Message Date
chenjianxing 35d392618c Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3 2020-09-29 18:11:26 +08:00
chenjianxing 776ed4252d fix(接口测试): 接口测试导入环境列表显示问题 2020-09-29 18:11:17 +08:00
Captain.B a2483b48d4 Merge branch 'v1.3' into master 2020-09-29 18:03:10 +08:00
fit2-zhao 2b1023b7bb Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3 2020-09-29 18:00:21 +08:00
fit2-zhao a0009de2e6 fix(测试跟踪): 异常格式处理 2020-09-29 18:00:02 +08:00
shiziyuan9527 4797793169 fix(用例评审): i18n 2020-09-29 17:46:52 +08:00
chenjianxing 320978a4de Merge branch 'master' of https://github.com/metersphere/server into v1.3 2020-09-29 17:36:18 +08:00
chenjianxing 38a34b0527 fix(测试跟踪): 修复测试计划列表国际化问题 2020-09-29 17:35:51 +08:00
shiziyuan9527 ee47268c68 feat(测试计划): 测试报告中失败用例支持跳转 2020-09-29 17:32:11 +08:00
chenjianxing 0cf960b7d1 Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3 2020-09-29 17:05:05 +08:00
chenjianxing e2da03f0a3 fix(测试跟踪): 只读用户访问测试跟踪退出登入 2020-09-29 17:04:16 +08:00
fit2-zhao e4a7c2eb34 refactor(测试跟踪): 合并导入所有校验方法 2020-09-29 17:00:58 +08:00
fit2-zhao cb8fb36297 Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3 2020-09-29 16:37:13 +08:00
fit2-zhao 61eaeb45e9 fix(测试跟踪): 导入xmind 模块标题有效性校验 2020-09-29 16:36:59 +08:00
wenyann bd13c3ccb1 fix: 性能测试报告链接id修改 2020-09-29 16:32:57 +08:00
Captain.B 0ce346ddc7 Merge branch 'v1.3' into master 2020-09-29 15:53:19 +08:00
Captain.B f5036e85c9 fix: 修复删除在线用户之后用户还能操作的问题 2020-09-29 15:48:14 +08:00
Captain.B 81c8c5c15e Merge branch 'v1.3' into temp 2020-09-29 13:46:30 +08:00
Captain.B e247248652 fix: 修复重复打开outputstream的问题 2020-09-29 13:45:45 +08:00
chenjianxing 8aa8e1a018 Merge branch 'v1.3' 2020-09-29 12:29:34 +08:00
Captain.B 19a70d6e1a refactor: 暂时回退到 jetty 2020-09-29 11:56:12 +08:00
chenjianxing 28b33ff0b8 Merge branch 'v1.3' 2020-09-29 11:30:29 +08:00
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
Captain.B 8d1f68666c fix(接口测试): 调试结果返回自动选中mode 2020-09-28 18:32:01 +08:00
chenjianxing 4f22705ec4 Merge branch 'v1.3' 2020-09-28 18:11:44 +08:00
chenjianxing 556118cd9f Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3 2020-09-28 15:50:25 +08:00
chenjianxing 01a9eb3d83 refactor(接口测试): 测试报告自动选择json模式,前后置脚本添加全局变量模版 2020-09-28 15:50:12 +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
wenyann fdbb438040 Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-09-28 15:29:20 +08:00
wenyann da17c8448f fix:i18n 2020-09-28 15:29:02 +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 b88b7730e8 Merge branch 'v1.3' 2020-09-28 11:59:47 +08:00
chenjianxing 45d0f00003 Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3 2020-09-28 11:59:25 +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 be93cf134c Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-09-28 10:28:54 +08:00
wenyann f54e1ce476 fix:站点示例 2020-09-28 10:28:32 +08:00
chenjianxing b106f13dd6 Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3 2020-09-28 10:05:41 +08:00
chenjianxing 1f1afa17ee fix(接口测试): url 自动添加参数key为空 2020-09-28 10:05:30 +08:00
wenyann 8f672752fc Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-09-28 09:46:15 +08:00
wenyann 95b44c9f91 fix:首页评审进度修改 2020-09-28 09:45:52 +08:00
chenjianxing 78ac2e8c14 Merge branch 'master' of https://github.com/metersphere/server 2020-09-27 21:12:52 +08:00
chenjianxing 5d66fb3527 Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3 2020-09-27 21:12:17 +08:00