152 Commits (5de65ce3e89ba2f229170ed18933c99e5caa8dff)

Author	SHA1	Message	Date
Ivan Tashkinov	1b49b8efe5	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md	4 years ago
Alexander Strizhakov	c369d2b930	support for with_relationships parameter ... in /api/v1/mutes and /api/v1/accounts/:id endpoints	4 years ago
Ivan Tashkinov	60b4654038	Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube). ... Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56.	4 years ago
Egor Kislitsyn	bddb01bded	Add tests	4 years ago
Egor Kislitsyn	793fc77b16	Add active user count	4 years ago
Mark Felder	e854c35e65	Convert tests to all use clear_config instead of Pleroma.Config.put	4 years ago
lain	229acae6c3	Merge branch 'develop' into '2435-list-multiple-users' ... # Conflicts: # CHANGELOG.md	4 years ago
Alexander Strizhakov	875fbaae35	support for expires_in/expires_at in filters	4 years ago
Haelwenn	250e202098	Merge branch 'fix/missing-own_votes' into 'develop' ... Include own_votes in the poll data See merge request pleroma/pleroma!3274	4 years ago
Ivan Tashkinov	694d98be55	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	4 years ago
Alexander Strizhakov	3f3d64acbf	little refactor and tests ... for voted & own_votes fields in polls	4 years ago
Mark Felder	537ba1c5e0	Merge branch 'develop' into refactor/deactivated_user_field	4 years ago
Mark Felder	6bfd497f4a	Include own_votes in the poll data	4 years ago
Ivan Tashkinov	218c519606	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # test/pleroma/web/mastodon_api/views/status_view_test.exs	4 years ago
Mark Felder	80ccdb56f6	Make tag urls absolute	4 years ago
Ivan Tashkinov	2634a16b4c	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md	4 years ago
feld	958a7f6ed0	Merge branch 'fix/reblog-api' into 'develop' ... Fix Reblog API Closes #2423 See merge request pleroma/pleroma!3261	4 years ago
Mark Felder	28581e03ad	Merge branch 'develop' into refactor/deactivated_user_field	4 years ago
Mark Felder	44a86951a3	Merge branch 'develop' into refactor/approval_pending_user_field	4 years ago
Egor Kislitsyn	1b79dce7bc	Fix Reblog API ... Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.	4 years ago
Lain Soykaf	bdfd72630f	ListController: Fix being unable to add / remove users.	4 years ago
Mark Felder	d36182c088	Change user.confirmation_pending field to user.is_confirmed	4 years ago
Mark Felder	ebd7d1365b	Make setting user activation status explicit	4 years ago
Mark Felder	860b5c7804	Change user.deactivated field to user.is_active	4 years ago
Mark Felder	f7e59c28ed	Change user.approval_pending field to user.is_approved	4 years ago
Ivan Tashkinov	e350898828	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	4 years ago
Haelwenn (lanodan) Monnier	c4439c630f	Bump Copyright to 2021 ... grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'	4 years ago
lain	cf0eb0c1c5	Merge branch 'object-normalize-refactor' into 'develop' ... Object: Rework how Object.normalize works See merge request pleroma/pleroma!3229	4 years ago
lain	20a269ed69	Merge branch 'fix/pagination-regression' into 'develop' ... Do not try to guess which pagination we need by the existence of an :offset param. Closes #2399 See merge request pleroma/pleroma!3230	4 years ago
lain	e802b48d55	User: Use ObjectID type to validate also-known-as field	4 years ago
lain	95a0ae8a35	AccountControllerTest: Fix test logic	4 years ago
Mark Felder	0e93775ed0	Add test to validate profile pagination works with keyset	4 years ago
lain	e1e7e4d379	Object: Rework how Object.normalize works ... Now it defaults to not fetching, and the option is named.	4 years ago
Alex Gleason	cbce880076	Merge remote-tracking branch 'upstream/develop' into aliases	4 years ago
Haelwenn	3966add048	Revert "Merge branch 'features/hashtag-column' into 'develop'" ... This reverts merge request !2824	4 years ago
Haelwenn	b122b6ffa3	Merge branch 'features/hashtag-column' into 'develop' ... Insert text representation of hashtags into object["hashtags"] See merge request pleroma/pleroma!2824	4 years ago
Ivan Tashkinov	4134abef63	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	4 years ago
Haelwenn (lanodan) Monnier	acb03d591b	Insert text representation of hashtags into object["hashtags"] ... Includes a new mix task: pleroma.database fill_old_hashtags	4 years ago
Ivan Tashkinov	ee221277b0	Encapsulation of tags / hashtags fetching from objects.	4 years ago
lain	9d5ce82221	Test: More async/sync tweaks.	4 years ago
lain	9ba60f70d2	Tests: Make as many tests as possible async. ... In general, tests that match these criteria can be made async: - Doesn't use real Cachex. - Doesn't write to the Config / Application Environment. - Uses Mock. Using Mox is fine. - Uses the streamer.	4 years ago
lain	b4b68b71fc	Tests: Remove unneeded explicit cachex use. ... Only use cachex when we're actually testing it.	4 years ago
lain	477c6c8e55	Merge branch 'auth-improvements' into 'develop' ... Cookie auth rework / Auth subsystem refactoring and tweaks Closes pleroma/secteam/pleroma#3 See merge request pleroma/pleroma!3112	4 years ago
Ivan Tashkinov	a010c5b16a	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements	4 years ago
Egor Kislitsyn	35ba48494f	Stream follow updates	4 years ago
rinpatch	fc9ebe5073	Search tests: Use on_exit for restoring `persistent_term` state ... Otherwise if the assertion failed, the code below which resets the state would never be reached	4 years ago
Ivan Tashkinov	f1b07a2b2b	OAuth form user remembering feature. Local MastoFE login / logout fixes.	4 years ago
lain	67b15cc033	Search: Save detected pg version in a persistent term.	4 years ago
lain	f9a4cf2097	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch	4 years ago
lain	8532325d65	SearchController Test: Fix test.	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
lain	783fa797bb	SearchController Test: Fix test	4 years ago
minibikini	6669ac5bf7	Merge branch 'develop' into 'hide-muted-reactions' ... # Conflicts: # CHANGELOG.md	4 years ago
Mark Felder	415481a4d9	Add test for POST when push is disabled ... Also group together the tests verifiying failure when disabled	4 years ago
Mark Felder	3eaa5335c9	Revert adding extra alert types here	4 years ago
Mark Felder	d9732fb7d3	Fix incorrect test description	4 years ago
Mark Felder	ff7a4b6aa2	Test that we ignore invalid subscription alert types separately.	4 years ago
Mark Felder	30f140e570	Ensure all supported push notification subscription alert types are tested	4 years ago
Mark Felder	67a6abd071	Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions	4 years ago
Egor Kislitsyn	79d2d3f609	Merge branch 'develop' into hide-muted-reactions	4 years ago
lain	fec1ed802e	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope	4 years ago
Mark Felder	b1466661eb	Use absolute URLs to thumbnail and background in /api/v1/instance	4 years ago
Egor Kislitsyn	fb41bd1a85	Hide reactions from muted and blocked users	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
Mark Felder	2254e5e595	Render blurhashes in Mastodon API	4 years ago
Egor Kislitsyn	0118ccb53c	Add `local` visibility	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
lain	dd2b3a8da9	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes	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	329aa19c9f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain	4 years ago
lain	c7bcbfbc1d	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope	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
Egor Kislitsyn	1a98476f48	Remove unused aliases	4 years ago
Alibek Omarov	1042c30fa5	ConversationViewTest: fix test	4 years ago
Alibek Omarov	0552a08dfd	ConversationControllerTest: fix test, 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	630eb0f939	ConversationViewTest: fix test #2	4 years ago
Alibek Omarov	149589c842	ConversationViewTest: fix test	4 years ago
Alibek Omarov	390a12d4c8	ConversationControllerTest: fix test	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
Egor Kislitsyn	fa902867c0	Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination	4 years ago
minibikini	1bfd8528bb	Merge branch 'develop' into 'feature/local-only-scope' ... # Conflicts: # CHANGELOG.md	4 years ago
Egor Kislitsyn	76c4e80e5a	Merge branch 'develop' into mutes-blocks-pagination	4 years ago
Ivan Tashkinov	9ea31b373f	Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11	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
Alex Gleason	83770b7b39	Merge remote-tracking branch 'upstream/develop' into aliases	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	ed61002815	Undo API breaking changes	4 years ago
Alex Gleason	755f58168b	Merge remote-tracking branch 'upstream/develop' into restrict-domain	4 years ago
Alex Gleason	7d8f610720	Merge remote-tracking branch 'upstream/develop' into aliases	4 years ago
Mark Felder	8b20c4d275	Missed tests	4 years ago
Egor Kislitsyn	6734abcbd4	Add pagination for Mutes	4 years ago
Egor Kislitsyn	33f4f39b1c	Add pagination for Blocks	4 years ago
Mark Felder	40f3cdc030	JPEG content_type must be image/jpeg	4 years ago