aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-06-16fix for new instancesAlexander Strizhakov
2019-06-16no print version to the shellAlex S
2019-06-16Credo fixesrinpatch
2019-06-16Sanitize HTML in ReportViewrinpatch
2019-06-16Add tests for report viewrinpatch
2019-06-15Merge branch 'bugfix/980-polls-double-vote' into 'develop'lain
2019-06-15Merge branch 'update/phoenix-and-plug' into 'develop'lain
2019-06-15Merge branch '963_oob_oauth_redirect_fix' into 'develop'kaniini
2019-06-15OEmbed.OEmbedController does not exist in the Pleroma codebase. It was remove...Mark Felder
2019-06-15Update Phoenix to 1.4.8Mark Felder
2019-06-15Merge branch 'feature/add-chat-token-to-masto-api' into 'develop'rinpatch
2019-06-15Apply suggestion to CHANGELOG.mdlain
2019-06-15Documentation: Document chat token response.lain
2019-06-15Changelog: Document chat token.lain
2019-06-15Mastodon API: Return the token needed for the chat.lain
2019-06-15bugfixAlex S
2019-06-15little fixAlex S
2019-06-15version generationAlex S
2019-06-14Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'rinpatch
2019-06-14Merge branch 'feature/905-dynamic-configuration-in-sql' into 'develop'kaniini
2019-06-14it is changed in compile timeAlexander Strizhakov
2019-06-14Merge branch 'fix-rate-limit-test' into 'develop'rinpatch
2019-06-14Fix rate limit testEgor Kislitsyn
2019-06-14Merge branch 'fix/hashtag-rich-media' into 'develop'lain
2019-06-14Merge branch 'issues/948-account-search' into 'develop'lain
2019-06-14[#948] /api/v1/account_search added optional parameters (limit, offset, follo...Maksim
2019-06-14Fix hashtags being picked up by rich media parserrinpatch
2019-06-14Merge branch 'patch-2' into 'develop'lain
2019-06-14Add copyright info to containment.exEgor
2019-06-14Merge branch '986-document-how-to-disable-rate-limiting' into 'develop'lain
2019-06-14Mastodon API: Document changes.lain
2019-06-14MastodonAPI: Add a way to update the background image.lain
2019-06-14Improve rate limiter documentationEgor Kislitsyn
2019-06-14Merge branch 'feature/ci-release-build' into 'develop'lain
2019-06-14Merge branch 'release-move-out-application-dir' into 'develop'lain
2019-06-14Set instance static/uploads to be outside of application directory in release...rinpatch
2019-06-13remove the feature branch from onlyrinpatch
2019-06-13Merge branch 'fix/pleroma-ctl-shellcheck' into 'develop'rinpatch
2019-06-13pleroma_ctl: fix == instead of = and double quote the path to prevent globingrinpatch
2019-06-13Merge branch 'develop' into feature/ci-release-buildrinpatch
2019-06-13Merge branch 'remove-prometheus-nif' into 'develop'rinpatch
2019-06-13Prometheus: Remove flaky process collection NIF.lain
2019-06-13Remove a TODOrinpatch
2019-06-13AccountView: Add user background.lain
2019-06-13Expire artifacts in 42 yearsrinpatch
2019-06-13Merge branch 'fix/ogp-title' into 'develop'lain
2019-06-13Merge branch 'feld/pleroma-fix/ogp-title' into 'fix/ogp-title'feld
2019-06-13Merge branch 'develop' into feature/ci-release-buildrinpatch
2019-06-13CI: Add automatic release buildsrinpatch
2019-06-13Merge branch 'improve-410-handling' into 'develop'lain