462f50e9db
Add "deactivated user" card
...
https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1417
2021-12-18 15:02:22 -06:00
86fee257a2
Change panel & terms of service
...
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2021-12-03 13:51:17 -06:00
55686addf1
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into froth
2021-12-03 13:39:49 -06:00
HJ
a20f1794d0
Merge branch 'simplePolicy_reasons_for_instance_specific_policies' into 'develop'
...
Simple policy reasons for instance specific policies
See merge request pleroma/pleroma-fe!1263
2021-12-03 18:14:32 +00:00
Ilja
b4cfda4a20
Simple policy reasons for instance specific policies
2021-12-03 18:14:32 +00:00
56f0c66f78
Merge branch 'froth' of git.freecumextremist.com:NotSam/pleroma-fe into froth
2021-11-23 07:53:51 -06:00
574d5d2897
make fullscreen not default
...
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2021-11-23 07:53:34 -06:00
132db595f4
Add default option back to prevent default looking weird
...
Signed-off-by: Not Sam <sam@samtherapy.net>
2021-11-20 13:21:00 -05:00
5333a6b6f2
move follow req button position
...
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2021-11-19 17:19:35 -06:00
25f124bade
make fullscreen default
...
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2021-11-19 16:46:05 -06:00
d21a9c8d15
change instance PNG
...
Make it vibrate MORE
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2021-11-19 16:32:31 -06:00
a46c02ecf5
add neko's changes
2021-11-19 16:31:08 -06:00
d02fb77e07
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into froth
...
yay bugfixes
2021-11-16 14:01:17 -06:00
HJ
ea0887a15e
Merge branch 'fix/escape-display-name' into 'develop'
...
entity_normalizer: Escape name when parsing user
See merge request pleroma/pleroma-fe!1415
2021-11-16 17:45:14 +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
c3a004df11
Fix double option
...
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2021-11-14 15:25:19 -06:00
2e959c53d2
Merge branch 'froth-puni' into 'froth'
...
Use Puniko's fork as a base
See merge request SamTherapy/pleroma-fe!1
2021-10-29 00:43:35 +00:00
0f2a8c69a9
Make media modal be aware of multi-touch actions
...
Originally the media viewer would think every touch is a swipe (one-finger
touch event), so we would encounter the case where a two-finger scale event
would incorrectly change the current media. This is now fixed.
2021-10-29 00:43:35 +00:00
0b5102104d
animate favicon
...
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2021-10-28 12:47:07 -05:00
5cc74214e6
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into froth
2021-10-28 12:40:27 -05:00
HJ
694c3ffec2
Merge branch 'simplePolicy_reasons_for_instance_specific_policies' into 'develop'
...
Simple policy reasons for instance specific policies
See merge request pleroma/pleroma-fe!1263
2021-10-22 15:19:26 +00:00
0ab3e10858
fix TOS
...
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2021-10-02 00:07:51 -05:00
bf5ce3f6f4
add a real TOS
...
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2021-10-01 15:01:51 -05:00
f333834614
s/shoutbox/frothbox
...
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2021-10-01 13:41:57 -05:00
0a4c8ead5c
change favicon to new one
...
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2021-10-01 13:13:45 -05:00
ba8bfd5b26
add a newline
...
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2021-09-30 21:35:52 -05:00
822f17d7a3
add a basic welcome message
...
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2021-09-30 21:23:21 -05:00
fa5c43a1c6
update links to the new instance
...
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2021-09-30 20:17:45 -05:00
d138c05851
s/king/queen
...
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2021-09-30 19:56:43 -05:00
8571de542e
Fix inconsitency in edit
...
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2021-09-21 09:39:39 -05:00
af3d89029b
change favicon
2021-09-12 16:18:23 -05:00
4699e5ca99
add syntax to list
2021-09-12 11:28:20 -05:00
be0721e031
Add mods as submodules
2021-09-12 10:44:46 -05:00
1c2d732628
add build script to gitignore
2021-09-12 09:36:02 -05:00
a8cc35092b
fix panel hehe
2021-09-12 09:32:02 -05:00
909e8ee054
Merge branch 'develop' of upstream into develop
2021-09-12 08:56:40 -05:00
3dbcb1b939
Add BloatFE
2021-09-12 08:56:01 -05:00
HJ
ef5bbc4e5f
Merge branch 'themeApply' into 'develop'
...
Minor QOL improvement: Theme tab Apply and Reset buttons shouldn't require scrolling
See merge request pleroma/pleroma-fe!1397
2021-09-09 22:00:20 +00: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
fd3f57ad3f
Merge branch 'develop' of upstream into develop
2021-09-07 16:05:01 -05:00
Henry Jameson
a39ee69901
handle multiple favicons (different sizes)
2021-09-07 16:03:21 -05:00
Henry Jameson
86ac773c56
fix favico badge not working on chrome
2021-09-07 16:03:21 -05:00
Henry Jameson
0645d06f91
fix spacing before hashtags
2021-09-07 16:03:21 -05:00
Henry Jameson
88b81dcaf5
very minimalist hashtaglink implementation, also you can middle-click
...
mentions now.
2021-09-07 16:03:21 -05:00
Henry Jameson
04af3e94e1
fix tests
2021-09-07 16:03:21 -05:00
Henry Jameson
3a7dc2c4c3
fix expanded mentions spacing
2021-09-07 16:03:20 -05:00
Henry Jameson
b198271f9f
hopefully final fix for spacings
2021-09-07 16:03:20 -05:00
Henry Jameson
4200f0029d
fix "+X more" sticking
2021-09-07 16:03:20 -05:00
Henry Jameson
79e00cce6d
fix links sticking to mentionsline
2021-09-07 16:03:20 -05:00
