Merge branch 'soon' into staging

readme.md

@@ -65,7 +65,7 @@ CryptPad is actively developed by a team at [XWiki SAS](https://www.xwiki.com),
 
 # Contributing
 
-We love Open Source and we love contribution. Learn more about [contributing](https://github.com/xwiki-labs/cryptpad/wiki/Contributor-overview). 
+We love Open Source and we love contribution. Learn more about [contributing](https://docs.cryptpad.fr/en/how_to_contribute.html). 
 
 If you have any questions or comments, or if you're interested in contributing to Cryptpad, come say hi on IRC, `#cryptpad` on Freenode.
 

www/common/cryptpad-common.js

@@ -1903,12 +1903,12 @@ define([
 
     var requestLogin = function () {
         // log out so that you don't go into an endless loop...
-        LocalStore.logout();
-
-        // redirect them to log in, and come back when they're done.
-        var href = Hash.hashToHref('', 'login');
-        var url = Hash.getNewPadURL(href, { href: currentPad.href });
-        window.location.href = url;
+        LocalStore.logout(function () {
+            // redirect them to log in, and come back when they're done.
+            var href = Hash.hashToHref('', 'login');
+            var url = Hash.getNewPadURL(href, { href: currentPad.href });
+            window.location.href = url;
+        });
     };
 
     common.startAccountDeletion = function (data, cb) {

www/common/outer/async-store.js

@@ -1631,7 +1631,7 @@ define([
                 Store.leavePad(null, data, function () {});
             };
             var conf = {
-                Cache: Cache,
+                //Cache: Cache, // XXX re-enable cache usage
                 onCacheStart: function () {
                     postMessage(clientId, "PAD_CACHE");
                 },
@@ -2686,7 +2686,7 @@ define([
                 readOnly: false,
                 validateKey: secret.keys.validateKey || undefined,
                 crypto: Crypto.createEncryptor(secret.keys),
-                Cache: Cache,
+                //Cache: Cache, // XXX re-enable cache usage
                 userName: 'fs',
                 logLevel: 1,
                 ChainPad: ChainPad,

www/common/outer/sharedfolder.js

@@ -175,7 +175,7 @@ define([
                 ChainPad: ChainPad,
                 classic: true,
                 network: network,
-                Cache: Cache,
+                //Cache: Cache, // XXX re-enable cache usage
                 metadata: {
                     validateKey: secret.keys.validateKey || undefined,
                     owners: owners

www/common/outer/team.js

@@ -427,7 +427,7 @@ define([
                 channel: secret.channel,
                 crypto: crypto,
                 ChainPad: ChainPad,
-                Cache: Cache,
+                //Cache: Cache, // XXX re-enable cache usage
                 metadata: {
                     validateKey: secret.keys.validateKey || undefined,
                 },