7743 Commits (fb02241580e095a7481c2e8e7ff0e5f6dc535c72)

Author	SHA1	Message	Date
Alexander Strizhakov	f97f24b067	making credo happy and test fix	4 years ago
Alexander Strizhakov	efc27f6464	fix for adminFE ... - revert UserAllowPolicy description - MRF descriptions order	4 years ago
Alexander Strizhakov	485697d96c	config descriptions for custom MRF policies	4 years ago
lain	88f6b61a5e	Merge branch '2260-wrong-report-link' into 'develop' ... Resolve "Wrong user link in Report email" Closes #2260 See merge request pleroma/pleroma!3121	4 years ago
lain	d77fd6b3d0	Merge branch 'fix/html-title-load' into 'develop' ... Fix title on load of Pleroma HTML, fixes #2281 Closes #2281 See merge request pleroma/pleroma!3125	4 years ago
Alexander Strizhakov	0c68b9ac13	escaping summary and other fields in xml templates	4 years ago
Sean King	e4a21084f0	Fix title on load of Pleroma HTML	4 years ago
rinpatch	cc45c69fff	Remove release_env ... While taking a final look at instance.gen before releasing I noticed that the release_env task outputs messages in broken english. Upon further inspection it seems to have even more severe issues which, in my opinion, warrant it's at least temporary removal: - We do not explain what it actually does, anywhere. Neither the task docs nor instance.gen, nor installation instructions. - It does not respect FHS on OTP releases (uses /opt/pleroma/config even though we store the config in /etc/pleroma/config.exs). - It doesn't work on OTP releases, which is the main reason it exists. Neither systemd nor openrc service files for OTP include it. - It is not mentioned in install guides other than the ones for Debian and OTP releases.	4 years ago
lain	294628d981	Merge branch 'feature/expire-mutes' into 'develop' ... Expiring mutes for users and activities Closes #1817 See merge request pleroma/pleroma!2971	4 years ago
lain	6d850c46dc	AdminEmail: Use AP id as user url.	4 years ago
lain	7bbc328d66	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into stats-genserver-fix	4 years ago
lain	dd2b3a8da9	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes	4 years ago
lain	4800ee656b	Merge branch 'features/federation-status' into 'develop' ... Add a federation_status endpoint showing unreachable instances See merge request pleroma/pleroma!3086	4 years ago
lain	5db4c823b2	Merge branch 'restrict-domain' into 'develop' ... View a remote server's timeline See merge request pleroma/pleroma!2713	4 years ago
Ivan Tashkinov	73e66fd31f	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements	4 years ago
Haelwenn	9c09ea01aa	Merge branch '2284-voters-count' into 'develop' ... Always return voters_count in polls See merge request pleroma/pleroma!3120	4 years ago
lain	504a829edb	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status	4 years ago
lain	329aa19c9f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain	4 years ago
lain	bc4d9c4ffc	Merge branch 'hide-muted-chats' into 'develop' ... Hide chats from muted users Closes #2230 See merge request pleroma/pleroma!3116	4 years ago
Egor Kislitsyn	ca95cbe0b4	Add `with_muted` param to ChatController.index/2	4 years ago
lain	e46c95b826	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api	4 years ago
lain	c7bcbfbc1d	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope	4 years ago
lain	92d252f364	Poll Schema: Update and fix.	4 years ago
lain	1cfc3278c0	Poll View: Always return `voters_count`.	4 years ago
lain	c37118e6f2	Conversations: A few refactors	4 years ago
lain	91f6c32430	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4	4 years ago
Mark Felder	7efc074ead	Permit fetching individual reports with notes preloaded	4 years ago
Egor Kislitsyn	be52819a11	Hide chats from muted users	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
minibikini	6163fbf553	Merge branch 'develop' into 'frontend-admin-api' ... # Conflicts: # lib/pleroma/web/router.ex	4 years ago
Haelwenn (lanodan) Monnier	4caad4e910	side_effects: Don’t increase_replies_count when it’s an Answer	4 years ago
feld	9fbe9ef774	Merge branch 'tesla-get-to-pleroma' into 'develop' ... Use Pleroma.HTTP instead of Tesla Closes #2275 See merge request pleroma/pleroma!3113	4 years ago
Ekaterina Vaartis	8f00d90f91	Use Pleroma.HTTP instead of Tesla ... Closes #2275 As discovered in the issue, captcha used Tesla.get instead of Pleroma.HTTP. I've also grep'ed the repo and changed the other place where this was used.	4 years ago
feld	38b481d112	Merge branch 'feature/account-export' into 'develop' ... Add account export Closes #847 See merge request pleroma/pleroma!2918	4 years ago
Ivan Tashkinov	04f6b48ac1	Auth subsystem refactoring and tweaks. ... Added proper OAuth skipping for SessionAuthenticationPlug. Integrated LegacyAuthenticationPlug into AuthenticationPlug. Adjusted tests & docs.	4 years ago
eugenijm	8e41baff40	Add idempotency_key to the chat_message entity.	4 years ago
Egor Kislitsyn	d1698267a2	Fix credo warning	4 years ago
Egor Kislitsyn	d2113428c0	Merge remote-tracking branch 'origin/develop' into feature/account-export	4 years ago
Alibek Omarov	d63ec02f31	ConversationView: fix formatting	4 years ago
Alibek Omarov	9b93eef715	ConversationView: fix last_status.account being empty, fix current user being included in group conversations	4 years ago
Alibek Omarov	241bd061fc	ConversationView: add current user to conversations, according to Mastodon behaviour	4 years ago
minibikini	1cc8e94506	Merge branch 'develop' into 'feature/local-only-scope' ... # Conflicts: # CHANGELOG.md	4 years ago
Haelwenn	131f3219e6	Merge branch 'issue/2069' into 'develop' ... [#2069] unread_conversation_count See merge request pleroma/pleroma!2939	4 years ago
feld	1cce1bd729	Merge branch 'issue/2137-user-filters-admin-fe' into 'develop' ... [#2137] admin/users filters See merge request pleroma/pleroma!3016	4 years ago
Egor Kislitsyn	d83c2bd330	Add support for install via `file` and `build_url` params	4 years ago
Egor Kislitsyn	fa902867c0	Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination	4 years ago
Egor Kislitsyn	8542d2efee	Merge remote-tracking branch 'origin/develop' into feature/local-only-scope	4 years ago
Ivan Tashkinov	9f5f7dc9f9	Fixed User.is_discoverable attribute rendering in Admin API User view.	4 years ago
Ivan Tashkinov	da4a1e57b1	@doc fix.	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
Mark Felder	d2b140a525	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261	4 years ago
Egor Kislitsyn	4a2d7a7a5d	Merge remote-tracking branch 'origin/develop' into feature/account-export	4 years ago
feld	1204aaa2e3	Merge branch 'feature/autofollowing' into 'develop' ... autofollowing_nicknames See merge request pleroma/pleroma!3087	4 years ago
Haelwenn	d8d4bd15d0	Merge branch '2236-no-name' into 'develop' ... Resolve "Account cannot be fetched by some instances" Closes #2236 See merge request pleroma/pleroma!3101	4 years ago
feld	03a318af9a	Merge branch 'develop' into 'feature/autofollowing' ... # Conflicts: # CHANGELOG.md	4 years ago
Maksim Pechnikov	d28f72a55a	FrontStatic plug: excluded invalid url	4 years ago
minibikini	1bfd8528bb	Merge branch 'develop' into 'feature/local-only-scope' ... # Conflicts: # CHANGELOG.md	4 years ago
Mark Felder	291189357b	Merge branch 'develop' into feature/account-export	4 years ago
Mark Felder	9e54ef086b	Merge branch 'develop' into feature/account-export	4 years ago
feld	5aff479951	Merge branch '1668-prometheus-access-restrictions' into 'develop' ... [#1668] App metrics endpoint (Prometheus) access restrictions Closes #1668 See merge request pleroma/pleroma!3093	4 years ago
feld	e062329a17	Merge branch 'develop' into 'feature/autofollowing' ... # Conflicts: # CHANGELOG.md	4 years ago
Egor Kislitsyn	03e306785b	Add an API endpoint to install a new frontend	4 years ago
lain	de6d49c8ce	ActivityPub: Add back debug call + explanation.	4 years ago
lain	9542c5d0f4	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name	4 years ago
Haelwenn	073ad7e6d9	Merge branch 'docs/ap_c2s' into 'develop' ... AP C2S: Document our additional endpoints See merge request pleroma/pleroma!3056	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
Ivan Tashkinov	8a68673eed	[#3059] Formatting fix.	4 years ago
Ivan Tashkinov	8a55de1d78	[#3059] Fixed Phoenix 1.5 telemetry processing.	4 years ago
lain	8d251096fe	SideEffects: Correctly handle chat messages sent to yourself	4 years ago
Maksim Pechnikov	ef627b9391	fix module name	4 years ago
Maksim Pechnikov	44e5a57d1a	admin api: added user filters by `actor_types`	4 years ago
Maksim Pechnikov	60663150b5	admin user search: added filter by `actor_type`	4 years ago
Maksim Pechnikov	46b420aa60	need_confirmed -> unconfirmed	4 years ago
Maksim Pechnikov	cf4f393794	added AdminApi.UserController	4 years ago
Maksim Pechnikov	9ef46ce410	added 'unconfirmed' filter to admin/users	4 years ago
Haelwenn	2ca98f2d94	Apply 1 suggestion(s) to 1 file(s)	4 years ago
Egor Kislitsyn	034ac43f3a	Fix credo warnings	4 years ago
Egor Kislitsyn	e87901c424	Merge remote-tracking branch 'origin/develop' into feature/account-export	4 years ago
Egor Kislitsyn	ad605e3e16	Rename `Pleroma.Backup` to `Pleroma.User.Backup`	4 years ago
lain	e97b254c6b	Transmogrifier: Refactor and unify incoming tag handling	4 years ago
lain	39fd4d7639	Transmogrifier: Downcase incoming Hashtags ... Also, set sensitive to true if we have an nsfw hashtag present.	4 years ago
Egor Kislitsyn	98f32cf820	Fix tests	4 years ago
Egor Kislitsyn	76c4e80e5a	Merge branch 'develop' into mutes-blocks-pagination	4 years ago
Egor Kislitsyn	18a91d85e5	Merge branch 'develop' into feature/local-only-scope	4 years ago
Haelwenn	0495a07dc7	Merge branch '2239-mute-fixes' into 'develop' ... ActivityPub: Show own replies to muted users. Closes #2239 See merge request pleroma/pleroma!3084	4 years ago
Ivan Tashkinov	524fb0e4c2	[#1668] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint. ... Added tests and documentation.	4 years ago
Ivan Tashkinov	9ea31b373f	Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11	4 years ago
Ivan Tashkinov	d54233760f	[#3053] Post-merge fix.	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
Mark Felder	1b8fd7e65a	Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts	4 years ago
Haelwenn (lanodan) Monnier	aafdc975bd	federation_status: Add ApiSpec	4 years ago
Haelwenn (lanodan) Monnier	3b5a7a6b14	federation_status: New endpoint showing unreachable instances	4 years ago
Mark Felder	fb056ce05b	Merge branch 'develop' into refactor/discoverable_user_field	4 years ago
Haelwenn	724e4b7f00	Apply 1 suggestion(s) to 1 file(s)	4 years ago
Maksim Pechnikov	2030ffd490	fix test	4 years ago
Maksim Pechnikov	cf53e300f8	added generate the release env to `pleroma.instance gen`	4 years ago
Maksim	e2333f757a	Apply 1 suggestion(s) to 1 file(s)	4 years ago
Maksim	499df7b73a	Apply 1 suggestion(s) to 1 file(s)	4 years ago
Maksim Pechnikov	14054cd004	update task messages	4 years ago
Maksim Pechnikov	20e68b30f0	added generated `pleroma.env`	4 years ago
Egor Kislitsyn	2a475622ee	Add Pleroma.Constants.as_local_public/0	4 years ago
Egor Kislitsyn	4f79bbbc31	Add local-only statuses	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
Mark Felder	1fb9452131	Merge branch 'develop' into feature/account-export	4 years ago
feld	77bca41595	Apply 3 suggestion(s) to 3 file(s)	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
Haelwenn	9a85ec0da0	Merge branch 'refactor/locked_user_field' into 'develop' ... Change user.locked field to user.is_locked See merge request pleroma/pleroma!3077	4 years ago
Mark Felder	ed61002815	Undo API breaking changes	4 years ago
Mark Felder	b001237b79	Finish undoing API breakage	4 years ago
Mark Felder	3242cfef20	Undo API breaking changes	4 years ago
Alex Gleason	dc38dc8472	Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235	4 years ago
Alex Gleason	755f58168b	Merge remote-tracking branch 'upstream/develop' into restrict-domain	4 years ago
Alex Gleason	c3112fd13a	Merge remote-tracking branch 'upstream/develop' into registration-workflow	4 years ago
Egor Kislitsyn	6734abcbd4	Add pagination for Mutes	4 years ago
Haelwenn (lanodan) Monnier	f5d8af1db1	Move Consistency.FileLocation to ./test ... This fixes a compilation fail because of Credo's absence in MIX_ENV=prod	4 years ago
Egor Kislitsyn	33f4f39b1c	Add pagination for Blocks	4 years ago
Mark Felder	b738f70953	Merge branch 'develop' into feature/gen-magic	4 years ago
Mark Felder	64553ebae2	Merge branch 'develop' into chore/elixir-1.11	4 years ago
Mark Felder	409f694e4f	Merge branch 'develop' into refactor/locked_user_field	4 years ago
Mark Felder	4ead0d564f	Merge branch 'develop' into refactor/discoverable_user_field	4 years ago
Mark Felder	8bacdc3680	Change user.discoverable field to user.is_discoverable	4 years ago
Mark Felder	9968b7efed	Change user.locked field to user.is_locked	4 years ago
Alexander Strizhakov	4c4ea9a348	changes after rebase	4 years ago
Alexander Strizhakov	3cb9c88837	migration and warning for RemoteIp plug rename	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	c4c5caedd8	changes after rebase	4 years ago
Alexander Strizhakov	1d0e130cb3	fixes after rebase	4 years ago
Alexander Strizhakov	0f8ab46a0e	fix after rebase	4 years ago
Alexander Strizhakov	207211a2b3	update files consistency after rebase	4 years ago
Alexander Strizhakov	3c8c540707	copyright	4 years ago
Alexander Strizhakov	b6eb7997f5	special namespaces for phoenix and api_spec	4 years ago
Alexander Strizhakov	9f4fe5485b	alias alphabetically order	4 years ago
Alexander Strizhakov	3ef4e9d170	AdminSecretAuthenticationPlug module name	4 years ago
Alexander Strizhakov	c497558d43	AuthenticationPlug module name	4 years ago
Alexander Strizhakov	c1777e7479	BasicAuthDecoderPlug module name	4 years ago
Alexander Strizhakov	970932689f	DigestPlug rename	4 years ago
Alexander Strizhakov	66e0b0065b	Cache plug module name	4 years ago
Alexander Strizhakov	c6baa811d6	EnsureAuthenticatedPlug module name	4 years ago
Alexander Strizhakov	011525a3d1	EnsurePublicOrAuthenticatedPlug module name	4 years ago
Alexander Strizhakov	8e301a4c37	EnsureUserKeyPlug module name	4 years ago
Alexander Strizhakov	d6cb1a3b46	ExpectAuthenticatedCheckPlug module name	4 years ago
Alexander Strizhakov	99e4ed21b1	ExpectPublicOrAuthenticatedCheckPlug module name	4 years ago
Alexander Strizhakov	8c993c5f63	FederatingPlug module name	4 years ago
Alexander Strizhakov	abc3c7689b	HTTPSecurityPlug module name and filename	4 years ago
Alexander Strizhakov	5cd7030076	IdempotencyPlug module name	4 years ago
Alexander Strizhakov	8dfaa54ffc	InstanceStatic module name	4 years ago
Alexander Strizhakov	e2332d92ce	LegacyAuthenticationPlug module name	4 years ago
Alexander Strizhakov	96d320bdfe	OAuthPlug module name	4 years ago
Alexander Strizhakov	a6d8cef33e	OAuthScopesPlug module name	4 years ago
Alexander Strizhakov	15772fda57	PlugHelper module name	4 years ago
Alexander Strizhakov	4b1863ca4e	RateLimiter module name	4 years ago
Alexander Strizhakov	3be8ab5103	RemoteIp module name	4 years ago
Alexander Strizhakov	4b4c0eef36	SessionAuthenticationPlug module name	4 years ago
Alexander Strizhakov	8249b75761	SetFormatPlug module name	4 years ago
Alexander Strizhakov	c97c7d982f	SetLocalePlug module name	4 years ago
Alexander Strizhakov	f7614d4718	SetUserSessionIdPlug module name	4 years ago
Alexander Strizhakov	d36c9e210a	StaticFEPlug module name	4 years ago
Alexander Strizhakov	a07688deb1	TrailingFormatPlug module name	4 years ago
Alexander Strizhakov	a5987155f7	UploadedMedia module name	4 years ago
Alexander Strizhakov	ebd6dd7c53	UserEnabledPlug module name	4 years ago
Alexander Strizhakov	61c609884c	UserFetcherPlug module name	4 years ago
Alexander Strizhakov	1d16cd0c3d	UserIsAdminPlug module name	4 years ago
Alexander Strizhakov	2125286e90	fix for fallback controller	4 years ago
Alexander Strizhakov	e267991a44	renaming LimiterSupervisor	4 years ago
Alexander Strizhakov	6a87f94ee2	renaming ratelimiter supervisor	4 years ago
Alexander Strizhakov	2501793f81	moving plugs into web dir	4 years ago
Alexander Strizhakov	0374df1d12	other files consistency	4 years ago
Alexander Strizhakov	fc7151a9c4	more files renamings	4 years ago
Alexander Strizhakov	e8e4034c48	metadata providers consistency	4 years ago
Alexander Strizhakov	b5b4395e4a	oauth consistency	4 years ago
Alexander Strizhakov	103f3dcb9e	rich media parser ttl files consistency	4 years ago
Alexander Strizhakov	6bf85440b3	mix tasks consistency	4 years ago
Alexander Strizhakov	b573711e9c	file locations consistency	4 years ago
Alex Gleason	83ae45b000	Preload `/api/pleroma/frontend_configurations`, fixes #1932	4 years ago
Alex Gleason	66e00ace7c	Refactor User.post_register_action/1 emails	4 years ago
Alex Gleason	cb29769a22	Make User.confirm/1 and User.approve/1 idempotent	4 years ago
Alex Gleason	6ebec50df6	Refactor User.confirm/1, add more tests	4 years ago
feld	03855f9789	Merge branch 'improve/instance-gen' into 'develop' ... #2159 Support enabling upload filters during instance gen See merge request pleroma/pleroma!3070	4 years ago
Mark Felder	8539e386c3	Add missing Copyright headers	4 years ago
Mark Felder	6c61ef14c3	Support enabling upload filters during instance gen	4 years ago
Alex Gleason	bb8c0614ef	Move admin approval email logic into User.post_register_action/1	4 years ago
Alex Gleason	521e965884	Registration tests	4 years ago
Alex Gleason	28005563f0	Send approval pending email during registration	4 years ago
Alex Gleason	c69b205409	Registration: user state is separate from instance state	4 years ago
Alex Gleason	b2fed59209	Handle User.post_register_action/1 in steps	4 years ago
Ivan Tashkinov	2498e569f1	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances	4 years ago
Ivan Tashkinov	89c595b772	[#3053] Removed target accessibility checks for OStatus endpoints delegating to RedirectController. Added tests.	4 years ago
Ivan Tashkinov	e1eb54d389	[#3053] Rollback of access control changes in ActivityPubController (base actions: :user, :object, :activity).	4 years ago
Mark Felder	3ca98878d2	Deep link to the user account in AdminFE in account confirmation emails	4 years ago
Mark Felder	04b514c567	Merge branch 'develop' into feature/gen-magic	4 years ago
Alex Gleason	9c672ecbb5	Remote Timeline: add Streaming support	4 years ago
Alex Gleason	3f9263fb16	Merge remote-tracking branch 'upstream/develop' into restrict-origin	4 years ago
Haelwenn	74be4de3f6	Merge branch 'fix/2209-remoteip' into 'develop' ... #2209 RemoteIP CIDR helper, config and doc improvements See merge request pleroma/pleroma!3057	4 years ago
Mark Felder	ed6511a086	Lint	4 years ago
Mark Felder	822e4472f3	Fix incorrect use of connect/1 ... Hint from Phoenix 1.4.17, which has a connect/7 shim: lib/phoenix/socket/transport.ex: def connect(endpoint, handler, _transport_name, transport, serializers, params, _pid \\ self()) do IO.warn "Phoenix.Socket.Transport.connect/7 is deprecated" handler.connect(%{ endpoint: endpoint, transport: transport, options: [serializer: serializers], params: params }) end	4 years ago