From 41dbdc2b28d4a5187db7c393cee5e99cdbb28fb3 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Wed, 11 Nov 2020 10:40:26 +0200 Subject: [PATCH 1/3] fix emoji not working in profile field names --- src/components/user_profile/user_profile.vue | 7 +++---- .../entity_normalizer/entity_normalizer.service.js | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index f1f5184023..745e795dec 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -20,14 +20,13 @@ :key="index" class="user-profile-field" > +
- {{ field.name }} -
- + v-html="field.name" + />
{ output.fields = data.fields output.fields_html = data.fields.map(field => { return { - name: addEmojis(field.name, data.emojis), + name: addEmojis(escape(field.name), data.emojis), value: addEmojis(field.value, data.emojis) } }) From b536c6e3c59c9e43beca288c4e581534230afadb Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Wed, 11 Nov 2020 10:42:13 +0200 Subject: [PATCH 2/3] changelog mention --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f14bc59ee..bf9898a29b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Fixed - Fixed regression in react popup alignment and overflowing - Fixed the occasional bug where screen would scroll 1px when typing into a reply form +- Fixed custom emoji not working in profile field names ## [2.2.0] - 2020-11-06 From 476154d0ee696f49d262408a4a5aecb1dd792992 Mon Sep 17 00:00:00 2001 From: Sean King Date: Wed, 11 Nov 2020 11:57:42 -0700 Subject: [PATCH 3/3] Remove title from index.html, title is now from server generated meta --- index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/index.html b/index.html index 1ff944d986..ba072edab5 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,6 @@ - Pleroma