summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-05-22Add access-control-expose-headers to Nginx default configNiklas Poslovski
2018-05-22Hook up block/unblock to TwitterAPIFrancis Dinh
2018-05-22Hook unfollow into TwitterAPIFrancis Dinh
2018-05-22Hook up unfollow and (un)block to MastoAPI + testsFrancis Dinh
2018-05-21Merge branch 'develop' into feature/mstdn-direct-apicsaurus
2018-05-21Fixed testSyldexia
2018-05-21Added endpoint for changing passwordsSyldexia
2018-05-21Merge branch 'feature/clarify-http-sig-error' into 'develop'lambda
clarify HTTP signature error in logs See merge request pleroma/pleroma!165
2018-05-21activitypub controller: note that the HTTP Host header must be forwarded for ↵William Pitcock
http signature validation to work
2018-05-21Pass correct number of arguments to unfollowFrancis Dinh
2018-05-21Merge branch 'bugfix/webfinger-statusnet' into 'develop'lambda
webfinger: fix finding the XRD uri for statusnet instances See merge request pleroma/pleroma!164
2018-05-21webfinger: fix finding the XRD uri for statusnet instancesWilliam Pitcock
2018-05-21Actually fix missing alias.lain
2018-05-21Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain
2018-05-21Add missing alias.lain
2018-05-21Add tests for incoming unfollow over OStatusFrancis Dinh
2018-05-21Fix unblock handlingFrancis Dinh
2018-05-21Handle unfollows from OStatusFrancis Dinh
2018-05-21Add undo block handlerFrancis Dinh
2018-05-20FormatFrancis Dinh
2018-05-20Fix unfollowsFrancis Dinh
2018-05-20pass user to User.blocks?/2 instead of ap_idFrancis Dinh
2018-05-20Merge remote-tracking branch 'upstream/develop' into ↵Francis Dinh
feature/incoming-remote-unfollow Fixed some conflicts in transmogrifier.ex
2018-05-20Merge branch 'develop' into 'develop'lambda
Correct 'register_user' parameters in README See merge request pleroma/pleroma!163
2018-05-20Correct 'register_user' parameters in READMEwitti
password parameter was missing
2018-05-20Migrate to comeonin 4 and Cachex 3Thog
Also fix some warning in the code and add a missing alias
2018-05-20More fixes.lain
2018-05-20Fix specs.lain
2018-05-20update frontendlain
2018-05-20Return visilility in twitter api, too.lain
2018-05-20Return private / direct posts on user timelines, too.lain
2018-05-20update frontendlain
2018-05-20Merge branch 'feature/account-deletion' into 'develop'lambda
Feature/account deletion Closes #115 See merge request pleroma/pleroma!157
2018-05-20Merge branch 'feature/undo-like-federation' into 'develop'lambda
Support undo like over ActivityPub (Fix #139) Closes #139 See merge request pleroma/pleroma!161
2018-05-20Fix test for blocksFrancis Dinh
2018-05-19Pass user instead of their ap_id to User.blockFrancis Dinh
2018-05-19Remove handler for incoming undos with object referencesFrancis Dinh
2018-05-19Formatting and add tests for blocks/unblocksFrancis Dinh
2018-05-19Use correct variable names in unfollowFrancis Dinh
2018-05-19Support Undo like activities (Fix #139)Thog
2018-05-19Modified deleting an account to run as a taskSyldexia
2018-05-19Merge branch 'feature/webfinger-mime-ld-json' into 'develop'lambda
webfinger: handle application/ld+json links See merge request pleroma/pleroma!159
2018-05-19Merge branch 'feature/remote-user-deactivation' into 'develop'lambda
remote user deactivation See merge request pleroma/pleroma!154
2018-05-19Fix linking problem.lain
2018-05-19Merge branch 'bugfix/hubzilla-compat' into 'develop'lambda
hubzilla compatibility Closes #100 See merge request pleroma/pleroma!160
2018-05-19run mix formatWilliam Pitcock
2018-05-19run mix formatWilliam Pitcock
2018-05-19tests: add test for hubzilla follow activity tooWilliam Pitcock
2018-05-19tests: add tests for Transmogrifier.maybe_fix_user_object()William Pitcock
2018-05-19activitypub transmogrifier: handle hubzilla AP actor quirksWilliam Pitcock