aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Collapse)Author
2020-06-25Merge branch 'issue/1872-ex_aws' into 'develop'lain
[#1872] use Pleroma.HTTP for ExAws.S3 See merge request pleroma/pleroma!2683
2020-06-25Blocking: Don't federate if the options is set.lain
2020-06-25ActivityPub: Remove `block`.lain
2020-06-25AccountController: Extract blocking to CommonAPI.lain
2020-06-25Transmogrifier: Switch to pipeline for Blocks.lain
2020-06-25ObjectValidator: Basic `Block` support.lain
2020-06-25Merge branch 'fix/following-request-from-deactivated' into 'develop'lain
Filter outstanding follower requests from deactivated accounts Closes #1771 See merge request pleroma/pleroma!2682
2020-06-25added wrapper Pleroma.HTTP for ExAws.S3Maksim Pechnikov
2020-06-24Filter outstanding follower requests from deactivated accountsMark Felder
2020-06-24fixed config/descpiption.exsMaksim Pechnikov
2020-06-24fix for emoji pagination in pack showAlexander Strizhakov
2020-06-24Status schema: Add parent_visible.lain
2020-06-24StatusView: Add pleroma.parent_visiblelain
2020-06-24Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'lain
admin api status count per instance See merge request pleroma/pleroma!2500
2020-06-24added wrapper Pleroma.HTTP for Tzdata.HTTPClientMaksim Pechnikov
2020-06-23Merge branch 'update-validator' into 'develop'lain
Update validator See merge request pleroma/pleroma!2668
2020-06-23Merge developRoman Chvanikov
2020-06-23Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'Haelwenn
Moving mrf settings from instance to separate mrf group Closes #1631 See merge request pleroma/pleroma!2320
2020-06-23migrate to oban 2.0-rc1Maksim Pechnikov
2020-06-23Merge branch 'issue/1798' into 'develop'lain
[#1798] fixed migration the settings to DB See merge request pleroma/pleroma!2655
2020-06-23ObjectValidator: Clarify type of object.lain
2020-06-23Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
update-validator
2020-06-23added testsMaksim Pechnikov
2020-06-23ActivityPubController: Update upload_media @docHaelwenn (lanodan) Monnier
Small cherry-pick from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/1810
2020-06-23Merge branch 'fix/missing-default-instance_thumbnail_config' into 'develop'Haelwenn
Add missing default config value for :instance, instance_thumbnail See merge request pleroma/pleroma!2672
2020-06-22Do not need a function to provide fallback value with default defined in ↵Mark Felder
config.exs
2020-06-22Merge branch 'warning/mastofe-settings-blob' into 'develop'Haelwenn
Add warning against parsing/reusing MastoFE settings blob See merge request pleroma/pleroma!2671
2020-06-22Add warning against parsing/reusing MastoFE settings blobHaelwenn (lanodan) Monnier
2020-06-22Merge branch 'add-muted-to-notifications' into 'develop'lain
Add `pleroma.is_muted` property to notifications Closes #1812 See merge request pleroma/pleroma!2670
2020-06-22Update NotificationOperation specEgor Kislitsyn
2020-06-22Add `is_muted` to notificationsEgor Kislitsyn
2020-06-22added verify RUM settings before start appMaksim Pechnikov
2020-06-22Merge branch 'feature/1739-account-endpoints' into 'develop'lain
account visibility in masto api Closes #1739 See merge request pleroma/pleroma!2488
2020-06-22Merge branch 'fix/1825-admin-api-error-codes' into 'develop'lain
Proper error codes for error in adminFE Closes #1825 See merge request pleroma/pleroma!2665
2020-06-22Credo fixeslain
2020-06-22ActivityPub: Remove `update` and switch to pipeline.lain
2020-06-22Merge branch '1865-media-only' into 'develop'rinpatch
Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned" Closes #1865 See merge request pleroma/pleroma!2650
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-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-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-20Apply suggestion to ↵lain
lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
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
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-23 14:39:27 +0000