summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-08-25Merge branch 'gun' of git.pleroma.social:alex.s/pleroma into integration/alex...integration/alex.s/gunAriadne Conill
2019-08-25Merge branch 'issue/1177' into 'develop'kaniini
2019-08-25Merge branch 'feature/moderation-log' into 'develop'kaniini
2019-08-25Log admin/moderator actionsMaxim Filippov
2019-08-25Merge branch 'fix-all-custom-fields-deleted' into 'develop'kaniini
2019-08-26Update test for custom profile fieldskPherox
2019-08-25Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'lain
2019-08-25no drop active connectionsAlex S
2019-08-25Merge branch 'bugfix/log_non_implemented_mocks' into 'develop'rinpatch
2019-08-25HttpRequestMock: Remove useless `error = error`Haelwenn (lanodan) Monnier
2019-08-25user_test.exs: fix rel=me testsHaelwenn (lanodan) Monnier
2019-08-25Implement missing mocks for rel=meHaelwenn (lanodan) Monnier
2019-08-25HttpRequestMock: Improve non-implemented error messageHaelwenn (lanodan) Monnier
2019-08-25HttpRequestMock: Log mock errors as warningsHaelwenn (lanodan) Monnier
2019-08-25Change to use attachment only when fields do not existkPherox
2019-08-24Merge branch 'admin-create-users' into 'develop'lain
2019-08-24Merge branch 'activity-expiration' into 'develop'kaniini
2019-08-24Update CHANGELOG.mdlain
2019-08-24Activity expiration: Fix docs.lain
2019-08-24Activity Expiration: Switch to 'expires_in' system.lain
2019-08-24ActivityExpirationWorker: Fix merge issues.lain
2019-08-24calculated crf for closing connectionsAlex S
2019-08-24update testsMaksim Pechnikov
2019-08-24 put_resp_header("content-type", "application/activity+json") -> put_resp_con...Maksim Pechnikov
2019-08-24Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expi...lain
2019-08-24add testsMaksim Pechnikov
2019-08-23Merge branch 'fix-default-config-account_field' into 'develop'kaniini
2019-08-23Fix default config of account fields lengtharies
2019-08-23some refactoringAlex S
2019-08-23bump tesla versionAlex S
2019-08-23little refactoringAlex S
2019-08-23added tls_opts to connect methodAlex S
2019-08-23basic support for proxiesAlex S
2019-08-23Merge branch 'fix/add-likes-index-objects' into 'develop'kaniini
2019-08-23Add an index on object likesrinpatch
2019-08-22fix /inbox for RelayMaksim Pechnikov
2019-08-22fix testMaksim Pechnikov
2019-08-22Merge branch 'develop' into issue/1177Maksim Pechnikov
2019-08-22Merge branch 'support/tests' into 'develop'feld
2019-08-22Merge branch 'improve-ap-routes-rate-limit' into 'develop'lain
2019-08-22formattingAlex S
2019-08-22opts to verify certificates by gunAlex S
2019-08-22was used with hackneyAlex S
2019-08-22tesla version bumpAlex S
2019-08-22Improve AP routes rate limitEgor Kislitsyn
2019-08-22fixed unfollow for relay actorMaksim Pechnikov
2019-08-22remove old user create and delete routes for adminSachin Joshi
2019-08-21fixed clear config after testMaksim Pechnikov
2019-08-21Merge branch 'rate-limit-ap-routes' into 'develop'lain
2019-08-20tests: fix up tesla testAriadne Conill