Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

www/common/toolbar3.js

@@ -596,7 +596,7 @@ define([
 
         var origin = config.metadataMgr.getPrivateData().origin;
 
-        var href = inDrive ? origin+'/index.html' : origin+'/drive/';
+        var href = inDrive.test(origin) ? origin+'/index.html' : origin+'/drive/';
         var buttonTitle = inDrive ? Messages.header_homeTitle : Messages.header_logoTitle;
 
         var $aTag = $('<a>', {

www/pad/main.js

@@ -234,5 +234,6 @@ define([
                 Cryptpad.replaceHash(Cryptpad.getEditHashFromKeys(wc.id, secret.keys));
             }
         });
+        Cryptpad.reportAppUsage();
     });
 });