aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-08-04App Test: Make more resilientlain
2020-08-04Unify Config.get behaviour for atom/list key paramRoman Chvanikov
2020-08-04Merge branch 'email-blacklist' into 'develop'lain
2020-08-04Changelog: Add info about email blacklistlain
2020-08-03Email blacklist: Update phrasing againAlex Gleason
2020-08-03Email blacklist: Update response phrasingAlex Gleason
2020-08-03Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' i...lain
2020-08-03Improved WelcomeChatMessageTestIlja
2020-08-03Consolidate construction of Rich Media Parser HTTP requestsMark Felder
2020-08-03Apply 1 suggestion(s) to 1 file(s)Ilja
2020-08-03Merge branch 'follower-mrf-again' into 'develop'lain
2020-08-03AccountControllerTest: Add test for message returned.lain
2020-08-03Merge branch 'config/default_ok_oldage' 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-03Merge branch 'indigenous-client' into 'develop'lain
2020-08-03Merge branch 'reportnote-test' into 'develop'lain
2020-08-02Add ReportNote testAlex Gleason
2020-08-02Factory: Add report_activity_factoryAlex Gleason
2020-08-02Add email blacklist, fixes #1404Alex Gleason
2020-08-02Migrate legacy tags set by AdminFE to match TagPolicy, #2010Alex Gleason
2020-08-02Add indigenous to clientsswentel
2020-08-02Add welcome chatmessagesIlja
2020-08-01SimpleMRF: Add missing :followers_only to config.exsAlex Gleason
2020-08-01Merge branch '1985-unobtrusive-autologin-on-registration' into 'develop'lain
2020-08-01Merge branch 'fix/gun-nxdomain-no-error-tuple' into 'develop'rinpatch
2020-08-01ConnectionPool: fix gun open errors being returned without an error tuplerinpatch
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