feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								2926713fe5
								
							
						 | 
						
							
							
								
								Merge branch 'deprecate-public_endpoint' into 'develop'
							
							
							
							
							
							
							
							Deprecate Uploaders.S3, :public_endpoint
See merge request pleroma/pleroma!3251 
							
						 | 
						
							2021-01-20 22:48:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c4439c630f
								
							
						 | 
						
							
							
								
								Bump Copyright to 2021
							
							
							
							
							
							
							
							grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;' 
							
						 | 
						
							2021-01-13 07:49:50 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								67e888498c
								
							
						 | 
						
							
							
								
								Switch another test to Upload.base_url/0
							
							
							
							
							
						 | 
						
							2021-01-12 16:42:43 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								e87cca97e6
								
							
						 | 
						
							
							
								
								Fix tests relying on old behavior. Use the Upload.base_url, Luke.
							
							
							
							
							
						 | 
						
							2021-01-12 16:35:10 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								40f3cdc030
								
							
						 | 
						
							
							
								
								JPEG content_type must be image/jpeg
							
							
							
							
							
						 | 
						
							2020-10-13 10:37:24 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								b738f70953
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/gen-magic
							
							
							
							
							
						 | 
						
							2020-10-13 10:08:38 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7dffaef479
								
							
						 | 
						
							
							
								
								tests consistency
							
							
							
							
							
						 | 
						
							2020-10-13 16:35:09 +03:00 | 
						
						
							
							
							
								
							
							
						 |