1465 Commits (73609211a425922a5068d3912a36b82abe24e12c)

Author	SHA1	Message	Date
lain	c37118e6f2	Conversations: A few refactors	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
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
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
Mark Felder	fb056ce05b	Merge branch 'develop' into refactor/discoverable_user_field	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
Mark Felder	b001237b79	Finish undoing API breakage	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
Egor Kislitsyn	6734abcbd4	Add pagination for Mutes	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	1d0e130cb3	fixes after rebase	4 years ago
Alexander Strizhakov	9f4fe5485b	alias alphabetically order	4 years ago
Alexander Strizhakov	011525a3d1	EnsurePublicOrAuthenticatedPlug module name	4 years ago
Alexander Strizhakov	a6d8cef33e	OAuthScopesPlug module name	4 years ago
Alexander Strizhakov	4b1863ca4e	RateLimiter module name	4 years ago
Mark Felder	04b514c567	Merge branch 'develop' into feature/gen-magic	4 years ago
Alex Gleason	3f9263fb16	Merge remote-tracking branch 'upstream/develop' into restrict-origin	4 years ago
Alex Gleason	77b1ea68a7	Merge remote-tracking branch 'upstream/develop' into aliases	4 years ago
Mark Felder	ed6511a086	Lint	4 years ago
Mark Felder	636c00037d	Fix duplicate @doc entries	4 years ago
Roman Chvanikov	8f5589cf66	Merge develop	4 years ago
Alex Gleason	3104367931	Merge remote-tracking branch 'upstream/develop' into email-fix-develop	4 years ago
Alex Gleason	23d5d7cf59	Fix #2172 HTTP error on password reset	4 years ago
Roman Chvanikov	4987ee6256	Merge branch 'develop' into feature/expire-mutes	4 years ago
Ivan Tashkinov	60b025b782	[#2074] OAuth scope checking in Streaming API.	4 years ago
rinpatch	608017b7df	Merge branch 'fix/streaming-termination-errors' into 'develop' ... Fix two pseudo-errors in websocket handler Closes #2131 See merge request pleroma/pleroma!2982	4 years ago
Ivan Tashkinov	d9fb5bc08a	Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream	4 years ago
Ivan Tashkinov	a781f41f96	[#2497] Media preview proxy: misc. improvements (`static` param support, dynamic fifo pipe path), refactoring.	4 years ago
Roman Chvanikov	c5830ac037	Merge develop	4 years ago
Alex Gleason	9733c9d065	Merge remote-tracking branch 'upstream/develop' into chat-moderation	4 years ago
Alex Gleason	f88dc1937e	MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1	4 years ago
Ivan Tashkinov	0bda85857e	Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy ... # Conflicts: # lib/pleroma/instances/instance.ex	4 years ago
Mark Felder	55562ca936	Merge branch 'develop' into feature/gen-magic	4 years ago
Alexander Strizhakov	9bf1065a06	schedule activity expiration in Oban	4 years ago
rinpatch	01fa68fe45	Websocket handler: fix never matching code on failed auth ... `:cowboy_req.reply` does not return tuples since 2.0, see https://ninenines.eu/docs/en/cowboy/2.4/manual/cowboy_req.reply/	4 years ago
rinpatch	e16e8f9816	Websocket handler: do not raise if handler is terminated before switching protocols ... Closes #2131	4 years ago
rinpatch	cb06e98da2	websocket handler: Do not log client ping frames as errors	4 years ago
Roman Chvanikov	91b9985e1c	Pass expires_in param from status controller	4 years ago
feld	43b07c31cb	Merge branch 'fix/2095-deactivated-account-reset' into 'develop' ... Disallow password resets for deactivated accounts Closes #2095 See merge request pleroma/pleroma!2935	4 years ago
Roman Chvanikov	c56e3d4f3b	Add expires_in param for account mutes	4 years ago
rinpatch	ea4b6c64d6	Merge branch 'feat/rich-media-improvements' into 'develop' ... Rich media improvements See merge request pleroma/pleroma!2944	4 years ago
Ivan Tashkinov	60c925380d	[#2497] Added support for enforcing output format for media proxy preview, used for avatar_static & header_static (AccountView).	4 years ago
Mark Felder	85446cc30c	Merge branch 'develop' into media-preview-proxy	4 years ago
feld	d1a6f67b1d	Merge branch 'fix/2095-deactivated-account-reset' into 'develop' ... Disallow password resets for deactivated accounts Closes #2095 See merge request pleroma/pleroma!2935	4 years ago
lain	119e11f455	Merge branch 'bugfix/mastoapi-lists' into 'develop' ... Fix removing an account from a list Closes #2103 See merge request pleroma/pleroma!2940	4 years ago
lain	581f382e71	ListController: DRY up stuff.	4 years ago
Mark Felder	cbf7f0e029	Disallow password resets for deactivated accounts. ... Ensure all responses to password reset events are identical.	4 years ago
rinpatch	d48fc90978	StatusView: Start fetching rich media cards as soon as possible	4 years ago
Haelwenn (lanodan) Monnier	d872858046	Fix removing an account from a list ... Mastodon (Frontend) changed a different method for deletes, keeping old format as mastodon documentation is too loose	4 years ago
rinpatch	126461942b	User table: ensure bio is always a string ... Gets rid of '|| ""' in multiple places and fixes #2067	4 years ago
Maksim Pechnikov	0d5088c2b8	remove `unread_conversation_count` from User	4 years ago
Mark Felder	3737f38432	Merge branch 'develop' into feld-2168-media-preview-proxy	4 years ago
Mark Felder	67c79394e8	Support static avatars and header images with Mediaproxy Preview	4 years ago
lain	cfc99fe05c	TimelineController: Keys are atoms now. ... Closes #2078 Closes #2070	4 years ago
Mark Felder	479578b148	Merge branch 'develop' into feld-2168-media-preview-proxy	4 years ago
Haelwenn (lanodan) Monnier	36c125a071	Pipeline Ingestion: Event	4 years ago
Ivan Tashkinov	27e7999a15	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	4 years ago
Ivan Tashkinov	95529ab709	[#2046] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).	4 years ago
Ivan Tashkinov	2def3cbf41	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # config/config.exs # mix.lock	4 years ago
lain	66122a11b5	AccountController: Build the correct update activity. ... Will fix federation issues.	4 years ago
Alex Gleason	4af1b80381	Clean up account aliases	4 years ago
Alex Gleason	1a5a7ba6e8	Merge remote-tracking branch 'upstream/develop' into aliases	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
Ivan Tashkinov	1298a2ea2c	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # mix.lock	4 years ago
Alex Gleason	cc196e2cd5	Merge remote-tracking branch 'upstream/develop' into restrict-domain	4 years ago
lain	f889400d05	Questions: Move fixes to validators.	4 years ago
lain	70522989d9	Apply 1 suggestion(s) to 1 file(s)	4 years ago
MK Fain	f341a8e142	Update filter_view.ex to return whole_word actual value	4 years ago
lain	878c7f3f30	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation	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
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
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
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
Alex Gleason	3b7c454418	Let favourites and emoji reactions optionally be hidden	4 years ago
Alex Gleason	6931dbfa58	Merge remote-tracking branch 'upstream/develop' into by-approval	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
Ivan Tashkinov	9ea51a6de5	[#2791] AccountView: renamed `:force` option to `:skip_visibility_check`.	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
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	afa8b469ed	Allow restricting public timeline by instance	4 years ago
Alex Gleason	d0eb43b58b	Add account aliases	4 years ago
Mark Felder	20a496d2cb	Expose the post formats in /api/v1/instance	4 years ago
Alex Gleason	9ce95fa68f	Use `approval_required` in /api/v1/instance	4 years ago
Haelwenn (lanodan) Monnier	d29b8997f4	MastoAPI: fix & test giving MRF reject reasons	4 years ago
Haelwenn (lanodan) Monnier	173f69c854	question_validator: fix for mastodon poll expiration ... Mastodon activities do not have a "closed" field, this could be seen on https://pouet.it/users/lanodan_tmp/statuses/104345126997708380 which runs Mastodon 3.1.4 (SDF runs 3.1.2)	4 years ago
Haelwenn (lanodan) Monnier	4644a8bd10	Fix multiple-choice poll detection	4 years ago
Alex Gleason	51ab8d0128	Add `account_approval_required` instance setting	4 years ago
lain	b39eb6ecc5	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information	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
lain	6d688f14fa	Merge branch 'bugfix/status-deletion' into 'develop' ... #1920 fix activity deletion See merge request pleroma/pleroma!2721	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
Ivan Tashkinov	a6495f4a68	[#1895] credo fix.	4 years ago
lain	c0385cf47a	AccountController: Fix muting / unmuting reblogs.	4 years ago
Ivan Tashkinov	3f8370a285	[#1895] Applied code review suggestion.	4 years ago
Haelwenn (lanodan) Monnier	312fc55f14	Add [:instances_favicons, :enabled] setting, defaults to false	4 years ago
Haelwenn (lanodan) Monnier	013e2c5057	Use instances table instead of Cachex	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
Ivan Tashkinov	3e08e77151	[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.	4 years ago
lain	59cf78e412	AccountController: Allow removal / reset of user images.	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
Roman Chvanikov	fc1f34b851	Delete activity before sending response to client	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	3250228be9	AccountView: Add 'accepts_chat_messages' to view.	4 years ago
Mark Felder	d44ec2bf4c	Remove camelCase from the keys	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
Mark Felder	5a8e0208b1	Add fields limits to instance metadata, add tests	4 years ago
Mark Felder	0883a706dc	Merge branch 'develop' into activation-meta	4 years ago
lain	59540131c1	Credo fixes.	4 years ago
lain	e374872fe7	AccountOperation: Correctly describe create response.	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
Haelwenn (lanodan) Monnier	244655e884	MastoAPI: Show source field when deleting	4 years ago
lain	f378e93bf4	AccountController: Return scope in proper format.	4 years ago
lain	8cfb58a8c0	AccountController: Extract blocking to CommonAPI.	4 years ago
lain	35f6770436	StatusView: Add pleroma.parent_visible	4 years ago
lain	98af7b59e4	Merge branch 'update-validator' into 'develop' ... Update validator See merge request pleroma/pleroma!2668	4 years ago
Haelwenn	c7d69e9256	Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop' ... Moving mrf settings from instance to separate mrf group Closes #1631 See merge request pleroma/pleroma!2320	4 years ago
lain	2c603f2009	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator	4 years ago
Mark Felder	df5e048cbb	Do not need a function to provide fallback value with default defined in config.exs	4 years ago
lain	46f7e51b27	Merge branch 'add-muted-to-notifications' into 'develop' ... Add `pleroma.is_muted` property to notifications Closes #1812 See merge request pleroma/pleroma!2670	4 years ago
Egor Kislitsyn	7e6f43c0d7	Add `is_muted` to notifications	4 years ago
lain	59bdef0c33	Merge branch 'feature/1739-account-endpoints' into 'develop' ... account visibility in masto api Closes #1739 See merge request pleroma/pleroma!2488	4 years ago
lain	b05f795326	Credo fixes	4 years ago
lain	e785cd5cae	ActivityPub: Remove `update` and switch to pipeline.	4 years ago
Sergey Suprunenko	ac0344dd24	Only accounts with Service actor_type are considered as bots	4 years ago
Sergey Suprunenko	b63646169d	Add support for bot field in update_credentials	4 years ago
Ivan Tashkinov	5237a2df9f	[#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search.	4 years ago
rinpatch	4ec2fb967e	Merge branch 'features/users-raw_bio' into 'develop' ... User: Add raw_bio, storing unformatted bio See merge request pleroma/pleroma!2326	4 years ago
href	39f7fc5b8e	Update majic & call plug before OpenApiSpex	4 years ago
Alexander Strizhakov	ed189568f3	moving mrf settings from instance to separate group	4 years ago
href	f124f68205	Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME	4 years ago
lain	b7df7436c8	Conversations: Return last dm for conversation, not last message.	4 years ago
eugenijm	b15cfc3d36	Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page	4 years ago
Egor Kislitsyn	520367d6fd	Fix atom leak in Rich Media Parser	4 years ago
Haelwenn	4115701f71	Merge branch 'recipients-experiments' into 'develop' ... ActivityPub: Don't show announces of your own objects in timeline. See merge request pleroma/pleroma!2637	4 years ago
Ivan Tashkinov	2188097066	[#1794] Fixes URI query handling for hashtags extraction in search.	4 years ago
Ivan Tashkinov	b28cec4271	[#1794] Fixes URI query handling for hashtags extraction in search.	4 years ago
lain	9e411372d0	ActivityPub: Don't show announces of your own objects in timeline.	4 years ago
lain	3b5282bef2	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
lain	7d66dd180a	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Haelwenn (lanodan) Monnier	e1b07402ab	User: Add raw_bio, storing unformatted bio ... Related: https://git.pleroma.social/pleroma/pleroma/issues/1643	4 years ago
lain	ca0e6e702b	ChatMessageReference -> Chat.MessageReference	4 years ago
Egor Kislitsyn	b02df1803e	Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys	4 years ago
lain	a8ca030d85	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Haelwenn	d74985af23	Merge branch 'features/apc2s-pagination' into 'develop' ... Fix AP C2S pagination Closes #866 and #751 See merge request pleroma/pleroma!2491	4 years ago
Haelwenn	54bae06b4f	Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1}) ... Unifies all the similar functions to one and simplify some blocks with it.	4 years ago
Egor Kislitsyn	317e2b8d61	Use atoms as keys in `ActivityPub.fetch_*` functions options	4 years ago
lain	f3ccd50a33	ChatMessageReferences: Adjust views	4 years ago
feld	6c1c2cddec	Merge branch 'fix/1794-hashtag-search-results' into 'develop' ... [#1794] Improvements to hashtags extraction from search query Closes #1794 See merge request pleroma/pleroma!2611	4 years ago
lain	37542a9dfa	Activity: Remove notifications-related functions.	4 years ago
lain	127ccc4e1c	NotificationController: Don't return chat_mentions by default.	4 years ago
lain	805ab86933	Notifications: Make notifications save their type.	4 years ago
lain	8e1db6a835	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
rinpatch	6fb900a496	Merge branch 'user-updates' into 'develop' ... AccountController: Federate user account changes. Closes pleroma-support#33 and #1801 See merge request pleroma/pleroma!2617	4 years ago
lain	d4d4b92f75	TimelineController: Only return `Create` in public timelines.	4 years ago
lain	9460983032	AccountController: Federate user account changes. ... Hotfixy commit, will be moved to the pipeline.	4 years ago
Alex Gleason	954acdda20	Add `account_activation_required` to /api/v1/instance	4 years ago
lain	6ff079ca9f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
lain	b004c427a0	Merge branch 'conversation-pagination' into 'develop' ... Conversation pagination See merge request pleroma/pleroma!2601	4 years ago
Steven Fuchs	6d4b80822b	Conversation pagination	4 years ago
Ivan Tashkinov	24f40b8a26	[#1794] Fixed search query splitting regex to deal with Unicode. Adjusted a test.	4 years ago
Ivan Tashkinov	c181e555db	[#1794] Improvements to hashtags extraction from search query.	4 years ago
Haelwenn (lanodan) Monnier	b3b367b894	Bugfix: Reuse Controller.Helper pagination for APC2S	4 years ago
lain	af6d01ec93	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
rinpatch	8f6d428880	AccountView: Use mediaproxy URLs for emojis ... Also use atom keys in emoji maps instead of binaries Closes #1810	4 years ago
lain	51bc6674f6	Mastodon API Controllers: Use the correct params for rate limiting.	4 years ago
lain	ee35bb5ac2	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Haelwenn	7b02bfca51	Merge branch 'announce-validator' into 'develop' ... Announce validator See merge request pleroma/pleroma!2567	4 years ago
lain	814c3e5171	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
lain	23e248694d	Announcements: Fix all tests.	4 years ago
eugenijm	b7fc61e17b	Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE	4 years ago
Ivan Tashkinov	6fd4f58ead	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	4 years ago
Haelwenn	94ba5a7802	Merge branch 'exposed-background-image' into 'develop' ... InstanceView: Expose background image link. See merge request pleroma/pleroma!2545	4 years ago
Egor Kislitsyn	6609714d66	Move Scrobble views to ScrobbleView	4 years ago
Maksim Pechnikov	41f8f17260	fix api/v1/accounts/update_credentials	4 years ago