aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-06-07Merge branch 'develop' into 'mastopost'lambda
2018-06-07Merge branch 'feature/quarantine' into 'develop'lambda
2018-06-07Merge branch 'import' into 'develop'lambda
2018-06-07add the ability to 'quarantine' an activitypub peer, causing them to be treat...William Pitcock
2018-06-07Fix follow errorsRachel H
2018-06-06Dedupe uploadsSir_Boops
2018-06-06Allow posting images without text in mastofeRachel H
2018-06-06Extract host from ap_id, add indexeal
2018-06-06Merge branch 'bugfix/webfinger-xml-crash' into 'develop'lambda
2018-06-06testsuite: update fixture URIs that were httpWilliam Pitcock
2018-06-06webfinger: use https as default fallback instead of httpWilliam Pitcock
2018-06-06XML: handle erlang errors tooWilliam Pitcock
2018-06-06Merge branch 'fix/oauth-http-basic' into 'develop'lambda
2018-06-06Add OAuth controller testsD Anzorge
2018-06-06Make token exchange return errors with 400 as status codeD Anzorge
2018-06-05Merge branch 'fix/emoji-picker' into 'develop'eal
2018-06-04Make OAuth token endpoint work with HTTP Basic authD Anzorge
2018-06-03ActivityPub.ex: filter domain blocked activities.eal
2018-06-03Merge branch 'develop' into 'develop'lambda
2018-06-03MastoAPI: add domain blocking.eal
2018-06-03Better error handling for OstatusController.lain
2018-06-03user.ex: add domain blocks.eal
2018-06-03caddy config examplewitti
2018-06-03Better error handling for ActivityPubControllerlain
2018-06-03Better error handling for MastodonApiController.lain
2018-06-03Better error handling in TwitterApiController.lain
2018-06-03lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: set visible_in_picke...Haelwenn (lanodan) Monnier
2018-06-02Revert "Update Mastofe."lain
2018-06-02Update Mastofe.lain
2018-06-02Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain
2018-06-01Merge branch 'fix/user-timeline-reading-user' into 'develop'eal
2018-06-01MastoAPI user timelines: render statuses for the logged in user.eal
2018-06-01Merge branch 'fix/twitterapi-incorrect-follows-you' into 'develop'lambda
2018-05-31TwitterAPI: fix "Follows you" being shown for the wrong user.eal
2018-05-30Fix url guessing attacks.lain
2018-05-30Fix url guessing attacks.lain
2018-05-30MastoAPI: Add streaming for lists.eal
2018-05-30Merge branch 'fix/dm-timeline-activities' into 'develop'eal
2018-05-30MastoAPI: fix dm_timeline getting non-create activities.eal
2018-05-29Merge branch 'patch-3' into 'develop'lambda
2018-05-29Merge branch 'fix/link-headers' into 'develop'lambda
2018-05-29MastoAPI: Fix link headers with restrictive params.eal
2018-05-28Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain
2018-05-28Only return certain activities in TwitterAPI mentions.lain
2018-05-28Update pleroma.nginxDominik V. Salonen
2018-05-27Merge branch 'feature/mastodon-context-microformat' into 'develop'lambda
2018-05-27run mix formatWilliam Pitcock
2018-05-27tests: update for html changesWilliam Pitcock
2018-05-27formatter: use class='mention' on links to user profilesWilliam Pitcock
2018-05-26Fix user topic streaming.lain