Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2017-08-31 18:12:21 +02:00
parent ae60b5845f e2719d9098
commit 1072e3e797
12 changed files with 257 additions and 4 deletions
--- a/www/common/common-realtime.js
+++ b/www/common/common-realtime.js
@@ -44,7 +44,7 @@ define([
                // inform the user their session is in a bad state
                Cryptpad.confirm(Messages.realtime_unrecoverableError, function (yes) {
                    if (!yes) { return; }
-                    window.location.reload();
+                    window.parent.location.reload();
                });
                common.infiniteSpinnerDetected = true;
            }, 2000);
--- a/www/common/media-tag-nacl.min.js
+++ b/www/common/media-tag-nacl.min.js