aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api/controllers
AgeCommit message (Expand)Author
2021-01-13Bump Copyright to 2021Haelwenn (lanodan) Monnier
2021-01-07Merge branch 'object-normalize-refactor' into 'develop'lain
2021-01-04Object: Rework how Object.normalize workslain
2020-12-30Merge remote-tracking branch 'upstream/develop' into aliasesAlex Gleason
2020-12-21Cachex: Unify arity of callback functionlain
2020-12-18Cachex: Make caching provider switchable at runtime.lain
2020-11-28OAuth form user remembering feature. Local MastoFE login / logout fixes.Ivan Tashkinov
2020-11-25Session token setting on token exchange. Auth-related refactoring.Ivan Tashkinov
2020-11-19[#2301] Proper handling of `User.is_discoverable`: users appear in in-service...Ivan Tashkinov
2020-11-16Hide reactions from muted and blocked usersEgor Kislitsyn
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/exp...lain
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason...lain
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-10Merge branch 'develop' into feature/gen-magicMark Felder
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-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