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

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

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2018-12-10 21:27:00 -07:00 committed by GitHub
commit ade7a51a4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/StatusController.php
View file

@ -279,7 +279,7 @@ class StatusController extends Controller
$photos = 0; $photos = 0;
$videos = 0; $videos = 0;
foreach($mimes as $mime) { foreach($mimes as $mime) {
if(in_array($mime, $allowed) == false) { if(in_array($mime, $allowed) == false && $mime !== 'video/mp4') {
continue; continue;
} }
if(str_contains($mime, 'image/')) { if(str_contains($mime, 'image/')) {

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.5.1', 'version' => '0.5.2',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

BIN
public/js/components.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

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

@ -308,6 +308,11 @@
<span class="font-weight-bold">{{n.account.username}}</span> mentioned you. <span class="font-weight-bold">{{n.account.username}}</span> mentioned you.
</p> </p>
</div> </div>
<div v-else-if="n.type == 'follow'">
<p class="my-0">
<span class="font-weight-bold">{{n.account.username}}</span> followed you.
</p>
</div>
</div> </div>
</div> </div>