haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 15:09:14 +00:00
Code Issues Releases Wiki Activity

Merge branch '6.0'

Browse Source 
Conflicts:
	media/css/seahub.css
This commit is contained in:
zhengxie
2016-12-26 14:22:35 +08:00
parent f5d17c3814 c28f684c22
commit d4e00402af
39 changed files with 520 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
static/scripts/common.js
View File

@@ -184,6 +184,7 @@ define([
case 'admin-trash-libraries': return siteRoot + 'api/v2.1/admin/trash-libraries/';
case 'admin-trash-library': return siteRoot + 'api/v2.1/admin/trash-libraries/' + options.repo_id + '/';
case 'admin_shares': return siteRoot + 'api/v2.1/admin/shares/';
case 'sys_group_admin_export_excel': return siteRoot + 'sys/groupadmin/export-excel/';
}
},