Commit Graph

1182 Commits

Author SHA1 Message Date
shiziyuan9527 c2f91a140e 校验资源池服务器是否可用时,添加超时限制 2020-06-10 16:21:40 +08:00
Captain.B 302d4ea5a3 每次刷新页面的时候重新put session user 2020-06-10 16:17:29 +08:00
chenjianxing 5fd03f1f54 测试日历显示问题 2020-06-10 13:47:05 +08:00
chenjianxing 3a9763ed82 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-10 11:12:32 +08:00
chenjianxing 247bb88666 资源池启用校验优化 2020-06-10 11:11:38 +08:00
wenyann 259031831d Merge remote-tracking branch 'origin/dev' into dev 2020-06-10 11:00:34 +08:00
wenyann be8ab4681f '' 2020-06-10 11:00:12 +08:00
chenjianxing 4f13120d31 测试计划详情添加报告按钮 2020-06-10 10:31:01 +08:00
chenjianxing 7e6fecc09f 性能测试跳转刷新 2020-06-10 10:01:04 +08:00
chenjianxing 354e3f9907 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-10 09:22:24 +08:00
shiziyuan9527 bf7bedef9c fix Safari 表格字段错位 2020-06-09 16:52:55 +08:00
王振 2b681f396f 更换 logo 图片 2020-06-09 15:26:19 +08:00
q4speed 129a602e00 Merge remote-tracking branch 'origin/dev' into dev 2020-06-09 15:18:26 +08:00
q4speed bc5f527364 修复响应时间断言输入框在删光字符后消失的bug 2020-06-09 15:18:12 +08:00
shiziyuan9527 990076e74f Safari下字段名称显示过长问题 2020-06-09 14:59:15 +08:00
q4speed 868e3316b0 Merge branch 'dev' of https://github.com/metersphere/metersphere into dev 2020-06-09 10:46:26 +08:00
chenjianxing 5bb2e223a8 接口测试首页刷新 2020-06-09 10:16:50 +08:00
wenyann e7d0ab6479 Merge remote-tracking branch 'origin/dev' into dev 2020-06-08 19:02:43 +08:00
wenyann 5d8581eac6 '默认设置' 2020-06-08 19:02:18 +08:00
王振 f1e4cb8d92 Merge branch 'dev' of github.com:metersphere/metersphere into dev 2020-06-08 17:50:16 +08:00
王振 82c0d658f2 update i18n 2020-06-08 17:49:42 +08:00
wenyann b53f07cae6 Merge remote-tracking branch 'origin/dev' into dev 2020-06-08 17:45:59 +08:00
wenyann 2181ef42ae '去除弹出保存用户名密码弹框' 2020-06-08 17:45:32 +08:00
shiziyuan9527 016e20ba60 性能测试首页,测试和报告交换位置 2020-06-08 17:12:33 +08:00
chenjianxing 8333367ca0 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-08 16:34:23 +08:00
chenjianxing af481eb14a 用例导入对话框大小 2020-06-08 16:34:01 +08:00
Captain.B 2a8fab75f0 去掉没有用到的代码 2020-06-08 16:15:13 +08:00
Captain.B cc7efe9497 Merge remote-tracking branch 'origin/dev' into dev 2020-06-08 16:10:25 +08:00
Captain.B b130c1ffa4 修复sql报错 2020-06-08 16:08:59 +08:00
chenjianxing 66ecbc26f0 解决富文本框link显示问题 2020-06-08 16:00:20 +08:00
chenjianxing 05af9a0f3d 阻止测试用例状态点击事件冒泡 2020-06-08 15:21:34 +08:00
Captain.B 4ef02281ce 去掉没有实现的按钮 2020-06-08 14:33:04 +08:00
chenjianxing 5ab8c54f93 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-08 13:23:17 +08:00
chenjianxing f247cab1f1 删除组织提示 2020-06-08 13:22:46 +08:00
chenjianxing bd320ff002 删除工作空间提示 2020-06-08 13:17:14 +08:00
chenjianxing ad2f41f07a 删除项目确认 2020-06-08 12:58:38 +08:00
shiziyuan9527 cbbfd79e62 项目名长度限制 2020-06-08 12:11:06 +08:00
chenjianxing 8896c0730f 删除测试计划确认 2020-06-08 12:11:06 +08:00
chenjianxing 88df2d6950 i18n 2020-06-08 12:11:06 +08:00
Captain.B 66b60dbbc6 删除无用的代码 2020-06-08 11:56:31 +08:00
chenjianxing 1b35fa2b5f Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-08 11:55:50 +08:00
chenjianxing 5c2fb3fca1 删除测试计划确认 2020-06-08 11:55:10 +08:00
shiziyuan9527 c45659a9de 项目名长度限制 2020-06-08 11:33:00 +08:00
shiziyuan9527 050a48fa73 fix ajax.js 2020-06-05 18:15:05 +08:00
chenjianxing d07676e678 i18n 2020-06-05 17:37:27 +08:00
q4speed c02c4b865c 简化 2020-06-05 17:18:17 +08:00
wenyann b4634994bf 'checked' 2020-06-05 17:15:50 +08:00
wenyann d42f399a49 Merge remote-tracking branch 'origin/dev' into dev 2020-06-05 16:03:18 +08:00
wenyann 8fa8a86912 '修复smtp设置取消保存成功' 2020-06-05 16:02:56 +08:00
chenjianxing ed556adc59 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-05 15:31:13 +08:00
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