| 
								
								
									 Francis Dinh | c8a16f334d | Format | 2018-05-20 21:02:06 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 89c5de9096 | Fix unfollows | 2018-05-20 21:01:14 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 1afd6d37bd | Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow Fixed some conflicts in transmogrifier.ex | 2018-05-20 19:17:15 -04:00 |  | 
				
					
						| 
								
								
									 lain | dca26f3655 | Fix specs. | 2018-05-20 19:22:26 +02:00 |  | 
				
					
						| 
								
								
									 lain | ff007af0c2 | Return visilility in twitter api, too. | 2018-05-20 18:01:24 +02:00 |  | 
				
					
						| 
								
								
									 lain | 434601a5c3 | Return private / direct posts on user timelines, too. | 2018-05-20 16:15:18 +02:00 |  | 
				
					
						| 
								
								
									 lambda | 8b0c222b43 | Merge branch 'feature/account-deletion' into 'develop' Feature/account deletion
Closes #115
See merge request pleroma/pleroma!157 | 2018-05-20 10:57:19 +00:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | a9141d88aa | Pass user instead of their ap_id to User.block | 2018-05-19 22:02:13 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 3b706ea493 | Remove handler for incoming undos with object references | 2018-05-19 21:34:30 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 1e43de0f86 | Formatting and add tests for blocks/unblocks | 2018-05-19 21:23:52 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | da9744eb84 | Use correct variable names in unfollow | 2018-05-19 20:57:37 -04:00 |  | 
				
					
						| 
								
								
									 Thog | 6f39ecc41b | Support Undo like activities (Fix #139) | 2018-05-19 22:14:15 +02:00 |  | 
				
					
						| 
								
								
									 Syldexia | d1366f8d46 | Modified deleting an account to run as a task | 2018-05-19 13:35:49 +01:00 |  | 
				
					
						| 
								
								
									 lambda | 7831b38705 | Merge branch 'feature/webfinger-mime-ld-json' into 'develop' webfinger: handle application/ld+json links
See merge request pleroma/pleroma!159 | 2018-05-19 09:31:08 +00:00 |  | 
				
					
						| 
								
								
									 lambda | ad563669c8 | Merge branch 'feature/remote-user-deactivation' into 'develop' remote user deactivation
See merge request pleroma/pleroma!154 | 2018-05-19 09:30:09 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 725b05d04a | run mix format | 2018-05-19 08:48:15 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 2051530868 | activitypub transmogrifier: handle hubzilla AP actor quirks | 2018-05-19 03:28:29 -05:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 4d2c6707c2 | activitypub: normalize the actor to ensure we have its URI | 2018-05-19 03:28:28 -05:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 1a250d65af | webfinger: only do ld+json on modern json webfinger | 2018-05-19 01:28:19 -05:00 |  | 
				
					
						| 
								
								
									 William Pitcock | d1f6ecf607 | webfinger: interpret application/ld+json links as an alternate to application/activity+json | 2018-05-19 01:28:12 -05:00 |  | 
				
					
						| 
								
								
									 William Pitcock | cce5a9cb1c | webfinger: expose the application/ld+json link alongside the older application/activity+json link | 2018-05-19 01:28:03 -05:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 13d4b6d2b5 | remote user deactivation: fix test failures | 2018-05-19 01:26:13 -05:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 0ec1abb3b6 | Add federated blocks | 2018-05-18 18:09:56 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 8d11bae0d5 | Revert "Undo formatting in user.ex" This reverts commit e6dc15b96c. | 2018-05-17 23:55:00 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | e6dc15b96c | Undo formatting in user.ex | 2018-05-17 23:53:34 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | d8c842a771 | Add support for incoming remote unfollows | 2018-05-17 22:15:57 -04:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 9390492138 | ActivityPub create: discard activities from deactivated users | 2018-05-13 19:05:02 -05:00 |  | 
				
					
						| 
								
								
									 Syldexia | 98b36d359a | Fixed formatting and test | 2018-05-13 15:43:42 +01:00 |  | 
				
					
						| 
								
								
									 Syldexia | 5bfb7b4ce6 | Moved account deletion stuff to somewhere that hopefully makes more sense | 2018-05-13 14:36:02 +01:00 |  | 
				
					
						| 
								
								
									 Syldexia | a16117225f | Added endpoint for user account deletion | 2018-05-13 14:35:48 +01:00 |  | 
				
					
						| 
								
								
									 lain | c7a85de35c | Revert "Remove 'unlisted' handling for now." This reverts commit 1027d1f696. | 2018-05-13 12:38:13 +02:00 |  | 
				
					
						| 
								
								
									 lain | 1027d1f696 | Remove 'unlisted' handling for now. It's just too slow (over 1 second on small systems, haven't looked at
the queries in detail yet). We'll need some other way to handle it. | 2018-05-13 12:07:11 +02:00 |  | 
				
					
						| 
								
								
									 lain | a5c9dd0a2a | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop | 2018-05-13 11:59:35 +02:00 |  | 
				
					
						| 
								
								
									 lain | 3c3933e40b | Unlisted fetching: Reverse logic Generates a faster query. | 2018-05-13 11:58:03 +02:00 |  | 
				
					
						| 
								
								
									 lambda | aeff2d6474 | Merge branch 'feature/unrepeats' into 'develop' Add unrepeats
Closes #69
See merge request pleroma/pleroma!113 | 2018-05-13 09:32:29 +00:00 |  | 
				
					
						| 
								
								
									 lain | ec531ca281 | Add test. | 2018-05-13 11:18:48 +02:00 |  | 
				
					
						| 
								
								
									 lain | 29376fcc13 | Format. | 2018-05-13 10:56:44 +02:00 |  | 
				
					
						| 
								
								
									 lain | 76722ea9c8 | Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses | 2018-05-13 10:56:11 +02:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 54ccbd8479 | Use original status id instead of announce id | 2018-05-13 03:42:31 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 4d88747561 | Revert "Log error when handling unrepeats" This reverts commit c17c55e989. | 2018-05-11 15:34:46 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | c17c55e989 | Log error when handling unrepeats | 2018-05-11 15:29:19 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 271fb5ccb1 | Probably better way of handling non-follow undos in ostatus | 2018-05-11 11:59:53 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 4151cbe6b2 | Revert "Do not send non-follow undos over ostatus for now" This reverts commit 07fdc07238. | 2018-05-11 11:53:28 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 0b527b5528 | Revert "Use [] instead of nil" This reverts commit 42268b0981. | 2018-05-11 11:53:06 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 42268b0981 | Use [] instead of nil | 2018-05-11 01:48:56 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 07fdc07238 | Do not send non-follow undos over ostatus for now | 2018-05-11 01:45:10 -04:00 |  | 
				
					
						| 
								
								
									 href | c220a6db43 | format & made get_policies/1 private | 2018-05-10 18:51:58 +02:00 |  | 
				
					
						| 
								
								
									 href | e9e6f37bda | Chain policies - The `:pleroma, :instance, :rewrite_policy` can now be either a policy
or a list of policies
- Made a behaviour for MRF policies | 2018-05-10 18:41:06 +02:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 900c735467 | Match proper number of values from unannounce | 2018-05-09 00:04:14 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 54f6628590 | Change argument order and call correct # of args | 2018-05-08 23:59:36 -04:00 |  |