aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api
AgeCommit message (Expand)Author
2021-01-18Dev patch appliedRoman Chvanikov
2021-01-18Merge branch 'develop' into refactor/uploadsRoman Chvanikov
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-28Revert "Merge branch 'features/hashtag-column' into 'develop'"Haelwenn
2020-12-28Merge branch 'features/hashtag-column' into 'develop'Haelwenn
2020-12-28Pleroma.Object/1: take %Object{} as argument insteadHaelwenn (lanodan) Monnier
2020-12-22Create Object.hashtags/1 wrapperHaelwenn (lanodan) Monnier
2020-12-22Insert text representation of hashtags into object["hashtags"]Haelwenn (lanodan) Monnier
2020-12-21Cachex: Unify arity of callback functionlain
2020-12-18Cachex: Make caching provider switchable at runtime.lain
2020-12-14Minor refactoring of the logic for hiding followers/following counts.Mark Felder
2020-12-08wipRoman Chvanikov
2020-12-07wipRoman Chvanikov
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-17Merge branch 'develop' into hide-muted-reactionsEgor Kislitsyn
2020-11-16Use absolute URLs to thumbnail and background in /api/v1/instanceMark Felder
2020-11-16Hide reactions from muted and blocked usersEgor Kislitsyn
2020-11-13Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into '...lain
2020-11-13Make notifs view work for reportsIlja
2020-11-11Render blurhashes in Mastodon APIMark Felder
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/exp...lain
2020-11-04Merge branch 'restrict-domain' into 'develop'lain
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason...lain
2020-11-04Poll View: Always return `voters_count`.lain
2020-11-03Conversations: A few refactorslain
2020-10-30ConversationView: fix formattingAlibek Omarov
2020-10-30ConversationView: fix last_status.account being empty, fix current user being...Alibek Omarov
2020-10-30ConversationView: add current user to conversations, according to Mastodon be...Alibek Omarov
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