aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api
AgeCommit message (Expand)Author
2020-10-29Merge branch 'issue/2069' into 'develop'Haelwenn
2020-10-29Merge remote-tracking branch 'origin/develop' into mutes-blocks-paginationEgor Kislitsyn
2020-10-19Merge branch 'develop' into mutes-blocks-paginationEgor Kislitsyn
2020-10-17Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11Ivan Tashkinov
2020-10-15Merge branch 'develop' into refactor/discoverable_user_fieldMark Felder
2020-10-14Merge remote-tracking branch 'upstream/develop' into aliasesAlex Gleason
2020-10-14Merge branch 'feature/gen-magic' into 'develop'feld
2020-10-14Undo API breaking changesMark Felder
2020-10-14Finish undoing API breakageMark Felder
2020-10-13Merge remote-tracking branch 'upstream/develop' into restrict-domainAlex Gleason
2020-10-13Merge remote-tracking branch 'upstream/develop' into aliasesAlex Gleason
2020-10-13Add pagination for MutesEgor Kislitsyn
2020-10-13Add pagination for BlocksEgor Kislitsyn
2020-10-13Merge branch 'develop' into feature/gen-magicMark Felder
2020-10-13Merge branch 'develop' into chore/elixir-1.11Mark Felder
2020-10-13Merge branch 'develop' into refactor/locked_user_fieldMark Felder
2020-10-13Merge branch 'develop' into refactor/discoverable_user_fieldMark Felder
2020-10-13Change user.discoverable field to user.is_discoverableMark 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-10-08Merge remote-tracking branch 'upstream/develop' into restrict-originAlex Gleason
2020-10-08Merge remote-tracking branch 'upstream/develop' into aliasesAlex Gleason
2020-10-07LintMark Felder
2020-10-07Fix duplicate @doc entriesMark Felder
2020-09-23Merge developRoman Chvanikov
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-20Merge branch 'develop' into feature/expire-mutesRoman Chvanikov
2020-09-19[#2074] OAuth scope checking in Streaming API.Ivan Tashkinov
2020-09-17Merge branch 'fix/streaming-termination-errors' into 'develop'rinpatch
2020-09-17Merge remote-tracking branch 'remotes/origin/develop' into media-preview-prox...Ivan Tashkinov
2020-09-16[#2497] Media preview proxy: misc. improvements (`static` param support, dyna...Ivan Tashkinov
2020-09-13Merge developRoman Chvanikov
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
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
2020-09-10Websocket handler: do not raise if handler is terminated before switching pro...rinpatch
2020-09-10websocket handler: Do not log client ping frames as errorsrinpatch
2020-09-08Pass expires_in param from status controllerRoman Chvanikov
2020-09-08Merge branch 'fix/2095-deactivated-account-reset' into 'develop'feld
2020-09-08Add expires_in param for account mutesRoman Chvanikov
2020-09-08Merge branch 'feat/rich-media-improvements' into 'develop'rinpatch