aboutsummaryrefslogtreecommitdiff
path: root/test/pleroma/web/mastodon_api
AgeCommit message (Collapse)Author
2020-11-18Merge branch 'develop' into 'hide-muted-reactions'minibikini
# Conflicts: # CHANGELOG.md
2020-11-17Add test for POST when push is disabledMark Felder
Also group together the tests verifiying failure when disabled
2020-11-17Revert adding extra alert types hereMark Felder
2020-11-17Fix incorrect test descriptionMark Felder
2020-11-17Test that we ignore invalid subscription alert types separately.Mark Felder
2020-11-17Ensure all supported push notification subscription alert types are testedMark Felder
2020-11-17Update OpenAPI spec/schema and test to verify support for ↵Mark Felder
pleroma:emoji_reaction subscriptions
2020-11-17Merge branch 'develop' into hide-muted-reactionsEgor Kislitsyn
2020-11-17Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/local-only-scope
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
'develop' fixes 2034 Make notifs view work for reports Closes #2034 See merge request pleroma/pleroma!2912
2020-11-13Make notifs view work for reportsIlja
* These are the first small steps for issue 2034 "Reports should send a notification to admins". * I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later) * I added the new type to the notification_controller * I made the view return the notification. It doesn't include the report itself (yet)
2020-11-11Render blurhashes in Mastodon APIMark Felder
2020-11-11Add `local` visibilityEgor Kislitsyn
2020-11-11Moving some background jobs into simple tasksAlexander Strizhakov
- fetching activity data - attachment prefetching - using limiter to prevent overload
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/expire-mutes
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
alexgleason/pleroma-block-behavior
2020-11-04Merge branch 'restrict-domain' into 'develop'lain
View a remote server's timeline See merge request pleroma/pleroma!2713
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
alexgleason/pleroma-restrict-domain
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/local-only-scope
2020-11-04Poll View: Always return `voters_count`.lain
2020-11-03Conversations: A few refactorslain
2020-11-03Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
a1batross/pleroma-patch-4
2020-10-30Remove unused aliasesEgor Kislitsyn
2020-10-30ConversationViewTest: fix testAlibek Omarov
2020-10-30ConversationControllerTest: fix test, fix formattingAlibek Omarov
2020-10-30ConversationView: fix last_status.account being empty, fix current user ↵Alibek Omarov
being included in group conversations
2020-10-30ConversationViewTest: fix test #2Alibek Omarov
2020-10-30ConversationViewTest: fix testAlibek Omarov
2020-10-30ConversationControllerTest: fix testAlibek Omarov
2020-10-30Merge branch 'develop' into 'feature/local-only-scope'minibikini
# Conflicts: # CHANGELOG.md
2020-10-29Merge branch 'issue/2069' into 'develop'Haelwenn
[#2069] unread_conversation_count See merge request pleroma/pleroma!2939
2020-10-29Merge remote-tracking branch 'origin/develop' into mutes-blocks-paginationEgor Kislitsyn
2020-10-27Merge branch 'develop' into 'feature/local-only-scope'minibikini
# Conflicts: # CHANGELOG.md
2020-10-26Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
alexgleason/pleroma-block-behavior
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-15Add Pleroma.Constants.as_local_public/0Egor Kislitsyn
2020-10-15Add local-only statusesEgor Kislitsyn
2020-10-15Fix warningsEgor Kislitsyn
2020-10-14Merge remote-tracking branch 'upstream/develop' into aliasesAlex Gleason
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 remote-tracking branch 'upstream/develop' into restrict-domainAlex Gleason
2020-10-13Merge remote-tracking branch 'upstream/develop' into aliasesAlex Gleason
2020-10-13Merge remote-tracking branch 'upstream/develop' into block-behaviorAlex Gleason
2020-10-13Missed testsMark Felder
2020-10-13Add pagination for MutesEgor Kislitsyn
2020-10-13Add pagination for BlocksEgor Kislitsyn