Merge branch '5.0'

Conflicts: seahub/templates/base_for_backbone.html seahub/templates/libraries.html seahub/templates/myhome_base.html
2025-09-08 18:30:53 +00:00 · 2016-02-02 12:19:46 +08:00
parent d3eaf26773 f2b4cdad3d
commit cc5af51dec
48 changed files with 9694 additions and 9573 deletions
--- a/static/scripts/app/views/dir.js
+++ b/static/scripts/app/views/dir.js
@@ -325,7 +325,6 @@ define([
            // Directory Operations
            events: {
                'click .path-link': 'visitDir',
-                'click #upload-file': 'uploadFile',
                'click #add-new-dir': 'newDir',
                'click #add-new-file': 'newFile',
                'click #share-cur-dir': 'share',
--- a/static/scripts/lib/jquery.fileupload.ui.9.6.0.js
+++ b/static/scripts/lib/jquery.fileupload.ui.9.6.0.js