web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
yflory 2019-01-08 17:47:38 +01:00
commit 6a45f5233e
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
customize.dist/pages.js
View File

@ -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)")
]); ]);
}; };

2
package.json
View File

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

10
www/common/common-feedback.js
View File

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

6
www/common/cryptpad-common.js
View File

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

1
www/settings/inner.js
View File

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