aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-06-03Chats: Remove `unread` from the db, calculate from unseen messages.lain
2020-06-03Migration: Remove superfluous importslain
2020-06-03Credo fixes.lain
2020-06-03Migrations: Add unique index to ChatMessageReferences.lain
2020-06-03ChatMessageReferences: Move testslain
2020-06-03ChatMessageReferences: Adjust viewslain
2020-06-03ChatMessageReference: Introduce and switch in chat controller.lain
2020-06-02Credo fixeslain
2020-06-02Migrations: Add a migration to backfill notification types.lain
2020-06-02Notification: Add function to backfill notification typeslain
2020-06-02Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-06-02Activity: Remove notifications-related functions.lain
2020-06-02NotificationController: Don't return chat_mentions by default.lain
2020-06-02Merge branch 'fix/invisible-repeats' into 'develop'lain
2020-06-02Notifications: Make notifications save their type.lain
2020-06-02Do not include activities of invisible users unless explicitly requestedrinpatch
2020-06-02Merge branch 'weblate-pleroma-pleroma' into 'develop'lain
2020-06-02Translated using Weblate (Dutch)Fristi
2020-06-02Merge branch 'feature/status-by-id-account-view' into 'develop'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