Merge pull request #2361 from pixelfed/staging

Staging

package-lock.json

@@ -3122,9 +3122,9 @@
             "integrity": "sha512-IKDR/xCxKFhPts7h+VaSXS02Z1mznP3fli1BbXWXeN89i2gCzKraU8qLpEid8YzKcmZdZD3Mly3cn5/lY9xsBQ=="
         },
         "elliptic": {
-            "version": "6.5.2",
-            "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz",
-            "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==",
+            "version": "6.5.3",
+            "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
+            "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
             "requires": {
                 "bn.js": "^4.4.0",
                 "brorand": "^1.0.1",
@@ -3136,9 +3136,9 @@
             },
             "dependencies": {
                 "bn.js": {
-                    "version": "4.11.8",
-                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-                    "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
+                    "version": "4.11.9",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+                    "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
                 }
             }
         },

public/mix-manifest.json

@@ -14,7 +14,7 @@
     "/js/compose.js": "/js/compose.js?id=b1d8d2cd9ede424f210b",
     "/js/compose-classic.js": "/js/compose-classic.js?id=283f19c895f4118a2a8b",
     "/js/developers.js": "/js/developers.js?id=f75deca5ccf47d43eb07",
-    "/js/discover.js": "/js/discover.js?id=ea7279e1612a1989941d",
+    "/js/discover.js": "/js/discover.js?id=1bc0d0b9d96e5b320f1d",
     "/js/hashtag.js": "/js/hashtag.js?id=e6b41cab117cb03c7d2a",
     "/js/loops.js": "/js/loops.js?id=ac610897b12207c829b9",
     "/js/mode-dot.js": "/js/mode-dot.js?id=1225a9aac7a93d5d232f",

resources/assets/js/components/DiscoverComponent.vue

@@ -7,10 +7,13 @@
 			<div class="d-block d-md-none px-0 border-top-0 mx-n3">
 				<input class="form-control rounded-0" placeholder="Search" v-model="searchTerm" v-on:keyup.enter="searchSubmit">
 			</div>
+			<div>
+				<p class="display-4 font-weight-bold pt-5 text-lighter"><i class="far fa-compass"></i> DISCOVER</p>
+			</div>
 			<section class="d-none d-md-flex mb-md-2 pt-5 discover-bar" style="width:auto; overflow: auto hidden;" v-if="categories.length > 0">
-				<a v-if="config.ab.loops == true" class="text-decoration-none bg-transparent border border-success rounded d-inline-flex align-items-center justify-content-center mr-3 card-disc" href="/discover/loops">
+				<!--<a v-if="config.ab.loops == true" class="text-decoration-none bg-transparent border border-success rounded d-inline-flex align-items-center justify-content-center mr-3 card-disc" href="/discover/loops">
 					<p class="text-success lead font-weight-bold mb-0">Loops</p>
-				</a>
+				</a>-->
 				<a v-for="(category, index) in categories" :key="index+'_cat_'" class="bg-dark rounded d-inline-flex align-items-end justify-content-center mr-3 box-shadow card-disc text-decoration-none" :href="category.url" :style="'background: linear-gradient(rgba(0, 0, 0, 0.3),rgba(0, 0, 0, 0.3)),url('+category.thumb+');'">
 					<p class="text-white font-weight-bold" style="text-shadow: 3px 3px 16px #272634;">{{category.name}}</p>
 				</a>

resources/lang/eo/helpcenter.php

@@ -21,6 +21,7 @@ return [
 	'blockingAccounts' => 'Bloki Kontoj',
 	'safetyTips' => 'Sekurecaj Konsiletoj',
 	'reportSomething' => 'Informi',
-	'dataPolicy' => 'Datuma Politiko'
+	'dataPolicy' => 'Datuma Politiko',
 
+    'taggingPeople' => 'Etikedi Personoj'
 ];

resources/views/discover/loops/home.blade.php

@@ -1,7 +1,11 @@
 @extends('layouts.app')
 
 @section('content')
-<div class="bg-success" style="height:1.2px;"></div>
+<div class="bg-primary">
+  <p class="text-center text-white mb-0 py-3 font-weight-bold">
+    <i class="fas fa-exclamation-triangle fa-lg mr-2"></i> This feature has been deprecated and will be removed in a future version.
+  </p>
+</div>
 <div class="profile-header">
   <div class="container pt-5">
     <div class="profile-details text-center">