600 Commits (99f86055828d57ca496d8290f73b12f35c060178)

Author	SHA1	Message	Date
Mark Felder	28581e03ad	Merge branch 'develop' into refactor/deactivated_user_field	4 years ago
Mark Felder	d36182c088	Change user.confirmation_pending field to user.is_confirmed	4 years ago
Mark Felder	860b5c7804	Change user.deactivated field to user.is_active	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	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 (lanodan) Monnier	18b536c176	Pleroma.Object/1: take %Object{} as argument instead	4 years ago
Haelwenn (lanodan) Monnier	87b13c5430	Create Object.hashtags/1 wrapper	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
Mark Felder	6dac2ac71a	Minor refactoring of the logic for hiding followers/following counts. ... Field is not nullable anymore, and this is more readable.	4 years ago
Egor Kislitsyn	79d2d3f609	Merge branch 'develop' into hide-muted-reactions	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
lain	1cfc3278c0	Poll View: Always return `voters_count`.	4 years ago
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
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
Mark Felder	ed61002815	Undo API breaking changes	4 years ago
Mark Felder	b001237b79	Finish undoing API breakage	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
Alex Gleason	77b1ea68a7	Merge remote-tracking branch 'upstream/develop' into aliases	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
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
Alexander Strizhakov	9bf1065a06	schedule activity expiration in Oban	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
rinpatch	d48fc90978	StatusView: Start fetching rich media cards as soon as possible	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	67c79394e8	Support static avatars and header images with Mediaproxy Preview	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	2def3cbf41	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # config/config.exs # mix.lock	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
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
Haelwenn (lanodan) Monnier	ac2598307d	Merge remote-tracking branch 'pleroma/develop' into features/poll-validation	4 years ago
Alex Gleason	6931dbfa58	Merge remote-tracking branch 'upstream/develop' into by-approval	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
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	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	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
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
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
lain	d3efb50262	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text	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
Haelwenn (lanodan) Monnier	244655e884	MastoAPI: Show source field when deleting	4 years ago
lain	35f6770436	StatusView: Add pleroma.parent_visible	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
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
Sergey Suprunenko	ac0344dd24	Only accounts with Service actor_type are considered as bots	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
Alexander Strizhakov	ed189568f3	moving mrf settings from instance to separate group	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
lain	3b5282bef2	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