Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								d1e1057e22
								
							
						 | 
						
							
							
								
								Merge branch 'media-preview-proxy' of git.pleroma.social:pleroma/pleroma into feld-media-preview-proxy
							
							
							
							
							
						 | 
						
							2020-09-03 14:48:43 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								6141eb94ab
								
							
						 | 
						
							
							
								
								Fetch preview requests through the MediaProxy. Separate connection options are not needed.
							
							
							
							
							
							
							
							Use a separate pool for preview requests 
							
						 | 
						
							2020-09-03 14:42:11 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								60c925380d
								
							
						 | 
						
							
							
								
								[#2497] Added support for enforcing output format for media proxy preview, used for avatar_static & header_static (AccountView).
							
							
							
							
							
						 | 
						
							2020-09-03 20:13:29 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								6ce28c4091
								
							
						 | 
						
							
							
								
								[#2497] Fix for png media proxy preview response headers (content-type & content-disposition).
							
							
							
							
							
						 | 
						
							2020-09-01 21:21:58 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								0a839d51a7
								
							
						 | 
						
							
							
								
								[#2497] Added Cache-Control response header for media proxy preview endpoint.
							
							
							
							
							
						 | 
						
							2020-08-31 13:08:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								2d2af75777
								
							
						 | 
						
							
							
								
								Support PNG previews to preserve alpha channels
							
							
							
							
							
						 | 
						
							2020-08-30 09:17:24 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b4d483f52
								
							
						 | 
						
							
							
								
								Add a note about the avatars and banners situation
							
							
							
							
							
						 | 
						
							2020-08-27 17:28:21 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								ef9d12fcc5
								
							
						 | 
						
							
							
								
								Attempt at supporting video thumbnails via ffmpeg
							
							
							
							
							
						 | 
						
							2020-08-27 12:31:55 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								157ecf4022
								
							
						 | 
						
							
							
								
								Follow redirects.
							
							
							
							
							
							
							
							I think we should be using some global adapter options here, though. 
							
						 | 
						
							2020-08-27 11:46:56 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								eead2276e7
								
							
						 | 
						
							
							
								
								Ensure GIFs are redirected to the original or they become static.
							
							
							
							
							
						 | 
						
							2020-08-26 16:18:11 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								ddbddc08fc
								
							
						 | 
						
							
							
								
								Redirects for videos right now
							
							
							
							
							
						 | 
						
							2020-08-25 17:31:55 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								899ea2da3e
								
							
						 | 
						
							
							
								
								Switch to imagemagick, only support videos
							
							
							
							
							
						 | 
						
							2020-08-25 17:18:22 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								aa0a5ffb48
								
							
						 | 
						
							
							
								
								[#2497] Media preview proxy: added quality config setting, adjusted width/height defaults.
							
							
							
							
							
						 | 
						
							2020-08-21 08:59:08 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								02ad1cd8e9
								
							
						 | 
						
							
							
								
								[#2497] Media preview proxy: added Content-Disposition header with filename to response.
							
							
							
							
							
						 | 
						
							2020-08-20 09:58:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4ee15e991e
								
							
						 | 
						
							
							
								
								[#2497] Media preview proxy config refactoring & documentation.
							
							
							
							
							
						 | 
						
							2020-08-19 21:36:26 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								da116d81fb
								
							
						 | 
						
							
							
								
								[#2497] Added video preview proxy. Switched from exexec to Port.
							
							
							
							
							
						 | 
						
							2020-08-18 18:23:27 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								27e7999a15
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
							
							
							
							
							
						 | 
						
							2020-08-18 18:02:09 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								345ac512e4
								
							
						 | 
						
							
							
								
								added paginate+search for admin/MediaProxy URLs
							
							
							
							
							
						 | 
						
							2020-08-11 10:30:13 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								bdf57b8ef4
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
							
							
							
							
							
							
							
							# Conflicts:
#	config/config.exs
#	lib/pleroma/web/media_proxy/media_proxy.ex
#	mix.lock
#	test/web/media_proxy/media_proxy_test.exs 
							
						 | 
						
							2020-07-19 20:05:37 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b376442325
								
							
						 | 
						
							
							
								
								MediaProxy whitelist setting now supports hosts with scheme
							
							
							
							
							
							
							
							added deprecation warning about using bare domains 
							
						 | 
						
							2020-07-12 12:41:40 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								d23804f191
								
							
						 | 
						
							
							
								
								Use the Pleroma.Config alias
							
							
							
							
							
						 | 
						
							2020-07-09 10:53:51 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								9faa632037
								
							
						 | 
						
							
							
								
								[#2497] Fixed merge issue.
							
							
							
							
							
						 | 
						
							2020-07-05 19:02:43 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								61180ab6f4
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
							
							
							
							
							
							
							
							# Conflicts:
#	config/config.exs
#	lib/pleroma/web/media_proxy/media_proxy.ex
#	lib/pleroma/web/media_proxy/media_proxy_controller.ex 
							
						 | 
						
							2020-07-02 16:36:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4044f24e2e
								
							
						 | 
						
							
							
								
								fix test
							
							
							
							
							
						 | 
						
							2020-06-18 05:06:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								2731ea1334
								
							
						 | 
						
							
							
								
								Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url
							
							
							
							
							
						 | 
						
							2020-06-17 13:13:55 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								c08c9db0c1
								
							
						 | 
						
							
							
								
								Remove misleading is_ prefix from boolean function
							
							
							
							
							
						 | 
						
							2020-06-17 13:02:01 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								71a5d9bffb
								
							
						 | 
						
							
							
								
								Empty list as default
							
							
							
							
							
						 | 
						
							2020-06-17 12:54:02 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								9a371bf5f6
								
							
						 | 
						
							
							
								
								Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
							
							
							
							
							
						 | 
						
							2020-06-17 13:12:38 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								44ce97a9c9
								
							
						 | 
						
							
							
								
								Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
							
							
							
							
							
						 | 
						
							2020-06-17 13:12:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								74fd761637
								
							
						 | 
						
							
							
								
								Apply suggestion to lib/pleroma/web/media_proxy/invalidation.ex
							
							
							
							
							
						 | 
						
							2020-06-17 12:56:30 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								62b8c31b7a
								
							
						 | 
						
							
							
								
								added tests
							
							
							
							
							
						 | 
						
							2020-06-15 14:55:00 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								2e8a236cef
								
							
						 | 
						
							
							
								
								fix invalidates media url's
							
							
							
							
							
						 | 
						
							2020-06-14 21:02:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								610343edb3
								
							
						 | 
						
							
							
								
								[#2497] Image preview proxy: image resize & background color fix with ffmpeg -filter_complex.
							
							
							
							
							
						 | 
						
							2020-05-21 17:35:42 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								6fd4f58ead
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
							
							
							
							
							
						 | 
						
							2020-05-20 20:27:03 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								1871a5ddb4
								
							
						 | 
						
							
							
								
								[#2497] Image preview proxy: implemented ffmpeg-based resizing, removed eimp & mogrify-based resizing.
							
							
							
							
							
						 | 
						
							2020-05-20 20:26:43 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5f0a3ac74d
								
							
						 | 
						
							
							
								
								added tests
							
							
							
							
							
						 | 
						
							2020-05-19 06:05:09 +03: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
								
							 
						 | 
						
							
							
							
							
								
							
							
								f1f588fd52
								
							
						 | 
						
							
							
								
								[#2497] Added support for :eimp for image resizing.
							
							
							
							
							
						 | 
						
							2020-05-14 20:18:31 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								1b23acf164
								
							
						 | 
						
							
							
								
								[#2497] Media preview proxy for images: fixes, tweaks, refactoring, tests adjustments.
							
							
							
							
							
						 | 
						
							2020-05-11 23:21:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								bbdad85568
								
							
						 | 
						
							
							
								
								Initial implementation of image preview proxy. Media proxy tests refactoring.
							
							
							
							
							
						 | 
						
							2020-05-08 23:06:47 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f685cbd309
								
							
						 | 
						
							
							
								
								Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
							
							
							
							
							
						 | 
						
							2020-04-21 16:29:19 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								05da5f5cca
								
							
						 | 
						
							
							
								
								Update Copyrights
							
							
							
							
							
						 | 
						
							2020-03-03 16:44:49 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								d93d777915
								
							
						 | 
						
							
							
								
								Fix/mediaproxy whitelist base url
							
							
							
							
							
						 | 
						
							2019-08-02 17:07:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sachin Joshi
								
							 
						 | 
						
							
							
							
							
								
							
							
								1d906ffa82
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into match-file-name
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/web/media_proxy/media_proxy_controller.ex 
							
						 | 
						
							2019-07-15 21:30:56 +05:45 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								fa17879c20
								
							
						 | 
						
							
							
								
								added tests for Web.MediaProxy
							
							
							
							
							
						 | 
						
							2019-07-14 21:01:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sachin Joshi
								
							 
						 | 
						
							
							
							
							
								
							
							
								f8e3ae6154
								
							
						 | 
						
							
							
								
								try to always match the filename for proxy url
							
							
							
							
							
						 | 
						
							2019-07-12 22:56:14 +05:45 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sachin Joshi
								
							 
						 | 
						
							
							
							
							
								
							
							
								6a6c4d134b
								
							
						 | 
						
							
							
								
								preserve the original path/filename (no encoding/decoding) for proxy
							
							
							
							
							
						 | 
						
							2019-07-12 21:05:01 +05:45 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sachin Joshi
								
							 
						 | 
						
							
							
							
							
								
							
							
								f5ad430974
								
							
						 | 
						
							
							
								
								make sure the url used by proxy is same as origin url
							
							
							
							
							
							
							
							encoding or decoding it breaks some of the signed url 
							
						 | 
						
							2019-07-07 14:13:40 +05:45 | 
						
						
							
							
							
								
							
							
						 |