30 Commits (f5f267fa764f53ef617bc9504c7ecb68b5d3d7ab)

Author	SHA1	Message	Date
Ivan Tashkinov	e350898828	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	4 years ago
Haelwenn (lanodan) Monnier	c4439c630f	Bump Copyright to 2021 ... grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'	4 years ago
lain	cf0eb0c1c5	Merge branch 'object-normalize-refactor' into 'develop' ... Object: Rework how Object.normalize works See merge request pleroma/pleroma!3229	4 years ago
lain	e1e7e4d379	Object: Rework how Object.normalize works ... Now it defaults to not fetching, and the option is named.	4 years ago
Alex Gleason	cbce880076	Merge remote-tracking branch 'upstream/develop' into aliases	4 years ago
Haelwenn	3966add048	Revert "Merge branch 'features/hashtag-column' into 'develop'" ... This reverts merge request !2824	4 years ago
Haelwenn	b122b6ffa3	Merge branch 'features/hashtag-column' into 'develop' ... Insert text representation of hashtags into object["hashtags"] See merge request pleroma/pleroma!2824	4 years ago
Ivan Tashkinov	4134abef63	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	4 years ago
Haelwenn (lanodan) Monnier	acb03d591b	Insert text representation of hashtags into object["hashtags"] ... Includes a new mix task: pleroma.database fill_old_hashtags	4 years ago
Ivan Tashkinov	ee221277b0	Encapsulation of tags / hashtags fetching from objects.	4 years ago
lain	9ba60f70d2	Tests: Make as many tests as possible async. ... In general, tests that match these criteria can be made async: - Doesn't use real Cachex. - Doesn't write to the Config / Application Environment. - Uses Mock. Using Mox is fine. - Uses the streamer.	4 years ago
lain	b4b68b71fc	Tests: Remove unneeded explicit cachex use. ... Only use cachex when we're actually testing it.	4 years ago
Egor Kislitsyn	35ba48494f	Stream follow updates	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' ... 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
Alex Gleason	83770b7b39	Merge remote-tracking branch 'upstream/develop' into aliases	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
Alex Gleason	7d8f610720	Merge remote-tracking branch 'upstream/develop' into aliases	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