浏览代码

Merge pull request #2591 from pixelfed/staging

Staging
daniel 4 年之前
父节点
当前提交
5d85a7977b
共有 4 个文件被更改,包括 2 次插入1 次删除
  1. 二进制
      public/js/timeline.js
  2. 二进制
      public/mix-manifest.json
  3. 1 1
      resources/assets/js/components/Timeline.vue
  4. 1 0
      routes/web.php

二进制
public/js/timeline.js


二进制
public/mix-manifest.json


+ 1 - 1
resources/assets/js/components/Timeline.vue

@@ -171,7 +171,7 @@
 
 						</div>
 
-						<div v-if="config.features.label.covid.enabled && status.label && status.label.covid == true" class="card-body border-bottom py-2 cursor-pointer pr-2" @click="labelRedirect()">
+						<div v-if="config.features.label.covid.enabled && status.label && status.label.covid == true" class="card-body border-top border-bottom py-2 cursor-pointer pr-2" @click="labelRedirect()">
 							<p class="font-weight-bold d-flex justify-content-between align-items-center mb-0">
 								<span>
 									<i class="fas fa-info-circle mr-2"></i>

+ 1 - 0
routes/web.php

@@ -101,6 +101,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
     Route::group(['prefix' => 'api'], function () {
         Route::get('search', 'SearchController@searchAPI');
         Route::get('nodeinfo/2.0.json', 'FederationController@nodeinfo');
+        Route::post('status/view', 'StatusController@storeView');
 
         Route::group(['prefix' => 'compose'], function() {
             Route::group(['prefix' => 'v0'], function() {