summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-22I forgot to git add some files, oops (should be squashed with MR)Ilja
2020-06-22Fix 1586 Docs: provide a index.mdIlja
* I renamed the introduction.md to index.md * I moved over the FE parts to an index file in the FE repo (will do an MR in the FE repo to actually add it) * While I was at it, I also fixed some broken links
2020-06-22Merge branch 'feature/1854-emoji-pagination' into 'develop'lain
Emoji and packs pagination Closes #1854 See merge request pleroma/pleroma!2658
2020-06-20Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'lain
mix.exs: version git-less (part 2, MacOS-compat) See merge request pleroma/pleroma!2420
2020-06-20Apply suggestion to ↵Alexander Strizhakov
lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
2020-06-20Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop'lain
Support 'bot' field in account update_credentials Closes #1600 and #1467 See merge request pleroma/pleroma!2662
2020-06-20Merge branch 'docs/attachment_links' into 'develop'lain
cheatsheet.md: no_attachment_links → attachment_links See merge request pleroma/pleroma!2664
2020-06-20Merge branch 'cleanup/object-conversation' into 'develop'lain
Stop filling conversation field on incoming objects (legacy, unused) See merge request pleroma/pleroma!2663
2020-06-20Apply suggestion to ↵lain
lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
2020-06-20cheatsheet.md: no_attachment_links → attachment_linksHaelwenn (lanodan) Monnier
2020-06-20fix for packs paginationAlexander Strizhakov
2020-06-20Stop filling conversation field on incoming objects (legacy, unused)Haelwenn (lanodan) Monnier
conversation field is still set for outgoing federation for compatibility.
2020-06-19Merge branch 'issue/1855' into 'develop'feld
#1855 MediaProxy cache invalidation via Admin API See merge request pleroma/pleroma!2648
2020-06-19Only accounts with Service actor_type are considered as botsSergey Suprunenko
2020-06-19Add support for bot field in update_credentialsSergey Suprunenko
2020-06-19Merge branch 'add-troubleshooting-info' into 'develop'lain
README: Add some troubleshooting info for compilation issues. See merge request pleroma/pleroma!2660
2020-06-19README: Add some troubleshooting info for compilation issues.lain
2020-06-19Merge branch '1873-pagination-fixes' into 'develop'lain
[#1873] :offset pagination param support, hashtags pagination Closes #1873 See merge request pleroma/pleroma!2659
2020-06-19Merge branch 'dry-up-follower-update' into 'develop'lain
User: update_follower_count refactor. See merge request pleroma/pleroma!2649
2020-06-19[#1873] Fixes missing :offset pagination param support. Added pagination ↵Ivan Tashkinov
support for hashtags search.
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-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-17credo fixAlexander Strizhakov
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.