919 Commits (b1fc9fe95164add471da2e1906d5fbaa980763a3)

Author	SHA1	Message	Date
rinpatch	77c239f309	Import stable commits into develop after releasing 2.2.0 ... Updates the frontend bundle and syncs the changelog.	4 years ago
Mark Felder	5cbaa76fd6	Document S3 and Elixir 1.11 compat fix	4 years ago
Haelwenn	28da36975d	Merge branch 'bugfix/instance-gen_exiftool' into 'develop' ... pleroma.instance: Fix Exiftool module name See merge request pleroma/pleroma!3143	4 years ago
Haelwenn (lanodan) Monnier	e2f573d68b	pleroma.instance: Fix Exiftool module name	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
rinpatch	99edfba3da	Polish the changelog a bit and specify release date	4 years ago
lain	b0e4e0cf2a	Changelog: Add info about title injection	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
rinpatch	6166ecdbc8	CHANGELOG.md: Add an entry for the spoofing fix	4 years ago
Haelwenn	4d693b5e54	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	48f7e12e6c	Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' into 'develop' ... OStatus / Static FE access control fixes See merge request pleroma/pleroma!3053	4 years ago
feld	86b4149a13	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
lain	5ddf0be208	Changelog: Add info about admin email user link changes.	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
lain	eb1e1e7494	Changelog: Add info about federation status endpoint	4 years ago
rinpatch	7058cac1c2	Merge branch '2257-self-chat' into 'develop' ... Resolve "Can't message yourself in a chat (but can start it)" Closes #2257 See merge request pleroma/pleroma!3099	4 years ago
lain	329aa19c9f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain	4 years ago
lain	f09bb814a9	Changelog: Add info about poll view changes	4 years ago
lain	91f6c32430	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4	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
eugenijm	8e41baff40	Add idempotency_key to the chat_message entity.	4 years ago
Egor Kislitsyn	d2113428c0	Merge remote-tracking branch 'origin/develop' into feature/account-export	4 years ago
Alibek Omarov	5591dc0248	Add entry in changelog	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	fa902867c0	Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination	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
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
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
lain	a999e8b0b7	Changelog: Add info about whitespace name remote users.	4 years ago
lain	3fdc2a0d1e	Changelog: Add information about self-chats	4 years ago
Maksim Pechnikov	add26817e3	update changelog	4 years ago
rinpatch	fb0e340363	Rip out fedsockets from the release branch	4 years ago
Egor Kislitsyn	e87901c424	Merge remote-tracking branch 'origin/develop' into feature/account-export	4 years ago
Egor Kislitsyn	76c4e80e5a	Merge branch 'develop' into mutes-blocks-pagination	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
Mark Felder	d16336e7fb	Document autofollowing_nicknames	4 years ago
Mark Felder	cb3ee4d543	Fix duplicate Added sections in the changelog	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
rinpatch	6c1bc9ca39	CHANGELOG.md: prepare 2.2.0 changelog	4 years ago
Mark Felder	1fb9452131	Merge branch 'develop' into feature/account-export	4 years ago
Egor Kislitsyn	2b58b0dbce	Update CHANGELOG	4 years ago