From 83bc74de0a58de54aca3228a2c284e27ff6ddfe4 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Sun, 6 Dec 2020 23:45:34 +0200 Subject: [PATCH 1/6] fix recent mistakes in react button --- src/components/react_button/react_button.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue index dde67d21..ac940b98 100644 --- a/src/components/react_button/react_button.vue +++ b/src/components/react_button/react_button.vue @@ -20,10 +20,10 @@
{{ emoji.replacement }} From 415119cda949f2c92865f9ea5db3e377b83d1eb0 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Mon, 7 Dec 2020 00:11:21 +0200 Subject: [PATCH 2/6] use title html for poll options before vote --- CHANGELOG.md | 1 + src/components/poll/poll.vue | 3 ++- src/services/entity_normalizer/entity_normalizer.service.js | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd4a2836..a1506eb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Fixed pinned statuses not appearing in user profiles - Fixed some elements not being keyboard navigation friendly - Fixed your latest chat messages disappearing when closing chat view and opening it again during the same session +- Fixed custom emoji not showing in poll options before voting ### Changed - Errors when fetching are now shown with popup errors instead of "Error fetching updates" in panel headers diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue index 264a5f03..42819c19 100644 --- a/src/components/poll/poll.vue +++ b/src/components/poll/poll.vue @@ -42,7 +42,8 @@ :value="index" >
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index e3a52489..b1e68df5 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -280,7 +280,7 @@ export const parseStatus = (data) => { if (output.poll) { output.poll.options = (output.poll.options || []).map(field => ({ ...field, - title_html: addEmojis(field.title, data.emojis) + title_html: addEmojis(escape(field.title), data.emojis) })) } output.pinned = data.pinned From 51e6f5e255f908de14a2fcfcca7b7298643017d1 Mon Sep 17 00:00:00 2001 From: eugenijm Date: Fri, 11 Dec 2020 17:11:03 +0300 Subject: [PATCH 3/6] Display upload limit on the Features panel --- CHANGELOG.md | 1 + src/components/features_panel/features_panel.js | 5 ++++- src/components/features_panel/features_panel.vue | 1 + src/i18n/en.json | 3 ++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd4a2836..3a6eb29e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Mouseover titles for emojis in reaction picker - Support to input emoji into the search box in reaction picker - Added some missing unicode emoji +- Added the upload limit to the Features panel in the About page ### Fixed - Fixed the occasional bug where screen would scroll 1px when typing into a reply form diff --git a/src/components/features_panel/features_panel.js b/src/components/features_panel/features_panel.js index 620a85ea..8b142d08 100644 --- a/src/components/features_panel/features_panel.js +++ b/src/components/features_panel/features_panel.js @@ -1,3 +1,5 @@ +import fileSizeFormatService from '../../services/file_size_format/file_size_format.js' + const FeaturesPanel = { computed: { chat: function () { return this.$store.state.instance.chatAvailable }, @@ -6,7 +8,8 @@ const FeaturesPanel = { whoToFollow: function () { return this.$store.state.instance.suggestionsEnabled }, mediaProxy: function () { return this.$store.state.instance.mediaProxyAvailable }, minimalScopesMode: function () { return this.$store.state.instance.minimalScopesMode }, - textlimit: function () { return this.$store.state.instance.textlimit } + textlimit: function () { return this.$store.state.instance.textlimit }, + uploadlimit: function () { return fileSizeFormatService.fileSizeFormat(this.$store.state.instance.uploadlimit) } } } diff --git a/src/components/features_panel/features_panel.vue b/src/components/features_panel/features_panel.vue index 608b11c8..9605d09d 100644 --- a/src/components/features_panel/features_panel.vue +++ b/src/components/features_panel/features_panel.vue @@ -25,6 +25,7 @@
  • {{ $t('features_panel.scope_options') }}
  • {{ $t('features_panel.text_limit') }} = {{ textlimit }}
    • +
  • {{ $t('features_panel.upload_limit') }} = {{ uploadlimit.num }} {{ $t('upload.file_size_units.' + uploadlimit.unit) }}
    • diff --git a/src/i18n/en.json b/src/i18n/en.json index ef23efd6..c42126fc 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -50,7 +50,8 @@ "scope_options": "Scope options", "text_limit": "Text limit", "title": "Features", - "who_to_follow": "Who to follow" + "who_to_follow": "Who to follow", + "upload_limit": "Upload limit" }, "finder": { "error_fetching_user": "Error fetching user", From 4451ac9f7cd42e530f1d9c736bb8dbc83c186b0b Mon Sep 17 00:00:00 2001 From: "W. W" Date: Mon, 14 Dec 2020 19:52:07 +0000 Subject: [PATCH 4/6] Add uk.json in messages.js --- src/i18n/messages.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/messages.js b/src/i18n/messages.js index c3195f10..2624d1d0 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -33,6 +33,7 @@ const loaders = { ro: () => import('./ro.json'), ru: () => import('./ru.json'), te: () => import('./te.json'), + uk: () => import('./uk.json'), zh: () => import('./zh.json') } From 6d9c79fb6d27ddbbb88a6d60ed25d984c7888eae Mon Sep 17 00:00:00 2001 From: eugenijm Date: Tue, 15 Dec 2020 21:17:50 +0300 Subject: [PATCH 5/6] Disable horizontal textarea resize --- CHANGELOG.md | 1 + src/App.scss | 4 ++++ src/components/settings_modal/tabs/filtering_tab.vue | 1 + src/components/settings_modal/tabs/profile_tab.vue | 4 ++-- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a6eb29e..5fdc1f32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Changed - Errors when fetching are now shown with popup errors instead of "Error fetching updates" in panel headers - Made reply/fav/repeat etc buttons easier to hit +- Disabled horizontal textarea resize ## [2.2.1] - 2020-11-11 diff --git a/src/App.scss b/src/App.scss index cdc3209c..48313f57 100644 --- a/src/App.scss +++ b/src/App.scss @@ -332,6 +332,10 @@ input, textarea, .select, .input { box-sizing: border-box; } } + + &.resize-height { + resize: vertical; + } } option { diff --git a/src/components/settings_modal/tabs/filtering_tab.vue b/src/components/settings_modal/tabs/filtering_tab.vue index 813dc4cd..8f850c8b 100644 --- a/src/components/settings_modal/tabs/filtering_tab.vue +++ b/src/components/settings_modal/tabs/filtering_tab.vue @@ -75,6 +75,7 @@

    {{ $t('settings.filtering_explanation') }}