Compare commits

..

11 Commits
6.4.1 ... 6.4.2

Author SHA1 Message Date
Mario Vavti
a40babbf0d version 6.4.2 2021-12-14 11:12:43 +01:00
Mario Vavti
7822257e1c Merge branch 'dev' 2021-12-14 11:11:57 +01:00
Mario Vavti
b37165c62b changelog 2021-12-14 11:09:27 +01:00
Mario Vavti
5e9d267959 mod sse_bs: when processing returned mids, do not assume they are b64 encoded 2021-12-14 11:04:26 +01:00
Mario Vavti
1a1e6b6810 Announce missing in is_response_activity() 2021-12-11 10:56:50 +01:00
Mario Vavti
88140002e7 Merge branch 'dev' 2021-12-03 16:26:10 +01:00
Mario Vavti
efc203d958 fix blured profile images and pdl files 2021-12-03 16:25:42 +01:00
Mario Vavti
42d4cdcc39 Merge branch 'dev' 2021-12-03 15:13:57 +01:00
Mario Vavti
fd433b3eb6 main_width in rem 2021-12-03 15:10:59 +01:00
Mario Vavti
7483adb8ad Merge branch 'dev' 2021-12-03 14:55:39 +01:00
Mario Vavti
45fd462f80 fix content width for dark schema 2021-12-03 14:54:47 +01:00
14 changed files with 21 additions and 14 deletions

View File

@@ -1,3 +1,8 @@
Hubzilla 6.4.2 (2021-12-14)
- Fix issue in mod sse_bs where returning message id's were assumed to be base64 encoded
- Fix announce activity type not registered as response activity
Hubzilla 6.4.1 (2021-12-03)
- Fix hubloc_site_id in fix_system_urls() on detected site rename events
- Fix duplicate deliveries if duplicate hublocs available

View File

@@ -285,7 +285,7 @@ class ActivityStreams {
if (!$s) {
return false;
}
return (in_array($s, ['Like', 'Dislike', 'Flag', 'Block', 'Accept', 'Reject', 'TentativeAccept', 'TentativeReject', 'emojiReaction', 'EmojiReaction', 'EmojiReact']));
return (in_array($s, ['Like', 'Dislike', 'Flag', 'Block', 'Announce', 'Accept', 'Reject', 'TentativeAccept', 'TentativeReject', 'emojiReaction', 'EmojiReaction', 'EmojiReact']));
}
/**

View File

@@ -124,7 +124,7 @@ class Sse_bs extends Controller {
$str = '';
foreach($arr as $a) {
$mids[] = '\'' . dbesc(@base64url_decode(substr($a,4))) . '\'';
$mids[] = '\'' . dbesc(unpack_link_id($a)) . '\'';
}
$str = implode(',', $mids);

View File

@@ -55,7 +55,7 @@ require_once('include/bbcode.php');
require_once('include/items.php');
define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'STD_VERSION', '6.4.1' );
define ( 'STD_VERSION', '6.4.2' );
define ( 'ZOT_REVISION', '6.0' );
define ( 'DB_UPDATE_VERSION', 1248 );

View File

@@ -127,7 +127,7 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') {
return replace_macros(get_markup_template('xchan_vcard.tpl'),array(
'$name' => $xchan['xchan_name'],
'$addr' => (($xchan['xchan_addr']) ? $xchan['xchan_addr'] : $xchan['xchan_url']),
'$photo' => $xchan['xchan_photo_m'],
'$photo' => $xchan['xchan_photo_l'],
'$follow' => (($xchan['xchan_addr']) ? $xchan['xchan_addr'] : $xchan['xchan_url']),
'$link' => zid($xchan['xchan_url']),
'$connect' => $connect,

View File

@@ -1,4 +1,5 @@
[region=aside]
[widget=profile][/widget]
[widget=archive][var=articles]1[/var][/widget]
[widget=categories][var=articles]1[/var][/widget]
[widget=tasklist][/widget]

View File

@@ -1,5 +1,5 @@
[region=aside]
[widget=fullprofile][/widget]
[widget=profile][/widget]
[/region]
[region=right_aside]
[widget=notifications][/widget]

View File

@@ -1,4 +1,5 @@
[region=aside]
[widget=profile][/widget]
[widget=categories][var=cards]1[/var][/widget]
[widget=tasklist][/widget]
[widget=notes][/widget]

View File

@@ -1,5 +1,5 @@
[region=aside]
[widget=vcard][/widget]
[widget=profile][/widget]
[widget=categories][var=files]1[/var][/widget]
[/region]
[region=right_aside]

View File

@@ -1,5 +1,5 @@
[region=aside]
[widget=vcard][/widget]
[widget=profile][/widget]
[widget=photo_albums][/widget]
[/region]
[region=right_aside]

View File

@@ -1,5 +1,5 @@
[region=aside]
[widget=vcard][/widget]
[widget=profile][/widget]
[widget=wiki_pages][/widget]
[/region]
[region=right_aside]

View File

@@ -43,7 +43,7 @@ aside#right_aside_wrapper {
main {
margin-left: auto;
margin-right: auto;
max-width: $main_widthpx;
max-width: $main_widthrem;
}
#overlay {

View File

@@ -101,7 +101,7 @@ if (! $radius)
if (! $shadow)
$shadow = '0';
if (! $converse_width)
$converse_width = '1250'; //unit: rem
$converse_width = '52'; //unit: rem
if(! $top_photo)
$top_photo = '2.3rem';
if(! $reply_photo)
@@ -126,7 +126,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
$main_width = $left_aside_width + $right_aside_width + intval($converse_width);
// prevent main_width smaller than 768px
$main_width = (($main_width < 768) ? 768 : $main_width);
$main_width = (($main_width < 30) ? 30 : $main_width);
$options = array (
'$nav_bg' => $nav_bg,

View File

@@ -1,5 +1,5 @@
<?php
if (! $nav_bg)
$nav_bg = "#000";
if (! $nav_gradient_top)
@@ -35,7 +35,7 @@
if (! $font_colour)
$font_colour = "#ccc";
if (! $converse_width)
$converse_width = "1024";
$converse_width = '52'; //unit: rem;