Merge branch 'soon' into staging

2017-05-29 11:32:54 +02:00
parent 3f3d64992d 41a8604cb8
commit 6573813523
2 changed files with 93 additions and 90 deletions
--- a/www/auth/main.js
+++ b/www/auth/main.js
@@ -18,6 +18,9 @@ define([
        /^http(s)?:\/\/localhost\:/
    ];

+    // Safari is weird about localStorage in iframes but seems to let sessionStorage slide.
+    localStorage.User_hash = localStorage.User_hash || sessionStorage.User_hash;
+
    Cryptpad.ready(function () {
        console.log('IFRAME READY');
        $(window).on("message", function (jqe) {