dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
yflory 2020-03-10 14:23:26 +01:00
parent 315704a1b8 45601068ae
commit c8f0c99ddc
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/tests/test-rpc.js
View File

@ -718,12 +718,11 @@ nThen(function (w) {
}));
}).nThen(function (w) {
oscar.roster.checkpoint(w(function (err) {
var hash = oscar.lastRosterCheckpointHash = oscar.roster.getLastCheckpointHash(); // FIXME bob should connect to this to avoid extra messages
oscar.lastRosterCheckpointHash = oscar.roster.getLastCheckpointHash(); // FIXME bob should connect to this to avoid extra messages
if (!err) { return; }
console.error("Checkpoint by an owner failed unexpectedly");
console.error(err);
process.exit(1);
}));
}).nThen(function (w) {
alice.roster.remove([

2
www/common/sframe-common-file.js
View File

@ -158,7 +158,7 @@ define([
});
onError = function (e) {
// XXX if we included the max upload sizes in /api/config
// TODO if we included the max upload sizes in /api/config
// then we could check if a file is too large without going to the server...
queue.inProgress = false;
queue.next();