Commit Graph

145 Commits (5c3a0dd26e8ba818388ca6965e71600fd2ec07a1)

Author SHA1 Message Date
Mark Felder 30f140e570 Ensure all supported push notification subscription alert types are tested
4 years ago
Mark Felder 67a6abd071 Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions
4 years ago
Egor Kislitsyn 79d2d3f609
Merge branch 'develop' into hide-muted-reactions
4 years ago
lain fec1ed802e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
4 years ago
Mark Felder b1466661eb Use absolute URLs to thumbnail and background in /api/v1/instance
4 years ago
Egor Kislitsyn fb41bd1a85 Hide reactions from muted and blocked users
4 years ago
lain 0d149502fe Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop'
4 years ago
Ilja 70e4b86250 Make notifs view work for reports
4 years ago
Mark Felder 2254e5e595 Render blurhashes in Mastodon API
4 years ago
Egor Kislitsyn 0118ccb53c
Add `local` visibility
4 years ago
Alexander Strizhakov 8d218ebaf5
Moving some background jobs into simple tasks
4 years ago
lain dd2b3a8da9 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
4 years ago
lain 5db4c823b2 Merge branch 'restrict-domain' into 'develop'
4 years ago
lain 329aa19c9f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
4 years ago
lain c7bcbfbc1d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
4 years ago
lain 1cfc3278c0 Poll View: Always return `voters_count`.
4 years ago
lain c37118e6f2 Conversations: A few refactors
4 years ago
lain 91f6c32430 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4
4 years ago
Egor Kislitsyn 1a98476f48 Remove unused aliases
4 years ago
Alibek Omarov 1042c30fa5 ConversationViewTest: fix test
4 years ago
Alibek Omarov 0552a08dfd ConversationControllerTest: fix test, fix formatting
4 years ago
Alibek Omarov 9b93eef715 ConversationView: fix last_status.account being empty, fix current user being included in group conversations
4 years ago
Alibek Omarov 630eb0f939 ConversationViewTest: fix test #2
4 years ago
Alibek Omarov 149589c842 ConversationViewTest: fix test
4 years ago
Alibek Omarov 390a12d4c8 ConversationControllerTest: fix test
4 years ago
minibikini 1cc8e94506 Merge branch 'develop' into 'feature/local-only-scope'
4 years ago
Haelwenn 131f3219e6 Merge branch 'issue/2069' into 'develop'
4 years ago
Egor Kislitsyn fa902867c0
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
4 years ago
minibikini 1bfd8528bb Merge branch 'develop' into 'feature/local-only-scope'
4 years ago
Egor Kislitsyn 76c4e80e5a
Merge branch 'develop' into mutes-blocks-pagination
4 years ago
Ivan Tashkinov 9ea31b373f Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
4 years ago
Egor Kislitsyn 2a475622ee
Add Pleroma.Constants.as_local_public/0
4 years ago
Egor Kislitsyn 4f79bbbc31
Add local-only statuses
4 years ago
Egor Kislitsyn 3985c1b450
Fix warnings
4 years ago
Alex Gleason 83770b7b39
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
feld 2013705690 Merge branch 'feature/gen-magic' into 'develop'
4 years ago
Mark Felder ed61002815 Undo API breaking changes
4 years ago
Alex Gleason 755f58168b
Merge remote-tracking branch 'upstream/develop' into restrict-domain
4 years ago
Alex Gleason 7d8f610720
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
Mark Felder 8b20c4d275 Missed tests
4 years ago
Egor Kislitsyn 6734abcbd4
Add pagination for Mutes
4 years ago
Egor Kislitsyn 33f4f39b1c
Add pagination for Blocks
4 years ago
Mark Felder 40f3cdc030 JPEG content_type must be image/jpeg
4 years ago
Mark Felder 409f694e4f Merge branch 'develop' into refactor/locked_user_field
4 years ago
Alexander Strizhakov 7dffaef479
tests consistency
4 years ago