Merge pull request #2638 from pixelfed/staging

Staging

CHANGELOG.md

@@ -37,6 +37,9 @@
 - Updated DiscoverComponent, allow unathenicated if enabled. ([a1059a6e](https://github.com/pixelfed/pixelfed/commit/a1059a6e))
 - Updated components, improve content warnings. ([a9e98965](https://github.com/pixelfed/pixelfed/commit/a9e98965))
 - Updated ComposeModal, prevent tagging empty users. Fixes #2633. ([ceae664c](https://github.com/pixelfed/pixelfed/commit/ceae664c))
+- Updated ComposeModal, show filter warning for unsupported browsers. ([12ce7602](https://github.com/pixelfed/pixelfed/commit/12ce7602))
+- Updated Hashtag component, fix null infinite loading bug. Fixes #2637. ([55136518](https://github.com/pixelfed/pixelfed/commit/55136518))
+- Updated filesystems config, add backup driver to store backups on other filesystems. ([ae90eef9](https://github.com/pixelfed/pixelfed/commit/ae90eef9))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.10.10 (2021-01-28)](https://github.com/pixelfed/pixelfed/compare/v0.10.9...v0.10.10)

config/filesystems.php

@@ -81,6 +81,19 @@ return [
             'url' => str_replace(env('DO_SPACES_REGION'),env('DO_SPACES_BUCKET').'.'.env('DO_SPACES_REGION'),str_replace("digitaloceanspaces","cdn.digitaloceanspaces",env('DO_SPACES_ENDPOINT'))),
         ],
 
+        'backup' => [
+            'driver' => env('PF_BACKUP_DRIVER', 'local'),
+            'visibility' => 'private',
+            'root' => env('PF_BACKUP_DRIVER', 'local') == 'local' ?
+                storage_path('app/backups/') :
+                env('PF_BACKUP_ROOT','/'),
+            'key' => env('PF_BACKUP_KEY'),
+            'secret' => env('PF_BACKUP_SECRET'),
+            'endpoint' => env('PF_BACKUP_ENDPOINT'),
+            'region' => env('PF_BACKUP_REGION'),
+            'bucket' => env('PF_BACKUP_BUCKET'),
+        ],
+
     ],
 
 ];

public/mix-manifest.json

@@ -11,12 +11,12 @@
     "/js/collectioncompose.js": "/js/collectioncompose.js?id=c6a07cb79dd7d6c7b8a0",
     "/js/collections.js": "/js/collections.js?id=6f64a9032085ebac28b3",
     "/js/components.js": "/js/components.js?id=6a067b7270581d1039cb",
-    "/js/compose.js": "/js/compose.js?id=b896ae7df355994d1f40",
+    "/js/compose.js": "/js/compose.js?id=4c4a28c5b88cfa2ee625",
     "/js/compose-classic.js": "/js/compose-classic.js?id=283f19c895f4118a2a8b",
     "/js/developers.js": "/js/developers.js?id=f75deca5ccf47d43eb07",
     "/js/direct.js": "/js/direct.js?id=e1e4a830bfedc1870db1",
     "/js/discover.js": "/js/discover.js?id=0e6a97dc8171aaee5767",
-    "/js/hashtag.js": "/js/hashtag.js?id=f22994116815f17a4ad0",
+    "/js/hashtag.js": "/js/hashtag.js?id=883e6d2d079b0ea33175",
     "/js/loops.js": "/js/loops.js?id=1dcb3790eb9ea4ea5848",
     "/js/memoryprofile.js": "/js/memoryprofile.js?id=75ea0503eca4f7ad3642",
     "/js/mode-dot.js": "/js/mode-dot.js?id=dd9c87024fbaa8e75ac4",

resources/assets/js/components/ComposeModal.vue

@@ -1131,7 +1131,7 @@ export default {
 			// this is where the magic happens
 			var ua = navigator.userAgent.toLowerCase();
 			if(ua.indexOf('firefox') == -1 && ua.indexOf('chrome') == -1) {
-			 	// swal('Oops!', 'Your browser does not support the filter feature. Please use Chrome or Firefox if you want to apply a filter.', 'error');
+			 	swal('Oops!', 'Your browser does not support the filter feature.', 'error');
 			 	return;
 			}
 

resources/assets/js/components/Hashtag.vue

@@ -168,7 +168,7 @@
 				}).then(res => {
 					let data = res.data;
 					let tags = data.tags.filter(n => {
-						if(!n || n.length == 0) {
+						if(!n || n.length == 0 || n.status == null) {
 							return false;
 						}
 						return true;
@@ -195,7 +195,7 @@
 					let data = res.data;
 					if(data.tags.length) {
 						let tags = data.tags.filter(n => {
-							if(!n || n.length == 0) {
+							if(!n || n.length == 0 || n.status == null) {
 								return false;
 							}
 							return true;

storage/app/.gitignore

@@ -1,4 +1,5 @@
 *
+!backups/
 !public/
 !remcache/
 !cities.json

storage/app/backups/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore