Commit Graph

1182 Commits

Author SHA1 Message Date
wenyann 1477e6961a Merge remote-tracking branch 'origin/dev' into dev 2020-06-05 15:30:11 +08:00
wenyann 2caa6637d7 '资源池url和token默认填充' 2020-06-05 15:28:57 +08:00
chenjianxing 5df638d51c 统一首页跳转样式 2020-06-05 14:49:47 +08:00
chenjianxing d74f2e5b01 接口性能测试跳转只读用户 2020-06-05 14:40:58 +08:00
chenjianxing 9d2da8f7f9 最近测试只读用户 2020-06-05 14:27:19 +08:00
chenjianxing 2ee269c533 最近测试只读用户 2020-06-05 14:19:05 +08:00
chenjianxing b4e5dbc382 性能测试点击一行只读 2020-06-05 11:20:40 +08:00
chenjianxing 8af9a73d9a api测试点击一行只读 2020-06-05 10:59:53 +08:00
chenjianxing cb3b90a033 网站链接 2020-06-05 09:52:17 +08:00
chenjianxing ba7f600b8c 关于页宽度 2020-06-05 09:50:29 +08:00
wenyann 285037e475 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	backend/src/main/java/io/metersphere/controller/SystemParameterController.java
#	backend/src/main/java/io/metersphere/service/SystemParameterService.java
2020-06-04 18:34:32 +08:00
wenyann fc8cad2679 '添加查询默认smtp设置' 2020-06-04 18:32:06 +08:00
q4speed 3e126e7f3e 新页面打开链接 2020-06-04 18:10:38 +08:00
q4speed 79c7ac49a6 Merge remote-tracking branch 'origin/dev' into dev 2020-06-04 16:41:14 +08:00
q4speed 7d95c69637 修改标题等内容 2020-06-04 16:40:43 +08:00
chenjianxing 5833c3b902 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-04 15:56:47 +08:00
chenjianxing 8e8dbf5259 关于页 2020-06-04 15:56:22 +08:00
shiziyuan9527 03787d12c8 修改成员时角色项为必填 2020-06-04 15:27:14 +08:00
q4speed 430c15f742 Merge remote-tracking branch 'origin/dev' into dev 2020-06-04 15:13:55 +08:00
q4speed 29417d246a 修复enable值为readOnly的bug 2020-06-04 15:13:42 +08:00
shiziyuan9527 076e0b657f i18n 2020-06-04 14:32:43 +08:00
shiziyuan9527 dcdda0b3b8 fix 创建用户时密码自动填充 2020-06-04 14:25:43 +08:00
wenyann db0d13d438 Merge remote-tracking branch 'origin/dev' into dev 2020-06-04 10:52:08 +08:00
wenyann 19b400b1c6 '修复个人信息提示不全' 2020-06-04 10:48:05 +08:00
q4speed 22fb6855ab 修复复制成功提示bug 2020-06-03 18:16:38 +08:00
q4speed f83e2a69cc 修复复制成功提示bug 2020-06-03 18:15:21 +08:00
chenjianxing f83550044f Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-03 17:37:54 +08:00
chenjianxing 9569be7d1f 测试报告修改至测试计划 2020-06-03 17:37:32 +08:00
shiziyuan9527 1ee3dd09b0 fix 性能、接口测试 测试跳转方式 2020-06-03 16:49:40 +08:00
chenjianxing c7a927c78c 测试跟踪项目跳转 2020-06-03 16:24:18 +08:00
chenjianxing 1df3bb49c1 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-03 16:00:09 +08:00
chenjianxing 445a075744 去掉调试打印 2020-06-03 15:59:57 +08:00
q4speed 75803d6c2b Merge remote-tracking branch 'origin/dev' into dev 2020-06-03 15:51:04 +08:00
q4speed 47c8ba45b5 显示字符长度限制 2020-06-03 15:50:21 +08:00
q4speed 0778f3c230 修复提前器特殊字符bug 2020-06-03 15:46:18 +08:00
chenjianxing 389f356012 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-03 15:38:40 +08:00
chenjianxing 4e7d42c272 fix 快捷创建用例 2020-06-03 15:38:26 +08:00
shiziyuan9527 16159a02ea 去掉无用代码 2020-06-03 14:32:34 +08:00
q4speed 366213d2a5 修复菜单触发方式 2020-06-03 13:26:53 +08:00
chenjianxing 6f4d91102f 接口测试结果刷新 2020-06-03 11:58:26 +08:00
chenjianxing 572f53d1d4 解决localStorage清空,cookie没失效导致的卡死问题 2020-06-03 11:07:13 +08:00
wenyann 8ba58d1a70 Merge remote-tracking branch 'origin/dev' into dev 2020-06-02 19:39:51 +08:00
wenyann ff0d49fb6f 'session国际化' 2020-06-02 19:39:31 +08:00
shiziyuan9527 7205b02a8f 去掉性能测试名称特殊字符校验 2020-06-02 18:52:49 +08:00
wenyann 1a562ef255 '修改测试报告展示' 2020-06-02 18:14:03 +08:00
shiziyuan9527 1a15ebae4e Merge branch 'dev' of https://github.com/metersphere/metersphere into dev 2020-06-02 16:48:35 +08:00
wenyann 89eaebebdd Merge remote-tracking branch 'origin/dev' into dev 2020-06-02 16:48:11 +08:00
shiziyuan9527 ffdd3ebd40 资源池为空时跳转到压力配置Tab 2020-06-02 16:48:02 +08:00
wenyann 6e57757d61 '' 2020-06-02 16:47:24 +08:00
chenjianxing 17b10751a8 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-02 16:16:55 +08:00
chenjianxing 35aee1f213 fix 快捷创建用例 2020-06-02 16:16:37 +08:00
q4speed 8e3af5ad68 Merge remote-tracking branch 'origin/dev' into dev 2020-06-02 16:12:30 +08:00
q4speed 2d118712a2 创建接口测试时,带入最后选择的项目 2020-06-02 16:12:20 +08:00
q4speed 74a49ae13f 去掉无用代码 2020-06-02 16:09:35 +08:00
wenyann 03c39aee90 '' 2020-06-02 15:46:46 +08:00
wenyann 9ab8e749c5 '' 2020-06-02 15:44:07 +08:00
chenjianxing 1b6cdb648d Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-02 15:25:07 +08:00
chenjianxing 96e3111768 i18n 2020-06-02 15:24:43 +08:00
wenyann ffaefb3985 修改API测试判断名称不能重复 2020-06-02 15:20:39 +08:00
chenjianxing 2f6c95d137 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-02 14:58:08 +08:00
chenjianxing aa60ed59fd 接口测试只读 2020-06-02 14:57:57 +08:00
shiziyuan9527 4f3aa4b8ae 项目排序 2020-06-02 14:50:39 +08:00
chenjianxing 445d90c955 性能测试只读页面 2020-06-02 14:09:24 +08:00
q4speed 989c07280a keepalive 2020-06-02 14:06:45 +08:00
q4speed 1a67407155 Merge remote-tracking branch 'origin/dev' into dev 2020-06-02 12:43:05 +08:00
q4speed 9a97f53ae4 修复oom问题,查看报告获取日志改为滚动分页,不再一次获取 2020-06-02 12:42:52 +08:00
chenjianxing 91ffab8c30 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-02 11:51:05 +08:00
chenjianxing a94f648d6d session 过期报错提示 2020-06-02 11:50:48 +08:00
chenjianxing c9ceaa3c8c 测试用例只读页面 2020-06-02 11:39:56 +08:00
shiziyuan9527 fbcd87f7ca 性能测试名称校验 2020-06-02 11:35:39 +08:00
wenyann cb11ae8646 Merge remote-tracking branch 'origin/dev' into dev 2020-06-02 10:38:29 +08:00
wenyann d140acb522 接口测试报告和测试排序 2020-06-02 10:38:04 +08:00
shiziyuan9527 b5c220f9a6 性能测试报告 筛选排序 2020-06-01 21:34:49 +08:00
shiziyuan9527 9f3a21756a fix 筛选,排序 2020-06-01 21:16:18 +08:00
wenyann 2dbc79eadd 接口测试状态筛选更新 2020-06-01 19:53:11 +08:00
wenyann 59a645edd2 接口测试逻辑跳转 2020-06-01 19:07:47 +08:00
chenjianxing db9d5643aa Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-01 18:37:11 +08:00
chenjianxing e1da61a846 报错提示 2020-06-01 18:36:48 +08:00
chenjianxing 6db8c62171 测试计划备注长度校验 2020-06-01 18:28:33 +08:00
shiziyuan9527 32b77b5e2f 性能测试报告筛选排序 2020-06-01 18:13:18 +08:00
shiziyuan9527 2ac559519a 筛选测试,最近报告增加时间 2020-06-01 18:06:38 +08:00
chenjianxing 6554685c37 测试计划排序筛选 2020-06-01 18:02:05 +08:00
chenjianxing e3f364c0b0 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-01 17:26:20 +08:00
chenjianxing 54000e2f31 测试用例关联性能测试 2020-06-01 17:25:55 +08:00
shiziyuan9527 42db0a44d3 性能测试-全部测试-点击名称跳转 2020-06-01 17:25:19 +08:00
shiziyuan9527 8abae1024d 性能测试-全部测试-排序 2020-06-01 16:43:51 +08:00
shiziyuan9527 12c6acef77 性能测试-全部项目-点击项目名跳转 2020-06-01 15:15:16 +08:00
shiziyuan9527 194326b11e 性能测试 复制 2020-06-01 14:29:00 +08:00
chenjianxing 903c81c93b Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-01 13:43:10 +08:00
chenjianxing 6035750d74 测试计划状态快捷修改 2020-06-01 13:42:48 +08:00
chenjianxing 107abf98b0 测试计划-测试用例快捷修改状态 2020-06-01 13:37:13 +08:00
wenyann df8984d7ca Merge remote-tracking branch 'origin/dev' into dev 2020-06-01 12:11:37 +08:00
q4speed 00c60388f1 Merge remote-tracking branch 'origin/dev' into dev 2020-06-01 11:48:54 +08:00
q4speed 806fe04fa1 修复lang为空报错问题 2020-06-01 11:46:31 +08:00
chenjianxing c7f0d842ef Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-01 11:17:55 +08:00
chenjianxing c4537726a0 添加创建用例快捷按钮 2020-06-01 11:17:42 +08:00
wenyann 057ae3406b '' 2020-05-29 19:00:17 +08:00
q4speed f4d3e95170 1.增加URL验证
2.URL不填不能保存或运行
2020-05-29 18:44:00 +08:00
q4speed e403e7bc6e Merge remote-tracking branch 'origin/dev' into dev 2020-05-29 18:13:27 +08:00
q4speed f01bbf0f3f 修复响应时间断言更新bug 2020-05-29 18:13:13 +08:00
q4speed f30c30325e 场景clone 2020-05-29 18:12:48 +08:00
q4speed 2a5c5815e2 修复场景名称被改变的bug 2020-05-29 18:08:30 +08:00
shiziyuan9527 be67e74603 fix 性能测试报告面包屑跳转 2020-05-29 17:30:27 +08:00
chenjianxing a646d41ef4 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-29 17:24:11 +08:00
shiziyuan9527 c03656f5ad 性能测试报告添加创建人 2020-05-29 17:21:50 +08:00
q4speed aad9d64a7a Merge remote-tracking branch 'origin/dev' into dev 2020-05-29 17:11:08 +08:00
q4speed 082dd21cd3 去掉场景名称和请求名称输入字符限制,只设长度限制。 2020-05-29 17:03:06 +08:00
shiziyuan9527 ab19dc0627 Merge branch 'dev' of https://github.com/metersphere/metersphere into dev 2020-05-29 17:02:49 +08:00
shiziyuan9527 464fd7abb0 添加性能测试创建人 2020-05-29 17:02:39 +08:00
chenjianxing ee23eff3e9 fix 下一个测试用例获取关联测试 2020-05-29 16:56:10 +08:00
q4speed 8611d153f9 Merge remote-tracking branch 'origin/dev' into dev 2020-05-29 16:53:55 +08:00
q4speed ddaed4f2f7 自定义变量等key value输入显示输入字符限制 2020-05-29 16:53:42 +08:00
chenjianxing d97eacd5e4 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-29 16:46:58 +08:00
chenjianxing 1f84e55ce7 解决全屏对话框浏览器回退问题 2020-05-29 16:46:32 +08:00
shiziyuan9527 b602eae04c Merge branch 'dev' of https://github.com/metersphere/metersphere into dev 2020-05-29 16:42:54 +08:00
shiziyuan9527 3fc0f46f35 性能测试修改文件上传个数 2020-05-29 16:42:28 +08:00
q4speed 34d2fac553 复制接口测试 2020-05-29 16:29:57 +08:00
q4speed 9472430209 修改按钮禁用 2020-05-29 15:28:12 +08:00
q4speed b116516af1 Merge branch 'dev' of https://github.com/metersphere/metersphere into dev 2020-05-29 14:57:32 +08:00
q4speed 11979fd663 从接口测试 创建 性能测试 2020-05-29 14:57:19 +08:00
shiziyuan9527 3dbd617ded i18n 2020-05-29 14:15:32 +08:00
chenjianxing 18eee8c2a6 没有模块时,提示先创建模块 2020-05-29 14:15:20 +08:00
chenjianxing 9f7baf6dfb fix 2020-05-29 13:32:46 +08:00
chenjianxing 5cf20ef27d Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-29 13:27:22 +08:00
chenjianxing dc0ab3b22a 测试用例关联性能测试页面 2020-05-29 13:27:07 +08:00
shiziyuan9527 50c362adf9 Merge branch 'dev' of https://github.com/metersphere/metersphere into dev 2020-05-29 11:06:44 +08:00
wenyann 353338b7c2 Merge remote-tracking branch 'origin/dev' into dev 2020-05-29 11:05:57 +08:00
shiziyuan9527 a3f97c8362 项目描述添加长度限制 2020-05-29 11:05:49 +08:00
wenyann 670a7dfd11 '' 2020-05-29 11:05:08 +08:00
chenjianxing 093ac790f0 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-28 23:51:46 +08:00
chenjianxing 1293137541 测试用例关联接口测试 2020-05-28 23:51:27 +08:00
shiziyuan9527 dd9b03c206 性能测试-点击测试或报告会刷新页面问题 2020-05-28 23:07:53 +08:00
q4speed edea4644ce Merge remote-tracking branch 'origin/dev' into dev 2020-05-28 17:23:09 +08:00
q4speed 08253e818e 修复空字符串替换bug 2020-05-28 17:22:42 +08:00
chenjianxing cb34d921bd Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-28 14:27:27 +08:00
chenjianxing 5cd7841004 测试计划-测试用例关联测试 2020-05-28 14:27:11 +08:00
shiziyuan9527 3f74d5d138 i18n 2020-05-28 13:51:40 +08:00
chenjianxing bceade43a9 创建用例绑定测试 2020-05-28 09:47:24 +08:00
shiziyuan9527 fd4854d4ab bug fix 资源池创建未检查同名 2020-05-27 19:02:42 +08:00
shiziyuan9527 2b6e4ee958 bug fix 创建工作空间时对名称和描述长度限制 2020-05-27 18:30:23 +08:00
shiziyuan9527 448dccdcbd bug fix 创建工作空间时对名称和描述长度限制 2020-05-27 17:05:01 +08:00
chenjianxing 48eafa2be0 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-27 16:30:33 +08:00
chenjianxing 30500115fb 性能测试只读 2020-05-27 16:30:21 +08:00
chenjianxing 40da3d46c0 接口测试只读 2020-05-27 16:15:56 +08:00
chenjianxing 06aecf4425 测试跟踪只读 2020-05-27 16:07:46 +08:00
shiziyuan9527 eeb6dd0a70 bug fix 禁用用户后仍可登录 2020-05-27 14:42:54 +08:00
shiziyuan9527 ab23a3d5f3 管理员添加成员时提示问题 2020-05-27 14:06:30 +08:00
chenjianxing 660035b1a8 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-27 12:25:18 +08:00
chenjianxing 74827189bc fix 删除项目 2020-05-27 12:25:02 +08:00
wenyann 1288f6ecf9 Merge remote-tracking branch 'origin/dev' into dev 2020-05-27 12:05:43 +08:00
wenyann dd21945dae '' 2020-05-27 12:05:16 +08:00
q4speed de13d7866a Merge remote-tracking branch 'origin/dev' into dev 2020-05-27 11:56:16 +08:00
q4speed 9718c6ece6 修复断言名称为null的bug 2020-05-27 11:55:59 +08:00
chenjianxing dfd6aaeeee 自动更新测试计划状态 2020-05-27 10:47:30 +08:00
wenyann 42d1b1ece1 '' 2020-05-27 10:46:53 +08:00
shiziyuan9527 65a54d9286 i18n 2020-05-27 10:38:19 +08:00
chenjianxing a7a5086816 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-26 21:45:03 +08:00
chenjianxing ee83169911 测试计划-测试用例取消自动保存 2020-05-26 21:44:42 +08:00
chenjianxing ff4d2f0da5 前置条件长度限制 2020-05-26 19:50:14 +08:00
chenjianxing bae5d95371 测试用例默认按更新时间排序 2020-05-26 19:45:08 +08:00
wenyann 7760fbea72 修改session过期提示 2020-05-26 18:45:22 +08:00
wenyann 499ddca4c3 Merge remote-tracking branch 'origin/dev' into dev 2020-05-26 17:29:16 +08:00
wenyann 0511cfedb7 .. 2020-05-26 17:27:37 +08:00
shiziyuan9527 a882fa0afc 修改按钮和提示 2020-05-26 17:06:28 +08:00
shiziyuan9527 c8be28e2aa i18n 2020-05-26 16:35:33 +08:00
shiziyuan9527 b61dbfe107 修改工作空间管理员添加成员的方式 2020-05-26 16:13:27 +08:00
shiziyuan9527 b34c209257 修改组织管理员添加成员的方式 2020-05-26 15:52:57 +08:00
chenjianxing da32ae5a84 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-26 14:58:05 +08:00
chenjianxing ccb6bfc95d 首页测试计划添加表头 2020-05-26 14:57:43 +08:00
q4speed 12b4aae62c 完成follow_redirects,展示子请求内容 2020-05-26 14:32:20 +08:00
q4speed e4acd3cdf6 修复post body encode bug,
修复响应时间断言未加上bug
2020-05-26 13:00:58 +08:00
wenyann def79b1de0 .. 2020-05-26 09:49:38 +08:00
wenyann 66b12adc03 Merge remote-tracking branch 'origin/dev' into dev 2020-05-25 19:14:30 +08:00
wenyann 57c8150a5d 修改组织成员提示 2020-05-25 19:13:59 +08:00
chenjianxing 0821c307b2 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-25 19:09:40 +08:00
chenjianxing 4a270ceba2 测试计划项目不能修改 2020-05-25 18:22:28 +08:00
shiziyuan9527 a0c878bb63 bug fix 上传jmx文件数量检查问题 2020-05-25 18:21:00 +08:00
wenyann 05bd3a1353 修改 2020-05-25 17:46:29 +08:00
wenyann 98f955a74e 测试 2020-05-25 17:33:34 +08:00
chenjianxing cf0f35eba3 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-25 17:26:06 +08:00
chenjianxing b7b33ad2bb 删除项目提示并删除测试跟踪资源 2020-05-25 17:25:49 +08:00
shiziyuan9527 a16c0be406 i18n 2020-05-25 17:00:54 +08:00
shiziyuan9527 7dce48c7bb bug fix 系统设置中重复进入相同路由刷新数据 2020-05-25 16:20:58 +08:00
q4speed b6fef27f69 Merge remote-tracking branch 'origin/dev' into dev 2020-05-25 15:24:27 +08:00
q4speed e736019e8f 改为后台增加BackendListener,保证前端生成的jmx独立性 2020-05-25 15:22:05 +08:00
chenjianxing df7f4c18da Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-22 19:56:30 +08:00
chenjianxing f9ff75fe36 测试跟踪-只读用户 2020-05-22 19:56:09 +08:00
q4speed af47f8d950 避免异常状态导致无限循环 2020-05-22 18:07:19 +08:00
q4speed 2f1a299f27 避免异常状态导致无限循环 2020-05-22 17:56:19 +08:00
q4speed 907da39d8d Merge remote-tracking branch 'origin/dev' into dev 2020-05-22 17:50:03 +08:00
q4speed 063e3ec03d 增加失败场景 2020-05-22 17:49:48 +08:00
shiziyuan9527 ca3a38ab1a 修复编辑用户角色出现的问题 2020-05-22 17:47:30 +08:00
q4speed b2f6866237 Merge remote-tracking branch 'origin/dev' into dev 2020-05-22 16:45:34 +08:00
q4speed a5bc32ff57 修改多个脚本并行运行的处理方式 2020-05-22 16:45:08 +08:00
chenjianxing 21d7beb82f 编辑用例去掉继续创建选项 2020-05-22 16:39:31 +08:00
chenjianxing 6ae916a191 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-22 16:32:33 +08:00
chenjianxing 1f3ca6f5f2 文件下载方法 2020-05-22 16:31:55 +08:00
chenjianxing bdac9282fc 项目列表去掉工作空间字段 2020-05-22 16:17:54 +08:00
chenjianxing 6977ee496b excel导入导出国际化 2020-05-22 16:08:22 +08:00
shiziyuan9527 9b0a2f1f3a 校验特殊字符 2020-05-22 15:52:42 +08:00