haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-08 18:30:53 +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/app/views/dialogs/repo-folder-perm-admin.js
View File

@@ -116,6 +116,7 @@ define([
},
error: function(collection, response, opts) {
$loadingTip.hide();
var err_msg;
if (response.responseText) {
if (response['status'] == 401 || response['status'] == 403) {
err_msg = gettext("Permission error");