1
0
Эх сурвалжийг харах

Merge pull request #3461 from shleeable/patch-8

typo?
daniel 3 жил өмнө
parent
commit
283ea5f38f

+ 1 - 0
CHANGELOG.md

@@ -8,6 +8,7 @@
 - Add storage flags to admin dashboard diagnostics ([#3444](https://github.com/pixelfed/pixelfed/pull/3444))
 - Add storage flags to admin dashboard diagnostics ([#3444](https://github.com/pixelfed/pixelfed/pull/3444))
 - Hardcode UTC application timezone to prevent timezone issues ([b0d2c5e1](https://github.com/pixelfed/pixelfed/commit/b0d2c5e1))
 - Hardcode UTC application timezone to prevent timezone issues ([b0d2c5e1](https://github.com/pixelfed/pixelfed/commit/b0d2c5e1))
 - Remove arbitrary metro url redirect timeout ([84209c24](https://github.com/pixelfed/pixelfed/commit/84209c24))
 - Remove arbitrary metro url redirect timeout ([84209c24](https://github.com/pixelfed/pixelfed/commit/84209c24))
+- Fix json-ld attributes, fixes #3423 ([95f902b1](https://github.com/pixelfed/pixelfed/commit/95f902b1))
 - Add trusted proxies flag to admin dashboard diagnostics ([#3450](https://github.com/pixelfed/pixelfed/pull/3450))
 - Add trusted proxies flag to admin dashboard diagnostics ([#3450](https://github.com/pixelfed/pixelfed/pull/3450))
 - Fix json-ld attributes, fixes #3423 ([95f902b1](https://github.com/pixelfed/pixelfed/commit/95f902b1))
 - Fix json-ld attributes, fixes #3423 ([95f902b1](https://github.com/pixelfed/pixelfed/commit/95f902b1))
 - Update exp config, enforce mastoapi compatibility by default ([a160b233](https://github.com/pixelfed/pixelfed/commit/a160b233))
 - Update exp config, enforce mastoapi compatibility by default ([a160b233](https://github.com/pixelfed/pixelfed/commit/a160b233))

+ 1 - 1
resources/assets/js/components/partials/PollCard.vue

@@ -98,7 +98,7 @@
 							<div>
 							<div>
 								<p class="mb-0 small text-lighter font-weight-bold d-flex justify-content-between">
 								<p class="mb-0 small text-lighter font-weight-bold d-flex justify-content-between">
 									<span>{{ status.poll.votes_count }} votes</span>
 									<span>{{ status.poll.votes_count }} votes</span>
-									<a v-if="tab != 'results' && authenticated && !activeRefreshTimeout & status.poll.expired != true && status.poll.voted" class="text-lighter" @click.prevent="refreshResults()" href="#">Refresh Results</a>
+									<a v-if="tab != 'results' && authenticated && !activeRefreshTimeout && status.poll.expired != true && status.poll.voted" class="text-lighter" @click.prevent="refreshResults()" href="#">Refresh Results</a>
 									<span v-if="tab != 'results' && authenticated && refreshingResults" class="text-lighter">
 									<span v-if="tab != 'results' && authenticated && refreshingResults" class="text-lighter">
 										<div class="spinner-border spinner-border-sm" role="status">
 										<div class="spinner-border spinner-border-sm" role="status">
 											<span class="sr-only">Loading...</span>
 											<span class="sr-only">Loading...</span>