test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,644 Commits 42 Branches 174 Tags 409 MiB
Commit Graph

3763 Commits

Author SHA1 Message Date
chenjianxing ce7600bad4 fix: 解决冲突 2021-02-20 13:44:18 +08:00
chenjianxing 500fe60fec feat: 场景导入-MS格式 2021-02-20 11:57:31 +08:00
fit2-zhao 35d87006e0 fix(接口自动化): 注释一部分重复代码 2021-02-20 11:56:18 +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
fit2-zhao 63b8801aa9 feat(接口自动化): 完善jmx导入功能，增加jmeter相关Sampler依赖jar包 2021-02-20 11:20:58 +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
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
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
wenyann 245b46dc19 fix: 自定义表头 2021-02-19 16:34:22 +08:00
shiziyuan9527 b289b4d267 feat(测试跟踪): 测试计划默认关联工作空间下所有项目 2021-02-19 16:12:04 +08:00
chenjianxing f42e7ac3eb feat: 场景用例导出 2021-02-19 15:41:27 +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
song.tianyang d54e6911db Merge branch 'v1.7' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
#	frontend/src/business/components/api/definition/components/runtest/RunTestDubboPage.vue
#	frontend/src/business/components/api/definition/components/runtest/RunTestSQLPage.vue
#	frontend/src/business/components/api/definition/components/runtest/RunTestTCPPage.vue
 2021-02-17 12:03:59 +08:00
song.tianyang 7b671d3620 feat: 接口页面增加文档功能 
接口页面增加文档功能
 2021-02-17 11:50:25 +08:00
fit2-zhao 298e8df45a Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-08 18:27:30 +08:00
fit2-zhao e7df89b1e2 feat(接口自动化): 导入jmx对已经有的请求处理 2021-02-08 18:27:22 +08:00
wenyann 8e4ce8a197 feat: 自定义表头 2021-02-08 18:06:52 +08:00
wenyann 21b6481b8b feat: 自定义表头 2021-02-08 17:22:27 +08:00
Captain.B 51ca71531e fix(性能测试): 修复请求很多的时候，图标鼠标悬停显示不全 2021-02-08 17:07:30 +08:00
fit2-zhao 6501890d5c Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-08 14:46:55 +08:00
fit2-zhao b42fbeafa2 fix(接口自动化): query参数自动处理 2021-02-08 14:46:09 +08:00
Captain.B 353d047854 Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-08 14:28:53 +08:00
Captain.B ad98e6f783 fix(性能测试): 修复请求很多的时候，图标鼠标悬停显示不全 2021-02-08 14:28:24 +08:00
fit2-zhao 69646c0a92 style(接口自动化): 样式调整 2021-02-08 14:26:27 +08:00