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

www/common/sframe-app-framework.js

@@ -391,8 +391,7 @@ define([
                 // really basic operational transform
                 transformFunction: options.transformFunction || JsonOT.validate,
 
-                // This one causes a big mess.
-                //patchTransformer: options.patchTransformer || JsonOT.patchTransformer,
+                patchTransformer: options.patchTransformer || JsonOT.patchTransformer,
 
                 // cryptpad debug logging (default is 1)
                 // logLevel: 0,

www/common/sframe-chainpad-listmap.js

@@ -685,7 +685,9 @@ define([
             });
         };
 
+        var ready = false;
         realtimeOptions.onReady = function (info) {
+            if (ready) { return; }
             // create your patcher
             if (realtime !== info.realtime) {
                 realtime = rt.realtime = info.realtime;
@@ -709,6 +711,7 @@ define([
             DeepProxy.checkLocalChange(proxy, onLocal);
 
             initializing = false;
+            ready = true;
         };
 
         realtimeOptions.onAbort = function (info) {

www/common/toolbar3.js

@@ -886,6 +886,7 @@ define([
                 // type : 1 (+1 user), 0 (rename existing user), -1 (-1 user)
                 if (typeof name === "undefined") { return; }
                 name = name || Messages.anonymous;
+                if (Config.disableUserlistNotifications) { return; }
                 switch(type) {
                     case 1:
                         Cryptpad.log(Messages._getKey("notifyJoined", [name]));