haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-31 22:54:11 +00:00
Code Issues Releases Wiki Activity

Merge branch '6.0'

Browse Source 
Conflicts:
	media/js/base.js
	seahub/api2/views.py
	seahub/views/ajax.py
	tests/api/test_repo_user_folder_perm.py
This commit is contained in:
zhengxie
2017-02-17 17:11:33 +08:00
parent 096e2e06bb 08ce98ec19
commit d82df5fb52
176 changed files with 44016 additions and 40721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/scripts/app/views/group-settings.js
View File

@@ -270,7 +270,7 @@ define([
if (data.failed.length > 0) {
var err_msg = '';
$(data.failed).each(function(index, item) {
err_msg += item.email + ': ' + item.error_msg + '<br />';
err_msg += Common.HTMLescape(item.email) + ': ' + Common.HTMLescape(item.error_msg) + '<br />';
});
$error.html(err_msg).removeClass('hide');
Common.enableButton($submitBtn);