浏览代码

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

Frontend ui refactor
daniel 6 年之前
父节点
当前提交
ade7a51a4d
共有 5 个文件被更改,包括 7 次插入2 次删除
  1. 1 1
      app/Http/Controllers/StatusController.php
  2. 1 1
      config/pixelfed.php
  3. 二进制
      public/js/components.js
  4. 二进制
      public/mix-manifest.json
  5. 5 0
      resources/assets/js/components/Timeline.vue

+ 1 - 1
app/Http/Controllers/StatusController.php

@@ -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/')) {

+ 1 - 1
config/pixelfed.php

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

二进制
public/js/components.js


二进制
public/mix-manifest.json


+ 5 - 0
resources/assets/js/components/Timeline.vue

@@ -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>