summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-19Merge branch 'dry-up-follower-update' into 'develop'lain
User: update_follower_count refactor. See merge request pleroma/pleroma!2649
2020-06-19ObjectValidators: Add basic UpdateValidator.lain
2020-06-19[#1873] Fixes missing :offset pagination param support. Added pagination ↵Ivan Tashkinov
support for hashtags search.
2020-06-19Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
update-validator
2020-06-19default page size for filesAlexander Strizhakov
2020-06-19changelog entryAlexander Strizhakov
2020-06-19adding overall count for packs and filesAlexander Strizhakov
2020-06-18emoji pagination for pack show actionAlexander Strizhakov
2020-06-18emoji packs paginationAlexander Strizhakov
2020-06-18added testMaksim Pechnikov
2020-06-18revert 'database' option to rejected keysMaksim Pechnikov
2020-06-18fix testMaksim Pechnikov
2020-06-17Change references from "deleted_urls" to "banned_urls" as nothing is handled ↵Mark Felder
via media deletions anymore; all actions are manual operations by an admin to ban the url
2020-06-17Remove misleading is_ prefix from boolean functionMark Felder
2020-06-17Empty list as defaultMark Felder
2020-06-17Merge branch 'develop' into issue/1855Mark Felder
2020-06-17Merge branch 'fix/1787-mogrify-args' into 'develop'lain
Moving custom ecto types in context folders See merge request pleroma/pleroma!2652
2020-06-17Merge branch 'fix/notification-type' into 'develop'rinpatch
Remove `poll` from `notification_type` OpenAPI spec Closes #1867 See merge request pleroma/pleroma!2657
2020-06-17Remove `poll` from `notification_type` OpenAPI specEgor Kislitsyn
2020-06-17Apply suggestion to test/web/media_proxy/invalidation_test.exsMaksim
2020-06-17Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.exMaksim
2020-06-17Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.exMaksim
2020-06-17Apply suggestion to test/web/media_proxy/media_proxy_controller_test.exsMaksim
2020-06-17Apply suggestion to test/web/media_proxy/invalidations/script_test.exsMaksim
2020-06-17Apply suggestion to test/web/media_proxy/invalidations/http_test.exsMaksim
2020-06-17Apply suggestion to ↵Maksim
test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
2020-06-17Apply suggestion to ↵Maksim
test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
2020-06-17Apply suggestion to ↵Maksim
test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
2020-06-17Apply suggestion to lib/pleroma/web/media_proxy/invalidation.exMaksim
2020-06-17Apply suggestion to docs/API/admin_api.mdMaksim
2020-06-17Apply suggestion to docs/API/admin_api.mdMaksim
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-17formattingAlexander Strizhakov
2020-06-17suggestion for changelogAlexander Strizhakov
2020-06-17credo fixAlexander Strizhakov
2020-06-17fixed migration the settings to DBMaksim Pechnikov
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-16fixes for testsAlexander Strizhakov
2020-06-16moving mrf settings from instance to separate groupAlexander Strizhakov
2020-06-16moving custom ecto types in context foldersAlexander Strizhakov
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