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

Merge pull request #1333 from pixelfed/frontend-ui-refactor

Browse source 
Bump version to v0.9.3
This commit is contained in:
daniel 2019-06-03 17:52:55 -06:00 committed by GitHub
commit 949f5d0b00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/pixelfed.php
View file

@ -23,7 +23,7 @@ return [
| This value is the version of your PixelFed instance. | This value is the version of your PixelFed instance.
| |
*/ */
'version' => '0.9.2', 'version' => '0.9.3',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

BIN
public/js/activity.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

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

@ -62,11 +62,13 @@
<img :src="n.status.parent.media_attachments[0].preview_url" width="32px" height="32px"> <img :src="n.status.parent.media_attachments[0].preview_url" width="32px" height="32px">
</a> </a>
</div> --> </div> -->
<div v-else-if="n.type == 'follow' && n.relationship.following == false">
<!-- <div v-else-if="n.type == 'follow' && n.relationship.following == false">
<a href="#" class="btn btn-primary py-0 font-weight-bold" @click.prevent="followProfile(n);"> <a href="#" class="btn btn-primary py-0 font-weight-bold" @click.prevent="followProfile(n);">
Follow Follow
</a> </a>
</div> </div> -->
<!-- <div v-else-if="n.status && n.status.parent && !n.status.parent.media_attachments && n.type == 'like' && n.relationship.following == false"> <!-- <div v-else-if="n.status && n.status.parent && !n.status.parent.media_attachments && n.type == 'like' && n.relationship.following == false">
<a href="#" class="btn btn-primary py-0 font-weight-bold"> <a href="#" class="btn btn-primary py-0 font-weight-bold">
Follow Follow