Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								721fc7c554 
								
							 
						 
						
							
							
								
								added wrapper Pleroma.HTTP for Tzdata.HTTPClient  
							
							 
							
							
							
						 
						
							2020-06-24 09:12:32 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								c7d69e9256 
								
							 
						 
						
							
							
								
								Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'  
							
							 
							
							... 
							
							
							
							Moving mrf settings from instance to separate mrf group
Closes  #1631 
See merge request pleroma/pleroma!2320  
							
						 
						
							2020-06-23 16:38:27 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								bf8310f380 
								
							 
						 
						
							
							
								
								Add missing default config value for :instance, instance_thumbnail  
							
							 
							
							... 
							
							
							
							Follows up on b7fc61e17b 
							
						 
						
							2020-06-22 17:35:02 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3462d4b995 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1855  
							
							 
							
							
							
						 
						
							2020-06-17 12:50:06 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ed189568f3 
								
							 
						 
						
							
							
								
								moving mrf settings from instance to separate group  
							
							 
							
							
							
						 
						
							2020-06-16 18:32:18 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								579763126f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1855  
							
							 
							
							
							
						 
						
							2020-06-15 15:24:55 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								2e8a236cef 
								
							 
						 
						
							
							
								
								fix invalidates media url's  
							
							 
							
							
							
						 
						
							2020-06-14 21:02:57 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								697cf92024 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers  
							
							 
							
							
							
						 
						
							2020-06-12 18:25:29 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1f35acce54 
								
							 
						 
						
							
							
								
								Merge OGP parser with TwitterCard  
							
							 
							
							
							
						 
						
							2020-06-11 17:57:31 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								da22119c2f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into global-status-expiration  
							
							 
							
							
							
						 
						
							2020-06-08 17:21:47 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6977500ef7 
								
							 
						 
						
							
							
								
								Merge branch 'tagline' into 'develop'  
							
							 
							
							... 
							
							
							
							Update default instance description
See merge request pleroma/pleroma!2600  
							
						 
						
							2020-06-02 14:10:53 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a7627bdc7a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into global-status-expiration  
							
							 
							
							
							
						 
						
							2020-06-01 15:48:51 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ac31f687c0 
								
							 
						 
						
							
							
								
								Config: Default to Hackney again  
							
							 
							
							... 
							
							
							
							Gun needs some server setting changes (files) and has problems with
OTP 23 (wildcards), so use Hackney as a default again for now. 
							
						 
						
							2020-06-01 13:35:39 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d4a18d44fe 
								
							 
						 
						
							
							
								
								Update default instance description  
							
							 
							
							
							
						 
						
							2020-05-28 11:56:30 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								337ca33e5e 
								
							 
						 
						
							
							
								
								Config: Restore old new background image  
							
							 
							
							... 
							
							
							
							Became lost in a settings restructure 
							
						 
						
							2020-05-26 16:00:56 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								cc82229ba7 
								
							 
						 
						
							
							
								
								Add filename_display_max_length config  
							
							 
							
							
							
						 
						
							2020-05-22 18:19:25 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								42b06d78df 
								
							 
						 
						
							
							
								
								Merge branch 'chore/update-config-fe' into 'develop'  
							
							 
							
							... 
							
							
							
							Synchronize :fe settings in config.exs
See merge request pleroma/pleroma!2560  
							
						 
						
							2020-05-20 17:45:19 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4c48626585 
								
							 
						 
						
							
							
								
								Also add new sidebarRight setting  
							
							 
							
							
							
						 
						
							2020-05-20 12:22:31 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								94ba5a7802 
								
							 
						 
						
							
							
								
								Merge branch 'exposed-background-image' into 'develop'  
							
							 
							
							... 
							
							
							
							InstanceView: Expose background image link.
See merge request pleroma/pleroma!2545  
							
						 
						
							2020-05-20 10:53:54 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6dd1575c64 
								
							 
						 
						
							
							
								
								Merge branch 'issue/1509' into 'develop'  
							
							 
							
							... 
							
							
							
							[#1509 ]  purge media from cache after delete
See merge request pleroma/pleroma!2539  
							
						 
						
							2020-05-20 10:35:36 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								918ee46417 
								
							 
						 
						
							
							
								
								Synchronize :fe settings in config.exs  
							
							 
							
							
							
						 
						
							2020-05-19 16:05:39 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								188b32145e 
								
							 
						 
						
							
							
								
								InstanceView: Expose background image link.  
							
							 
							
							... 
							
							
							
							This will make it easier for more clients to support this feature. 
							
						 
						
							2020-05-18 13:29:30 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								c33a4315fb 
								
							 
						 
						
							
							
								
								updated docs  
							
							 
							
							
							
						 
						
							2020-05-18 06:48:19 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								3f8d68bdf3 
								
							 
						 
						
							
							
								
								added example cache purge script  
							
							 
							
							
							
						 
						
							2020-05-17 05:56:20 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								cb40602a16 
								
							 
						 
						
							
							
								
								added media proxy invalidation  
							
							 
							
							
							
						 
						
							2020-05-15 21:39:42 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								b2924ab1fb 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding  
							
							 
							
							
							
						 
						
							2020-05-08 21:37:55 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								3d0c567fbc 
								
							 
						 
						
							
							
								
								Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController  
							
							 
							
							
							
						 
						
							2020-05-07 08:14:54 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								decaa64f75 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into global-status-expiration  
							
							 
							
							
							
						 
						
							2020-05-05 14:28:54 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f070b5569c 
								
							 
						 
						
							
							
								
								Add a config option to enable strict validation  
							
							 
							
							
							
						 
						
							2020-05-04 22:33:05 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								d5cdc907e3 
								
							 
						 
						
							
							
								
								Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering).  
							
							 
							
							... 
							
							
							
							Added support for :skip_notifications for accounts listing (index.json).
Adjusted tests. 
							
						 
						
							2020-05-01 18:45:24 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								92efb888c7 
								
							 
						 
						
							
							
								
								Made follow request notifications non-optional (removed config switch).  
							
							 
							
							
							
						 
						
							2020-05-01 09:51:41 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c56c0a3d23 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into global-status-expiration  
							
							 
							
							
							
						 
						
							2020-04-24 18:37:58 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								364eecc49f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into global-status-expiration  
							
							 
							
							
							
						 
						
							2020-04-20 20:37:56 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bedc558809 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into accept-deletes  
							
							 
							
							
							
						 
						
							2020-04-20 10:15:40 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b54c8813d6 
								
							 
						 
						
							
							
								
								Add :reject_deletes option to SimplePolicy  
							
							 
							
							
							
						 
						
							2020-04-20 10:11:06 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6e6f95c6ae 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2020-04-17 16:23:58 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7f692343c8 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into global-status-expiration  
							
							 
							
							
							
						 
						
							2020-04-10 14:20:48 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								1a4875adfa 
								
							 
						 
						
							
							
								
								[ #1559 ] Support for "follow_request" notifications (configurable).  
							
							 
							
							... 
							
							
							
							(Not currently supported by PleromaFE, thus disabled by default). 
							
						 
						
							2020-04-07 21:52:32 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								98b96e45ab 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2020-04-01 20:08:14 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2f2bd7fe72 
								
							 
						 
						
							
							
								
								Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.  
							
							 
							
							... 
							
							
							
							See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param. 
							
						 
						
							2020-04-01 19:49:09 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								80e1571610 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into global-status-expiration  
							
							 
							
							
							
						 
						
							2020-03-20 22:08:34 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9bae9b1b1b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							 
							
							
							
						 
						
							2020-03-20 20:47:54 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fe15f0ba15 
								
							 
						 
						
							
							
								
								restrict_unauthenticated setting  
							
							 
							
							
							
						 
						
							2020-03-20 16:36:20 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								b17d8d305f 
								
							 
						 
						
							
							
								
								Enable Gun adapter by default  
							
							 
							
							... 
							
							
							
							We need devs to dogfood this before we merge it into the 2.1 release 
							
						 
						
							2020-03-16 15:39:34 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								421e35b578 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into global-status-expiration  
							
							 
							
							
							
						 
						
							2020-03-16 15:31:31 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f0651730bd 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							 
							
							
							
						 
						
							2020-03-16 14:25:55 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e87a32bcd7 
								
							 
						 
						
							
							
								
								rip out fetch_initial_posts  
							
							 
							
							... 
							
							
							
							Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes  #1595  #1422  
							
						 
						
							2020-03-15 15:59:17 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8854770fc4 
								
							 
						 
						
							
							
								
								retry and retry_timeout settings default change  
							
							 
							
							
							
						 
						
							2020-03-03 18:01:35 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								28ed4b41d0 
								
							 
						 
						
							
							
								
								naming for checkin from pool timeout  
							
							 
							
							
							
						 
						
							2020-03-03 13:05:28 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								509c81e4b1 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							 
							
							
							
						 
						
							2020-03-03 10:08:07 +03:00