aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-11-08Merge remote-tracking branch 'origin/develop' into reactionslain
2019-11-07Merge branch 'chore/bump-fast-sanitize' into 'develop'rinpatch
2019-11-08Bump fast_sanitize to 0.1.1rinpatch
2019-11-07Merge branch 'recipients-filter' into 'develop'kaniini
2019-11-07Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`eugenijm
2019-11-06Merge branch 'fix/unwrapped-object-return' into 'develop'rinpatch
2019-11-07Fetcher: fix local check returning unwrapped objectrinpatch
2019-11-06Merge branch 'fix/trailing-format-plug-oauth' into 'develop'rinpatch
2019-11-06Merge branch 'changelog-cleanup' into 'develop'rinpatch
2019-11-06Merge branch 'fix/saner-static-cache-control' into 'develop'rinpatch
2019-11-06Fix TrailingFormatPlug not being active for /api/oauth_tokensrinpatch
2019-11-06Removed duplicate Changed entry in Unreleased section of CHANGELOG.md.Ivan Tashkinov
2019-11-06Set better Cache-Control header for static contentrinpatch
2019-11-06Merge branch 'feature/multiple-users-force-password-reset' into 'develop'feld
2019-11-06Merge branch 'fix/object-reinject-set-cache' into 'develop'rinpatch
2019-11-06Object Fetcher: set cache after reinjectingrinpatch
2019-11-06Merge branch 'ci/remove-docs-build' into 'develop'Haelwenn
2019-11-05CI: Remove the docs-build jobrinpatch
2019-11-05Merge branch 'chore/bump-htmlentities' into 'develop'rinpatch
2019-11-05Bump HtmlEntities to 0.5rinpatch
2019-11-05Merge branch 'develop' into feature/multiple-users-force-password-resetMaxim Filippov
2019-11-04Merge branch 'failing-search-fixes' into 'develop'rinpatch
2019-11-04Merge branch 'add-direct-conversation-id-to-conversation-event' into 'develop'lain
2019-11-04User Search: Remove superfluous setweight and random test.lain
2019-11-04Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `convers...eugenijm
2019-11-04Merge branch 'transmogrifier-test-errors' into 'develop'lain
2019-11-04Merge branch 'missing-tesla-mocks' into 'develop'lain
2019-11-04add missing tesla mocksSteven Fuchs
2019-11-04Merge branch 'chore/update-fast-sanitize' into 'develop'kaniini
2019-11-04mix: update fast_sanitize dependency to 1af67547Ariadne Conill
2019-11-04Merge branch 'faster-user-deactivation' into 'develop'kaniini
2019-11-04Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'lain
2019-11-04User: Don't pull remote users follower count immediately after deactivating.lain
2019-11-03Merge branch 'chore/update-fast-sanitize' into 'develop'kaniini
2019-11-03update fast sanitize dependencyAriadne Conill
2019-11-03Merge branch 'bugfix/streamer-follows' into 'develop'rinpatch
2019-11-03Merge branch 'feature/omit-relay-user' into 'develop'kaniini
2019-11-03Merge branch 'feature/fast_sanitize' into 'develop'kaniini
2019-11-03streamer: use direct object for filter checks when there is no valid child ob...Ariadne Conill
2019-11-02Merge branch 'fix/migration-schema' into 'develop'Haelwenn
2019-11-01Bump fast_sanitize versionrinpatch
2019-11-01Merge branch 'fix/moderation-log-crash' into 'develop'kaniini
2019-11-01Update docsMaxim Filippov
2019-11-01Apply suggestion to CHANGELOG.mdMaxim Filippov
2019-11-01Fix moderation log crashMaxim Filippov
2019-11-01Force password reset for multiple usersMaxim Filippov
2019-11-01Undo dialyzer fixMaxim Filippov
2019-11-01Merge branch 'fix-recipients-from-activity' into 'develop'kaniini
2019-10-31Merge branch 'refactor/db-add-defaults' into 'develop'lain
2019-10-31Fix countMaxim Filippov