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

www/common/sframe-app-framework.js

@@ -253,6 +253,13 @@ define([
                 newContent = normalize(newContent);
                 contentUpdate(newContent);
             } else {
+                if (!cpNfInner.metadataMgr.getPrivateData().isNewFile) {
+                    // We're getting 'new pad' but there is an existing file
+                    // We don't know exactly why this can happen but under no circumstances
+                    // should we overwrite the content, so lets just try again.
+                    common.gotoURL();
+                    return;
+                }
                 console.log('updating title');
                 title.updateTitle(title.defaultTitle);
                 evOnDefaultContentNeeded.fire();

www/common/sframe-common-outer.js

@@ -150,6 +150,7 @@ define([
             if (!secret.keys) {
                 isNewHash = false;
                 secret.keys = secret.key;
+                readOnly = false;
             }
             var parsed = Utils.Hash.parsePadUrl(window.location.href);
             if (!parsed.type) { throw new Error(); }