Commit Graph

3844 Commits (8bfacffabc1325fa908f253358bbe29093622b0a)

Author SHA1 Message Date
lain 74edd4f391 Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 56dfa0e0fb Transmogrifier: Update notification after accepting.
4 years ago
lain 9a53f619e0 Apply suggestion to test/chat_message_reference_test.exs
4 years ago
lain 41503b1673 Apply suggestion to test/web/activity_pub/transmogrifier/chat_message_test.exs
4 years ago
lain 00748e9650 ChatMessageReferences: Change seen -> unread
4 years ago
minibikini b57e4ad1ab Merge branch 'develop' into 'openapi/admin/relay'
4 years ago
lain b952f3f379 WebPush: Push out chat message notications.
4 years ago
lain 5d7dda883e SideEffectsTest: More tests.
4 years ago
Egor Kislitsyn a8132690bd
Fix credo
4 years ago
Egor Kislitsyn 70f054b083
Merge branch 'develop' into openapi/admin/relay
4 years ago
Egor Kislitsyn b4d5bdd6f1
Merge branch 'develop' into openapi/admin/config
4 years ago
lain b3407344d3 ChatController: Add function to mark single message as read.
4 years ago
lain c020fd4352 ChatMessageReferenceView: Return read status as `unread`.
4 years ago
Egor Kislitsyn c16315d055
Add OpenAPI spec for AdminAPI.ReportController
4 years ago
Egor Kislitsyn 9d572f2f66
Move report actions to AdminAPI.ReportController
4 years ago
lain fb4ae9c720 Streamer, SideEffects: Stream out ChatMessageReferences
4 years ago
lain 7f5c5b11a5 Chats: Remove `unread` from the db, calculate from unseen messages.
4 years ago
lain 2591745fc2 ChatMessageReferences: Move tests
4 years ago
lain f3ccd50a33 ChatMessageReferences: Adjust views
4 years ago
lain aa22fce8f4 ChatMessageReference: Introduce and switch in chat controller.
4 years ago
feld 6c1c2cddec Merge branch 'fix/1794-hashtag-search-results' into 'develop'
4 years ago
Egor Kislitsyn 68cb152a08
Merge branch 'develop' into openapi/admin/relay
4 years ago
lain 879304dcd9 Merge branch 'replies-domain-block' into 'develop'
4 years ago
lain 5da38c15cd Merge branch 'openapi/admin/oauth-apps' into 'develop'
4 years ago
lain 022d975a39 Merge branch 'openapi/admin/invites' into 'develop'
4 years ago
lain 38dce485c4 Notification: Add function to backfill notification types
4 years ago
lain 904295d53b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 37542a9dfa Activity: Remove notifications-related functions.
4 years ago
lain 127ccc4e1c NotificationController: Don't return chat_mentions by default.
4 years ago
lain cd2abcc0e3 Merge branch 'fix/invisible-repeats' into 'develop'
4 years ago
lain 805ab86933 Notifications: Make notifications save their type.
4 years ago
rinpatch 165a4b2a69 Do not include activities of invisible users unless explicitly requested
4 years ago
lain d111eae798 Merge branch 'feature/status-by-id-account-view' into 'develop'
4 years ago
lain 8e1db6a835 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Alexander Strizhakov 19f468c5bc
replies filtering for blocked domains
4 years ago
rinpatch 6fb900a496 Merge branch 'user-updates' into 'develop'
4 years ago
Alexander Strizhakov 7e6ec778d9
exclude replies on blocked domains
4 years ago
lain af9090238e CommonAPI: Newlines -> br for chat messages.
4 years ago
Egor Kislitsyn a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
4 years ago
lain 8ff3425828 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain d4d4b92f75 TimelineController: Only return `Create` in public timelines.
4 years ago
lain 9460983032 AccountController: Federate user account changes.
4 years ago
Haelwenn e96765df6b Merge branch 'chore/bump-hackney' into 'develop'
4 years ago
Roman Chvanikov b973d0b2f0 Fix config setting to not affect other tests
4 years ago
rinpatch 0cb7b0ea84 hackney adapter helper: support tlsv1.3 and remove custom opts
4 years ago
lain 6ff079ca9f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 8bdf18d7c1 CommonAPI: Linkify chat messages.
4 years ago
lain 2c9465cc51 SafeText: Let through basic html.
4 years ago
lain b004c427a0 Merge branch 'conversation-pagination' into 'develop'
4 years ago
Steven Fuchs 6d4b80822b Conversation pagination
4 years ago
Ivan Tashkinov 24f40b8a26 [#1794] Fixed search query splitting regex to deal with Unicode. Adjusted a test.
4 years ago
Ivan Tashkinov 78c80a261a Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-search-results
4 years ago
Roman Chvanikov 0a83af330b fix unused var warning
4 years ago
Ivan Tashkinov c181e555db [#1794] Improvements to hashtags extraction from search query.
4 years ago
kPherox 9ca978494f
Add test for stream boosts of mastodon user
4 years ago
Haelwenn (lanodan) Monnier a43b435c0a
AP C2S: allow limit & order on outbox & read_inbox
4 years ago
Haelwenn (lanodan) Monnier b3b367b894
Bugfix: Reuse Controller.Helper pagination for APC2S
4 years ago
lain 863c02b25d SideEffects: Stream out chat messages.
4 years ago
lain c86a88edec Streamer: Add a chat message stream.
4 years ago
lain 9848978109 Merge branch 'fix-relay-repeat-notification' into 'develop'
4 years ago
lain af6d01ec93 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch 396bc69aee Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
4 years ago
Egor Kislitsyn 06f20e9181
Add OpenApi spec to AdminAPI.ConfigController
4 years ago
Egor Kislitsyn d1ee3527ef
Move config actions to AdminAPI.ConfigController
4 years ago
lain 1d30608e20 Merge branch 'fix/1557-gets-local-pack' into 'develop'
4 years ago
lain f6ddf0cc50 Merge branch 'feature/1792-update-actor-type' into 'develop'
4 years ago
Alexander Strizhakov ae05792d2a
get-packs for local generated pack
4 years ago
rinpatch 455a402c8a HTTP Security plug: rewrite &csp_string/0
4 years ago
rinpatch 8f6d428880 AccountView: Use mediaproxy URLs for emojis
4 years ago
rinpatch 78c46fb7ba MediaProxy test: use config macros instead of directly putting values
4 years ago
kPherox 48fd9be65a
Exclude post actor from to of relay announce
4 years ago
rinpatch d35be02e70 Merge branch 'refactor-add-mention-step-one' into 'develop'
4 years ago
rinpatch 91f73a7592 Merge branch 'notification-fixes' into 'develop'
4 years ago
lain b8e029b5ea Notification: Actually preload objects.
4 years ago
Alexander Strizhakov 3249141588
validate actor type
4 years ago
rinpatch 3601c0015c Merge branch '1808-pleroma-sucks' into 'develop'
4 years ago
Egor Kislitsyn fca48154a2
Add AdminAPI.InviteView
4 years ago
Egor Kislitsyn 2a4f965191
Add OpenAPI spec for AdminAPI.InviteTokenController
4 years ago
Egor Kislitsyn 95ebfb9190
Move invite actions to AdminAPI.InviteTokenController
4 years ago
lain 644195e31e Merge branch '1501-include-unlisted-posts-in-user-feed' into 'develop'
4 years ago
Alexander Strizhakov 8f08384d80
another view for account in admin-fe status_show
4 years ago
Ivan Tashkinov d7a57004ef [#1501] Made user feed contain public and unlisted activities.
4 years ago
Egor Kislitsyn e32b7ae044
Skip failing `:crypt` test on mac
4 years ago
Egor Kislitsyn 0ba1f2631a
Add OpenAPI spec for AdminAPI.OAuthAppContoller
4 years ago
lain dbd07d29a3 Streamer: Don't crash on streaming chat notifications
4 years ago
lain 2c25087d20 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 6bd7070b00 Transmogrifier: Use a simpler way to get mentions.
4 years ago
Egor Kislitsyn cbcd592300
Add OpenAPI spec for AdminAPI.RelayController
4 years ago
lain f20dff451e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks
4 years ago
lain 5d5db7e5b7 StealEmojiPolicyTest: Clean up.
4 years ago
lain 2dff376041 StealEmojiPolicyTest: Fix flaky test.
4 years ago
lain ee35bb5ac2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain aeb0875025 StealEmojiPolicyTest: Fix flaky test.
4 years ago
lain ec470c4c77 Merge branch 'openapi/admin/status' into 'develop'
4 years ago
lain 3bec0d2e50 Factory: Set users to be ap_enabled by default.
4 years ago
lain 0c970a9d44 UserTest: Add test for user refreshing.
4 years ago
lain d0c26956da User: Don't error out if we want to refresh a user but can't
4 years ago
rinpatch 7bc2ec0aa2 Merge branch 'mastodon-migration-compat' into 'develop'
4 years ago
lain ddbbefeb2e Merge branch 'feature/configure-filename-truncate' into 'develop'
4 years ago
Roman Chvanikov cc82229ba7 Add filename_display_max_length config
4 years ago