aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG14
-rw-r--r--SBOM.md16
-rw-r--r--Zotlabs/Module/Sse_bs.php25
-rw-r--r--boot.php2
-rw-r--r--include/channel.php2
5 files changed, 40 insertions, 19 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ccb089b62..832b91958 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,8 @@ Hubzilla 5.4 (2021-03-xx)
- Add new connections to privacy group independend from the default privacy group settings
- group_add() return group hash to save a lookup
- Do not poll feeds if feed contacts setting is disabled
- - Deprecate sticky_kit library in favour of CSS position sticky solution
+ - Deprecate sticky_kit library in favor of CSS position sticky solution
+ - Trigger endless scroll loading at the end of content instead of end of window height
- Implement experimental zap export compatibility
- Deprecate the [summary] tag in favor of a separate input field for the summary
- Adjust error reporting for PHP8
@@ -14,7 +15,8 @@ Hubzilla 5.4 (2021-03-xx)
- Introduce fetch_provider hook
- Implement ActivityStreams discovery in mod profile
- Implement ActivityStreams discovery in mod channel
- - Update OS folder and file permissions
+ - Streamline OS folder and file permissions
+ - Add polish translations
- Implement ThreadListener in mod activity_match
- Improve ThreadListener handling
- Use mail envelope instead of lock icon for direct messages
@@ -29,6 +31,7 @@ Hubzilla 5.4 (2021-03-xx)
- Port util/connect to Lib/Connect
Bugfixes
+ - Fix visible/empty notifications for blocked contacts items
- Fix issue where URL fragment was turned into hashtag if the hashtag existed elsewhere in the post (issue #1518)
- Fix audio and video embeds for media sources without media format extension
- Fix issue where zot package was saved in iconf instead of the decoded activity
@@ -40,20 +43,23 @@ Hubzilla 5.4 (2021-03-xx)
- Fix r_preview for list mode in mod channel and mod network
Addons
+ - Pubcrawl: deal with mastodons remote replies
- Diaspora: reduce xchan network confusion in several places
- Diaspora: fix mentions if multiple xchan networks exists
- Diaspora: fix comments on comments
- Pubcrawl: do not re-use broken signed messages
- - Pubcrawl: fix parsing of images with description
+ - Pubcrawl: fix parsing of images with description (core issue #1519)
- Pubcrawl: use the signed message from the attachment (iconfig) when relaying
- Diaspora: implement browser to browser encrypted messages as base64 encoded string
- Pubcrawl: implement browser to browser encrypted messages as base64 encoded string
- Diaspora: support post summary
- Pubcrawl: fix summary aka content warning
- PHP8 compatibility (experimental)
+ - Tripleaes: removed
- Reflect core crypto changes
- Photocache: improve mimetype detection
- Diaspora: implement mnanual fetch provider
+ - Diaspora: implement send participation
- Pubcrawl: deprecate pubcrawl_is_as_request() in favor of the core version in Lib/ActivityStreams
- Diaspora: prefer zot identity for inbound comments if available
- Pubcrawl: return zotfeed results in mod outbox
@@ -64,7 +70,7 @@ Hubzilla 5.4 (2021-03-xx)
Hubzilla 5.2.2 (2021-02-13)
- - Fix issue with ping_site()
+ - Fix issue with ping_site()
Hubzilla 5.2.1 (2021-01-16)
diff --git a/SBOM.md b/SBOM.md
index a26faad58..3d9a5edc9 100644
--- a/SBOM.md
+++ b/SBOM.md
@@ -3,7 +3,7 @@
|Name|Version|License|Source|
|----|-------|-------|------|
|blueimp/jquery-file-upload|10.31.0.0|MIT|https://github.com/vkhramtsov/jQuery-File-Upload.git|
-|brick/math|0.9.1.0|MIT|https://github.com/brick/math.git|
+|brick/math|0.9.2.0|MIT|https://github.com/brick/math.git|
|bshaffer/oauth2-server-php|1.11.1.0|MIT|https://github.com/bshaffer/oauth2-server-php.git|
|commerceguys/intl|1.0.7.0|MIT|https://github.com/commerceguys/intl.git|
|desandro/imagesloaded|4.1.4.0|MIT|https://github.com/desandro/imagesloaded.git|
@@ -12,22 +12,22 @@
|lukasreschke/id3parser|0.0.3.0|GPL|https://github.com/LukasReschke/ID3Parser.git|
|michelf/php-markdown|1.9.0.0|BSD-3-Clause|https://github.com/michelf/php-markdown.git|
|pear/text_languagedetect|1.0.1.0|BSD-2-Clause|https://github.com/pear/Text_LanguageDetect.git|
+|phpseclib/phpseclib|2.0.30.0|MIT|https://github.com/phpseclib/phpseclib.git|
|psr/log|1.1.3.0|MIT|https://github.com/php-fig/log.git|
-|ramsey/collection|1.1.1.0|MIT|https://github.com/ramsey/collection.git|
+|ramsey/collection|1.1.3.0|MIT|https://github.com/ramsey/collection.git|
|ramsey/uuid|4.1.1.0|MIT|https://github.com/ramsey/uuid.git|
-|sabre/dav|4.1.3.0|BSD-3-Clause|https://github.com/sabre-io/dav.git|
+|sabre/dav|4.1.5.0|BSD-3-Clause|https://github.com/sabre-io/dav.git|
|sabre/event|5.1.2.0|BSD-3-Clause|https://github.com/sabre-io/event.git|
|sabre/http|5.1.1.0|BSD-3-Clause|https://github.com/sabre-io/http.git|
|sabre/uri|2.2.1.0|BSD-3-Clause|https://github.com/sabre-io/uri.git|
-|sabre/vobject|4.3.3.0|BSD-3-Clause|https://github.com/sabre-io/vobject.git|
+|sabre/vobject|4.3.5.0|BSD-3-Clause|https://github.com/sabre-io/vobject.git|
|sabre/xml|2.2.3.0|BSD-3-Clause|https://github.com/sabre-io/xml.git|
|simplepie/simplepie|1.5.6.0|BSD-3-Clause|https://github.com/simplepie/simplepie.git|
-|smarty/smarty|3.1.36.0|LGPL-3.0|https://github.com/smarty-php/smarty.git|
-|symfony/polyfill-ctype|1.20.0.0|MIT|https://github.com/symfony/polyfill-ctype.git|
-|twbs/bootstrap|4.5.3.0|MIT|https://github.com/twbs/bootstrap.git|
+|smarty/smarty|3.1.38.0|LGPL-3.0|https://github.com/smarty-php/smarty.git|
+|symfony/polyfill-ctype|1.22.0.0|MIT|https://github.com/symfony/polyfill-ctype.git|
+|twbs/bootstrap|4.6.0.0|MIT|https://github.com/twbs/bootstrap.git|
|fullcalendar/fullcalendar|4.4.2.0|MIT|https://github.com/fullcalendar/fullcalendar.git|
|miromannino/Justified-Gallery|3.8.1.0|MIT|https://github.com/miromannino/Justified-Gallery.git|
|fengyuanchen/cropperjs|1.5.7.0|MIT|https://github.com/fengyuanchen/cropperjs.git|
|ForkAwesome/Fork-Awesome|1.1.7.0|MIT,SIL OFL,CC BY 3.0|https://github.com/ForkAwesome/Fork-Awesome.git|
-|leafo/sticky-kit|1.1.2.0|MIT|https://github.com/leafo/sticky-kit.git|
|jquery/jquery|3.5.1.0|MIT|https://github.com/jquery/jquery.git|
diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php
index 396e07001..3b39d5b49 100644
--- a/Zotlabs/Module/Sse_bs.php
+++ b/Zotlabs/Module/Sse_bs.php
@@ -181,7 +181,10 @@ class Sse_bs extends Controller {
$result['network']['offset'] = ((count($items) == $limit) ? intval($offset + $limit) : -1);
xchan_query($items);
foreach($items as $item) {
- $result['network']['notifications'][] = Enotify::format($item);
+ $parsed = Enotify::format($item);
+ if($parsed) {
+ $result['network']['notifications'][] = $parsed;
+ }
}
}
else {
@@ -250,7 +253,10 @@ class Sse_bs extends Controller {
$result['dm']['offset'] = ((count($items) == $limit) ? intval($offset + $limit) : -1);
xchan_query($items);
foreach($items as $item) {
- $result['dm']['notifications'][] = Enotify::format($item);
+ $parsed = Enotify::format($item);
+ if($parsed) {
+ $result['dm']['notifications'][] = $parsed;
+ }
}
}
else {
@@ -319,7 +325,10 @@ class Sse_bs extends Controller {
$result['home']['offset'] = ((count($items) == $limit) ? intval($offset + $limit) : -1);
xchan_query($items);
foreach($items as $item) {
- $result['home']['notifications'][] = Enotify::format($item);
+ $parsed = Enotify::format($item);
+ if($parsed) {
+ $result['home']['notifications'][] = $parsed;
+ }
}
}
else {
@@ -400,7 +409,10 @@ class Sse_bs extends Controller {
$result['pubs']['offset'] = ((count($items) == $limit) ? intval($offset + $limit) : -1);
xchan_query($items);
foreach($items as $item) {
- $result['pubs']['notifications'][] = Enotify::format($item);
+ $parsed = Enotify::format($item);
+ if($parsed) {
+ $result['pubs']['notifications'][] = $parsed;
+ }
}
}
else {
@@ -592,7 +604,10 @@ class Sse_bs extends Controller {
if($r) {
xchan_query($r);
foreach($r as $rr) {
- $result['files']['notifications'][] = Enotify::format($rr);
+ $parsed = Enotify::format($rr);
+ if($parsed) {
+ $result['files']['notifications'][] = $parsed;
+ }
}
$result['files']['count'] = count($r);
}
diff --git a/boot.php b/boot.php
index 664e35732..e508b0d0f 100644
--- a/boot.php
+++ b/boot.php
@@ -2422,7 +2422,7 @@ function construct_page() {
if(App::get_scheme() === 'https' && App::$config['system']['transport_security_header'])
header("Strict-Transport-Security: max-age=31536000");
- if(App::$config['system']['content_security_policy']) {
+ if(isset(App::$config['system']['content_security_policy'])) {
$cspsettings = [
'script-src' => [ "'self'", "'unsafe-inline'", "'unsafe-eval'" ],
'style-src' => [ "'self'", "'unsafe-inline'" ],
diff --git a/include/channel.php b/include/channel.php
index 4f48402d2..ecb7c24f7 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -508,7 +508,7 @@ function create_identity($arr) {
if($group_hash) {
group_add_member($newuid,t('Friends'),$ret['channel']['channel_hash']);
- $default_collection = '';
+ $default_collection_str = '';
// if our role_permissions indicate that we're using a default collection ACL, add it.
if(is_array($role_permissions) && $role_permissions['default_collection']) {
$default_collection_str = '<' . $group_hash . '>';