summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-06-07even more formattingsquidboi
2018-06-08Merge branch 'bugfix/locked-account-regression' into 'develop'lambda
security fix: locked account regression See merge request pleroma/pleroma!200
2018-06-07more formattingsquidboi
2018-06-07formattingsquidboi
2018-06-07add mrf for dropping follower-only and direct postssquidboi
2018-06-08user: fix maybe_direct_follow() after user_info() refactoring broke it slightlyWilliam Pitcock
2018-06-08tests: add regression test for locking/unlocking account updatesWilliam Pitcock
2018-06-08activitypub transmogrifier: fix locked account state from being clobberedWilliam Pitcock
2018-06-08activitypub transmogrifier: learn locked state in Update messagesWilliam Pitcock
2018-06-07Merge branch 'develop' into 'mastopost'lambda
# Conflicts: # .gitignore
2018-06-07Merge branch 'feature/quarantine' into 'develop'lambda
add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer. See merge request pleroma/pleroma!199
2018-06-07Merge branch 'import' into 'develop'lambda
Fix follow errors See merge request pleroma/pleroma!198
2018-06-07add the ability to 'quarantine' an activitypub peer, causing them to be ↵William Pitcock
treated as an OStatus peer.
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
webfinger robustness improvements See merge request pleroma/pleroma!195
2018-06-06testsuite: update fixture URIs that were httpWilliam Pitcock
2018-06-06webfinger: use https as default fallback instead of httpWilliam Pitcock
realistically, all instances need to be on https anyway to properly federate with all software
2018-06-06XML: handle erlang errors tooWilliam Pitcock
2018-06-06Merge branch 'fix/oauth-http-basic' into 'develop'lambda
Make OAuth token endpoint work with HTTP Basic auth See merge request pleroma/pleroma!191
2018-06-06Add OAuth controller testsD Anzorge
Tests for Pleroma.Web.OAuth.OAuthController
2018-06-06Make token exchange return errors with 400 as status codeD Anzorge
2018-06-05Merge branch 'fix/emoji-picker' into 'develop'eal
set visible_in_picker to true in custom_emojis Closes #177 and mastofe#16 See merge request pleroma/pleroma!188
2018-06-04Make OAuth token endpoint work with HTTP Basic authD Anzorge
client_id/client_secret can now be supplied in an Authorization header
2018-06-03ActivityPub.ex: filter domain blocked activities.eal
2018-06-03Merge branch 'develop' into 'develop'lambda
Added: caddy webserver config example Closes #192 See merge request pleroma/pleroma!189
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 ↵Haelwenn (lanodan) Monnier
visible_in_picker to true in custom_emojis Fixes: https://github.com/ilianaw/emojos.in/issues/4 Closes: https://git.pleroma.social/pleroma/pleroma/issues/177 Closes: https://git.pleroma.social/pleroma/mastofe/issues/16
2018-06-02Revert "Update Mastofe."lain
This reverts commit 726b131b0a675a1116e579e0c1adbed8e5a1a856. Some things broke (threads).
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
MastoAPI user timelines: render statuses for the logged in user. See merge request pleroma/pleroma!187
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
TwitterAPI: fix "Follows you" being shown for the wrong user. Closes pleroma-fe#89 See merge request pleroma/pleroma!185
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
MastoAPI: fix dm_timeline getting non-create activities. See merge request pleroma/pleroma!182
2018-05-30MastoAPI: fix dm_timeline getting non-create activities.eal
2018-05-29Merge branch 'patch-3' into 'develop'lambda
Update pleroma.nginx See merge request pleroma/pleroma!179
2018-05-29Merge branch 'fix/link-headers' into 'develop'lambda
MastoAPI: Fix link headers with restrictive params. See merge request pleroma/pleroma!181