1425 Commits (d896e45fafbdf3d1428eead9b9b9ce99668c16b3)

Author	SHA1	Message	Date
Mark Felder	7c508319a5	Prefer naming this put_application because we're putting it into the params map	4 years ago
Mark Felder	09b8378646	%Token{} may not be in the conn, so avoid breaking the ability to post statuses in that scenario.	4 years ago
Ivan Tashkinov	5992382cf8	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md # lib/mix/tasks/pleroma/database.ex # lib/pleroma/web/templates/feed/feed/_activity.rss.eex	4 years ago
Ivan Tashkinov	df89b5019b	[#2510] Improved support for app-bound OAuth tokens. Auth-related refactoring.	4 years ago
Mark Felder	4540e08a6a	Rendering fallback for when we don't have valid data available	4 years ago
Mark Felder	981349f21d	Enable rendering of the client application data details	4 years ago
Mark Felder	3dc7e89c54	Ensure we capture the application details into the object	4 years ago
feld	008499f65a	Merge branch 'develop' into 'fix/2412-filters' ... # Conflicts: # CHANGELOG.md	4 years ago
Ivan Tashkinov	4e14945670	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/activity_pub/activity_pub.ex	4 years ago
feld	f1f773f2c7	Merge branch 'email-stub-in-verify-credentials' into 'develop' ... Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike) See merge request pleroma/pleroma!3286	4 years ago
feld	d289ad8579	Merge branch 'develop' into 'fix/2411-mutes-api' ... # Conflicts: # CHANGELOG.md # docs/development/API/differences_in_mastoapi_responses.md	4 years ago
feld	cd5ff7a943	Merge branch 'develop' into 'feature/2164-unify-api-arguments' ... # Conflicts: # CHANGELOG.md	4 years ago
Alexander Strizhakov	2cb6dc5a3a	list timeline filtration by params	4 years ago
Alexander Strizhakov	c3110c46f3	expanding filtration for home timeline ... added local & remote statuses filtration for home timeline	4 years ago
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	380d0cce6b	[#3213] Reinstated DISTINCT clause for hashtag "any" filtering with 2+ terms. Added test.	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	793fc77b16	Add active user count	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
Mark Felder	2cb5c16723	Credo	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
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	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
Haelwenn (lanodan) Monnier	18b536c176	Pleroma.Object/1: take %Object{} as argument instead	4 years ago
Ivan Tashkinov	4134abef63	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	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
lain	c9d73af74d	Cachex: Unify arity of callback function	4 years ago
lain	713612c377	Cachex: Make caching provider switchable at runtime. ... Defaults to Cachex.	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
Ivan Tashkinov	f1b07a2b2b	OAuth form user remembering feature. Local MastoFE login / logout fixes.	4 years ago
Ivan Tashkinov	12a5981cc3	Session token setting on token exchange. Auth-related refactoring.	4 years ago
Ivan Tashkinov	e164c37139	[#2301] Proper handling of `User.is_discoverable`: users appear in in-service search but are hidden from external services like search bots.	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	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	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
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