3355 Commits (0a839d51a7adb034d6514ea647d90546c829813d)

Author	SHA1	Message	Date
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
Alex Gleason	48983e9421	Merge remote-tracking branch 'upstream/develop' into by-approval	4 years ago
Alex Gleason	20d24741af	AdminAPI: Add `PATCH /api/pleroma/admin/users/approve` endpoint	4 years ago
Alex Gleason	33f1b29b2c	AdminAPI: Filter users by `need_approval`	4 years ago
Alex Gleason	b750129da1	AdminAPI: Return `approval_pending` with users	4 years ago
Maksim Pechnikov	1dd767b8c7	Include port in host for signatures	4 years ago
Alex Gleason	a1570ba6ad	AdminAPI: Return `registration_reason` with users	4 years ago
feld	3f65f2ea79	Merge branch 'feature/1922-media-proxy-whitelist' into 'develop' ... Support for hosts with scheme in MediaProxy whitelist setting Closes #1922 See merge request pleroma/pleroma!2754	4 years ago
feld	2909dc873b	Merge branch '1940-admin-token-oauthless-auth' into 'develop' ... [#1940] Reinstated OAuth-less `admin_token` authentication Closes #1940 See merge request pleroma/pleroma!2760	4 years ago
Ivan Tashkinov	124b4709dc	[#1940] Added `admin_token` param (as `admin_api_params/0`) to existing Admin API OpenAPI operations.	4 years ago
feld	246f49d685	Merge branch '1916-transmogrifier-skipping-oddities-in-address-fields' into 'develop' ... Transmogrifier: filtering weirdness in address fields Closes #1916 See merge request pleroma/pleroma!2762	4 years ago
Haelwenn (lanodan) Monnier	858d9fc7e8	MRF Policies: Return a {:reject, reason} instead of {:reject, nil}	4 years ago
Ivan Tashkinov	cf3f8cb72a	[#1940] Reinstated OAuth-less `admin_token` authentication. Refactored UserIsAdminPlug (freed from checking admin scopes presence).	4 years ago
Alex Gleason	5ddf0415c4	Accept `reason` in POST /api/v1/accounts and store in DB	4 years ago
=	b221b640a2	Transmogrifier: filtering weirdness in address fields	4 years ago
Mark Felder	80c21100db	Merge branch 'develop' into refactor/notification_settings	4 years ago
feld	8f9ee694ed	Merge branch 'features/profile-fields-emojo' into 'develop' ... user: Add support for custom emojis in profile fields See merge request pleroma/pleroma!2741	4 years ago
Haelwenn (lanodan) Monnier	2aac92e9e0	Transmogrifier.fix_in_reply_to/2: Use warn for non-fatal fail to get replied-to post	4 years ago
Haelwenn	f918b6f86d	Merge branch '1937-renaming' into 'develop' ... ActivityPub: Don't rename a clashing nickname with the same ap id. Closes #1937 See merge request pleroma/pleroma!2748	4 years ago
Alex Gleason	e4e5577818	Prevent unapproved users from logging in	4 years ago
Alex Gleason	51ab8d0128	Add `account_approval_required` instance setting	4 years ago
Alexander Strizhakov	b376442325	MediaProxy whitelist setting now supports hosts with scheme ... added deprecation warning about using bare domains	4 years ago
Maksim Pechnikov	62fc8eab0d	fix reset confirmation email in admin section	4 years ago
Mark Felder	3c0c1fd2ef	Merge branch 'develop' into issue/1790-updated-oban	4 years ago
lain	93e494ec21	ActivityPub: Don't rename a clashing nickname with the same ap id.	4 years ago
lain	b39eb6ecc5	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information	4 years ago
Haelwenn	4ac6e6283f	Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix' ... # Conflicts: # CHANGELOG.md	4 years ago
Haelwenn (lanodan) Monnier	cc7153cd82	user: Add support for custom emojis in profile fields	4 years ago
lain	8ca1f3e8c6	Merge branch '1723-token-fixes' into 'develop' ... AccountController: Return scope in proper format. Closes #1723 See merge request pleroma/pleroma!2694	4 years ago
lain	f4469dc741	Merge branch 'features/favicons' into 'develop' ... Add support for remote favicons See merge request pleroma/pleroma!2261	4 years ago
Haelwenn	bdc7b60610	Merge branch '1925-muting-reblogs' into 'develop' ... AccountController: Fix muting / unmuting reblogs. Closes #1925 See merge request pleroma/pleroma!2732	4 years ago
eugenijm	c2be0da79f	Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`	4 years ago
lain	00e54f8fe7	ActivityPub: Remove `follow` and fix issues.	4 years ago
lain	9dda8b5427	CommonAPI: Switch to pipeline for following.	4 years ago
lain	172f4aff8e	Transmogrifier: Move following to the pipeline.	4 years ago
lain	7d0e2b3fdd	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline	4 years ago
lain	6335b32aa8	Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop' ... [#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting Closes #1895 See merge request pleroma/pleroma!2731	4 years ago
lain	c0385cf47a	AccountController: Fix muting / unmuting reblogs.	4 years ago
Haelwenn (lanodan) Monnier	312fc55f14	Add [:instances_favicons, :enabled] setting, defaults to false	4 years ago
Haelwenn (lanodan) Monnier	6a679d80c9	Move get_favicon to Pleroma.Instances, use /	4 years ago
Haelwenn (lanodan) Monnier	f6d09fafee	Add support for remote favicons	4 years ago
Haelwenn	a8447c3803	Merge branch '1918-avatar-background-header-reset-2' into 'develop' ... Resolve "Better support for resetting avatar/header/background" Closes #1918 See merge request pleroma/pleroma!2729	4 years ago
lain	8939ff39e4	Merge branch 'remove-twitter-api' into 'develop' ... Remove some TwitterAPI endpoints See merge request pleroma/pleroma!2327	4 years ago
Ivan Tashkinov	3e08e77151	[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.	4 years ago
lain	c8dd973af5	AccountController: Remove unused `update_?` routes. ... These were not documented and are also not used anymore.	4 years ago
lain	59cf78e412	AccountController: Allow removal / reset of user images.	4 years ago
lain	9ad305209a	Merge branch 'bugfix/peertube-videos' into 'develop' ... Fix getting videos from peertube See merge request pleroma/pleroma!2728	4 years ago
Haelwenn	fa0fa4552f	Merge branch 'feature/1392-support-irreversible-filters' into 'develop' ... Updates for Feature/1392 support irreversible filters Closes #1392 See merge request pleroma/pleroma!2186	4 years ago
Haelwenn (lanodan) Monnier	fbb9743a70	Fix getting videos from peertube	4 years ago
Haelwenn	d81acb5f62	Merge branch 'description-limits' into 'develop' ... Add limits to image descriptions See merge request pleroma/pleroma!2724	4 years ago
lain	a6a12b241f	FollowValidator: Add basic validation.	4 years ago
lain	4e3b3998ad	BlockValidation test: Rename.	4 years ago
lain	eb87430803	ObjectValidator tests: Extract block validation tests.	4 years ago
lain	410c1fab31	ObjectValidator tests: Extract update validation tests.	4 years ago
lain	b2e1ea9226	ObjectValidation tests: Extract announce validation tests.	4 years ago
lain	bbaf108aee	ObjectValidator tests: Extract undo validation tests.	4 years ago
lain	168256dce9	ObjectValidation tests: Extract like validation tests.	4 years ago
lain	e6a13d97d0	ObjectValidation tests: Extract delete validation tests.	4 years ago
lain	60d4c6c91d	ObjectValidator tests: Extract emoji react testing	4 years ago
lain	e0baaa967c	ObjectValidator tests: Extract chat tests	4 years ago
lain	0aa4c20d78	ObjectValidator Test: Extract attachments.	4 years ago
lain	28feba8af4	Preloaders: Remove status_net preloader	4 years ago
lain	1963e143c5	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api	4 years ago
lain	ed4f9f6a29	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe-prioritize-json	4 years ago
lain	208baf157a	ActivityPub: Add new 'capabilities' to user.	4 years ago
lain	74b88c0a8b	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information	4 years ago
lain	cc8b4e48d9	InstanceView: Add chat limit, description limit	4 years ago
Alexander Strizhakov	818f3c2393	test fixes	4 years ago
Sergey Suprunenko	8277b29790	Restrict thread statuses that contain user's irreversible filters	4 years ago
Sergey Suprunenko	4a8c26654e	Restrict statuses that contain user's irreversible filters	4 years ago
lain	cf56655614	Streamer: Don't filter out announce notifications.	4 years ago
Mark Felder	4695bdd81b	Merge branch 'develop' into issue/1790-updated-oban	4 years ago
lain	c2a052a346	Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop' ... MastoAPI 2.9.0: status text on deletion See merge request pleroma/pleroma!2690	4 years ago
lain	d3efb50262	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text	4 years ago
lain	945e75c8e8	SearchController: Trim query.	4 years ago
lain	e3b5559780	AccountController: Make setting accepts_chat_messages possible.	4 years ago
lain	4a7b89e372	ChatMessageValidator: Additional validation.	4 years ago
lain	5c0bf4c472	ActivityPub: Ingest information about chat acceptance.	4 years ago
lain	26a7cc3f00	UserView: Add acceptsChatMessages field	4 years ago
lain	db76c26469	AccountViewTest: Fix test.	4 years ago
lain	3250228be9	AccountView: Add 'accepts_chat_messages' to view.	4 years ago
Mark Felder	8121e46f25	Merge branch 'develop' into activation-meta	4 years ago
Ivan Tashkinov	61180ab6f4	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # config/config.exs # lib/pleroma/web/media_proxy/media_proxy.ex # lib/pleroma/web/media_proxy/media_proxy_controller.ex	4 years ago
lain	311b7c19d0	Streamer: Align announce streaming with polling.	4 years ago
lain	61fe94d698	SideEffects: Refactor.	4 years ago
lain	691742e62d	Revert "Merge branch 'avatar-removing' into 'develop'" ... This reverts merge request !2701	4 years ago
Mark Felder	5a8e0208b1	Add fields limits to instance metadata, add tests	4 years ago
Mark Felder	d69af7f742	Rename user.settings column ... This is used exclusively by MastoFE/GlitchFE now	4 years ago
lain	0176b7bca2	Merge branch 'preload-fixups-2' into preloadfixups	4 years ago
lain	2382a2a151	Preload: Load the correct instance panel	4 years ago
Egor Kislitsyn	3aa04b81c4	Test default "content-type" for CastAndValidate	4 years ago
Egor Kislitsyn	4a306720e8	Merge branch 'develop' into remove-twitter-api	4 years ago
lain	651f269568	Merge branch 'avatar-removing' into 'develop' ... UpdateCredentialsTest: Add test for removing profile images. See merge request pleroma/pleroma!2701	4 years ago
lain	e64d08439e	UpdateCredentialsTest: Add test for removing profile images.	4 years ago
lain	8630a6c7f5	Preloaders: Use strings as keys.	4 years ago
lain	a19f8778af	User preloader: Put user info at correct key	4 years ago
lain	577da132da	Merge branch '1031-parent-visible' into 'develop' ... Resolve "Add `pleroma.parent_visible` to the status view" Closes #1031 See merge request pleroma/pleroma!2679	4 years ago
Mark Felder	ce85db41a3	Lint	4 years ago
Haelwenn (lanodan) Monnier	244655e884	MastoAPI: Show source field when deleting	4 years ago
Mark Felder	69848d5c97	Rename notification "privacy_option" setting	4 years ago
Haelwenn	bf1c5e255a	Merge branch 'block-handling' into 'develop' ... Handle blocks with the pipeline See merge request pleroma/pleroma!2685	4 years ago