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

Merge branch '6.0'

Browse Source 
Conflicts:
	seahub/templates/sysadmin/sysadmin_backbone.html
	seahub/urls.py
	seahub/views/sysadmin.py
	static/scripts/app/views/dir.js
This commit is contained in:
zhengxie
2017-03-27 13:53:35 +08:00
parent 88c8fe04c2 d49b7d0e17
commit 1b11350f80
39 changed files with 1092 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/scripts/app/views/fileupload.js
View File

@@ -268,7 +268,7 @@ define([
}
}
});
$('#simplemodal-container').css({'height':'auto'});
$('#simplemodal-container').css({'width':'auto', 'height':'auto'});
$('.yes', confirm_popup).click(function() {
var selected_file = dirents.findWhere({'obj_name': file.name});
if (selected_file.get('is_locked')) {