chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

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

Bump version to v0.9.3
This commit is contained in:
daniel 2019-06-03 17:52:55 -06:00 committed by GitHub
parent d3567aabcf 40f78478e4
commit 949f5d0b00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 5 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',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

2
public/js/activity.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -1,5 +1,5 @@
{ {
"/js/activity.js": "/js/activity.js?id=7215ab70fff456de127b", "/js/activity.js": "/js/activity.js?id=5aa546eb151078508efa",
"/js/app.js": "/js/app.js?id=1f05f00eec0e86f49dd4", "/js/app.js": "/js/app.js?id=1f05f00eec0e86f49dd4",
"/css/app.css": "/css/app.css?id=3a974ff74b6b5905a73c", "/css/app.css": "/css/app.css?id=3a974ff74b6b5905a73c",
"/css/appdark.css": "/css/appdark.css?id=107806a000e2ca675a3c", "/css/appdark.css": "/css/appdark.css?id=107806a000e2ca675a3c",

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