3355 Commits (0a839d51a7adb034d6514ea647d90546c829813d)

Author	SHA1	Message	Date
Egor Kislitsyn	249f21dcbb	Admin API: Filter out unapproved users when the `active` filter is on	4 years ago
lain	66122a11b5	AccountController: Build the correct update activity. ... Will fix federation issues.	4 years ago
lain	d0fc48ea67	Merge branch 'develop' into 'feat/floki-fast-html-2' ... # Conflicts: # config/config.exs	4 years ago
Mark Felder	54e2af8293	Merge branch 'develop' into fix/ldap-auth-issues	4 years ago
Alex Gleason	673e8e3ac1	Force 204 responses to be empty, fixes #2029	4 years ago
rinpatch	7e23a48d38	rel me test: fix HTML so broken browsers (and therefore ... lexbor) refuse to parse it like mochiweb does	4 years ago
rinpatch	325c7c924b	Make Floki use fast_html	4 years ago
lain	34cbe9f44a	Merge branch 'features/poll-validation' into 'develop' ... Poll and votes pipeline ingestion Closes #1362 and #1852 See merge request pleroma/pleroma!2635	4 years ago
Maksim Pechnikov	8e90cc58e7	Merge branch 'develop' into feature/update-welcome-setting-in-description	4 years ago
Maksim Pechnikov	6e6276b4f8	added test	4 years ago
Ivan Tashkinov	56ddf20208	Removed unused alias.	4 years ago
Ivan Tashkinov	1298a2ea2c	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # mix.lock	4 years ago
lain	10b0e55acf	Merge branch 'whole-word-filter-hotfix' into 'develop' ... Update filter_view.ex to return whole_word actual value See merge request pleroma/pleroma!2851	4 years ago
Mary Kate	f785dba09b	changelog for filter whole_word fix	4 years ago
Mary Kate	d6ab9f2132	update test for whole_word in filter	4 years ago
lain	9c96fc052a	CommonValidations: Extract modification right checker	4 years ago
Mark Felder	0f9aecbca4	Remove fallback to local database when LDAP is unavailable. ... In many environments this will not work as the LDAP password and the copy stored in Pleroma will stay synchronized.	4 years ago
Mark Felder	f7146583e5	Remove LDAP mail attribute as a requirement for registering an account	4 years ago
lain	19c108170e	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation	4 years ago
lain	474aba984f	Merge branch 'unique-app-id' into 'develop' ... Add unique index for apps.client_id, fixes #2022 Closes #2022 See merge request pleroma/pleroma!2844	4 years ago
rinpatch	b1b6a7dfa8	Merge branch 'deactivated-user-posts' into 'develop' ... Deactivated user posts Closes #2011 See merge request pleroma/pleroma!2845	4 years ago
Alex Gleason	184742af5e	Unique apps.client_id for new installations, fixes #2022	4 years ago
Egor Kislitsyn	91fbb5b21f	Fix ActivityExpirationPolicy	4 years ago
lain	878c7f3f30	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation	4 years ago
lain	36aa34a1a8	MastodonAPITest: Do the needful	4 years ago
Haelwenn (lanodan) Monnier	0f088d8ce3	question_validator: Allow content to be an empty-string (blank)	4 years ago
lain	1a00713744	CommonValidations: Treat deactivated users as not present.	4 years ago
lain	0cfadcf2ca	TransmogrifierTest: Add test for deactivated users	4 years ago
lain	e92c040ad3	CommonAPITest: Add test that deactivated users can't post.	4 years ago
lain	28584bb224	Merge branch 'email-blacklist' into 'develop' ... Add email blacklist, fixes #1404 Closes #1404 See merge request pleroma/pleroma!2837	4 years ago
Alex Gleason	4f57e85ab9	Email blacklist: Update phrasing again	4 years ago
Alex Gleason	058daf498f	Email blacklist: Update response phrasing	4 years ago
lain	56b5b9aa27	Merge branch 'follower-mrf-again' into 'develop' ... Follower mrf again See merge request pleroma/pleroma!2833	4 years ago
lain	de3bdc63ad	AccountControllerTest: Add test for message returned.	4 years ago
lain	5876d5123c	Merge branch 'object-age-fix' into 'develop' ... MRF Object Age Policy: Don't break on messages without cc/to See merge request pleroma/pleroma!2840	4 years ago
lain	10c792110e	MRF Object Age Policy: Don't break on messages without cc/to	4 years ago
lain	4b18a07392	Revert "Merge branch 'revert-1ac0969c' into 'develop'" ... This reverts merge request !2825	4 years ago
lain	010d77ec85	Revert "Merge branch 'mrf-silence-2' into 'develop'" ... This reverts merge request !2820	4 years ago
lain	1ac0969c72	Merge branch 'mrf-silence-2' into 'develop' ... MRF silencing alternative solution See merge request pleroma/pleroma!2820	4 years ago
Haelwenn (lanodan) Monnier	ac2598307d	Merge remote-tracking branch 'pleroma/develop' into features/poll-validation	4 years ago
Ivan Tashkinov	27b0a8b155	[#1985] Prevented force login on registration if account approval and/or email confirmation needed. ... Refactored login code in OAuthController, reused in AccountController. Added tests.	4 years ago
lain	1dd162a5f7	SimplePolicy: Fix problem with DM leaks.	4 years ago
Haelwenn	d1cf1108ac	Merge branch 'render-preview-cards-in-chats' into 'develop' ... Render preview cards in chats See merge request pleroma/pleroma!2816	4 years ago
Haelwenn	87fe31fb5c	Merge branch '1993-confirm-users-on-registration' into 'develop' ... AccountController: Don't explicitly ask to keep users unconfirmed. Closes #1993 See merge request pleroma/pleroma!2809	4 years ago
lain	781b270863	ChatMessageReferenceView: Display preview cards.	4 years ago
lain	873ff5ce14	Merge branch 'hide-reactions' into 'develop' ... Let favourites and emoji reactions optionally be hidden See merge request pleroma/pleroma!2804	4 years ago
lain	e2e66e50d3	SimplePolicyTest: Add test for leaking DMs.	4 years ago
Maksim Pechnikov	cff7bb5cd4	Merge branch 'develop' into issue/1933-update-dependency	4 years ago
Alex Gleason	702f0fb822	Merge remote-tracking branch 'upstream/develop' into mrf-silence	4 years ago
Alex Gleason	93638935d7	SimpleMRF: :silence --> :followers_only	4 years ago
Alex Gleason	00d090004e	:show_reactions, refactor the other test	4 years ago
Alex Gleason	026a51cb27	:show_reactions, add CHANGELOG.md, refactor test	4 years ago
Alex Gleason	d8a01c9432	Merge remote-tracking branch 'upstream/develop' into hide-reactions	4 years ago
lain	d9bf2c58df	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration	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	c25c21dd22	AccountController: Don't explicitly ask to keep users unconfirmed. ... Confirmation is set in User.register_changeset based on the config settings.	4 years ago
lain	edf8b6abfe	EnsureRePrepended: Don't break on chat messages.	4 years ago
Maksim Pechnikov	15b8446cdb	updated dev & test packages	4 years ago
Alex Gleason	3c90f7f715	SimpleMRF: Let instances be silenced	4 years ago
Alex Gleason	3b7c454418	Let favourites and emoji reactions optionally be hidden	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
lain	9e6f4694dd	Pipeline: Unify embedded_object / object_data, move to validator.	4 years ago
Alex Gleason	6931dbfa58	Merge remote-tracking branch 'upstream/develop' into by-approval	4 years ago
Lain Soykaf	1dd6de03ee	CommonAPI Tests: Check that undoing objects federates them as embeds.	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
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
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
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 Soykaf	0cb9e1da74	StatusView: Handle badly formatted emoji reactions.	4 years ago
Mark Felder	109836306c	Test that Emoji Packs can be listed when instance is not public	4 years ago
Ivan Tashkinov	b8021016eb	[#2497] Resolved merge conflicts.	4 years ago
Egor Kislitsyn	bdb3375933	Allow unblocking a domain via query params	4 years ago
Ivan Tashkinov	bdf57b8ef4	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # config/config.exs # lib/pleroma/web/media_proxy/media_proxy.ex # mix.lock # test/web/media_proxy/media_proxy_test.exs	4 years ago
Alex Gleason	48f8b26c92	OpenAPI: Add :id to follower/following endpoints, fixes #1958	4 years ago
Alex Gleason	15f8921b11	Test that unapproved users can never log in regardless of admin settings	4 years ago
Alex Gleason	9ce95fa68f	Use `approval_required` in /api/v1/instance	4 years ago
Mark Felder	9d30bacace	Merge branch 'develop' into refactor/notification_settings	4 years ago
rinpatch	0fe36b311c	Merge branch 'features/mrf-reasons' into 'develop' ... Add rejection reason to our MRFs See merge request pleroma/pleroma!2759	4 years ago
Haelwenn (lanodan) Monnier	d29b8997f4	MastoAPI: fix & test giving MRF reject reasons	4 years ago
Maksim Pechnikov	3f8bff8d6b	Merge branch 'develop' into issue/sign-authority	4 years ago
Haelwenn (lanodan) Monnier	e4beff90f5	Create Question: Add context field to create	4 years ago
Haelwenn (lanodan) Monnier	922ca23298	Question: Add tests on HTML tags in options ... Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/1362	4 years ago
Haelwenn (lanodan) Monnier	c19bdc811e	Fix attachments in polls	4 years ago
lain	040524c09f	Merge branch 'tests/apc2s-update_outbox' into 'develop' ... AP C2S tests: Make sure you can't use another user's AP id See merge request pleroma/pleroma!2767	4 years ago
Haelwenn (lanodan) Monnier	39870d99b8	transmogrifier tests: Move & enhance in specialised modules	4 years ago
Haelwenn (lanodan) Monnier	82895a4012	SideEffects: port ones from ActivityPub.do_create and ActivityPub.insert	4 years ago
Haelwenn (lanodan) Monnier	10bd08ef07	transmogrifier_test: test date, anyOf and oneOf completely	4 years ago
Haelwenn (lanodan) Monnier	7bcd7a9595	QuestionValidator: Create	4 years ago
Haelwenn (lanodan) Monnier	6d8427cca2	AP C2S tests: Make sure you can't use another user's AP id	4 years ago
Alex Gleason	0d004a9d04	Email admins when a new unapproved account is up for review	4 years ago