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
|
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 |
|
song.tianyang
|
f1564b5751
|
Merge remote-tracking branch 'origin/v1.6' into v1.6
|
2020-12-29 15:19:47 +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 |
|
chenjianxing
|
8d8292227f
|
refactor: 代码优化
|
2020-12-29 14:15:58 +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
|
711c787f8d
|
fix(接口自动化): 添加执行时 mock 处理
|
2020-12-29 09:56:26 +08:00 |
|
fit2-zhao
|
f5ea7d25b9
|
fix(接口自动化): 执行场景非变量的参数不做处理
|
2020-12-28 19:36:58 +08:00 |
|
Captain.B
|
5d9da617be
|
Merge branch 'v1.6'
|
2020-12-28 16:52:50 +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 |
luoylove
|
24e89c2c57
|
swaggerParser RefProperty bug fix (#994)
Co-authored-by: luoyoujun <luoyoujun3712@dingtalk.com>
|
2020-12-28 13:47:25 +08:00 |
|
Captain.B
|
79d34a1825
|
fix(接口测试): 接口测试 url encoder
Closes #872
|
2020-12-28 13:04:18 +08:00 |
|
Captain.B
|
758677beb5
|
Merge remote-tracking branch 'origin/v1.6' into v1.6
|
2020-12-28 12:55:13 +08:00 |
|
Captain.B
|
4cc0fd0e24
|
fix(接口测试): 接口测试 url encoder
Closes #872
|
2020-12-28 12:54:48 +08:00 |
|
chenjianxing
|
965f43d9fc
|
Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6
|
2020-12-28 12:50:58 +08:00 |
|
chenjianxing
|
8696347f4a
|
fix: 测试计划进度没有统计到接口测试用例
|
2020-12-28 12:49:40 +08:00 |
|
Captain.B
|
ad982b5e09
|
fix: 修复火狐icon不能显示的问题
|
2020-12-28 11:08:17 +08:00 |
|
Captain.B
|
dd5b0d9cab
|
chore: Sync
|
2020-12-28 10:50:01 +08:00 |
|
chenjianxing
|
007ede7069
|
Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6
|
2020-12-28 10:43:31 +08:00 |
|
chenjianxing
|
08b75e5ddb
|
解决${}变量请求体格式化问题
|
2020-12-28 10:43:03 +08:00 |
|
shiziyuan9527
|
e6f5b717b4
|
feat(接口): 接口相关列表添加ID列
|
2020-12-25 21:52:52 +08:00 |
|
chenjianxing
|
0d037a9165
|
Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6
|
2020-12-25 18:24:22 +08:00 |
|
fit2-zhao
|
de716c32ab
|
fix(接口自动化): 修复拖拽问题
|
2020-12-25 18:23:31 +08:00 |
|
chenjianxing
|
7f52b22864
|
Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6
|
2020-12-25 18:23:19 +08:00 |
|
chenjianxing
|
1c5f83a1b3
|
refactor: 导出带模块，导入自动生成模块
|
2020-12-25 18:22:55 +08:00 |
|
fit2-zhao
|
76b3624aac
|
Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6
|
2020-12-25 18:00:30 +08:00 |
|
fit2-zhao
|
ee27fa0c5e
|
fix(接口自动化): 模块同级别排序
|
2020-12-25 18:00:05 +08:00 |
|
Captain.B
|
fa5a693d1f
|
refactor: 去掉 $$get 方法
|
2020-12-25 15:40:28 +08:00 |
|
Captain.B
|
414674d833
|
fix: 下载jtl国际化的key失败
|
2020-12-25 14:53:55 +08:00 |
|
chenjianxing
|
f7a0463eb2
|
fix: 接口导入
|
2020-12-25 14:45:35 +08:00 |
|
fit2-zhao
|
bc79ae48f3
|
fix(接口自动化): 执行场景非变量的参数不做处理
|
2020-12-25 14:31:39 +08:00 |
|
fit2-zhao
|
719bda0ff7
|
Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6
|
2020-12-25 13:57:54 +08:00 |
|
fit2-zhao
|
7645026dae
|
fix(接口自动化): 修复环境公共变量
|
2020-12-25 13:57:36 +08:00 |
|
Captain.B
|
6e3139d24f
|
chore: Sync
|
2020-12-25 13:31:00 +08:00 |
|
Captain.B
|
8db039e1b7
|
fix: 修复rps index 越界的问题
|
2020-12-25 13:30:35 +08:00 |
|
chenjianxing
|
cd3e68ab4d
|
refactor: 接口导入到选中模块
|
2020-12-25 12:07:06 +08:00 |
|
chenjianxing
|
0f5da509cf
|
fix: 取消调试注释
|
2020-12-25 11:28:16 +08:00 |