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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								226fa3e486 
								
							 
						 
						
							
							
								
								Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter  
							
							
							
						 
						
							2020-09-17 22:10:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7cdbd91d83 
								
							 
						 
						
							
							
								
								[ #2497 ] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.  
							
							
							
						 
						
							2020-09-17 17:13:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2f155fb89f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream  
							
							
							
						 
						
							2020-09-15 20:29:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								0b5e72ecf0 
								
							 
						 
						
							
							
								
								Remove :managed_config option.  
							
							... 
							
							
							
							In practice, it was already removed half a year ago, but the description
 and cheatsheet entries were still there.
The migration intentionally does not use ConfigDB.get_by_params, since
this will break migration code as soon as we add a new field is added
 to ConfigDB.
Closes  #2086  
							
						 
						
							2020-09-14 18:04:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								0bda85857e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/instances/instance.ex 
							
						 
						
							2020-09-11 17:19:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								2c2094d4b2 
								
							 
						 
						
							
							
								
								configurable lifetime for ephemeral activities  
							
							
							
						 
						
							2020-09-10 21:51:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								629a8de9cb 
								
							 
						 
						
							
							
								
								deprecation warning  
							
							... 
							
							
							
							changed namespace for activity expiration configuration 
							
						 
						
							2020-09-10 21:50:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								9bf1065a06 
								
							 
						 
						
							
							
								
								schedule activity expiration in Oban  
							
							
							
						 
						
							2020-09-10 21:50:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7dd986a563 
								
							 
						 
						
							
							
								
								expire mfa tokens  through Oban  
							
							
							
						 
						
							2020-09-10 16:01:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3ce658b930 
								
							 
						 
						
							
							
								
								schedule expired oauth tokens deletion with Oban  
							
							
							
						 
						
							2020-09-10 16:01:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4ee99dafcc 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into media-preview-proxy  
							
							
							
						 
						
							2020-09-09 11:11:36 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								14d07081fd 
								
							 
						 
						
							
							
								
								Feed provider only generates a redirect, so always activate it.  
							
							... 
							
							
							
							Making this configurable is misleading. 
							
						 
						
							2020-09-08 20:21:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								630444ee08 
								
							 
						 
						
							
							
								
								Do not make RelMe metadata provider optional.  
							
							... 
							
							
							
							There's really no sound reason to turn this off anyway. 
							
						 
						
							2020-09-08 20:21:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								788dececff 
								
							 
						 
						
							
							
								
								test: remove extraneous :instances_favicons config bits  
							
							
							
						 
						
							2020-09-08 16:32:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								696bf09433 
								
							 
						 
						
							
							
								
								passing adapter options directly without adapter key  
							
							
							
						 
						
							2020-09-07 19:59:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a83916fdac 
								
							 
						 
						
							
							
								
								adapter options unification  
							
							... 
							
							
							
							not needed options deletion 
							
						 
						
							2020-09-07 19:59:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ee67c98e55 
								
							 
						 
						
							
							
								
								removing Stats worker from Oban cron jobs  
							
							
							
						 
						
							2020-09-07 19:16:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								f170d47130 
								
							 
						 
						
							
							
								
								[ #2497 ] Adjusted media proxy preview invalidation. Allowed client-side caching for media preview. Adjusted prewarmer to fetch only proxiable URIs.  
							
							... 
							
							
							
							Removed :preview pool in favor of existing :media one. Misc. refactoring. 
							
						 
						
							2020-09-05 20:19:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								b529616e11 
								
							 
						 
						
							
							
								
								Increase pool and timeout for preview so it catches slow media pool responses  
							
							
							
						 
						
							2020-09-03 15:08:12 -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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								85446cc30c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into media-preview-proxy  
							
							
							
						 
						
							2020-09-03 10:34:06 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								19691389b9 
								
							 
						 
						
							
							
								
								Rich media: Add failure tracking  
							
							
							
						 
						
							2020-09-02 14:59:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c17d83cd73 
								
							 
						 
						
							
							
								
								improvements and fixes for http requests  
							
							... 
							
							
							
							- fix for gun worker termination in some circumstances
- pool for http clients (ex_aws, tzdata)
- default pool timeouts for gun
- gun retries on gun_down messages
- s3 upload timeout if streaming enabled 
							
						 
						
							2020-09-02 09:04:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								899ea2da3e 
								
							 
						 
						
							
							
								
								Switch to imagemagick, only support videos  
							
							
							
						 
						
							2020-08-25 17:18:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								479578b148 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feld-2168-media-preview-proxy  
							
							
							
						 
						
							2020-08-25 11:57:23 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6d6e43fd09 
								
							 
						 
						
							
							
								
								Description: Update description.  
							
							
							
						 
						
							2020-08-25 11:49:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c1d51944c7 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads  
							
							
							
						 
						
							2020-08-25 11:44:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Angelina Filippova 
								
							 
						 
						
							
							
							
							
								
							
							
								6e5678b5af 
								
							 
						 
						
							
							
								
								Add Pleroma.Web.Preload to description.exs  
							
							
							
						 
						
							2020-08-24 22:43:37 +03: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 
								
							 
						 
						
							
							
							
							
								
							
							
								4ee15e991e 
								
							 
						 
						
							
							
								
								[ #2497 ] Media preview proxy config refactoring & documentation.  
							
							
							
						 
						
							2020-08-19 21:36:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								3d5d8c05c9 
								
							 
						 
						
							
							
								
								Merge branch '2064-image-blanking' into 'develop'  
							
							... 
							
							
							
							Resolve "Make default image description blank"
Closes  #2064 
See merge request pleroma/pleroma!2899  
							
						 
						
							2020-08-18 19:02:33 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								83cef25794 
								
							 
						 
						
							
							
								
								Merge branch 'chore/improve-descriptions' into 'develop'  
							
							... 
							
							
							
							Improve description for mediaproxy cache invalidation settings
See merge request pleroma/pleroma!2891  
							
						 
						
							2020-08-18 12:56:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								52a79506c7 
								
							 
						 
						
							
							
								
								Test config: Default to filename for descriptions  
							
							
							
						 
						
							2020-08-18 14:37:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								aabc26a573 
								
							 
						 
						
							
							
								
								Pleroma.Upload: Set default upload name / description based on config.  
							
							
							
						 
						
							2020-08-18 13:21:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6c3130ef47 
								
							 
						 
						
							
							
								
								Improve description for mediaproxy cache invalidation settings  
							
							
							
						 
						
							2020-08-14 13:07:58 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								95529ab709 
								
							 
						 
						
							
							
								
								[ #2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).  
							
							
							
						 
						
							2020-08-14 20:55:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								dfc56de167 
								
							 
						 
						
							
							
								
								Merge branch 'feature/update-welcome-setting-in-description' into 'develop'  
							
							... 
							
							
							
							Update :welcome settings in description.exs
Closes  #2024 
See merge request pleroma/pleroma!2843  
							
						 
						
							2020-08-12 16:18:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2def3cbf41 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy  
							
							... 
							
							
							
							# Conflicts:
#	config/config.exs
#	mix.lock 
							
						 
						
							2020-08-11 15:13:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d0fc48ea67 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'feat/floki-fast-html-2'  
							
							... 
							
							
							
							# Conflicts:
#   config/config.exs 
							
						 
						
							2020-08-09 10:53:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								54e2af8293 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into fix/ldap-auth-issues  
							
							
							
						 
						
							2020-08-07 14:55:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Angelina Filippova 
								
							 
						 
						
							
							
							
							
								
							
							
								f21b6ebd5d 
								
							 
						 
						
							
							
								
								Merge branch 'feature/update-welcome-setting-in-description' of git.pleroma.social:pleroma/pleroma into feature/update-welcome-setting-in-description  
							
							
							
						 
						
							2020-08-07 21:05:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Angelina Filippova 
								
							 
						 
						
							
							
							
							
								
							
							
								8e1f7a3eff 
								
							 
						 
						
							
							
								
								Add new image type to settings whose values are image urls  
							
							
							
						 
						
							2020-08-07 21:04:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								325c7c924b 
								
							 
						 
						
							
							
								
								Make Floki use fast_html  
							
							
							
						 
						
							2020-08-07 16:45:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3f88366e2a 
								
							 
						 
						
							
							
								
								Apply 1 suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2020-08-07 11:07:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								8e90cc58e7 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/update-welcome-setting-in-description  
							
							
							
						 
						
							2020-08-07 09:48:34 +03:00