summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-12-19Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developLain Iwakura
2017-12-19Fix timelines in subway tooter.Lain Iwakura
2017-12-18Merge branch 'fix/twitterapi-follow-lists' into 'develop'lambda
Fix follower/following lists. Closes #29 See merge request pleroma/pleroma!41
2017-12-18MastoAPI: Fix always-sensitive bugs.Lain Iwakura
2017-12-18Send out salmons before websub.Lain Iwakura
2017-12-18Fix follower/following lists.eal
Add tests.
2017-12-18Merge branch 'feature/follow-import' into 'develop'lambda
Add follow import. See merge request pleroma/pleroma!40
2017-12-12Run follow import in the background.eal
2017-12-12Allow uploading a file for follow import.eal
2017-12-12Add recipients field to activities.Lain Iwakura
Also do some very basic checks for AP message insertion.
2017-12-12Add follow import.eal
2017-12-12proxy emojishref
(i fix emojos better than gargon but sshhhhh)
2017-12-12fix content-type and fallback to image/jpeghref
2017-12-12ActivityPub: Check inbox requests for valid signature.Roger Braun
2017-12-12Add plug to validate signed http requests.Roger Braun
2017-12-11Fix some more tests.eal
2017-12-11ActivityPub: Add controller tests.Lain Iwakura
2017-12-11ActivityPub: Add object routes / controller.Lain Iwakura
2017-12-11ActivityPub: Use only string keys in views.Lain Iwakura
2017-12-11ActivityPub: Add Objects View.Lain Iwakura
2017-12-11Fix tests.eal
2017-12-11Merge branch 'fix/tootdon-mentions' into 'develop'lambda
Fix Tootdon linking the whole status when mentioning someone. See merge request pleroma/pleroma!39
2017-12-11Add a bunch of useless HTML to mentions.eal
2017-12-11HTTPSig: Add method to validate connRoger Braun
2017-12-11Basic incoming AP support.Roger Braun
2017-12-11Merge remote-tracking branch 'upstream/develop' into media-proxyhref
2017-12-11nginx sample config, quickly testedhref
2017-12-11Limit body size to 25MBhref
2017-12-09Add link to AP address in webfinger.Roger Braun
2017-12-09Merge branch 'develop' into feature/activitypubRoger Braun
2017-12-09Merge branch 'feature/user_deletion' into developRoger Braun
2017-12-08Delete notifications on activity deletion.Lain Iwakura
2017-12-08Basic user deletion.Lain Iwakura
2017-12-08Merge branch 'fix/linkify' into 'develop'lambda
Fix links with HTML elements and/or parentheses. See merge request pleroma/pleroma!38
2017-12-08Merge branch 'fix/mastoapi-attachment-linking' into 'develop'lambda
MastoAPI: don't add attachment links. Closes #92 See merge request pleroma/pleroma!37
2017-12-08Merge branch 'postgresetup' into 'develop'lambda
first version of safe DB setup See merge request pleroma/pleroma!32
2017-12-07Allow parentheses in links.eal
2017-12-07Fix HTML escape breaking some links.eal
2017-12-07MastoAPI: don't add attachment links.eal
2017-12-07Add websocket upgrade to example nginx config.eal
2017-12-07User deletion: Remove relationships.Lain Iwakura
2017-12-07Don't follow deactivated users.Lain Iwakura
2017-12-07Add function to deactivate users.Lain Iwakura
2017-12-07Don't log in deactivated users.Lain Iwakura
2017-12-06Priority queue fixes.Lain Iwakura
2017-12-05Add basic queue prioritization.Lain Iwakura
2017-12-05Merge remote-tracking branch 'upstream/develop' into media-proxyhref
2017-12-05Merge branch 'feature/chat' into 'develop'lambda
Feature/chat See merge request pleroma/pleroma!36
2017-12-05Fix tests.Lain Iwakura
2017-12-05Update frontend.Lain Iwakura