aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Collapse)Author
2019-06-16Merge branch 'fix/sanitize-report-content' into 'develop'Haelwenn
Sanitize HTML in ReportView Closes #990 See merge request pleroma/pleroma!1293
2019-06-16salmon fixAlex S
removed some ownership sandbox error
2019-06-16[#570] add user:notification streamMaksim
2019-06-16Fix report content stopping to be nullablerinpatch
2019-06-16fix for new instancesAlexander Strizhakov
2019-06-16Credo fixesrinpatch
2019-06-16Sanitize HTML in ReportViewrinpatch
Closes #990
2019-06-15Merge branch 'bugfix/980-polls-double-vote' into 'develop'lain
MastodonAPI Controller: Band-Aid double vote problem. See merge request pleroma/pleroma!1275
2019-06-15Merge branch 'update/phoenix-and-plug' into 'develop'lain
Update Phoenix See merge request pleroma/pleroma!1290
2019-06-15Merge branch '963_oob_oauth_redirect_fix' into 'develop'kaniini
[#963] No redirect on OOB OAuth authorize request with existing authorization See merge request pleroma/pleroma!1276
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-15Mastodon API: Return the token needed for the chat.lain
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-14it is changed in compile timeAlexander Strizhakov
we can't change module attributes and endpoint settings in runtime
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-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-14Add copyright info to containment.exEgor
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-13Prometheus: Remove flaky process collection NIF.lain
2019-06-13AccountView: Add user background.lain
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-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
2019-06-12Merge branch 'update_auto_linker' into 'develop'lain
Update `auto_linker` dependency See merge request pleroma/pleroma!1272
2019-06-12Remove search result order for non-RUM indexesEgor Kislitsyn
2019-06-12Update `auto_linker` dependencyEgor Kislitsyn
2019-06-11Add option to restrict all users to local contentEgor Kislitsyn
2019-06-11Merge branch 'feature/rate-limiter' into 'develop'lain
Feature/Rate Limiter Closes #943 See merge request pleroma/pleroma!1266
2019-06-11Replace `MastodonAPIController.account_register/2` rate limiterEgor Kislitsyn
2019-06-11Add rate limiting for search endpointsEgor Kislitsyn
2019-06-11Add RateLimiterEgor Kislitsyn
2019-06-11Merge branch 'preload-changes' into 'develop'kaniini
Conversations: Fetch users in one query. See merge request pleroma/pleroma!1258
2019-06-09Merge branch 'develop' into feature/releasesrinpatch
2019-06-09Add migrate/rollback to release tasksrinpatch
2019-06-08Make mix tasks work in a releaserinpatch
2019-06-08Merge branch 'fix/transmogrifier-inReplyTo' into 'develop'lain
Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched See merge request pleroma/pleroma!1259
2019-06-07Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetchedrinpatch
2019-06-07Conversations: Fetch users in one query.lain
2019-06-07Emoji: Use full path to check if a file is a directory.lain
2019-06-06Replace Mix.env with Pleroma.Config.get(:env)rinpatch
Mix.env/0 is not availible in release environments such as distillery or elixir's built-in releases.
2019-06-06Merge branch 'fix/elixir-master-deprecation-warnings' into 'develop'kaniini
Switch to manual Supervisor child specifications instead of Supervisor.Spec See merge request pleroma/pleroma!1252
2019-06-06User Search: Boost friends more strongly.lain