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

manual merge

Browse Source
This commit is contained in:
Caleb James DeLisle
2017-11-09 15:38:32 +01:00
parent 75130150d5 cf5ccf04f2
commit 840cd91bcb
24 changed files with 2068 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
www/common/fsStore.js
View File

@@ -236,8 +236,11 @@ define([
}
}
if (typeof(proxy.allowUserFeedback) !== 'boolean') {
proxy.allowUserFeedback = true;
if (!proxy.settings || !proxy.settings.general ||
typeof(proxy.settings.general.allowUserFeedback) !== 'boolean') {
proxy.settings = proxy.settings || {};
proxy.settings.general = proxy.settings.general || {};
proxy.settings.general.allowUserFeedback = true;
}
if (typeof(proxy.uid) !== 'string' || proxy.uid.length !== 32) {