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

Merge branch 'msg' into staging

Browse Source
This commit is contained in:
yflory
2017-07-10 11:48:22 +02:00
parent 8e2e8b1653 1c531ccd47
commit 159d72f33b
27 changed files with 1341 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
www/login/main.js
View File

@@ -91,6 +91,9 @@ define([
proxy.edPrivate = result.edPrivate;
proxy.edPublic = result.edPublic;
proxy.curvePrivate = result.curvePrivate;
proxy.curvePublic = result.curvePublic;
Cryptpad.feedback('LOGIN', true);
Cryptpad.whenRealtimeSyncs(result.realtime, function() {
Cryptpad.login(result.userHash, result.userName, function () {