fit2-zhao
|
5e04f7ef17
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2021-02-20 11:53:11 +08:00 |
|
fit2-zhao
|
1270eb8b29
|
Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
# backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
# backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
# backend/src/main/java/io/metersphere/base/mapper/SwaggerUrlProjectMapper.xml
# frontend/src/business/components/api/automation/ApiAutomation.vue
# frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
|
2021-02-20 11:53:04 +08:00 |
|
fit2-zhao
|
b0486b6faf
|
Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
# backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
# backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
# backend/src/main/java/io/metersphere/base/mapper/SwaggerUrlProjectMapper.xml
# frontend/src/business/components/api/automation/ApiAutomation.vue
# frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
|
2021-02-20 11:52:23 +08:00 |
song.tianyang
|
9be6c192d0
|
Merge branch 'v1.7'
|
2021-02-20 11:28:56 +08:00 |
|
song.tianyang
|
567ae41aa3
|
fix: 接口测试、接口自动化转性能测试时自带函数会带来jmeter报错
修复接口测试、接口自动化转性能测试时自带函数会带来jmeter报错的问题
|
2021-02-20 11:27:04 +08:00 |
|
fit2-zhao
|
63b8801aa9
|
feat(接口自动化): 完善jmx导入功能，增加jmeter相关Sampler依赖jar包
|
2021-02-20 11:20:58 +08:00 |
|
song.tianyang
|
2b9713b143
|
Merge remote-tracking branch 'origin/v1.7' into v1.7
|
2021-02-19 18:45:53 +08:00 |
|
song.tianyang
|
217800b24d
|
fix: 修改定时任务表key字段长度
修改定时任务表key字段长度
|
2021-02-19 18:45:36 +08:00 |
|
song.tianyang
|
1f6736cad0
|
Merge remote-tracking branch 'origin/master'
|
2021-02-19 18:30:13 +08:00 |
|
song.tianyang
|
d1789dd154
|
feat: 接口定义->文档 增加JSON-Schema的显示和查找功能
接口定义->文档 增加JSON-Schema的显示和查找功能
|
2021-02-19 18:29:47 +08:00 |
wenyann
|
9b2e1e5a52
|
Merge remote-tracking branch 'origin/master'
|
2021-02-19 18:27:44 +08:00 |
|
wenyann
|
4e376541d1
|
fix: 修复冲突
|
2021-02-19 18:27:24 +08:00 |
chenjianxing
|
a813605095
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2021-02-19 17:52:45 +08:00 |
|
chenjianxing
|
c6c220269b
|
fix: 解决冲突
|
2021-02-19 17:52:34 +08:00 |
|
chenjianxing
|
ff478c3d88
|
Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7
|
2021-02-19 17:47:51 +08:00 |
|
chenjianxing
|
a15ab8b8c6
|
fix: 测试用例模块树拖拽报错
|
2021-02-19 17:44:29 +08:00 |
|
wenyann
|
a1d0dc5208
|
fix: flyway版本号冲突
|
2021-02-19 17:03:51 +08:00 |
|
wenyann
|
c72a85ba39
|
Merge remote-tracking branch 'origin/master'
|
2021-02-19 16:54:36 +08:00 |
|
wenyann
|
774c44c28a
|
fix: 冲突
|
2021-02-19 16:53:54 +08:00 |
|
fit2-zhao
|
bf81de8926
|
fix(测试跟踪): 修复https://github.com/metersphere/metersphere/issues/659 对应问题
|
2021-02-19 16:45:58 +08:00 |
shiziyuan9527
|
eb5b2d3de1
|
feat(测试跟踪): 用例评审默认关联工作空间下所有项目
|
2021-02-19 16:44:51 +08:00 |
|
wenyann
|
6e6ca3c0b9
|
Merge branch 'master' of https://github.com/metersphere/metersphere
Conflicts:
frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
frontend/src/business/components/api/definition/components/list/ApiList.vue
|
2021-02-19 16:42:14 +08:00 |
|
chenjianxing
|
3f23ce02d7
|
场景导入-插件
|
2021-02-19 16:37:11 +08:00 |
|
wenyann
|
56a195b247
|
fix: 自定义表头
|
2021-02-19 16:34:30 +08:00 |
|
wenyann
|
245b46dc19
|
fix: 自定义表头
|
2021-02-19 16:34:22 +08:00 |
|
fit2-zhao
|
1c04e19880
|
feat(接口自动化): 导入JMX 通用数据源初始化
|
2021-02-19 16:26:30 +08:00 |
|
shiziyuan9527
|
b289b4d267
|
feat(测试跟踪): 测试计划默认关联工作空间下所有项目
|
2021-02-19 16:12:04 +08:00 |
|
chenjianxing
|
54258fb01e
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2021-02-19 15:42:19 +08:00 |
|
chenjianxing
|
f42e7ac3eb
|
feat: 场景用例导出
|
2021-02-19 15:41:27 +08:00 |
BugKing
|
5db0ce1b46
|
docs: 更新演示视频链接
|
2021-02-19 15:25:04 +08:00 |
|
fit2-zhao
|
6e3391c6fe
|
fix(场景自动化): 场景请求头失效问题修复
|
2021-02-19 15:13:06 +08:00 |
|
fit2-zhao
|
8f9286252c
|
feat(接口自动化): 导入JMX JDBC类型 数据源处理
|
2021-02-19 15:07:19 +08:00 |
|
chenjianxing
|
a003eb566e
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2021-02-19 14:37:49 +08:00 |
|
chenjianxing
|
1e2e80d507
|
refactor: 重构场景全选
|
2021-02-19 14:37:25 +08:00 |
Captain.B
|
2b27f03ddf
|
Merge remote-tracking branch 'origin/master'
|
2021-02-19 13:12:26 +08:00 |
|
Captain.B
|
cecdcebc49
|
feat: K8S 资源池支持nodeSelector
|
2021-02-19 13:11:19 +08:00 |
|
chenjianxing
|
5e8cbfe931
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2021-02-19 11:30:28 +08:00 |
|
chenjianxing
|
c24ca8e562
|
场景支持导入postman
|
2021-02-19 11:30:08 +08:00 |
|
shiziyuan9527
|
340a685393
|
refactor: 删除无用log
|
2021-02-19 10:40:28 +08:00 |
|
shiziyuan9527
|
e2efd5c55b
|
refactor: 模块节点可回车保存
Closes #1413
|
2021-02-18 17:08:22 +08:00 |
|
shiziyuan9527
|
9f74130dc8
|
fix(系统设置): 修复缺陷管理平台页面保存数据后密码显示明文的问题
Closes #347
|
2021-02-18 15:52:31 +08:00 |
|
fit2-zhao
|
09b39ca249
|
fix(xpack): 修复license数量显示为0 问题
|
2021-02-18 14:54:44 +08:00 |
|
fit2-zhao
|
72351396ae
|
fix(xpack): 修复license数量显示为0 问题
|
2021-02-18 14:23:31 +08:00 |
|
chenjianxing
|
bdf11d09aa
|
修改定时任务 #1167
|
2021-02-18 14:11:05 +08:00 |
|
chenjianxing
|
b7e12652dd
|
fix: 解决冲突
|
2021-02-18 14:10:57 +08:00 |
|
chenjianxing
|
c7046993e5
|
fix: 删除无用代码
|
2021-02-18 14:05:26 +08:00 |
|
fit2-zhao
|
a45fce4d41
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2021-02-18 12:56:09 +08:00 |
|
chenjianxing
|
c60db63f2a
|
fix: 修复退出登入后重新登入页面无数据问题
|
2021-02-18 11:42:31 +08:00 |
|
chenjianxing
|
ccdf41894d
|
修改定时任务 #1167
|
2021-02-18 10:35:08 +08:00 |
|
fit2-zhao
|
329d95fe64
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2021-02-18 09:35:18 +08:00 |