Commit graph

21 commits

Author SHA1 Message Date
HJ
9725443e60 Revert "Merge branch 'revert-a88abc7e' into 'develop'"
This reverts merge request !1526
2022-05-22 16:40:59 +00:00
HJ
069cf3fa87 Revert "Merge branch 'from/develop/tusooa/lang-opts' into 'develop'"
This reverts merge request !1494
2022-05-22 16:38:09 +00:00
HJ
a88abc7ee3 Merge branch 'from/develop/tusooa/lang-opts' into 'develop'
Add language options

See merge request pleroma/pleroma-fe!1494
2022-05-22 16:35:51 +00:00
29b084b4b8 Pass file name of cropped avatar to form data 2022-05-21 19:44:44 +03:00
Tusooa Zhu
3633ea66d4
Make lint happy 2022-04-29 20:34:32 -04:00
Tusooa Zhu
d39de30221
Add config opts for email language 2022-04-29 20:34:31 -04:00
Henry Jameson
9c1814d122 expert settings toggle + server-side settings 2022-02-22 23:31:40 +02: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
Shpuld Shpuldson
4dde9c4d52 refactor error handling in profile tab 2020-12-02 12:46:31 +02:00
Shpuld Shpuldson
0f386ccbc7 use users state + fetching with delay 2020-11-18 18:43:24 +02:00
Henry Jameson
a50cd7e37d remaining changes... 2020-10-21 00:01:28 +03:00
Henry Jameson
b19c2eb0fb More stuff. Buttons in user card's corner now have MUCH bigger hitboxes 2020-10-20 22:13:19 +03:00
Henry Jameson
046c60cb61 cancel -> times 2020-10-20 21:18:23 +03:00
Shpuld Shpludson
eea002e6f5 streamline profile image api, update reset ui for all profile images to match avatar, remove unnecessary stuff 2020-07-08 10:11:17 +00:00
Shpuld Shpludson
ea0a12f604 Merge branch 'develop' into 'iss-149/profile-fields-setting'
# Conflicts:
#   src/components/settings_modal/tabs/profile_tab.vue
2020-06-27 07:19:49 +00:00
Sergey Suprunenko
2451956d83
Add 'bot' flag to Profile settings 2020-06-21 14:59:05 +02:00
kPherox
bad3dacfac
implement user suggestor for profile fields 2020-06-19 21:18:36 +09:00
kPherox
54fdc22001
Add profile fields form 2020-06-10 03:37:58 +09:00
Henry Jameson
e7ba4255bb eslint --fix + small fix 2020-05-25 03:43:55 +03:00
Henry Jameson
138ec85003 Merge remote-tracking branch 'origin/develop' into settings-modal
* origin/develop: (95 commits)
  Translated using Weblate (Italian)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Russian)
  Translated using Weblate (Polish)
  Translated using Weblate (Dutch)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  ...
2020-05-25 03:29:48 +03:00
Henry Jameson
bcebec478e moved stuff from settings, cleaned up naming for tabs, added close and peek 2020-05-10 06:46:06 +03:00
Renamed from src/components/settings_modal/tabs/profile.js (Browse further)