Commit Graph

1885 Commits

Author SHA1 Message Date
chenjianxing 9ca89babed fix(接口测试): 保存并执行为DEBUG模式 2020-11-30 14:41:29 +08:00
chenjianxing 0c7ba5cb80 refactor: 认证相关请求返回4xx响应码 2020-11-30 14:27:28 +08:00
chenjianxing b74f9e21f5 fix: 解决冲突 2020-11-27 18:10:41 +08:00
chenjianxing 30a1858ffa fix: 解决冲突 2020-11-27 18:09:30 +08:00
chenjianxing 455b231133 Merge branch 'v1.5' of https://github.com/metersphere/metersphere into v1.5 2020-11-27 17:57:36 +08:00
chenjianxing c53fe5ac4a fix(接口测试): 引用的场景支持禁用启用 2020-11-27 17:57:23 +08:00
Captain.B a1d32d79a8 Merge branch 'v1.5' into master 2020-11-27 16:29:41 +08:00
Captain.B b9052ca787 fix(性能测试): 删除测试报告时删除相关的jtl 2020-11-27 16:28:49 +08:00
fit2-zhao c9e2e3e489 fix(接口定义): 执行方法修改 2020-11-27 14:22:07 +08:00
fit2-zhao dd5cdad759 feat(接口定义):删除多余文件 2020-11-27 14:04:40 +08:00
fit2-zhao 73204d7793 feat(接口定义): 合并master 最新代码 2020-11-27 13:59:18 +08:00
fit2-zhao 22108b3048 feat(接口定义): 合并master 最新代码 2020-11-27 13:58:25 +08:00
chenjianxing 8333c3f77d fix(测试跟踪): 首页最近测试跳转错误 2020-11-27 13:39:22 +08:00
fit2-zhao e081448183 feat(接口定义):完成回收站功能 2020-11-27 11:30:47 +08:00
Captain.B d2cf26b16c chore: 同步 submodule
(cherry picked from commit 9e62022ae9)
2020-11-27 10:20:02 +08:00
wenyann 977db2fdb2 fix:修复消息设置testId为空时异常 2020-11-26 15:35:05 +08:00
chenjianxing d3386b748a fix(测试跟踪): 报告导出样式缺失 2020-11-26 15:04:10 +08:00
fit2-zhao 5bfbf01c3d feat(接口定义): 所有协议基本完成 2020-11-26 14:23:33 +08:00
wenyann 5b2b7fd322 fix: 2020-11-26 12:35:52 +08:00
wenyann 51682762e1 Merge remote-tracking branch 'origin/master' 2020-11-26 12:12:17 +08:00
wenyann 0941dc971e fix:定时判断通知人是否重复 2020-11-26 12:11:36 +08:00
Captain.B 9e62022ae9 chore: 同步 submodule 2020-11-26 11:52:43 +08:00
chenjianxing 23a450119e fix(接口测试): 接口编辑页面报告不展示调试的报告 2020-11-26 10:56:04 +08:00
chenjianxing 5de10c5a5c fix(接口测试): python脚本 2020-11-25 21:04:35 +08:00
chenjianxing 8656fa36bf fi(接口测试): python 脚本失效 2020-11-25 20:45:34 +08:00
Captain.B 7184d551f6 Merge branch 'v1.5' into master 2020-11-25 19:25:49 +08:00
Captain.B 3843f0b420 fix: 修复接口测试处理参数转义的问题 2020-11-25 19:21:07 +08:00
fit2-zhao 2ba69e9a32 feat(接口定义): 完成JDBC快捷调试 2020-11-25 18:52:33 +08:00
chenjianxing e56c42dcc4 fix(测试跟踪): 测试用例点击全部用例展示问题 2020-11-25 17:43:08 +08:00
Captain.B 4f93da8907 Merge branch 'v1.5' into master
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
2020-11-25 16:49:52 +08:00
Captain.B 245da1d1ca fix: 修复显示设置加载图片的问题 2020-11-25 16:49:20 +08:00
Captain.B ae1b31bbfc fix: 修复显示设置加载图片的问题 2020-11-25 16:40:39 +08:00
Captain.B 0ffe1cc414 Merge remote-tracking branch 'origin/master' into master 2020-11-25 16:39:27 +08:00
Captain.B 756c8d3fff Merge branch 'v1.5' into master
# Conflicts:
#	frontend/src/business/components/xpack
2020-11-25 16:39:14 +08:00
Captain.B 17142dc4b3 fix: 修复显示设置加载图片的问题 2020-11-25 16:38:31 +08:00
fit2-zhao 948fcdb3b8 feat(接口定义): SQL协议快捷调试 2020-11-25 16:32:16 +08:00
fit2-zhao 9d1350a97b fix(测试跟踪): 修复 xmind 导入备注缺失问题 2020-11-25 15:45:52 +08:00
fit2-zhao 8db0b4349a feat(接口定义): TCP,SQL,DUBBO 协议基本录入完成 2020-11-25 15:31:06 +08:00
BugKing 2543618ace Merge branch 'v1.5' into master 2020-11-25 13:44:57 +08:00
BugKing 7b5dd9c14f refactor: 修改版本号 2020-11-25 11:15:29 +08:00
chenjianxing 754f067cdd refactor: 完善日志打印 2020-11-25 10:36:30 +08:00
wenyann fe7b1abdac Merge remote-tracking branch 'origin/master' 2020-11-25 10:13:28 +08:00
wenyann 18c810178a fix: 修复账号不一致,更新不发送,时间问题 2020-11-25 10:13:05 +08:00
Captain.B 0bd6599d36 Merge branch 'v1.5' into master 2020-11-25 09:39:55 +08:00
fit2-zhao cbc9c42122 feat(接口定义): TCP 协议基础完成 2020-11-24 19:36:45 +08:00
Captain.B 4a0c640aee refactor: 邮件配置匿名改成免密 2020-11-24 18:33:59 +08:00
Captain.B ed45152263 Merge remote-tracking branch 'origin/master' into master 2020-11-24 18:13:55 +08:00
Captain.B 06820c0af1 Merge branch 'v1.5' into master 2020-11-24 18:13:37 +08:00
Captain.B a9ff93841b fix: 修复MailService不支持非SSL的SMTP邮件服务器
Closes #768
2020-11-24 18:04:59 +08:00
shiziyuan9527 66561c5c71 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-24 17:54:43 +08:00