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

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

Frontend ui refactor
This commit is contained in:
daniel 2018-12-10 21:27:00 -07:00 committed by GitHub
parent 9a015190ac 564fd93290
commit ade7a51a4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 4 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;
$videos = 0;
foreach($mimes as $mime) {
if(in_array($mime, $allowed) == false) {
if(in_array($mime, $allowed) == false && $mime !== 'video/mp4') {
continue;
}
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.
|
*/
'version' => '0.5.1',
'version' => '0.5.2',
/*
|--------------------------------------------------------------------------

2
public/js/components.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/components.js": "/js/components.js?id=96ce3848888232d3703a",
"/js/components.js": "/js/components.js?id=f7eff1b7304c561d5f8c",
"/js/app.js": "/js/app.js?id=763d01bb175be69c8ad3",
"/css/app.css": "/css/app.css?id=986cee6cfca852babf8e",
"/js/timeline.js": "/js/timeline.js?id=415bfde862ab8c5b4548",

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

@ -308,6 +308,11 @@
<span class="font-weight-bold">{{n.account.username}}</span> mentioned you.
</p>
</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>