Commit Graph

3132 Commits

Author SHA1 Message Date
fit2-zhao d1c179fc5c Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-06 18:27:10 +08:00
fit2-zhao f096e1e52b feat(接口自动化): 循环控制器 2021-01-06 18:26:52 +08:00
Captain.B 9bd8a55f2e chore: Sync 2021-01-06 15:26:47 +08:00
Captain.B f02477ce05 Merge remote-tracking branch 'origin/master' 2021-01-06 15:11:32 +08:00
Captain.B a71f4a6610 Merge branch 'tmp' 2021-01-06 15:10:42 +08:00
Captain.B 5952b01646 refactor: 按照迭代次数和执行时间区分性能测试 2021-01-06 14:59:35 +08:00
fit2-zhao 3789365746 feat(接口自动化): 循环控制器 2021-01-06 14:49:33 +08:00
fit2-zhao 5ec2e11ca5 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-06 14:19:11 +08:00
chenjianxing baea09fcae Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-06 14:05:47 +08:00
chenjianxing d2fd83389c fix: 解决冲突 2021-01-06 14:01:21 +08:00
fit2-zhao 643db9c863 Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	backend/src/main/java/io/metersphere/api/controller/APITestController.java
2021-01-06 13:49:43 +08:00
fit2-zhao f810d15bfb style(系统管理): 样式调整 2021-01-06 13:45:23 +08:00
fit2-zhao 624970c16d Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6
# Conflicts:
#	frontend/src/business/components/settings/project/MsProject.vue
2021-01-06 13:43:30 +08:00
fit2-zhao 09fd2c2ab6 feat(接口自动化): 增加URL唯一性校验开关,控制URL校验规则 2021-01-06 13:38:17 +08:00
chenjianxing f01c7f9d59 refator: 项目列表添加jar包上传 2021-01-06 13:35:27 +08:00
fit2-zhao fc8c997716 feat(接口自动化): 数据迁移初版 2021-01-06 12:24:13 +08:00
song.tianyang 5f26ee9e26 Merge remote-tracking branch 'origin/master' 2021-01-06 10:18:10 +08:00
song.tianyang 9b22917e8c fix: 首页跳转场景修改页面控制套报错
修复首页跳转场景修改页面控制套报错的问题
2021-01-06 10:17:55 +08:00
Captain.B e937b3d949 Merge remote-tracking branch 'origin/master' 2021-01-06 10:04:52 +08:00
Captain.B f3dc01d3a9 Merge branch 'v1.6' 2021-01-06 10:04:27 +08:00
song.tianyang b402acfeda fix: 场景跳转数据查询功能失效
修复场景跳转数据查询功能失效的问题
2021-01-05 18:20:51 +08:00
song.tianyang 252f5f3c10 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
#	frontend/src/business/components/api/definition/components/list/ApiList.vue
2021-01-05 18:05:46 +08:00
song.tianyang 9a32e83a01 feat: 接口测试首页优化
接口测试首页优化
2021-01-05 17:43:55 +08:00
wenyann 2d609fded2 Merge remote-tracking branch 'origin/master' 2021-01-05 17:37:13 +08:00
wenyann 1a43a1605a fix: 更换jenkins查询测试计划接口 2021-01-05 17:32:28 +08:00
chenjianxing 2a605a77c0 refactor: 去掉测试接口用例添加到测试计划按钮 2021-01-05 16:21:13 +08:00
chenjianxing e8afbf3cb5 refactor: 全选框样式优化 2021-01-05 16:00:25 +08:00
chenjianxing 606a8fb38e fix: 关联用例小屏适配 2021-01-05 16:00:11 +08:00
chenjianxing 1f51cb63e0 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-05 15:40:33 +08:00
chenjianxing 37acc581f2 refactor: 全选框样式优化 2021-01-05 15:40:02 +08:00
fit2-zhao b65c79424b Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-05 15:34:31 +08:00
chenjianxing c39e71b626 fix: 关联用例小屏适配 2021-01-05 15:22:21 +08:00
chenjianxing 6e7560cf6a Merge branch 'v1.6' 2021-01-05 15:11:53 +08:00
fit2-zhao 25caf3c48e fix(接口定义): url 规范问题修改 2021-01-05 14:43:02 +08:00
shiziyuan9527 b824302acf feat(测试计划): 接口测试用例页面添加ID列 2021-01-05 14:27:47 +08:00
fit2-zhao 1e6b252d12 feat(接口定义): 增加批量修改用例信息功能 2021-01-05 14:23:13 +08:00
wenyann d984b2f08a Merge remote-tracking branch 'origin/master' 2021-01-05 14:21:01 +08:00
wenyann 5aa46f6656 feat: 添加邮件测试 2021-01-05 14:20:32 +08:00
chenjianxing af8b6e4ae0 fix: 测试计划自报告自定义表格样式问题 2021-01-05 13:44:55 +08:00
Captain.B 9fc151f6e2 chore: Sync 2021-01-05 12:59:03 +08:00
fit2-zhao 554af29606 refactor(接口定义): 增加JSON-SCHEMA开关 2021-01-05 12:46:07 +08:00
fit2-zhao 02c99498e7 refactor(接口定义): 规范JSON控件的i18n 2021-01-05 10:08:45 +08:00
chenjianxing 6b076416fb fix: 旧版复制请求,文件上传参数同步修改问题 2021-01-05 10:05:17 +08:00
fit2-zhao 4fb1a6319a Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
2021-01-05 09:34:02 +08:00
chenjianxing 24e89b5b3c refactor: 测试计划关联页面优化 2021-01-04 19:46:48 +08:00
chenjianxing e7d489a469 fix: python脚本无法使用 2021-01-04 19:15:16 +08:00
fit2-zhao cd44e90808 feat(接口定义): 完成json编辑器 2021-01-04 19:05:31 +08:00
chenjianxing 29cc8caff3 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-04 18:05:50 +08:00
chenjianxing 1fede9b66b refactor: 封装全选组件 2021-01-04 15:56:31 +08:00
shiziyuan9527 ad597dcd79 fix: 修复菜单组件会重复监听事件的问题 2021-01-04 15:44:38 +08:00