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

Merge branch 'soon' into staging

Browse Source
This commit is contained in:
yflory
2017-02-13 11:59:49 +01:00
parent 2807ad9dc3 a995df25f6
commit 2851ceb95a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
www/code/main.js
View File

@@ -157,8 +157,8 @@ define([
readOnly: readOnly, readOnly: readOnly,
crypto: Crypto.createEncryptor(secret.keys), crypto: Crypto.createEncryptor(secret.keys),
setMyID: setMyID, setMyID: setMyID,
transformFunction: JsonOT.transform || JsonOT.validate, network: Cryptpad.getNetwork(),
network: Cryptpad.getNetwork() transformFunction: JsonOT.validate,
}; };
var canonicalize = function (t) { return t.replace(/\r\n/g, '\n'); }; var canonicalize = function (t) { return t.replace(/\r\n/g, '\n'); };

2
www/pad/main.js
View File

@@ -404,7 +404,7 @@ define([
crypto: Crypto.createEncryptor(secret.keys), crypto: Crypto.createEncryptor(secret.keys),
// really basic operational transform // really basic operational transform
transformFunction : JsonOT.transform || JsonOT.validate, transformFunction : JsonOT.validate,
// cryptpad debug logging (default is 1) // cryptpad debug logging (default is 1)
// logLevel: 0, // logLevel: 0,