test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,881 Commits 42 Branches 174 Tags 409 MiB
Commit Graph

2576 Commits

Author SHA1 Message Date
shiziyuan9527 815fada034 fix: 修复点击创建用例无反应的问题 2020-10-21 19:05:05 +08:00
chenjianxing 21983d1ccb fix(接口测试): 编辑jar包描述字段显示问题 2020-10-21 18:29:11 +08:00
chenjianxing 4a07f74706 Merge branch 'master' of https://github.com/metersphere/server 2020-10-21 18:26:09 +08:00
chenjianxing 71a54ba8bf fix(性能测试): 全选后切换显示数量后批量删除报错 2020-10-21 18:26:00 +08:00
chenjianxing 8b863e5eaa Merge branch 'master' of https://github.com/metersphere/server 2020-10-21 18:06:35 +08:00
chenjianxing 6fffba9976 refactor(接口测试): 环境的环境域名末尾不自动添加/ 2020-10-21 18:06:27 +08:00
Captain.B 005cdc9eb5 Merge branch 'master' into v1.4 2020-10-21 17:15:39 +08:00
BugKing 7c2d0dd8af Merge branch 'master' into v1.4 2020-10-21 16:04:46 +08:00
shiziyuan9527 fe1bea3316 feat(测试跟踪): 用例相关的计划和评审中展示附件列表 2020-10-21 16:04:41 +08:00
chenjianxing 0b6ee308eb refactor(测试跟踪): 模块树最大深度8层 2020-10-21 14:40:42 +08:00
q4speed 1b7250cb7d Merge remote-tracking branch 'origin/master' 2020-10-21 14:17:39 +08:00
q4speed 47c3e40805 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-21 14:17:00 +08:00
q4speed c074fd77ef fix(接口测试): 修复TCP请求服务器或IP必填的bug 2020-10-21 14:14:22 +08:00
shiziyuan9527 4866c32746 feat(测试跟踪): 保存评审结果后自动跳转下一条用例 2020-10-21 14:14:13 +08:00
shiziyuan9527 49bd060cad refactor(测试跟踪): 测试用例附件的修改时间改为上传时间 2020-10-21 13:41:09 +08:00
Captain.B 869a4a315e Merge branch 'master' into v1.4 2020-10-21 09:26:06 +08:00
wenyann e35a400bb0 Merge remote-tracking branch 'origin/master' 2020-10-21 00:10:19 +08:00
wenyann b38fbf034e feat: 消息设置 2020-10-21 00:09:23 +08:00
shiziyuan9527 bd8ca07af6 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-20 18:55:42 +08:00
shiziyuan9527 876cc63d02 refactor: i18n 2020-10-20 18:51:41 +08:00
chenjianxing e3a90f98ca Merge branch 'master' of https://github.com/metersphere/server 2020-10-20 18:44:14 +08:00
chenjianxing 1632b3fe13 refactor: 代码优化 2020-10-20 18:44:05 +08:00
shiziyuan9527 21dd0e7508 refactor(用例评审): 调整用例评审页面评审按钮的位置 2020-10-20 18:35:33 +08:00
fit2-zhao fd0ee661a5 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-20 17:41:21 +08:00
fit2-zhao 6ee4ca0921 refactor(测试跟踪): 导入用例提示消息优化，按照类型进行划分 2020-10-20 17:41:06 +08:00
shiziyuan9527 fd77afcfc6 feat(测试跟踪): 测试用例附件预览 2020-10-20 16:59:27 +08:00
BugKing 144803a8c2 refactor: 更改版本号 2020-10-20 16:50:16 +08:00
chenjianxing 8dad580a6a Merge branch 'master' of https://github.com/metersphere/server 2020-10-20 16:48:45 +08:00
chenjianxing 510850db51 feat(接口测试): 支持提取多个值 2020-10-20 16:48:37 +08:00
q4speed 58a8510989 fix(接口测试): 去掉TCP请求必填服务器名称的bug 2020-10-20 16:30:34 +08:00
q4speed 9f1198fe9e Merge remote-tracking branch 'origin/master' 2020-10-20 16:05:49 +08:00
q4speed 99f21d6228 fix(接口测试): 修复因为太挤无法显示TCP配置输入框的bug 2020-10-20 16:05:35 +08:00
fit2-zhao 9d05edc6f4 fix(接口测试): 增加域名格式校验 2020-10-20 15:32:58 +08:00
fit2-zhao c44b72e5fa fix(测试跟踪): 修复选中关联单个模块用例实际上关联整个项目的用例缺陷 2020-10-20 14:44:07 +08:00
chenjianxing 73218f5f23 fix(测试跟踪): 点击面包屑全部用例，我的用例显示问题 2020-10-20 14:15:07 +08:00
chenjianxing 6de79df31f fix(接口测试): 文件上传删除文件失败 2020-10-20 13:46:19 +08:00
chenjianxing 1c9050d833 fix: 解决冲突 2020-10-20 13:11:10 +08:00
chenjianxing 764567d5f8 refactor(接口测试): 删除无用代码 2020-10-20 12:58:00 +08:00
chenjianxing bd43116ff4 feat(接口测试): 上传jar包 2020-10-20 12:54:09 +08:00
chenjianxing 9a009dbf28 feat(接口测试): 上传jar包 2020-10-20 12:53:09 +08:00
wenyann 87f53cbebf feat: 消息设置 2020-10-20 10:34:31 +08:00
wenyann f872fb6692 Merge remote-tracking branch 'origin/master' 2020-10-19 18:49:27 +08:00
wenyann 1b4047386e feat: 消息设置 2020-10-19 18:48:56 +08:00
shiziyuan9527 8b2fdaad7c fix(性能测试): 修复新建项目后修改已存在的测试所属项目的时候项目列表未更新的问题 2020-10-19 18:07:38 +08:00
q4speed b5b09842e7 Merge remote-tracking branch 'origin/master' 2020-10-19 17:44:45 +08:00
q4speed faa9c713c2 fix(接口测试): 修复TCPClient没有候选项的bug 2020-10-19 17:44:34 +08:00
shiziyuan9527 24217c96c8 feat(测试跟踪): 用例评审页面标明评审结果 2020-10-19 17:30:15 +08:00
shiziyuan9527 4e7babcda0 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-19 16:06:45 +08:00
shiziyuan9527 045f0fd180 fix(测试跟踪): 修复测试评审的截止时间可以早于当前时间的问题 2020-10-19 16:06:36 +08:00
wenyann d2e1b81c6a Merge remote-tracking branch 'origin/master' 2020-10-19 15:45:39 +08:00
wenyann dd86a0f53a fix:修复预览详情格式，添加message表字段 2020-10-19 15:44:43 +08:00
Captain.B 452fc29771 Merge remote-tracking branch 'origin/master' into master 2020-10-19 15:21:15 +08:00
Captain.B 695aae0d9d fix(性能测试): 修复压力配置-开启RPS上限按钮，执行测试后，按钮自动关闭 2020-10-19 15:20:50 +08:00
shiziyuan9527 6cf026addc refactor(系统设置): 去掉创建组织时对特殊字符的限制 2020-10-19 15:11:30 +08:00
shiziyuan9527 f0f9877765 fix: 修复创建项目时因为描述超出长度限制而产生报错的问题 2020-10-19 14:59:24 +08:00
shiziyuan9527 9b7ca67649 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-19 14:03:07 +08:00
shiziyuan9527 d1fa9ca32a fix(测试跟踪): 修复测试用例上传附件报错的问题 2020-10-19 14:02:06 +08:00
q4speed ff5a52d966 Merge remote-tracking branch 'origin/master' 2020-10-19 13:00:30 +08:00
q4speed fb224d2289 feat(接口测试): 断言增加忽略状态 2020-10-19 12:59:29 +08:00
wenyann 951157592c feat: 性能测试报告字段优化 2020-10-19 12:29:40 +08:00
wenyann eccbaa639d Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
 2020-10-19 12:28:55 +08:00
wenyann d838073c59 feat: 性能测试报告字段优化 2020-10-19 12:27:03 +08:00
q4speed ae474fadd7 feat: 最近的评审改为我最近的评审。 2020-10-16 23:39:41 +08:00
wenyann f18c55b67f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-16 15:58:58 +08:00
wenyann 1169f46fac feat: 前置条件字符长度限制 2020-10-16 15:51:55 +08:00
fit2-zhao ce90cf9cb5 fix(测试跟踪): 修复用例关联全部问题 2020-10-16 14:28:17 +08:00
wenyann ce222275fb Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-16 14:25:41 +08:00
wenyann 07dea85f7c feat: 消息设置 2020-10-16 14:25:24 +08:00
fit2-zhao e0a349e432 fix(系统设置): 修复成员列表筛选问题 2020-10-16 11:00:43 +08:00
fit2-zhao 50ee06bff1 refactor(测试跟踪): 优化变量名 2020-10-15 18:35:53 +08:00
fit2-zhao 25b40809db Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
 2020-10-15 18:23:10 +08:00
fit2-zhao cbf2b89742 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
 2020-10-15 18:22:27 +08:00
fit2-zhao b4af198897 refactor(测试跟踪): 测试计划，用例评审 两处关联测试用例一次加载全部优化 2020-10-15 18:08:41 +08:00
chenjianxing b21c799ba2 feat(接口测试): jar包管理 2020-10-15 17:37:49 +08:00
Captain.B b52f8ba9eb fix: 修复测试计划执行人选择的问题 2020-10-15 10:05:37 +08:00
fit2-zhao 92122e0546 refactor(测试跟踪): 关联测试用例一次加载全部优化 2020-10-14 18:56:27 +08:00
shiziyuan9527 1681f634f2 refactor(测试跟踪): 修改评审状态名称 2020-10-14 18:16:33 +08:00
shiziyuan9527 2795345786 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-14 17:54:24 +08:00
shiziyuan9527 8ce89cf4a7 feat(测试跟踪): 测试用例上传附件 2020-10-14 17:53:43 +08:00
chenjianxing 7375aaff65 fix(接口测试): 文件上传请求删除文件 2020-10-14 17:52:56 +08:00
chenjianxing 16506bee0a feat(接口测试): 添加数据库连接性检测 2020-10-14 16:39:39 +08:00
chenjianxing 79d9926e53 fix(接口测试): sql自定义变量 2020-10-14 15:06:54 +08:00
chenjianxing cccb100ed0 refactor(接口测试): sql 添加自定义变量 2020-10-14 14:37:49 +08:00
chenjianxing 0c3b154433 fix(接口测试): 环境中变量名称太长显示问题 2020-10-14 13:08:46 +08:00
chenjianxing ad0dcbaa74 Merge branch 'master' of https://github.com/metersphere/server 2020-10-14 12:41:00 +08:00
chenjianxing d58990bb16 refactor(接口测试): 不同请求颜色区分 2020-10-14 12:40:50 +08:00
fit2-zhao b2f80fea78 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-14 11:16:30 +08:00
fit2-zhao 578dfa4b88 style(测试跟踪): 规范下拉框样式统一组件大小 2020-10-14 11:16:14 +08:00
Captain.B 70c513099a refactor: 去掉 show-more-btn 的背景色 2020-10-14 11:00:16 +08:00
chenjianxing 08b973c03e refactor(接口测试): POST 支持 multipart/form-data 2020-10-14 10:55:52 +08:00
chenjianxing bc59848dec Merge branch 'master' of https://github.com/metersphere/server 2020-10-13 19:26:15 +08:00
chenjianxing 5d81523f52 Merge branch 'v1.3' 2020-10-13 19:24:59 +08:00
chenjianxing 782f32ce8e fix(接口测试): 一键执行文件上传接口报错 2020-10-13 17:44:52 +08:00
fit2-zhao 21685342e4 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-13 17:31:41 +08:00
Captain.B 0e23dbd564 Merge remote-tracking branch 'origin/master' into master 2020-10-13 17:17:57 +08:00
Captain.B a262c03e53 feat(测试跟踪): 测试计划-执行人可筛选 2020-10-13 17:17:31 +08:00
fit2-zhao 106505f3a6 fix(接口调试): 修复环境配置页面 过小 一些输入框 无法输入内容 2020-10-13 16:43:10 +08:00
fit2-zhao ffc2c3f495 fix(接口测试): 修复自定义变量 内容被遮挡缺陷 2020-10-13 16:37:43 +08:00
fit2-zhao f6af7c9d08 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-13 16:11:03 +08:00
fit2-zhao bb8711025a refactor(测试跟踪): 下拉列表组件中增加输入筛选功能 2020-10-13 16:10:52 +08:00
fit2-zhao 1d23ce38a9 refactor(性能测试): 下拉列表组件中增加输入筛选功能 2020-10-13 16:10:36 +08:00
fit2-zhao 7cd3234ac2 refactor(接口测试): 下拉列表组件中增加输入筛选功能 2020-10-13 16:10:18 +08:00
fit2-zhao 9118cb3404 refactor(系统设置): 下拉列表组件中增加输入筛选功能 2020-10-13 16:09:54 +08:00
chenjianxing 1abf0de61e Merge branch 'v1.3' 2020-10-13 15:49:05 +08:00
chenjianxing 4b43a2cd8b refactor: 优化前端错误提示 2020-10-13 15:47:51 +08:00
q4speed 15af40cc6f Merge remote-tracking branch 'origin/master' 2020-10-13 11:17:47 +08:00
q4speed c13baa2f70 fix(接口测试): 修复TCP配置被场景配置覆盖的bug 2020-10-13 11:17:35 +08:00
wenyann 3f73ecd5da Merge remote-tracking branch 'origin/master' 2020-10-12 18:43:35 +08:00
wenyann 55c06e0ff0 fix:修复预览详情字段显示 2020-10-12 18:42:33 +08:00
wenyann 4ed7802bea Merge branch 'v1.3' 2020-10-12 18:09:31 +08:00
wenyann 3f8e5c58d3 fix:添加预览详情 2020-10-12 18:06:17 +08:00
shiziyuan9527 a4ee354778 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-12 17:37:42 +08:00
shiziyuan9527 797c9f0776 feat(测试计划): 测试计划结果为通过时自动跳转到下一用例 2020-10-12 17:35:19 +08:00
q4speed bb7d3f7b5a Merge remote-tracking branch 'origin/master' 2020-10-12 17:23:30 +08:00
q4speed f2bf1e0d21 feat(接口测试): TCPSampler 增加环境配置和场景配置 2020-10-12 17:23:18 +08:00
shiziyuan9527 1c79468b00 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-12 16:23:34 +08:00
shiziyuan9527 63bd7f1fe3 refactor(测试跟踪): 格式化代码 2020-10-12 16:22:50 +08:00
chenjianxing f138d0271b Merge branch 'v1.3' 2020-10-12 16:07:26 +08:00
wenyann 6d265b55db Merge branch 'v1.3' of https://github.com/metersphere/metersphere 2020-10-12 14:21:50 +08:00
Captain.B 5803eccc2b refactor: 表格又边框设置为0 
(cherry picked from commit fed5d15589)
 2020-10-12 13:26:24 +08:00
Captain.B fed5d15589 refactor: 表格又边框设置为0 2020-10-12 13:25:43 +08:00
Captain.B 00424b0255 revert: 回退td的底部border 
(cherry picked from commit ff7454f6ef)
 2020-10-12 13:18:56 +08:00
Captain.B ff7454f6ef revert: 回退td的底部border 2020-10-12 13:18:02 +08:00
Captain.B b6a064e5cc refactor: 表格边框hover之后的颜色修改 
(cherry picked from commit 6d1fb1583f)
 2020-10-12 13:14:21 +08:00
Captain.B 9f2eeda276 refactor: 表格边框hover之后的颜色修改 
(cherry picked from commit d524f76549)
 2020-10-12 13:14:18 +08:00
q4speed 43c05ee5fd Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-12 13:10:53 +08:00
q4speed 53ced104fe Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-10-12 13:09:52 +08:00
q4speed 62a6af8758 fix(接口测试): 修复条件控制器判断bug 2020-10-12 13:09:40 +08:00
Captain.B 6d1fb1583f refactor: 表格边框hover之后的颜色修改 2020-10-12 13:08:19 +08:00
q4speed fc55a685d0 style: 调整样式 2020-10-12 13:04:29 +08:00
chenjianxing dbf18cde4a Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3 2020-10-12 11:34:57 +08:00
chenjianxing 70d677c4fc fit(接口测试): 导入测试请求参数未勾选 2020-10-12 11:34:38 +08:00
q4speed 27e50e9ff0 fix(接口测试): 修复跨场景拼接无法多次复制同一场景的bug 
Closes #509
 2020-10-12 10:15:06 +08:00
Captain.B e64518fb79 Merge remote-tracking branch 'origin/master' into master 2020-10-12 09:55:11 +08:00
Captain.B d524f76549 refactor: 表格边框hover之后的颜色修改 2020-10-12 09:54:28 +08:00
fit2-zhao 9e154c6d87 Merge branch 'v1.3' 2020-10-12 09:43:54 +08:00
fit2-zhao 90e857b105 fix(接口测试): hosts 列表执行缺陷修复 2020-10-10 19:52:39 +08:00
Captain.B 3e1ca62e62 Merge branch 'v1.3' into master 2020-10-10 17:55:33 +08:00
Captain.B 77e16e2ace refactor: 加上 progress bar 2020-10-10 15:30:28 +08:00
wenyann fbfb29074e Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-10-10 15:29:43 +08:00
wenyann 1771cd4f82 feat: 测试用例列表增加预览 2020-10-10 15:28:43 +08:00
Captain.B 432d13fb1d Merge branch 'v1.3' into master 2020-10-10 14:41:50 +08:00
shiziyuan9527 3e3a43d113 fix: 修复我的评审结果分布tip未显示的问题 2020-10-10 14:32:43 +08:00
fit2-zhao 04b4d7aa8d Merge branch 'v1.3' 2020-10-10 13:24:52 +08:00
q4speed 6ca14fe393 feat: 最近的测试，用例，计划改为我最近的测试，用例，计划。 2020-10-10 11:13:46 +08:00
shiziyuan9527 42a9074074 Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-10-09 18:40:02 +08:00
shiziyuan9527 e9619aba99 feat: 测试跟踪首页我的评审中添加结果分布列 2020-10-09 18:35:33 +08:00
q4speed af046d0f91 Merge remote-tracking branch 'origin/master' 2020-10-09 18:09:02 +08:00
q4speed 8582a4f04f feat(接口测试): 增加TCP协议的接口测试 2020-10-09 18:08:49 +08:00
q4speed b63a3ebbbc style(接口测试): 优化标题 2020-10-09 18:07:52 +08:00
shiziyuan9527 9a0c0857bc feat: 测试评审关联测试用例时增加状态列 2020-10-09 16:29:27 +08:00
Captain.B 446f0cdcde fix: 修复测试计划列表页面，“负责人”应展示成员姓名，非展示成员ID 
Closes 406
 2020-10-09 16:27:37 +08:00
Captain.B 04a022a4f3 feat: 系统设置页面左上角用户头像修改 2020-10-09 16:13:49 +08:00
shiziyuan9527 47ed214502 feat: 测试用例增加状态列 2020-10-09 15:49:33 +08:00
wenyann b2fc59b398 fix:修改开关按钮颜色 2020-10-09 15:38:25 +08:00
fit2-zhao 7972c91170 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-09 10:40:07 +08:00
wenyann 01f5dd02a1 fix:退回header修改 2020-09-30 18:01:46 +08:00
Captain.B df919bd6ac fix: 修复登录用户可以查看其他工作空间的bug 2020-09-30 17:35:55 +08:00
fit2-zhao c64f5847f8 fix(测试跟踪): 修复上传的文件为空时异常 2020-09-30 17:10:16 +08:00
fit2-zhao f32b6b530b fix(接口测试): 增加domain 为 undefined时校验 2020-09-30 16:19:50 +08:00
fit2-zhao 9c1150d5f5 Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3 2020-09-30 16:07:54 +08:00
fit2-zhao 0f38b7f2ab style(接口测试): 首页样式调整，固定card 大小 2020-09-30 15:46:23 +08:00
wenyann a66741406f fix:修复重复点击导航路由报错 2020-09-30 14:07:09 +08:00
shiziyuan9527 c671c8a557 fix(用例评审): 修复查询用例评审时会报错的问题 2020-09-30 11:20:54 +08:00
chenjianxing 1c7ce5e20b fix(接口测试): 点击最近项目跳转后菜单栏未激活 2020-09-29 18:54:20 +08:00
chenjianxing 35d392618c Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3 2020-09-29 18:11:26 +08:00
chenjianxing 776ed4252d fix(接口测试): 接口测试导入环境列表显示问题 2020-09-29 18:11:17 +08:00
shiziyuan9527 4797793169 fix(用例评审): i18n 2020-09-29 17:46:52 +08:00
chenjianxing 38a34b0527 fix(测试跟踪): 修复测试计划列表国际化问题 2020-09-29 17:35:51 +08:00
shiziyuan9527 ee47268c68 feat(测试计划): 测试报告中失败用例支持跳转 2020-09-29 17:32:11 +08:00
Captain.B 08a0408b5f Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-09-29 10:23:25 +08:00
Captain.B 436914947b refactor: 继续重构通知部分 2020-09-29 10:21:55 +08:00
chenjianxing 2659818d95 merge v1.3 2020-09-29 10:05:54 +08:00
Captain.B 8d1f68666c fix(接口测试): 调试结果返回自动选中mode 2020-09-28 18:32:01 +08:00
chenjianxing 556118cd9f Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3 2020-09-28 15:50:25 +08:00
chenjianxing 01a9eb3d83 refactor(接口测试): 测试报告自动选择json模式，前后置脚本添加全局变量模版 2020-09-28 15:50:12 +08:00
wenyann fdbb438040 Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-09-28 15:29:20 +08:00
wenyann da17c8448f fix:i18n 2020-09-28 15:29:02 +08:00
shiziyuan9527 d95ded1f38 refactor: i18n 2020-09-28 15:04:31 +08:00
fit2-zhao ce7eb2391e Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-28 15:02:21 +08:00
fit2-zhao abcd4b299b refactor(接口测试): 重写提取方法 2020-09-28 15:02:12 +08:00
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
q4speed 18d3694b3e Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
#	frontend/src/business/components/xpack
 2020-09-22 10:49:28 +08:00
q4speed 625a870629 refactor(XPack): update submodule 2020-09-22 10:49:03 +08:00
Captain.B 81bf333e29 Merge branch 'v1.3' into master 2020-09-22 10:41:20 +08:00
chenjianxing c347c1d56d Merge branch 'master' of https://github.com/metersphere/server 2020-09-22 10:36:23 +08:00
chenjianxing e00265b577 feat(测试跟踪): 测试计划报告导出 2020-09-22 10:35:59 +08:00
shiziyuan9527 bebc97d867 fix(用例评审): 修改评审人为必填项 2020-09-22 10:30:03 +08:00
shiziyuan9527 1c51bc57e9 feat: 测试评审修改评审人和所属项目 2020-09-21 21:19:58 +08:00
q4speed fd24ed1246 refactor(XPack): 同步submodule 2020-09-21 18:02:50 +08:00
shiziyuan9527 0274d1eb3d Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-21 17:51:46 +08:00
shiziyuan9527 6289043772 refactor(用例评审): 测试评审测试用例列表去掉缺陷列 2020-09-21 17:51:31 +08:00
Captain.B 01cf93bf45 refactor(性能测试): 响应时间默认为空 2020-09-21 17:50:32 +08:00
q4speed 5f22162ce6 Merge remote-tracking branch 'origin/master' 2020-09-21 15:16:18 +08:00
q4speed 0713f58f09 fix(配额管理): 修复压测时长没有显示单位的bug 2020-09-21 14:56:58 +08:00
wenyann 16a4bd9cb5 Merge remote-tracking branch 'origin/master' 2020-09-21 14:08:15 +08:00
wenyann e27e763da3 fix:修改缺陷处理人 2020-09-21 14:07:56 +08:00
BugKing e13ae20766 refactor: Merge branch 'master' into v1.3 2020-09-21 12:57:40 +08:00
shiziyuan9527 38ef329ba0 fix: 修复关联用例页面筛选失败的问题 2020-09-21 11:37:07 +08:00
BugKing 7d2b2a4cc9 refactor: 修改版本号 2020-09-21 10:28:24 +08:00
Captain.B 5744103f79 refactor: 修改性能测试上传文件数量的限制判断 2020-09-21 10:10:20 +08:00
shiziyuan9527 b9509e3725 refactor: 删除无用代码 2020-09-20 12:42:07 +08:00
shiziyuan9527 b7507b8cfd refactor: 修改用例评论样式 2020-09-20 12:12:04 +08:00
shiziyuan9527 18a68f3041 feat(测试跟踪): 测试跟踪首页我的评审 2020-09-20 09:48:25 +08:00
shiziyuan9527 ef33833794 feat(测试跟踪): 用例评审 2020-09-19 23:52:09 +08:00
shiziyuan9527 b9579d61a0 feat(测试跟踪): 保存评审结果 2020-09-19 11:52:49 +08:00
shiziyuan9527 3135bf3406 feat(测试跟踪): 用例评审关联测试用例 2020-09-18 23:56:43 +08:00
shiziyuan9527 95b722e86c fix(测试计划): 测试计划修改所属项目时的提示问题 2020-09-18 17:04:50 +08:00
chenjianxing da23e9cc46 Merge branch 'master' of https://github.com/metersphere/server 2020-09-18 16:53:39 +08:00
chenjianxing 57b62ded31 fix(接口测试): 数据库密码框 2020-09-18 16:53:15 +08:00
Captain.B 106b9f65d0 Merge remote-tracking branch 'origin/master' into master 2020-09-18 16:33:26 +08:00
Captain.B cfe8393fee refactor: 修改性能测试上传文件数量的限制判断 2020-09-18 16:32:58 +08:00
chenjianxing 7a867e80d1 fix(接口测试): GET 请求参数错误 2020-09-18 15:58:24 +08:00
chenjianxing 4887585838 merger master 2020-09-18 15:27:32 +08:00
q4speed e917b844b6 Merge remote-tracking branch 'origin/master' 2020-09-18 15:12:39 +08:00
q4speed ae8bf4dc40 fix(接口测试): 修复逻辑控制器禁用状态初始化无效的bug 2020-09-18 15:12:21 +08:00
chenjianxing 648f1fa2d0 fix(接口测试): 接口测试保存无反应 2020-09-18 15:06:19 +08:00
wenyann fed9519fce Merge remote-tracking branch 'origin/master' 2020-09-18 14:57:19 +08:00
wenyann a363074c16 fix:执行时间定时刷新 2020-09-18 14:56:58 +08:00
chenjianxing a646f5f4d8 refactor(接口测试): 修改数据库配置样式 2020-09-18 14:48:56 +08:00
xuxm 1d2d7128d9 update：test_plan增加4个字段：planned_start_time、planned_end_time、actual_start_time、actual_end_time 2020-09-18 13:59:18 +08:00
xuxm 2062b14a17 update：测试计划表单页面增加‘计划开始’，‘计划结束’时间字段 2020-09-18 13:54:38 +08:00
xuxm 89b2bb9525 update：增加测试计划列表页面显示“计划开始”，“计划结束”，“实际开始”，“实际结束” 2020-09-18 13:52:08 +08:00
chenjianxing 6383750485 fix(接口测试): 场景折叠问题 2020-09-18 13:05:22 +08:00
chenjianxing 5badcc3a21 Merge branch 'master' of https://github.com/metersphere/server 2020-09-18 11:50:16 +08:00
chenjianxing e3b437827b refactor(接口测试): 支持提取接口到变量 2020-09-18 11:48:46 +08:00
fit2-zhao c5d52a6906 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-18 11:41:25 +08:00
fit2-zhao 56db0e077b refactor(XPack): license增强校验，并对过期时间进行展示 2020-09-18 11:14:44 +08:00
shiziyuan9527 7a6151ab79 feat(测试计划): 测试计划可以修改所属项目 2020-09-18 11:09:37 +08:00
chenjianxing 18c300f85e Merge branch 'master' of https://github.com/metersphere/server 2020-09-17 21:45:50 +08:00
chenjianxing fbbd943990 feat(接口测试): GET 请求支持 body 2020-09-17 21:45:31 +08:00
shiziyuan9527 89e5c55add fix(测试计划): 提缺陷时同步实际结果 2020-09-17 21:41:52 +08:00
shiziyuan9527 5c9c645016 fix(系统设置): 修复创建用户时ID含中文可以创建的问题 2020-09-17 21:27:02 +08:00
chenjianxing 7b0045d1a7 refactor: 解决冲突 2020-09-17 18:37:38 +08:00
chenjianxing e40ce93182 refactor(测试跟踪): 功能测试支持选择自动方式 2020-09-17 18:36:13 +08:00
q4speed 92d9db0d52 feat(接口测试): 修复搜索条件缺少Success的bug 2020-09-17 18:21:11 +08:00
chenjianxing 6e72c03e2e fix: ScenarioModel.js 报错 2020-09-17 18:16:53 +08:00
q4speed 2e2fdebe1e fix: 去掉console.log 2020-09-17 18:15:51 +08:00
q4speed 7ab46caa36 Merge remote-tracking branch 'origin/master' 2020-09-17 18:13:39 +08:00
q4speed 8cee5b816d fix: 删除重复代码 2020-09-17 18:13:26 +08:00
chenjianxing 94a549cf8e Merge branch 'master' of https://github.com/metersphere/server 2020-09-17 18:12:10 +08:00
chenjianxing 1488109f23 feat(测试跟踪): 执行步骤复制 2020-09-17 18:11:39 +08:00
q4speed d4199e85b4 Merge remote-tracking branch 'origin/master' 2020-09-17 18:09:28 +08:00
q4speed 3994e346b5 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/api/test/model/ScenarioModel.js
 2020-09-17 18:08:37 +08:00
shiziyuan9527 4766813ae4 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-17 18:07:36 +08:00
q4speed 4e9a2f084f feat(接口测试): 增加逻辑控制器 2020-09-17 18:04:51 +08:00
shiziyuan9527 ed43ef4dc4 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-17 18:03:32 +08:00
shiziyuan9527 92f91fcb48 feat(测试跟踪): 用例评审CURD 2020-09-17 18:03:05 +08:00
chenjianxing 78b0b348a0 feat(接口测试): 场景点图标才折叠 2020-09-17 18:02:46 +08:00
chenjianxing 884ae86d91 fix(接口测试): http请求页面报错 2020-09-17 17:51:16 +08:00
chenjianxing 1b36e3302a Merge branch 'master' of https://github.com/metersphere/server 2020-09-17 17:17:35 +08:00