Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

This commit is contained in:
zotlabs
2016-12-16 19:57:49 -08:00
9 changed files with 306 additions and 287 deletions

View File

@@ -666,6 +666,8 @@ function updateConvItems(mode,data) {
$('.item_' + bParam_mid.substring(0,32)).addClass('item-highlight');
}
$(document.body).trigger("sticky_kit:recalc");
}
function collapseHeight() {
@@ -1164,7 +1166,6 @@ function preview_mail() {
return true;
}
function unpause() {
// unpause auto reloads if they are currently stopped
totStopped = false;