Commit Graph

1450 Commits

Author SHA1 Message Date
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
shiziyuan9527 80a870c548 bug fix 2020-06-05 15:25:54 +08:00
chenjianxing 5df638d51c 统一首页跳转样式 2020-06-05 14:49:47 +08:00
shiziyuan9527 9acb7e38a2 fix 无角色登录 2020-06-05 14:44:11 +08:00
chenjianxing 511cd64a4e Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-05 14:41:39 +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
shiziyuan9527 5291f6073c i18n 2020-06-05 10:46:14 +08:00
chenjianxing cb3b90a033 网站链接 2020-06-05 09:52:17 +08:00
chenjianxing ba7f600b8c 关于页宽度 2020-06-05 09:50:29 +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
q4speed 3e126e7f3e 新页面打开链接 2020-06-04 18:10:38 +08:00
shiziyuan9527 1b12e870d0 系统设置下信息列表按照时间排序查询 2020-06-04 17:57:36 +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 d4d09ccf0d 关于 2020-06-04 16:09:03 +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
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
q4speed 29417d246a 修复enable值为readOnly的bug 2020-06-04 15:13:42 +08:00
wenyann 93ddd15caf Merge remote-tracking branch 'origin/dev' into dev 2020-06-04 14:43:53 +08:00
wenyann 4b5aa3d98c '登陆国际化修改' 2020-06-04 14:43:27 +08:00
shiziyuan9527 076e0b657f i18n 2020-06-04 14:32:43 +08:00
shiziyuan9527 dcdda0b3b8 fix 创建用户时密码自动填充 2020-06-04 14:25:43 +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
wenyann db0d13d438 Merge remote-tracking branch 'origin/dev' into dev 2020-06-04 10:52:08 +08:00
王振 07a53aa6f3 构建参数默认值 2020-06-04 10:50:29 +08:00
王振 a40d3056aa Merge branch 'dev' of github.com:metersphere/metersphere into dev 2020-06-04 10:49:53 +08:00
王振 ee306e720e 增加构建参数 2020-06-04 10:49:31 +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
q4speed 6aa1701e2e Merge remote-tracking branch 'origin/dev' into dev 2020-06-03 18:07:38 +08:00
q4speed b06215f582 修复字符集bug 2020-06-03 18:07:28 +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