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

www/common/outer/cache-store.js

@@ -97,7 +97,7 @@ define([
     var checkCheckpoints = function (array) {
         if (!Array.isArray(array)) { return; }
         // Keep the last 100 messages
-        if (array.length > 100) {
+        if (array.length > 100) { // XXX
             array.splice(0, array.length - 100);
         }
         // Remove every message before the first checkpoint

www/form/main.js

@@ -176,7 +176,7 @@ define([
                         validateKey: keys.secondaryValidateKey,
                         owners: [myKeys.edPublic],
                         crypto: crypto,
-                        Cache: Utils.Cache
+                        //Cache: Utils.Cache // XXX
                     };
                     var results = {};
                     config.onError = function (info) {

www/pad/inner.js

@@ -1326,6 +1326,11 @@ define([
                 }));
                 $(waitFor());
             }).nThen(function(waitFor) {
+                // TODO this breaks users' ability to tab out of the editor
+                // but that's a problem in other editors and nobody has complained so far
+                // so we'll include this as-is for now while we search for a good pattern
+                // addresses this issue more generally
+                Ckeditor.config.tabSpaces = 4;
                 Ckeditor.config.toolbarCanCollapse = true;
                 Ckeditor.config.language = Messages._getLanguage();
                 if (screen.height < 800) {