aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-06-02Activity: Remove notifications-related functions.lain
2020-06-02NotificationController: Don't return chat_mentions by default.lain
2020-06-02Notifications: Make notifications save their type.lain
2020-06-02Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-06-01Merge branch 'user-updates' into 'develop'rinpatch
2020-06-01Merge branch 'only-creates-in-public-tl' into 'develop'rinpatch
2020-06-01Merge branch 'default-to-hackney-again' into 'develop'lain
2020-06-01CommonAPI: Newlines -> br for chat messages.lain
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-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-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-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
2020-05-28Merge branch 'fix/1557-gets-local-pack' into 'develop'lain
2020-05-28Merge branch 'feature/1792-update-actor-type' into 'develop'lain