sadposter
238ebcf1e4
remove svg
2021-11-20 14:38:01 +00:00
sadposter
b141b04a53
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into develop
2021-11-19 13:48:39 +00:00
rinpatch
d36b45ad43
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.
[1]: https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1052
[2]: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2167
[3]: https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1392
2021-11-16 20:35:23 +03:00
HJ
370f1e55ad
Merge branch 'develop' into 'themeApply'
...
# Conflicts:
# CHANGELOG.md
2021-09-09 21:51:39 +00:00
HJ
a8a82ad12f
Merge branch 'showMobileNewPost' into 'develop'
...
New user option: Always show floating New Post button
See merge request pleroma/pleroma-fe!1395
2021-09-09 12:19:53 +00:00
HJ
8af1f08539
Merge branch 'better-still-emoji' into 'develop'
...
Status HTML parsing - better emoji and mentions rendering
Closes #935
See merge request pleroma/pleroma-fe!1392
2021-09-07 16:15:41 +00:00
Shpuld Shpludson
25a8b48bf2
Merge branch 'from/develop/tusooa/fix-mobile-shoutbox-display' into 'develop'
...
Fix mobile shoutbox display
See merge request pleroma/pleroma-fe!1404
2021-09-07 14:46:39 +00:00
sadposter
e5db1a7e55
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
2021-08-30 22:07:05 +01:00
Henry Jameson
4d73eaa6ce
fix spacing before hashtags
2021-08-23 21:36:18 +03:00
Henry Jameson
39494439d3
very minimalist hashtaglink implementation, also you can middle-click
...
mentions now.
2021-08-23 20:57:21 +03:00
Henry Jameson
cbb34e2b0e
fix expanded mentions spacing
2021-08-18 20:58:26 +03:00
Henry Jameson
e98a2af39e
hopefully final fix for spacings
2021-08-18 20:54:04 +03:00
Henry Jameson
dbdc5e050f
fix ext profile bug
2021-08-16 01:41:52 +03:00
Henry Jameson
0087d33c75
fix "+X more" sticking
2021-08-15 18:41:13 +03:00
Henry Jameson
8cc1ad67df
fix links sticking to mentionsline
2021-08-15 18:11:38 +03:00
Henry Jameson
68b4323181
prevent infinite update loops
2021-08-15 02:55:45 +03:00
Henry Jameson
530ac4442b
removed useless code, review change, fixed bug with tall statuses
2021-08-15 02:41:53 +03:00
Henry Jameson
4465de5241
fixed mentions line again
2021-08-14 22:03:09 +03:00
Henry Jameson
4c974f5ca2
richcontent support in polls, user cards and user profiles
2021-08-13 13:06:42 +03:00
Henry Jameson
6c6df29ed3
support richcontent in polls
2021-08-13 12:19:57 +03:00
Henry Jameson
add5921b8b
fix tests, add performance test (skipped, doesn't assert anything),
...
tweak max mentions count
2021-08-12 19:37:04 +03:00
Henry Jameson
2182af4058
made the code responsible for showing unwritten mentions actually work
2021-08-12 03:09:28 +03:00
Henry Jameson
2cfff1b8b9
remove new options for style and separate line, now groups all chained
...
mentions on a mentionsline regardless of placement. fixes spacing
2021-08-12 02:56:40 +03:00
sadposter
feb7090cde
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
2021-08-05 12:59:18 +01:00
Tusooa Zhu
ef277ae4e2
Fix mobile shoutbox
2021-08-03 20:11:06 -04:00
f35e3d0f3f
Fix merge conflict in CHANGELOG
...
# Conflicts:
# CHANGELOG.md
2021-07-22 20:47:36 +00:00
179af131ee
Fix changelog merge conflict
...
# Conflicts:
# CHANGELOG.md
2021-07-22 20:46:41 +00: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
9cea1bc08c
fix preset
2021-07-01 16:47:16 +01:00
sadposter
d49434a799
add stuff
2021-07-01 16:06:59 +01:00
sadposter
214d85189c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
2021-06-25 10:07:29 +01:00
Henry Jameson
a258182522
fix non-notifying mentions and original mention display
2021-06-22 20:16:26 +03:00
6125dc885a
Update for latest develop merges to CHANGELOG
2021-06-20 21:06:59 +00:00
cd9dd352e3
Fix follow request count position on mobile
2021-06-20 06:27:32 +00:00
Henry Jameson
c6831a3810
fix not escaping some stuff
2021-06-18 21:42:46 +03:00
Henry Jameson
b68fb7738b
Merge remote-tracking branch 'origin/develop' into better-still-emoji
...
* origin/develop:
Use proper setting name
Use cleaner instance config check for shoutbox setting
Make locale language cleaner
Don't shorten shoutbox to SB
Fix lint error
Update CHANGELOG.md
New option: Hide shoutbox
2021-06-18 02:27:57 +03:00
85e2f8f78c
Don't show profile edit button in sidebar
2021-06-17 20:57:23 +00:00
b2ebfc1fd6
Merge branch 'develop' into 'editProfile'
...
# Conflicts:
# CHANGELOG.md
2021-06-17 19:35:09 +00:00
e1361a1cae
Add edit profile button
2021-06-17 19:29:58 +00:00
Henry Jameson
1717a3aaf2
fix chats again
2021-06-16 12:44:04 +03:00
Henry Jameson
ad3a2fd4e5
fixed "invisible" spans inside links
2021-06-16 01:20:20 +03:00
139a0d1562
Merge branch 'develop' into 'themeApply'
...
# Conflicts:
# CHANGELOG.md
2021-06-15 21:50:39 +00:00
cab0095989
Merge branch 'develop' into 'showMobileNewPost'
...
# Conflicts:
# CHANGELOG.md
# src/App.js
2021-06-15 21:49:33 +00:00
d7a53aec61
Use proper setting name
2021-06-15 18:09:00 +00:00
Henry Jameson
4aac0125e5
fixed bug with hashtags
2021-06-15 14:43:44 +03:00
7e3393b5a2
Use cleaner instance config check for shoutbox setting
2021-06-15 00:59:36 +00:00
5047663c51
Make locale language cleaner
2021-06-15 00:25:09 +00:00
