diff --git a/changelog.d/non-expiring-polls-indication.fix b/changelog.d/non-expiring-polls-indication.fix new file mode 100644 index 0000000000..7979cc131e --- /dev/null +++ b/changelog.d/non-expiring-polls-indication.fix @@ -0,0 +1 @@ +The expiry date indication won't be shown if the poll never expires diff --git a/package.json b/package.json index fa41beb3a8..cbbcb170ea 100644 --- a/package.json +++ b/package.json @@ -24,15 +24,15 @@ "@fortawesome/vue-fontawesome": "3.0.3", "@kazvmoe-infra/pinch-zoom-element": "1.2.0", "@kazvmoe-infra/unicode-emoji-json": "0.4.0", - "@ruffle-rs/ruffle": "0.1.0-nightly.2022.7.12", + "@ruffle-rs/ruffle": "0.1.0-nightly.2024.3.17", "@vuelidate/core": "2.0.3", - "@vuelidate/validators": "2.0.0", + "@vuelidate/validators": "2.0.4", "body-scroll-lock": "3.1.5", "chromatism": "3.0.0", "click-outside-vue3": "4.0.1", "cropperjs": "1.5.13", "escape-html": "1.0.3", - "js-cookie": "3.0.1", + "js-cookie": "3.0.5", "localforage": "1.10.0", "parse-link-header": "2.0.0", "phoenix": "1.7.7", @@ -55,13 +55,13 @@ "@babel/preset-env": "7.21.5", "@babel/register": "7.21.0", "@intlify/vue-i18n-loader": "5.0.1", - "@ungap/event-target": "0.2.3", + "@ungap/event-target": "0.2.4", "@vue/babel-helper-vue-jsx-merge-props": "1.4.0", - "@vue/babel-plugin-jsx": "1.1.1", + "@vue/babel-plugin-jsx": "1.2.1", "@vue/compiler-sfc": "3.2.45", "@vue/test-utils": "2.2.8", - "autoprefixer": "10.4.14", - "babel-loader": "9.1.2", + "autoprefixer": "10.4.19", + "babel-loader": "9.1.3", "babel-plugin-lodash": "3.3.4", "chai": "4.3.7", "chalk": "1.1.3", @@ -69,7 +69,7 @@ "connect-history-api-fallback": "2.0.0", "copy-webpack-plugin": "11.0.0", "cross-spawn": "7.0.3", - "css-loader": "6.7.3", + "css-loader": "6.10.0", "css-minimizer-webpack-plugin": "4.2.2", "custom-event-polyfill": "1.0.7", "eslint": "8.33.0", @@ -99,7 +99,7 @@ "lodash": "4.17.21", "mini-css-extract-plugin": "2.7.6", "mocha": "10.2.0", - "nightwatch": "2.6.20", + "nightwatch": "2.6.25", "opn": "5.5.0", "ora": "0.4.1", "postcss": "8.4.23", diff --git a/src/components/poll/poll.js b/src/components/poll/poll.js index f6001f56a5..9ce0e29ebd 100644 --- a/src/components/poll/poll.js +++ b/src/components/poll/poll.js @@ -38,7 +38,7 @@ export default { return (this.poll && this.poll.options) || [] }, expiresAt () { - return (this.poll && this.poll.expires_at) || 0 + return (this.poll && this.poll.expires_at) || null }, expired () { return (this.poll && this.poll.expired) || false diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue index 2e16393892..580e5377cc 100644 --- a/src/components/poll/poll.vue +++ b/src/components/poll/poll.vue @@ -78,13 +78,16 @@
+ +  ·  +
- +