diff --git a/htaccess.dist b/htaccess.dist index 3ba5c5322..52207b075 100644 --- a/htaccess.dist +++ b/htaccess.dist @@ -1,8 +1,6 @@ Options -Indexes -AddType application/x-java-archive .jar AddType audio/ogg .oga CGIPassAuth On -#SSLCipherSuite HIGH:AES256-SHA:AES128-SHA:RC4:!aNULL:!eNULL:!EDH # don't allow any web access to logfiles, even after rotation/compression diff --git a/view/js/main.js b/view/js/main.js index 749690dea..492e73e93 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -970,6 +970,7 @@ function liveUpdate(notify_id) { clearTimeout(livetime); } livetime = setTimeout(liveUpdate, 10000); + loadingPage = false; return; } console.log('liveUpdate'); @@ -1063,6 +1064,7 @@ function liveUpdate(notify_id) { }) .done(function() { notificationsUpdate(); + loadingPage = false; }); }