Commit Graph

5978 Commits

Author SHA1 Message Date
chenjianxing 82b004df60 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-12 17:00:35 +08:00
chenjianxing 74deed5032 fix: 脑图样式冲突以及功能优化 2021-03-12 16:57:34 +08:00
Captain.B e9e3dce76c Merge remote-tracking branch 'origin/master' 2021-03-12 15:56:26 +08:00
Captain.B 03151eaa3e fix(性能测试): 修复由于node-controller返回不正确的错误提示 2021-03-12 15:56:09 +08:00
chenjianxing f4ed49fde5 fix: 删除相关用户,接口测试用例列表报错 2021-03-12 15:30:54 +08:00
Captain.B 56110bfa5b Merge remote-tracking branch 'origin/master' 2021-03-12 15:07:58 +08:00
Captain.B 306600c73a refactor: 用户登录时用户名和密码使用密文传输
Closes #1094
2021-03-12 15:07:12 +08:00
song.tianyang 2b47f47d40 Merge remote-tracking branch 'origin/master' 2021-03-12 15:03:05 +08:00
song.tianyang a0d7b33323 fix: 修改定时任务创建时的参数-测试计划等入口参数修改
修改定时任务创建时的参数-测试计划等入口参数修改
2021-03-12 14:55:59 +08:00
wenyann ca838a36d6 Merge remote-tracking branch 'origin/master' 2021-03-12 14:55:52 +08:00
wenyann d3d35568bb fix:flayway 2021-03-12 14:55:33 +08:00
song.tianyang 7e9cf5b292 fix: 修改定时任务创建时的参数
修改定时任务创建时的参数类
2021-03-12 14:23:46 +08:00
wenyann 637739459e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-12 11:15:31 +08:00
fit2-zhao f84eb9f702 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-12 10:57:13 +08:00
fit2-zhao 7a9bb603e8 fix(接口自动化): 修复引用场景不能移除问题 2021-03-12 10:56:59 +08:00
Captain.B 3d6eb4be51 chore: sync 2021-03-12 10:51:47 +08:00
Captain.B 17fff4a326 Merge remote-tracking branch 'origin/master' 2021-03-12 10:48:43 +08:00
Captain.B 2ff611bd58 fix(性能测试): 查看报告的时候压力配置图修改 2021-03-12 10:48:27 +08:00
shiziyuan9527 846345cdd2 fix: SQL报错 2021-03-12 10:37:50 +08:00
shiziyuan9527 f787ed11d4 refactor: i18n 2021-03-12 10:25:17 +08:00
wenyann 9d6cec56e1 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-12 10:23:38 +08:00
Tester_Z 114573a475
fix: 修复菜单栏缩放过大导致的布局错位问题 (#1594) 2021-03-12 09:48:39 +08:00
Coooder-X de06a5e770
fix: 国际化补充 (#1615)
* feat(测试跟踪): 测试用例下载模版增加标签列

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

* fix: 国际化补充
2021-03-11 20:44:49 +08:00
Coooder-X c25f10050b
feat(接口定义): 支持接口定义导出为 swagger 格式 (#1606)
* feat(测试跟踪): 测试用例下载模版增加标签列

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

* feat(接口定义): 支持接口定义导出为 swagger 格式
2021-03-11 20:44:29 +08:00
Ambitiousliga b8c8d036bf
fix(接口测试):修复只读用户权限过高能对数据进行操作 (#1614)
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com>
2021-03-11 20:41:25 +08:00
chenjianxing 5ec898a4fb Merge branch 'master' of github.com:metersphere/metersphere 2021-03-11 20:28:24 +08:00
chenjianxing 0e5494cbe2 模块树转脑图 2021-03-11 20:27:54 +08:00
wenyann 3aae293f22 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 18:54:04 +08:00
fit2-zhao 5870c64653 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 18:49:41 +08:00
shiziyuan9527 4c6760df8b fix(测试用例): 字符串限制长度不一致
Closes #1574
2021-03-11 18:40:23 +08:00
fit2-zhao 4cd4a7592b Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	frontend/src/business/main.js
2021-03-11 18:34:03 +08:00
wenyann 4edddd5e39 Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	backend/src/main/resources/db/migration/V78__v1.8_release.sql
2021-03-11 18:33:38 +08:00
wenyann c3627e5f29 fix:测试评审接口列表修改 2021-03-11 18:32:34 +08:00
chenjianxing 1b541ab4fc fix: 解决冲突 2021-03-11 18:12:50 +08:00
fit2-zhao 257d031b8a Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 17:59:27 +08:00
fit2-zhao 50d4d03380 fix(接口自动化): 修复因卡顿 重复提交的问题 2021-03-11 17:54:40 +08:00
chenjianxing 4d1958fd01 fix: 脑图样式 2021-03-11 17:42:41 +08:00
shiziyuan9527 b08a524f2a fix: 修复顶部菜单样式 2021-03-11 17:31:57 +08:00
Captain.B 4557e1905d fix(性能测试): 查看报告的时候不能点击线程类型 2021-03-11 17:26:18 +08:00
Captain.B 84895e7d34 chore: sync 2021-03-11 17:22:03 +08:00
Captain.B f49e0ce771 Merge remote-tracking branch 'origin/master' 2021-03-11 17:21:12 +08:00
Captain.B d92f04c1bd refactor(性能测试): 性能测试压力预览图修改 2021-03-11 17:20:50 +08:00
fit2-zhao 7dfa50d348 fix(接口定义): 保存用例最后执行环境 2021-03-11 17:03:29 +08:00
shiziyuan9527 6500e0cf4a Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	frontend/src/business/components/xpack
2021-03-11 16:46:58 +08:00
shiziyuan9527 56e9399595 feat(系统设置): 修改配色 2021-03-11 16:38:40 +08:00
song.tianyang 9f33d88d3a Merge remote-tracking branch 'origin/master' 2021-03-11 16:36:42 +08:00
song.tianyang 2a29e611b5 feat: 接口自动化模块Har文件导入
接口自动化模块Har文件导入
2021-03-11 16:34:14 +08:00
wenyann 0d1d1acd3d fix:修复测试报告不存在 2021-03-11 16:32:47 +08:00
fit2-zhao be133b3cc6 fix(接口自动化,接口定义): 修复列表数据放到回收站再恢复时状态错误问题 2021-03-11 15:56:54 +08:00
wenyann 6b46f3120b Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 14:14:29 +08:00