Commit Graph

2346 Commits

Author SHA1 Message Date
wenyann dd049e7893 fix(测试计划): 修复测试方式为自动时通过按钮禁止 2020-08-05 18:22:56 +08:00
chenjianxing 60d863208b fix: 接口测试首页定时任务 2020-08-05 18:21:15 +08:00
chenjianxing 61496ce11a fix: 侧边栏折叠样式 2020-08-05 18:13:14 +08:00
chenjianxing 0d3f93a71c fix: 保存接口测试跳转 2020-08-05 17:23:03 +08:00
chenjianxing 04e823646a Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-08-05 17:22:16 +08:00
chenjianxing f10c233858 refactor: 保存接口测试不跳转到列表页面 2020-08-05 17:22:01 +08:00
chenjianxing 1803f9cf67 fix: 浏览器回退关闭对话框 2020-08-05 17:00:23 +08:00
q4speed 018f7caf88 fix(接口测试): 修复zookeeper无限重连bug,修复Registry Center更新后无法生效bug 2020-08-05 16:57:54 +08:00
chenjianxing f10fef30bf Merge branch 'master' of https://github.com/metersphere/server 2020-08-05 13:10:40 +08:00
chenjianxing ff7d0e0343 fix: 解决冲突 2020-08-05 13:10:24 +08:00
chenjianxing 3a8dc9ee04 fix: 修复插件导入kv类型body报错 2020-08-05 13:08:18 +08:00
shiziyuan9527 b49512a42b Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-05 11:18:25 +08:00
shiziyuan9527 9b5523d336 feat(测试跟踪): 测试用例批量删除 2020-08-05 11:17:17 +08:00
chenjianxing 1faa4b6e8c fix: 测试用例导入功能测试不能选择自动方式 2020-08-05 10:55:21 +08:00
BugKing 6125d57c9d
docs: Merge pull request #201 from maninhill/patch-4
Update README.md
2020-08-05 10:22:27 +08:00
chenjianxing e1089b1eb1 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-08-05 10:14:11 +08:00
chenjianxing 7de5205b99 fix: 模块树拖拽 2020-08-05 10:13:56 +08:00
wenyann c8b59784fa fix(系统设置): 修复用户邮箱格式支持带符号 2020-08-05 10:11:26 +08:00
maninhill ffe0ca5a8a
Update README.md 2020-08-05 09:38:08 +08:00
wenyann e18e61a918 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-08-04 19:04:24 +08:00
wenyann 74ea612f2e fix(测试计划): 修复测试用例筛选条件 2020-08-04 19:04:03 +08:00
shiziyuan9527 fdc9b1c2fe feat(测试跟踪): 测试用例批量编辑 2020-08-04 19:01:36 +08:00
chenjianxing bca1ef13cb fix: 点击定时任务启动报错 2020-08-04 18:01:41 +08:00
chenjianxing f274cd3b32 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-08-04 17:54:53 +08:00
chenjianxing 9d293f653e fix: 环境设置beaseUrl 2020-08-04 17:54:36 +08:00
chenjianxing ff76a7e69d refactor: 环境域名可以设置为DbeaseUrl 2020-08-04 17:46:44 +08:00
wenyann 5fb0fc59b7 Merge remote-tracking branch 'origin/master' 2020-08-04 17:36:30 +08:00
wenyann b4658c2a9a feat(测试跟踪): 修改新增字段长度 2020-08-04 17:35:58 +08:00
chenjianxing 998750d77f 性能测试首页定时任务列表 2020-08-04 17:35:09 +08:00
wenyann e67e3d06cf Merge branch 'v1.1' 2020-08-04 17:30:15 +08:00
wenyann 0cc8ff5d19 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-08-04 17:28:01 +08:00
wenyann 58cfcb13ff fix(系统设置): 组织管理员编辑工作空间弹框问题 2020-08-04 17:27:36 +08:00
chenjianxing 79c3e771c4 Merge branch 'master' of https://github.com/metersphere/server 2020-08-04 17:11:43 +08:00
chenjianxing 1a33e7ddac fix: 修复冲突 2020-08-04 17:11:28 +08:00
wangzhen-fit2cloud ebba3937c7 Merge branch 'master' of github.com:metersphere/metersphere 2020-08-04 17:02:17 +08:00
wenyann 833d80faf5 Merge remote-tracking branch 'origin/master' 2020-08-04 16:45:17 +08:00
wenyann 4359861a50 feat(测试跟踪): 导出用例,备注显示文本框名字 2020-08-04 16:44:56 +08:00
wangzhen-fit2cloud 9d4d2edae3 Merge branch 'master' of github.com:metersphere/metersphere 2020-08-04 16:39:58 +08:00
wangzhen-fit2cloud 40b3f06c3f docs: 修改 roadmap 内容 2020-08-04 16:38:51 +08:00
chenjianxing 4ad4a698cd Merge branch 'master' of https://github.com/metersphere/server 2020-08-04 16:38:06 +08:00
chenjianxing 002ace6b16 接口测试首页定时任务列表 2020-08-04 16:37:42 +08:00
wenyann 628a99f697 Merge remote-tracking branch 'origin/master' 2020-08-04 16:36:36 +08:00
wenyann b29720930e feat(测试跟踪): 测试方式自动时关联用例增加其它选项 2020-08-04 16:36:04 +08:00
Captain.B 4cb0940b28 fix: 处理合并分支的冲突 2020-08-04 16:20:36 +08:00
chenjianxing 4f298c6bb0 refactor: 取消请求参数长度限制
(cherry picked from commit fac8442392)
2020-08-04 16:12:08 +08:00
wenyann fdfee3a6b8 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-04 16:10:43 +08:00
wenyann 559fcc3c71 feat(测试跟踪): 测试方式自动时关联用例增加其它选项 2020-08-04 16:10:22 +08:00
Captain.B 9f4dd6e49c Merge branch 'v1.1'
# Conflicts:
#	frontend/src/business/components/api/test/components/ApiScenarioVariables.vue
#	frontend/src/business/components/api/test/model/ScenarioModel.js
2020-08-04 16:07:26 +08:00
shiziyuan9527 52f6d4f336 feat(测试跟踪): 批量编辑用例组件 2020-08-04 14:58:55 +08:00
Captain.B eebfb72110 refactor(性能测试): 修改测试报告label 2020-08-04 12:36:42 +08:00