William Pitcock
|
76f80ba8c2
|
activitypub: when unfollowing, update the follow activity's disposition to 'cancelled' so it cannot be reused
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
a2c4a5a75b
|
mastodon api: allow setting an account locked or not
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
ad7188fe92
|
user: use Enum.uniq on the follow request query
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
f328de8eb7
|
activitypub transmogrifier: send Rejects in the format Mastodon wants
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
876ad6aa38
|
activitypub transmogrifier: send @context on accept activities
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
760eb72a38
|
add a bunch of stuff
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
6f89d2d583
|
stash api controller
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
9c88933422
|
implement tracking of follow requests
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
6041380774
|
activitypub transmogrifier: learn locked state in Update messages
|
2018-06-11 22:15:27 +00:00 |
|
William Pitcock
|
e5206752e1
|
activitypub: only send accept back automatically if the account is not locked
|
2018-06-11 22:15:27 +00:00 |
|
William Pitcock
|
3208611bfc
|
mix: add task for setting an account as locked or not
|
2018-06-11 22:15:27 +00:00 |
squidboi
|
08fc1ba382
|
more rewording (x2)
|
2018-06-11 14:59:04 -07:00 |
|
squidboi
|
0921489809
|
more rewording
|
2018-06-11 14:42:57 -07:00 |
|
squidboi
|
01b2dc19cc
|
super-minor rewording
|
2018-06-11 14:29:50 -07:00 |
|
squidboi
|
837792b015
|
added CONFIGURATION.md containing some details about configuring mrf
|
2018-06-11 14:27:16 -07:00 |
eal
|
cdf5a668f2
|
Merge branch 'fix/mix-task-caching' into 'develop'
make_moderator.ex: set cache on update
See merge request pleroma/pleroma!206
|
2018-06-11 19:59:30 +00:00 |
|
eal
|
18837c2fed
|
make_moderator.ex: set cache on update
|
2018-06-11 22:53:38 +03:00 |
lambda
|
7f79b467b1
|
Merge branch 'feature/domain-blocks' into 'develop'
Domain blocks
See merge request pleroma/pleroma!190
|
2018-06-11 11:19:45 +00:00 |
|
squidboi
|
07f0cfa53f
|
add allow_followersonly and allow_direct options for configuring mrf_rejectnonpublic
|
2018-06-10 16:40:51 -07:00 |
|
squidboi
|
4f9ecfc77a
|
formatting
|
2018-06-09 04:28:11 +00:00 |
|
squidboi
|
8903f1ad4d
|
more fixes
|
2018-06-08 19:07:14 -07:00 |
|
squidboi
|
16d896f526
|
fixes
|
2018-06-08 19:01:14 -07:00 |
|
squidboi
|
b3580b6971
|
add option to not deny follow if blocked (fixed)
|
2018-06-08 18:29:41 -07:00 |
|
squidboi
|
e99c73aeba
|
add option to not deny follow if blocked
|
2018-06-08 17:47:24 -07:00 |
|
squidboi
|
2847fc8f90
|
add option to not unfollow on block, and option to not federate outgoing blocks
|
2018-06-08 17:12:16 -07:00 |
|
lambda
|
45a935f0bd
|
Merge branch 'users' into 'develop'
Fix users lookup/return type
See merge request pleroma/pleroma!201
|
2018-06-08 11:10:10 +00:00 |
|
lambda
|
bb639a362e
|
Merge branch 'feature/rejectnonpublic' into 'develop'
Add MRF to drop all posts with "followers-only" or "direct" privacy settings
See merge request pleroma/pleroma!202
|
2018-06-08 11:08:50 +00:00 |
Rachel H
|
fa0c2727d8
|
Fix users lookup/return type
* Allow viewing user in frontend by id on pageload
|
2018-06-07 23:18:45 -07:00 |
|
lambda
|
4a16ade2ee
|
Merge branch 'mastopost' into 'develop'
Allow posting images without text in mastofe
See merge request pleroma/pleroma!194
|
2018-06-08 06:02:21 +00:00 |
|
squidboi
|
e2c4013c88
|
s/get_by_ap_id/get_cached_by_ap_id/
|
2018-06-07 22:33:50 -07:00 |
|
squidboi
|
6e7f91bf8f
|
final format
|
2018-06-07 22:14:39 -07:00 |
|
squidboi
|
82225dfc8d
|
even more formatting
|
2018-06-07 22:10:11 -07:00 |
|
lambda
|
c86823f724
|
Merge branch 'bugfix/locked-account-regression' into 'develop'
security fix: locked account regression
See merge request pleroma/pleroma!200
|
2018-06-08 05:10:08 +00:00 |
|
squidboi
|
990cde7439
|
more formatting
|
2018-06-07 22:03:24 -07:00 |
|
squidboi
|
5b9e1f228a
|
formatting
|
2018-06-07 21:55:58 -07:00 |
|
squidboi
|
f69d38e455
|
add mrf for dropping follower-only and direct posts
|
2018-06-07 21:00:57 -07:00 |
|
William Pitcock
|
1e9dd6fbc2
|
user: fix maybe_direct_follow() after user_info() refactoring broke it slightly
|
2018-06-08 02:52:36 +00:00 |
|
William Pitcock
|
299ef74f2e
|
tests: add regression test for locking/unlocking account updates
|
2018-06-08 02:52:34 +00:00 |
|
William Pitcock
|
47c7e259c4
|
activitypub transmogrifier: fix locked account state from being clobbered
|
2018-06-08 02:52:29 +00:00 |
|
William Pitcock
|
a003bdc30a
|
activitypub transmogrifier: learn locked state in Update messages
|
2018-06-08 02:52:24 +00:00 |
|
lambda
|
839cb7b424
|
Merge branch 'develop' into 'mastopost'
# Conflicts:
# .gitignore
|
2018-06-07 16:29:33 +00:00 |
|
lambda
|
595ca3bb3a
|
Merge branch 'feature/quarantine' into 'develop'
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-07 14:44:08 +00:00 |
|
lambda
|
b114808a10
|
Merge branch 'import' into 'develop'
Fix follow errors
See merge request pleroma/pleroma!198
|
2018-06-07 14:42:32 +00:00 |
|
William Pitcock
|
09604182d0
|
add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.
|
2018-06-07 14:38:09 +00:00 |
|
Rachel H
|
1525a0404b
|
Fix follow errors
|
2018-06-07 00:39:24 -07:00 |
Sir_Boops
|
3f0440ac3c
|
Dedupe uploads
|
2018-06-06 13:25:44 -06:00 |
|
Rachel H
|
b4292295d7
|
Allow posting images without text in mastofe
|
2018-06-06 11:29:49 -07:00 |
|
eal
|
29c9c8d93b
|
Extract host from ap_id, add index
|
2018-06-06 21:13:40 +03:00 |
|
lambda
|
0a0c6bf394
|
Merge branch 'bugfix/webfinger-xml-crash' into 'develop'
webfinger robustness improvements
See merge request pleroma/pleroma!195
|
2018-06-06 16:44:44 +00:00 |
|
William Pitcock
|
1620ec502c
|
testsuite: update fixture URIs that were http
|
2018-06-06 16:36:58 +00:00 |