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

Merge branch 'staging' into locks

Browse Source
This commit is contained in:
yflory
2019-01-24 16:27:15 +01:00
parent 024eafaf32 e993925d81
commit ed4f8016a1
42 changed files with 663 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
www/common/sframe-common-outer.js
View File

@@ -301,7 +301,7 @@ define([
forceCreationScreen: forceCreationScreen,
password: password,
channel: secret.channel,
enableSF: localStorage.CryptPad_SF === "1" // TODO to remove when enabled by default
enableSF: localStorage.CryptPad_SF === "1", // TODO to remove when enabled by default
};
if (window.CryptPad_newSharedFolder) {
additionalPriv.newSharedFolder = window.CryptPad_newSharedFolder;
@@ -311,7 +311,8 @@ define([
additionalPriv.disabledApp = true;
}
if (!Utils.LocalStore.isLoggedIn() &&
AppConfig.registeredOnlyTypes.indexOf(parsed.type) !== -1) {
AppConfig.registeredOnlyTypes.indexOf(parsed.type) !== -1 &&
parsed.type !== "file") {
additionalPriv.registeredOnly = true;
}