Commit Graph

758 Commits

Author SHA1 Message Date
shiziyuan9527 80a870c548 bug fix 2020-06-05 15:25:54 +08:00
shiziyuan9527 9acb7e38a2 fix 无角色登录 2020-06-05 14:44:11 +08:00
shiziyuan9527 5291f6073c i18n 2020-06-05 10:46:14 +08:00
shiziyuan9527 0923ed43de Merge branch 'dev' of https://github.com/metersphere/metersphere into dev 2020-06-04 18:52:10 +08:00
shiziyuan9527 1304459791 i18n 2020-06-04 18:51:48 +08:00
wenyann ba94365ea8 '合并' 2020-06-04 18:43:54 +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
shiziyuan9527 1b12e870d0 系统设置下信息列表按照时间排序查询 2020-06-04 17:57:36 +08:00
chenjianxing d4d09ccf0d 关于 2020-06-04 16:09:03 +08:00
wenyann 54f2fdf3ea Merge remote-tracking branch 'origin/dev' into dev 2020-06-04 15:19:33 +08:00
wenyann 22ff5f0b4b 'i18n' 2020-06-04 15:19:10 +08:00
q4speed 430c15f742 Merge remote-tracking branch 'origin/dev' into dev 2020-06-04 15:13:55 +08:00
wenyann 4b5aa3d98c '登陆国际化修改' 2020-06-04 14:43:27 +08:00
q4speed 3cdd916633 去掉无用代码 2020-06-04 14:17:05 +08:00
wenyann 381189cb39 '登陆国际化修改' 2020-06-04 11:58:08 +08:00
wenyann 4191176da7 '修改个人信息密码提示' 2020-06-04 11:03:15 +08:00
q4speed b06215f582 修复字符集bug 2020-06-03 18:07:28 +08:00
q4speed 19ae82dc43 修复排序问题 2020-06-03 14:37:02 +08:00
q4speed b022fc087a 修复排序问题 2020-06-03 13:23:52 +08:00
q4speed a64685abdf 修复测试名称重复bug 2020-06-03 11:43:29 +08:00
wenyann 86630d0115 '性能测试报告展示' 2020-06-02 18:35:38 +08:00
shiziyuan9527 e39732882d fix 同名校验 2020-06-02 18:12:29 +08:00
王振 5f1ed2611b Merge branch 'dev' of github.com:metersphere/metersphere into dev 2020-06-02 17:31:51 +08:00
王振 963b41006a 增加默认组织、工作空间创建 SQL 2020-06-02 17:31:39 +08:00
wenyann e4cdbc8d24 Merge remote-tracking branch 'origin/dev' into dev 2020-06-02 17:17:21 +08:00
wenyann 0639330f83 '接口测试名称重复国际化修改' 2020-06-02 17:16:57 +08:00
shiziyuan9527 a12cf46b7a fix 组织名称重复检查 2020-06-02 17:11:49 +08:00
wenyann 7849e771e5 Merge remote-tracking branch 'origin/dev' into dev 2020-06-02 16:54:42 +08:00
wenyann 1c671aed3c '' 2020-06-02 16:54:21 +08:00
shiziyuan9527 1a15ebae4e Merge branch 'dev' of https://github.com/metersphere/metersphere into dev 2020-06-02 16:48:35 +08:00
wenyann dd8ab09875 '接口测试筛选修改' 2020-06-02 16:47:41 +08:00
shiziyuan9527 25ee74760f i18n 2020-06-02 16:46:43 +08:00
wenyann b6529b25b8 '' 2020-06-02 15:41:50 +08:00
wenyann 6e3d551a01 '' 2020-06-02 15:33:52 +08:00
wenyann ffaefb3985 修改API测试判断名称不能重复 2020-06-02 15:20:39 +08:00
wenyann 2bd46011ea Merge remote-tracking branch 'origin/dev' into dev 2020-06-02 15:16:32 +08:00
wenyann 4ac32d7c17 API测试判断名称不能重复 2020-06-02 15:15:32 +08:00
shiziyuan9527 4f3aa4b8ae 项目排序 2020-06-02 14:50:39 +08:00
shiziyuan9527 8e52fc7266 最近列表按照更新时间降序 2020-06-02 14:31:21 +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
shiziyuan9527 b5c220f9a6 性能测试报告 筛选排序 2020-06-01 21:34:49 +08:00
shiziyuan9527 9f3a21756a fix 筛选,排序 2020-06-01 21:16:18 +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 194326b11e 性能测试 复制 2020-06-01 14:29:00 +08:00
chenjianxing dde198da93 测试计划默认排序 2020-06-01 13:53:09 +08:00
shiziyuan9527 c03656f5ad 性能测试报告添加创建人 2020-05-29 17:21:50 +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 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
q4speed 592c8117bc 接口测试复制功能 2020-05-29 16:34:42 +08:00
chenjianxing 5f93bc4f56 判断导入文件中名称重复 2020-05-29 14:01:08 +08:00
chenjianxing 146a5cc385 修改项目、计划、用例时判断名称重复 2020-05-29 13:47:40 +08:00
shiziyuan9527 a07e58e54f 项目按照更新时间排序 2020-05-29 11:24:00 +08:00
chenjianxing 1293137541 测试用例关联接口测试 2020-05-28 23:51:27 +08:00
chenjianxing cb34d921bd Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-28 14:27:27 +08:00
chenjianxing bceade43a9 创建用例绑定测试 2020-05-28 09:47:24 +08:00
shiziyuan9527 d4a4d74926 校验邮箱是否存在 2020-05-27 21:09:24 +08:00
shiziyuan9527 fd4854d4ab bug fix 资源池创建未检查同名 2020-05-27 19:02:42 +08:00
shiziyuan9527 e8db406de6 bug fix 修改组织的描述信息失败 2020-05-27 18:15:26 +08:00
shiziyuan9527 37de2c2c4e 接口添加权限 2020-05-27 14:45:06 +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 74827189bc fix 删除项目 2020-05-27 12:25:02 +08:00
chenjianxing dfd6aaeeee 自动更新测试计划状态 2020-05-27 10:47:30 +08:00
chenjianxing a7a5086816 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-26 21:45:03 +08:00
chenjianxing bae5d95371 测试用例默认按更新时间排序 2020-05-26 19:45:08 +08:00
王振 1ad5d52e73 update default user 2020-05-26 18:22:32 +08:00
q4speed 12b4aae62c 完成follow_redirects,展示子请求内容 2020-05-26 14:32:20 +08:00
q4speed d240c1a377 删除项目时,删除接口测试相关资源 2020-05-26 13:12:37 +08:00
q4speed adb7dc2728 修复乱码 2020-05-26 12:59:13 +08:00
q4speed 0433d8f36b Merge remote-tracking branch 'origin/dev' into dev 2020-05-26 12:15:07 +08:00
q4speed 7cba4604da 压缩报告 2020-05-26 12:14:50 +08:00
chenjianxing 58ba058041 冲突 2020-05-25 17:58:07 +08:00
chenjianxing fbbba58bfc 测试计划已存在校验 2020-05-25 17:46:12 +08:00
wenyann a64760e72d Merge remote-tracking branch 'origin/dev' into dev 2020-05-25 17:32:34 +08:00
wenyann bc3e3d6fcd 测试 2020-05-25 17:31:45 +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
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
shiziyuan9527 928539f1c1 添加性能测试创建人和报告创建人 2020-05-25 14:31:16 +08:00
chenjianxing afcd60c6f7 添加后端权限 2020-05-22 20:08:37 +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
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 6ae916a191 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-22 16:32:33 +08:00
chenjianxing 6977ee496b excel导入导出国际化 2020-05-22 16:08:22 +08:00
shiziyuan9527 7421b4b89d 登录时判断用户状态 2020-05-22 14:47:07 +08:00
shiziyuan9527 788939936d 修改user字段为user_id 2020-05-22 14:29:16 +08:00
shiziyuan9527 b169fb86da 修改新增工作空间接口 2020-05-22 14:16:15 +08:00
q4speed 4896115c1c Merge remote-tracking branch 'origin/dev' into dev 2020-05-22 13:25:44 +08:00