Commit Graph

2665 Commits

Author SHA1 Message Date
Captain.B dd0b474959 Merge branch 'master' of github.com:fit2cloudrd/metersphere-server into master 2020-09-17 16:05:47 +08:00
Captain.B f0198ccb68 chore: 同步submodule 2020-09-17 16:05:37 +08:00
Captain.B eecc351061 refactor(性能测试): 页面可配置响应超时时间 2020-09-17 15:52:17 +08:00
chenjianxing 5fd8a424d6 fix(接口测试): 接口顺序执行 2020-09-17 15:16:58 +08:00
chenjianxing 370b424e7c Merge branch 'master' of https://github.com/metersphere/server 2020-09-17 15:11:37 +08:00
chenjianxing e1eba35e13 feat(接口测试): 支持 Oracle 2020-09-17 15:11:00 +08:00
Captain.B 6a0d7ecf47 Merge branch 'master' of github.com:fit2cloudrd/metersphere-server into master 2020-09-17 14:55:41 +08:00
Captain.B 10d42f432d refactor(性能测试): 增加一个response_timeout,避免目标网站不反回结果导致测试不能结束 2020-09-17 14:55:08 +08:00
fit2-zhao 79b232b928 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-17 13:52:09 +08:00
fit2-zhao dfc7f1755e perf(测试跟踪): 导入性能优化 2020-09-17 13:51:50 +08:00
chenjianxing d4439f01ad feat(接口测试): 支持 postgresql 2020-09-17 13:03:33 +08:00
fit2-zhao 8ca36bd18f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-17 11:36:43 +08:00
fit2-zhao 252e52d316 fix(测试跟踪): 导入xmind 增加校验保护 2020-09-17 11:35:59 +08:00
chenjianxing 5ef0f5a629 fix(接口测试):引用环境url显示问题 2020-09-17 11:34:17 +08:00
chenjianxing dc41ddc683 Merge branch 'master' of https://github.com/metersphere/server 2020-09-17 11:02:27 +08:00
chenjianxing 21ad96c691 feat(接口测试): 支持sqlserver 2020-09-17 11:02:16 +08:00
fit2-zhao 4d983fd071 fix(接口调试): 修复host不匹配时开启DnsCache缺陷 2020-09-17 11:01:08 +08:00
wenyann c0a9dc003d fix:导出全部用例 2020-09-16 22:14:19 +08:00
wenyann ed5232f5d0 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-16 22:13:48 +08:00
wenyann 3bd398debf fix:导出全部用例 2020-09-16 22:13:18 +08:00
chenjianxing 9918d77e51 fix: 解决冲突 2020-09-16 20:48:40 +08:00
chenjianxing fccababb39 feat(接口测试): 支持连接Mysql 2020-09-16 20:45:09 +08:00
fit2-zhao 4ad35dcf7d Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-16 19:32:31 +08:00
fit2-zhao 95b44e7fd0 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	backend/pom.xml
2020-09-16 19:32:11 +08:00
fit2-zhao 76b09b4751 feat(测试跟踪): 支持思维导图导入用例 2020-09-16 18:47:04 +08:00
fit2-zhao d71969b2fa fix(接口调试): 修复场景中自定义变量和请求头不能选择问题 2020-09-16 16:43:44 +08:00
wenyann b6e9f7867f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-16 16:25:52 +08:00
wenyann 0a9563a7db fix:jenkins对应接口修改 2020-09-16 16:25:39 +08:00
shiziyuan9527 be29bcc04f feat(测试跟踪): tapd提交缺陷时增加创建人 2020-09-16 14:26:54 +08:00
wenyann 8dca4bce9a fix:修改互相调用 2020-09-16 12:05:02 +08:00
wenyann 64a731bb57 Merge remote-tracking branch 'origin/master' 2020-09-16 11:35:30 +08:00
wenyann 4ff4023889 fix:修改互相调用 2020-09-16 11:35:04 +08:00
Captain.B 142c32705f fix: 误删jira的包 2020-09-16 10:47:09 +08:00
Captain.B 0527ff7f92 Merge branch 'master' of github.com:fit2cloudrd/metersphere-server into master 2020-09-16 10:40:35 +08:00
wenyann 124c93dc7b fix: 删除无用代码 2020-09-16 10:37:19 +08:00
Captain.B 4f83705378 Merge branch 'master' of github.com:fit2cloudrd/metersphere-server into master 2020-09-16 10:08:14 +08:00
wenyann 43bfebfcaa Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	backend/src/main/resources/i18n/messages_en_US.properties
	backend/src/main/resources/i18n/messages_zh_CN.properties
	backend/src/main/resources/i18n/messages_zh_TW.properties
2020-09-16 10:03:31 +08:00
wenyann b221a51d4c feat: 定时任务通知 2020-09-16 09:57:55 +08:00
Captain.B 1f4e0be15c refactor: 修改jmeter镜像 2020-09-15 18:27:58 +08:00
shiziyuan9527 a325a18139 feat(测试跟踪): tapd提交缺陷时增加处理人信息 2020-09-15 16:54:50 +08:00
chenjianxing 14531a571a Merge branch 'master' of https://github.com/metersphere/server 2020-09-15 11:29:12 +08:00
chenjianxing cbb1976f77 feat(接口测试): sql 请求 2020-09-15 11:26:29 +08:00
shiziyuan9527 98ccbc043c refactor(测试跟踪): 修改测试计划表,删除项目ID列 2020-09-15 11:21:10 +08:00
shiziyuan9527 84c891419f refactor: Jira id 替换为 key 2020-09-15 10:51:52 +08:00
fit2-zhao 776d17833b style(XPack): 修复 认证页面样式 2020-09-15 10:32:44 +08:00
fit2-zhao ae3cbd298a style(XPack): 授权认证页面样式调整 2020-09-14 20:41:30 +08:00
fit2-zhao f306dbc804 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-14 17:09:48 +08:00
fit2-zhao 825957fbbb fix(XPack): 修改认证文件路径,删除源代码下认证文件 2020-09-14 17:08:11 +08:00
shiziyuan9527 5c400f616c Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-14 16:51:01 +08:00
shiziyuan9527 54b72c017e feat(测试计划): 测试报告中列表增加所属项目列 2020-09-14 16:50:49 +08:00