haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-26 07:22:34 +00:00
Code Issues Releases Wiki Activity

Merge branch '7.0'

Browse Source
This commit is contained in:
plt
2019-07-08 18:27:48 +08:00
parent 9583c71f1c 5db48da328
commit 6cb4d38788
31 changed files with 477 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/utils/constants.js
View File

@@ -119,5 +119,5 @@ export const canManageUser = window.sysadmin ? window.sysadmin.pageOptions.admin
export const canManageGroup = window.sysadmin ? window.sysadmin.pageOptions.admin_permissions.can_manage_group : '';
export const canViewUserLog = window.sysadmin ? window.sysadmin.pageOptions.admin_permissions.can_view_user_log : '';
export const canViewAdminLog = window.sysadmin ? window.sysadmin.pageOptions.admin_permissions.can_view_admin_log : '';
export const enableWorkWeixinDepartments = window.sysadmin ? window.sysadmin.pageOptions.enable_work_weixin_departments : '';
export const enableWorkWeixin = window.sysadmin ? window.sysadmin.pageOptions.enable_work_weixin : '';

3
frontend/src/utils/utils.js
View File

@@ -240,7 +240,8 @@ export const Utils = {
isSupportUploadFolder: function() {
return navigator.userAgent.indexOf('Firefox')!=-1 ||
navigator.userAgent.indexOf('Chrome') > -1;
navigator.userAgent.indexOf('Chrome') > -1 ||
navigator.userAgent.indexOf("Safari") > -1;
},
isIEBrower: function() { // is ie <= ie11 not include Edge