Commit Graph

2184 Commits

Author SHA1 Message Date
chenjianxing fdde95218d Merge branch 'master' of https://github.com/metersphere/server 2020-09-08 17:26:22 +08:00
chenjianxing 2deec48cd5 fix(接口测试): python 执行失败 2020-09-08 17:25:57 +08:00
shiziyuan9527 fbce41bb3e refactor(测试计划): 删除测试计划时同时删除相关联数据 2020-09-08 15:20:30 +08:00
wenyann 913ff44480 fix: 任务通知设置 2020-09-08 14:52:44 +08:00
shiziyuan9527 dad8ad2be9 feat: 测试计划关联用例支持跨项目 2020-09-07 22:30:38 +08:00
q4speed c1dfe05e87 Merge remote-tracking branch 'origin/master' 2020-09-07 16:11:23 +08:00
fit2-zhao ab4be0a23b style(接口调试): 格式化内容 2020-09-07 16:11:06 +08:00
q4speed c9cf9b8e8f feat(接口测试): 请求支持跨场景拖拽 2020-09-07 16:11:06 +08:00
fit2-zhao 2b462c4f1c fix(接口调试): 修复body内容无法传递问题 2020-09-07 15:59:44 +08:00
fit2-zhao 20f89c0017 Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	frontend/src/business/components/api/test/ApiTestConfig.vue
2020-09-07 13:44:40 +08:00
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
wenyann 0a39e34b37 fix: 修改时间 2020-08-20 19:10:23 +08:00
Captain.B ae7d030577 Merge remote-tracking branch 'origin/master' into master 2020-08-20 18:58:35 +08:00
Captain.B 246b63d432 fix: 修复jmeter内置函数的提示 2020-08-20 18:58:20 +08:00
chenjianxing 9a9d702aca Merge branch 'master' of https://github.com/metersphere/server 2020-08-20 18:16:45 +08:00
chenjianxing eceb099545 feactor: 用户ID支持特殊字符 2020-08-20 18:16:28 +08:00
q4speed 22b6fb25c4 chore: update submodule 2020-08-20 18:08:08 +08:00
wenyann 56914fa834 style:禁掉导出按钮 2020-08-20 17:41:52 +08:00
wenyann a722d6419e Merge remote-tracking branch 'origin/master' 2020-08-20 16:51:06 +08:00
wenyann ad808590e7 fix: 修复接口报告不更新问题 2020-08-20 16:50:34 +08:00
chenjianxing c4d4284957 fix(接口测试): 只读用户单接口调试 2020-08-20 16:02:14 +08:00
chenjianxing 72010207ea Merge branch 'master' of https://github.com/metersphere/server 2020-08-20 15:53:52 +08:00
chenjianxing 53b2833ee4 fix(测试跟踪): 只读用户创建用户测试报告 2020-08-20 15:53:16 +08:00
shiziyuan9527 1038f50c3f fix: 修改缺陷描述 2020-08-20 15:00:18 +08:00
chenjianxing 3ebee20b90 Merge branch 'master' of https://github.com/metersphere/server 2020-08-20 14:37:25 +08:00
chenjianxing 84e9c23486 feat(接口测试): 添加超时设置 2020-08-20 14:37:05 +08:00
Captain.B a50666f1d6 Updating the submodule to the latest version 2020-08-20 12:12:20 +08:00
chenjianxing fbed4ecda4 fix: 解决冲突 2020-08-19 18:10:31 +08:00
chenjianxing 948e489626 fix(接口调试): 接口调试响应不更新问题 2020-08-19 18:04:42 +08:00
shiziyuan9527 7445f06d58 refactor: i18n 2020-08-19 17:05:31 +08:00
Captain.B 4c0ca40b1a Merge remote-tracking branch 'origin/master' into master 2020-08-19 16:36:05 +08:00
Captain.B e3ce7c0db2 fix: 修复删除测试和报告的时候没有及时刷新 recent 列表的问题 2020-08-19 16:35:37 +08:00
shiziyuan9527 4efcd10bae refactor: 修改服务集成样式 2020-08-19 15:56:57 +08:00
chenjianxing 83c21a33b5 Merge branch 'master' of https://github.com/metersphere/server 2020-08-19 15:41:24 +08:00
chenjianxing 478d6db83b feat(接口测试): 场景和接口支持禁用和启用 2020-08-19 15:41:14 +08:00
shiziyuan9527 fabba9a364 refactor: i18n 2020-08-19 11:55:00 +08:00
Captain.B b5fab0f8a6 refactor: Api Keys 前端页面修改 2020-08-19 11:50:08 +08:00
Captain.B a435a5194d refactor: Api Keys 前端页面修改 2020-08-19 11:46:01 +08:00
Captain.B 759fd8cadd Merge remote-tracking branch 'origin/master' into master 2020-08-19 11:00:09 +08:00
Captain.B 4b4b3d92dc refactor: 系统设置前端页面修改 2020-08-19 10:58:35 +08:00
wenyann dea1884cc2 Merge remote-tracking branch 'origin/master' 2020-08-19 10:46:08 +08:00
wenyann 88429985c6 style(LDAP): 删掉无用代码 2020-08-19 10:45:40 +08:00
q4speed 0197515077 chore: 子模块 2020-08-19 10:22:04 +08:00
wenyann b60d296c85 feat(测试跟踪): 新增缺陷列表,缺陷数 2020-08-19 10:03:15 +08:00
wenyann 29f5e772a1 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-19 10:02:22 +08:00
wenyann d9b3831b3e feat(测试跟踪): 新增缺陷列表,缺陷数 2020-08-19 10:02:02 +08:00
chenjianxing b04c573362 Merge branch 'master' of https://github.com/metersphere/server 2020-08-18 19:02:10 +08:00
chenjianxing d820bf400c feat(接口测试): dubbo BeanShell 2020-08-18 19:01:49 +08:00
shiziyuan9527 744e1fd7c2 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-18 18:47:32 +08:00
shiziyuan9527 ae151e4535 refactor: 修改样式 2020-08-18 18:47:24 +08:00
chenjianxing 65a033ce3a Merge branch 'master' of https://github.com/metersphere/server 2020-08-18 18:43:28 +08:00
chenjianxing f60e06d4c0 feat(接口测试): BeanShell 代码提示 2020-08-18 18:42:55 +08:00
q4speed cadcf9eb7b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
2020-08-18 18:10:02 +08:00
q4speed a26a12fb17 fix: 修复保存工作控件配额时超出组织的配额的bug 2020-08-18 18:08:50 +08:00
shiziyuan9527 26895e0c57 feat: 修改密码时进行二次确认 2020-08-18 16:53:57 +08:00
shiziyuan9527 ea8445a676 fix: 关联用例时首次加载全部用例 2020-08-18 16:30:29 +08:00
wenyann 6e8f7f4796 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-18 16:10:29 +08:00
wenyann 509e5c9fbb feat(LDAP): 测试报告导出 2020-08-18 15:56:19 +08:00
shiziyuan9527 7ffb6812cf fix: 取消集成后,解除项目关联 2020-08-18 15:44:41 +08:00
shiziyuan9527 ab07bc3de8 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-18 14:34:43 +08:00
shiziyuan9527 46d52334bf feat: 测试计划测试用例列表显示缺陷数 2020-08-18 14:33:52 +08:00
chenjianxing fcb8eeedf2 feat(接口测试): 支持Beanshell脚本 2020-08-18 14:32:24 +08:00
chenjianxing 163fae2e51 Merge branch 'master' of https://github.com/metersphere/server 2020-08-18 10:21:13 +08:00
chenjianxing a3bc670b44 fix: 修改sso名称 2020-08-18 10:20:39 +08:00
shiziyuan9527 240ac7ab26 feat: 集成Jira 2020-08-17 22:01:15 +08:00
chenjianxing 5ec095673c feat(接口测试): 前后置脚本页面 2020-08-17 19:23:29 +08:00
chenjianxing c1c2bc7f76 fix: swagger body参数循环依赖问题 2020-08-17 15:24:11 +08:00
chenjianxing 263aba9b57 fix: 单接口调试 2020-08-17 13:06:41 +08:00
chenjianxing 064304ba28 refactor: 适配cas 2020-08-17 10:09:19 +08:00
Captain.B 6e7fe725a1 Merge remote-tracking branch 'origin/master' 2020-08-14 19:20:11 +08:00
Captain.B fa23fcdfcd feat(接口测试): 代码调整 2020-08-14 19:19:53 +08:00
shiziyuan9527 f52a5cc078 feat: 集成Tapd 2020-08-14 18:07:42 +08:00
Captain.B b86fbafa00 feat(接口测试): Jmeter 函数说明 2020-08-14 16:51:36 +08:00
Captain.B ea872b5f79 feat(接口测试): Jmeter 函数说明 2020-08-14 16:50:12 +08:00
wenyann 1cff9c1d02 Merge remote-tracking branch 'origin/master' 2020-08-14 14:33:57 +08:00
wenyann 7e6530a591 style(测试跟踪): 测试报告优化 2020-08-14 14:33:02 +08:00
q4speed 2fb347bd85 Merge remote-tracking branch 'origin/master' 2020-08-14 13:35:34 +08:00
q4speed 3783d30d7e feat: 增加配额管理 2020-08-14 13:34:18 +08:00
Captain.B 26f29ade01 refactor: 高级参数设置组件 2020-08-14 13:15:02 +08:00
Captain.B 69bac33aa1 feat(接口测试): 处理变量 2020-08-14 12:19:41 +08:00
Captain.B 220c8fb099 Merge branch 'func' 2020-08-14 12:04:30 +08:00
Captain.B b63c136fb5 feat(接口测试): 处理变量 2020-08-14 12:02:20 +08:00
wenyann ccf7c0e52f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-13 19:09:14 +08:00
wenyann bf71b37cf4 style: 测试报告优化 2020-08-13 19:09:02 +08:00
shiziyuan9527 e8842accc2 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-13 17:15:40 +08:00
shiziyuan9527 f42a920fcf feat: 集成TAPD平台 2020-08-13 17:15:19 +08:00
Captain.B 01e22c9f1a feat(接口测试): 处理变量 2020-08-13 15:26:11 +08:00
Captain.B 9bad4b4a83 Merge branch 'master' into func 2020-08-13 14:12:16 +08:00
Captain.B 6461c1a6a6 feat(接口测试): 定义新的组件 2020-08-13 13:34:43 +08:00
Captain.B ad4709e502 feat: mock 数据 2020-08-13 11:11:14 +08:00
wenyann c3280f955d fix: 时间样式调整 2020-08-13 10:18:49 +08:00
Captain.B a1fa5de266 feat: mock 数据 2020-08-13 09:52:51 +08:00
wenyann 9e22233616 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-13 09:52:01 +08:00
wenyann 7530fff681 fix(接口测试): 报告页面时间显示调整,响应不刷新,页面全部展开 2020-08-13 09:51:03 +08:00
shiziyuan9527 47fad33be1 feat: 服务集成 2020-08-12 17:37:14 +08:00
wenyann b0e0aa1327 fix(接口测试): 报告 2020-08-12 16:48:54 +08:00
Captain.B 23f04146b3 Merge branch 'master' into func 2020-08-12 13:32:04 +08:00
Captain.B 6847ff0530 fix: 非 GET 请求中支持 url 参数 2020-08-12 13:14:38 +08:00
Captain.B 42a3f7261b Revert "refactor: 请求参数修改"
This reverts commit 468eea3b
2020-08-12 12:56:52 +08:00
Captain.B 0263662f97 refactor: 请求参数修改 2020-08-12 12:55:41 +08:00
Captain.B be57bf66a5 Merge branch 'master' into func 2020-08-12 12:40:17 +08:00
Captain.B e512957cd6 refactor: 请求参数修改 2020-08-12 12:14:53 +08:00
wenyann 9dca87376e Merge remote-tracking branch 'origin/master' 2020-08-12 10:58:49 +08:00
wenyann 0222b053b0 fix(测试计划): 时间修改 2020-08-12 10:58:10 +08:00
shiziyuan9527 b13fb0f001 feat: 服务集成 2020-08-11 17:17:25 +08:00
wenyann 59c9cdfef2 fix(接口测试): 场景重复 2020-08-11 15:57:50 +08:00
wenyann a8671ca4f3 Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	frontend/src/business/components/api/report/components/ScenarioResults.vue
	frontend/src/business/components/common/head/ShowAll.vue
2020-08-11 14:52:02 +08:00
wenyann 66b6c179e8 feat(接口测试):增加接口测试一键运行功能 2020-08-11 14:40:18 +08:00
Captain.B 468eea3b50 refactor: 请求参数修改 2020-08-11 14:28:20 +08:00
chenjianxing 9692b8d2a5 fix(测试跟踪): fix 提缺陷生成D实际结果不正确 2020-08-11 11:22:28 +08:00
chenjianxing b37d6a15f2 fix: 选择raw类型body后,切换成kv请求头错误 2020-08-11 11:15:16 +08:00
chenjianxing f316d99141 Merge branch 'master' of https://github.com/metersphere/server 2020-08-11 10:36:45 +08:00
chenjianxing e187d91c76 feat(接口测试): dubbo 单接口调试 2020-08-11 10:36:18 +08:00
Captain.B 2f1b8e9d1a feat: 请求body支持变量 2020-08-11 10:22:19 +08:00
Captain.B 8b2041bbd9 feat: 请求Headers支持变量 2020-08-11 10:05:09 +08:00
chenjianxing 22950f0893 Merge branch 'master' of https://github.com/metersphere/server 2020-08-10 21:59:26 +08:00
chenjianxing 4e0b340c20 feat(接口测试): 单接口调试 2020-08-10 21:59:11 +08:00
Captain.B 92667da369 refactor(性能测试): 修改测试报告展示压力配置的逻辑 2020-08-10 18:31:53 +08:00
Captain.B 88a9807dfb feat: 显示性能测试的压力配置 2020-08-10 18:17:31 +08:00
Captain.B ece541e80e Merge remote-tracking branch 'origin/master' 2020-08-10 18:07:55 +08:00
Captain.B dfd66d3793 feat: 显示性能测试的压力配置 2020-08-10 18:07:17 +08:00
shiziyuan9527 57ec7ba0c9 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-10 17:58:21 +08:00
shiziyuan9527 6e0f0bdd1a refactor: i18n 2020-08-10 17:58:05 +08:00
q4speed 27b5d37033 Merge remote-tracking branch 'origin/master' 2020-08-10 17:04:56 +08:00
q4speed c8e6b5106f refactor: 优化代码 2020-08-10 17:04:34 +08:00
shiziyuan9527 1007479e20 feat(系统设置): 组织菜单下增加服务集成子菜单 2020-08-10 16:18:17 +08:00
Captain.B 585c85e86b Merge branch 'master' of github.com:fit2cloudrd/metersphere-server 2020-08-10 14:59:54 +08:00
Captain.B da226cf76e feat: 显示Jmeter的内置函数提示 2020-08-10 14:59:20 +08:00
shiziyuan9527 2646dc94b4 feat(测试跟踪): 测试计划下用例按照ID字段排序 2020-08-10 14:17:16 +08:00
chenjianxing 94079cd283 refactor: 去掉post请求末尾?号 2020-08-07 19:44:14 +08:00
chenjianxing 95341e5663 fix: body格式化 2020-08-07 19:39:54 +08:00
chenjianxing 1582a46534 refactor: 执行结果不填时,测试用例可通过 2020-08-07 19:22:17 +08:00
chenjianxing 6d6506a3cb fix: 资源池校验 2020-08-07 19:14:33 +08:00
chenjianxing 2e130d3eb5 fix: 步骤描述显示问题 2020-08-07 19:06:09 +08:00
Captain.B 18eb1827ef feat: 高级参数设置前端实现 2020-08-07 17:46:53 +08:00
Captain.B 9d6c1ea86d feat: 高级参数设置前端实现 2020-08-07 17:43:19 +08:00
Captain.B fa13003865 Merge branch 'master' of github.com:fit2cloudrd/metersphere-server 2020-08-07 17:37:45 +08:00
Captain.B 5bc5eeb4db feat: 高级参数设置预览 2020-08-07 17:37:29 +08:00
chenjianxing 683fed8ec9 feat: 接口调试部分代码 2020-08-07 17:16:24 +08:00
Captain.B fdda9b00b0 feat: 使用java运行js脚本,添加相关js 2020-08-07 16:26:54 +08:00
chenjianxing 9b294a00f8 Merge branch 'v1.1' of https://github.com/metersphere/server 2020-08-07 11:36:01 +08:00
chenjianxing df2f972c9a Merge branch 'master' of https://github.com/metersphere/server 2020-08-07 11:26:10 +08:00
chenjianxing 76ae0969c4 feat: 场景内cookie共享 2020-08-07 11:25:56 +08:00
Captain.B 2013aafb86 Merge branch 'func' 2020-08-07 10:36:28 +08:00
Captain.B 00ef9b7db9 feat: 高级参数设置 2020-08-07 10:34:05 +08:00
chenjianxing a9d6c98c09 Merge branch 'master' of https://github.com/metersphere/server 2020-08-07 10:03:33 +08:00
chenjianxing 18c7a30a03 refactor: 首页只显示运行中的定时任务 2020-08-07 10:03:22 +08:00
shiziyuan9527 1f64dd0c86 feat(测试跟踪): 测试计划批量操作 2020-08-06 18:31:23 +08:00
q4speed 5edda89021 fix(接口测试): 修复保存后控制台报错的bug 2020-08-06 17:16:19 +08:00
shiziyuan9527 4a20e5ccad refactor: 优化变量命名 2020-08-06 15:22:23 +08:00
shiziyuan9527 3db24258f4 refactor: 浏览器回退问题 2020-08-06 14:41:20 +08:00
shiziyuan9527 9ebc2163ba fix: 修复点击显示全部时菜单没激活的问题 2020-08-06 14:19:42 +08:00
chenjianxing b82b5d34e0 Merge branch 'master' of https://github.com/metersphere/server 2020-08-05 20:07:20 +08:00
chenjianxing b04904d105 Merge branch 'v1.1' 2020-08-05 20:07:04 +08:00
shiziyuan9527 2d14ace67e feat(测试跟踪): 测试用例批量移动 2020-08-05 18:57:36 +08:00
chenjianxing ec3276edff fix: 测试用例接口测试执行 2020-08-05 18:53:08 +08:00
wenyann a3dc5ce547 fix(测试计划): 修复测试方式为自动时通过按钮禁止 2020-08-05 18:26:31 +08:00
wenyann de6a585d17 Merge remote-tracking branch 'origin/master' 2020-08-05 18:23:24 +08:00
wenyann dd049e7893 fix(测试计划): 修复测试方式为自动时通过按钮禁止 2020-08-05 18:22:56 +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 f10c233858 refactor: 保存接口测试不跳转到列表页面 2020-08-05 17:22:01 +08:00
chenjianxing 1803f9cf67 fix: 浏览器回退关闭对话框 2020-08-05 17:00:23 +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
shiziyuan9527 9b5523d336 feat(测试跟踪): 测试用例批量删除 2020-08-05 11:17:17 +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
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
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 1a33e7ddac fix: 修复冲突 2020-08-04 17:11:28 +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
q4speed 52c521658e refactor: 优化代码 2020-08-04 10:52:40 +08:00
shiziyuan9527 62cf3ac27c feat(测试跟踪): 测试用例列表添加批量操作按钮 2020-08-03 21:40:00 +08:00
chenjianxing e41ca820df refactor: 场景中有配置环境,创建请求默认引用环境 2020-08-03 17:11:13 +08:00
chenjianxing bd3b9e0164 Merge branch 'master' of https://github.com/metersphere/server 2020-08-03 17:07:03 +08:00
chenjianxing 759bb68491 refactor: 环境域名可以设置为DbeaseUrl 2020-08-03 17:06:45 +08:00
shiziyuan9527 a0600ed4b9 refactor(测试跟踪): 优先级名称变更为用例等级 2020-08-03 14:14:50 +08:00
chenjianxing 7cbb202309 fix: 非管理员用户点击高级搜索退出登入 2020-07-31 18:10:44 +08:00
chenjianxing ad40932869 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-31 16:47:10 +08:00
chenjianxing fac8442392 refactor: 取消请求参数长度限制 2020-07-31 16:42:08 +08:00
shiziyuan9527 b9d48bd00e fix: 修复访问最近报告中已删除的报告报错的问题 2020-07-31 15:45:01 +08:00
chenjianxing c0861c56a3 fix: 项目描述显示回车 2020-07-31 15:27:25 +08:00
chenjianxing 1e73ad065a fix: post 请求URL变量失效 2020-07-31 14:25:24 +08:00
chenjianxing 960641c577 fix: 场景变量长度限制 2020-07-31 09:36:32 +08:00
chenjianxing f6fee2f9b5 fix: 场景变量长度限制 2020-07-31 09:35:47 +08:00
chenjianxing 6e6ce650f7 Merge branch 'master' of https://github.com/metersphere/server 2020-07-30 18:45:55 +08:00
chenjianxing 1b0dc296fc Merge branch 'v1.1' 2020-07-30 18:45:14 +08:00
chenjianxing 049c7f06a4 fix: 测试用例执行步骤删除逻辑 2020-07-30 18:44:50 +08:00
q4speed a7d29c6a50 docs(XPack): 注释 2020-07-30 18:31:58 +08:00
q4speed d040b2c3e4 feat(XPack): 前端XPack 2020-07-30 18:30:02 +08:00
chenjianxing f591f5d9c6 fix: dubbo 配置中心非必填 2020-07-30 17:31:12 +08:00
chenjianxing 282a5d5c17 refactor: 项目描述长度限制 2020-07-30 17:19:46 +08:00
chenjianxing 2f1d776ede refact: 修改请求断言提取长度限制 2020-07-30 17:06:26 +08:00
chenjianxing 2d2ac4f632 feat: 断言支持JSONPath 2020-07-30 17:01:04 +08:00
shiziyuan9527 3423c05f60 refactor(系统设置): 简化代码 2020-07-30 11:10:04 +08:00
chenjianxing 90af469466 fix: 测试用例执行步骤显示 2020-07-30 09:25:49 +08:00
chenjianxing a22827fd2a fix: 测试用例执行步骤显示 2020-07-30 09:23:17 +08:00
chenjianxing e8f7ee688a refactor: merge v1.1 2020-07-29 18:41:01 +08:00
chenjianxing 5933e0a27c fix: swagger 导入post请求body格式化 2020-07-29 18:38:21 +08:00
chenjianxing 3bb35a4452 Merge branch 'v1.1' 2020-07-29 18:22:05 +08:00
chenjianxing 560a22a186 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-29 18:06:44 +08:00
chenjianxing 16adeef77b fix: 增加请求头长度限制 2020-07-29 18:03:49 +08:00
shiziyuan9527 73af237437 fix: 修复在列表页面点击显示全部无效的问题 2020-07-29 17:30:19 +08:00
chenjianxing 09081ba2d5 fix: 测试用例测试步骤没有显示换行 2020-07-29 17:25:16 +08:00
chenjianxing 9d8a56dec3 fix: 折叠按钮样式优化 2020-07-29 16:38:40 +08:00
chenjianxing 335df77ff6 fix: 增加密码长度限制 2020-07-29 15:49:25 +08:00
chenjianxing 7528053dd0 Merge branch 'v1.1' 2020-07-29 13:33:09 +08:00
chenjianxing 5b9279b116 fix: postman 多级目录导入 2020-07-29 13:16:46 +08:00
chenjianxing f0e3fd22a0 Merge branch 'v1.1' 2020-07-28 19:16:36 +08:00
chenjianxing 5aca08a677 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-28 19:16:15 +08:00
chenjianxing e181a4867c feat: post 请求支持参数格式化 2020-07-28 19:16:00 +08:00
shiziyuan9527 270e816599 feat(系统设置): 组织菜单下,一次可以添加多个成员 2020-07-28 18:29:25 +08:00
chenjianxing 15798a7726 Merge branch 'v1.1' 2020-07-28 16:23:08 +08:00
chenjianxing d513ae4403 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-28 16:22:57 +08:00
chenjianxing ac6466ffcd feat: 接口测试结果格式化 2020-07-28 16:22:48 +08:00
q4speed 6c7c148697 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-28 11:08:28 +08:00
q4speed 638eb859e4 feat(接口测试): 给下拉框增加清除功能 2020-07-28 11:08:17 +08:00
shiziyuan9527 865fc14a39 Merge branch 'v1.1' of https://github.com/metersphere/metersphere into v1.1 2020-07-28 10:41:00 +08:00
shiziyuan9527 9ee6fc9f0e refactor: 登录默认为普通登录,隐藏普通登录选项 2020-07-28 10:40:21 +08:00
q4speed 70a45fe807 fix(接口测试): 增加loading的描述 2020-07-28 10:36:35 +08:00
shiziyuan9527 5bf3f355f5 feat: 启用LDAP认证后才显示LDAP登录选项 2020-07-27 18:09:34 +08:00
chenjianxing d7df95c7f6 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-27 15:30:08 +08:00
chenjianxing 274f820daf feat: 添加侧边栏折叠功能 2020-07-27 15:29:58 +08:00
Captain.B 01b6f1b7bf fix: 修复强制停止时刷新页面的bug 2020-07-27 13:35:01 +08:00
Captain.B c6fb64e754 feat: 优化停止性能测试是否保留报告 2020-07-27 13:31:33 +08:00
Captain.B 492dca961c feat: 优化停止性能测试是否保留报告 2020-07-27 13:25:47 +08:00
Captain.B 2522b83f81 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-27 12:27:04 +08:00
Captain.B 62fa6fd9c6 refactor: 执行测试之后跳转到报告查看页面 2020-07-27 11:11:31 +08:00
chenjianxing 0fd89fc6be refactor: post请求url优化 2020-07-27 10:12:25 +08:00
chenjianxing b2b3675429 refactor: post请求url优化 2020-07-27 10:11:45 +08:00
chenjianxing 10d7441487 Merge branch 'master' of https://github.com/metersphere/server 2020-07-24 18:24:02 +08:00
chenjianxing ce2b3e4c98 Merge branch 'v1.1' 2020-07-24 18:23:18 +08:00
chenjianxing 3841ff55d8 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-24 18:22:46 +08:00
chenjianxing 8d389f0298 fix: post 参数encoding 2020-07-24 18:22:31 +08:00
shiziyuan9527 de984bbebb fix: 修改性能测试报告请求统计Label 2020-07-24 18:16:52 +08:00
shiziyuan9527 430e1a3a2c refactor: 简化代码 2020-07-24 17:57:45 +08:00
shiziyuan9527 0ca3455122 refactor: 修改变量命名 2020-07-24 17:47:18 +08:00
chenjianxing 2bdc7b6e29 refactor: 接口测试报告完成状态新增成功失败 2020-07-24 14:24:10 +08:00
chenjianxing be96428a13 refactor: 接口测试报告完成状态新增成功失败 2020-07-24 14:23:41 +08:00
chenjianxing 7ab96f2998 feat: 表格拖拽表头调整宽度 2020-07-24 12:02:16 +08:00
chenjianxing f33246db90 feat: 表格拖拽表头调整宽度 2020-07-24 12:01:17 +08:00
chenjianxing e9ebc1407e Merge branch 'v1.1' 2020-07-23 19:46:46 +08:00
chenjianxing bb8571da2d fix: 接口测试保存校验URL正确性 2020-07-23 19:46:17 +08:00
chenjianxing 61d81a46ee refactor: 取消项目名称特殊字符校验 2020-07-23 16:46:28 +08:00
Captain.B 5eed1e2af8 fix: 修复前端显示日志在切换报告后不生效的问题 2020-07-23 11:36:59 +08:00
wangzhen-fit2cloud ab2020873a refactor: Merge branch 'v1.1' 2020-07-23 10:57:44 +08:00
Captain.B 1215f15d00 refactor: 前端查询日志显示前5块数据 2020-07-23 10:54:19 +08:00
q4speed db0d49eb9d refactor: 去掉警告,简化代码 2020-07-23 10:25:08 +08:00
q4speed 344b9f6f77 Merge remote-tracking branch 'origin/master' 2020-07-23 10:20:56 +08:00
q4speed b316344788 fix(高级查询): 修复部分高级查询报错的bug 2020-07-23 10:20:40 +08:00
chenjianxing b877e03e5c Merge branch 'master' of https://github.com/metersphere/server 2020-07-23 07:36:59 +08:00
chenjianxing 0b03cd128f fix: 切换语言后端国际化不生效 2020-07-23 00:05:34 +08:00
chenjianxing 9a5ce9c4c8 fix: 解决嵌套对话框显示问题 2020-07-22 22:46:45 +08:00
chenjianxing 2bc11e4f4e Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-22 21:33:04 +08:00
chenjianxing e32635ed30 fix: 最近用例跳转显示uuid 2020-07-22 21:32:48 +08:00
wenyann 0e54e56c20 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-22 21:26:28 +08:00
wenyann 8bb657c28e fix: 修改导出用例请求方法 2020-07-22 21:26:03 +08:00
chenjianxing 73a4ee5d12 fix: 测试用例页面浏览器回退问题 2020-07-22 20:42:59 +08:00
wangzhen-fit2cloud b0e02f2b50 refactor: 修改版本号为 1.1 2020-07-22 19:43:15 +08:00
q4speed 78ccfcd99b Merge remote-tracking branch 'origin/master' 2020-07-22 17:52:37 +08:00
q4speed 473cbe8274 fix(高级查询): 修复高级查询执行查询操作后不能保留查询条件的bug 2020-07-22 17:52:23 +08:00
shiziyuan9527 2660ebb975 Merge branch 'v1.1'
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/APITestService.java
2020-07-22 15:56:40 +08:00
wenyann 2c9fd0ddc1 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-22 15:23:48 +08:00
wenyann d5562998e8 fix: 国际化 2020-07-22 15:23:25 +08:00
chenjianxing 159428b4a4 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-22 14:54:31 +08:00
chenjianxing b208847cc9 fix: 断言描述修改后不生效 2020-07-22 14:54:16 +08:00
Captain.B 4bd14608a3 fix: 修复性能测试日志查看时的 duplicate key 的问题 2020-07-22 14:50:35 +08:00
Captain.B c3176d1a6e Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-22 13:58:12 +08:00
shiziyuan9527 e9f7e532c4 Merge branch 'v1.1' of https://github.com/metersphere/metersphere into v1.1 2020-07-22 13:55:12 +08:00
shiziyuan9527 4b11a3ff85 fix: 添加用户来源列 2020-07-22 13:54:39 +08:00
q4speed 0fa304a409 style(接口测试): 避免测试报告message内容溢出 2020-07-22 13:45:54 +08:00
chenjianxing 451f7311bf fix: 解决冲突 2020-07-22 13:38:31 +08:00
chenjianxing d1f2251536 refactor: swagger 增加url导入 2020-07-22 13:36:49 +08:00
Captain.B fcffefadf2 refactor: 修改没有角色的用户的视图 2020-07-22 13:35:38 +08:00
Captain.B 933a7b3608 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-22 13:23:09 +08:00
Captain.B 23351a71e2 feat: 增加测试用例和测试计划的高级搜索 2020-07-22 13:22:54 +08:00
q4speed c247110668 fix(接口测试): 修复get provider成功后的提示,i18n 2020-07-22 13:20:37 +08:00
q4speed f4100f43e6 fix(接口测试): 修复get provider成功后的提示 2020-07-22 13:19:39 +08:00
shiziyuan9527 d8383748fd fix: 测试计划执行接口测试产生的测试报告触发方式为空的问题 2020-07-22 12:57:42 +08:00
shiziyuan9527 8312c4f090 fix: ldap i18n 2020-07-22 12:47:03 +08:00
shiziyuan9527 0b1a0964d1 Merge branch 'v1.1' of https://github.com/metersphere/metersphere into v1.1 2020-07-22 11:35:30 +08:00