Merge pull request #3101 from pixelfed/staging

Staging

CHANGELOG.md

@@ -9,6 +9,9 @@
 - Added UI Settings modal and fixed height media previews setting ([f2467e71](https://github.com/pixelfed/pixelfed/commit/f2467e71))
 - Set max-width of 1440px for larger screens ([af68872a](https://github.com/pixelfed/pixelfed/commit/af68872a))
 
+### Configuration
+- Enable network timeline by default ([b95aec12](https://github.com/pixelfed/pixelfed/commit/b95aec12))
+
 ### Added
 - Manual email verification requests. ([bc659387](https://github.com/pixelfed/pixelfed/commit/bc659387))
 - Added StatusMentionService, fixes #3026. ([e5387d67](https://github.com/pixelfed/pixelfed/commit/e5387d67))

config/federation.php

@@ -40,6 +40,6 @@ return [
 		'enabled' => env('WEBFINGER', true)
 	],
 
-	'network_timeline' => env('PF_NETWORK_TIMELINE', false)
+	'network_timeline' => env('PF_NETWORK_TIMELINE', true)
 
 ];

public/mix-manifest.json

@@ -24,7 +24,7 @@
     "/js/rempos.js": "/js/rempos.js?id=2ef46b249c6390aa4ef8",
     "/js/rempro.js": "/js/rempro.js?id=3971b84aef886204d286",
     "/js/search.js": "/js/search.js?id=dc888b173463dc3894ba",
-    "/js/spa.js": "/js/spa.js?id=9a82217c3a305738e70a",
+    "/js/spa.js": "/js/spa.js?id=fbf08b95a8fc8ad00b1b",
     "/js/status.js": "/js/status.js?id=49fd7ac5b254220021f9",
     "/js/stories.js": "/js/stories.js?id=f882708d5f00b4738dd7",
     "/js/story-compose.js": "/js/story-compose.js?id=0f9d2f7ce5e63ef14c6a",