summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-08-01Merge branch 'fix/gun-limiter' into 'develop'rinpatch
2020-08-01Fix ConnecitonPool deadlocking after reaching the connection limitrinpatch
2020-08-01Merge branch 'fix/user-agent-overriding' into 'develop'rinpatch
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-31Merge 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-31Merge remote-tracking branch 'pleroma/develop' into features/poll-validationHaelwenn (lanodan) Monnier
2020-07-31[#1985] Prevented force login on registration if account approval and/or emai...Ivan Tashkinov
2020-07-31Apply 1 suggestion(s) to 1 file(s)lain
2020-07-31Default MRF to ObjectAgePolicy, 7 days thresholdHaelwenn (lanodan) Monnier
2020-07-31Merge branch 'deactivate-gun-again' into 'develop'lain
2020-07-31Config: Default to Hackney againlain
2020-07-31SimplePolicy: Fix problem with DM leaks.lain
2020-07-30Merge branch 'chore/fix-docs-typo' into 'develop'feld
2020-07-30Fix example json responseMark Felder
2020-07-30Merge branch 'fix/configdb-otp-instructions' into 'develop'feld
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-30Merge branch 'develop' into fix/configdb-otp-instructionsMark Felder
2020-07-30ChatMessage schema: Add preview cards.lain
2020-07-30ChatMessageReferenceView: Display preview cards.lain
2020-07-30OTP users need Pleroma running to execute pleroma_ctl, so reorganize instruct...Mark Felder
2020-07-30Merge branch 'chore/fix-configdb-docs-formatting' into 'develop'feld
2020-07-30Attempt to fix markdown formattingMark Felder
2020-07-30Merge branch 'hide-reactions' into 'develop'lain
2020-07-30SimplePolicyTest: Add test for leaking DMs.lain
2020-07-30Merge branch 'feature/captcha-expose-timeout' into 'develop'lain
2020-07-30Apply 1 suggestion(s) to 1 file(s)lain
2020-07-30Merge branch 'issue/1933-update-dependency' into 'develop'lain
2020-07-30set versionsMaksim Pechnikov
2020-07-30updated `cors_plug`Maksim Pechnikov
2020-07-30set `postgrex` versionMaksim Pechnikov
2020-07-30set `web_push_encryption` versionMaksim Pechnikov
2020-07-30updated `calendar` packageMaksim Pechnikov
2020-07-30Merge branch 'develop' into issue/1933-update-dependencyMaksim Pechnikov
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-29:show_reactions, refactor the other testAlex Gleason
2020-07-29:show_reactions, add CHANGELOG.md, refactor testAlex Gleason
2020-07-29Merge remote-tracking branch 'upstream/develop' into hide-reactionsAlex Gleason
2020-07-29Merge branch 'issue/1023' into 'develop'lain
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-02 11:48:51 +0000