Commit Graph

2145 Commits

Author SHA1 Message Date
chenjianxing 45d0f00003 Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3 2020-09-28 11:59:25 +08:00
chenjianxing 3ca92d1a9c fix(测试跟踪): 测试计划开始结束时间无法修改 2020-09-28 11:59:12 +08:00
fit2-zhao 34a0f005f3 fix(接口测试): 完善提取功能 2020-09-28 10:48:05 +08:00
fit2-zhao ccd209880f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-28 10:46:49 +08:00
wenyann be93cf134c Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-09-28 10:28:54 +08:00
wenyann f54e1ce476 fix:站点示例 2020-09-28 10:28:32 +08:00
chenjianxing b106f13dd6 Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3 2020-09-28 10:05:41 +08:00
chenjianxing 1f1afa17ee fix(接口测试): url 自动添加参数key为空 2020-09-28 10:05:30 +08:00
wenyann 8f672752fc Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-09-28 09:46:15 +08:00
wenyann 95b44c9f91 fix:首页评审进度修改 2020-09-28 09:45:52 +08:00
chenjianxing 7545f6990f fix(接口测试): 切换项目环境域名无变化 2020-09-27 21:12:01 +08:00
chenjianxing 20b88800e0 merge origin 2020-09-27 20:36:54 +08:00
fit2-zhao 5f8c7ef45d fix(接口测试): 修复提取变量相关问题 2020-09-27 19:42:13 +08:00
Captain.B 64039e93f8 style: 前端缩进2个空格 2020-09-27 18:54:23 +08:00
shiziyuan9527 95293a7377 Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3 2020-09-27 18:43:44 +08:00
shiziyuan9527 5e8e533c93 refactor(用例评审): 修改多选样式 2020-09-27 18:43:24 +08:00
wenyann aa4bb3e8f9 fix:select框加滚动条 2020-09-27 18:39:23 +08:00
fit2-zhao a934214100 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-27 18:03:02 +08:00
shiziyuan9527 7c83c7d4e4 Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3 2020-09-27 16:29:28 +08:00
shiziyuan9527 72b2a2784c fix(用例评审): 修复评论换行不生效的问题 2020-09-27 16:24:27 +08:00
shiziyuan9527 0b5b55e76c feat(测试计划): 增加取消全部关联按钮 2020-09-27 16:03:46 +08:00
chenjianxing 02cffc3447 Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3 2020-09-27 15:09:23 +08:00
chenjianxing 85e320910e fix(接口测试): 修复请求头删除报错 2020-09-27 15:09:07 +08:00
Captain.B ecd95efb6a Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-09-27 14:41:40 +08:00
Captain.B 5ae9f9a2df refactor: 重构邮件通知部分 2020-09-27 14:41:04 +08:00
shiziyuan9527 233e4e2ff8 fix(测试用例): 修复选中一条用例时不显示更多操作按钮的问题 2020-09-27 14:31:58 +08:00
shiziyuan9527 5927f0fc2b Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3 2020-09-27 14:16:08 +08:00
Captain.B 22b0a423bd fix: 修复notice没有主键及相关问题 2020-09-27 14:14:17 +08:00
shiziyuan9527 b63eef6e87 Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3 2020-09-27 14:10:58 +08:00
fit2-zhao 561ece01e8 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-27 14:10:55 +08:00
shiziyuan9527 10c9d73b5d fix(测试计划): 修复关闭缺陷时会把缺陷删除的问题 2020-09-27 14:09:44 +08:00
wenyann f3e8667fbf fix: 重构邮箱代码,修复一键运行报错
(cherry picked from commit 666532bd8c)
2020-09-27 13:19:11 +08:00
q4speed e3251dfaee Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3 2020-09-27 12:58:13 +08:00
q4speed c27b6b809e perf: 加载js优化 2020-09-27 12:46:32 +08:00
shiziyuan9527 7bca400593 Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3 2020-09-27 11:32:11 +08:00
shiziyuan9527 228bac8277 fix(测试计划): 修复选中一条用例时不显示更多操作按钮的问题 2020-09-27 11:31:44 +08:00
fit2-zhao d71c04caf8 Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3 2020-09-27 11:29:43 +08:00
fit2-zhao 6ebac26151 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-27 11:29:26 +08:00
fit2-zhao 3476c93bea feat(接口测试): 添加提取变量的结果数据展示 2020-09-27 11:29:17 +08:00
fit2-zhao 9cdd9311ee fix(测试跟踪): 分页展示错误修复 2020-09-27 11:27:30 +08:00
wenyann d30cb9246a Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-27 11:26:52 +08:00
wenyann 666532bd8c fix: 重构邮箱代码,修复一键运行报错 2020-09-27 11:26:28 +08:00
fit2-zhao c62a403798 fix(测试跟踪): 分页展示错误修复 2020-09-27 11:17:55 +08:00
chenjianxing b98c21b009 Merge branch 'master' of https://github.com/metersphere/server into v1.3 2020-09-27 11:13:42 +08:00
chenjianxing 942551b205 refactor(接口测试): 调整sql表单布局 2020-09-27 11:12:15 +08:00
chenjianxing 7addde0db2 fix(测试跟踪): 导出报文名称错误 2020-09-27 11:01:39 +08:00
chenjianxing 23867d8a39 fix(接口测试): python 后置处理器模版去掉分号 2020-09-27 10:43:13 +08:00
chenjianxing fd03ecc57b fix: 测试计划报告导出样式 2020-09-27 09:50:34 +08:00
chenjianxing fa307f8be3 merge master 2020-09-25 20:53:54 +08:00
chenjianxing 5275a708b3 fix(测试跟踪): 关联接口测试报错 2020-09-25 20:39:18 +08:00
q4speed 302a754f5b fix(接口测试): 修复删除最后一个场景后弹出已有场景列表的bug 2020-09-25 18:20:52 +08:00
Captain.B dd2c688a23 Merge remote-tracking branch 'origin/master' into master 2020-09-25 17:46:10 +08:00
Captain.B 315bd84118 refactor(接口测试): 接口测试保存按钮上加上Tips Ctrl + S 2020-09-25 17:45:44 +08:00
q4speed d082d8b4e9 Merge remote-tracking branch 'origin/master' 2020-09-25 17:25:49 +08:00
q4speed e7f8c25a70 feat(接口测试): 报告里增加请求开始时间 2020-09-25 17:25:13 +08:00
Captain.B 0426e34b44 Merge remote-tracking branch 'origin/master' into master 2020-09-25 17:17:44 +08:00
Captain.B dac8ef1e48 feat(接口测试): 接口测试保存可以按 Ctrl+S
Closes 481
2020-09-25 17:17:30 +08:00
wenyann ea9a2cef59 fix:switch颜色修改 2020-09-25 17:16:25 +08:00
fit2-zhao 2b2ebb6823 fix(接口测试): 修复切换报告右侧没刷新问题 2020-09-25 15:26:39 +08:00
fit2-zhao 6ec08c0ec5 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-25 15:20:25 +08:00
fit2-zhao 3c6b839efd fix(接口测试): 修复切换报告右侧没刷新问题 2020-09-25 15:20:01 +08:00
chenjianxing 7b69571840 Merge branch 'master' of https://github.com/metersphere/server 2020-09-25 13:59:54 +08:00
chenjianxing 3813cdc120 fix(接口测试): 修复文件上传参数值勾选等问题 2020-09-25 13:59:45 +08:00
Captain.B 4eff4dc4b1 Merge branch 'v1.3' into master 2020-09-25 09:50:11 +08:00
Captain.B 14d1d29245 refactor: 修改用例评审评论页面高度设置 2020-09-24 21:59:14 +08:00
chenjianxing cc364cf1fc Merge branch 'master' of https://github.com/metersphere/server 2020-09-24 18:42:18 +08:00
chenjianxing 4093f39b58 feat(系统设置): 增加当前站点配置 2020-09-24 18:42:05 +08:00
BugKing 5e0a79f6a3 Merge branch 'master' of https://github.com/metersphere/metersphere into master 2020-09-24 18:31:01 +08:00
BugKing 05fd5655c4 fix(测试跟踪): 修改测试计划时间选择器样式 2020-09-24 18:30:36 +08:00
shiziyuan9527 305478cd35 refactor(测试计划): 修改测试计划所属项目展示样式 2020-09-24 17:56:44 +08:00
BugKing d0d894811d fix(测试跟踪): 修改测试计划时间选择样式 2020-09-24 17:24:37 +08:00
BugKing 5d17ed6348 Merge remote-tracking branch 'temp/master' into master 2020-09-24 16:09:59 +08:00
shiziyuan9527 56491903de Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-24 15:16:33 +08:00
shiziyuan9527 fdb593be58 feat(用例评审): 非用例评审人员不可取消或关联用例 2020-09-24 15:15:38 +08:00
Captain.B c6a46ff51b fix: 修复创建新用户偶尔无法登录的报错 2020-09-24 15:13:01 +08:00
wenyann 0954149d62 Merge remote-tracking branch 'origin/master' 2020-09-24 14:38:51 +08:00
wenyann 4898f1ed53 fix:字体字号统一 2020-09-24 14:38:13 +08:00
chenjianxing 366265db36 fix(接口测试): 场景下无请求控制台报错 2020-09-24 14:14:14 +08:00
chenjianxing b5a9f2cf0f fix: 测试报告导出样式 2020-09-24 13:14:11 +08:00
chenjianxing 896fd7f9ce Merge branch 'master' of https://github.com/metersphere/server 2020-09-23 20:31:24 +08:00
chenjianxing ae8e2605a4 fix(接口测试): 场景加载环境异常 2020-09-23 20:31:08 +08:00
Captain.B 299abdb705 Merge remote-tracking branch 'origin/master' into master 2020-09-23 18:49:48 +08:00
Captain.B 80e5b2c4f5 fix(性能测试): 修复性能测试图表上的legend 太多不显示的问题 2020-09-23 18:49:27 +08:00
fit2-zhao 70ce2eae17 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-23 18:15:21 +08:00
fit2-zhao 30ae0e5ce4 fix(XPack): 认证过后再次登陆菜单显示问题修复 2020-09-23 18:14:51 +08:00
chenjianxing dced33e977 Merge branch 'master' of https://github.com/metersphere/server 2020-09-23 18:06:30 +08:00
chenjianxing 75778440cc fix: 国际化 2020-09-23 18:06:16 +08:00
chenjianxing 105115de01 fix(接口测试): 环境中没有填写环境域名提示 2020-09-23 18:03:18 +08:00
q4speed 777dfa18fe refactor(接口测试): 修改操作符 2020-09-23 17:00:19 +08:00
q4speed 7e0f378938 Merge remote-tracking branch 'origin/master' 2020-09-23 16:49:22 +08:00
q4speed b34e279269 fix(接口测试): 修复dubbo和sql请求不能添加控制器的bug 2020-09-23 16:49:10 +08:00
q4speed d7a9d7df1a fix(接口测试): 修复条件控制器的值不能修改的bug 2020-09-23 16:48:19 +08:00
chenjianxing ff2fcd620b Merge branch 'master' of https://github.com/metersphere/server 2020-09-23 16:18:36 +08:00
chenjianxing 9d8d77ef9a fix: 场景下无请求是保存报错 2020-09-23 16:18:16 +08:00
q4speed c0fe259276 Merge remote-tracking branch 'origin/master' 2020-09-23 16:12:09 +08:00
q4speed 0b3e1bfe71 fix(接口测试): 修复引用SQL仍然可编辑的bug 2020-09-23 16:11:54 +08:00
chenjianxing c050331e4b feat: 登入后跳转 2020-09-23 16:08:00 +08:00
chenjianxing 2e13831daa Merge branch 'master' of https://github.com/metersphere/server 2020-09-23 16:03:32 +08:00
chenjianxing a609ca7638 feat: 登入后跳转至原地址 2020-09-23 16:03:14 +08:00
q4speed 4c9b68ddd5 Merge remote-tracking branch 'origin/master' 2020-09-23 15:30:31 +08:00
q4speed b8b9e9ac64 feat(接口测试): 条件控制器增加空和非空操作符 2020-09-23 15:30:17 +08:00
fit2-zhao e85aa875d1 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-23 14:37:38 +08:00
fit2-zhao 1ba55315c4 fix(测试跟踪): 修复xmind模版下载无法自动打开问题 2020-09-23 14:36:31 +08:00
shiziyuan9527 8028fdcd5f fix(用例评审): 修复开始评审后按钮不可点击的问题 2020-09-23 14:01:16 +08:00
Captain.B 5efef14133 style(接口测试): 任务通知页面修改 2020-09-23 13:12:27 +08:00
chenjianxing 37f07b473e Merge branch 'master' of https://github.com/metersphere/server 2020-09-23 11:55:29 +08:00
chenjianxing 7338513ec2 refactor: 代码优化 2020-09-23 11:55:15 +08:00
q4speed a31cd2e8bc Merge remote-tracking branch 'origin/master' 2020-09-23 11:49:03 +08:00
q4speed 2f0882c7f8 refactor: 删除无用代码 2020-09-23 11:48:44 +08:00
chenjianxing 9f8a937d50 Merge branch 'master' of https://github.com/metersphere/server 2020-09-23 11:47:39 +08:00
chenjianxing d4473116fd fit: 测试报告导出格式优化 2020-09-23 11:45:14 +08:00
shiziyuan9527 7f6fd6d013 refactor(用例评审): i18n 2020-09-23 11:15:11 +08:00
shiziyuan9527 e3a6fdfecc Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-23 11:07:59 +08:00
fit2-zhao 5afdfac40c style(测试跟踪): 去除多余日志 2020-09-23 11:03:52 +08:00
fit2-zhao 4b1c6a4a8a fix(测试跟踪): 修复firefox下载模版缺陷 2020-09-23 11:02:32 +08:00
shiziyuan9527 f825b009d7 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-23 10:42:44 +08:00
fit2-zhao 3dfab4b13f fix(XPack): 添加加载校验 2020-09-23 10:11:06 +08:00
fit2-zhao b8b1cc97ce Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-23 09:38:04 +08:00
fit2-zhao f3e3e70658 fix(XPack): 修复认证缓存内容 2020-09-23 09:37:56 +08:00
chenjianxing 06f7531969 fix: 报告导出后缀 2020-09-22 21:54:23 +08:00
chenjianxing a13c187537 Merge branch 'master' of https://github.com/metersphere/server 2020-09-22 21:48:25 +08:00
chenjianxing b0faae20b5 feat(接口测试): 接口测试报告导出 2020-09-22 21:48:11 +08:00
q4speed 569b01f589 refactor(XPack): License接口都放到XPack内 2020-09-22 21:29:53 +08:00
shiziyuan9527 9a10123bc4 refactor(用例评审): 添加loading 2020-09-22 21:14:02 +08:00
q4speed 22020e48d0 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-22 21:10:32 +08:00
fit2-zhao 1dfbd16144 fix(XPack): 第一次登陆认证失效问题修复 2020-09-22 20:12:38 +08:00
fit2-zhao 37f4384321 fix(XPack): license 验证缺陷修复 2020-09-22 19:50:47 +08:00
fit2-zhao 52297235a9 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-22 19:49:16 +08:00
fit2-zhao 8f807044ad fix(XPack): license 验证缺陷修复 2020-09-22 19:48:44 +08:00
shiziyuan9527 7713b24506 fix(用例评审): 修改样式 2020-09-22 18:58:37 +08:00
wenyann ddf1e7a5bf Merge remote-tracking branch 'origin/master' 2020-09-22 18:05:28 +08:00
wenyann 4d374fcc4f fix:修复一键运行报错 2020-09-22 18:05:05 +08:00
chenjianxing 3674320e9b fix(接口测试): 数据库配置添加必填项 2020-09-22 17:48:30 +08:00
shiziyuan9527 37ced87b76 feat(用例评审): 批量取消用例关联 2020-09-22 17:23:07 +08:00
q4speed 8bdfeced41 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-22 17:13:13 +08:00
wenyann 6e2069e011 Merge remote-tracking branch 'origin/master' 2020-09-22 15:36:32 +08:00
wenyann e14af29232 fix:修复执行测试计划,提示关联有测试 2020-09-22 15:36:09 +08:00
shiziyuan9527 c128021dc3 fix(测试跟踪): 删除测试用例时删除关联的评论 2020-09-22 15:32:04 +08:00
Captain.B ed8a2f6d5f Merge branch 'master' of github.com:metersphere/metersphere into master 2020-09-22 15:20:31 +08:00
Captain.B b788091622 refactor(测试跟踪): 评审页面的样式 2020-09-22 15:20:13 +08:00
chenjianxing 1d2ef25f39 Merge branch 'master' of https://github.com/metersphere/server 2020-09-22 14:56:36 +08:00
chenjianxing 968ff5f470 feat(性能测试): 导出性能测试报告 2020-09-22 14:56:25 +08:00
q4speed 3b2059de14 refactor(XPack): update submodule 2020-09-22 14:39:08 +08:00
q4speed a52ae19526 Merge remote-tracking branch 'origin/master' 2020-09-22 14:27:21 +08:00
fit2-zhao c089e27ff9 Merge remote-tracking branch 'origin/master' 2020-09-22 12:35:50 +08:00
fit2-zhao e50a952944 refactor(XPack): 认证机制重构,权限修改 2020-09-22 12:35:07 +08:00
chenjianxing 7977e92e9f Merge branch 'master' of https://github.com/metersphere/server 2020-09-22 12:03:30 +08:00
chenjianxing aa646931dc Merge branch 'master' of https://github.com/metersphere/server 2020-09-22 11:46:24 +08:00
chenjianxing 014ce229f1 fix(接口测试): 复制环境 2020-09-22 11:46:02 +08:00
shiziyuan9527 74878cd806 refactor: i18n 2020-09-22 11:45:20 +08:00