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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								43a7cd27fe 
								
							 
						 
						
							
							
								
								[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest  
							
							
							
						 
						
							2019-07-20 13:07:51 +00: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 
								
							 
						 
						
							
							
							
							
								
							
							
								621cacf667 
								
							 
						 
						
							
							
								
								tests: add tests for mapped signature plug  
							
							
							
						 
						
							2019-07-18 16:28:36 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								1345e0c2bf 
								
							 
						 
						
							
							
								
								tests: add tests for signed object fetches  
							
							
							
						 
						
							2019-07-17 23:06:16 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								3d23a12d75 
								
							 
						 
						
							
							
								
								tests: add test for fetching the internal fetch actor  
							
							
							
						 
						
							2019-07-17 17:48:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								62e5ff624e 
								
							 
						 
						
							
							
								
								user: add is_internal_user? helper function  
							
							
							
						 
						
							2019-07-17 17:12:42 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								7a24def473 
								
							 
						 
						
							
							
								
								Mastodon Controller: Fix tests.  
							
							
							
						 
						
							2019-07-16 14:01:18 +09: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								9f987dd017 
								
							 
						 
						
							
							
								
								Merge branch 'match-file-name' into 'develop'  
							
							... 
							
							
							
							try to always match the filename for proxy url
See merge request pleroma/pleroma!1405  
							
						 
						
							2019-07-15 22:04:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								b74300bc7a 
								
							 
						 
						
							
							
								
								Add more tests for MastodonAPIController and CommonAPI  
							
							
							
						 
						
							2019-07-15 19:47:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								1d906ffa82 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into match-file-name  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/web/media_proxy/media_proxy_controller.ex 
							
						 
						
							2019-07-15 21:30:56 +05:45 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								03c4ea44ad 
								
							 
						 
						
							
							
								
								Merge branch 'admin-configure-atom-keys' into 'develop'  
							
							... 
							
							
							
							admin configure - atom keys with leading :
See merge request pleroma/pleroma!1424  
							
						 
						
							2019-07-15 13:01:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								c32384c1ea 
								
							 
						 
						
							
							
								
								tests for Pleroma.Signature  
							
							
							
						 
						
							2019-07-15 13:01:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								b8607c151c 
								
							 
						 
						
							
							
								
								migrating task refactor  
							
							
							
						 
						
							2019-07-15 15:45:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								c66044b923 
								
							 
						 
						
							
							
								
								atom keys with leading :  
							
							
							
						 
						
							2019-07-15 11:00:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								de13c9bb8f 
								
							 
						 
						
							
							
								
								List messages must be visible for mentioned users  
							
							
							
						 
						
							2019-07-15 14:54:40 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								64a946643e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-07-15 14:11:54 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								a87c313309 
								
							 
						 
						
							
							
								
								Support list visibility in StatusView  
							
							
							
						 
						
							2019-07-15 14:00:29 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								fa17879c20 
								
							 
						 
						
							
							
								
								added tests for Web.MediaProxy  
							
							
							
						 
						
							2019-07-14 21:01:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								dce8ebc9ea 
								
							 
						 
						
							
							
								
								Unfollow should also unsubscribe  
							
							
							
						 
						
							2019-07-14 19:25:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								841314c2d5 
								
							 
						 
						
							
							
								
								tests: fix object containment violations in the transmogrifier tests  
							
							... 
							
							
							
							Some objects were not completely rewritten in the tests, which caused object
containment violations.  Fix them by rewriting the object IDs to be in an
appropriate namespace. 
							
						 
						
							2019-07-14 19:24:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								739bbe0d3b 
								
							 
						 
						
							
							
								
								security: detect object containment violations at the IR level  
							
							... 
							
							
							
							It is more efficient to check for object containment violations at the IR
level instead of in the protocol handlers.  OStatus containment is especially
a tricky situation, as the containment rules don't match those of IR and
ActivityPub.
Accordingly, we just always do a final containment check at the IR level
before the object is added to the IR object graph. 
							
						 
						
							2019-07-14 17:47:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								cef4337f95 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/llal-object-containment' into 'develop'  
							
							... 
							
							
							
							Object.Fetcher: Handle error on Containment.contain_origin/2
See merge request pleroma/pleroma!1414  
							
						 
						
							2019-07-14 16:39:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a2c601acb5 
								
							 
						 
						
							
							
								
								FetcherTest: Containment refute called(OStatus.fetch_activity_from_url)  
							
							
							
						 
						
							2019-07-14 17:05:32 +02:00