Commit Graph

959 Commits (a0623c5db226a54998923ebab01703a7cee3dad5)

Author SHA1 Message Date
Alex Gleason f688c8df82
Fix User.registration_reason HTML sanitizing issues
4 years ago
Alex Gleason f43518eb74
Lint, fix test
4 years ago
Alex Gleason 6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
feld 51627a10e5 Merge branch 'unblock-domain-via-query' into 'develop'
4 years ago
Mark Felder 4bfad0b483 Support blocking via query parameters as well and document the change.
4 years ago
Haelwenn 6100b90209 Merge branch '1976-status-view-fixes' into 'develop'
4 years ago
Ivan Tashkinov 9ea51a6de5 [#2791] AccountView: renamed `:force` option to `:skip_visibility_check`.
4 years ago
Ivan Tashkinov 6f5f7af607 [#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.
4 years ago
Lain Soykaf 0cb9e1da74 StatusView: Handle badly formatted emoji reactions.
4 years ago
Egor Kislitsyn bdb3375933
Allow unblocking a domain via query params
4 years ago
Alex Gleason 48f8b26c92
OpenAPI: Add :id to follower/following endpoints, fixes #1958
4 years ago
Alex Gleason 9ce95fa68f
Use `approval_required` in /api/v1/instance
4 years ago
Mark Felder 9d30bacace Merge branch 'develop' into refactor/notification_settings
4 years ago
rinpatch 0fe36b311c Merge branch 'features/mrf-reasons' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier d29b8997f4
MastoAPI: fix & test giving MRF reject reasons
4 years ago
Alex Gleason 48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Alex Gleason 5ddf0415c4
Accept `reason` in POST /api/v1/accounts and store in DB
4 years ago
Mark Felder 80c21100db Merge branch 'develop' into refactor/notification_settings
4 years ago
feld 8f9ee694ed Merge branch 'features/profile-fields-emojo' into 'develop'
4 years ago
Alex Gleason 51ab8d0128
Add `account_approval_required` instance setting
4 years ago
lain b39eb6ecc5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
4 years ago
Haelwenn (lanodan) Monnier cc7153cd82
user: Add support for custom emojis in profile fields
4 years ago
lain 8ca1f3e8c6 Merge branch '1723-token-fixes' into 'develop'
4 years ago
lain f4469dc741 Merge branch 'features/favicons' into 'develop'
4 years ago
Haelwenn bdc7b60610 Merge branch '1925-muting-reblogs' into 'develop'
4 years ago
lain 00e54f8fe7 ActivityPub: Remove `follow` and fix issues.
4 years ago
lain 9dda8b5427 CommonAPI: Switch to pipeline for following.
4 years ago
lain 6335b32aa8 Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'
4 years ago
lain c0385cf47a AccountController: Fix muting / unmuting reblogs.
4 years ago
Haelwenn (lanodan) Monnier 312fc55f14
Add [:instances_favicons, :enabled] setting, defaults to false
4 years ago
Haelwenn (lanodan) Monnier 6a679d80c9
Move get_favicon to Pleroma.Instances, use /
4 years ago
Haelwenn (lanodan) Monnier f6d09fafee
Add support for remote favicons
4 years ago
Ivan Tashkinov 3e08e77151 [#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.
4 years ago
lain 59cf78e412 AccountController: Allow removal / reset of user images.
4 years ago
lain 74b88c0a8b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
4 years ago
lain cc8b4e48d9 InstanceView: Add chat limit, description limit
4 years ago
lain c2a052a346 Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'
4 years ago
lain d3efb50262 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text
4 years ago
lain 945e75c8e8 SearchController: Trim query.
4 years ago
lain e3b5559780 AccountController: Make setting accepts_chat_messages possible.
4 years ago
lain db76c26469 AccountViewTest: Fix test.
4 years ago
lain 3250228be9 AccountView: Add 'accepts_chat_messages' to view.
4 years ago
Mark Felder 8121e46f25 Merge branch 'develop' into activation-meta
4 years ago
lain 691742e62d Revert "Merge branch 'avatar-removing' into 'develop'"
4 years ago
Mark Felder 5a8e0208b1 Add fields limits to instance metadata, add tests
4 years ago
Egor Kislitsyn 3aa04b81c4
Test default "content-type" for CastAndValidate
4 years ago
lain 651f269568 Merge branch 'avatar-removing' into 'develop'
4 years ago
lain e64d08439e UpdateCredentialsTest: Add test for removing profile images.
4 years ago
Haelwenn (lanodan) Monnier 244655e884
MastoAPI: Show source field when deleting
4 years ago
Mark Felder 69848d5c97 Rename notification "privacy_option" setting
4 years ago