Merge remote-tracking branch 'origin/develop' into plain-bg

* origin/develop:
  fix remote follow button style
  Disable horizontal textarea resize
  Add uk.json in messages.js
  Display upload limit on the Features panel
  use title html for poll options before vote
  fix recent mistakes in react button

12 files changed, 24 insertions, 9 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d627a146..79dd0773 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
 - Support for solid color wallpaper, instance doesn't have to define a wallpaper anymore
 
 ### Fixed
@@ -19,11 +20,13 @@ 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
 - Fixed link color not applied to instance name in topbar
 
 ### 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
 - Wallpaper is now top-aligned, horizontally centered.
 
 
diff --git a/src/App.scss b/src/App.scss
index 394d6434..2a1d7b1b 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -334,6 +334,10 @@ input, textarea, .select, .input {
       box-sizing: border-box;
     }
   }
+
+  &.resize-height {
+    resize: vertical;
+  }
 }
 
 option {
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 @@
           </li>
           <li>{{ $t('features_panel.scope_options') }}</li>
           <li>{{ $t('features_panel.text_limit') }} = {{ textlimit }}</li>
+          <li>{{ $t('features_panel.upload_limit') }} = {{ uploadlimit.num }} {{ $t('upload.file_size_units.' + uploadlimit.unit) }}</li>
         </ul>
       </div>
     </div>
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"
         >
         <label class="option-vote">
-          <div>{{ option.title }}</div>
+          <!-- eslint-disable-next-line vue/no-v-html -->
+          <div v-html="option.title_html" />
         </label>
       </div>
     </div>
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 @@
       <div class="reaction-picker">
         <span
           v-for="emoji in commonEmojis"
-          :key="emoji"
+          :key="emoji.replacement"
           class="emoji-button"
           :title="emoji.displayText"
-          @click="addReaction($event, emoji, close)"
+          @click="addReaction($event, emoji.replacement, close)"
         >
           {{ emoji.replacement }}
         </span>
diff --git a/src/components/remote_follow/remote_follow.vue b/src/components/remote_follow/remote_follow.vue
index cb1c2a1b..be827400 100644
--- a/src/components/remote_follow/remote_follow.vue
+++ b/src/components/remote_follow/remote_follow.vue
@@ -16,7 +16,7 @@
       >
       <button
         click="submit"
-        class="remote-button"
+        class="button-default remote-button"
       >
         {{ $t('user_card.remote_follow') }}
       </button>
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 @@
         <p>{{ $t('settings.filtering_explanation') }}</p>
         <textarea
           id="muteWords"
+          class="resize-height"
           v-model="muteWordsString"
         />
       </div>
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index 50d3ee63..66275fcc 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -11,7 +11,7 @@
         <input
           id="username"
           v-model="newName"
-          classname="name-changer"
+          class="name-changer"
         >
       </EmojiInput>
       <p>{{ $t('settings.bio') }}</p>
@@ -22,7 +22,7 @@
       >
         <textarea
           v-model="newBio"
-          classname="bio"
+          class="bio resize-height"
         />
       </EmojiInput>
       <p>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index d1de8f34..815c0f2a 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",
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')
 }
 
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