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

6799 Commits

Author SHA1 Message Date
chenjianxing 01480fc6f2 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 16:42:06 +08:00
chenjianxing 32b26efc73 refactor: 导入用例重复提示优化 2021-03-30 16:41:44 +08:00
fit2-zhao c5362840fc Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 16:38:47 +08:00
fit2-zhao 9abc90150d fix(接口自动化): 修复重定向接口内容重复问题 2021-03-30 16:38:30 +08:00
song.tianyang 60136a3e02 fix: ESB导入增加xpack判断，ESB导入模板去掉"是否必填"列，ESB请求参数去掉"是否必填"列 
ESB导入增加xpack判断，ESB导入模板去掉"是否必填"列，ESB请求参数去掉"是否必填"列
 2021-03-30 16:33:45 +08:00
song.tianyang cc99108e28 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-30 16:29:10 +08:00
Ambitiousliga ab98740321 fix(测试跟踪):使只读用户不能删除测试计划报告 (#1758) 
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
 2021-03-30 16:20:22 +08:00
Ambitiousliga 2534eafcf0 fix(测试跟踪):修复用例excel导入时重复校验不准确问题。 (#1756) 
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com>
 2021-03-30 16:20:22 +08:00
Ambitiousliga ce8547300f
fix(测试跟踪):修复用例excel导入时重复校验不准确问题。 (#1756) 
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com>
 2021-03-30 16:19:23 +08:00
Ambitiousliga bd9b47ca33
fix(测试跟踪):使只读用户不能删除测试计划报告 (#1758) 
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
 2021-03-30 16:17:08 +08:00
chenjianxing 971c96b08f Merge branch 'master' of github.com:metersphere/metersphere 2021-03-30 16:10:02 +08:00
chenjianxing 89e28ea3df Merge branch 'v1.8' 2021-03-30 16:09:27 +08:00
chenjianxing 5c70925360 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 16:08:34 +08:00
chenjianxing 87221dfda2 groovy脚本无法使用jar包 2021-03-30 16:08:17 +08:00
fit2-zhao 6db8a133de fix(接口自动化): 修复端口是变量的问题 2021-03-30 15:52:25 +08:00
Captain.B 7185961ad2 Merge branch 'v1.8' 2021-03-30 15:43:52 +08:00
fit2-zhao 22b63d03df Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 15:35:39 +08:00
fit2-zhao 81645d4387 fix(接口自动化): 选中模块创建数据，默认放到当前选择的模块下 2021-03-30 15:35:11 +08:00
Captain.B 3a11fd16eb chore: sync 2021-03-30 15:31:27 +08:00
Captain.B 1847fbbf5d fix: 修复文件名过短导致场景无法引入 2021-03-30 15:31:02 +08:00
Captain.B 02af3f1fe9 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-30 15:29:45 +08:00
Captain.B d556c722ad fix(性能测试): 修复预热时间没有适配单位的bug 2021-03-30 15:28:16 +08:00
fit2-zhao 2a70396bf8 fix: 恢复被覆盖的sql 2021-03-30 15:25:23 +08:00
fit2-zhao a05d1a773a fix(测试用例，接口定义，接口自动化): 默认添加的模块，不能编辑也不能删除。 2021-03-30 15:20:34 +08:00
fit2-zhao 015c665bcf Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 15:03:46 +08:00
fit2-zhao cff32b828c fix(测试用例，接口定义，接口自动化): 增加默认模块，默认创建用例都放到默认模块下 2021-03-30 15:03:31 +08:00
Captain.B 575cc7dbed Merge branch 'v1.8' 2021-03-30 14:53:13 +08:00
Captain.B 0f1676166c fix: 修复文件名过短导致场景无法引入，文件重复弹框提示优化 2021-03-30 14:52:34 +08:00
Captain.B 6bc2601bc7 Merge branch 'v1.8' 2021-03-30 14:11:52 +08:00
Captain.B b54ed5c92e Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-30 14:11:05 +08:00
Captain.B b9eae5ed70 chore: 添加 Intellij Toolbox 图标 2021-03-30 14:10:46 +08:00
fit2-zhao c84d1e8535 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 13:55:37 +08:00
fit2-zhao 6303bcb42e fix(测试用例，接口定义，接口自动化): 增加默认模块，默认创建用例都放到默认模块下 2021-03-30 13:55:32 +08:00
chenjianxing 6da82053a1 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 13:09:05 +08:00
Coooder-X 3e97f8da6c fix(接口定义): 修复swagger导入一些值缺失 & 请求体导出支持json、xml格式 (#1751) 
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充

* fix(接口定义): 修复swagger导入一些值缺失 & 请求体导出支持json、xml格式
 2021-03-30 13:08:29 +08:00
chenjianxing 0b820ca39d Merge branch 'master' of github.com:metersphere/metersphere 2021-03-30 13:08:20 +08:00
Coooder-X 138f1e3874
fix(接口定义): 修复swagger导入一些值缺失 & 请求体导出支持json、xml格式 (#1751) 
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充

* fix(接口定义): 修复swagger导入一些值缺失 & 请求体导出支持json、xml格式
 2021-03-30 13:07:09 +08:00
chenjianxing b0dbc6e240 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-30 13:06:21 +08:00
chenjianxing c93a4913a7 Merge branch 'v1.8' 2021-03-30 13:06:03 +08:00
Captain.B b67a6fafe2 Merge branch 'v1.8' 2021-03-30 12:59:33 +08:00
Captain.B 2b32f119a0 chore: sync 2021-03-30 12:58:52 +08:00
chenjianxing fc9d040579 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 12:06:18 +08:00
chenjianxing 378c31e3ca fix: swagger2 导入响应体 2021-03-30 12:05:52 +08:00
fit2-zhao cc07843e12 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 11:50:49 +08:00
fit2-zhao 4f4aa6f5d2 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
 2021-03-30 11:50:34 +08:00
BugKing 569e86b0ce build: mvn打包前先安装前端依赖 2021-03-30 11:48:44 +08:00
song.tianyang d72a3e049b Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-30 11:48:19 +08:00
fit2-zhao e0182038b9 fix(接口定义): 修改默认模块 2021-03-30 11:46:22 +08:00
song.tianyang 33e0207d84 fix(推荐断言弹框可以点击空白关闭): 推荐断言弹框可以点击空白关闭 2021-03-30 11:44:35 +08:00
chenjianxing 11bb0cf5a4 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 11:31:38 +08:00