aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-06-15OEmbed.OEmbedController does not exist in the Pleroma codebase. It was ↵Mark Felder
removed in commit 92c5640f and this leftover artifact breaks compiling now.
2019-06-15Update Phoenix to 1.4.8Mark Felder
2019-06-15Merge branch 'feature/add-chat-token-to-masto-api' into 'develop'rinpatch
Mastodon API: Return the token needed for the chat. See merge request pleroma/pleroma!1292
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
AccountView: Add user background. See merge request pleroma/pleroma!1280
2019-06-14Merge branch 'feature/905-dynamic-configuration-in-sql' into 'develop'kaniini
Feature/905 dynamic configuration in sql Closes #905 See merge request pleroma/pleroma!1195
2019-06-14it is changed in compile timeAlexander Strizhakov
we can't change module attributes and endpoint settings in runtime
2019-06-14Merge branch 'fix-rate-limit-test' into 'develop'rinpatch
Fix rate limit test See merge request pleroma/pleroma!1289
2019-06-14Fix rate limit testEgor Kislitsyn
2019-06-14Merge branch 'fix/hashtag-rich-media' into 'develop'lain
Fix hashtags being picked up by rich media parser Closes #989 See merge request pleroma/pleroma!1288
2019-06-14Merge branch 'issues/948-account-search' into 'develop'lain
[#948] /api/v1/account_search added optional parameters (limit, offset, following) See merge request pleroma/pleroma!1270
2019-06-14[#948] /api/v1/account_search added optional parameters (limit, offset, ↵Maksim
following)
2019-06-14Fix hashtags being picked up by rich media parserrinpatch
Closes #989
2019-06-14Merge branch 'patch-2' into 'develop'lain
Add copyright info to containment.ex See merge request pleroma/pleroma!1286
2019-06-14Add copyright info to containment.exEgor
2019-06-14Merge branch '986-document-how-to-disable-rate-limiting' into 'develop'lain
Resolve "Document how to disable rate limiting" Closes #986 See merge request pleroma/pleroma!1285
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
Documents how to disable rate limiting
2019-06-14Merge branch 'feature/ci-release-build' into 'develop'lain
CI: build otp releases for master and develop branches See merge request pleroma/pleroma!1279
2019-06-14Merge branch 'release-move-out-application-dir' into 'develop'lain
Set instance static/uploads to be outside of application directory in release config See merge request pleroma/pleroma!1283
2019-06-14Set instance static/uploads to be outside of application directory in ↵rinpatch
release config In case of releases the application directory changes with each version so the contents will not be accessible
2019-06-13remove the feature branch from onlyrinpatch
2019-06-13Merge branch 'fix/pleroma-ctl-shellcheck' into 'develop'rinpatch
pleroma_ctl: fix == instead of = and double quote the path to prevent globing See merge request pleroma/pleroma!1282
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
Prometheus: Remove flaky process collection NIF. See merge request pleroma/pleroma!1281
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
Rich Media Parser: Attempt to use <title> from HTML as a fallback Closes #979 See merge request pleroma/pleroma!1277
2019-06-13Merge branch 'feld/pleroma-fix/ogp-title' into 'fix/ogp-title'feld
Improve <title> fallback; Add a test See merge request feld/pleroma!1
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
Handle HTTP 404 and 410 response Closes #977 See merge request pleroma/pleroma!1278
2019-06-13Handle HTTP 404 responseEgor Kislitsyn
2019-06-13Handle HTTP "410 Gone" responseEgor Kislitsyn
2019-06-13Improve <title> fallback; Add a testEgor Kislitsyn
2019-06-12Revert "Only run Floki if title is missing from the map"Mark Felder
This reverts commit 97d2b1a45ab12c530dd730518b9d8ca546bbc9f2.
2019-06-12Only run Floki if title is missing from the mapMark Felder
2019-06-12Attempt to use <title> from HTML as a fallbackMark Felder
2019-06-12[#963] No redirect on OOB OAuth authorize request with existing ↵Ivan Tashkinov
authorization. OAuth-related refactoring.
2019-06-12MastodonAPI Controller: Band-Aid double vote problem.lain