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

customize.dist/pages.js

@@ -91,7 +91,7 @@ define([
                     ])
                 ])
             ]),
-            h('div.cp-version-footer', "CryptPad v2.14.0 (Opossum)")
+            h('div.cp-version-footer', "CryptPad v2.15.0 (Pademelon)")
         ]);
     };
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "cryptpad",
   "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "2.14.0",
+  "version": "2.15.0",
   "license": "AGPL-3.0+",
   "repository": {
     "type": "git",

www/common/common-feedback.js

@@ -21,15 +21,15 @@ define([
         };
         http.send();
     };
-    Feedback.send = function (action, force) {
+    Feedback.send = function (action, force, cb) {
-        if (AppConfig.disableFeedback) { return; }
+        if (AppConfig.disableFeedback) { return void cb(); }
-        if (!action) { return; }
+        if (!action) { return void cb(); }
         if (force !== true) {
-            if (!Feedback.state) { return; }
+            if (!Feedback.state) { return void cb(); }
         }
 
         var href = '/common/feedback.html?' + action + '=' + randomToken();
-        ajax(href);
+        ajax(href, cb);
     };
 
     Feedback.reportAppUsage = function () {

www/common/cryptpad-common.js

@@ -89,7 +89,6 @@ define([
             value: token
         }, function (obj) {
             if (obj && obj.error) { return void cb(obj.error); }
-            Feedback.send('LOGOUT_EVERYWHERE');
             cb();
         });
     };
@@ -934,7 +933,12 @@ define([
             }
         }).nThen(function () {
             // We have the new drive, with the new login block
-            window.location.reload();
+            var feedbackKey = (password === newPassword)?
+                'OWNED_DRIVE_MIGRATION': 'PASSWORD_CHANGED';
+
+            Feedback.send(feedbackKey, undefined, function () {
+                window.location.reload();
+            });
         });
     };
 

www/settings/inner.js

@@ -212,6 +212,7 @@ define([
                 $spinner.show();
                 $ok.hide();
 
+                Feedback.send('LOGOUT_EVERYWHERE');
                 sframeChan.query('Q_SETTINGS_LOGOUT', null, function () {
                     $spinner.hide();
                     $ok.show();