summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-06-13Merge branch 'feature/webfinger-rfc7033-compliant' into 'develop'lambda
webfinger: send JRD by default instead of XRD See merge request pleroma/pleroma!211
2018-06-13webfinger: send JRD by default instead of XRDWilliam Pitcock
JRD being the default representation for WebFinger responses was standardized 5 years ago in RFC 7033.
2018-06-13Merge branch 'bugfix/webfinger-refactoring' into 'develop'lambda
webfinger: refactor webfinger() functions Closes #212 See merge request pleroma/pleroma!210
2018-06-13webfinger: refactor webfinger() functionsWilliam Pitcock
- remove code duplication - move user lookup to parent with statement - tighten both user lookup by nickname and activitypub URI with a type constraint
2018-06-12newlinessquidboi
2018-06-12split lines, explicitly advised against editing default config filessquidboi
2018-06-12update frontendlain
2018-06-12set_moderator: ensureall applications are started.eal
2018-06-12Merge branch 'patch-2' into 'develop'lambda
Proposal: Default Avatar Replacement See merge request pleroma/pleroma!209
2018-06-12formattingHenry Jameson
2018-06-12Replace avi.png with the Pleroma logoArtik Banana
2018-06-12Initial invites support + tests.Henry Jameson
2018-06-12Merge branch 'develop' into 'develop'lambda
Dedupe uploads See merge request pleroma/pleroma!115
2018-06-12Update sample_config.eexlambda
2018-06-12Merge branch 'feature/list-streaming' into 'develop'lambda
MastoAPI: Add streaming for lists. See merge request pleroma/pleroma!183
2018-06-12Merge branch 'feature/locked-accounts-part-1' into 'develop'lambda
locked accounts See merge request pleroma/pleroma!180
2018-06-12Merge branch 'patch-2' into 'develop'lambda
Nginx Config - Security Upgrades See merge request pleroma/pleroma!207
2018-06-11router: remove stub /domain_blocks entryWilliam Pitcock
2018-06-11* Removed TLSv1 and TLSv1.1Artik Banana
* Added OCSP Stapling * Added SSL Cache * Changed ciphers * Specified ECDH curves
2018-06-11Security upgrades:Artik Banana
* Removed TLSv1 and TLSv1.1 * Added OCSP Stapling * Added SSL Cache * Changed ciphers * Specified ECDH curves
2018-06-11tests: update twitterapi user view tests for new locked variableWilliam Pitcock
2018-06-11twitter api: add approve/deny endpointsWilliam Pitcock
2018-06-11tests: add tests for /api/pleroma/friend_requestsWilliam Pitcock
2018-06-11twitter api: add friend requests list apiWilliam Pitcock
2018-06-11twitterapi: user view: return if an account is locked or notWilliam Pitcock
2018-06-11activitypub transmogrifier: accept/reject outgoing: we might send the actual ↵William Pitcock
object instead of the URI in some cases, handle it
2018-06-11run mix formatWilliam Pitcock
2018-06-11twitterapi: add profile setting for locked/unlocked accountsWilliam Pitcock
2018-06-11tests: assert the state prior to mutating it as well as afterwardWilliam Pitcock
2018-06-11testsuite: add mastodon api testsWilliam Pitcock
2018-06-11activitypub transmogrifier: remove debug codeWilliam Pitcock
2018-06-11user: add a workaround for situations where Pleroma may believe a followee ↵William Pitcock
is followed this was caused by lack of Undo follows in the early days, and can likely be eventually removed
2018-06-11activitypub: when unfollowing, update the follow activity's disposition to ↵William Pitcock
'cancelled' so it cannot be reused
2018-06-11mastodon api: allow setting an account locked or notWilliam Pitcock
2018-06-11user: use Enum.uniq on the follow request queryWilliam Pitcock
2018-06-11activitypub transmogrifier: send Rejects in the format Mastodon wantsWilliam Pitcock
2018-06-11activitypub transmogrifier: send @context on accept activitiesWilliam Pitcock
2018-06-11add a bunch of stuffWilliam Pitcock
2018-06-11stash api controllerWilliam Pitcock
2018-06-11implement tracking of follow requestsWilliam Pitcock
2018-06-11activitypub transmogrifier: learn locked state in Update messagesWilliam Pitcock
2018-06-11activitypub: only send accept back automatically if the account is not lockedWilliam Pitcock
2018-06-11mix: add task for setting an account as locked or notWilliam Pitcock
2018-06-11more rewording (x2)squidboi
2018-06-11more rewordingsquidboi
2018-06-11super-minor rewordingsquidboi
2018-06-11added CONFIGURATION.md containing some details about configuring mrfsquidboi
2018-06-11Merge branch 'fix/mix-task-caching' into 'develop'eal
make_moderator.ex: set cache on update See merge request pleroma/pleroma!206
2018-06-11make_moderator.ex: set cache on updateeal
2018-06-11Merge branch 'feature/domain-blocks' into 'develop'lambda
Domain blocks See merge request pleroma/pleroma!190