summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2018-06-10add allow_followersonly and allow_direct options for configuring ↵squidboi
mrf_rejectnonpublic
2018-06-09formattingsquidboi
2018-06-08more fixessquidboi
2018-06-08fixessquidboi
2018-06-08add option to not deny follow if blocked (fixed)squidboi
2018-06-08add option to not deny follow if blockedsquidboi
2018-06-08add option to not unfollow on block, and option to not federate outgoing blockssquidboi
2018-06-08Merge branch 'users' into 'develop'lambda
Fix users lookup/return type See merge request pleroma/pleroma!201
2018-06-08Merge branch 'feature/rejectnonpublic' into 'develop'lambda
Add MRF to drop all posts with "followers-only" or "direct" privacy settings See merge request pleroma/pleroma!202
2018-06-07Fix users lookup/return typeRachel H
* Allow viewing user in frontend by id on pageload
2018-06-08Merge branch 'mastopost' into 'develop'lambda
Allow posting images without text in mastofe See merge request pleroma/pleroma!194
2018-06-07s/get_by_ap_id/get_cached_by_ap_id/squidboi
2018-06-07final formatsquidboi
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