Henry Jameson
c551e3e697
Merge remote-tracking branch 'origin/develop' into proper-attachments
...
* origin/develop: (81 commits)
Improve the user card for deactivated users
Update CHANGELOG.md
Update CHANGELOG.md
Allow canceling a follow request
Simple policy reasons for instance specific policies
entity_normalizer: Escape name when parsing user
Translated using Weblate (Spanish)
Translated using Weblate (Catalan)
Translated using Weblate (Korean)
Translated using Weblate (Japanese (ja_PEDANTIC))
Translated using Weblate (Indonesian)
Translated using Weblate (Esperanto)
Translated using Weblate (Vietnamese)
Translated using Weblate (Italian)
Translated using Weblate (Vietnamese)
Translated using Weblate (Indonesian)
Translated using Weblate (Italian)
Translated using Weblate (Vietnamese)
Translated using Weblate (Indonesian)
Translated using Weblate (Chinese (Simplified))
...
2022-01-24 19:28:38 +02: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
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
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
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
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
HJ
59bab829a6
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma-fe!1412
2021-09-05 12:31:23 +00:00
Hồ Nhất Duy
13468f2a89
Translated using Weblate (Vietnamese)
...
Currently translated at 50.0% (358 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/vi/
2021-09-05 04:46:01 +00:00
@liimee
5bb471a68e
Translated using Weblate (Indonesian)
...
Currently translated at 67.3% (482 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
2021-09-05 04:45:45 +00:00
Kana
ff5ed29ec1
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 100.0% (716 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
2021-09-05 04:45:43 +00:00
tarteka
fa75a3a615
Translated using Weblate (Basque)
...
Currently translated at 80.7% (578 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eu/
2021-09-05 04:45:43 +00:00
HJ
057e3dac85
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma-fe!1388
2021-09-02 16:58:11 +00:00
Hồ Nhất Duy
6e57170626
Added translation using Weblate (Vietnamese)
2021-09-02 14:47:32 +00:00
@liimee
98da3ad124
Translated using Weblate (Indonesian)
...
Currently translated at 60.6% (434 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
2021-08-30 15:24:16 +00:00
@liimee
144cee6d34
Translated using Weblate (Indonesian)
...
Currently translated at 58.6% (420 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
2021-08-30 15:24:16 +00:00
tarteka
0543c8d536
Translated using Weblate (Basque)
...
Currently translated at 80.4% (576 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eu/
2021-08-30 15:24:16 +00:00
marcin mikołajczak
9319666f04
Translated using Weblate (Polish)
...
Currently translated at 98.8% (708 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pl/
2021-08-30 15:24:16 +00:00
@liimee
ca9652b30b
Translated using Weblate (Indonesian)
...
Currently translated at 56.9% (408 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
2021-08-30 15:24:16 +00:00
tarteka
21af736fe1
Translated using Weblate (Basque)
...
Currently translated at 79.8% (572 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eu/
2021-08-30 15:24:16 +00:00
tarteka
78ba8be969
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (716 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
2021-08-30 15:24:16 +00:00
@liimee
29f229daad
Translated using Weblate (Indonesian)
...
Currently translated at 50.1% (359 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
2021-08-30 15:24:16 +00:00
marcin mikołajczak
5049ee575f
Translated using Weblate (Polish)
...
Currently translated at 98.7% (707 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pl/
2021-08-30 15:24:16 +00:00
tarteka
32ed71501a
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (716 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
2021-08-30 15:24:16 +00:00
@liimee
a7a736c7b8
Added translation using Weblate (Indonesian)
2021-08-30 15:24:16 +00:00
tarteka
5cbb71e588
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (716 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
2021-08-30 15:24:16 +00:00