sam/pleroma-fe
sam/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
5920 commits 3 branches 15 tags 109 MiB
Commit graph

5920 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Therapy
3f113d3a69
Remove ruffle 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2022-01-22 11:17:33 -06:00
Sam Therapy
ef7c024b84
Change git URL 2022-01-19 12:57:21 -06:00
Sam Therapy
325aab5e2a
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into froth 2022-01-19 12:55:58 -06:00
HJ
182fcca5da Merge branch 'weblate-pleroma-pleroma-fe' into 'develop' 
Translations update from Weblate

See merge request pleroma/pleroma-fe!1413
 2022-01-19 13:10:16 +00:00
HJ
6509542dbd Merge branch 'fixes_for_deactivated_profile' into 'develop' 
Improve the user card for deactivated users

See merge request pleroma/pleroma-fe!1417
 2022-01-19 13:09:49 +00:00
Ilja
2ac78219ee Improve the user card for deactivated users 2022-01-19 13:09:48 +00:00
Shpuld Shpludson
756f7bf7c2 Merge branch 'shpuld-develop-patch-58245' into 'develop' 
Update CHANGELOG.md

See merge request pleroma/pleroma-fe!1423
 2022-01-09 18:29:46 +00:00
Shpuld Shpludson
4cd27acf7f Update CHANGELOG.md 2022-01-09 18:26:35 +00:00
Shpuld Shpludson
030c374def Merge branch 'shpuld-develop-patch-87791' into 'develop' 
Update CHANGELOG.md

See merge request pleroma/pleroma-fe!1422
 2022-01-09 18:21:14 +00:00
Shpuld Shpludson
056f5f547a Update CHANGELOG.md 2022-01-09 18:16:44 +00:00
HJ
d22e04eaf6 Merge branch 'allow_to_cancel_follow_request' into 'develop' 
Allow canceling a follow request

See merge request pleroma/pleroma-fe!1416
 2021-12-28 11:43:24 +00:00
Sam Therapy
459e047419
Make follow requests cancel by default when clicking them twice 
https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1416
 2021-12-18 15:03:25 -06:00
Sam Therapy
462f50e9db
Add "deactivated user" card 
https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1417
 2021-12-18 15:02:22 -06:00
Ilja
4587f37dd7 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.
 2021-12-12 18:09:21 +01:00
Sam Therapy
86fee257a2
Change panel & terms of service 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2021-12-03 13:51:17 -06:00
Sam Therapy
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
Sam Therapy
56f0c66f78
Merge branch 'froth' of git.freecumextremist.com:NotSam/pleroma-fe into froth 2021-11-23 07:53:51 -06:00
Sam Therapy
574d5d2897
make fullscreen not default 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2021-11-23 07:53:34 -06:00
Not Sam
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
Sam Therapy
5333a6b6f2
move follow req button position 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2021-11-19 17:19:35 -06:00
Sam Therapy
25f124bade
make fullscreen default 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2021-11-19 16:46:05 -06:00
Sam Therapy
d21a9c8d15
change instance PNG 
Make it vibrate MORE

Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2021-11-19 16:32:31 -06:00
Sam Therapy
a46c02ecf5
add neko's changes 2021-11-19 16:31:08 -06:00
Sam Therapy
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
Sam Therapy
c3a004df11
Fix double option 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2021-11-14 15:25:19 -06:00
Sam Therapy
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
Sam Therapy
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
Sam Therapy
0b5102104d
animate favicon 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2021-10-28 12:47:07 -05:00
Sam Therapy
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
tarteka
d2730d5bad Translated using Weblate (Spanish) 
Currently translated at 100.0% (722 of 722 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
 2021-10-21 19:22:22 +00:00
Sam Therapy
0ab3e10858
fix TOS 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2021-10-02 00:07:51 -05:00
Sam Therapy
bf5ce3f6f4
add a real TOS 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2021-10-01 15:01:51 -05:00
Sam Therapy
f333834614
s/shoutbox/frothbox 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2021-10-01 13:41:57 -05:00
Sam Therapy
0a4c8ead5c
change favicon to new one 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2021-10-01 13:13:45 -05:00
Sam Therapy
ba8bfd5b26
add a newline 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2021-09-30 21:35:52 -05:00
Sam Therapy
822f17d7a3
add a basic welcome message 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2021-09-30 21:23:21 -05:00
Sam Therapy
fa5c43a1c6
update links to the new instance 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2021-09-30 20:17:45 -05:00
Sam Therapy
d138c05851
s/king/queen 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2021-09-30 19:56:43 -05:00
retiolus
1c75c74c91 Translated using Weblate (Catalan) 
Currently translated at 99.7% (720 of 722 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ca/
 2021-09-29 00:45:54 +00:00
Sam Therapy
8571de542e
Fix inconsitency in edit 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2021-09-21 09:39:39 -05:00
Ryo Ueno
ef684dff61 Translated using Weblate (Korean) 
Currently translated at 61.9% (447 of 722 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
 2021-09-19 09:45:49 +00:00
Ryo Ueno
241b4957e1 Translated using Weblate (Japanese (ja_PEDANTIC)) 
Currently translated at 99.4% (718 of 722 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
 2021-09-19 09:45:49 +00:00
@liimee
45eda03d1c Translated using Weblate (Indonesian) 
Currently translated at 68.1% (492 of 722 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
 2021-09-16 00:45:47 +00:00
Tirifto
1d0e4bada8 Translated using Weblate (Esperanto) 
Currently translated at 100.0% (722 of 722 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
 2021-09-14 15:45:47 +00:00
Sam Therapy
af3d89029b
change favicon 2021-09-12 16:18:23 -05:00