diff options
| -rw-r--r-- | CHANGELOG | 70 | ||||
| -rw-r--r-- | Zotlabs/Module/Photos.php | 6 | ||||
| -rw-r--r-- | Zotlabs/Widget/Forums.php | 4 | ||||
| -rw-r--r-- | view/css/conversation.css | 17 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/conv_list.tpl | 1 |
6 files changed, 94 insertions, 5 deletions
@@ -1,3 +1,73 @@ +Hubzilla 3.4 (????-??-??) + + - Implement trending tags for mod pubstream + - Relax restrictions to the design tools menu to allow those with write_pages permission + - Add alt pager to mod moderate + - Show existing cover photo when changing it + - Update to bootstrap lib to version 4.1 + - Provide a higher accuracy method for active channels information + - Provide visible star status for starred posts + - Move the thread author menu to the wall item photo + - Accept system_language through either get or post + - Remove recipient name from stored notifications but keep them in emails + - Fix issue of being forced to log back in after leaving a delegated channel + - Implement last commented expiration setting in mod admin + - Create catcloud widget and provide a type option which can include 'cards' or 'articles' + - Modified notifications widget to add the public stream when the current user is allowed to see it only + - Don't provide a connect button for transient identities + - Merge techlevels and features + - Implement auto-save posts and comments in browser using localStorage + - Display directory server in siteinfo.json + - Bring back the dnt policy document + - Implement OAuth2 + - Add basic structure for additional features documentation + - Community tag refactor + - Obscurify chats + - Provide a way to share wiki pages + - Update folder timestamp on uploaded files + - Code optimisations and de-duplication on updating parent commented timestamp + - Turn newmember widget into a feature + - Make list mode work in cards and articles + - Make alt pager work for articles and cards + - Initial support for alternative sort orders on the cloud pages + - Add Ochannel module for testing OStatus bad behaviour + - Add the social - federation permission role + - Update justified gallery lib from 3.6.3 to 3.6.5 + + Bugfixes + - Fix regression with forum widget unseen count + - Fix issue with imagemagick exif info + - Aonymous comments in StdLimits shouldn't be allowed + - Fix wiki pages not syncing + - Show "Unseen public activity" channel setting when site only public streams are activated + - Fix channel import failing to provide channel_password value + - Fix permalinks to children of articles and cards + - Fix missing year on profile birthday input + - Fix missing login/out buttons for medium screensize + - Preserve existing categories when updating an app from an embed source + - Fix app sellpage not being stored + - Fix tagadelic being overly protective of permissions + - Fix comments not displayed in single card/article view + - Fix anonymous comments bump thread + - Fix pending registrations visible in admin accounts + + Addons + Pubcrawl: fix issues with postgresql + Fuzzloc: new addon to blur your browser location + Pubcrawl: implement follow by webfinger + Cart: new addon which provides online shop functionalities (experimental) + Pubcrawl: implement two-way summary functionality + Wordpress: upgrade incutio xmlrpc library to use hubzilla curl wrapper + Hzfiles: various fixes + Diaspora: support full_name attribute in profile messages + Frphotos: deprecate plugin (keep it for reference) + Webmention: require html5 parser + GNU-Social: provide alternative xchan_url + Diaspora: fix wrong callback function + Diaspora: fix conversion of forum mentions to markdown by providing a !{forum@host} link syntax + Diaspora: fix item title not transferred + + Hubzilla 3.2 (2018-03-09) - Improve rendering of Readme files in plugin settings - Add pdl file for mod moderate diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php index fa22c3f26..a143c4d4c 100644 --- a/Zotlabs/Module/Photos.php +++ b/Zotlabs/Module/Photos.php @@ -1148,10 +1148,10 @@ class Photos extends \Zotlabs\Web\Controller { builtin_activity_puller($item, $conv_responses); } - $like_count = ((x($alike,$link_item['mid'])) ? $alike[$link_item['mid']] : ''); $like_list = ((x($alike,$link_item['mid'])) ? $alike[$link_item['mid'] . '-l'] : ''); - if (count($like_list) > MAX_LIKERS) { + + if(is_array($like_list) && (count($like_list) > MAX_LIKERS)) { $like_list_part = array_slice($like_list, 0, MAX_LIKERS); array_push($like_list_part, '<a href="#" data-toggle="modal" data-target="#likeModal-' . $this->get_id() . '"><b>' . t('View all') . '</b></a>'); } else { @@ -1163,7 +1163,7 @@ class Photos extends \Zotlabs\Web\Controller { $dislike_count = ((x($dlike,$link_item['mid'])) ? $dlike[$link_item['mid']] : ''); $dislike_list = ((x($dlike,$link_item['mid'])) ? $dlike[$link_item['mid'] . '-l'] : ''); $dislike_button_label = tt('Dislike','Dislikes',$dislike_count,'noun'); - if (count($dislike_list) > MAX_LIKERS) { + if (is_array($dislike_list) && (count($dislike_list) > MAX_LIKERS)) { $dislike_list_part = array_slice($dislike_list, 0, MAX_LIKERS); array_push($dislike_list_part, '<a href="#" data-toggle="modal" data-target="#dislikeModal-' . $this->get_id() . '"><b>' . t('View all') . '</b></a>'); } else { diff --git a/Zotlabs/Widget/Forums.php b/Zotlabs/Widget/Forums.php index f65a639ff..7415c0f0a 100644 --- a/Zotlabs/Widget/Forums.php +++ b/Zotlabs/Widget/Forums.php @@ -66,8 +66,8 @@ class Forums { for($x = 0; $x < count($r1); $x ++) { $r = q("select sum(item_unseen) as unseen from item where uid = %d and owner_xchan = '%s' and item_unseen = 1 $perms_sql ", - dbesc($r1[$x]['xchan_hash']), - intval(local_channel()) + intval(local_channel()), + dbesc($r1[$x]['xchan_hash']) ); if($r) $r1[$x]['unseen'] = $r[0]['unseen']; diff --git a/view/css/conversation.css b/view/css/conversation.css index c239a665b..c0d6712a9 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -87,6 +87,23 @@ margin-left:10px; } +.wall-item-photo-wrapper { + position: relative; +} + +.wall-item-photo-caret { + position: absolute; + left: 3px; + bottom: 0px; + color: #fff; + text-shadow: 1px 1px 3px rgba(0,0,0,0.5);; + display: none; +} + +.wall-item-photo-wrapper:hover .wall-item-photo-caret { + display: block; +} + .wall-item-divider { margin: 5px; } diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index a1d287f26..a408a83d2 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -31,6 +31,7 @@ <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}"> <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-toggle="dropdown" /> {{if $item.thread_author_menu}} + <i class="fa fa-caret-down wall-item-photo-caret"></i> <div class="dropdown-menu"> {{foreach $item.thread_author_menu as $mitem}} <a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a> diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index c42751057..f94a2f24f 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -31,6 +31,7 @@ <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}"> <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-toggle="dropdown" /></a> {{if $item.thread_author_menu}} + <i class="fa fa-caret-down wall-item-photo-caret"></i> <div class="dropdown-menu"> {{foreach $item.thread_author_menu as $mitem}} <a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a> |