Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d2da3d30f3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							 
							
							
							
						 
						
							2019-07-24 16:37:52 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								f5d574f4ed 
								
							 
						 
						
							
							
								
								check both item and parent domain blocks  
							
							 
							
							
							
						 
						
							2019-07-24 11:35:16 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								48bd3be9cb 
								
							 
						 
						
							
							
								
								move domain block check to with block  
							
							 
							
							
							
						 
						
							2019-07-24 11:11:33 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								4af4f6166b 
								
							 
						 
						
							
							
								
								honour domain blocks on streaming notifications  
							
							 
							
							
							
						 
						
							2019-07-24 11:09:06 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								9c6357324e 
								
							 
						 
						
							
							
								
								Merge branch 'feature/admin-api-user-statuses' into 'develop'  
							
							 
							
							... 
							
							
							
							Admin API: Endpoint for fetching latest user's statuses
See merge request pleroma/pleroma!1413  
							
						 
						
							2019-07-23 23:59:21 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								d3bdb8e704 
								
							 
						 
						
							
							
								
								rich media: parser: splice the given URL into the result  
							
							 
							
							
							
						 
						
							2019-07-23 23:51:29 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								f46805bb40 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/admin-api-user-statuses  
							
							 
							
							
							
						 
						
							2019-07-24 02:42:28 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								03471151d6 
								
							 
						 
						
							
							
								
								AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)  
							
							 
							
							
							
						 
						
							2019-07-24 01:51:36 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								bd265acf91 
								
							 
						 
						
							
							
								
								Merge branch 'chore/adminapi-deprecated-endpoints' into 'develop'  
							
							 
							
							... 
							
							
							
							Router: Remove deprecated AdminAPI endpoints
See merge request pleroma/pleroma!1466  
							
						 
						
							2019-07-23 19:48:34 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								90be91b0e0 
								
							 
						 
						
							
							
								
								Router: Remove deprecated AdminAPI endpoints  
							
							 
							
							
							
						 
						
							2019-07-23 21:35:25 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								5e72554f3c 
								
							 
						 
						
							
							
								
								Admin config fix  
							
							 
							
							
							
						 
						
							2019-07-23 19:17:00 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								c49a09ed88 
								
							 
						 
						
							
							
								
								tests for Pleroma.Web.ActivityPub.Publisher  
							
							 
							
							
							
						 
						
							2019-07-23 19:15:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								8d3cf7e519 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/unauthed-liked-by' into 'develop'  
							
							 
							
							... 
							
							
							
							Bugfix: don't error out on unauthorized request to liked/favourited_by
See merge request pleroma/pleroma!1474  
							
						 
						
							2019-07-23 19:14:43 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								03d89e182e 
								
							 
						 
						
							
							
								
								Merge branch 'fix/subscriber-notifications' into 'develop'  
							
							 
							
							... 
							
							
							
							Do not notify subscribers for messages from users which are replies to others
See merge request pleroma/pleroma!1477  
							
						 
						
							2019-07-23 19:13:55 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6a79bb12c3 
								
							 
						 
						
							
							
								
								Fix function  
							
							 
							
							
							
						 
						
							2019-07-23 13:53:05 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								54a161cb7a 
								
							 
						 
						
							
							
								
								move unauth'd user blocks?/2 check  
							
							 
							
							
							
						 
						
							2019-07-23 19:44:47 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								fd287387a0 
								
							 
						 
						
							
							
								
								Do not notify subscribers for messages from users which are replies to others  
							
							 
							
							
							
						 
						
							2019-07-23 13:14:26 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								e7c64f106e 
								
							 
						 
						
							
							
								
								signature: properly deduce the actor from misskey key IDs  
							
							 
							
							
							
						 
						
							2019-07-23 16:47:22 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								452980652d 
								
							 
						 
						
							
							
								
								Mix format  
							
							 
							
							
							
						 
						
							2019-07-23 15:13:05 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								eacf61d823 
								
							 
						 
						
							
							
								
								fix unauthenticated req to favourited/rebloggd_by  
							
							 
							
							
							
						 
						
							2019-07-23 15:08:33 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								b70e659304 
								
							 
						 
						
							
							
								
								Feature/1087 wildcard option for blocks  
							
							 
							
							
							
						 
						
							2019-07-22 14:33:58 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								674ad5e1df 
								
							 
						 
						
							
							
								
								Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop'  
							
							 
							
							... 
							
							
							
							activitypub: publisher: align sharedinbox usage with AP specification rules
See merge request pleroma/pleroma!1464  
							
						 
						
							2019-07-22 11:01:35 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								f712ee879a 
								
							 
						 
						
							
							
								
								Bugfix: muted/blocked user notification streaming  
							
							 
							
							
							
						 
						
							2019-07-22 02:43:55 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								05b5af8075 
								
							 
						 
						
							
							
								
								Add tests for users tasks and PleromaAuthenticator  
							
							 
							
							
							
						 
						
							2019-07-22 02:43:15 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								a5d6287ba8 
								
							 
						 
						
							
							
								
								Hide blocked users from interactions  
							
							 
							
							
							
						 
						
							2019-07-22 02:42:29 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								56019d53a8 
								
							 
						 
						
							
							
								
								activitypub: publisher: align sharedinbox usage with AP specification rules  
							
							 
							
							... 
							
							
							
							While debugging the follow breakage, I observed that our sharedInbox usage
did not match the rules in the specification.  Accordingly, I have better
aligned our usage of sharedInbox with the rules outlined in the ActivityPub
specification. 
							
						 
						
							2019-07-22 02:38:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								a00aab3402 
								
							 
						 
						
							
							
								
								Merge branch 'fix/rich-media-ttl-fallback' into 'develop'  
							
							 
							
							... 
							
							
							
							Fix rich media parser failing when no TTL can be found by image TTL setters
See merge request pleroma/pleroma!1460  
							
						 
						
							2019-07-21 16:05:58 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3368174785 
								
							 
						 
						
							
							
								
								Fix rich media parser failing when no TTL can be found by image TTL  
							
							 
							
							... 
							
							
							
							setters 
							
						 
						
							2019-07-21 18:22:22 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								bc6c5c513a 
								
							 
						 
						
							
							
								
								router: ensure the AP sharedinbox path is registered first  
							
							 
							
							
							
						 
						
							2019-07-21 03:52:06 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								8292331b35 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							 
							
							
							
						 
						
							2019-07-20 16:41:58 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								d0198fe215 
								
							 
						 
						
							
							
								
								[ #1112 ] Preserving id on user insert conflict on order not to violate conversation_partipations_user_id_fkey constraint.  
							
							 
							
							
							
						 
						
							2019-07-20 13:03:34 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								ae4fc58589 
								
							 
						 
						
							
							
								
								Remove flavour from userinfo  
							
							 
							
							
							
						 
						
							2019-07-20 01:24:01 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								36049f08ef 
								
							 
						 
						
							
							
								
								Merge develop  
							
							 
							
							
							
						 
						
							2019-07-20 01:03:25 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								93df0796f0 
								
							 
						 
						
							
							
								
								Merge branch 'feature/matstodon-statuses-by-name' into 'develop'  
							
							 
							
							... 
							
							
							
							Feature/matstodon statuses by name
See merge request pleroma/pleroma!1211  
							
						 
						
							2019-07-19 21:59:18 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9169f331b6 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/matstodon-statuses-by-name  
							
							 
							
							
							
						 
						
							2019-07-19 16:55:10 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								33729bbb28 
								
							 
						 
						
							
							
								
								Merge branch 'feature/richmedia-ttl' into 'develop'  
							
							 
							
							... 
							
							
							
							add the rich media ttl based on image exp time
See merge request pleroma/pleroma!1438  
							
						 
						
							2019-07-19 21:36:36 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								9a8eb2c94d 
								
							 
						 
						
							
							
								
								mix: add pleroma.user unsubscribe_all_from_instance  
							
							 
							
							
							
						 
						
							2019-07-19 19:25:29 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								716afc83ce 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/http-signature-plug' into 'develop'  
							
							 
							
							... 
							
							
							
							http signature plug: separation of concerns
See merge request pleroma/pleroma!1449  
							
						 
						
							2019-07-19 16:57:24 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								c2e2aadc42 
								
							 
						 
						
							
							
								
								#1110  fixed /api/pleroma/healthcheck  
							
							 
							
							
							
						 
						
							2019-07-19 16:20:23 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								de9906ad56 
								
							 
						 
						
							
							
								
								change the structure of image ttl parsar  
							
							 
							
							
							
						 
						
							2019-07-19 11:43:42 +05:45  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								9570a5be40 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/admin-api-user-statuses  
							
							 
							
							
							
						 
						
							2019-07-18 23:38:38 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								c947cfec5a 
								
							 
						 
						
							
							
								
								mapped signature plug: use user assign like authentication plug  
							
							 
							
							
							
						 
						
							2019-07-18 20:31:25 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								f435217e50 
								
							 
						 
						
							
							
								
								tests for Plugs.AuthenticationPlug  
							
							 
							
							
							
						 
						
							2019-07-18 20:29:51 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								a8af0ac053 
								
							 
						 
						
							
							
								
								mapped signature plug: fix user lookup  
							
							 
							
							
							
						 
						
							2019-07-18 16:27:50 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								5ea0cd69f7 
								
							 
						 
						
							
							
								
								mapped signature plug: don't invalidate in cases where a signature is actually not present (testsuite)  
							
							 
							
							
							
						 
						
							2019-07-18 16:01:21 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								184fa61fb3 
								
							 
						 
						
							
							
								
								plugs: add MappedSignatureToIdentityPlug  
							
							 
							
							
							
						 
						
							2019-07-18 15:38:45 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								18d8d12d53 
								
							 
						 
						
							
							
								
								signature: make key_id_to_actor_id() public  
							
							 
							
							
							
						 
						
							2019-07-18 15:35:42 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								88d064d80e 
								
							 
						 
						
							
							
								
								http signature plug: remove redundant checks handled by HTTPSignatures library  
							
							 
							
							... 
							
							
							
							the redundant checks assumed a POST request, which will not work for signed GETs.
this check was originally needed because the HTTPSignatures adapter assumed that
the requests were also POST requests.  but now, the adapter has been corrected. 
							
						 
						
							2019-07-18 15:11:21 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								f9a0014681 
								
							 
						 
						
							
							
								
								Merge branch 'feature/signed-object-fetches' into 'develop'  
							
							 
							
							... 
							
							
							
							signed object fetches
See merge request pleroma/pleroma!1446  
							
						 
						
							2019-07-18 13:27:50 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								b6b748d3e7 
								
							 
						 
						
							
							
								
								tests for Uploader with webhook  
							
							 
							
							
							
						 
						
							2019-07-18 12:30:18 +00:00