aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-06-01Merge remote-tracking branch 'origin/develop' into feature/embeddable-postsEgor Kislitsyn
2020-06-01Merge branch 'default-to-hackney-again' into 'develop'lain
2020-06-01CommonAPI: Newlines -> br for chat messages.lain
2020-06-01Merge remote-tracking branch 'origin/develop' into global-status-expirationEgor Kislitsyn
2020-06-01Config: Default to Hackney againlain
2020-06-01Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-06-01TimelineController: Only return `Create` in public timelines.lain
2020-06-01AccountController: Federate user account changes.lain
2020-05-30Merge branch 'chore/bump-hackney' into 'develop'Haelwenn
2020-05-30Merge branch 'test/fix-config-setting-in-user-test' into 'develop'lain
2020-05-30Fix config setting to not affect other testsRoman Chvanikov
2020-05-30hackney adapter helper: support tlsv1.3 and remove custom optsrinpatch
2020-05-30Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-05-30CommonAPI: Linkify chat messages.lain
2020-05-30SafeText: Let through basic html.lain
2020-05-30Merge branch 'conversation-pagination' into 'develop'lain
2020-05-30Conversation paginationSteven Fuchs
2020-05-30[#1794] Fixed search query splitting regex to deal with Unicode. Adjusted a t...Ivan Tashkinov
2020-05-30Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-s...Ivan Tashkinov
2020-05-29Merge branch 'bugfix/csp-unproxied' into 'develop'rinpatch
2020-05-29Merge branch 'media-docs' into 'develop'rinpatch
2020-05-30mix.lock: update hackney to 1.16.0rinpatch
2020-05-29Apply suggestion to lib/pleroma/plugs/http_security_plug.exrinpatch
2020-05-29Merge branch 'hotfix/streamer-test-unused-var-warning' into 'develop'lain
2020-05-29fix unused var warningRoman Chvanikov
2020-05-29Merge branch 'connect-src' into 'develop'rinpatch
2020-05-29[#1794] Improvements to hashtags extraction from search query.Ivan Tashkinov
2020-05-29Add blob: to connect-src CSPAlex Gleason
2020-05-29Merge branch 'fix-streaming' into 'develop'lain
2020-05-29Merge branch 'mix/database-vacuum-options' into 'develop'feld
2020-05-30Add test for stream boosts of mastodon userkPherox
2020-05-30Fix argument error in streamerkPherox
2020-05-29http_security_plug.ex: Fix non-proxied mediaHaelwenn (lanodan) Monnier
2020-05-29Document new database vacuum tasksMark Felder
2020-05-29AP C2S: allow limit & order on outbox & read_inboxHaelwenn (lanodan) Monnier
2020-05-29Bugfix: router: allow basic_auth for outboxHaelwenn (lanodan) Monnier
2020-05-29Bugfix: Reuse Controller.Helper pagination for APC2SHaelwenn (lanodan) Monnier
2020-05-29Docs: Also add the streaming docs to the Chat api doc.lain
2020-05-29SideEffects: Ensure a chat is present before streaming something out.lain
2020-05-29Docs: Document streaming differenceslain
2020-05-29StreamerView: Actually send Chats, not ChatMessages.lain
2020-05-29SideEffects: Stream out chat messages.lain
2020-05-29Streamer: Add a chat message stream.lain
2020-05-29Merge branch 'fix-relay-repeat-notification' into 'develop'lain
2020-05-29Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-05-29Use `User.is_internal_user?` insteadkPherox
2020-05-29Don't make relay announce notificationkPherox
2020-05-29Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'rinpatch
2020-05-29HTTP Security plug: make starting csp string generation more readablerinpatch
2020-05-28Docs: Attachement limitations in MastoAPI differencesAlex Gleason
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 02:10:14 +0000