Commit Graph

1382 Commits (2e682788a30b225b67254e92d1807b317ede57f8)

Author SHA1 Message Date
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
Alex Gleason 83770b7b39
Merge remote-tracking branch 'upstream/develop' into aliases
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
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'
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
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
4 years ago
rinpatch e16e8f9816 Websocket handler: do not raise if handler is terminated before switching protocols
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'
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'
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'
4 years ago
lain 119e11f455 Merge branch 'bugfix/mastoapi-lists' into 'develop'
4 years ago
lain 581f382e71 ListController: DRY up stuff.
4 years ago
Mark Felder cbf7f0e029 Disallow password resets for deactivated accounts.
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
4 years ago
rinpatch 126461942b User table: ensure bio is always a string
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.
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
4 years ago
lain 66122a11b5 AccountController: Build the correct update activity.
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'
4 years ago
Ivan Tashkinov 1298a2ea2c Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
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