aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-17Remove `poll` from `notification_type` OpenAPI specEgor Kislitsyn
2020-06-17Merge branch 'features/users-raw_bio' into 'develop'rinpatch
User: Add raw_bio, storing unformatted bio See merge request pleroma/pleroma!2326
2020-06-17Merge branch 'release/update-otp-elixir' into 'develop'rinpatch
Update elixir image used for OTP releases See merge request pleroma/pleroma!2654
2020-06-17CHANGELOG.md: mention minimal elixir version updaterinpatch
2020-06-17Update OTP releases to official images of 1.10.3rinpatch
This is necessary since we bumped required version of elixir to 1.9. The dlsym bug should be gone by now.
2020-06-16Merge branch 'hotfix/notification-migration' into 'develop'lain
Chunk the notification type backfill migration See merge request pleroma/pleroma!2653
2020-06-16Chunk the notification type backfill migrationrinpatch
Long-term we want that migration to be done entirely in SQL, but for now this is a hotfix to not cause OOMs on large databases. This is using a homegrown version of `Repo.stream`, it's worse in terms of performance than the upstream since it doesn't use the same prepared query for chunk queries, but unlike the upstream it supports preloads.
2020-06-16Merge branch '1866-last-status-stuff' into 'develop'Haelwenn
Resolve "/api/v1/conversations returns the wrong `last_status`" Closes #1866 See merge request pleroma/pleroma!2647
2020-06-16Merge branch 'elixir-1.9' into 'develop'rinpatch
Upgrade to Elixir 1.9 See merge request pleroma/pleroma!2651
2020-06-16Upgrade to Elixir 1.9Steven Fuchs
2020-06-16Merge branch 'fix/1787-mogrify-args' into 'develop'lain
Mogrify args in adminFE Closes #1787 See merge request pleroma/pleroma!2616
2020-06-16namingAlexander Strizhakov
2020-06-16fix attemps to merge mapAlexander Strizhakov
2020-06-16fix for updated hackneyAlexander Strizhakov
warning: :hackney_connect.partial_chain/1 is undefined or private
2020-06-16Mogrify args as custom tuplesAlexander Strizhakov
2020-06-15Merge branch 'merge-ogp-twitter-parsers' into 'develop'lain
Merge OGP parser with TwitterCard Closes #1835 See merge request pleroma/pleroma!2642
2020-06-15Fix testsEgor Kislitsyn
2020-06-15Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsersEgor Kislitsyn
2020-06-15Changelog: Add info about conversation view changes.lain
2020-06-15Conversations: Return last dm for conversation, not last message.lain
2020-06-15Merge branch 'notifications-filtering' into 'develop'lain
Mastodon API return full result set in notifications See merge request pleroma/pleroma!2552
2020-06-14Mastodon API: ensure the notification endpoint doesn't return less than the ↵eugenijm
requested amount of records unless it's the last page
2020-06-13Merge branch '1851-favorites-pagination' into 'develop'rinpatch
StatusController: Correctly paginate favorites. Closes #1851 See merge request pleroma/pleroma!2636
2020-06-13ControllerHelper: Always return id field.lain
2020-06-13Apply suggestion to lib/pleroma/web/controller_helper.exlain
2020-06-13Remove use of atoms in MRF.UserAllowListPolicyhref
2020-06-13Fix atom leak in Rich Media ParserEgor Kislitsyn
2020-06-12Merge branch 'patch-1' into 'develop'Haelwenn
Update pleroma.nginx to support TLSv1.3 See merge request pleroma/pleroma!2644
2020-06-12Merge branch 'recipients-experiments' into 'develop'Haelwenn
ActivityPub: Don't show announces of your own objects in timeline. See merge request pleroma/pleroma!2637
2020-06-12Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2Egor Kislitsyn
2020-06-12Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsersEgor Kislitsyn
2020-06-12Merge branch 'global-status-expiration' into 'develop'lain
Global status expiration See merge request pleroma/pleroma!2208
2020-06-12Apply suggestion to config/description.exslain
2020-06-12Merge branch 'features/mix-task-reset-mfa' into 'develop'feld
New mix task: pleroma.user reset_mfa <nickname> See merge request pleroma/pleroma!2643
2020-06-12Merge branch 'chore/bump-changelog' into 'develop'feld
Add changelog entry for emoji pack reload command See merge request pleroma/pleroma!2646
2020-06-12Document new mix task feature to reset mfaMark Felder
2020-06-12Merge branch 'develop' into features/mix-task-reset-mfaMark Felder
2020-06-12Add changelog entry for emoji pack reload commandMark Felder
2020-06-12Merge branch 'feature/cli-reload-emoji' into 'develop'lain
Add command to reload emoji packs from cli for OTP users Closes #1814 See merge request pleroma/pleroma!2639
2020-06-12Merge branch '1794-hashtags-construction-from-uri-fix' into 'develop'feld
[#1794] Fixes URI query handling for hashtags extraction in search Closes #1794 See merge request pleroma/pleroma!2645
2020-06-12[#1794] Fixes URI query handling for hashtags extraction in search.Ivan Tashkinov
2020-06-12Update pleroma.nginx to support TLSv1.3normandy
Based on SSL config from https://ssl-config.mozilla.org/
2020-06-11New mix task: pleroma.user reset_mfa <nickname>Haelwenn (lanodan) Monnier
2020-06-11Deprecate Pleroma.Web.RichMedia.Parsers.OGPEgor Kislitsyn
2020-06-11Merge branch 'fix/csp-mediaproxy-base-url' into 'develop'feld
HTTP security plug: add media proxy base url host to csp See merge request pleroma/pleroma!2638
2020-06-11Check for media proxy base_url, not Upload base_urlMark Felder
2020-06-11Merge branch 'develop' into fix/csp-mediaproxy-base-urlMark Felder
2020-06-11Merge branch '1794-hashtags-construction-from-uri' into 'develop'feld
[#1794] Hashtags search fix for URI as query string Closes #1794 See merge request pleroma/pleroma!2641
2020-06-11Merge OGP parser with TwitterCardEgor Kislitsyn
2020-06-11[#1794] Fixes URI query handling for hashtags extraction in search.Ivan Tashkinov