| 
								
								
									 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 | 56de0216ae | pass user to User.blocks?/2 instead of ap_id | 2018-05-20 19:45:05 -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 |  | 
				
					
						| 
								
								
									 lambda | 961f131257 | Merge branch 'develop' into 'develop' Correct 'register_user' parameters in README
See merge request pleroma/pleroma!163 | 2018-05-20 19:37:16 +00:00 |  | 
				
					
						| 
								
								
									 witti | 9c3e2069d0 | Correct 'register_user' parameters in README password parameter was missing | 2018-05-20 20:49:44 +02:00 |  | 
				
					
						| 
								
								
									 lain | 413de8e4bc | More fixes. | 2018-05-20 19:26:09 +02:00 |  | 
				
					
						| 
								
								
									 lain | dca26f3655 | Fix specs. | 2018-05-20 19:22:26 +02:00 |  | 
				
					
						| 
								
								
									 lain | dde5ad9e37 | update frontend | 2018-05-20 18:29:12 +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 |  | 
				
					
						| 
								
								
									 lain | bdfe0991d2 | update frontend | 2018-05-20 13:24:16 +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 |  | 
				
					
						| 
								
								
									 lambda | 40af452594 | Merge branch 'feature/undo-like-federation' into 'develop' Support undo like over ActivityPub (Fix #139)
Closes #139
See merge request pleroma/pleroma!161 | 2018-05-20 10:55:39 +00:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | d46393f6ef | Fix test for blocks | 2018-05-20 02:15:56 -04: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 |  | 
				
					
						| 
								
								
									 lain | df95118c81 | Fix linking problem. | 2018-05-19 11:27:14 +02:00 |  | 
				
					
						| 
								
								
									 lambda | 125d934bc6 | Merge branch 'bugfix/hubzilla-compat' into 'develop' hubzilla compatibility
Closes #100
See merge request pleroma/pleroma!160 | 2018-05-19 09:17:04 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 725b05d04a | run mix format | 2018-05-19 08:48:15 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 6e8de2faae | run mix format | 2018-05-19 08:37:04 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 4033ed6714 | tests: add test for hubzilla follow activity too | 2018-05-19 03:28:32 -05:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 19c96c8a19 | tests: add tests for Transmogrifier.maybe_fix_user_object() | 2018-05-19 03:28:30 -05: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 | f32e19f668 | webfinger: add tests | 2018-05-19 01:28:27 -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 | 6604bea9d0 | actually rvert those changes | 2018-05-17 23:56:47 -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 |  | 
				
					
						| 
								
								
									 lain | 1d4bbec6b3 | Fix User search. Now uses a trigram based search. This is a lot faster and gives better
results. Closes #185. | 2018-05-16 17:55:20 +02:00 |  | 
				
					
						| 
								
								
									 lain | 2e9aa16b86 | update frontend | 2018-05-16 13:02:53 +02:00 |  | 
				
					
						| 
								
								
									 William Pitcock | a6a6915aaf | add mix task for deactivating a user by nickname | 2018-05-13 19:05:03 -05: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 | 89954a2ce7 | Fix format. | 2018-05-13 13:02:24 +02:00 |  | 
				
					
						| 
								
								
									 lain | 94c1f28ba4 | Modify sort index for activities. This prevents a problem that made the local timeline very slow when
there were few posts. | 2018-05-13 12:54:08 +02:00 |  |