aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api/controllers
AgeCommit message (Expand)Author
2020-11-04Merge branch 'chore/elixir-1.11' into 'develop'feld
2020-10-14Merge branch 'feature/gen-magic' into 'develop'feld
2020-10-14Undo API breaking changesMark Felder
2020-10-13Merge branch 'develop' into feature/gen-magicMark Felder
2020-10-13Merge branch 'develop' into refactor/locked_user_fieldMark Felder
2020-10-13Change user.locked field to user.is_lockedMark Felder
2020-10-13fixes after rebaseAlexander Strizhakov
2020-10-13alias alphabetically orderAlexander Strizhakov
2020-10-13EnsurePublicOrAuthenticatedPlug module nameAlexander Strizhakov
2020-10-13OAuthScopesPlug module nameAlexander Strizhakov
2020-10-13RateLimiter module nameAlexander Strizhakov
2020-10-09Merge branch 'develop' into feature/gen-magicMark Felder
2020-09-22Merge remote-tracking branch 'upstream/develop' into email-fix-developAlex Gleason
2020-09-21Fix #2172 HTTP error on password resetAlex Gleason
2020-09-10Merge branch 'develop' into feature/gen-magicMark Felder
2020-09-08Merge branch 'fix/2095-deactivated-account-reset' into 'develop'feld
2020-09-02Merge branch 'fix/2095-deactivated-account-reset' into 'develop'feld
2020-09-02ListController: DRY up stuff.lain
2020-09-02Disallow password resets for deactivated accounts.Mark Felder
2020-09-01Fix removing an account from a listHaelwenn (lanodan) Monnier
2020-08-26TimelineController: Keys are atoms now.lain
2020-08-14[#2046] Defaulted pleroma/restrict_unauthenticated basing on instance privacy...Ivan Tashkinov
2020-08-10AccountController: Build the correct update activity.lain
2020-07-31[#1985] Prevented force login on registration if account approval and/or emai...Ivan Tashkinov
2020-07-30Merge branch '1993-confirm-users-on-registration' into 'develop'Haelwenn
2020-07-29AccountController: Don't explicitly ask to keep users unconfirmed.lain
2020-07-28Let favourites and emoji reactions optionally be hiddenAlex Gleason
2020-07-23Merge branch 'unblock-domain-via-query' into 'develop'feld
2020-07-23Support blocking via query parameters as well and document the change.Mark Felder
2020-07-22[#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :re...Ivan Tashkinov
2020-07-21Allow unblocking a domain via query paramsEgor Kislitsyn
2020-07-15MastoAPI: fix & test giving MRF reject reasonsHaelwenn (lanodan) Monnier
2020-07-10Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federa...lain
2020-07-09Merge branch '1723-token-fixes' into 'develop'lain
2020-07-09Merge branch '1925-muting-reblogs' into 'develop'Haelwenn
2020-07-09Merge branch 'bugfix/status-deletion' into 'develop'lain
2020-07-08Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'lain
2020-07-08[#1895] credo fix.Ivan Tashkinov
2020-07-08AccountController: Fix muting / unmuting reblogs.lain
2020-07-08[#1895] Applied code review suggestion.Ivan Tashkinov
2020-07-07[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance se...Ivan Tashkinov
2020-07-07AccountController: Allow removal / reset of user images.lain
2020-07-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federa...lain
2020-07-06Delete activity before sending response to clientRoman Chvanikov
2020-07-03Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'lain
2020-07-03Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/ma...lain
2020-07-03SearchController: Trim query.lain
2020-07-03AccountController: Make setting accepts_chat_messages possible.lain
2020-06-29Credo fixes.lain
2020-06-29AccountOperation: Correctly describe create response.lain