Commit Graph

4711 Commits

Author SHA1 Message Date
fit2-zhao 4b975918e1 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-30 11:27:22 +08:00
fit2-zhao a683bb27ff fix(接口自动化): 修复http环境请求头公共参数无效问题 2020-12-30 11:25:26 +08:00
fit2-zhao 22fee64092 fix(接口自动化): 增加json 列表编辑器 2020-12-30 11:03:59 +08:00
Captain.B b7325171ab Merge branch 'v1.6' 2020-12-30 10:41:02 +08:00
Captain.B 22e8bf6def refactor: k8s 环境指定namespace 2020-12-30 10:40:37 +08:00
Captain.B 7ef0be2783 Merge branch 'v1.6' 2020-12-30 10:35:16 +08:00
Captain.B 4cf7c06f07 refactor: k8s 环境指定namespace 2020-12-30 10:34:17 +08:00
song.tianyang 9be10ec291 refactor: 处理上次提交合并冲突时未删除的代码块
处理上次提交合并冲突时未删除的代码块
2020-12-29 18:00:03 +08:00
song.tianyang 7cc9f8c01d Merge remote-tracking branch 'origin/v1.6' into v1.6
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
#	frontend/src/business/components/api/definition/components/list/ApiList.vue
2020-12-29 17:46:22 +08:00
song.tianyang f2908ac330 feat: 接口定义页面增加"选择所有数据"操作
接口定义页增加"选择所有数据"功能,用于批量修改、批量删除
2020-12-29 17:41:35 +08:00
chenjianxing af61afde13 refactor: 测试计划关联按钮样式 2020-12-29 17:06:16 +08:00
chenjianxing 62ac695a0b refactor: 测试计划关联列表只列出有未关联用例的接口 2020-12-29 16:43:29 +08:00
chenjianxing 2ff0726965 fix: 解决冲突 2020-12-29 15:39:51 +08:00
chenjianxing 9ce507d201 refactor: 测试计划获取关联接口列表 2020-12-29 15:32:57 +08:00
Captain.B 3506c2fdd2 Merge remote-tracking branch 'origin/master' 2020-12-29 15:23:44 +08:00
Captain.B f11e0af0bf Merge remote-tracking branch 'origin/v1.6' into v1.6 2020-12-29 15:22:47 +08:00
Captain.B 5cc8399e15 fix: 修改 statistics 显示 2020-12-29 15:22:28 +08:00
shiziyuan9527 3b50e38f04 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-29 15:20:57 +08:00
song.tianyang f1564b5751 Merge remote-tracking branch 'origin/v1.6' into v1.6 2020-12-29 15:19:47 +08:00
shiziyuan9527 57f6515d89 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-29 15:19:36 +08:00
shiziyuan9527 213a7db8fd fix(测试计划): 查询缺陷失败时捕获异常 2020-12-29 15:18:42 +08:00
song.tianyang fbc19a6f32 Merge remote-tracking branch 'origin/v1.6' into v1.6 2020-12-29 15:18:05 +08:00
fit2-zhao fb8abc6c18 fix(接口自动化): 执行场景没有步骤时保护 2020-12-29 15:17:55 +08:00
song.tianyang 669cfd168b feat: 增加"选择所有数据"功能
接口自动化页面、测试报告页面,增加"选择所有数据"功能,用于批量操作
2020-12-29 15:17:43 +08:00
fit2-zhao 88a633237f fix(接口定义): 用例运行环境更换位置 2020-12-29 14:40:09 +08:00
fit2-zhao 68e58a9b1b feat(接口定义): JSON 模版初版 2020-12-29 14:37:22 +08:00
chenjianxing 8d8292227f refactor: 代码优化 2020-12-29 14:15:58 +08:00
chenjianxing daa8f3821e Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-29 11:05:25 +08:00
chenjianxing df1ebcdb96 refactor: 场景编辑页面优化 2020-12-29 11:05:06 +08:00
Captain.B 89714f530e Merge remote-tracking branch 'origin/master' 2020-12-29 11:04:20 +08:00
Captain.B 1f611e3f5c Merge branch 'v1.6' 2020-12-29 11:03:58 +08:00
Captain.B 1154b3ce80 fix: 修改k8s资源池节点验证信息 2020-12-29 11:03:24 +08:00
Captain.B c52fddbe19 refactor: 国际化 not support key 显示具体的key 2020-12-29 10:54:08 +08:00
fit2-zhao 16163203d9 Merge branch 'v1.6' 2020-12-29 10:18:31 +08:00
fit2-zhao 711c787f8d fix(接口自动化): 添加执行时 mock 处理 2020-12-29 09:56:26 +08:00
fit2-zhao f5ea7d25b9 fix(接口自动化): 执行场景非变量的参数不做处理 2020-12-28 19:36:58 +08:00
chenjianxing 8f7a32698f Merge branch 'v1.6' 2020-12-28 17:46:30 +08:00
Captain.B 5d9da617be Merge branch 'v1.6' 2020-12-28 16:52:50 +08:00
fit2-zhao bee13b6b94 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-28 16:14:16 +08:00
fit2-zhao fbeb1ded75 fix(接口自动化): 修复执行单个步骤无公共参数问题 2020-12-28 16:12:55 +08:00
chenjianxing 883fff3808 全局左右拖拽组件 2020-12-28 16:04:52 +08:00
shiziyuan9527 be1779c546 refactor(性能测试): 修改性能测试执行页面文本描述
Closes #939
2020-12-28 15:06:40 +08:00
chenjianxing 8e1d3a3da7 fix: 更新提交 2020-12-28 14:44:46 +08:00
shiziyuan9527 06706736db refactor: sql 2020-12-28 14:29:03 +08:00
Captain.B 271275f4bd chore: Sync 2020-12-28 14:25:07 +08:00
chenjianxing 85b90f3226 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-28 14:20:51 +08:00
chenjianxing f323e737e1 fix: 性能测试列表为空 2020-12-28 14:20:26 +08:00
chenjianxing 5f1adb6d34 fix: 性能测试列表为空 2020-12-28 14:19:49 +08:00
Captain.B 6ee91faf9e Merge remote-tracking branch 'origin/master' 2020-12-28 14:14:28 +08:00
Captain.B d62345fc66 Merge branch 'v1.6' 2020-12-28 14:13:58 +08:00