infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'staging' into soon

pull/1/head
ansuz 2021-03-24 16:25:34 +05:30
parent d2e3a1a69a 5772887876
commit 7b5c70b2ad
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2028,7 +2028,6 @@ define([
});
};
var provideFeedback = function () {
if (typeof(window.Proxy) === 'undefined') {
Feedback.send("NO_PROXIES");
@ -2065,7 +2064,6 @@ define([
if (!common.hasCSSVariables()) {
Feedback.send('NO_CSS_VARIABLES');
}
Feedback.reportScreenDimensions();
Feedback.reportLanguage();
};

5
www/common/outer/async-store.js
View File

@ -3068,14 +3068,19 @@ define([
if (obj.error === 'GET_HK') {
data.noDrive = false;
Store.init(clientId, data, _callback);
Feedback.send("NO_DRIVE_ERROR", true);
return;
}
}
Feedback.send("NO_DRIVE", true);
callback(obj);
});
}
initialized = true;
if (store.noDriveUid) {
Feedback.send('NO_DRIVE_CONVERSION', true);
}
store.data = data;
connect(clientId, data, function (ret) {