puniko/pleroma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Projects Releases Packages Wiki Activity
5757 commits 4 branches 24 tags 16 MiB
Commit graph

5757 commits

This branch
This branch
All branches
Author SHA1 Message Date
HJ
d3659b5597 Merge branch 'fix-1133' into 'develop' 
fix #1133

Closes #1133

See merge request pleroma/pleroma-fe!1434
 2022-02-20 14:12:20 +00:00
Henry Jameson
373c30be69 fix #1133 2022-02-20 16:06:26 +02:00
HJ
8ade11783a Merge branch 'from/develop/tusooa/1118-enhanced-mention-link' into 'develop' 
Enhanced mention link

Closes #1118

See merge request pleroma/pleroma-fe!1424
 2022-02-03 19:37:13 +00:00
HJ
a5e20a4eb2 Merge branch 'from/develop/tusooa/fix-follow-list' into 'develop' 
Fix Follow button missing on follow list

See merge request pleroma/pleroma-fe!1428
 2022-02-03 10:22:22 +00:00
HJ
dd75e43c57 Merge branch 'from/develop/tusooa/fix-lint-warn' into 'develop' 
Fix lint warning in filtering_tab.vue

See merge request pleroma/pleroma-fe!1429
 2022-02-03 10:22:04 +00:00
Tusooa Zhu
0e6af68a0f
Fix lint warning in filtering_tab.vue 2022-02-02 21:35:17 -05:00
Tusooa Zhu
f886135bb7
Fix Follow button missing on follow list 2022-02-02 21:30:52 -05:00
Tusooa Zhu
c3f1765b21
Hide mention link avatar by default 2022-01-29 16:57:59 -05:00
Tusooa Zhu
7cc0d0763c
Add English translation for mention link prefs 2022-01-29 16:57:59 -05:00
Tusooa Zhu
c8983d5606
Make mention link prefs ui more intuitive 2022-01-29 16:57:59 -05:00
Tusooa Zhu
0c60b31eee
Add option to fade domains in mention link 2022-01-29 16:57:59 -05:00
Tusooa Zhu
aaf0b985ad
Make avatar unselectable 2022-01-29 16:57:59 -05:00
Tusooa Zhu
9fde13c968
Add option to display user avatar in mention link 2022-01-29 16:57:59 -05:00
Tusooa Zhu
8896afd8d8
Make (You) unselectable 2022-01-29 16:57:59 -05:00
Tusooa Zhu
95007059d1
Style properly usernames without tooltips 2022-01-29 16:57:59 -05:00
Tusooa Zhu
1d4b1b296e
Add pref for whether to display full user names and tooltips 2022-01-29 16:57:59 -05:00
Tusooa Zhu
76547fe66d
Add a pref for whether to display mention as icon or text 2022-01-29 16:57:59 -05:00
HJ
28ee5721bb Merge branch 'hj-develop-patch-16931' into 'develop' 
Update CHANGELOG.md

See merge request pleroma/pleroma-fe!1427
 2022-01-24 19:31:42 +00:00
HJ
e5f731c97d Update CHANGELOG.md 2022-01-24 19:29:01 +00:00
HJ
3cf7f9e3c8 Merge branch 'settings-and-filtering' into 'develop' 
Settings rearrange and filtering improvements

See merge request pleroma/pleroma-fe!1394
 2022-01-24 18:18:27 +00:00
Henry Jameson
f7e2ac1c48 undo accidental change when merging 2022-01-24 19:16:03 +02:00
Henry Jameson
2f8aae371b Merge remote-tracking branch 'origin/settings-and-filtering' into settings-and-filtering 
* origin/settings-and-filtering:
  Apply 1 suggestion(s) to 1 file(s)
 2022-01-24 19:13:29 +02:00
Henry Jameson
9ea0f10abb Merge remote-tracking branch 'origin/develop' into settings-and-filtering 
* origin/develop: (169 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:12:17 +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
af2a408b78 Apply 1 suggestion(s) to 1 file(s) 2022-01-09 17:59:50 +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