summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-29Fix CastAndValidate plugEgor Kislitsyn
2020-06-29updated swooshMaksim Pechnikov
2020-06-29Remove `/statusnet/config`Egor Kislitsyn
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-29Fix warningEgor Kislitsyn
2020-06-29excluding attachment links from RichMediaAlexander Strizhakov
2020-06-29Merge branch 'develop' into remove-twitter-apiEgor Kislitsyn
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-29Preloaders: Use strings as keys.lain
2020-06-29User preloader: Put user info at correct keylain
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-27added tab & labels for mrf policiesAlexander Strizhakov
2020-06-26object/fetcher: Pass full Transmogrifier errorHaelwenn (lanodan) Monnier
2020-06-26MastoAPI: Show source field when deletingHaelwenn (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-26StaticFE: Prioritize json in requests.lain
2020-06-26Preloading: Fix nodeinfo url.lain
2020-06-26Preloading: Return correct data for statusnet stuff.lain
2020-06-26additional data to MRF policies in descriptionsAlexander Strizhakov
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-26Pleroma.Upload.Filter.Mogrify args descriptionAlexander Strizhakov
2020-06-26activity_draft: Add source fieldHaelwenn (lanodan) Monnier
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