| 
								
								
									 William Pitcock | 4084889a2d | activitypub transmogrifier: remove debug code | 2018-06-11 22:15:53 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 1452b2823f | user: add a workaround for situations where Pleroma may believe a followee is followed this was caused by lack of Undo follows in the early days, and can likely be eventually removed | 2018-06-11 22:15:53 +00:00 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 | 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 | 1abf0f3b3e | webfinger: use https as default fallback instead of http realistically, all instances need to be on https anyway to properly federate with all
software | 2018-06-06 16:27:14 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | aaa81d3540 | XML: handle erlang errors too | 2018-06-06 16:27:13 +00:00 |  | 
				
					
						| 
								
								
									 lambda | b5d8213e70 | Merge branch 'fix/oauth-http-basic' into 'develop' Make OAuth token endpoint work with HTTP Basic auth
See merge request pleroma/pleroma!191 | 2018-06-06 08:27:08 +00:00 |  | 
				
					
						| 
								
								
									 D Anzorge | 3607dc4558 | Make token exchange return errors with 400 as status code | 2018-06-06 03:14:50 +02:00 |  | 
				
					
						| 
								
								
									 eal | f9719b064c | Merge branch 'fix/emoji-picker' into 'develop' set visible_in_picker to true in custom_emojis
Closes #177 and mastofe#16
See merge request pleroma/pleroma!188 | 2018-06-05 21:18:25 +00:00 |  | 
				
					
						| 
								
								
									 D Anzorge | 73904e8f78 | Make OAuth token endpoint work with HTTP Basic auth client_id/client_secret can now be supplied in an Authorization header | 2018-06-04 00:59:00 +02:00 |  | 
				
					
						| 
								
								
									 eal | 9075b6d25b | ActivityPub.ex: filter domain blocked activities. | 2018-06-03 23:33:33 +03:00 |  | 
				
					
						| 
								
								
									 eal | 4856962434 | MastoAPI: add domain blocking. | 2018-06-03 22:21:23 +03:00 |  | 
				
					
						| 
								
								
									 lain | 8073af6e10 | Better error handling for OstatusController. | 2018-06-03 21:04:44 +02:00 |  | 
				
					
						| 
								
								
									 eal | 87566b6e2f | user.ex: add domain blocks. | 2018-06-03 22:01:37 +03:00 |  | 
				
					
						| 
								
								
									 lain | 06439f64d0 | Better error handling for ActivityPubController | 2018-06-03 19:58:59 +02:00 |  | 
				
					
						| 
								
								
									 lain | 4856ba596f | Better error handling for MastodonApiController. | 2018-06-03 19:28:11 +02:00 |  | 
				
					
						| 
								
								
									 lain | 0f70e83e8c | Better error handling in TwitterApiController. | 2018-06-03 19:11:22 +02:00 |  |