Commit Graph

1874 Commits

Author SHA1 Message Date
fit2-zhao a92db96844 fix(接口测试): 加强host列表校验 2020-09-07 13:42:21 +08:00
q4speed 7f296f453c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	frontend/src/business/components/api/test/components/ApiScenarioConfig.vue
#	frontend/src/business/components/api/test/components/request/ApiHttpRequestForm.vue
2020-09-07 13:29:37 +08:00
q4speed d6459dfa73 feat(接口测试): 增加场景拼接 2020-09-07 13:20:27 +08:00
fit2-zhao 92c5215349 fix(接口测试): 加强host列表校验 2020-09-07 11:41:57 +08:00
fit2-zhao ce579fe143 fix(接口调试): 修复调试未勾选参数加入执行缺陷 2020-09-07 10:23:25 +08:00
fit2-zhao 59aeb11fa1 feat(接口测试): 环境配置增加hosts 2020-09-04 19:35:50 +08:00
fit2-zhao 60961c0a27 style(接口测试): 规范化提交内容 2020-09-03 16:17:15 +08:00
fit2-zhao 82cf5b25c4 Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	frontend/src/business/components/api/test/components/ApiVariable.vue
2020-09-03 15:11:05 +08:00
fit2-zhao ed4b773bd8 feat(接口调试): 参数增加启用/禁用勾选项 2020-09-03 14:59:12 +08:00
chenjianxing 765d0941c3 Merge branch 'v1.2' 2020-09-03 13:31:01 +08:00
chenjianxing 306773ddcd fix(接口测试): 兼容旧版本beanshell 2020-09-03 13:28:58 +08:00
wenyann 3e14fd3d6b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	frontend/src/business/components/common/components/MsScheduleEdit.vue
2020-09-03 10:36:44 +08:00
wenyann 6785e58d10 feat: 任务通知 2020-09-03 10:34:13 +08:00
Captain.B ec931d038c refactor: 修改 Header 上注册事件的方式 2020-09-03 10:02:51 +08:00
chenjianxing 5b750fe55f refact: 解决冲突 2020-09-02 19:33:38 +08:00
chenjianxing 86098dee8a refactor: merge v1.2 2020-09-02 19:32:31 +08:00
chenjianxing 9f9210bb87 fix(接口测试): 修复环境删除时,测试保存无反应 2020-09-02 19:18:37 +08:00
chenjianxing dc6e777bb6 Merge branch 'v1.2' of https://github.com/metersphere/server into v1.2 2020-09-02 18:19:41 +08:00
chenjianxing 7a0535b6b3 fix(接口测试): dubbo 禁用保存不生效 2020-09-02 18:19:15 +08:00
Captain.B 32d8054304 Merge branch 'v1.2' into master 2020-09-02 17:06:56 +08:00
Captain.B e9c79676c1 chore: 去掉不用的文件 2020-09-02 17:03:08 +08:00
wenyann af53cf7c47 Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	frontend/src/business/components/common/components/MsScheduleEdit.vue
2020-09-02 16:24:27 +08:00
wenyann 2dbe00bf23 fix: 任务通知设置 2020-09-02 16:21:40 +08:00
chenjianxing d0e8cf0a49 Merge branch 'v1.2' of https://github.com/metersphere/server into v1.2 2020-09-02 15:29:17 +08:00
chenjianxing 7d6cf859df feat(接口测试): 支持python脚本 2020-09-02 15:29:01 +08:00
Captain.B 738311dc86 Merge branch 'v1.2' into master 2020-09-02 10:51:09 +08:00
Captain.B 1ae6ab2b88 refactor(接口测试): 修改高级参数设置按钮样式 2020-09-02 10:42:52 +08:00
Captain.B da8c52e6e3 refactor: 合并代码修改部分页面显示 2020-09-01 18:02:47 +08:00
Captain.B 5aa7019bb0 Merge branch 'v1.2' into master
# Conflicts:
#	frontend/src/business/components/common/components/MsScheduleEdit.vue
2020-09-01 17:54:53 +08:00
shiziyuan9527 1a9fcf0d7b feat: 性能测试报告批量删除 2020-09-01 16:22:58 +08:00
Captain.B 4c18b8d29a feat(性能测试): 支持上传多个csv 2020-09-01 10:21:24 +08:00
Captain.B 7d156c4399 Merge branch 'v1.2' of github.com:fit2cloudrd/metersphere-server into v1.2 2020-09-01 10:08:31 +08:00
chenjianxing 4fa973eff1 Merge branch 'master' of https://github.com/metersphere/server 2020-08-31 23:37:04 +08:00
chenjianxing 286439c56d refactor(接口测试): 后置处理器可以获取提取后的变量 2020-08-31 20:28:46 +08:00
chenjianxing 05979450fd Merge branch 'v1.2' of https://github.com/metersphere/server into v1.2 2020-08-31 20:15:04 +08:00
chenjianxing 31d7fa36f3 feat(接口测试): 跟随重定向配置 2020-08-31 20:14:49 +08:00
wenyann 53ba48b468 Merge remote-tracking branch 'origin/master' 2020-08-31 17:41:24 +08:00
wenyann 8d88ff7f6e feat: 增加帮助文档跳转 2020-08-31 17:40:56 +08:00
Captain.B 6bcb7aa16b refactor: 调整js代码 2020-08-31 17:27:57 +08:00
shiziyuan9527 4203707ef5 feat: 接口测试报告批量删除 2020-08-31 17:18:25 +08:00
Captain.B 708c3deb1a refactor: 页面样式修改 2020-08-31 17:06:27 +08:00
shiziyuan9527 63fc4c0f1e refactor: 保存jira认证信息时补全地址 2020-08-31 15:15:35 +08:00
Captain.B 336020322d refactor: track home 页面样式调整 2020-08-31 14:06:19 +08:00
wenyann 02d5aa8bc7 Merge branch 'v1.2' of https://github.com/metersphere/metersphere into v1.2 2020-08-29 12:00:55 +08:00
wenyann f22bc72602 fix:测试用例备注字符修改为500 2020-08-29 12:00:33 +08:00
shiziyuan9527 b88e3d5bff fix: jira 提交缺陷失败的问题 2020-08-28 18:16:27 +08:00
Captain.B a7a53241ba Merge branch 'v1.2' of github.com:fit2cloudrd/metersphere-server into v1.2 2020-08-28 17:56:07 +08:00
Captain.B c29dd93243 fix(性能测试): 点击再次执行时查询时间状态检测 2020-08-28 17:55:56 +08:00
q4speed 7714805698 refactor: 优化代码 2020-08-28 17:10:17 +08:00
wenyann 5353d7a04a Merge remote-tracking branch 'origin/v1.2' into v1.2 2020-08-28 16:39:23 +08:00
wenyann c2cef4bd70 fix: 用例导出优化 2020-08-28 16:38:44 +08:00
Captain.B 8298781148 fix: 修复切换路由之后执行时间没有查询的问题 2020-08-28 16:26:18 +08:00
Captain.B 0757d0f6ab fix: 修复资源池下拉框显示uuid的问题 2020-08-28 16:03:09 +08:00
wenyann 082c634611 Merge branch 'v1.2' of https://github.com/metersphere/metersphere into v1.2 2020-08-28 13:35:54 +08:00
chenjianxing 46cab70f36 refactor: 对话框不点击外部自动关闭 2020-08-28 12:10:54 +08:00
chenjianxing 0dc6e10529 Merge branch 'master' of https://github.com/metersphere/server 2020-08-28 11:39:06 +08:00
chenjianxing 2548bad565 Merge branch 'v1.2' 2020-08-28 11:38:35 +08:00
q4speed ac3093641f refactor: 优化代码 2020-08-28 11:26:32 +08:00
wenyann f529d7f6bb Merge branch 'master' into v1.2 2020-08-28 10:38:55 +08:00
wenyann 00c269ff8d fix:创建测试用例点击窗口外区域不关闭当前窗口
fix:测试名称校验
2020-08-28 10:30:42 +08:00
chenjianxing b0f720bb1e fix(接口测试): 代码模版添加undefined问题 2020-08-27 17:58:48 +08:00
chenjianxing e07f24b817 fix(测试跟踪): 测试步骤列表高度问题 2020-08-27 17:50:13 +08:00
wenyann 98b0391234 fix: 一键运行同一项目报错提示 2020-08-27 15:51:44 +08:00
wenyann d8094b3907 fix: 一键运行同一项目报错提示 2020-08-27 14:59:18 +08:00
Captain.B 788e020168 fix: 修复 this 绑定偶现的问题 2020-08-27 10:26:16 +08:00
Captain.B 117a1c0e98 Merge remote-tracking branch 'origin/master' into master 2020-08-27 10:17:45 +08:00
Captain.B c7e04f2f32 fix: 修复 echart title 消失的问题 2020-08-27 10:17:27 +08:00
wenyann 7ddd9f23d2 fix: 测试结果统计图页面修改 2020-08-27 10:15:40 +08:00
chenjianxing 9d88665a1a fix: Login.vue 控制台报错 2020-08-26 21:31:39 +08:00
chenjianxing 6604834cbf Merge branch 'master' of https://github.com/metersphere/server 2020-08-26 18:49:12 +08:00
chenjianxing 2bf023ecac fix(接口测试): 请求超时时间限制最小值 2020-08-26 18:48:45 +08:00
shiziyuan9527 00acafbcdc Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-26 18:05:52 +08:00
shiziyuan9527 a68990a27d refactor: 修改测试计划搜索框的提示 2020-08-26 18:05:24 +08:00
chenjianxing 8dc66e9268 fix(接口测试): 禁用场景不校验 2020-08-26 17:57:34 +08:00
chenjianxing 8eeb51258f Merge branch 'master' of https://github.com/metersphere/server 2020-08-26 17:48:57 +08:00
chenjianxing 1f6fffad2c refactor: 复制测试可填写测试名称 2020-08-26 17:20:56 +08:00
Captain.B 395344b53c Merge branch 'master' of github.com:fit2cloudrd/metersphere-server into master 2020-08-26 16:59:02 +08:00
Captain.B 9ae8305b2c refactor: 修改 chart title 2020-08-26 16:58:36 +08:00
wenyann a0c389a0c9 Merge remote-tracking branch 'origin/master' 2020-08-26 16:54:19 +08:00
wenyann d52819d0d2 fix: 测试结果页面修改 2020-08-26 16:53:56 +08:00
Captain.B 7dba6df7b1 Merge remote-tracking branch 'origin/master' into master 2020-08-26 16:24:09 +08:00
Captain.B b653848594 refactor: 默认使用svg渲染echart 2020-08-26 16:23:31 +08:00
chenjianxing 5b017a42a5 fix(接口测试): 无可用请求时可保存不可执行 2020-08-26 16:04:53 +08:00
chenjianxing 6550c47338 Merge branch 'master' of https://github.com/metersphere/server 2020-08-26 16:02:14 +08:00
chenjianxing 205f4ce4ed refactor(接口测试): 没有可用请求时提示 2020-08-26 16:02:06 +08:00
Captain.B e483748b97 Merge remote-tracking branch 'origin/master' into master 2020-08-26 15:52:36 +08:00
chenjianxing e8ee29da09 fix(接口测试): body 文件上传大小限制 2020-08-26 15:46:47 +08:00
Captain.B a487a1f2aa refactor: 为路由设置roles 2020-08-26 15:45:43 +08:00
chenjianxing d7313eabdd fix(接口测试): 禁用请求不校验 2020-08-26 15:34:36 +08:00
Captain.B 1af11f2bc0 refactor: 去掉import的警告 2020-08-26 14:43:03 +08:00
BugKing 1cc6476f15 refactor(测试跟踪): 修改用例批量操作文本提示 2020-08-26 14:00:20 +08:00
wenyann e44311c2a8 Merge remote-tracking branch 'origin/master' 2020-08-26 13:29:54 +08:00
wenyann 7afbe8fa3f fix: 修复缺陷描述,测试结果列表表格太长 2020-08-26 13:29:29 +08:00
chenjianxing ec4632be45 Merge branch 'master' of https://github.com/metersphere/server 2020-08-26 13:03:23 +08:00
chenjianxing 9ffffe5703 fix(接口测试): 文件上传调试执行失败 2020-08-26 13:03:03 +08:00
Captain.B b8bf889e94 fix: 修复 api header menus undefine 的问题 2020-08-26 11:56:55 +08:00
Captain.B f642b5ace1 refactor(接口测试): 接口测试报告页面调整 2020-08-26 11:32:40 +08:00
Captain.B 3aa9c19468 Merge branch 'master' of github.com:fit2cloudrd/metersphere-server into master 2020-08-26 11:29:13 +08:00
Captain.B 71bea4e0f4 refactor(接口测试): 接口测试页面调整 2020-08-26 11:28:34 +08:00
shiziyuan9527 4bef8a0edc fix: 去掉测试用例测试计划列表上方的批量操作按钮 2020-08-26 11:28:33 +08:00
chenjianxing 895c43bbaf Merge branch 'master' of https://github.com/metersphere/server 2020-08-26 10:49:39 +08:00
chenjianxing 3882914c6b refactor(接口测试): 单接口执行页面优化 2020-08-26 10:48:00 +08:00
q4speed 4632afab9c chore: update submodule 2020-08-26 10:14:25 +08:00
shiziyuan9527 5bd35fa4f1 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-25 18:18:59 +08:00
shiziyuan9527 b82ffef3cf fix: 提缺陷时生成缺陷描述 2020-08-25 18:18:50 +08:00
q4speed 54f025e6a2 Merge remote-tracking branch 'origin/master' 2020-08-25 17:48:13 +08:00
q4speed 954262a631 style: 修复表格抖动bug 2020-08-25 17:47:58 +08:00
Captain.B a34cb53bbb Merge remote-tracking branch 'origin/master' into master 2020-08-25 17:45:35 +08:00
Captain.B 20a124b593 feat: 修改列表项刷新head 2020-08-25 17:44:49 +08:00
chenjianxing 5424f9b505 fix(接口测试): 前置脚本禁用获取响应代码模版 2020-08-25 17:31:32 +08:00
chenjianxing 8531e7e176 fix(测试跟踪): 快速点击模块树报错问题 2020-08-25 17:14:30 +08:00
chenjianxing d4a722033e Merge branch 'master' of https://github.com/metersphere/server 2020-08-25 16:50:58 +08:00
chenjianxing d5727857e5 fix(接口测试): 超时设置上限 2020-08-25 16:50:42 +08:00
wenyann 7f0f245609 Merge remote-tracking branch 'origin/master' 2020-08-25 16:06:47 +08:00
wenyann 8a60a57102 fix: 修复一键运行uuid重复 2020-08-25 16:05:58 +08:00
chenjianxing ae8389bb90 fix: body json 格式化大数字异常 2020-08-25 16:03:14 +08:00
chenjianxing 19224b367d Merge branch 'master' of https://github.com/metersphere/server 2020-08-25 15:48:44 +08:00
shiziyuan9527 3c482f4840 refactor: 修改系统组织菜单下成员列表的表格样式 2020-08-25 15:48:16 +08:00
chenjianxing b055fac758 Merge branch 'master' of https://github.com/metersphere/server 2020-08-25 15:44:26 +08:00
chenjianxing 52049d61d4 refacotr: 合并v1.1 2020-08-25 15:44:07 +08:00
shiziyuan9527 75ae9f6ce4 fix: 修改缺陷预览样式 2020-08-25 15:42:20 +08:00
chenjianxing 1e870fd04e fix(接口测试): 首次提取失败问题 2020-08-25 15:24:49 +08:00
chenjianxing 7ed2d30acd refactor(接口测试): 前后置脚本排版优化 2020-08-25 14:22:19 +08:00
chenjianxing dc64026250 Merge branch 'master' of https://github.com/metersphere/server 2020-08-25 14:15:24 +08:00
chenjianxing 51fb3466ae refactor: 用例名称长度限制改为50 2020-08-25 14:15:06 +08:00
wenyann e93622d8ec Merge remote-tracking branch 'origin/master' 2020-08-25 14:08:36 +08:00
wenyann e743be130c fix: 修复一键运行报错 2020-08-25 14:08:12 +08:00
chenjianxing 050a519d54 refactor: 解决冲突 2020-08-25 13:44:50 +08:00
chenjianxing d54b32ced3 feat(接口测试): 接口测试支持文件上传 2020-08-25 13:42:31 +08:00
Captain.B ea9378c81d style: 格式化vue代码 2020-08-25 10:17:55 +08:00
q4speed abd9bad78b Merge remote-tracking branch 'origin/master' 2020-08-24 18:42:49 +08:00
q4speed 62899cbd22 perf: 路由懒加载 2020-08-24 18:42:35 +08:00
q4speed cc3f2a68e1 refactor: 优化代码 2020-08-24 18:41:53 +08:00
shiziyuan9527 cbf1bc09e2 fix: 测试计划可以关联多个模块下的用例 2020-08-24 18:09:08 +08:00
wenyann 9f76a15120 Merge remote-tracking branch 'origin/master' 2020-08-24 16:51:57 +08:00
wenyann e33ffa6542 fix: 缺陷列表按时间排序 2020-08-24 16:51:33 +08:00
shiziyuan9527 f1846943be fix: 提交缺陷后隐藏输入框 2020-08-24 16:48:02 +08:00
shiziyuan9527 88b1cfd71a refactor: 修改搜索框的提示 2020-08-24 16:35:52 +08:00
shiziyuan9527 694f712f52 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-24 16:14:10 +08:00
wenyann e0de47e1cc fix: 缺陷列表当前处理人修改 2020-08-24 16:11:37 +08:00
shiziyuan9527 8fcf7aea75 fix: 缺陷添加创建时间 2020-08-24 16:10:12 +08:00
wenyann e8918c08c4 fix: 修改模块显示路径,时间排序 2020-08-24 16:08:52 +08:00
shiziyuan9527 9ad4da05cd fix: 修改缺陷标题长度 2020-08-24 14:11:08 +08:00
shiziyuan9527 e00c3ddab0 fix: 测试计划切换用例时更新缺陷信息 2020-08-21 17:44:42 +08:00
wenyann 001e275a83 Merge remote-tracking branch 'origin/master' 2020-08-21 16:37:51 +08:00
wenyann ff955209b2 fix: 修改关联其他测试提示 2020-08-21 16:37:19 +08:00
shiziyuan9527 8572956083 refactor: i18n 2020-08-21 14:46:50 +08:00
q4speed be574b1b40 chore: update submodule 2020-08-21 14:29:00 +08:00
q4speed cb8b73d9ad feat(性能测试): 增加资源池限额过滤 2020-08-21 11:14:47 +08:00
wenyann 83f90d7d12 Merge remote-tracking branch 'origin/master' 2020-08-20 19:11:09 +08:00