Commit Graph

982 Commits (2d2af75777ae468fb08a2b09dc5af4636106a04b)

Author SHA1 Message Date
feld fb33321fa2 Merge branch 'feature/1952-read-muted-notifications' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier 36c125a071
Pipeline Ingestion: Event
4 years ago
Ivan Tashkinov 60ac83a4c1 [#2046] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog.
4 years ago
Sergey Suprunenko 0865f36965
Mark notifications about statuses from muted users as read automatically
4 years ago
lain 66122a11b5 AccountController: Build the correct update activity.
4 years ago
lain 34cbe9f44a Merge branch 'features/poll-validation' into 'develop'
4 years ago
Mary Kate f785dba09b changelog for filter whole_word fix
4 years ago
Mary Kate d6ab9f2132 update test for whole_word in filter
4 years ago
lain 19c108170e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
4 years ago
lain 878c7f3f30 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
4 years ago
lain 36aa34a1a8 MastodonAPITest: Do the needful
4 years ago
Alex Gleason 4f57e85ab9
Email blacklist: Update phrasing again
4 years ago
Alex Gleason 058daf498f
Email blacklist: Update response phrasing
4 years ago
lain de3bdc63ad AccountControllerTest: Add test for message returned.
4 years ago
Haelwenn (lanodan) Monnier ac2598307d
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation
4 years ago
Ivan Tashkinov 27b0a8b155 [#1985] Prevented force login on registration if account approval and/or email confirmation needed.
4 years ago
Haelwenn 87fe31fb5c Merge branch '1993-confirm-users-on-registration' into 'develop'
4 years ago
Alex Gleason 00d090004e
:show_reactions, refactor the other test
4 years ago
Alex Gleason d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions
4 years ago
lain d9bf2c58df Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration
4 years ago
lain c25c21dd22 AccountController: Don't explicitly ask to keep users unconfirmed.
4 years ago
Alex Gleason 3b7c454418
Let favourites and emoji reactions optionally be hidden
4 years ago
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
Haelwenn (lanodan) Monnier 922ca23298
Question: Add tests on HTML tags in options
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