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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								399acd4c42 
								
							 
						 
						
							
							
								
								fetcher: sign object fetches if configured  
							
							
							
						 
						
							2019-07-17 22:58:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								1e48af9acf 
								
							 
						 
						
							
							
								
								Merge branch 'feature/instance-fetch-actor' into 'develop'  
							
							... 
							
							
							
							instance fetch service actor
See merge request pleroma/pleroma!1440  
							
						 
						
							2019-07-17 19:45:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								60b54ee64a 
								
							 
						 
						
							
							
								
								Merge branch 'feature/http-signatures-keyid' into 'develop'  
							
							... 
							
							
							
							http signatures: derive actor from key IDs
See merge request pleroma/pleroma!1442  
							
						 
						
							2019-07-17 19:44:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								f84fb340b7 
								
							 
						 
						
							
							
								
								http signatures: derive actor ID from key ID.  
							
							... 
							
							
							
							Almost all AP servers return their key ID as the actor URI with #main-key
added.  Hubzilla, which doesn't, uses a URL which refers to the actor
anyway, so worst case, Hubzilla users get refetched. 
							
						 
						
							2019-07-17 19:18:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								4bf2bb9cff 
								
							 
						 
						
							
							
								
								Fix password reset for non-test env  
							
							... 
							
							
							
							Fixes `Plug.Conn.NotSentError` that causes a 5xx error in response
instead of 404 and 400.
Fixes pattern matching error caused by different response format
in test and non-test env: `Pleroma.Emails.Mailer.deliver_async` returns
:ok when PleromaJobQueue is enabled and `{:ok, _}` when it's disabled.
In tests, it's disabled. 
							
						 
						
							2019-07-17 18:09:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								cf9cb953d5 
								
							 
						 
						
							
							
								
								activitypub: represent internal fetch actor  
							
							
							
						 
						
							2019-07-17 17:34:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								d930e5d5c3 
								
							 
						 
						
							
							
								
								activitypub: introduce internal fetch service actor  
							
							
							
						 
						
							2019-07-17 17:14:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								62e5ff624e 
								
							 
						 
						
							
							
								
								user: add is_internal_user? helper function  
							
							
							
						 
						
							2019-07-17 17:12:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								0a6f6e1b5b 
								
							 
						 
						
							
							
								
								webfinger: allow resolution of usernames with dots in them (internal actors)  
							
							
							
						 
						
							2019-07-17 16:59:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								a9d6a12bb3 
								
							 
						 
						
							
							
								
								activitypub: controller: rework the way the relay actor is presented so the code can be reused  
							
							
							
						 
						
							2019-07-17 16:33:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								4885473be2 
								
							 
						 
						
							
							
								
								user: refactor get_or_create_instance_user() into get_or_create_service_actor_by_id()  
							
							
							
						 
						
							2019-07-17 16:03:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								ce73d5f6a5 
								
							 
						 
						
							
							
								
								Merge branch 'feature/mention-mrf' into 'develop'  
							
							... 
							
							
							
							Add MRF MentionPolicy for dropping posts which mention specific actors
See merge request pleroma/pleroma!1439  
							
						 
						
							2019-07-17 15:28:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									RX14 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								96a2890a9e 
								
							 
						 
						
							
							
								
								Add MRF MentionPolicy for dropping posts which mention specific actors  
							
							
							
						 
						
							2019-07-17 15:16:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								10f82c88b8 
								
							 
						 
						
							
							
								
								mastoapi password reset  
							
							... 
							
							
							
							added rate limit to password reset
configure rate limit in runtime 
							
						 
						
							2019-07-16 21:44:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								21e3f9ac69 
								
							 
						 
						
							
							
								
								added tests for Pleroma.Upload.Filter  
							
							
							
						 
						
							2019-07-16 21:35:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								18234cc44e 
								
							 
						 
						
							
							
								
								add the rich media ttl based on image exp time  
							
							
							
						 
						
							2019-07-17 00:20:34 +05:45 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								889dc17abd 
								
							 
						 
						
							
							
								
								[ #1094 ] Rate-limited follow & unfollow actions.  
							
							
							
						 
						
							2019-07-16 19:18:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								520ee6c591 
								
							 
						 
						
							
							
								
								Add pleroma.deactivated to the Account entity (Mastodon API)  
							
							
							
						 
						
							2019-07-16 11:14:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								c4ca142e14 
								
							 
						 
						
							
							
								
								Add the blocked_by attribute to the relationship API (GET /api/v1/accounts/relationships)  
							
							
							
						 
						
							2019-07-16 11:04:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								70439494af 
								
							 
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							2019-07-16 14:56:07 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								996fd58ac4 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/poll-id-as-string' into 'develop'  
							
							... 
							
							
							
							Status View: Poll ids are strings.
See merge request pleroma/pleroma!1430  
							
						 
						
							2019-07-16 06:06:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1ed24bcc76 
								
							 
						 
						
							
							
								
								Status View: Poll ids are strings.  
							
							... 
							
							
							
							All ids in mastodon are strings, in general. 
							
						 
						
							2019-07-16 12:47:40 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ffb4eb9779 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/matstodon-statuses-by-name  
							
							
							
						 
						
							2019-07-15 17:10:27 -05:00