6784 Commits (0309514656b92771dc5078cc1ec6d343e42399b0)

Author	SHA1	Message	Date
lain	a6d3bb5f30	Merge branch 'issue/1023' into 'develop' ... [#1023] added generated `pleroma.env` See merge request pleroma/pleroma!2763	4 years ago
Haelwenn	269b61a240	Merge branch '1996-dont-break-on-chatmessages' into 'develop' ... EnsureRePrepended: Don't break on chat messages. Closes #1996 See merge request pleroma/pleroma!2808	4 years ago
lain	de5c7e20a3	Merge branch 'bugfix/remote-user-atom' into 'develop' ... feed/user_controller: Return 404 when the user is remote Closes #1911 See merge request pleroma/pleroma!2811	4 years ago
Haelwenn (lanodan) Monnier	2e27847573	feed/user_controller: Return 404 when the user is remote	4 years ago
lain	79f9ddd8b7	Merge branch 'by-approval' into 'develop' ... Registrations "by approval" mode Closes #1931 See merge request pleroma/pleroma!2757	4 years ago
lain	edf8b6abfe	EnsureRePrepended: Don't break on chat messages.	4 years ago
rinpatch	dab1d8c98e	gun ConnectionPool: Re-add a missing cast for remove_client	4 years ago
rinpatch	4ce6179dc7	gun ConnectionPool: replace casts with calls ... The slowdown from this is most likely immesurable, however it eliminates possible false positives when tracking dead clients.	4 years ago
lain	ad5c42628a	FrontendStatic: Add plug to serve frontends based on configuration.	4 years ago
lain	14c28dcbd1	InstanceStatic: Refactor.	4 years ago
lain	e5ac9534aa	Merge branch 'cleanup/masto_fe-default_settings' into 'develop' ... masto_fe_view: Remove @default_settings See merge request pleroma/pleroma!2799	4 years ago
Alex Gleason	f688c8df82	Fix User.registration_reason HTML sanitizing issues	4 years ago
Alex Gleason	f43518eb74	Lint, fix test	4 years ago
Alex Gleason	6f44a0ee84	Add configurable registration_reason limit	4 years ago
Alex Gleason	6747bf2e16	Merge remote-tracking branch 'upstream/develop' into by-approval	4 years ago
lain	e1a1c8e7de	Merge branch 'develop' into 'cleanup/masto_fe-default_settings' ... # Conflicts: # lib/pleroma/web/views/masto_fe_view.ex	4 years ago
Haelwenn (lanodan) Monnier	4a6389316d	masto_fe_view: Remove @default_settings	4 years ago
lain	9e6f4694dd	Pipeline: Unify embedded_object / object_data, move to validator.	4 years ago
lain	762c9ea564	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object-federation	4 years ago
lain	2a3abfd326	Merge branch 'issue/1934-welcome-email' into 'develop' ... [#1934] welcome email See merge request pleroma/pleroma!2786	4 years ago
lain	0d5d1c62ef	Apply 1 suggestion(s) to 1 file(s)	4 years ago
Haelwenn	64b21cee14	Merge branch 'fix/reverse-proxy-no-body-connection-leak' into 'develop' ... ReverseProxy: Fix a gun connection leak when there is an error with no body See merge request pleroma/pleroma!2798	4 years ago
Alex Gleason	6931dbfa58	Merge remote-tracking branch 'upstream/develop' into by-approval	4 years ago
rinpatch	6bf8eee5f9	ReverseProxy tesla client: remove handling of old_conn ... This is no longer relevant because we use a custom FollowRedirects middleware now	4 years ago
rinpatch	d4fbec62a3	ReverseProxy: Fix a gun connection leak when there is an error with no ... body - Modify `close/1` function to do the same thing it does for hackney, which is - close the client rather than the whole connection - Release the connection when there is no body to chunk	4 years ago
Alibek Omarov	6107440ea0	OpenAPI: remove accidentally pasted buffer data	4 years ago
Alibek Omarov	b31844d6e0	OpenAPI: Replace actor_id by account_id to follow ChatMessage schema	4 years ago
Mark Felder	65a1b048a8	Ensure Oban is available during mix tasks. ... Fixes: mix pleroma.user rm username	4 years ago
Mark Felder	9be6668236	Fix mix tasks that make HTTP calls by starting the Gun connection pool	4 years ago
Lain Soykaf	3d13fb05f8	Side Effects: On undoing, put information about the undone object.	4 years ago
Lain Soykaf	91f3cf9bc6	Pipeline: Add embedded object federation.	4 years ago
Maksim Pechnikov	61ef1fca4b	remove duplicate module	4 years ago
feld	51627a10e5	Merge branch 'unblock-domain-via-query' into 'develop' ... Allow unblocking a domain via query params Closes #1971 See merge request pleroma/pleroma!2783	4 years ago
Mark Felder	4bfad0b483	Support blocking via query parameters as well and document the change.	4 years ago
Haelwenn	6100b90209	Merge branch '1976-status-view-fixes' into 'develop' ... StatusView: Handle badly formatted emoji reactions. Closes #1976 See merge request pleroma/pleroma!2788	4 years ago
Maksim Pechnikov	67ab9a7928	Merge branch 'develop' into issue/1934-welcome-email	4 years ago
lain	76aa49a0c5	Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop' ... [#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting Closes #1973 See merge request pleroma/pleroma!2791	4 years ago
Ivan Tashkinov	9ea51a6de5	[#2791] AccountView: renamed `:force` option to `:skip_visibility_check`.	4 years ago
lain	b2ba70eec4	Merge branch 'bugfix/mrf-reject-logging' into 'develop' ... Fix #783: Make MRF reject log as info level instead of error Closes #783 See merge request pleroma/pleroma!2758	4 years ago
lain	250e0369c7	Merge branch 'issue/1878' into 'develop' ... [#1878] fix reset confirmation email in admin section See merge request pleroma/pleroma!2751	4 years ago
lain	a81581472f	Merge branch 'linkify' into 'develop' ... Fix Linkify See merge request pleroma/pleroma!2792	4 years ago
Maksim Pechnikov	7991ddad58	added warning to use old keys	4 years ago
Ivan Tashkinov	6f5f7af607	[#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated. ... Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.	4 years ago
lain	1c9752cff4	Merge branch 'fix/pleroma-api-emoji-packs' into 'develop' ... Fix /api/pleroma/emoji/packs index endpoint. See merge request pleroma/pleroma!2777	4 years ago
Maksim Pechnikov	db0224d174	added check user email for welcome email	4 years ago
Lain Soykaf	0cb9e1da74	StatusView: Handle badly formatted emoji reactions.	4 years ago
Maksim Pechnikov	5879d36854	fix sender for welcome email	4 years ago
Maksim Pechnikov	8d6f7aec21	Merge branch 'develop' into issue/1023	4 years ago
Mark Felder	341a8f3500	Skip the correct plug	4 years ago
lain	5b1eeb06d8	Revert "Merge branch 'revert-2b5d9eb1' into 'develop'" ... This reverts merge request !2784	4 years ago