Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								b93498eb52 
								
							 
						 
						
							
							
								
								constants: add as_public constant and use it everywhere  
							
							 
							
							
							
						 
						
							2019-07-29 02:43:19 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								242f5c585e 
								
							 
						 
						
							
							
								
								add account confirmation email resend in mastodon api  
							
							 
							
							
							
						 
						
							2019-07-28 20:30:10 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								6b77a88365 
								
							 
						 
						
							
							
								
								[ #1097 ] added redirect: /pleroma/admin -> /pleroma/admin/  
							
							 
							
							
							
						 
						
							2019-07-26 20:27:38 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								19835be067 
								
							 
						 
						
							
							
								
								Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'  
							
							 
							
							... 
							
							
							
							Fix remote follow from /ostatus_subscribe
Closes  #1103 
See merge request pleroma/pleroma!1472  
							
						 
						
							2019-07-24 19:29:01 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								b20020da16 
								
							 
						 
						
							
							
								
								Show the url advertised in the Activity in the Status JSON response  
							
							 
							
							
							
						 
						
							2019-07-24 19:28:21 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kPherox 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8d9f43e1d1 
								
							 
						 
						
							
							
								
								Add WebFinger test for AP-only account  
							
							 
							
							
							
						 
						
							2019-07-25 01:27:34 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								55341ac717 
								
							 
						 
						
							
							
								
								tests WebFinger  
							
							 
							
							
							
						 
						
							2019-07-24 15:13:10 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								4504135894 
								
							 
						 
						
							
							
								
								Add domain_blocking to the relationship API (GET /api/v1/accounts/relationships)  
							
							 
							
							
							
						 
						
							2019-07-24 15:12:27 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								f5d574f4ed 
								
							 
						 
						
							
							
								
								check both item and parent domain blocks  
							
							 
							
							
							
						 
						
							2019-07-24 11:35:16 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								c400565427 
								
							 
						 
						
							
							
								
								fix test names because i cannot type  
							
							 
							
							
							
						 
						
							2019-07-23 15:47:17 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								299c0e965b 
								
							 
						 
						
							
							
								
								actually reblog on the reblog test  
							
							 
							
							
							
						 
						
							2019-07-23 15:38:19 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								7026018c8c 
								
							 
						 
						
							
							
								
								Use correct URL for tests  
							
							 
							
							
							
						 
						
							2019-07-23 15:31:35 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								452980652d 
								
							 
						 
						
							
							
								
								Mix format  
							
							 
							
							
							
						 
						
							2019-07-23 15:13:05 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								fd1fa5a2ec 
								
							 
						 
						
							
							
								
								add tests for unauthed reqs to liked/reblogged_by  
							
							 
							
							
							
						 
						
							2019-07-23 15:08:41 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								b6b748d3e7 
								
							 
						 
						
							
							
								
								tests for Uploader with webhook  
							
							 
							
							
							
						 
						
							2019-07-18 12:30:18 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								c66044b923 
								
							 
						 
						
							
							
								
								atom keys with leading :  
							
							 
							
							
							
						 
						
							2019-07-15 11:00:55 +03:00