aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-22Update Handling Test: Fix for re-used update ids.lain
2020-06-22Transmogrifier: Handle `Update` with the pipeline.lain
2020-06-22SideEffects: Handle user updating.lain
2020-06-22Merge branch '1883-mrf-chat' into 'develop'rinpatch
HellthreadPolicy: Restrict to Notes and Articles. Closes #1883 See merge request pleroma/pleroma!2666
2020-06-22Add include for the "Further reading" sectionIlja
* I added an include and use this include for the installation guides that already had this section * I added the "Further reading" section as well as te "Questions" section to the English guides that didn't have it yet * I added a first point "How Federation Works/Why is my Federated Timeline empty?" to link to lains blogpost about this because we still get this question a lot in the #pleroma support channel * I reordered the list a bit
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-22HellthreadPolicy: Restrict to Notes and Articles.lain
2020-06-22Merge branch 'develop' into refactor/fe-bundlesRoman Chvanikov
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-20Merge branch 'develop' into refactor/fe-bundlesRoman Chvanikov
2020-06-20Apply suggestion to ↵Alexander Strizhakov
lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
2020-06-20proper error codes for error in adminFEAlexander Strizhakov
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-20Apply suggestion to lib/mix/tasks/pleroma/config.exlain
2020-06-20Merge branch 'develop' into '1865-media-only'lain
# Conflicts: # CHANGELOG.md
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-19Merge branch 'develop' into refactor/fe-bundlesRoman Chvanikov
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-19UpdateValidator: Only allow updates from the user themselves.lain
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-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-18Merge branch 'develop' into refactor/fe-bundlesRoman Chvanikov
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