aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Expand)Author
2020-08-04added stream fetch objectsissue/1969Maksim Pechnikov
2020-08-03Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' i...lain
2020-08-03Merge branch 'follower-mrf-again' into 'develop'lain
2020-08-03Merge branch 'object-age-fix' into 'develop'lain
2020-08-03MRF Object Age Policy: Don't break on messages without cc/tolain
2020-08-02Add welcome chatmessagesIlja
2020-08-01Merge branch '1985-unobtrusive-autologin-on-registration' into 'develop'lain
2020-08-01ConnectionPool: fix gun open errors being returned without an error tuplerinpatch
2020-08-01Don't override user-agent header if it's been setRoman Chvanikov
2020-07-31Revert "Merge branch 'revert-1ac0969c' into 'develop'"lain
2020-07-31Revert "Merge branch 'mrf-silence-2' into 'develop'"lain
2020-07-31Merge branch 'mrf-silence-2' into 'develop'lain
2020-07-31[#1985] Prevented force login on registration if account approval and/or emai...Ivan Tashkinov
2020-07-31SimplePolicy: Fix problem with DM leaks.lain
2020-07-30Merge branch 'render-preview-cards-in-chats' into 'develop'Haelwenn
2020-07-30Merge branch '1993-confirm-users-on-registration' into 'develop'Haelwenn
2020-07-30ChatMessage schema: Add preview cards.lain
2020-07-30ChatMessageReferenceView: Display preview cards.lain
2020-07-30Merge branch 'hide-reactions' into 'develop'lain
2020-07-29Expose seconds_valid in Pleroma Captcha API endpointMark Felder
2020-07-29Merge remote-tracking branch 'upstream/develop' into mrf-silenceAlex Gleason
2020-07-29SimpleMRF: :silence --> :followers_onlyAlex Gleason
2020-07-29Merge remote-tracking branch 'upstream/develop' into hide-reactionsAlex Gleason
2020-07-29Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confir...lain
2020-07-29Merge branch '1996-dont-break-on-chatmessages' into 'develop'Haelwenn
2020-07-29Merge branch 'bugfix/remote-user-atom' into 'develop'lain
2020-07-29feed/user_controller: Return 404 when the user is remoteHaelwenn (lanodan) Monnier
2020-07-29Merge branch 'by-approval' into 'develop'lain
2020-07-29AccountController: Don't explicitly ask to keep users unconfirmed.lain
2020-07-29EnsureRePrepended: Don't break on chat messages.lain
2020-07-28SimpleMRF silence: optimize, work okay with nil values in addressingAlex Gleason
2020-07-28SimpleMRF: Let instances be silencedAlex Gleason
2020-07-28gun ConnectionPool: Re-add a missing cast for remove_clientrinpatch
2020-07-28Let favourites and emoji reactions optionally be hiddenAlex Gleason
2020-07-28gun ConnectionPool: replace casts with callsrinpatch
2020-07-28FrontendStatic: Add plug to serve frontends based on configuration.lain
2020-07-28InstanceStatic: Refactor.lain
2020-07-28Merge branch 'cleanup/masto_fe-default_settings' into 'develop'lain
2020-07-27Fix User.registration_reason HTML sanitizing issuesAlex Gleason
2020-07-27Lint, fix testAlex Gleason
2020-07-27Add configurable registration_reason limitAlex Gleason
2020-07-27Merge remote-tracking branch 'upstream/develop' into by-approvalAlex Gleason
2020-07-27Merge branch 'develop' into 'cleanup/masto_fe-default_settings'lain
2020-07-27masto_fe_view: Remove @default_settingsHaelwenn (lanodan) Monnier
2020-07-27Pipeline: Unify embedded_object / object_data, move to validator.lain
2020-07-27Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-ob...lain
2020-07-27Merge branch 'issue/1934-welcome-email' into 'develop'lain
2020-07-27Apply 1 suggestion(s) to 1 file(s)lain
2020-07-27Merge branch 'fix/reverse-proxy-no-body-connection-leak' into 'develop'Haelwenn
2020-07-26Merge remote-tracking branch 'upstream/develop' into by-approvalAlex Gleason