コミットグラフ

180 コミット

作成者 SHA1 メッセージ 日付
Alexander Tumin 998aa8f732 Allow custom emoji reactions 2023-03-17 20:28:16 +03:00
tusooa b1e75c25bd
Merge remote-tracking branch 'upstream/develop' into birthdays 2023-01-22 09:34:01 -05:00
Ilja 5541d0ec29 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into fine_grained_moderation_privileges 2022-09-24 15:56:27 +02:00
tusooa 2bea5d8128 Merge branch 'add/edit-status' into 'develop'
Add edit status functionality

See merge request pleroma/pleroma-fe!1537
2022-09-11 18:08:00 +00:00
tusooa 8b25febe36 Merge branch 'navigation-update' into 'develop'
Navigation update + preferences storage (and some minor fixes)

See merge request pleroma/pleroma-fe!1592
2022-08-30 00:14:30 +00:00
Tusooa Zhu 0a79a74773
Use dedicated indicator for non-ascii domain names 2022-08-29 18:46:41 -04:00
Sean King ee58e3868c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into add/edit-status 2022-08-22 19:08:58 -06:00
Henry Jameson 50f5afbce1 add and remove users to/from lists from their profile 2022-08-15 23:19:33 +03:00
Henry Jameson 8d3d8fffab fixes, clear cache on logout 2022-08-12 01:19:19 +03:00
HJ 750696643f Merge branch 'feat/report-notification' into 'develop'
#949 Feat/report notification

See merge request pleroma/pleroma-fe!1322
2022-08-09 21:56:15 +00:00
Sean King 470654d275
Update fallback privileges for moderators to include reports_manage_reports 2022-08-07 01:20:49 -06:00
Sean King dc9951d400
Fix merge conflicts 2022-08-06 22:02:21 -06:00
Ilja 0d714f07ec Add priviliges
We can now check what priviliges someone has besides only the role.
On older back-ends, privileges aren't provided, so we have a fall-back to list the privileges corresponding to what mods/admins are allowed on older BE's.
2022-08-06 12:01:13 +02:00
marcin mikołajczak 6649baaac9 Merge remote-tracking branch 'pleroma/develop' into birthdays
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-05 11:53:44 +02:00
Henry Jameson dbfca224d8 server-side storage for flags 2022-08-04 01:56:52 +03:00
Sean King 232cc72df8
Fix lint errors and warnings 2022-08-01 18:45:52 -06:00
Sean King 081aa0fd05
Fix merge conflicts 2022-08-01 18:17:09 -06:00
Henry Jameson fc18673030 deal with no-prototype-builtins 2022-07-31 12:36:02 +03:00
Henry Jameson fddb531ed2 --fix 2022-07-31 12:35:48 +03:00
Sean King fa5d35523d
Add ability to view status history for edited statuses 2022-06-20 22:52:08 -06:00
Sean King 1a333aabba
Add edit status functionality 2022-06-07 21:31:48 -06:00
Ilja d0bfd9a808 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into feat/report-notification 2022-03-20 09:53:57 +01:00
Ilja d0c4ad22cd Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into feat/report-notification 2022-02-26 02:08:13 +01:00
Henry Jameson 9c1814d122 expert settings toggle + server-side settings 2022-02-22 23:31:40 +02:00
marcin mikołajczak 79d02bddbe Birthdays
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-13 19:11:14 +01: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
Henry Jameson 97e86381c8 remove old emoji added, everything emoji-bearing uses RichContent now 2021-08-13 13:12:33 +03:00
Henry Jameson 4c974f5ca2 richcontent support in polls, user cards and user profiles 2021-08-13 13:06:42 +03:00
Henry Jameson 6c6df29ed3 support richcontent in polls 2021-08-13 12:19:57 +03:00
Henry Jameson 418f029789 review + fixes 2021-06-12 20:43:29 +03:00
Henry Jameson 90a188f2c3 cleanup 2021-06-12 19:54:34 +03:00
Henry Jameson 8e9f5d7580 renamed StatusText to StatusBody for clarity, fixed chats 2021-06-07 19:50:38 +03:00
Henry Jameson 04fa1f0b2d some docs, added richcontent to usernames in status, updated stillImage
to allow scale of "gif" label
2021-06-07 18:41:47 +03:00
Henry Jameson 20ce646852 [WIP] MUCH better approach to replacing emojis with still versions 2021-06-07 18:41:47 +03:00
Matilde Park 06d0254cc5 entity_normalizer: safely check screen_name
Prevents a crash on undefined screen name cases.
2021-04-21 01:40:25 -04:00
Shpuld Shpuldson 09fe160e8b separate screen_name and screen_name_ui with decoded punycode 2021-02-26 16:23:11 +02:00
Shpuld Shpuldson 8334649c11 Merge branch 'develop' into feat/report-notification 2021-01-27 13:24:19 +02:00
feld 831cf9eafb Apply 1 suggestion(s) to 1 file(s) 2021-01-20 14:47:13 -06:00
Mark Felder 36e56354e4 More robust backwards compatibility 2021-01-19 10:01:55 -06:00
Mark Felder 9656c9b969 Support old user.deactivated and new user.is_active fields 2021-01-18 15:54:12 -06:00
Shpuld Shpuldson 65dbf7b85d Add report button to status ellipsis menu 2021-01-12 14:43:21 +02:00
Shpuld Shpuldson a4e3cccf1c somewhat workign version still with fixture 2021-01-06 18:31:34 +02:00
Shpuld Shpuldson ab2c2c66bf Merge branch 'develop' into feat/report-notification 2021-01-05 13:58:52 +02:00
Shpuld Shpludson ef6e2087ae fix #1036 convert screen name to unicode with punycode 2021-01-05 08:09:08 +00:00
Shpuld Shpuldson 415119cda9 use title html for poll options before vote 2020-12-07 00:11:21 +02:00
Shpuld Shpuldson 5e96260a4f add test data for dev 2020-12-04 12:48:15 +02:00
Shpuld Shpuldson 1fd1553a1c Merge branch 'develop' into feat/report-notification 2020-12-04 11:20:01 +02:00
Henry Jameson 49f7c84e3f Fix pinned statuses and perhaps some other stuff 2020-11-17 15:25:38 +02:00
Shpuld Shpuldson 15bed586dc report notification wip 2020-11-15 13:57:02 +02:00
Shpuld Shpuldson 41dbdc2b28 fix emoji not working in profile field names 2020-11-11 10:40:26 +02:00