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

customize.dist/main.css

@@ -494,6 +494,7 @@ html.cp,
   color: #555;
   font-family: Georgia,Cambria,serif;
   height: 100%;
+  overflow-x: hidden;
 }
 .cp {
   /* buttons */

customize.dist/src/fragments/privacy.html

@@ -22,7 +22,6 @@
     <h2 data-localization="policy_choices"></h2>
     <p data-localization="policy_choices_open"></p>
     <p data-localization="policy_choices_vpn"></p>
-    <p data-localization="policy_choices_ads"></p>
 
     <br />
 </div>

customize.dist/src/less/cryptpad.less

@@ -15,6 +15,7 @@ html.cp, .cp body {
 
     font-family: Georgia,Cambria,serif;
     height: 100%;
+    overflow-x: hidden;
 }
 
 .cp {

customize.dist/translations/messages.js

@@ -309,8 +309,7 @@ define(function () {
     out.policy_title = 'CryptPad Privacy Policy';
     out.policy_whatweknow = 'What we know about you';
     out.policy_whatweknow_p1 = 'As an application that is hosted on the web, CryptPad has access to metadata exposed by the HTTP protocol. This includes your IP address, and various other HTTP headers that can be used to identify your particular browser. You can see what information your browser is sharing by visiting <a target="_blank" rel="noopener noreferrer" href="https://www.whatismybrowser.com/detect/what-http-headers-is-my-browser-sending" title="what http headers is my browser sending">WhatIsMyBrowser.com</a>.';
-    out.policy_whatweknow_p2 = 'We use <a href="https://piwik.org/" target="_blank" rel="noopener noreferrer" title="open source analytics platform">Piwik</a>, an open source analytics platform, to learn more about our users. Piwik tells us about how you found CryptPad, via direct entry, through a search engine, or via a referral from another web service like Reddit or Twitter. We also learn when you visit, what links you click while on our informational pages, and how long you stay on a particular page.';
-    out.policy_whatweknow_p3 = 'These analytics tools are only used on informational pages. We do not collect any information about your usage of our zero-knowledge applications.';
+    out.policy_whatweknow_p2 = 'We use <a href="https://www.elastic.co/products/kibana" target="_blank" rel="noopener noreferrer" title="open source analytics platform">Kibana</a>, an open source analytics platform, to learn more about our users. Kibana tells us about how you found CryptPad, via direct entry, through a search engine, or via a referral from another web service like Reddit or Twitter.';
     out.policy_howweuse = 'How we use what we learn';
     out.policy_howweuse_p1 = 'We use this information to make better decisions about promoting CryptPad, by evaluating which of our past efforts were successful. Information about your location lets us know whether we should consider providing better support for languages other than English.';
     out.policy_howweuse_p2 = "Information about your browser (whether it's a desktop or mobile operating system) helps us make decisions when prioritizing feature improvements. Our development team is small, and we try to make choices that will improve as many users' experience as possible.";

www/common/cryptpad-common.js

@@ -66,11 +66,15 @@ define([
     };
 
     var whenRealtimeSyncs = common.whenRealtimeSyncs = function (realtime, cb) {
-        // FIXME realtime.onSettle should handle this but it doesn't seem to
-        if (realtime.getAuthDoc() === realtime.getUserDoc()) {
-            return void cb();
-        }
-        realtime.onSettle(cb);
+        realtime.sync();
+        window.setTimeout(function () {
+            if (realtime.getAuthDoc() === realtime.getUserDoc()) {
+                return void cb();
+            }
+            realtime.onSettle(function () {
+                cb();
+            });
+        }, 0);
     };
 
     var getWebsocketURL = common.getWebsocketURL = function () {