YunoHost-Apps/pixelfed_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/pixelfed_ynh.git synced 2024-09-03 20:06:04 +02:00
Code Issues Activity Actions

Merge pull request #2788 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2021-06-07 23:34:53 -06:00 • committed by GitHub
commit 004eff1625
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -3,6 +3,9 @@
## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.0...dev)
### Updated
- Updated PrettyNumber, fix deprecated warning. ([20ec870b](https://github.com/pixelfed/pixelfed/commit/20ec870b))
- Updated landing page, use config_cache. ([54920294](https://github.com/pixelfed/pixelfed/commit/54920294))
- Updated Timeline, implement suggested post opt out. ([66750d34](https://github.com/pixelfed/pixelfed/commit/66750d34))
- ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0)
### Added

2
public/js/timeline.js vendored
View file

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View file

@ -31,5 +31,5 @@
"/js/status.js": "/js/status.js?id=ce91385c7214bfa91c29",
"/js/story-compose.js": "/js/story-compose.js?id=a450061c248b4ddb2d63",
"/js/theme-monokai.js": "/js/theme-monokai.js?id=85f0af57479412548223",
"/js/timeline.js": "/js/timeline.js?id=a5c04954f50f7dbbf748"
"/js/timeline.js": "/js/timeline.js?id=45ce02ff0eba7a9a8bff"
}

17
resources/assets/js/components/Timeline.vue
View file

@ -294,6 +294,9 @@
<p class="text-center mb-0">
<a class="btn btn-link font-weight-bold px-4" href="/?a=vop">View Older Posts</a>
</p>
<p class="text-center mb-0">
<a class="btn btn-link font-weight-bold px-4" href="/" @click.prevent="alwaysViewOlderPosts()">Always show older posts on this device</a>
</p>
</div>
<div v-else>
<p class="text-center h3 font-weight-light">You've reached the end of this feed</p>
@ -310,6 +313,9 @@
<p class="text-center mb-0">
<a class="btn btn-link font-weight-bold px-4" href="/?a=vop">View Older Posts</a>
</p>
<p class="text-center mb-0">
<a class="btn btn-link font-weight-bold px-4" href="/" @click.prevent="alwaysViewOlderPosts()">Always show older posts on this device</a>
</p>
</div>
<div v-else>
<p class="text-center h3 font-weight-light">You've reached the end of this feed</p>
@ -331,6 +337,9 @@
<p class="text-center mb-0">
<a class="btn btn-link font-weight-bold px-4" href="/?a=vop">View Older Posts</a>
</p>
<p class="text-center mb-0">
<a class="btn btn-link font-weight-bold px-4" href="/" @click.prevent="alwaysViewOlderPosts()">Always show older posts on this device</a>
</p>
</div>
<div v-else class="card-body py-5 my-5">
<p class="text-center"><i class="far fa-smile fa-8x text-lighter"></i></p>
@ -1223,6 +1232,7 @@
},
beforeMount() {
let avop = window.localStorage.getItem('pf.feed:avop') === 'always';
let u = new URLSearchParams(window.location.search);
if(u.has('a')) {
switch(u.get('a')) {
@ -1236,6 +1246,7 @@
break;
}
}
this.recentFeed = avop ? false : this.recentFeed;
this.fetchProfile();
this.fetchTimelineApi();
},
@ -2479,6 +2490,12 @@
this.pagination = response.data.meta.pagination;
$('.load-more-link').removeClass('d-none');
});
},
alwaysViewOlderPosts() {
// Set Feed:Always View Older Posts
window.localStorage.setItem('pf.feed:avop', 'always');
window.location.href = '/';
}
},

2
resources/views/site/index.blade.php
View file

@ -127,7 +127,7 @@
</div>
<div class="card shadow-none border card-body">
<p class="text-center mb-0 font-weight-bold small">
@if(config('pixelfed.open_registration'))
@if(config_cache('pixelfed.open_registration'))
<a href="/register">Register</a>
<span class="px-1">·</span>
@endif