Commit Graph

2730 Commits

Author SHA1 Message Date
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
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
chenjianxing 37bf65ce07 Merge branch 'master' of https://github.com/metersphere/server 2020-09-14 15:55:24 +08:00
chenjianxing 1eb9b3c45f feat(接口测试): 场景数据库配置页面 2020-09-14 15:55:01 +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 c1dfe05e87 Merge remote-tracking branch 'origin/master' 2020-09-07 16:11:23 +08:00
fit2-zhao ab4be0a23b style(接口调试): 格式化内容 2020-09-07 16:11:06 +08:00
q4speed c9cf9b8e8f feat(接口测试): 请求支持跨场景拖拽 2020-09-07 16:11:06 +08:00
fit2-zhao 3f6359bede Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-07 16:00:10 +08:00
fit2-zhao 2b462c4f1c fix(接口调试): 修复body内容无法传递问题 2020-09-07 15:59:44 +08:00
BugKing 3563c36ecc
docs: 更新 readme 2020-09-07 15:35:40 +08:00
BugKing 72efb0e1ff
docs: 更新 readme 2020-09-07 15:34:52 +08:00
fit2-zhao 20f89c0017 Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	frontend/src/business/components/api/test/ApiTestConfig.vue
2020-09-07 13:44:40 +08:00
fit2-zhao a92db96844 fix(接口测试): 加强host列表校验 2020-09-07 13:42:21 +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
fit2-zhao 92c5215349 fix(接口测试): 加强host列表校验 2020-09-07 11:41:57 +08:00
shiziyuan9527 34bf64ce73 fix: 获取jira缺陷时出现空指针的问题 2020-09-07 11:38:02 +08:00
fit2-zhao ce579fe143 fix(接口调试): 修复调试未勾选参数加入执行缺陷 2020-09-07 10:23:25 +08:00