shiziyuan9527
|
3738f77950
|
restTemplate 超时限制
|
2020-06-12 20:32:17 +08:00 |
chenjianxing
|
82f7b44a03
|
fix 导入用户该维护人不存在
|
2020-06-12 13:46:46 +08:00 |
|
shiziyuan9527
|
18fcb24755
|
restTemplate 超时限制
|
2020-06-12 11:02:46 +08:00 |
|
chenjianxing
|
d96578f305
|
切换组织时自动选取工作空间
|
2020-06-12 09:49:27 +08:00 |
|
chenjianxing
|
8b15612d61
|
创建项目后台权限
|
2020-06-11 18:11:52 +08:00 |
|
chenjianxing
|
7ccf59ac8a
|
测试计划报告保留一位小数
|
2020-06-11 15:39:41 +08:00 |
|
chenjianxing
|
875e132d99
|
Merge branch 'dev' of https://github.com/metersphere/server into dev
|
2020-06-11 15:33:44 +08:00 |
|
chenjianxing
|
32fd7e8b1f
|
自动更新执行人
|
2020-06-11 15:33:19 +08:00 |
|
shiziyuan9527
|
3ab0ef54b5
|
用户ID校验
|
2020-06-11 15:26:09 +08:00 |
|
chenjianxing
|
155ff74c57
|
邮箱登入
|
2020-06-11 14:27:17 +08:00 |
|
chenjianxing
|
30c0612c51
|
fix 字符集
|
2020-06-11 12:06:35 +08:00 |
|
shiziyuan9527
|
20a0fa0fcc
|
删除资源池前进行检查
|
2020-06-11 11:44:52 +08:00 |
Captain.B
|
6560a87bd6
|
去掉dns cache
|
2020-06-11 10:39:09 +08:00 |
|
Captain.B
|
6694f45c17
|
rollback
|
2020-06-10 16:47:33 +08:00 |
|
shiziyuan9527
|
c2f91a140e
|
校验资源池服务器是否可用时，添加超时限制
|
2020-06-10 16:21:40 +08:00 |
|
Captain.B
|
302d4ea5a3
|
每次刷新页面的时候重新put session user
|
2020-06-10 16:17:29 +08:00 |
|
Captain.B
|
0065f15f60
|
Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev
|
2020-06-10 14:09:58 +08:00 |
|
Captain.B
|
26079198e1
|
get user
|
2020-06-09 15:18:40 +08:00 |
q4speed
|
92d10d6c8e
|
NaN
|
2020-06-09 11:14:52 +08:00 |
|
q4speed
|
6cb11c5fb7
|
修改sql，去掉大小写区分
|
2020-06-09 10:56:04 +08:00 |
|
shiziyuan9527
|
ae77df2ae3
|
用户排序
|
2020-06-08 18:18:11 +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 |
|
shiziyuan9527
|
c14a8b24c3
|
移除角色时判断是否需要清空lastWsId和lastOrgId
|
2020-06-08 16:08:53 +08:00 |
|
shiziyuan9527
|
0e240b1ad9
|
删除用户时同时删除用户角色
|
2020-06-08 14:10:44 +08:00 |
|
chenjianxing
|
5ab8c54f93
|
Merge branch 'dev' of https://github.com/metersphere/server into dev
|
2020-06-08 13:23:17 +08:00 |
|
chenjianxing
|
ad2f41f07a
|
删除项目确认
|
2020-06-08 12:58:38 +08:00 |
|
Captain.B
|
66b60dbbc6
|
删除无用的代码
|
2020-06-08 11:56:31 +08:00 |
|
shiziyuan9527
|
5eca6de52f
|
fix
|
2020-06-05 17:52:51 +08:00 |
|
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 |