Commit Graph

2613 Commits

Author SHA1 Message Date
fit2-zhao 825957fbbb fix(XPack): 修改认证文件路径,删除源代码下认证文件 2020-09-14 17:08:11 +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
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
fit2-zhao ea832f6f0e Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-04 19:36:11 +08:00
fit2-zhao 59aeb11fa1 feat(接口测试): 环境配置增加hosts 2020-09-04 19:35:50 +08:00
Captain.B d00f170581 refactor: 修改session默认的timeout时间为12小时 2020-09-04 14:29:55 +08:00
fit2-zhao a8684f4c7b Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-03 16:17:41 +08:00
fit2-zhao 60961c0a27 style(接口测试): 规范化提交内容 2020-09-03 16:17:15 +08:00
BugKing d727bbd54a
docs: 更新 readme 2020-09-03 15:35:57 +08:00
fit2-zhao 82cf5b25c4 Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	frontend/src/business/components/api/test/components/ApiVariable.vue
2020-09-03 15:11:05 +08:00
fit2-zhao ed4b773bd8 feat(接口调试): 参数增加启用/禁用勾选项 2020-09-03 14:59:12 +08:00
Captain.B 70c7145a86 Merge remote-tracking branch 'origin/master' into master 2020-09-03 14:48:57 +08:00
Captain.B 433aa6bf19 refactor: 修改定时任务的配置类 2020-09-03 14:47:12 +08:00
chenjianxing 765d0941c3 Merge branch 'v1.2' 2020-09-03 13:31:01 +08:00
chenjianxing 306773ddcd fix(接口测试): 兼容旧版本beanshell 2020-09-03 13:28:58 +08:00
wenyann 788f60b7b8 fix: 任务通知设置 2020-09-03 11:32:48 +08:00
wenyann 3e14fd3d6b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	frontend/src/business/components/common/components/MsScheduleEdit.vue
2020-09-03 10:36:44 +08:00
wenyann 6785e58d10 feat: 任务通知 2020-09-03 10:34:13 +08:00
Captain.B ec931d038c refactor: 修改 Header 上注册事件的方式 2020-09-03 10:02:51 +08:00
chenjianxing 5b750fe55f refact: 解决冲突 2020-09-02 19:33:38 +08:00