From 30403da3262ef38db302cf2519cfb60b6986f4be Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 6 Dec 2018 00:24:30 +0000 Subject: [PATCH 1/7] reset page title if article has no title. (cherry picked from commit 8ab1f3105874b3167515de9a41c3bf3f3fe5a9d8) --- Zotlabs/Module/Display.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index d1755c183..e3691702d 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -375,8 +375,7 @@ class Display extends \Zotlabs\Web\Controller { } $o .= ''; - if ($items[0]['title']) - \App::$page['title'] = $items[0]['title'] . " - " . \App::$page['title']; + \App::$page['title'] = (($items[0]['title']) ? $items[0]['title'] . " - " . \App::$page['title'] : \App::$page['title']); $o .= conversation($items, 'display', $update, 'client'); } From f20a923dd7b1669ca27a798b30e9ae797bda1dea Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 9 Dec 2018 19:20:57 +0000 Subject: [PATCH 2/7] total_identities restriction off by one (cherry picked from commit e60fb175242516382d1e1a61fce327c38515f3ee) --- Zotlabs/Module/New_channel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/New_channel.php b/Zotlabs/Module/New_channel.php index a9022a03a..73cdf4c8c 100644 --- a/Zotlabs/Module/New_channel.php +++ b/Zotlabs/Module/New_channel.php @@ -145,7 +145,7 @@ class New_channel extends \Zotlabs\Web\Controller { $canadd = true; if($r && ($limit !== false)) { $channel_usage_message = sprintf( t("You have created %1$.0f of %2$.0f allowed channels."), $r[0]['total'], $limit); - if ($r[0]['total'] >= $limit) { + if ($r[0]['total'] > $limit) { $canadd = false; } } From 44832bbacb90cabe1d31ba425b44998667f63936 Mon Sep 17 00:00:00 2001 From: phani00 Date: Mon, 10 Dec 2018 03:03:28 +0000 Subject: [PATCH 3/7] change redbasic dark schema to make categories and highlights readable additions to /view/theme/redbasic/schema/dark.css to change the appearance of category badges and highlighted text ([hl]...[/hl]). hl text changed from master: it's not 'strong' anymore. commented out the pseudo-class selector that works in master but not in dev anymore. (cherry picked from commit 18caf0273fe6ec66ea429561c1da93deb5741c23) --- view/theme/redbasic/schema/dark.css | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index 71f7bc393..e958d9ee7 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -326,6 +326,17 @@ a.text-dark:focus, a.text-dark:hover { color: #ddd !important; } +.badge-warning { + background-color: #ffc927; +} +.badge-warning a.text-dark { + color: #333 !important; +} +.badge-warning a.text-dark:focus, .badge-warning a.text-dark:hover { + color: red !important; + text-decoration: none; +} + .group-selected, .fileas-selected, .categories-selected, .search-selected, a.active { color: #fff !important; text-decoration: underline !important; @@ -480,3 +491,11 @@ pre { .widget-nav-pills-checkbox:hover + a { background-color: #222; } + +/* change color of [hl] tag: */ +div.wall-item-body span /*strong:only-of-type */{ + color: #1212b6; + padding: 2px 3px; +/* font-weight: 500; */ + white-space: nowrap; +} From 989605754948ad8b8d0f0642d1c3ba155a0b362a Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 10 Dec 2018 04:24:04 +0000 Subject: [PATCH 4/7] home notifications won't expand if there are more than 300 unseen network notifications ahead of them. (cherry picked from commit 30efeb5becb2b5e1133f429460c5c3bbc9b44f55) --- Zotlabs/Module/Ping.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index 12244d88c..a367b1062 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -347,6 +347,10 @@ class Ping extends \Zotlabs\Web\Controller { if(argc() > 1 && (argv(1) === 'network' || argv(1) === 'home')) { $result = array(); + if(argv(1) === 'home') { + $sql_extra .= ' and item_wall = 1 '; + } + $r = q("SELECT * FROM item WHERE uid = %d AND item_unseen = 1 @@ -362,8 +366,6 @@ class Ping extends \Zotlabs\Web\Controller { if($r) { xchan_query($r); foreach($r as $item) { - if((argv(1) === 'home') && (! intval($item['item_wall']))) - continue; $result[] = \Zotlabs\Lib\Enotify::format($item); } } From 1bd49671b710ed6b6a34726535d1cbcd262716d0 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 10 Dec 2018 09:37:29 +0000 Subject: [PATCH 5/7] add photo_view_filter hook and fix minor issue with unset auto_save_draft variable which resultet in a javascript error (cherry picked from commit 7894fed7413ab3bd782bf939b17ca70bf0196d28) --- Zotlabs/Module/Photos.php | 13 +++++++++++-- doc/hook/photo_view_filter.bb | 1 + doc/hooklist.bb | 3 +++ view/tpl/photo_view.tpl | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 doc/hook/photo_view_filter.bb diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php index 21f6293ef..b87c586da 100644 --- a/Zotlabs/Module/Photos.php +++ b/Zotlabs/Module/Photos.php @@ -1122,6 +1122,7 @@ class Photos extends \Zotlabs\Web\Controller { $comments = ''; if(! $r) { if($observer && ($can_post || $can_comment)) { + $feature_auto_save_draft = ((feature_enabled($owner_uid, 'auto_save_draft')) ? "true" : "false"); $commentbox = replace_macros($cmnt_tpl,array( '$return_path' => '', '$mode' => 'photos', @@ -1137,7 +1138,8 @@ class Photos extends \Zotlabs\Web\Controller { '$submit' => t('Submit'), '$preview' => t('Preview'), '$ww' => '', - '$feature_encrypt' => false + '$feature_encrypt' => false, + '$auto_save_draft' => $feature_auto_save_draft )); } } @@ -1270,8 +1272,14 @@ class Photos extends \Zotlabs\Web\Controller { if(feature_enabled($owner_uid,'dislike')) $response_verbs[] = 'dislike'; - $responses = get_responses($conv_responses,$response_verbs,'',$link_item); + + $hookdata = [ + 'onclick' => '$.colorbox({href: \'' . $photo['href'] . '\'}); return false;', + 'raw_photo' => $ph[0], + 'nickname' => \App::$data['channel']['channel_address'] + ]; + call_hooks('photo_view_filter', $hookdata); $photo_tpl = get_markup_template('photo_view.tpl'); $o .= replace_macros($photo_tpl, array( @@ -1309,6 +1317,7 @@ class Photos extends \Zotlabs\Web\Controller { '$comments' => $comments, '$commentbox' => $commentbox, '$paginate' => $paginate, + '$onclick' => $hookdata['onclick'] )); \App::$data['photo_html'] = $o; diff --git a/doc/hook/photo_view_filter.bb b/doc/hook/photo_view_filter.bb new file mode 100644 index 000000000..0780c1edc --- /dev/null +++ b/doc/hook/photo_view_filter.bb @@ -0,0 +1 @@ +[h2]photo_view_filter[/h2] diff --git a/doc/hooklist.bb b/doc/hooklist.bb index d104df380..5d12a139e 100644 --- a/doc/hooklist.bb +++ b/doc/hooklist.bb @@ -502,6 +502,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the [zrl=[baseurl]/help/hook/photo_upload_form]photo_upload_form[/zrl] Called when generating a photo upload form +[zrl=[baseurl]/help/hook/photo_view_filter]photo_view_filter[/zrl] + Called before the data is handed over to the photo_view template + [zrl=[baseurl]/help/hook/poke_verbs]poke_verbs[/zrl] Called when generating the list of actions for "poke" module diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 105cf0ac8..6d566cab9 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -99,7 +99,7 @@
-
+
{{if $tags}}
From ad4b18cbbe610cbbf47ba1c5e8c1ac3c46a378d0 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 11 Dec 2018 11:21:09 +0000 Subject: [PATCH 6/7] return on readImageBlob() exception (cherry picked from commit 993db01400be17c5e74dfa895c324a7116a4e97e) --- include/photo/photo_imagick.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/photo/photo_imagick.php b/include/photo/photo_imagick.php index f04c00245..cb3ad27fb 100644 --- a/include/photo/photo_imagick.php +++ b/include/photo/photo_imagick.php @@ -36,6 +36,7 @@ class photo_imagick extends photo_driver { } catch (Exception $e) { logger('imagick readImageBlob() exception:' . print_r($e,true)); + return; } /** From 79f828125d6e0287a238901e504e82109eed4c93 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 14 Dec 2018 11:47:02 +0100 Subject: [PATCH 7/7] version bump --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index dedfa4654..73ed18bd7 100755 --- a/boot.php +++ b/boot.php @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '3.8.6' ); +define ( 'STD_VERSION', '3.8.7' ); define ( 'ZOT_REVISION', '6.0a' ); define ( 'DB_UPDATE_VERSION', 1225 );