aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <mike@macgirvin.com>2016-09-27 17:39:05 -0700
committerredmatrix <mike@macgirvin.com>2016-09-27 17:39:05 -0700
commit3bf0a27e4505881e9a8c118f5025aa7a3495e54e (patch)
tree5fda01b4fd4d9ce7b3980a576c204773061df774
parent44a2cc872cb1baa7807376939e2c5bf6f8f63dda (diff)
parent68cb4baeb3213a2e6b24b4ad4526f1aaf6e741ec (diff)
downloadvolse-hubzilla-3bf0a27e4505881e9a8c118f5025aa7a3495e54e.tar.gz
volse-hubzilla-3bf0a27e4505881e9a8c118f5025aa7a3495e54e.tar.bz2
volse-hubzilla-3bf0a27e4505881e9a8c118f5025aa7a3495e54e.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
-rw-r--r--CHANGELOG14
-rw-r--r--view/js/main.js4
2 files changed, 14 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 660b82897..e93d0377c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,9 @@
Hubzilla 1.14 (not released)
+ - Allow a site to over-ride the help table-of-contents files
+ - Autoscroll to target post/comment when in single-thread mode
+ - Indicator for own response verb activity
+ - Add server role documentation
+ - Pro: remove 'Additional Features' link for techlevel 0
- Upgrade fullcalendar library to version 3
- Whitelist button tag in htmlpurifier
- Upgrade justifiedGallery library to version 3.6.3
@@ -27,8 +32,13 @@ Hubzilla 1.14 (not released)
- Server roles (basic, standard and pro)
Bugfixes
- - do not show hidden channels in /randprof
- - Various postgres fixes
+ - Missing categories in preview mode
+ - attach_store() sql issue
+ - Rename id share_container to distr_container - share_container seem to be blacklisted in various security browser plugins
+ - Add 'map' extension to files served natively by nginx without using the project controller
+ - Zot discovery wasn't returning in all cases (after discovering zot)
+ - Do not show hidden channels in /randprof
+ - Numerous postgres fixes
- Illegal offset errors in include/conversation:status_editor() when no permissions array is passed
- Patch foundation-6.2.3 to work with jquery-3.1
- Custom/expert permissions bug
diff --git a/view/js/main.js b/view/js/main.js
index b5bbd57b5..65a5311af 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -652,8 +652,8 @@ function updateConvItems(mode,data) {
}
// auto-scroll to a particular comment in a thread (designated by mid) when in single-thread mode
- if(bParam_mid && mode == 'replace') {
- $('html, body').animate({ scrollTop: $('.item_' + bParam_mid.substring(0,32)).offset().top }, 'slow');
+ if($('.item_' + bParam_mid.substring(0,32)).length && mode == 'replace') {
+ $('html, body').animate({ scrollTop: $('.item_' + bParam_mid.substring(0,32)).offset().top - $('nav').outerHeight(true) }, 'slow');
if($('.collapsed-comments').length) {
var scrolltoid = $('.collapsed-comments').attr('id').substring(19);
$('#collapsed-comments-' + scrolltoid).slideDown();