5880 Commits (f5cb1f3616e9cb9430038697532eb49161937dec)

Author	SHA1	Message	Date
Egor Kislitsyn	b4d5bdd6f1	Merge branch 'develop' into openapi/admin/config	4 years ago
Egor Kislitsyn	c16315d055	Add OpenAPI spec for AdminAPI.ReportController	4 years ago
Egor Kislitsyn	9d572f2f66	Move report actions to AdminAPI.ReportController	4 years ago
Haelwenn	18b050dfd1	Merge branch 'openapi/update-admin-api/status' into 'develop' ... Update OpenAPI spec for AdminAPI.StatusController See merge request pleroma/pleroma!2624	4 years ago
Egor Kislitsyn	8a43611e01	Use AdminAPI.StatusView in api/admin/users	4 years ago
feld	6c1c2cddec	Merge branch 'fix/1794-hashtag-search-results' into 'develop' ... [#1794] Improvements to hashtags extraction from search query Closes #1794 See merge request pleroma/pleroma!2611	4 years ago
Egor Kislitsyn	7922e63825	Update OpenAPI spec for AdminAPI.StatusController	4 years ago
lain	879304dcd9	Merge branch 'replies-domain-block' into 'develop' ... Replies domain block Closes #1650 See merge request pleroma/pleroma!2622	4 years ago
lain	5da38c15cd	Merge branch 'openapi/admin/oauth-apps' into 'develop' ... Add OpenAPI spec for AdminAPI.OAuthAppContoller See merge request pleroma/pleroma!2582	4 years ago
lain	6977500ef7	Merge branch 'tagline' into 'develop' ... Update default instance description See merge request pleroma/pleroma!2600	4 years ago
lain	022d975a39	Merge branch 'openapi/admin/invites' into 'develop' ... Add OpenAPI spec for AdminAPI.InviteController See merge request pleroma/pleroma!2585	4 years ago
lain	2860c66e88	Merge branch 'feature/embeddable-posts' into 'develop' ... Add embeddable posts Closes #1288 See merge request pleroma/pleroma!2319	4 years ago
lain	cd2abcc0e3	Merge branch 'fix/invisible-repeats' into 'develop' ... Do not include activities of invisible users unless explicitly requested Closes #1833 See merge request pleroma/pleroma!2620	4 years ago
rinpatch	165a4b2a69	Do not include activities of invisible users unless explicitly requested ... Closes #1833	4 years ago
lain	d111eae798	Merge branch 'feature/status-by-id-account-view' into 'develop' ... another view for account in admin-fe status_show Closes #1783 See merge request pleroma/pleroma!2543	4 years ago
Alexander Strizhakov	19f468c5bc	replies filtering for blocked domains	4 years ago
rinpatch	6fb900a496	Merge branch 'user-updates' into 'develop' ... AccountController: Federate user account changes. Closes pleroma-support#33 and #1801 See merge request pleroma/pleroma!2617	4 years ago
Alexander Strizhakov	7e6ec778d9	exclude replies on blocked domains	4 years ago
Egor Kislitsyn	6b84c62d4a	Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts	4 years ago
lain	d4d4b92f75	TimelineController: Only return `Create` in public timelines.	4 years ago
lain	9460983032	AccountController: Federate user account changes. ... Hotfixy commit, will be moved to the pipeline.	4 years ago
Haelwenn	e96765df6b	Merge branch 'chore/bump-hackney' into 'develop' ... mix.lock: update hackney to 1.16.0 Closes #1612 See merge request pleroma/pleroma!2614	4 years ago
rinpatch	0cb7b0ea84	hackney adapter helper: support tlsv1.3 and remove custom opts ... - partitial_chain is no longer exported, but it seems to be the default anyway. - The bug that caused sni to not be sent automatically seems to be fixed - https://github.com/benoitc/hackney/issues/612	4 years ago
lain	b004c427a0	Merge branch 'conversation-pagination' into 'develop' ... Conversation pagination See merge request pleroma/pleroma!2601	4 years ago
Steven Fuchs	6d4b80822b	Conversation pagination	4 years ago
Ivan Tashkinov	24f40b8a26	[#1794] Fixed search query splitting regex to deal with Unicode. Adjusted a test.	4 years ago
Ivan Tashkinov	78c80a261a	Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-search-results	4 years ago
rinpatch	d23b3701d8	Merge branch 'bugfix/csp-unproxied' into 'develop' ... http_security_plug.ex: Fix non-proxied media See merge request pleroma/pleroma!2610	4 years ago
rinpatch	109af93227	Apply suggestion to lib/pleroma/plugs/http_security_plug.ex	4 years ago
rinpatch	660d49227b	Merge branch 'connect-src' into 'develop' ... Add blob: to connect-src CSP, fixes #1827 Closes #1827 See merge request pleroma/pleroma!2608	4 years ago
Ivan Tashkinov	c181e555db	[#1794] Improvements to hashtags extraction from search query.	4 years ago
Alex Gleason	d38f28870e	Add blob: to connect-src CSP	4 years ago
lain	219d2b3146	Merge branch 'fix-streaming' into 'develop' ... Fix argument error in streamer See merge request pleroma/pleroma!2609	4 years ago
feld	81db758e8e	Merge branch 'mix/database-vacuum-options' into 'develop' ... Database vacuum mix task See merge request pleroma/pleroma!2599	4 years ago
kPherox	de0e262839	Fix argument error in streamer ... `Repo.exists` can't use `nil` as it is unsafe. Use parent object instead of activity because currently Announce activity's context is null.	4 years ago
Haelwenn (lanodan) Monnier	da1e31fae3	http_security_plug.ex: Fix non-proxied media	4 years ago
lain	9848978109	Merge branch 'fix-relay-repeat-notification' into 'develop' ... Fix relay repeat notification See merge request pleroma/pleroma!2590	4 years ago
kPherox	228ff3760e	Use `User.is_internal_user?` instead	4 years ago
kPherox	9df5b1e6ae	Don't make relay announce notification	4 years ago
rinpatch	396bc69aee	Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop' ... Fix profile emojis bypassing mediaproxy and harden CSP Closes #1810 See merge request pleroma/pleroma!2596	4 years ago
rinpatch	27180611df	HTTP Security plug: make starting csp string generation more readable	4 years ago
Egor Kislitsyn	06f20e9181	Add OpenApi spec to AdminAPI.ConfigController	4 years ago
Egor Kislitsyn	d1ee3527ef	Move config actions to AdminAPI.ConfigController	4 years ago
lain	f6ddf0cc50	Merge branch 'feature/1792-update-actor-type' into 'develop' ... Validate actor type See merge request pleroma/pleroma!2593	4 years ago
Alex Gleason	d4a18d44fe	Update default instance description	4 years ago
Mark Felder	30f96b19c1	Abstract out the database maintenance. I'd like to use this from AdminFE too.	4 years ago
Mark Felder	95f6240889	Fix minor spelling error	4 years ago
rinpatch	29ff6d414b	HTTP security plug: Harden img-src and media-src when MediaProxy is enabled	4 years ago
rinpatch	455a402c8a	HTTP Security plug: rewrite &csp_string/0 ... - Directives are now separated with ";" instead of " ;", according to https://www.w3.org/TR/CSP2/#policy-parsing the space is optional - Use an IO list, which at the end gets converted to a binary as opposed to ++ing a bunch of arrays with binaries together and joining them to a string. I doubt it gives any significant real world advantage, but the code is cleaner and now I can sleep at night. - The static part of csp is pre-joined to a single binary at compile time. Same reasoning as the last point.	4 years ago
rinpatch	8f6d428880	AccountView: Use mediaproxy URLs for emojis ... Also use atom keys in emoji maps instead of binaries Closes #1810	4 years ago