Merge pull request #3096 from pixelfed/staging

Staging

CHANGELOG.md

@@ -5,6 +5,9 @@
 ### Breaking
 - Dropped support for PHP 7.3 [#3041](https://github.com/pixelfed/pixelfed/pull/3041)
 
+### Metro 2.0 UI
+- Added UI Settings modal and fixed height media previews setting ([f2467e71](https://github.com/pixelfed/pixelfed/commit/f2467e71))
+
 ### 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))
@@ -64,6 +67,7 @@
 - Updated site config, increase ttl and enable SPA by default. ([469d49d8](https://github.com/pixelfed/pixelfed/commit/469d49d8))
 - Updated Webfinger, fixes #3050. ([ff7ee3bd](https://github.com/pixelfed/pixelfed/commit/ff7ee3bd))
 - Updated status api, autolink caption before returning response. ([b00a453b](https://github.com/pixelfed/pixelfed/commit/b00a453b))
+- Updated Timeline, add new ui promo in timelines that can be hidden using localstorage. ([e13959ae](https://github.com/pixelfed/pixelfed/commit/e13959ae))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.1 (2021-09-07)](https://github.com/pixelfed/pixelfed/compare/v0.11.0...v0.11.1)

resources/assets/js/components/Timeline.vue

@@ -24,7 +24,7 @@
 								<div class="card rounded-0 shadow-none border border-top-0 py-5">
 									<div class="card-body p-5 my-5">
 										<h1>A New Experience Awaits</h1>
-										<p class="lead">Try out an early release of our upcoming design</p>
+										<p class="lead">Try out an early release of our new design</p>
 										<p class="mb-0 d-flex align-items-center">
 											<a class="btn btn-primary font-weight-bold py-1 px-4 rounded-pill mr-4" href="/i/web">Try new UI</a>
 											<a class="font-weight-bold text-muted" href="/" @click.prevent="hidePromo()">Hide</a>