43 Commits (1ab61953db36929517ce5a153cc18d4f65127a5a)

Author	SHA1	Message	Date
feld	ecd1ef8cb5	Merge branch 'fix/2302-report-duplicates' into 'develop' ... Fix for forwarded reports Closes #2303 and #2302 See merge request pleroma/pleroma!3146	4 years ago
feld	cd1b4155d5	Merge branch 'oban-jobs-to-simple-tasks' into 'develop' ... Moving some background jobs into simple tasks Closes #1790 See merge request pleroma/pleroma!3129	4 years ago
Alexander Strizhakov	46dab37351	little fix	4 years ago
Alexander Strizhakov	4aaffe3a10	log capture	4 years ago
Alexander Strizhakov	be0b874e1d	fix for mastodon forwarded reports	4 years ago
Alexander Strizhakov	a840aefda8	formatting	4 years ago
Alexander Strizhakov	e2bf6b1f7e	fix for forwarded reports	4 years ago
lain	61f86774d1	Merge branch 'chores/note-handling-move' into 'develop' ... Chores/note handling move See merge request pleroma/pleroma!3122	4 years ago
lain	fec1ed802e	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope	4 years ago
lain	81293e5aad	ActivityPubController: Don't return local only objects	4 years ago
rinpatch	6ca709816f	Fix object spoofing vulnerability in attachments ... Validate the content-type of the response when fetching an object, according to https://www.w3.org/TR/activitypub/#x3-2-retrieving-objects. content-type headers had to be added to many mocks in order to support this, some of this was done with a regex. While I did go over the resulting files to check I didn't modify anything unrelated, there is a possibility I missed something. Closes pleroma#1948	4 years ago
Mark Felder	966663c3f8	Fix tests for other attachment types	4 years ago
Mark Felder	6fd72e9e85	Ingest blurhash for attachments if they were federated	4 years ago
Alexander Strizhakov	8d218ebaf5	Moving some background jobs into simple tasks ... - fetching activity data - attachment prefetching - using limiter to prevent overload	4 years ago
Alexander Strizhakov	f97f24b067	making credo happy and test fix	4 years ago
Alexander Strizhakov	485697d96c	config descriptions for custom MRF policies	4 years ago
Haelwenn (lanodan) Monnier	e010bb292b	NoteHandlingTest: Poison → Jason	4 years ago
Haelwenn (lanodan) Monnier	fa1f5d4442	Move TransmogrifierTest for Note to NoteHandlingTest	4 years ago
lain	24ce324973	Merge branch 'bugfix/poll_replies_count' into 'develop' ... side_effects: Don’t increase_replies_count when it’s an Answer Closes #2274 See merge request pleroma/pleroma!3114	4 years ago
Haelwenn (lanodan) Monnier	4caad4e910	side_effects: Don’t increase_replies_count when it’s an Answer	4 years ago
Ivan Tashkinov	ba50dc05a8	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances ... # Conflicts: # CHANGELOG.md	4 years ago
lain	9542c5d0f4	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name	4 years ago
rinpatch	df61071422	Merge branch '2242-nsfw-case' into 'develop' ... Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive" Closes #2242 See merge request pleroma/pleroma!3094	4 years ago
lain	60e379ce0b	User: Correctly handle whitespace names.	4 years ago
feld	d6907e6e0c	Merge branch 'chore/elixir-1.11' into 'develop' ... Elixir 1.11 compatibility / Phoenix 1.5+ See merge request pleroma/pleroma!3059	4 years ago
lain	39fd4d7639	Transmogrifier: Downcase incoming Hashtags ... Also, set sensitive to true if we have an nsfw hashtag present.	4 years ago
Ivan Tashkinov	9ea31b373f	Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11	4 years ago
Ivan Tashkinov	049ece1ef3	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances ... # Conflicts: # lib/pleroma/web/feed/user_controller.ex # lib/pleroma/web/o_status/o_status_controller.ex # lib/pleroma/web/router.ex # lib/pleroma/web/static_fe/static_fe_controller.ex	4 years ago
Egor Kislitsyn	3985c1b450	Fix warnings	4 years ago
lain	7a2f100061	ActivityPub: Show own replies to muted users. ... Aligns mute with block behavior.	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	40f3cdc030	JPEG content_type must be image/jpeg	4 years ago
Mark Felder	b738f70953	Merge branch 'develop' into feature/gen-magic	4 years ago
Mark Felder	409f694e4f	Merge branch 'develop' into refactor/locked_user_field	4 years ago
Alexander Strizhakov	5f2071c458	changes after rebase	4 years ago
Alexander Strizhakov	7f5dbb0201	changes after rebase	4 years ago
Alexander Strizhakov	b081080dd9	fixes after rebase	4 years ago
Alexander Strizhakov	f679486540	rebase	4 years ago
Alexander Strizhakov	c4c5caedd8	changes after rebase	4 years ago
Alexander Strizhakov	b720ad2264	files consistency after rebase	4 years ago
Alexander Strizhakov	c5efded5fd	files consistency for new files	4 years ago
Alexander Strizhakov	e33782455d	updates after rebase	4 years ago
Alexander Strizhakov	7dffaef479	tests consistency	4 years ago