rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6bf8eee5f9 
								
							 
						 
						
							
							
								
								ReverseProxy tesla client: remove handling of old_conn  
							
							... 
							
							
							
							This is no longer relevant because we use a custom
FollowRedirects middleware now 
							
						 
						
							2020-07-26 20:52:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a7616dec8c 
								
							 
						 
						
							
							
								
								Merge branch 'patch-3' into 'develop'  
							
							... 
							
							
							
							OpenAPI: Replace actor_id by account_id to follow ChatMessage schema
See merge request pleroma/pleroma!2797  
							
						 
						
							2020-07-26 16:38:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d4fbec62a3 
								
							 
						 
						
							
							
								
								ReverseProxy: Fix a gun connection leak when there is an error with no  
							
							... 
							
							
							
							body
- Modify `close/1` function to do the same thing it does for hackney,
which is - close the client rather than the whole connection
- Release the connection when there is no body to chunk 
							
						 
						
							2020-07-26 19:30:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								6107440ea0 
								
							 
						 
						
							
							
								
								OpenAPI: remove accidentally pasted buffer data  
							
							
							
						 
						
							2020-07-26 13:59:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								b31844d6e0 
								
							 
						 
						
							
							
								
								OpenAPI: Replace actor_id by account_id to follow ChatMessage schema  
							
							
							
						 
						
							2020-07-26 13:54:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ce9647aed7 
								
							 
						 
						
							
							
								
								Merge branch 'fix/mix-tasks' into 'develop'  
							
							... 
							
							
							
							Fix/mix tasks
Closes  #1972  and #1970 
See merge request pleroma/pleroma!2795  
							
						 
						
							2020-07-26 11:47:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Angelina Filippova 
								
							 
						 
						
							
							
							
							
								
							
							
								4d80cf5409 
								
							 
						 
						
							
							
								
								Update types in Pleroma.Formatter group  
							
							
							
						 
						
							2020-07-26 01:48:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								643664d583 
								
							 
						 
						
							
							
								
								added migrate old settings to new  
							
							
							
						 
						
							2020-07-25 09:16:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								65a1b048a8 
								
							 
						 
						
							
							
								
								Ensure Oban is available during mix tasks.  
							
							... 
							
							
							
							Fixes: mix pleroma.user rm username 
							
						 
						
							2020-07-24 12:06:56 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9be6668236 
								
							 
						 
						
							
							
								
								Fix mix tasks that make HTTP calls by starting the Gun connection pool  
							
							
							
						 
						
							2020-07-24 12:05:42 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								1dd6de03ee 
								
							 
						 
						
							
							
								
								CommonAPI Tests: Check that undoing objects federates them as embeds.  
							
							
							
						 
						
							2020-07-24 14:54:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								3d13fb05f8 
								
							 
						 
						
							
							
								
								Side Effects: On undoing, put information about the undone object.  
							
							
							
						 
						
							2020-07-24 14:40:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								91f3cf9bc6 
								
							 
						 
						
							
							
								
								Pipeline: Add embedded object federation.  
							
							
							
						 
						
							2020-07-24 14:06:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								61ef1fca4b 
								
							 
						 
						
							
							
								
								remove duplicate module  
							
							
							
						 
						
							2020-07-24 08:35:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								51627a10e5 
								
							 
						 
						
							
							
								
								Merge branch 'unblock-domain-via-query' into 'develop'  
							
							... 
							
							
							
							Allow unblocking a domain via query params
Closes  #1971 
See merge request pleroma/pleroma!2783  
							
						 
						
							2020-07-23 20:06:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4bfad0b483 
								
							 
						 
						
							
							
								
								Support blocking via query parameters as well and document the change.  
							
							
							
						 
						
							2020-07-23 12:59:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								a74951a3b0 
								
							 
						 
						
							
							
								
								Merge branch 'feature/add-mrf-related-policies' into 'develop'  
							
							... 
							
							
							
							Add MRF related policies field to description.exs
See merge request pleroma/pleroma!2790  
							
						 
						
							2020-07-23 17:23:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								6100b90209 
								
							 
						 
						
							
							
								
								Merge branch '1976-status-view-fixes' into 'develop'  
							
							... 
							
							
							
							StatusView: Handle badly formatted emoji reactions.
Closes  #1976 
See merge request pleroma/pleroma!2788  
							
						 
						
							2020-07-23 16:58:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								67ab9a7928 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1934-welcome-email  
							
							
							
						 
						
							2020-07-23 16:36:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								76aa49a0c5 
								
							 
						 
						
							
							
								
								Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'  
							
							... 
							
							
							
							[#1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting
Closes  #1973 
See merge request pleroma/pleroma!2791  
							
						 
						
							2020-07-23 12:52:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								9ea51a6de5 
								
							 
						 
						
							
							
								
								[ #2791 ] AccountView: renamed :force option to :skip_visibility_check.  
							
							
							
						 
						
							2020-07-23 15:08:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b2ba70eec4 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/mrf-reject-logging' into 'develop'  
							
							... 
							
							
							
							Fix  #783 : Make MRF reject log as info level instead of error
Closes  #783 
See merge request pleroma/pleroma!2758  
						
							2020-07-23 11:08:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								250e0369c7 
								
							 
						 
						
							
							
								
								Merge branch 'issue/1878' into 'develop'  
							
							... 
							
							
							
							[#1878 ] fix reset confirmation email in admin section
See merge request pleroma/pleroma!2751  
							
						 
						
							2020-07-23 10:56:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a81581472f 
								
							 
						 
						
							
							
								
								Merge branch 'linkify' into 'develop'  
							
							... 
							
							
							
							Fix Linkify
See merge request pleroma/pleroma!2792  
							
						 
						
							2020-07-23 10:28:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								7991ddad58 
								
							 
						 
						
							
							
								
								added warning to use old keys  
							
							
							
						 
						
							2020-07-23 09:01:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b6488a4db4 
								
							 
						 
						
							
							
								
								Update linkify migration tests to use config from ConfigDB  
							
							
							
						 
						
							2020-07-22 16:11:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c7a0016f9f 
								
							 
						 
						
							
							
								
								Migration to fix malformed Pleroma.Formatter config  
							
							
							
						 
						
							2020-07-22 14:32:45 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b87a1f8eaf 
								
							 
						 
						
							
							
								
								Refactor require_migration/1 into a test helper function  
							
							
							
						 
						
							2020-07-22 14:32:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								67389b77af 
								
							 
						 
						
							
							
								
								Add AutolinkerToLinkify migration test  
							
							
							
						 
						
							2020-07-22 14:32:24 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7045db5a50 
								
							 
						 
						
							
							
								
								Fix linkify ConfigDB migration  
							
							
							
						 
						
							2020-07-22 11:38:55 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6f5f7af607 
								
							 
						 
						
							
							
								
								[ #1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.  
							
							... 
							
							
							
							Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting. 
							
						 
						
							2020-07-22 19:06:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Angelina Filippova 
								
							 
						 
						
							
							
							
							
								
							
							
								188b0dc72d 
								
							 
						 
						
							
							
								
								Add related_policy field  
							
							
							
						 
						
							2020-07-22 18:15:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1c9752cff4 
								
							 
						 
						
							
							
								
								Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'  
							
							... 
							
							
							
							Fix /api/pleroma/emoji/packs index endpoint.
See merge request pleroma/pleroma!2777  
							
						 
						
							2020-07-22 15:09:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								db0224d174 
								
							 
						 
						
							
							
								
								added check user email for welcome email  
							
							
							
						 
						
							2020-07-22 16:00:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								0cb9e1da74 
								
							 
						 
						
							
							
								
								StatusView: Handle badly formatted emoji reactions.  
							
							
							
						 
						
							2020-07-22 14:44:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								5879d36854 
								
							 
						 
						
							
							
								
								fix sender for welcome email  
							
							
							
						 
						
							2020-07-22 15:34:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								96f023be5c 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/limiter_git_url' into 'develop'  
							
							... 
							
							
							
							mix.exs: Append .git to git repo URLs
Closes  #1980 
See merge request pleroma/pleroma!2787  
							
						 
						
							2020-07-22 11:22:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c8fe0321b0 
								
							 
						 
						
							
							
								
								mix.exs: Append .git to git repo URLs  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/1980  
							
						 
						
							2020-07-22 12:00:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								8d6f7aec21 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1023  
							
							
							
						 
						
							2020-07-22 09:24:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b620290dd9 
								
							 
						 
						
							
							
								
								update description  
							
							
							
						 
						
							2020-07-22 09:20:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								7cafb96c02 
								
							 
						 
						
							
							
								
								added tests  
							
							
							
						 
						
							2020-07-22 08:58:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								b157b7dab3 
								
							 
						 
						
							
							
								
								Document the emoji packs API fix  
							
							
							
						 
						
							2020-07-21 17:29:11 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								109836306c 
								
							 
						 
						
							
							
								
								Test that Emoji Packs can be listed when instance is not public  
							
							
							
						 
						
							2020-07-21 17:27:13 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								341a8f3500 
								
							 
						 
						
							
							
								
								Skip the correct plug  
							
							
							
						 
						
							2020-07-21 17:26:59 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5b1eeb06d8 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !2784  
							
						 
						
							2020-07-21 22:18:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c36113cdf5 
								
							 
						 
						
							
							
								
								Merge branch 'revert-2b5d9eb1' into 'develop'  
							
							... 
							
							
							
							Revert "Merge branch 'linkify' into 'develop'"
See merge request pleroma/pleroma!2784  
							
						 
						
							2020-07-21 22:18:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								696c13ce54 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'linkify' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !2677  
							
						 
						
							2020-07-21 22:17:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								97c60b6a43 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into fix/pleroma-api-emoji-packs  
							
							
							
						 
						
							2020-07-21 16:25:45 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2b5d9eb105 
								
							 
						 
						
							
							
								
								Merge branch 'linkify' into 'develop'  
							
							... 
							
							
							
							AutoLinker --> Linkify, update to latest version
See merge request pleroma/pleroma!2677  
							
						 
						
							2020-07-21 19:35:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fa2421dd7e 
								
							 
						 
						
							
							
								
								Merge branch 'gopher-fix' into 'develop'  
							
							... 
							
							
							
							Gopher: using atom keys in search params
See merge request pleroma/pleroma!2775  
							
						 
						
							2020-07-21 19:31:03 +00:00