summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-29updated swooshMaksim Pechnikov
2020-06-29Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop'lain
excluding attachment links from RichMedia See merge request pleroma/pleroma!2702
2020-06-29excluding attachment links from RichMediaAlexander Strizhakov
2020-06-29Merge branch 'avatar-removing' into 'develop'lain
UpdateCredentialsTest: Add test for removing profile images. See merge request pleroma/pleroma!2701
2020-06-29UpdateCredentialsTest: Add test for removing profile images.lain
2020-06-29Merge branch '1031-parent-visible' into 'develop'lain
Resolve "Add `pleroma.parent_visible` to the status view" Closes #1031 See merge request pleroma/pleroma!2679
2020-06-29Merge branch 'openapi/schema-account-pleromafields' into 'develop'lain
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses See merge request pleroma/pleroma!2700
2020-06-29ApiSpec.Schemas.Account: import description from ↵Haelwenn (lanodan) Monnier
differences_in_mastoapi_responses
2020-06-29Merge branch 'docs/mastoapi-account-fields' into 'develop'Haelwenn
differences_in_mastoapi_responses: Update account fields See merge request pleroma/pleroma!2699
2020-06-29differences_in_mastoapi_responses: Update account fieldsHaelwenn (lanodan) Monnier
2020-06-27Merge branch 'reduce-preloading-defaults' into 'develop'lain
Config: Reduce default preloaders to configuration endpoints. See merge request pleroma/pleroma!2697
2020-06-27Config: Reduce default preloaders to configuration endpoints.lain
Fetching the timeline is a bit heavy to do by default.
2020-06-27Merge branch 'fix/fetcher-transmogrifier-error' into 'develop'lain
object/fetcher: Pass full Transmogrifier error See merge request pleroma/pleroma!2696
2020-06-26object/fetcher: Pass full Transmogrifier errorHaelwenn (lanodan) Monnier
2020-06-26Merge branch 'block-handling' into 'develop'Haelwenn
Handle blocks with the pipeline See merge request pleroma/pleroma!2685
2020-06-26Merge branch '1258-anti-link-spam-exemption' into 'develop'Haelwenn
AntiSpamLinkPolicy: Exempt local users. Closes #1258 See merge request pleroma/pleroma!2686
2020-06-26Merge branch 'fix-chats' into 'develop'lain
Nodeinfo: Add chat information back in. See merge request pleroma/pleroma!2691
2020-06-26Nodeinfo: Add chat information back in.lain
2020-06-26User: Don't unfollow on block when the relevant setting is set.lain
2020-06-26BlockValidator: Restore old behavior for incoming blocks.lain
2020-06-26Merge branch 'hotfix/preload-tests-nodeinfo' into 'develop'Haelwenn
nodeinfo: Fix MRF transparency See merge request pleroma/pleroma!2689
2020-06-26nodeinfo: Fix MRF transparencyHaelwenn (lanodan) Monnier
2020-06-25Merge branch 'preload-data' into 'develop'feld
Preload data into index.html Closes #1660 See merge request pleroma/pleroma!2381
2020-06-25Merge branch 'mastoapi-omitted' into 'develop'feld
MastoAPI differences: Document not implemented features See merge request pleroma/pleroma!2687
2020-06-25Merge branch 'update/admin-fe-20200625' into 'develop'feld
Update AdminFE build See merge request pleroma/pleroma!2688
2020-06-25Update AdminFE buildMark Felder
2020-06-25MastoAPI differences: Document not implemented featuresAlex Gleason
2020-06-25Merge branch 'chore/remove-reference-to-distsn' into 'develop'lain
Remove reference to defunct distsn.org See merge request pleroma/pleroma!2675
2020-06-25AntiSpamLinkPolicy: Exempt local users.lain
2020-06-25Apply suggestion to config/description.exslain
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-25Transmogrifier Test: Extract block handling.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-24Merge branch 'fix-emoji-pagination' into 'develop'lain
Fix for emoji pagination in pack show See merge request pleroma/pleroma!2681
2020-06-24fix for emoji pagination in pack showAlexander Strizhakov
2020-06-24Status schema: Add parent_visible.lain
2020-06-24Changelog: Put info under API header.lain
2020-06-24Changelog: Add info about parent_visible fieldlain
2020-06-24Docs: Document added parent_visible field.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-24Merge branch 'issue/1872-updated-tzdata' into 'develop'lain
[#1872] use Pleroma.HTTP for Tzdata See merge request pleroma/pleroma!2678
2020-06-24Apply suggestion to test/http/tzdata_test.exslain
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-28 15:17:44 +0000