aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api
AgeCommit message (Collapse)Author
2020-11-04Merge branch 'chore/elixir-1.11' into 'develop'feld
Elixir 1.11 compatibility / Phoenix 1.5+ See merge request pleroma/pleroma!3059
2020-10-14Merge branch 'feature/gen-magic' into 'develop'feld
Use libmagic via majic Closes #1736 See merge request pleroma/pleroma!2534
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-19[#2074] OAuth scope checking in Streaming API.Ivan Tashkinov
2020-09-17Merge branch 'fix/streaming-termination-errors' into 'develop'rinpatch
Fix two pseudo-errors in websocket handler Closes #2131 See merge request pleroma/pleroma!2982
2020-09-17Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
media-preview-proxy-nostream
2020-09-16[#2497] Media preview proxy: misc. improvements (`static` param support, ↵Ivan Tashkinov
dynamic fifo pipe path), refactoring.
2020-09-11Merge remote-tracking branch 'upstream/develop' into chat-moderationAlex Gleason
2020-09-11MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1Alex Gleason
2020-09-11Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxyIvan Tashkinov
# Conflicts: # lib/pleroma/instances/instance.ex
2020-09-10Merge branch 'develop' into feature/gen-magicMark Felder
2020-09-10schedule activity expiration in ObanAlexander Strizhakov
2020-09-10Websocket handler: fix never matching code on failed authrinpatch
`:cowboy_req.reply` does not return tuples since 2.0, see https://ninenines.eu/docs/en/cowboy/2.4/manual/cowboy_req.reply/
2020-09-10Websocket handler: do not raise if handler is terminated before switching ↵rinpatch
protocols Closes #2131
2020-09-10websocket handler: Do not log client ping frames as errorsrinpatch
2020-09-08Merge branch 'fix/2095-deactivated-account-reset' into 'develop'feld
Disallow password resets for deactivated accounts Closes #2095 See merge request pleroma/pleroma!2935
2020-09-08Merge branch 'feat/rich-media-improvements' into 'develop'rinpatch
Rich media improvements See merge request pleroma/pleroma!2944
2020-09-03[#2497] Added support for enforcing output format for media proxy preview, ↵Ivan Tashkinov
used for avatar_static & header_static (AccountView).
2020-09-03Merge branch 'develop' into media-preview-proxyMark Felder
2020-09-02Merge branch 'fix/2095-deactivated-account-reset' into 'develop'feld
Disallow password resets for deactivated accounts Closes #2095 See merge request pleroma/pleroma!2935
2020-09-02Merge branch 'bugfix/mastoapi-lists' into 'develop'lain
Fix removing an account from a list Closes #2103 See merge request pleroma/pleroma!2940
2020-09-02ListController: DRY up stuff.lain
2020-09-02Disallow password resets for deactivated accounts.Mark Felder
Ensure all responses to password reset events are identical.
2020-09-02StatusView: Start fetching rich media cards as soon as possiblerinpatch
2020-09-01Fix removing an account from a listHaelwenn (lanodan) Monnier
Mastodon (Frontend) changed a different method for deletes, keeping old format as mastodon documentation is too loose
2020-09-01User table: ensure bio is always a stringrinpatch
Gets rid of '|| ""' in multiple places and fixes #2067
2020-08-30Merge branch 'develop' into feld-2168-media-preview-proxyMark Felder
2020-08-27Support static avatars and header images with Mediaproxy PreviewMark Felder
2020-08-26TimelineController: Keys are atoms now.lain
Closes #2078 Closes #2070
2020-08-25Merge branch 'develop' into feld-2168-media-preview-proxyMark Felder
2020-08-20Pipeline Ingestion: EventHaelwenn (lanodan) Monnier
2020-08-18Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy
2020-08-14[#2046] Defaulted pleroma/restrict_unauthenticated basing on instance ↵Ivan Tashkinov
privacy setting (i.e. restrict on private instances only by default).
2020-08-11Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy # Conflicts: # config/config.exs # mix.lock
2020-08-10AccountController: Build the correct update activity.lain
Will fix federation issues.
2020-08-07Merge branch 'features/poll-validation' into 'develop'lain
Poll and votes pipeline ingestion Closes #1362 and #1852 See merge request pleroma/pleroma!2635
2020-08-07Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy # Conflicts: # mix.lock
2020-08-05Questions: Move fixes to validators.lain
2020-08-05Apply 1 suggestion(s) to 1 file(s)lain
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 08:32:24 +0000