summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-09-25Only check for expiring activities on local accountsfix/2189-remote-user-deletionMark Felder
2020-09-23Merge branch 'issue/2115' into 'develop'lain
2020-09-23Merge branch 'user-query/filter-out-internal' into 'develop'lain
2020-09-23Merge branch 'develop' into 'issue/2115'lain
2020-09-23Merge branch 'issue/1975' into 'develop'lain
2020-09-23Merge branch 'develop' into 'issue/1975'lain
2020-09-23Merge branch 'email-fix-develop' into 'develop'lain
2020-09-23Changelog: Add info about emoji zip import featurelain
2020-09-23Changelog: Info about email fix.lain
2020-09-22finland-emojis.zip -> emojis.zipMaksim Pechnikov
2020-09-22Merge branch 'develop' into issue/1975Maksim Pechnikov
2020-09-22Merge remote-tracking branch 'upstream/develop' into email-fix-developAlex Gleason
2020-09-22Changelog: Add info about chat pagination fix.lain
2020-09-22Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115lain
2020-09-22Filter out internal users by defaultEgor Kislitsyn
2020-09-22Merge branch 'chore/missing-link' into 'develop'feld
2020-09-22Add FreeBSD and alpha sortMark Felder
2020-09-21Merge branch 'docs/nginx-config-fedsockets' into 'develop'feld
2020-09-21Use an upstream for reverse proxy so future modifications are simplifiedMark Felder
2020-09-21Merge branch 'chore/autolinker-rename' into 'develop'feld
2020-09-21Most proxy settings can be globalMark Felder
2020-09-21Remove duplicate settingMark Felder
2020-09-21Add FedSockets configMark Felder
2020-09-21Merge branch 'fix/fedsocket-useragent' into 'develop'feld
2020-09-21Fix MastoAPI.AuthControllerTest, json_response(:no_content) --> empty_json_re...Alex Gleason
2020-09-21Chase the Autolinker rename from !2677Mark Felder
2020-09-21Pass hackney tls config into email tests, #2101Alex Gleason
2020-09-21Fix #2172 HTTP error on password resetAlex Gleason
2020-09-21Allow emails to be sent again, #2101 #2172Alex Gleason
2020-09-21Merge branch 'bugfix/federator-actor-error' into 'develop'lain
2020-09-21Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop'lain
2020-09-21Merge branch 'issue/2099' into 'develop'lain
2020-09-21Merge branch '2161-block-changes' into 'develop'Haelwenn
2020-09-21Force HTTP for fedsocketsMark Felder
2020-09-21ActivityPub: Don't block-filter your own postslain
2020-09-20Merge branch 'weblate-pleroma-pleroma' into 'develop'lain
2020-09-20Translated using Weblate (Chinese (Simplified))Kana
2020-09-20Added translation using Weblate (Chinese (Simplified))Kana
2020-09-20Merge branch 'fix/openapi-errors' into 'develop'rinpatch
2020-09-19[#2074] OAuth scope checking in Streaming API.Ivan Tashkinov
2020-09-19OpenAPI: make it possible to generate a spec without starting the apprinpatch
2020-09-19OpenAPI: fix various errors pointed out by editor.swagger.iorinpatch
2020-09-19Add user agent to fedsocket requestsMark Felder
2020-09-18Merge branch 'develop' into issue/2099Maksim Pechnikov
2020-09-18Merge branch 'media-preview-proxy-nostream' into 'develop'feld
2020-09-18Merge branch 'fix/fedsocket-log-spam' into 'develop'lain
2020-09-18FedSockets: fix log spam on cached rejectsrinpatch
2020-09-18Merge branch 'feature/2118-web-push-encryption-http' into 'develop'lain
2020-09-18Merge branch 'websocket-data-fed' into 'develop'lain
2020-09-18Federate data through persistent websocket connectionsSteven Fuchs
generated by cgit v1.2.3 (git 2.44.0) at 2024-04-24 00:55:57 +0000