Commit graph

4548 commits

Author SHA1 Message Date
Zero 8cff52ac32 Revert "Add a super basic keep reaction open button"
This reverts commit d8ec9f596d.
2022-12-01 16:40:04 -05:00
Zero 8d3d8de7a3 Better CSS for reacts 2022-12-01 16:40:04 -05:00
FloatingGhost a6a5f03966 make emoji reactions in notifications bar wider 2022-12-01 15:21:29 -05:00
Sol Fisher Romanoff 83fa4ad4a7 Highlight emoji reactions picked by yourself 2022-12-01 15:21:28 -05:00
FloatingGhost 0ab60d63ef fix "who reacted" emoji display
fixes #80
2022-12-01 15:21:28 -05:00
eris 788691b296 Better formatting for emoji react notifications 2022-12-01 15:21:28 -05:00
FloatingGhost fc7cdb1e69 fix css 2022-12-01 14:23:03 -05:00
FloatingGhost 44047458e4 add custom emoji display 2022-12-01 14:22:14 -05:00
Sol Fisher Romanoff c27845169d Add emoji name as title tag 2022-12-01 14:18:49 -05:00
sadposter 378ac642d4 fix width 2022-12-01 14:17:55 -05:00
FloatingGhost 23b60e9263 fix emoji sizing 2022-12-01 14:17:12 -05:00
FloatingGhost e1785d2d91 force width 2022-12-01 14:15:23 -05:00
FloatingGhost 3cc6a0b252 allow custom reactions 2022-12-01 14:15:03 -05:00
FloatingGhost 710891d1f3 allow customs 2022-12-01 14:13:57 -05:00
Zero 69671446e5 Add more default reacts 2022-02-23 16:00:03 -05:00
Sam Therapy d8ec9f596d Add a super basic keep reaction open button
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2022-02-19 19:02:39 -05:00
Zero df8bf08f46 Revert "entity_normalizer: Escape name when parsing user"
This reverts commit e32ae82441.
2022-02-19 18:16:11 -05:00
Sam Therapy 2d43adb6e5 Change default emoji reacts Why
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2022-02-19 17:44:18 -05:00
Tusooa Zhu 58cd2fb994 Fix Follow button missing on follow list 2022-02-05 16:08:34 -05:00
Zero e32ae82441 entity_normalizer: Escape name when parsing user
In January 2020 Pleroma backend stopped escaping HTML in display names
and passed that responsibility on frontends, compliant with Mastodon's
version of Mastodon API [1]. Pleroma-FE was subsequently modified to
escape the display name [2], however only in the "name_html" field. This
was fine however, since that's what the code rendering display names used.

However, 2 months ago an MR [3] refactoring the way the frontend does emoji
and mention rendering was merged. One of the things it did was moving away
from doing emoji rendering in the entity normalizer and use the unescaped
'user.name' in the rendering code, resulting in HTML injection being
possible again.

This patch escapes 'user.name' as well, as far as I can tell there is no
actual use for an unescaped display name in frontend code, especially
when it comes from MastoAPI, where it is not supposed to be HTML.

d36b45ad43
2022-01-26 20:07:11 -05:00
Zero 0f5e601db2 Revert "Fix sidebar scroll height"
This reverts commit fbd9ee03c4.
2022-01-26 18:26:55 -05:00
Zero 9c827c9834 Revert "Add timeline menu toggle to nav panel"
This reverts commit 98cb9abac7.
2022-01-26 15:54:29 -05:00
Zero 7622b1230f Simple policy reasons for instance specific policies
a20f1794d0
2022-01-26 09:45:48 -05:00
Ilja 84ce0046f9 Improve the user card for deactivated users 2022-01-25 15:49:18 -05:00
Zero fbd9ee03c4 Fix sidebar scroll height 2022-01-25 15:14:23 -05:00
Zero 387958c7f1 Remove annoying error messages lole 2022-01-25 15:14:02 -05:00
Zero 51cb9b5c8f Change some default strings 2022-01-25 15:13:31 -05:00
Zero 16772d75f7 Add puniko's third column w/ compatibility for right sidebar 2022-01-25 15:12:40 -05:00
Ilja 241d520795 Allow canceling a follow request
When a follow request is sent, but not (yet) accepted, the behaviour is now to cancel the request instead of re sending.

The reason is double
* You couldn't cancel a follow request if you change your mind and the request wasn't answered yet
* Instances don't always correctly process a new follow request when the following is already happening. If something went wrong (e;g. the target server thinks you're following, but your instance thinks you're not yet), it's better to first sent an unfollow. This is the behaviour that Mastodon and most probably most other clients have. Therefore this flow is more tested and expected by other instances.
2022-01-25 15:11:19 -05:00
Henry Jameson 2ce47e8cf0 fix ext profile bug 2022-01-25 15:03:31 -05:00
Shpuld Shpludson 425919a0d2 Merge branch 'fix-themes-select' into 'develop'
Fix theme select not working

See merge request pleroma/pleroma-fe!1393
2021-07-19 18:33:19 +00:00
HJ ba961b784f Apply 1 suggestion(s) to 1 file(s) 2021-07-19 17:10:13 +00:00
Shpuld Shpludson 891611816c Merge branch 'editProfile' into 'develop'
Minor change: Add edit profile button onto self user card

See merge request pleroma/pleroma-fe!1398
2021-07-19 16:35:28 +00:00
Shpuld Shpludson 373b14e1e4 Merge branch 'fix-settings-anon' into 'develop'
Fix Boolean/Choice settings not working properly on initial launch

See merge request pleroma/pleroma-fe!1389
2021-07-19 16:11:11 +00:00
Eris cd9dd352e3 Fix follow request count position on mobile 2021-06-20 06:27:32 +00:00
Eris 85e2f8f78c Don't show profile edit button in sidebar 2021-06-17 20:57:23 +00:00
eris b2ebfc1fd6 Merge branch 'develop' into 'editProfile'
# Conflicts:
#   CHANGELOG.md
2021-06-17 19:35:09 +00:00
Eris e1361a1cae Add edit profile button 2021-06-17 19:29:58 +00:00
Eris d7a53aec61 Use proper setting name 2021-06-15 18:09:00 +00:00
Eris 7e3393b5a2 Use cleaner instance config check for shoutbox setting 2021-06-15 00:59:36 +00:00
Eris 5047663c51 Make locale language cleaner 2021-06-15 00:25:09 +00:00
Eris cbccea0546 Don't shorten shoutbox to SB 2021-06-14 20:33:51 +00:00
Eris 1668315bf8 Fix lint error 2021-06-14 20:02:13 +00:00
Eris 0c10145242 New option: Hide shoutbox 2021-06-14 19:42:56 +00:00
Henry Jameson 63c22ad131 Fixed mergedConfig misbehaving on first boot 2021-06-14 10:58:32 +03:00
Henry Jameson 38d9ea8b17 lint 2021-06-08 00:09:16 +03:00
Henry Jameson 59d046b163 fix theme selection not working 2021-06-07 23:48:46 +03:00
Mark Felder bd98ecb3f0 Remove unused shoutbox channel state from side drawer 2021-06-03 15:07:02 -05:00
Mark Felder 21477d07e9 This setting didn't actually do anything 2021-06-01 16:51:47 -05:00
Mark Felder ed824d964e Use old value to discover if Shoutbox is available until we ship a new release that's declaring the feature as "shout" 2021-06-01 16:48:40 -05:00