summaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api/controllers
AgeCommit message (Expand)Author
2021-02-28Merge branch 'feat/client_app_details' into 'develop'lain
2021-02-26Store the client application data in ActivityStreams formatMark Felder
2021-02-18Tests to validate client disclosure obeys user settingMark Felder
2021-02-18Mastodon makes this field null when posting with MastoFE or if you choose to ...Mark Felder
2021-02-17Merge branch 'remove-conversation-api' into 'develop'rinpatch
2021-02-15Add API endpoint to remove a conversationEgor Kislitsyn
2021-02-12App is already preloaded into the token, so avoid an extra queryMark Felder
2021-02-11ConsistencyMark Felder
2021-02-11Revert to original formatting for these function defsMark Felder
2021-02-11Prefer naming this put_application because we're putting it into the params mapMark Felder
2021-02-11%Token{} may not be in the conn, so avoid breaking the ability to post status...Mark Felder
2021-02-11[#2510] Improved support for app-bound OAuth tokens. Auth-related refactoring.Ivan Tashkinov
2021-02-09Ensure we capture the application details into the objectMark Felder
2021-02-03Merge branch 'develop' into 'fix/2412-filters'feld
2021-02-02Merge branch 'develop' into 'fix/2411-mutes-api'feld
2021-02-01list timeline filtration by paramsAlexander Strizhakov
2021-02-01expanding filtration for home timelineAlexander Strizhakov
2021-01-29support for with_relationships parameterAlexander Strizhakov
2021-01-26support for expires_in/expires_at in filtersAlexander Strizhakov
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