aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Expand)Author
2020-07-27Merge developRoman Chvanikov
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-27Merge branch 'develop' into refactor/fe-bundlesRoman Chvanikov
2020-07-26ReverseProxy tesla client: remove handling of old_connrinpatch
2020-07-26ReverseProxy: Fix a gun connection leak when there is an error with norinpatch
2020-07-26OpenAPI: remove accidentally pasted buffer dataAlibek Omarov
2020-07-26OpenAPI: Replace actor_id by account_id to follow ChatMessage schemaAlibek Omarov
2020-07-25Merge branch 'develop' into refactor/fe-bundlesRoman Chvanikov
2020-07-24remove duplicate moduleMaksim Pechnikov
2020-07-23Merge branch 'unblock-domain-via-query' into 'develop'feld
2020-07-23Support blocking via query parameters as well and document the change.Mark Felder
2020-07-23Merge branch '1976-status-view-fixes' into 'develop'Haelwenn
2020-07-23Merge branch 'develop' into issue/1934-welcome-emailMaksim Pechnikov
2020-07-23Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'lain
2020-07-23[#2791] AccountView: renamed `:force` option to `:skip_visibility_check`.Ivan Tashkinov
2020-07-23Merge branch 'bugfix/mrf-reject-logging' into 'develop'lain
2020-07-23Merge branch 'issue/1878' into 'develop'lain
2020-07-23Merge branch 'develop' into refactor/fe-bundlesRoman Chvanikov
2020-07-23Merge branch 'linkify' into 'develop'lain
2020-07-23added warning to use old keysMaksim Pechnikov
2020-07-22Merge branch 'develop' into refactor/fe-bundlesRoman Chvanikov
2020-07-22[#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :re...Ivan Tashkinov
2020-07-22Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'lain
2020-07-22added check user email for welcome emailMaksim Pechnikov
2020-07-22StatusView: Handle badly formatted emoji reactions.Lain Soykaf
2020-07-22fix sender for welcome emailMaksim Pechnikov
2020-07-22Merge branch 'develop' into refactor/fe-bundlesRoman Chvanikov
2020-07-21Skip the correct plugMark Felder
2020-07-21Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"lain
2020-07-21Revert "Merge branch 'linkify' into 'develop'"lain
2020-07-21Merge branch 'develop' into fix/pleroma-api-emoji-packsMark Felder
2020-07-21Merge branch 'linkify' into 'develop'lain
2020-07-21Merge branch 'gopher-fix' into 'develop'lain
2020-07-21fix credoRoman Chvanikov
2020-07-21Fix config testsRoman Chvanikov
2020-07-21Allow unblocking a domain via query paramsEgor Kislitsyn
2020-07-21added welcome emailMaksim Pechnikov
2020-07-20Pleroma.Formatter can have partial updatesAlex Gleason
2020-07-20add web installerRoman Chvanikov
2020-07-18Merge branch 'develop' into refactor/fe-bundlesRoman Chvanikov
2020-07-18Don't enable Pleroma.HTTP.Middleware.FollowRedirects unless Gun is usedhref
2020-07-18Fix /api/pleroma/emoji/packs index endpoint.KokaKiwi
2020-07-17Merge branch 'fix-1958' into 'develop'Haelwenn
2020-07-17OpenAPI: Add :id to follower/following endpoints, fixes #1958Alex Gleason
2020-07-17Expose the post formats in /api/v1/instanceMark Felder
2020-07-17using atom keys in search paramsAlexander Strizhakov
2020-07-17TOTP length is configurable, so we can't hardcode this here.Mark Felder
2020-07-16Merge remote-tracking branch 'upstream/develop' into linkifyAlex Gleason