aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api
AgeCommit message (Collapse)Author
2021-01-18Merge branch 'develop' into refactor/deactivated_user_fieldMark Felder
2021-01-15Change user.confirmation_pending field to user.is_confirmedMark Felder
2021-01-15Change user.deactivated field to user.is_activeMark Felder
2021-01-13Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
feature/object-hashtags-rework
2021-01-13Bump Copyright to 2021Haelwenn (lanodan) Monnier
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'
2021-01-07Merge branch 'object-normalize-refactor' into 'develop'lain
Object: Rework how Object.normalize works See merge request pleroma/pleroma!3229
2021-01-04Object: Rework how Object.normalize workslain
Now it defaults to not fetching, and the option is named.
2020-12-30Merge remote-tracking branch 'upstream/develop' into aliasesAlex Gleason
2020-12-28Revert "Merge branch 'features/hashtag-column' into 'develop'"Haelwenn
This reverts merge request !2824
2020-12-28Merge branch 'features/hashtag-column' into 'develop'Haelwenn
Insert text representation of hashtags into object["hashtags"] See merge request pleroma/pleroma!2824
2020-12-28Pleroma.Object/1: take %Object{} as argument insteadHaelwenn (lanodan) Monnier
2020-12-26Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
feature/object-hashtags-rework
2020-12-22Create Object.hashtags/1 wrapperHaelwenn (lanodan) Monnier
2020-12-22Insert text representation of hashtags into object["hashtags"]Haelwenn (lanodan) Monnier
Includes a new mix task: pleroma.database fill_old_hashtags
2020-12-21Encapsulation of tags / hashtags fetching from objects.Ivan Tashkinov
2020-12-21Cachex: Unify arity of callback functionlain
2020-12-18Cachex: Make caching provider switchable at runtime.lain
Defaults to Cachex.
2020-12-14Minor refactoring of the logic for hiding followers/following counts.Mark Felder
Field is not nullable anymore, and this is more readable.
2020-11-28OAuth form user remembering feature. Local MastoFE login / logout fixes.Ivan Tashkinov
2020-11-25Session token setting on token exchange. Auth-related refactoring.Ivan Tashkinov
2020-11-19[#2301] Proper handling of `User.is_discoverable`: users appear in ↵Ivan Tashkinov
in-service search but are hidden from external services like search bots.
2020-11-17Merge branch 'develop' into hide-muted-reactionsEgor Kislitsyn
2020-11-16Use absolute URLs to thumbnail and background in /api/v1/instanceMark Felder
2020-11-16Hide reactions from muted and blocked usersEgor Kislitsyn
2020-11-13Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into ↵lain
'develop' fixes 2034 Make notifs view work for reports Closes #2034 See merge request pleroma/pleroma!2912
2020-11-13Make notifs view work for reportsIlja
* 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)
2020-11-11Render blurhashes in Mastodon APIMark Felder
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/expire-mutes
2020-11-04Merge branch 'restrict-domain' into 'develop'lain
View a remote server's timeline See merge request pleroma/pleroma!2713
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
alexgleason/pleroma-restrict-domain
2020-11-04Poll View: Always return `voters_count`.lain
2020-11-03Conversations: A few refactorslain
2020-10-30ConversationView: fix formattingAlibek Omarov
2020-10-30ConversationView: fix last_status.account being empty, fix current user ↵Alibek Omarov
being included in group conversations
2020-10-30ConversationView: add current user to conversations, according to Mastodon ↵Alibek Omarov
behaviour
2020-10-29Merge branch 'issue/2069' into 'develop'Haelwenn
[#2069] unread_conversation_count See merge request pleroma/pleroma!2939
2020-10-29Merge remote-tracking branch 'origin/develop' into mutes-blocks-paginationEgor Kislitsyn
2020-10-19Merge branch 'develop' into mutes-blocks-paginationEgor Kislitsyn
2020-10-17Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11Ivan Tashkinov
2020-10-15Merge branch 'develop' into refactor/discoverable_user_fieldMark Felder
2020-10-14Merge remote-tracking branch 'upstream/develop' into aliasesAlex Gleason
2020-10-14Merge branch 'feature/gen-magic' into 'develop'feld
Use libmagic via majic Closes #1736 See merge request pleroma/pleroma!2534
2020-10-14Undo API breaking changesMark Felder
2020-10-14Finish undoing API breakageMark Felder
2020-10-13Merge remote-tracking branch 'upstream/develop' into restrict-domainAlex Gleason
2020-10-13Merge remote-tracking branch 'upstream/develop' into aliasesAlex Gleason
2020-10-13Add pagination for MutesEgor Kislitsyn
2020-10-13Add pagination for BlocksEgor Kislitsyn
2020-10-13Merge branch 'develop' into feature/gen-magicMark Felder
2020-10-13Merge branch 'develop' into chore/elixir-1.11Mark Felder
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 04:39:54 +0000