Merge branch 'master' into fix_3728_with_file_exists_dialog

Conflicts:
	apps/files/js/file-upload.js

diff --cc apps/files/css/files.css
Simple merge

diff --cc apps/files/js/file-upload.js
index d1f9a79f21a5623e9d1f077d5e0c7e07f78abca0,970aad1f978690f88c602cf407fdcd8595301b70..e5b3f807580747232790aa56d7c20b8adb81cedc
--- 1/apps/files/js/file-upload.js
--- 2/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@@ -431,14 -160,15 +429,15 @@@ $(document).ready(function() 
        };
  
        // warn user not to leave the page while upload is in progress
 -      $(window).bind('beforeunload', function(e) {
 -              if ($.assocArraySize(uploadingFiles) > 0) {
 -                      return t('files','File upload is in progress. Leaving the page now will cancel the upload.');
 +      $(window).on('beforeunload', function(e) {
 +              if (OC.Upload.isProcessing()) {
 +                      return t('files', 'File upload is in progress. Leaving the page now will cancel the upload.');
                }
        });
+ 
        //add multiply file upload attribute to all browsers except konqueror (which crashes when it's used)
-       if(navigator.userAgent.search(/konqueror/i) === -1) {
-               $('#file_upload_start').attr('multiple', 'multiple');
+       if(navigator.userAgent.search(/konqueror/i)==-1){
+               $('#file_upload_start').attr('multiple','multiple');
        }
  
        //if the breadcrumb is to long, start by replacing foldernames with '...' except for the current folder