Commit Graph

1254 Commits

Author SHA1 Message Date
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
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
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
wenyann 124c93dc7b fix: 删除无用代码 2020-09-16 10:37:19 +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
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 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
Captain.B 4f4cef3feb Merge branch 'master' of github.com:fit2cloudrd/metersphere-server into master 2020-09-14 16:17:41 +08:00
Captain.B 2abc0bd912 refactor: 处理创建容器的返回结果 2020-09-14 16:16:59 +08:00
fit2-zhao 3445ac4656 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-14 15:57:20 +08:00
fit2-zhao 1644a03cf6 feat(XPack): 【企业版】【公共】License 认证机制 2020-09-14 15:51:37 +08:00
shiziyuan9527 3b439edaeb feat(测试计划): 关联测试用例切换项目页列表分页 2020-09-14 15:14:19 +08:00
chenjianxing ed86abfb9e Merge branch 'master' of https://github.com/metersphere/server 2020-09-08 18:30:46 +08:00
chenjianxing f39e2f97a1 fix: 定时任务死锁问题 2020-09-08 18:30:25 +08:00
shiziyuan9527 b55ca479a4 feat(测试计划): 测试计划下测试用例增加所属项目列 2020-09-08 18:28:37 +08:00
chenjianxing fdd401280e Merge branch 'v1.2' 2020-09-08 17:30:57 +08:00
chenjianxing 40780b9158 Merge branch 'v1.2' of https://github.com/metersphere/server into v1.2 2020-09-08 17:29:47 +08:00
chenjianxing fcfb01db6e fix(接口测试): python 执行失败 2020-09-08 17:29:38 +08:00
chenjianxing fdde95218d Merge branch 'master' of https://github.com/metersphere/server 2020-09-08 17:26:22 +08:00
chenjianxing 2deec48cd5 fix(接口测试): python 执行失败 2020-09-08 17:25:57 +08:00
shiziyuan9527 84a1075795 refactor(LDAP): LDAP记录错误日志 2020-09-08 15:47:39 +08:00
wenyann 5eb9a5aadd fix: 修复导出用例null 2020-09-08 15:23:16 +08:00
shiziyuan9527 fbce41bb3e refactor(测试计划): 删除测试计划时同时删除相关联数据 2020-09-08 15:20:30 +08:00
wenyann 913ff44480 fix: 任务通知设置 2020-09-08 14:52:44 +08:00
q4speed 1d84cda5fe refactor: 优化代码 2020-09-08 10:49:18 +08:00
shiziyuan9527 dad8ad2be9 feat: 测试计划关联用例支持跨项目 2020-09-07 22:30:38 +08:00
q4speed 7f296f453c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	frontend/src/business/components/api/test/components/ApiScenarioConfig.vue
#	frontend/src/business/components/api/test/components/request/ApiHttpRequestForm.vue
2020-09-07 13:29:37 +08:00
q4speed d6459dfa73 feat(接口测试): 增加场景拼接 2020-09-07 13:20:27 +08:00