Commit Graph

10418 Commits (34c9446cb17cd11a6d141d9e4b6bce8ac042de77)
 

Author SHA1 Message Date
rinpatch 165a4b2a69 Do not include activities of invisible users unless explicitly requested
4 years ago
lain 2db7a0d6b6 Merge branch 'weblate-pleroma-pleroma' into 'develop'
4 years ago
Fristi 81fb45a71b Translated using Weblate (Dutch)
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
rinpatch d67b8a96c7 Merge branch 'only-creates-in-public-tl' into 'develop'
4 years ago
Alexander Strizhakov 7e6ec778d9
exclude replies on blocked domains
4 years ago
Egor Kislitsyn 6b84c62d4a
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
4 years ago
lain fa37bfff99 Merge branch 'default-to-hackney-again' into 'develop'
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 ac31f687c0 Config: Default to Hackney again
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
lain beeeed5b58 Merge branch 'test/fix-config-setting-in-user-test' 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
rinpatch d23b3701d8 Merge branch 'bugfix/csp-unproxied' into 'develop'
4 years ago
rinpatch 32ba2b7f9f Merge branch 'media-docs' into 'develop'
4 years ago
rinpatch d2a1975e56 mix.lock: update hackney to 1.16.0
4 years ago
rinpatch 109af93227 Apply suggestion to lib/pleroma/plugs/http_security_plug.ex
4 years ago
lain f361264e1a Merge branch 'hotfix/streamer-test-unused-var-warning' into 'develop'
4 years ago
Roman Chvanikov 0a83af330b fix unused var warning
4 years ago
rinpatch 660d49227b Merge branch 'connect-src' into 'develop'
4 years ago
Ivan Tashkinov c181e555db [#1794] Improvements to hashtags extraction from search query.
4 years ago
stwf d67b302810 preload data into index.html
4 years ago
Alex Gleason d38f28870e
Add blob: to connect-src CSP
4 years ago
lain 219d2b3146 Merge branch 'fix-streaming' into 'develop'
4 years ago
feld 81db758e8e Merge branch 'mix/database-vacuum-options' into 'develop'
4 years ago
kPherox 9ca978494f
Add test for stream boosts of mastodon user
4 years ago
kPherox de0e262839
Fix argument error in streamer
4 years ago
Haelwenn (lanodan) Monnier da1e31fae3
http_security_plug.ex: Fix non-proxied media
4 years ago
Mark Felder 1b586ff3ae Document new database vacuum tasks
4 years ago
Haelwenn (lanodan) Monnier a43b435c0a
AP C2S: allow limit & order on outbox & read_inbox
4 years ago
Haelwenn (lanodan) Monnier 2c18830d0d
Bugfix: router: allow basic_auth for outbox
4 years ago
Haelwenn (lanodan) Monnier b3b367b894
Bugfix: Reuse Controller.Helper pagination for APC2S
4 years ago
lain 32431ad1ee Docs: Also add the streaming docs to the Chat api doc.
4 years ago
lain 3898dd69a6 SideEffects: Ensure a chat is present before streaming something out.
4 years ago
lain b08baf905b Docs: Document streaming differences
4 years ago