William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								47dc52a758 
								
							 
						 
						
							
							
								
								activitypub utils: optimize block and follow activity lookup  
							
							 
							
							... 
							
							
							
							multi-field @> comparison is very expensive, so only use @> for the field where it matters
this makes the query take only a few usec to execute verses many msec on a busy instance 
							
						 
						
							2018-05-25 05:23:49 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								f3a71f2986 
								
							 
						 
						
							
							
								
								Merge branch 'feature/lists' into 'develop'  
							
							 
							
							... 
							
							
							
							Mastodon List API
See merge request pleroma/pleroma!138  
							
						 
						
							2018-05-24 20:22:43 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								c2dcd767cf 
								
							 
						 
						
							
							
								
								Merge branch 'feature/incoming-remote-unfollow' into 'develop'  
							
							 
							
							... 
							
							
							
							Add support for incoming remote unfollows and blocks/unblocks
See merge request pleroma/pleroma!158  
							
						 
						
							2018-05-24 19:52:24 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								1197ec10a8 
								
							 
						 
						
							
							
								
								Rewrite block fetch query  
							
							 
							
							
							
						 
						
							2018-05-24 13:26:59 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6b9a683833 
								
							 
						 
						
							
							
								
								update frontend  
							
							 
							
							
							
						 
						
							2018-05-24 19:25:44 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								c41012053a 
								
							 
						 
						
							
							
								
								Merge branch 'feature/change-password' into 'develop'  
							
							 
							
							... 
							
							
							
							Feature/change password
See merge request pleroma/pleroma!166  
							
						 
						
							2018-05-24 17:16:37 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								3dbd9809d4 
								
							 
						 
						
							
							
								
								MastoAPI: add lists.  
							
							 
							
							
							
						 
						
							2018-05-24 15:34:39 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1cd6194dee 
								
							 
						 
						
							
							
								
								More efficient queries.  
							
							 
							
							
							
						 
						
							2018-05-24 12:44:26 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								a8369db4f2 
								
							 
						 
						
							
							
								
								MastoAPI: add lists.  
							
							 
							
							
							
						 
						
							2018-05-24 13:18:39 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0b5bc62b33 
								
							 
						 
						
							
							
								
								Don't save double tags in AP objects we create  
							
							 
							
							... 
							
							
							
							This crashed Mastodon workers. 
							
						 
						
							2018-05-23 17:25:24 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								06c97f211f 
								
							 
						 
						
							
							
								
								Merge branch 'feature/deps-migration' into 'develop'  
							
							 
							
							... 
							
							
							
							Migrate to comeonin 4 and Cachex 3
See merge request pleroma/pleroma!162  
							
						 
						
							2018-05-23 09:03:11 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niklas Poslovski 
								
							 
						 
						
							
							
							
							
								
							
							
								f0e8194a71 
								
							 
						 
						
							
							
								
								Repair some access-control headers required for third-party webclients  
							
							 
							
							
							
						 
						
							2018-05-23 08:48:28 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								493e1bdf52 
								
							 
						 
						
							
							
								
								Merge branch 'nipos-develop' into develop  
							
							 
							
							
							
						 
						
							2018-05-22 16:02:53 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niklas Poslovski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d81a4e9280 
								
							 
						 
						
							
							
								
								Add access-control-expose-headers to Nginx default config  
							
							 
							
							
							
						 
						
							2018-05-22 15:39:29 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								72b93d13f8 
								
							 
						 
						
							
							
								
								Hook up block/unblock to TwitterAPI  
							
							 
							
							
							
						 
						
							2018-05-22 05:41:17 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								55f9aefd08 
								
							 
						 
						
							
							
								
								Hook unfollow into TwitterAPI  
							
							 
							
							
							
						 
						
							2018-05-22 04:49:30 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								b2c6ae7d82 
								
							 
						 
						
							
							
								
								Hook up unfollow and (un)block to MastoAPI + tests  
							
							 
							
							
							
						 
						
							2018-05-22 04:27:40 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Syldexia 
								
							 
						 
						
							
							
							
							
								
							
							
								69aa7c213a 
								
							 
						 
						
							
							
								
								Fixed test  
							
							 
							
							
							
						 
						
							2018-05-21 23:06:03 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Syldexia 
								
							 
						 
						
							
							
							
							
								
							
							
								d0690622cd 
								
							 
						 
						
							
							
								
								Added endpoint for changing passwords  
							
							 
							
							
							
						 
						
							2018-05-21 23:06:03 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								b4064dfe30 
								
							 
						 
						
							
							
								
								Merge branch 'feature/clarify-http-sig-error' into 'develop'  
							
							 
							
							... 
							
							
							
							clarify HTTP signature error in logs
See merge request pleroma/pleroma!165  
							
						 
						
							2018-05-21 21:20:41 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								9a2d097ed8 
								
							 
						 
						
							
							
								
								activitypub controller: note that the HTTP Host header must be forwarded for http signature validation to work  
							
							 
							
							
							
						 
						
							2018-05-21 19:22:30 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								46427cb90f 
								
							 
						 
						
							
							
								
								Pass correct number of arguments to unfollow  
							
							 
							
							
							
						 
						
							2018-05-21 11:57:15 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								38ee0f3fc6 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/webfinger-statusnet' into 'develop'  
							
							 
							
							... 
							
							
							
							webfinger: fix finding the XRD uri for statusnet instances
See merge request pleroma/pleroma!164  
							
						 
						
							2018-05-21 13:58:20 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								75cfd9d34d 
								
							 
						 
						
							
							
								
								webfinger: fix finding the XRD uri for statusnet instances  
							
							 
							
							
							
						 
						
							2018-05-21 12:41:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d269c69a0b 
								
							 
						 
						
							
							
								
								Actually fix missing alias.  
							
							 
							
							
							
						 
						
							2018-05-21 12:32:29 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								39bf535221 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop  
							
							 
							
							
							
						 
						
							2018-05-21 12:09:33 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bf64208b52 
								
							 
						 
						
							
							
								
								Add missing alias.  
							
							 
							
							
							
						 
						
							2018-05-21 12:09:03 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								d045b96f95 
								
							 
						 
						
							
							
								
								Add tests for incoming unfollow over OStatus  
							
							 
							
							
							
						 
						
							2018-05-21 05:11:13 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								cc5373b846 
								
							 
						 
						
							
							
								
								Fix unblock handling  
							
							 
							
							
							
						 
						
							2018-05-21 05:00:58 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								f2d6c3a512 
								
							 
						 
						
							
							
								
								Handle unfollows from OStatus  
							
							 
							
							
							
						 
						
							2018-05-21 04:36:20 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								2573332214 
								
							 
						 
						
							
							
								
								Add undo block handler  
							
							 
							
							
							
						 
						
							2018-05-21 04:35:43 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thog 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e55c6f311b 
								
							 
						 
						
							
							
								
								Migrate to comeonin 4 and Cachex 3  
							
							 
							
							... 
							
							
							
							Also fix some warning in the code and add a missing alias 
							
						 
						
							2018-05-20 20:08:40 +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