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

scripts/tests/test-rpc.js

@@ -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([

www/common/sframe-common-file.js

@@ -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();