Commit Graph

1330 Commits (085d4e6cfcdecd967cbe6716d06d1ace0108a11a)

Author SHA1 Message Date
Haelwenn 3966add048 Revert "Merge branch 'features/hashtag-column' into 'develop'"
4 years ago
Haelwenn b122b6ffa3 Merge branch 'features/hashtag-column' into 'develop'
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"]
4 years ago
lain c9d73af74d Cachex: Unify arity of callback function
4 years ago
lain 713612c377 Cachex: Make caching provider switchable at runtime.
4 years ago
Mark Felder 6dac2ac71a Minor refactoring of the logic for hiding followers/following counts.
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'
4 years ago
Ilja 70e4b86250 Make notifs view work for reports
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'
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'
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
feld 2013705690 Merge branch 'feature/gen-magic' into 'develop'
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
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
Mark Felder ed6511a086 Lint
4 years ago