sjw/pleroma-fe
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma-fe.git synced 2025-01-21 02:20:29 +01:00
Code Issues Releases Wiki Activity
6,356 Commits 159 Branches 3 Tags
Commit Graph

6356 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Your New SJW Waifu
0e5290334a Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-01-23 11:19:15 -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
Your New SJW Waifu
9f2316d02a update email 2022-01-13 12:26:16 -06:00
Your New SJW Waifu
b8558418fe fix typo 2022-01-13 12:20:32 -06:00
Your New SJW Waifu
facbcb834d update privacy policy and tos 2022-01-13 12:17:22 -06:00
Your New SJW Waifu
1ad764cb9f no more snow 2022-01-13 11:42:28 -06:00
Your New SJW Waifu
aa7ae519af Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-01-13 11:41:36 -06: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
Your New SJW Waifu
40ed0d9403 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-12-30 10:40:08 -06:00
Your New SJW Waifu
0ad5d85b22 Christmas is over 2021-12-30 10:39:33 -06:00
Your New SJW Waifu
58a07f897d Add new Baest banner by @neko@bae.st 2021-12-30 10:38:10 -06: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
Your New SJW Waifu
2079be9ec3 update sidebar 2021-12-14 10:46:49 -06:00
Your New SJW Waifu
1354585860 It is christmas my dudes 2021-12-14 10:18:12 -06:00
Your New SJW Waifu
07c6849b49 new location and shell 2021-12-14 08:07:51 -06:00
Your New SJW Waifu
0b4ecbec12 Christmas time 2021-12-14 08:02:26 -06:00
Your New SJW Waifu
5834d5f596 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-12-14 06:57:49 -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
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
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
Your New SJW Waifu
42b2a16206 new banner 2021-11-08 10:57:49 -06: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
Your New SJW Waifu
babdd5e013 spookt 2021-10-01 10:08:55 -05:00
Your New SJW Waifu
fb698ff9e3 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-10-01 10:01:53 -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
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
Hồ Nhất Duy
3c8ced53b9 Translated using Weblate (Vietnamese) 
Currently translated at 100.0% (722 of 722 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/vi/
 2021-09-09 22:00:26 +00:00
Ben Is
80dd6b2500 Translated using Weblate (Italian) 
Currently translated at 100.0% (722 of 722 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
 2021-09-09 22:00:26 +00:00
Hồ Nhất Duy
ad64b91d66 Translated using Weblate (Vietnamese) 
Currently translated at 100.0% (716 of 716 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/vi/
 2021-09-09 22:00:26 +00:00
@liimee
4988268f5f Translated using Weblate (Indonesian) 
Currently translated at 67.5% (484 of 716 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
 2021-09-09 22:00:26 +00:00
Ben Is
50adf0ddf2 Translated using Weblate (Italian) 
Currently translated at 100.0% (716 of 716 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
 2021-09-09 22:00:26 +00: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
Your New SJW Waifu
d55bed41bf Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-09-09 10:48:20 -05: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
1c53528433 Merge branch 'fix-favico-badge-chrome' into 'develop' 
fix favico badge not working on chrome

See merge request pleroma/pleroma-fe!1391
 2021-09-07 16:17:31 +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
Your New SJW Waifu
ca121ba22e 9/11 banner 2021-09-07 09:46:17 -05:00
Your New SJW Waifu
3971940a17 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-09-07 09:42:30 -05:00