15 Commits (24673b6ca35c5600f0d2a8f5b8b89a402f387bf6)

Author	SHA1	Message	Date
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' ... fixes 2034 Make notifs view work for reports Closes #2034 See merge request pleroma/pleroma!2912	4 years ago
Ilja	70e4b86250	Make notifs view work for reports ... * 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)	4 years ago
Mark Felder	2254e5e595	Render blurhashes in Mastodon API	4 years ago
lain	dd2b3a8da9	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes	4 years ago
lain	1cfc3278c0	Poll View: Always return `voters_count`.	4 years ago
lain	c37118e6f2	Conversations: A few refactors	4 years ago
Alibek Omarov	1042c30fa5	ConversationViewTest: fix test	4 years ago
Alibek Omarov	630eb0f939	ConversationViewTest: fix test #2	4 years ago
Alibek Omarov	149589c842	ConversationViewTest: fix test	4 years ago
feld	2013705690	Merge branch 'feature/gen-magic' into 'develop' ... Use libmagic via majic Closes #1736 See merge request pleroma/pleroma!2534	4 years ago
Mark Felder	ed61002815	Undo API breaking changes	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