aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-06-21Normalize file extension for uploaded filesFrancis Dinh
2018-06-19Merge branch 'features/column_media_streaming' into 'develop'lambda
2018-06-19Merge branch 'bugfix/block-follow-relationships' into 'develop'lambda
2018-06-19tests: fix a completely bogus mastodon api testWilliam Pitcock
2018-06-19user: add helper function to fetch a user given only an ap_id (fix tests)William Pitcock
2018-06-19Merge branch 'feature/exclude-replies-filter' into 'develop'lambda
2018-06-19Merge branch 'bugfix/as2-contentmap' into 'develop'lambda
2018-06-19tests: transmogrifier: ensure incoming blocks have the same effect as local b...William Pitcock
2018-06-19tests: prove that the block code is properly destroying follow relationshipsWilliam Pitcock
2018-06-19user: when processing a block in User.block(), ensure all follow relationship...William Pitcock
2018-06-18tests: add regression test for contentMap-only postsWilliam Pitcock
2018-06-18activitypub transmogrifier: fix handling of contentMap.William Pitcock
2018-06-18activitypub: support filtering activities by whether or not they are a reply ...William Pitcock
2018-06-17MastodonAPI: Add streaming to media tabs of federated and local TLsHaelwenn (lanodan) Monnier
2018-06-17Merge branch 'patch-2' into 'develop'lambda
2018-06-16Add comment about TLS curves for older servers.Artik Banana
2018-06-16Merge branch 'feature/configure-mrf-rejectnonpublic' into 'develop'lambda
2018-06-15Merge branch 'bugfix/mastofe_thread_render' into 'develop'eal
2018-06-15Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threadsHaelwenn (lanodan) Monnier
2018-06-15Fix typolain
2018-06-14Merge branch 'fix/missing-file-extension' into 'develop'lambda
2018-06-14Add missing file extension if file does not have oneFrancis Dinh
2018-06-14Merge branch 'fix/mp3-recognition' into 'develop'lambda
2018-06-14upload.ex: add MPEG Layer 3 file header.eal
2018-06-14Merge branch 'patch-2' into 'develop'lambda
2018-06-14Merge branch 'bugfix/mrf-orphaning' into 'develop'lambda
2018-06-14Merge branch 'feature/twitterapi-unrepeat' into 'develop'lambda
2018-06-14Merge branch 'bugfix/oauth2-param-name' into 'develop'lambda
2018-06-14Merge branch 'bugfix/oauth-password-with-email' into 'develop'lambda
2018-06-14Merge branch 'bugfix/mastodon-streaming-blocks' into 'develop'lambda
2018-06-14oauth: fix password-based login when username is email addressWilliam Pitcock
2018-06-14oauth: support either name or username parameter with grant_type=passwordWilliam Pitcock
2018-06-13fixup testFrancis Dinh
2018-06-13Add unretweet TwAPI endpoint and cleanup AP.unannounceFrancis Dinh
2018-06-13activitypub transmogrifier: handle activity lookup failureWilliam Pitcock
2018-06-13streamer: don't relay boosts of messages which would otherwise be blockedWilliam Pitcock
2018-06-13* fix nginx 1.15 warning:dex
2018-06-13Merge branch 'feature/webfinger-rfc7033-compliant' into 'develop'lambda
2018-06-13webfinger: send JRD by default instead of XRDWilliam Pitcock
2018-06-13Merge branch 'bugfix/webfinger-refactoring' into 'develop'lambda
2018-06-13webfinger: refactor webfinger() functionsWilliam Pitcock
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
2018-06-12Replace avi.png with the Pleroma logoArtik Banana
2018-06-12Merge branch 'develop' into 'develop'lambda
2018-06-12Update sample_config.eexlambda
2018-06-12Merge branch 'feature/list-streaming' into 'develop'lambda