Commit Graph

5081 Commits

Author SHA1 Message Date
chenjianxing 3f877ef845 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-25 14:57:38 +08:00
chenjianxing 601adb5004 fix: 旧版前后置脚本样式 2021-01-25 14:57:23 +08:00
song.tianyang f84df44d0a Merge remote-tracking branch 'origin/master' 2021-01-25 14:52:24 +08:00
song.tianyang 0b8651b1d8 fix: 接口测试-首页-接口数量统计-未开始/已完成/进行中跳转错误
解决接口测试-首页-接口数量统计-未开始/已完成/进行中跳转错误的问题
2021-01-25 14:51:57 +08:00
Captain.B 68f4ca38f9 refactor(xPack): 修改跳转认证源的代码 2021-01-25 14:34:43 +08:00
song.tianyang a71f75967d Merge remote-tracking branch 'origin/master' 2021-01-25 13:58:39 +08:00
song.tianyang a0bce7cda3 fix: 测试计划报告菜单批量删除功能的缺失
解决测试计划报告菜单批量删除功能的缺失的问题
2021-01-25 13:58:15 +08:00
fit2-zhao 3ac8b83d54 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-25 13:50:21 +08:00
fit2-zhao 33cd6b37e8 feat(接口自动化): 循环控制器 结果处理 2021-01-25 13:49:59 +08:00
Captain.B 829f912d8f fix(xPack): 修改substring的使用 2021-01-25 12:51:03 +08:00
shiziyuan9527 e005e39326 fix(测试计划): 修复性能测试按照状态筛选不生效的问题 2021-01-25 10:59:26 +08:00
chenjianxing 058c3b3dd4 refactor: pr代码优化 2021-01-25 10:10:21 +08:00
BugKing 7412faa7d9
Merge pull request #1246 from maninhill/patch-5
Update README.md
2021-01-23 14:55:03 +08:00
maninhill cf26e64d6c
Update README.md 2021-01-23 14:53:43 +08:00
Captain.B 493e766719 refactor: 单点登录cas提取hidden变量 2021-01-23 13:48:41 +08:00
Captain.B e60f71387b refactor: 修改配置cas的地址 2021-01-23 12:12:12 +08:00
BugKing ed3ca35749
Merge pull request #142 from metersphere/dependabot/maven/backend/org.apache.zookeeper-zookeeper-3.4.14
chore(deps): bump zookeeper from 3.4.13 to 3.4.14 in /backend
2021-01-22 22:20:58 +08:00
fit2-zhao e69791a15a Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 20:15:33 +08:00
fit2-zhao d6c5d56d55 feat(接口自动化): 循环控制器 结果处理 2021-01-22 20:14:15 +08:00
Captain.B 2013e784f9 Merge remote-tracking branch 'origin/master' 2021-01-22 19:40:00 +08:00
Captain.B c71b1d49f3 refactor(xPack): 接入oidc单点登录 2021-01-22 19:28:34 +08:00
song.tianyang e6d2e1bf4d feat: 测试计划定时任务报告增加状态字段
测试计划定时任务报告增加状态字段
2021-01-22 19:06:30 +08:00
fit2-zhao 66473ae258 fix(接口自动化): 修复数据迁移问题 2021-01-22 19:00:36 +08:00
fit2-zhao 96ae6250be fix(接口自动化): 修复部分缺陷 2021-01-22 18:42:04 +08:00
fit2-zhao 5ae9f4dcfe Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 18:18:26 +08:00
fit2-zhao 53fd31ec90 fix(接口自动化): 修复I18n 显示问题 2021-01-22 18:17:53 +08:00
Joker bb952bd430
fix swagger2.0 NullPointException (#1196)
* fix swagger2.0同步时存在$ref参数而dto不存在的情况

* 删除多余代码

* 修复编辑HTTP配置域名为空是,数据库config拼接的json串中domain没有更新为空的情况

* 语法调整

Co-authored-by: fengkaijun <fengkaijun@yingzi.com>
2021-01-22 18:17:19 +08:00
fit2-zhao 5340a37cb1 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 18:12:25 +08:00
fit2-zhao 4e38c73ac5 fix(接口自动化): 修复部分缺陷 2021-01-22 18:12:05 +08:00
Dream95 fed842e442
bugfix 修复'[]'格式json解析错误问题 (#1242)
https://github.com/metersphere/metersphere/issues/1144

Co-authored-by: zhouyx <zhouyx1@guahao.com>
2021-01-22 18:11:38 +08:00
chenjianxing 764ee6507e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 18:06:50 +08:00
chenjianxing 5f8ecf76cf fix: swagger2.0导入body为空 2021-01-22 18:06:18 +08:00
shiziyuan9527 4b41e9df0c fix(测试计划): 修复报告统计结果错误 2021-01-22 17:14:12 +08:00
wenyann 2cdf1e6730 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
2021-01-22 17:07:43 +08:00
wenyann 3048d8b52d feat: swagger定时同步 2021-01-22 17:06:03 +08:00
wenyann 8e1f189ce9 feat: swagger定时修改 2021-01-22 17:01:41 +08:00
chenjianxing 4144a35a26 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 16:32:24 +08:00
chenjianxing f2c93f828b fix: 编辑用例新增不显示上一条下一条 2021-01-22 16:32:13 +08:00
chenjianxing 6243e3a410 feat: 用例编辑支持上一条下一条 2021-01-22 16:30:49 +08:00
Captain.B 96926b3311 refactor: 设置迭代次数和rpslimit的上限 2021-01-22 16:20:43 +08:00
Captain.B 9025f42876 fix: 修复创建性能测试页面,按迭代次数点击没反应 2021-01-22 16:15:04 +08:00
song.tianyang 14b21ca544 feat: 接口测试首页-运行中的定时任务增加字段
接口测试首页-运行中的定时任务增加字段
2021-01-22 15:21:37 +08:00
fit2-zhao 8f45254225 fix(接口自动化): 自定义脚本问题修复 2021-01-22 14:18:42 +08:00
fit2-zhao 3c96877c1c style(接口自动化): 步骤页面优化 2021-01-22 14:06:45 +08:00
fit2-zhao 38169542e2 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 12:57:27 +08:00
fit2-zhao 1157a1c422 fix(场景自动化): 修复场景描述不能编辑问题,修复CSV 预览问题 2021-01-22 12:55:07 +08:00
Captain.B c571d000fe Merge remote-tracking branch 'origin/master' 2021-01-22 11:42:34 +08:00
Captain.B 649872c634 refactor(xPack): 验证k8s账号修改 2021-01-22 11:41:59 +08:00
shiziyuan9527 b0fa695c29 fix(测试计划): 去掉关联性能测试用例页面左侧模块树 2021-01-22 11:39:36 +08:00
shiziyuan9527 b68eb372f1 feat(性能测试): 报告请求统计页面支持按 label 筛选请求 2021-01-22 11:13:39 +08:00