3792 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	88de5c9449	Merge remote-tracking branch 'origin/master' into master	2020-11-27 16:29:58 +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
chenjianxing	c0329ce42a	refactor(接口测试): 数据库配置添加清空按钮	2020-11-27 16:02:35 +08:00
fit2-zhao	115ca3005b	feat(接口定义): 修改自定义主题色	2020-11-27 15:52:29 +08:00
fit2-zhao	586a6fdb64	fix(接口定义): 修复加载方法	2020-11-27 14:38:22 +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	9931403308	feat(接口定义):细节调整	2020-11-27 12:30:13 +08:00
fit2-zhao	23b2391968	feat(接口定义):高度处理	2020-11-27 11:44:58 +08:00
fit2-zhao	e081448183	feat(接口定义):完成回收站功能	2020-11-27 11:30:47 +08:00
chenjianxing	320ca1c542	fix(接口测试): 单接口调试点击请求报错	2020-11-27 11:16:03 +08:00
Captain.B	d2cf26b16c	chore: 同步 submodule ... (cherry picked from commit 9e62022ae9)	2020-11-27 10:20:02 +08:00
fit2-zhao	4871c9864a	feat(接口定义):细节调整	2020-11-26 18:41:05 +08:00
fit2-zhao	bc4aba0210	feat(接口定义): 基本功能优化完成	2020-11-26 18:29:23 +08:00
chenjianxing	7659f1d11b	fix(接口测试): 避免定时任务时间刷新报错	2020-11-26 15:54:18 +08:00
chenjianxing	efde34cb80	Merge branch 'master' of https://github.com/metersphere/metersphere	2020-11-26 15:38:56 +08:00
chenjianxing	3e9767ef88	fix(接口测试): 引用环境列表通过项目过滤	2020-11-26 15:38:47 +08:00
wenyann	977db2fdb2	fix:修复消息设置testId为空时异常	2020-11-26 15:35:05 +08:00
chenjianxing	a2f1e18aa7	Merge branch 'master' of https://github.com/metersphere/metersphere	2020-11-26 15:05:14 +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	c1c8f35296	Merge remote-tracking branch 'origin/master'	2020-11-26 13:55:52 +08:00
wenyann	a2e7e0ae88	fix:	2020-11-26 13:55:29 +08:00
chenjianxing	c15f3064c0	Merge branch 'master' of https://github.com/metersphere/metersphere	2020-11-26 13:01:22 +08:00
chenjianxing	4868426241	fix(性能测试): 报告导出样式问题	2020-11-26 13:01:07 +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	479beca209	fix(测试跟踪): 测试计划开始结束时间校验	2020-11-26 10:34:38 +08:00
chenjianxing	ab31922cb7	fix: session到期错误提示	2020-11-26 09:53:30 +08:00
chenjianxing	cea611a783	fix(接口测试): 去掉body请求描述	2020-11-25 21:08:22 +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
chenjianxing	a5f2da3104	Merge branch 'master' of https://github.com/metersphere/metersphere	2020-11-25 19:48:13 +08:00
chenjianxing	b5d926e264	fix(接口测试): 只读用户定时任务页面自动跳转	2020-11-25 19:48:04 +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
Captain.B	13a3820570	Merge remote-tracking branch 'origin/master' into master	2020-11-25 18:55:36 +08:00
Captain.B	57d7db8b94	Merge branch 'v1.5' into master	2020-11-25 18:55:23 +08:00
fit2-zhao	2ba69e9a32	feat(接口定义): 完成JDBC快捷调试	2020-11-25 18:52:33 +08:00
Captain.B	e440d36ead	fix: 修复显示设置加载图片的问题	2020-11-25 18:51:34 +08:00