Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c1777e7479 
								
							 
						 
						
							
							
								
								BasicAuthDecoderPlug module name  
							
							
							
						 
						
							2020-10-13 16:43:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								66e0b0065b 
								
							 
						 
						
							
							
								
								Cache plug module name  
							
							
							
						 
						
							2020-10-13 16:43:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c6baa811d6 
								
							 
						 
						
							
							
								
								EnsureAuthenticatedPlug module name  
							
							
							
						 
						
							2020-10-13 16:43:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								011525a3d1 
								
							 
						 
						
							
							
								
								EnsurePublicOrAuthenticatedPlug module name  
							
							
							
						 
						
							2020-10-13 16:43:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8e301a4c37 
								
							 
						 
						
							
							
								
								EnsureUserKeyPlug module name  
							
							
							
						 
						
							2020-10-13 16:43:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d6cb1a3b46 
								
							 
						 
						
							
							
								
								ExpectAuthenticatedCheckPlug module name  
							
							
							
						 
						
							2020-10-13 16:43:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								99e4ed21b1 
								
							 
						 
						
							
							
								
								ExpectPublicOrAuthenticatedCheckPlug module name  
							
							
							
						 
						
							2020-10-13 16:43:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8c993c5f63 
								
							 
						 
						
							
							
								
								FederatingPlug module name  
							
							
							
						 
						
							2020-10-13 16:43:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5cd7030076 
								
							 
						 
						
							
							
								
								IdempotencyPlug module name  
							
							
							
						 
						
							2020-10-13 16:43:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e2332d92ce 
								
							 
						 
						
							
							
								
								LegacyAuthenticationPlug module name  
							
							
							
						 
						
							2020-10-13 16:43:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								96d320bdfe 
								
							 
						 
						
							
							
								
								OAuthPlug module name  
							
							
							
						 
						
							2020-10-13 16:43:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a6d8cef33e 
								
							 
						 
						
							
							
								
								OAuthScopesPlug module name  
							
							
							
						 
						
							2020-10-13 16:43:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								15772fda57 
								
							 
						 
						
							
							
								
								PlugHelper module name  
							
							
							
						 
						
							2020-10-13 16:43:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4b1863ca4e 
								
							 
						 
						
							
							
								
								RateLimiter module name  
							
							
							
						 
						
							2020-10-13 16:43:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3be8ab5103 
								
							 
						 
						
							
							
								
								RemoteIp module name  
							
							
							
						 
						
							2020-10-13 16:43:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4b4c0eef36 
								
							 
						 
						
							
							
								
								SessionAuthenticationPlug module name  
							
							
							
						 
						
							2020-10-13 16:42:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8249b75761 
								
							 
						 
						
							
							
								
								SetFormatPlug module name  
							
							
							
						 
						
							2020-10-13 16:42:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c97c7d982f 
								
							 
						 
						
							
							
								
								SetLocalePlug module name  
							
							
							
						 
						
							2020-10-13 16:42:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f7614d4718 
								
							 
						 
						
							
							
								
								SetUserSessionIdPlug module name  
							
							
							
						 
						
							2020-10-13 16:42:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ebd6dd7c53 
								
							 
						 
						
							
							
								
								UserEnabledPlug module name  
							
							
							
						 
						
							2020-10-13 16:42:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								61c609884c 
								
							 
						 
						
							
							
								
								UserFetcherPlug module name  
							
							
							
						 
						
							2020-10-13 16:42:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1d16cd0c3d 
								
							 
						 
						
							
							
								
								UserIsAdminPlug module name  
							
							
							
						 
						
							2020-10-13 16:42:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0374df1d12 
								
							 
						 
						
							
							
								
								other files consistency  
							
							
							
						 
						
							2020-10-13 16:38:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7acf09beb8 
								
							 
						 
						
							
							
								
								more tests  
							
							
							
						 
						
							2020-10-13 16:38:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								103f3dcb9e 
								
							 
						 
						
							
							
								
								rich media parser ttl files consistency  
							
							
							
						 
						
							2020-10-13 16:38:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7dffaef479 
								
							 
						 
						
							
							
								
								tests consistency  
							
							
							
						 
						
							2020-10-13 16:35:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6bf85440b3 
								
							 
						 
						
							
							
								
								mix tasks consistency  
							
							
							
						 
						
							2020-10-13 16:33:24 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								83ae45b000 
								
							 
						 
						
							
							
								
								Preload /api/pleroma/frontend_configurations,  fixes   #1932  
							
							
							
						 
						
							2020-10-12 18:49:37 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								03855f9789 
								
							 
						 
						
							
							
								
								Merge branch 'improve/instance-gen' into 'develop'  
							
							... 
							
							
							
							#2159  Support enabling upload filters during instance gen
See merge request pleroma/pleroma!3070  
						
							2020-10-12 17:24:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								8539e386c3 
								
							 
						 
						
							
							
								
								Add missing Copyright headers  
							
							
							
						 
						
							2020-10-12 12:00:50 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6c61ef14c3 
								
							 
						 
						
							
							
								
								Support enabling upload filters during instance gen  
							
							
							
						 
						
							2020-10-12 11:19:48 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2498e569f1 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances  
							
							
							
						 
						
							2020-10-11 22:34:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								89c595b772 
								
							 
						 
						
							
							
								
								[ #3053 ] Removed target accessibility checks for OStatus endpoints delegating to RedirectController. Added tests.  
							
							
							
						 
						
							2020-10-11 22:34:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3ca98878d2 
								
							 
						 
						
							
							
								
								Deep link to the user account in AdminFE in account confirmation emails  
							
							
							
						 
						
							2020-10-09 17:08:05 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								04b514c567 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/gen-magic  
							
							
							
						 
						
							2020-10-09 11:26:10 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								74be4de3f6 
								
							 
						 
						
							
							
								
								Merge branch 'fix/2209-remoteip' into 'develop'  
							
							... 
							
							
							
							#2209  RemoteIP CIDR helper, config and doc improvements
See merge request pleroma/pleroma!3057  
						
							2020-10-08 17:29:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								a702f9fb5b 
								
							 
						 
						
							
							
								
								Lint  
							
							
							
						 
						
							2020-10-07 15:07:03 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								6ee20eb328 
								
							 
						 
						
							
							
								
								Apply 1 suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2020-10-07 19:32:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								8bfc5d9a0c 
								
							 
						 
						
							
							
								
								Apply 1 suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2020-10-07 19:32:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								d0eca5b125 
								
							 
						 
						
							
							
								
								Apply 2 suggestion(s) to 2 file(s)  
							
							
							
						 
						
							2020-10-07 19:16:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								8156940a49 
								
							 
						 
						
							
							
								
								Compatibility with phoenix_pubsub 2.0.0  
							
							
							
						 
						
							2020-10-07 13:28:39 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								570a406b7a 
								
							 
						 
						
							
							
								
								use Phoenix.ConnTest is deprecated  
							
							
							
						 
						
							2020-10-07 10:31:08 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bc3db72403 
								
							 
						 
						
							
							
								
								Use ModerationLog instead of Logger  
							
							
							
						 
						
							2020-10-07 18:35:29 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f1e4333dd7 
								
							 
						 
						
							
							
								
								Fix test  
							
							
							
						 
						
							2020-10-07 18:35:28 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e4792ce76a 
								
							 
						 
						
							
							
								
								Do not limit admins  
							
							
							
						 
						
							2020-10-07 18:35:27 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								17562bf414 
								
							 
						 
						
							
							
								
								Move API endpoints to /api/v1/pleroma/backups  
							
							
							
						 
						
							2020-10-07 18:35:27 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7c22c9afb4 
								
							 
						 
						
							
							
								
								Allow admins request user backups  
							
							
							
						 
						
							2020-10-07 18:34:31 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7fdd81d000 
								
							 
						 
						
							
							
								
								Add "Your backup is ready" email  
							
							
							
						 
						
							2020-10-07 18:34:30 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								27bc121ec0 
								
							 
						 
						
							
							
								
								Require email  
							
							
							
						 
						
							2020-10-07 18:34:30 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								86ce4afd93 
								
							 
						 
						
							
							
								
								Improve backup urls  
							
							
							
						 
						
							2020-10-07 18:34:29 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2c73bfe122 
								
							 
						 
						
							
							
								
								Add API endpoints for Backups  
							
							
							
						 
						
							2020-10-07 18:34:29 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								abdffc6b8c 
								
							 
						 
						
							
							
								
								Fix Credo warning  
							
							
							
						 
						
							2020-10-07 18:34:29 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								739cb1463b 
								
							 
						 
						
							
							
								
								Add backups deletion  
							
							
							
						 
						
							2020-10-07 18:34:29 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3ad7492f9d 
								
							 
						 
						
							
							
								
								Add config for Pleroma.Backup  
							
							
							
						 
						
							2020-10-07 18:34:29 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a0ad9bd734 
								
							 
						 
						
							
							
								
								Add BackupWorker  
							
							
							
						 
						
							2020-10-07 18:34:28 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4f3a633745 
								
							 
						 
						
							
							
								
								Add backups table  
							
							
							
						 
						
							2020-10-07 18:34:28 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								75e07ba206 
								
							 
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							2020-10-07 18:34:28 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								be42ab70dc 
								
							 
						 
						
							
							
								
								Add backup upload  
							
							
							
						 
						
							2020-10-07 18:34:28 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c82f912959 
								
							 
						 
						
							
							
								
								Fix credo warning  
							
							
							
						 
						
							2020-10-07 18:34:27 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c01a818048 
								
							 
						 
						
							
							
								
								Add tests  
							
							
							
						 
						
							2020-10-07 18:34:27 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9783e9cd80 
								
							 
						 
						
							
							
								
								Add test for an entry without CIDR format  
							
							
							
						 
						
							2020-10-06 17:08:26 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d43d05005a 
								
							 
						 
						
							
							
								
								Move hardcoded default configuration into config.exs  
							
							
							
						 
						
							2020-10-06 17:02:46 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								cddca85c84 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into revert/rich-media-censorship  
							
							
							
						 
						
							2020-10-06 14:25:20 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								2698bbc9f6 
								
							 
						 
						
							
							
								
								Merge branch 'filtering-following' into 'develop'  
							
							... 
							
							
							
							ActivityPub: Return Announces when filtering by `following`.
See merge request pleroma/pleroma!3022  
							
						 
						
							2020-10-06 18:11:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6c2264af24 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances  
							
							
							
						 
						
							2020-10-05 23:50:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								094edde7c4 
								
							 
						 
						
							
							
								
								[ #3053 ] Unauthenticated access control for OStatus-related controllers and ActivityPubController (base actions: :user, :object, :activity). Tests adjustments.  
							
							
							
						 
						
							2020-10-05 23:48:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								346cc3ac24 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination  
							
							
							
						 
						
							2020-10-05 12:40:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								f6024252ae 
								
							 
						 
						
							
							
								
								[ #3053 ] No auth check in StaticFEController, even on non-federating instances. Adjusted tests.  
							
							
							
						 
						
							2020-10-02 22:18:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cbdaabad34 
								
							 
						 
						
							
							
								
								web push http_client fix  
							
							
							
						 
						
							2020-10-01 13:32:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								90fee49c52 
								
							 
						 
						
							
							
								
								User search: Once again, change uri handling.  
							
							... 
							
							
							
							They can indeed be non-unique. 
							
						 
						
							2020-09-30 14:14:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2a11068a11 
								
							 
						 
						
							
							
								
								Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'  
							
							... 
							
							
							
							`ffmpeg` / `ImageMagick` handling as optional dependencies
See merge request pleroma/pleroma!3031  
							
						 
						
							2020-09-29 14:48:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								aa170caa76 
								
							 
						 
						
							
							
								
								Merge branch 'issue/2170' into 'develop'  
							
							... 
							
							
							
							[#2170 ] Can't remove dead relay
See merge request pleroma/pleroma!3041  
							
						 
						
							2020-09-29 14:37:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ba7f9459b4 
								
							 
						 
						
							
							
								
								Revert Rich Media censorship for sensitive statuses  
							
							... 
							
							
							
							The #NSFW hashtag test was broken anyway. 
							
						 
						
							2020-09-28 18:22:59 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								7bc561127d 
								
							 
						 
						
							
							
								
								Revert citext user URI migration  
							
							... 
							
							
							
							URI paths are not actually case-insesitive, which caused migration issues
 on a number of databases.
Closes  #2188  
							
						 
						
							2020-09-28 18:34:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								de993b856b 
								
							 
						 
						
							
							
								
								added force option to the unfollow operation  
							
							
							
						 
						
							2020-09-28 09:16:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								4e4f771082 
								
							 
						 
						
							
							
								
								Adjusted MediaProxyControllerTest to gracefully fail on missing dependencies. Installation docs update.  
							
							... 
							
							
							
							Added ffmpeg/imagemagick checks to launch checks (if media preview proxy is enabled). Added documentation on installing optional media / graphics packages (imagemagick, ffmpeg, exiftool). 
							
						 
						
							2020-09-26 19:32:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d1c724ef34 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into fix/deprecation-warning-welcome-message  
							
							
							
						 
						
							2020-09-25 13:08:33 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								93b674b66d 
								
							 
						 
						
							
							
								
								Fix test failures for NoOpPolicy describe/0  
							
							
							
						 
						
							2020-09-25 12:46:49 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4a30598b9e 
								
							 
						 
						
							
							
								
								Config settings leak and break configdb migration tests when async  
							
							
							
						 
						
							2020-09-25 12:20:52 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								dcdf75fbac 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into fix/deprecation-warning-welcome-message  
							
							
							
						 
						
							2020-09-25 11:45:51 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								1672d8b37c 
								
							 
						 
						
							
							
								
								Merge branch 'feature/bulk-confirmation' into 'develop'  
							
							... 
							
							
							
							Bulk account confirmation actions
Closes  #2085 
See merge request pleroma/pleroma!2975  
							
						 
						
							2020-09-25 16:15:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2bf2c68dee 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into fix/deprecation-warning-welcome-message  
							
							
							
						 
						
							2020-09-25 10:48:01 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5cd71208d9 
								
							 
						 
						
							
							
								
								Merge branch 'search-even-more' into 'develop'  
							
							... 
							
							
							
							More user search improvements
See merge request pleroma/pleroma!3032  
							
						 
						
							2020-09-25 12:56:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f67c967c4a 
								
							 
						 
						
							
							
								
								Merge branch 'features/incoming-create-exists' into 'develop'  
							
							... 
							
							
							
							transmogrifier: Drop incoming create early if it already exists
See merge request pleroma/pleroma!3026  
							
						 
						
							2020-09-25 12:44:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1e0f3f8514 
								
							 
						 
						
							
							
								
								User search: Make uri matches case insensitive.  
							
							
							
						 
						
							2020-09-25 08:56:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a8c17ea25a 
								
							 
						 
						
							
							
								
								User Search: Also find user by uri  
							
							
							
						 
						
							2020-09-25 08:46:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3bf3db39f5 
								
							 
						 
						
							
							
								
								Validate emails are sent to the appropriate unconfirmed actors  
							
							
							
						 
						
							2020-09-24 18:24:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d0078bc404 
								
							 
						 
						
							
							
								
								User Search: Boost resolved results and exact ap_id matches.  
							
							
							
						 
						
							2020-09-24 15:54:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								151df9fc17 
								
							 
						 
						
							
							
								
								Merge branch 'fix/test-fix' into 'develop'  
							
							... 
							
							
							
							Fix for test on mac
See merge request pleroma/pleroma!3027  
							
						 
						
							2020-09-24 09:50:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								47cd59342f 
								
							 
						 
						
							
							
								
								Merge branch 'smol-test' into 'develop'  
							
							... 
							
							
							
							CommonAPI test: Add test for polls
See merge request pleroma/pleroma!3028  
							
						 
						
							2020-09-24 09:41:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								35d62a4a56 
								
							 
						 
						
							
							
								
								CommonAPI test: Add test for polls  
							
							
							
						 
						
							2020-09-24 11:12:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								165961f56d 
								
							 
						 
						
							
							
								
								don't run in async mode  
							
							
							
						 
						
							2020-09-24 12:00:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								aa1f97a5b6 
								
							 
						 
						
							
							
								
								fix for test on mac  
							
							
							
						 
						
							2020-09-24 10:46:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								727a0556a9 
								
							 
						 
						
							
							
								
								fix  
							
							
							
						 
						
							2020-09-24 09:47:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5d7ec00bed 
								
							 
						 
						
							
							
								
								fixes after rebase  
							
							
							
						 
						
							2020-09-24 09:42:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8c6ec4c111 
								
							 
						 
						
							
							
								
								pack routes change  
							
							
							
						 
						
							2020-09-24 09:16:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dbbc801667 
								
							 
						 
						
							
							
								
								pagination for remote emoji packs  
							
							
							
						 
						
							2020-09-24 09:12:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9b6d89ff8c 
								
							 
						 
						
							
							
								
								support for special chars in pack name  
							
							
							
						 
						
							2020-09-24 09:12:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f3a1f9c3bb 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/bulk-confirmation  
							
							
							
						 
						
							2020-09-23 11:56:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e02101e15c 
								
							 
						 
						
							
							
								
								Merge branch 'issue/2115' into 'develop'  
							
							... 
							
							
							
							[#2115 ] added paginate links to headers for  /chats/:id/messages
See merge request pleroma/pleroma!2981  
							
						 
						
							2020-09-23 12:09:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4dadb7c433 
								
							 
						 
						
							
							
								
								Merge branch 'user-query/filter-out-internal' into 'develop'  
							
							... 
							
							
							
							Filter out internal users by default
Closes  #2147 
See merge request pleroma/pleroma!3024  
							
						 
						
							2020-09-23 11:51:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								436d1a3c41 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'issue/2115'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2020-09-23 11:49:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5e86a2809e 
								
							 
						 
						
							
							
								
								transmogrifier: Drop incoming create early if it already exists  
							
							
							
						 
						
							2020-09-23 13:40:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a6c14041c4 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'issue/1975'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2020-09-23 09:16:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								8e4f043ac7 
								
							 
						 
						
							
							
								
								finland-emojis.zip -> emojis.zip  
							
							
							
						 
						
							2020-09-22 21:58:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								72d2b34d3b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1975  
							
							
							
						 
						
							2020-09-22 21:42:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3104367931 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into email-fix-develop  
							
							
							
						 
						
							2020-09-22 13:37:02 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								88653c01c9 
								
							 
						 
						
							
							
								
								Add test for check_activity_expiration_config/0  
							
							
							
						 
						
							2020-09-22 11:34:51 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								7775b1540f 
								
							 
						 
						
							
							
								
								Add deprecation warning test for check_hellthread_threshold/0  
							
							
							
						 
						
							2020-09-22 11:22:15 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								25bdf0d0d9 
								
							 
						 
						
							
							
								
								Add test for welcome message format  
							
							
							
						 
						
							2020-09-22 11:19:29 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e2dcf039d2 
								
							 
						 
						
							
							
								
								Fix gun_pool_options deprecation warning message  
							
							
							
						 
						
							2020-09-22 11:15:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c95859e45b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115  
							
							
							
						 
						
							2020-09-22 17:13:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0e0ece251a 
								
							 
						 
						
							
							
								
								Filter out internal users by default  
							
							
							
						 
						
							2020-09-22 16:56:11 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ee3052a2d8 
								
							 
						 
						
							
							
								
								ActivityPub: Return Announces when filtering by following.  
							
							
							
						 
						
							2020-09-22 14:20:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bf181ca968 
								
							 
						 
						
							
							
								
								Fix MastoAPI.AuthControllerTest, json_response(:no_content) --> empty_json_response()  
							
							
							
						 
						
							2020-09-21 16:03:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0b728ccc44 
								
							 
						 
						
							
							
								
								Pass hackney tls config into email tests,  #2101  
							
							
							
						 
						
							2020-09-21 15:26:10 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9108e27c2f 
								
							 
						 
						
							
							
								
								Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop'  
							
							... 
							
							
							
							[#2074 ] OAuth scope checking in Streaming API
Closes  #2074 
See merge request pleroma/pleroma!3013  
							
						 
						
							2020-09-21 17:15:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b36b6259d8 
								
							 
						 
						
							
							
								
								Merge branch 'issue/2099' into 'develop'  
							
							... 
							
							
							
							[#2099 ] Import/export mutes [BE]
See merge request pleroma/pleroma!2965  
							
						 
						
							2020-09-21 16:25:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f2f0a0260f 
								
							 
						 
						
							
							
								
								ActivityPub: Don't block-filter your own posts  
							
							... 
							
							
							
							We are filtering out replies to people you block, but that should
not include your own posts. 
							
						 
						
							2020-09-21 16:08:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								60b025b782 
								
							 
						 
						
							
							
								
								[ #2074 ] OAuth scope checking in Streaming API.  
							
							
							
						 
						
							2020-09-19 19:16:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								ed3bc53fa1 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/2099  
							
							
							
						 
						
							2020-09-18 22:13:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								6c052bd5b6 
								
							 
						 
						
							
							
								
								Merge branch 'media-preview-proxy-nostream' into 'develop'  
							
							... 
							
							
							
							Media preview proxy
See merge request pleroma/pleroma!3001  
							
						 
						
							2020-09-18 18:38:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7e02f4ed3b 
								
							 
						 
						
							
							
								
								Merge branch 'feature/2118-web-push-encryption-http' into 'develop'  
							
							... 
							
							
							
							Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter
Closes  #2118 
See merge request pleroma/pleroma!3008  
							
						 
						
							2020-09-18 12:25:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Steven Fuchs 
								
							 
						 
						
							
							
							
							
								
							
							
								f2ef9735c5 
								
							 
						 
						
							
							
								
								Federate data through persistent websocket connections  
							
							
							
						 
						
							2020-09-18 11:58:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								2ec0dcf001 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/2099  
							
							
							
						 
						
							2020-09-18 07:08:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								226fa3e486 
								
							 
						 
						
							
							
								
								Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter  
							
							
							
						 
						
							2020-09-17 22:10:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a428800405 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2020-09-17 22:22:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								7bf269fe83 
								
							 
						 
						
							
							
								
								Fix MRF reject for ChatMessage  
							
							
							
						 
						
							2020-09-17 22:07:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								abf25e5d52 
								
							 
						 
						
							
							
								
								Create MRF.filter_pipeline to inject :object_data when present  
							
							
							
						 
						
							2020-09-17 22:07:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								beefc022dd 
								
							 
						 
						
							
							
								
								Merge branch 'omit-nondiscoverable-from-search' into 'develop'  
							
							... 
							
							
							
							User search should respect discoverable flag
See merge request pleroma/pleroma!2997  
							
						 
						
							2020-09-17 17:59:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								608824b97e 
								
							 
						 
						
							
							
								
								Merge branch 'instance-docs' into 'develop'  
							
							... 
							
							
							
							AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
Closes  #1516 
See merge request pleroma/pleroma!2931  
							
						 
						
							2020-09-17 16:54:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								608017b7df 
								
							 
						 
						
							
							
								
								Merge branch 'fix/streaming-termination-errors' into 'develop'  
							
							... 
							
							
							
							Fix two pseudo-errors in websocket handler
Closes  #2131 
See merge request pleroma/pleroma!2982  
							
						 
						
							2020-09-17 19:50:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								0465bdbd49 
								
							 
						 
						
							
							
								
								Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'  
							
							... 
							
							
							
							Ensure we only apply media_nsfw simple policy on parsable objects
Closes  #2133 
See merge request pleroma/pleroma!2992  
							
						 
						
							2020-09-17 19:50:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bb70b231d0 
								
							 
						 
						
							
							
								
								Merge branch 'reply-visibility-user-guard' into 'develop'  
							
							... 
							
							
							
							Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user
See merge request pleroma/pleroma!2999  
							
						 
						
							2020-09-17 19:49:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								22d49993d9 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/mrf-ingestion' into 'develop'  
							
							... 
							
							
							
							Bugfix: MRF and Pipeline Ingestion
See merge request pleroma/secteam/pleroma!15 
							
						 
						
							2020-09-17 19:48:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									stwf 
								
							 
						 
						
							
							
							
							
								
							
							
								9d77f4abf8 
								
							 
						 
						
							
							
								
								adapt to new user factory behavior  
							
							
							
						 
						
							2020-09-17 12:32:40 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									stwf 
								
							 
						 
						
							
							
							
							
								
							
							
								dfc621a529 
								
							 
						 
						
							
							
								
								add test and changelog entry  
							
							
							
						 
						
							2020-09-17 12:18:07 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									stwf 
								
							 
						 
						
							
							
							
							
								
							
							
								41939e3175 
								
							 
						 
						
							
							
								
								User search respect discoverable flag  
							
							
							
						 
						
							2020-09-17 12:15:50 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								dee4639dbb 
								
							 
						 
						
							
							
								
								Merge branch 'feat/rich-media-head' into 'develop'  
							
							... 
							
							
							
							RichMedia: Do a HEAD request to check content type/length
See merge request pleroma/pleroma!2995  
							
						 
						
							2020-09-17 19:04:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f7e40f7ef1 
								
							 
						 
						
							
							
								
								Deny ConfigDB migration when deprecated settings found  
							
							
							
						 
						
							2020-09-17 09:32:50 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								d9fb5bc08a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream  
							
							
							
						 
						
							2020-09-17 17:14:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7cdbd91d83 
								
							 
						 
						
							
							
								
								[ #2497 ] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.  
							
							
							
						 
						
							2020-09-17 17:13:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7c60789ba5 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'nondiscoverable-user-metadata'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2020-09-17 14:09:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								c711a2b157 
								
							 
						 
						
							
							
								
								Return the file content for GET /api/pleroma/admin/instance_document/:document_name  
							
							
							
						 
						
							2020-09-17 16:55:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								582ad5d4e1 
								
							 
						 
						
							
							
								
								AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API  
							
							
							
						 
						
							2020-09-17 16:48:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5e3c70afa5 
								
							 
						 
						
							
							
								
								AdminAPI Chat tests: Remove factory.  
							
							... 
							
							
							
							The factory system doesn't work too well with how the chats are
done. Instead of tempting people to use it, let's rather use the
CommonAPI system for now. 
							
						 
						
							2020-09-17 13:37:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e39ff2616b 
								
							 
						 
						
							
							
								
								Admin chat api tests: Small additions.  
							
							
							
						 
						
							2020-09-17 13:29:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7a73850928 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation  
							
							
							
						 
						
							2020-09-17 13:26:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b867f9d7ae 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/2099  
							
							
							
						 
						
							2020-09-17 08:41:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								73e0e6a8a2 
								
							 
						 
						
							
							
								
								Remove unused import  
							
							
							
						 
						
							2020-09-16 10:56:42 -05:00