UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-29 09:43:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2826 from pixelfed/staging

Browse source 
Update Timeline, fix suggested posts
This commit is contained in:
daniel 2021-06-28 23:20:12 -06:00 committed by GitHub
commit b79e395284
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -30,6 +30,7 @@
- Updated SharePipeline, add Undo->Announce support. ([c8e40e0f](https://github.com/pixelfed/pixelfed/commit/c8e40e0f)) - Updated SharePipeline, add Undo->Announce support. ([c8e40e0f](https://github.com/pixelfed/pixelfed/commit/c8e40e0f))
- Updated NetworkTimeline, fix remote comment urls. ([308acc91](https://github.com/pixelfed/pixelfed/commit/308acc91)) - Updated NetworkTimeline, fix remote comment urls. ([308acc91](https://github.com/pixelfed/pixelfed/commit/308acc91))
- Updated Timeline component, abstracted reusable partials. ([858f3f9e](https://github.com/pixelfed/pixelfed/commit/858f3f9e)) - Updated Timeline component, abstracted reusable partials. ([858f3f9e](https://github.com/pixelfed/pixelfed/commit/858f3f9e))
- Updated Timeline, fix suggested posts. ([3ba5c88c](https://github.com/pixelfed/pixelfed/commit/3ba5c88c))
- ([](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/timeline.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

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

@ -181,7 +181,7 @@
</div> </div>
<div v-if="!loading && scope == 'home' && recentFeed && discover_feed.length" class="pt-3"> <div v-if="!loading && scope == 'home' && recentFeed && discover_feed.length" class="pt-3">
<p class="h5 font-weight-bold pt-3 mb-0 d-flex justify-content-between align-items-center"> <p class="h5 font-weight-bold py-3 d-flex justify-content-between align-items-center">
<span>Suggested Posts</span> <span>Suggested Posts</span>
<a href="/?a=vop" class="small font-weight-bold">Older Posts</a> <a href="/?a=vop" class="small font-weight-bold">Older Posts</a>
</p> </p>
@ -272,7 +272,7 @@
</div> </div>
</div> </div>
<status :status="status" :recommended="true" /> <status-card :status="status" :recommended="true" />
</div> </div>
</div> </div>
</div> </div>

8
resources/assets/js/components/partials/StatusCard.vue
View file

@ -107,14 +107,14 @@
</p> </p>
</div> </div>
<div class="timestamp mt-2"> <div class="timestamp mt-2">
<p class="small text-uppercase mb-0"> <p class="small mb-0">
<a :href="statusUrl(status)" class="text-muted"> <a :href="statusUrl(status)" class="text-muted text-uppercase">
<timeago :datetime="status.created_at" :auto-update="60" :converter-options="{includeSeconds:true}" :title="timestampFormat(status.created_at)" v-b-tooltip.hover.bottom></timeago> <timeago :datetime="status.created_at" :auto-update="60" :converter-options="{includeSeconds:true}" :title="timestampFormat(status.created_at)" v-b-tooltip.hover.bottom></timeago>
</a> </a>
<div v-if="recommended"> <span v-if="recommended">
<span class="px-1">&middot;</span> <span class="px-1">&middot;</span>
<span class="text-muted">Based on popular and trending content</span> <span class="text-muted">Based on popular and trending content</span>
</div> </span>
</p> </p>
</div> </div>
</div> </div>