UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-01 18:53:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2811 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2021-06-18 06:21:40 -06:00 committed by GitHub
commit a6ea480f84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -22,6 +22,7 @@
- Updated Remote Post + Profile hashtag to redirect to local urls. ([1fa08644](https://github.com/pixelfed/pixelfed/commit/1fa08644)) - Updated Remote Post + Profile hashtag to redirect to local urls. ([1fa08644](https://github.com/pixelfed/pixelfed/commit/1fa08644))
- Updated Inbox, delete notifications on tombstone. ([ef63124d](https://github.com/pixelfed/pixelfed/commit/ef63124d)) - Updated Inbox, delete notifications on tombstone. ([ef63124d](https://github.com/pixelfed/pixelfed/commit/ef63124d))
- Updated NotificationCard, fix missing status bug. ([a3a86d46](https://github.com/pixelfed/pixelfed/commit/a3a86d46)) - Updated NotificationCard, fix missing status bug. ([a3a86d46](https://github.com/pixelfed/pixelfed/commit/a3a86d46))
- Updated Activity component, fix comment bug. ([9a2db8eb](https://github.com/pixelfed/pixelfed/commit/9a2db8eb))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0) ## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0)

BIN
public/js/activity.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

12
resources/assets/js/components/Activity.vue
View file

@ -144,6 +144,12 @@ export default {
if(n.type == 'share' && !status) { if(n.type == 'share' && !status) {
return false; return false;
} }
if(n.type == 'comment' && !status) {
return false;
}
if(n.type == 'mention' && !status) {
return false;
}
return true; return true;
}); });
let ids = res.data.map(n => n.id); let ids = res.data.map(n => n.id);
@ -170,6 +176,12 @@ export default {
if(n.type == 'share' && !status) { if(n.type == 'share' && !status) {
return false; return false;
} }
if(n.type == 'comment' && !status) {
return false;
}
if(n.type == 'mention' && !status) {
return false;
}
if(_.find(this.notifications, {id: n.id})) { if(_.find(this.notifications, {id: n.id})) {
return false; return false;
} }