Merge branch 'soon' into staging

pull/1/head
ansuz 4 years ago
commit d5a704d3b9

@ -2,10 +2,12 @@
@import (reference) "../include/colortheme-all.less";
@import (reference) "../include/alertify.less";
@import (reference) "../include/checkmark.less";
@import (reference) "../include/forms.less";
&.cp-page-login {
.infopages_main();
.alertify_main();
.forms_main();
.checkmark_main(20px);
.form-group {

@ -148,6 +148,22 @@ define([
};
send();
};
common.fixRosterHash = function () {
// Push teams keys
postMessage("GET", {
key: ['teams'],
}, function (obj) {
if (obj.error) { return console.error(obj.error); }
Object.keys(obj || {}).forEach(function (id) {
postMessage("SET", {
key: ['teams', id, 'keys', 'roster', 'lastKnownHash'],
value: ''
}, function () {
console.log('done, please close all your CryptPad tabs before testing the fix');
});
});
});
};
(function () {
var bypassHashChange = function (key) {

@ -45,7 +45,7 @@ define([
Env.folders[id].offline = true;
});
proxy.on('reconnect', function () {
Env.folders[id].online = true;
Env.folders[id].offline = false;
});
}
return userObject;

Loading…
Cancel
Save