Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2011142ed9 
								
							 
						 
						
							
							
								
								Use :restrict_unauthenticated testing for more granular control  
							
							
							
						 
						
							2020-09-08 20:21:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								a85ed6defb 
								
							 
						 
						
							
							
								
								Do not serve RSS/Atom feeds when instance is private  
							
							
							
						 
						
							2020-09-08 20:21:34 +03: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 
								
							 
						 
						
							
							
							
							
								
							
							
								ff07014b26 
								
							 
						 
						
							
							
								
								Disable providers of user and status metadata when instance is private  
							
							
							
						 
						
							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 
								
							 
						 
						
							
							
							
							
								
							
							
								947ee55ae2 
								
							 
						 
						
							
							
								
								user: harden get_friends_query(), get_followers_query() and their wrappers  
							
							
							
						 
						
							2020-09-08 20:21:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								16c451f8f1 
								
							 
						 
						
							
							
								
								search: Apply following filter only when user is usable  
							
							
							
						 
						
							2020-09-08 20:21:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								10ef532c63 
								
							 
						 
						
							
							
								
								AP C2S: Restrict character limit on Note  
							
							
							
						 
						
							2020-09-08 20:21:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								a781ac6ca5 
								
							 
						 
						
							
							
								
								Fix atom leak in AdminAPIController  
							
							
							
						 
						
							2020-09-08 20:21:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								27c3973b78 
								
							 
						 
						
							
							
								
								Merge branch 'temp-hackney-fix' into 'develop'  
							
							... 
							
							
							
							temp hackney fix
See merge request pleroma/pleroma!2951  
							
						 
						
							2020-09-08 19:45:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								7490b76bbf 
								
							 
						 
						
							
							
								
								Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'  
							
							... 
							
							
							
							Skip processing webp image files because we can't strip EXIF
Closes  #2080 
See merge request pleroma/pleroma!2924  
							
						 
						
							2020-09-08 19:45:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								921f926e96 
								
							 
						 
						
							
							
								
								Remove OStatus in testsuite  
							
							
							
						 
						
							2020-09-08 18:43:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ee0e05f930 
								
							 
						 
						
							
							
								
								Drop unused "inReplyToAtomUri" in objects  
							
							
							
						 
						
							2020-09-08 18:43:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								87d2805791 
								
							 
						 
						
							
							
								
								combo fixes  
							
							
							
						 
						
							2020-09-08 17:40:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								21efda2edb 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted  
							
							
							
						 
						
							2020-09-08 09:31:26 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								0a05670b44 
								
							 
						 
						
							
							
								
								Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'  
							
							... 
							
							
							
							Skip processing webp image files because we can't strip EXIF
Closes  #2080 
See merge request pleroma/pleroma!2924  
							
						 
						
							2020-09-08 12:21:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4b76d7ce67 
								
							 
						 
						
							
							
								
								Merge branch 'fix/admin-controller-atom-leak' into 'develop'  
							
							... 
							
							
							
							Fix atom leak in AdminAPIController
See merge request pleroma/secteam/pleroma!6 
							
						 
						
							2020-09-08 14:00:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9b85592b8b 
								
							 
						 
						
							
							
								
								Merge branch 'fix/rich-media-fake-statuses' into 'develop'  
							
							... 
							
							
							
							Rich Media: Do not cache URLs for preview statuses
Closes  #1987 
See merge request pleroma/pleroma!2956  
							
						 
						
							2020-09-08 13:56:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								964bc8e2e8 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/favicon-too-long' into 'develop'  
							
							... 
							
							
							
							instance: Drop favicon URLs longer than 255 characters
Closes  #2116 
See merge request pleroma/pleroma!2949  
							
						 
						
							2020-09-08 13:55:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								43b07c31cb 
								
							 
						 
						
							
							
								
								Merge branch 'fix/2095-deactivated-account-reset' into 'develop'  
							
							... 
							
							
							
							Disallow password resets for deactivated accounts
Closes  #2095 
See merge request pleroma/pleroma!2935  
							
						 
						
							2020-09-08 13:53:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								dccbed856d 
								
							 
						 
						
							
							
								
								Merge branch 'http-fixes' into 'develop'  
							
							... 
							
							
							
							Improvements and fixes for http requests
See merge request pleroma/pleroma!2904  
							
						 
						
							2020-09-08 13:53:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ea4b6c64d6 
								
							 
						 
						
							
							
								
								Merge branch 'feat/rich-media-improvements' into 'develop'  
							
							... 
							
							
							
							Rich media improvements
See merge request pleroma/pleroma!2944  
							
						 
						
							2020-09-08 13:00:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								8c3241df44 
								
							 
						 
						
							
							
								
								Merge branch 'fix/2047-rich-media-parser' into 'develop'  
							
							... 
							
							
							
							RichMedia parser fix
Closes  #2047 
See merge request pleroma/pleroma!2941  
							
						 
						
							2020-09-08 13:00:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								13e606941c 
								
							 
						 
						
							
							
								
								Merge branch 'fix/2087-metadata' into 'develop'  
							
							... 
							
							
							
							Fix/2087 metadata
See merge request pleroma/secteam/pleroma!11 
							
						 
						
							2020-09-08 12:55:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								74d46a1b09 
								
							 
						 
						
							
							
								
								Merge branch 'secfix/search-crash' into 'develop'  
							
							... 
							
							
							
							Fix crash done via search
See merge request pleroma/secteam/pleroma!12 
							
						 
						
							2020-09-08 12:53:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								84acfab156 
								
							 
						 
						
							
							
								
								Merge branch 'fix-searching-following' into 'develop'  
							
							... 
							
							
							
							search: fix 'following' query parameter
See merge request pleroma/pleroma!2943  
							
						 
						
							2020-09-08 12:53:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								718c7cc847 
								
							 
						 
						
							
							
								
								Merge branch 'fix/apc2s-limits' into 'develop'  
							
							... 
							
							
							
							AP C2S: Restrict character limit on Note
Closes  #2 
See merge request pleroma/secteam/pleroma!9 
							
						 
						
							2020-09-08 12:51:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4ea07f74e9 
								
							 
						 
						
							
							
								
								Revert/simplify.  
							
							... 
							
							
							
							We only need to check the content-type. There's no chance a webp file
will get mismatched as another image type. 
							
						 
						
							2020-09-08 12:29:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								216c84a8f4 
								
							 
						 
						
							
							
								
								Bypass the filter based on content-type as well in case a webp image is uploaded with the wrong file extension.  
							
							
							
						 
						
							2020-09-08 12:29:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2165a24974 
								
							 
						 
						
							
							
								
								Improve upload filter return values so we can identify when filters make no changes to the input  
							
							
							
						 
						
							2020-09-08 12:29:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								fa347b9c2f 
								
							 
						 
						
							
							
								
								Fix uploading webp image files when Exiftool Upload Filter is enabled  
							
							
							
						 
						
							2020-09-08 12:29:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								95688c90ad 
								
							 
						 
						
							
							
								
								ForceBotUnlistedPolicy: simplify code  
							
							
							
						 
						
							2020-09-08 01:15:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								8b695c3eeb 
								
							 
						 
						
							
							
								
								ForceBotUnlistedPolicy: format  
							
							
							
						 
						
							2020-09-07 22:53:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								699224a900 
								
							 
						 
						
							
							
								
								ForceBotUnlistedPolicy: initial add, tiny clean up from my previous version  
							
							
							
						 
						
							2020-09-07 22:15:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								18d21aed00 
								
							 
						 
						
							
							
								
								deprecation warnings  
							
							
							
						 
						
							2020-09-07 19:59:17 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6c6de8e5df 
								
							 
						 
						
							
							
								
								Merge branch 'temp-hackney-fix' into 'develop'  
							
							... 
							
							
							
							temp hackney fix
See merge request pleroma/pleroma!2951  
							
						 
						
							2020-09-07 12:47:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d5c286b802 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/favicon-too-long' into 'develop'  
							
							... 
							
							
							
							instance: Drop favicon URLs longer than 255 characters
Closes  #2116 
See merge request pleroma/pleroma!2949  
							
						 
						
							2020-09-07 11:12:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fdab01ab56 
								
							 
						 
						
							
							
								
								Merge branch 'fix/rich-media-fake-statuses' into 'develop'  
							
							... 
							
							
							
							Rich Media: Do not cache URLs for preview statuses
Closes  #1987 
See merge request pleroma/pleroma!2956  
							
						 
						
							2020-09-07 10:19:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								08aef7dd4e 
								
							 
						 
						
							
							
								
								instance: Log catch favicon errors as warnings  
							
							
							
						 
						
							2020-09-07 08:40:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								917d325972 
								
							 
						 
						
							
							
								
								added api spec  
							
							
							
						 
						
							2020-09-07 07:17:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								5ae56aafb2 
								
							 
						 
						
							
							
								
								added import mutes  
							
							
							
						 
						
							2020-09-06 21:42:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								563718cab9 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into media-preview-proxy  
							
							
							
						 
						
							2020-09-06 08:15:34 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								170599c390 
								
							 
						 
						
							
							
								
								RichMedia: do not log webpages missing metadata as errors  
							
							... 
							
							
							
							Also fixes the return value of Parser.parse on errors, previously
was just `:ok` due to the logger call in the end 
							
						 
						
							2020-09-05 22:05:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								129a2f48df 
								
							 
						 
						
							
							
								
								ConnectionPool middleware: handle connection opening errors  
							
							
							
						 
						
							2020-09-05 21:36:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9d6aca5bee 
								
							 
						 
						
							
							
								
								ConnectionPool: fix the previous hotfix  
							
							... 
							
							
							
							I rushed the hotfix and forgot how `pop_in` actually works,
I want to die. We need some integration tests for the HTTP client 
							
						 
						
							2020-09-05 21:27:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5298de3be6 
								
							 
						 
						
							
							
								
								ConnectionPool middleware: fix a crash due to unimplemented behaviour  
							
							... 
							
							
							
							Structs don't implement Access behaviour, so this crashed. Tests didn't
catch it and I didn't test that part of the codepath. Very sorry 
							
						 
						
							2020-09-05 21:17:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e198ba492e 
								
							 
						 
						
							
							
								
								Rich Media: Do not cache URLs for preview statuses  
							
							... 
							
							
							
							Closes  #1987  
						
							2020-09-05 20:53:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								88a6ee4a59 
								
							 
						 
						
							
							
								
								[ #2497 ] Func defs grouping fix.  
							
							
							
						 
						
							2020-09-05 20:23:18 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								c3b02341bf 
								
							 
						 
						
							
							
								
								[ #2497 ] Made media preview proxy fall back to media proxy instead of to source url. Adjusted tests. Refactoring.  
							
							
							
						 
						
							2020-09-05 16:16:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0d91f65284 
								
							 
						 
						
							
							
								
								Prevent AccountView and instance.get_or_update_favicon fails  
							
							
							
						 
						
							2020-09-05 05:43:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								10da13c713 
								
							 
						 
						
							
							
								
								ConnectionPool middleware: Fix connection leak on ReverseProxy redirects  
							
							... 
							
							
							
							Requires a patched Tesla due to upstream not saving opts between
redirects, patch submitted at https://github.com/teamon/tesla/pull/414  
							
						 
						
							2020-09-04 22:10:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								473458b0fb 
								
							 
						 
						
							
							
								
								fix for ReverseProxy  
							
							
							
						 
						
							2020-09-04 14:45:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8bd2b6eb13 
								
							 
						 
						
							
							
								
								temp hackney fix  
							
							
							
						 
						
							2020-09-04 14:24:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d34fe2840d 
								
							 
						 
						
							
							
								
								HTTP: radically simplify pool checkin/checkout  
							
							... 
							
							
							
							Use a custom tesla middleware instead of adapter helper function +
custom redirect middleware.
This will also fix "Client died before releasing the connection"
messages when the request pool is overloaded. Since the checkout is
now done after passing ConcurrentLimiter.
This is technically less efficient, since the connection needs to be
checked in/out every time the middleware is left or entered respectively.
But I don't think the nanoseconds we might lose on redirects
to the same host are worth the complexity. 
							
						 
						
							2020-09-03 23:44:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f25b0e87f3 
								
							 
						 
						
							
							
								
								URL passed to helper is already MediaProxy  
							
							... 
							
							
							
							Set :preview pool on the request 
							
						 
						
							2020-09-03 15:28:57 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								85446cc30c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into media-preview-proxy  
							
							
							
						 
						
							2020-09-03 10:34:06 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9433311923 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/incoming-poll-emoji' into 'develop'  
							
							... 
							
							
							
							Fix emoji in Question, force generated context/context_id insertion
Closes  #1870 
See merge request pleroma/pleroma!2915  
							
						 
						
							2020-09-03 11:50:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f26b580e80 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into seanking/pleroma-fix_install_fe_bug  
							
							
							
						 
						
							2020-09-03 11:29:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								d1a6f67b1d 
								
							 
						 
						
							
							
								
								Merge branch 'fix/2095-deactivated-account-reset' into 'develop'  
							
							... 
							
							
							
							Disallow password resets for deactivated accounts
Closes  #2095 
See merge request pleroma/pleroma!2935  
							
						 
						
							2020-09-02 17:11:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0ab03e8564 
								
							 
						 
						
							
							
								
								Merge branch 'fix/1991-tzdata-update' into 'develop'  
							
							... 
							
							
							
							user agent if Endpoint is not started yet
Closes  #1991 
See merge request pleroma/pleroma!2945  
							
						 
						
							2020-09-02 17:09:55 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								119e11f455 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/mastoapi-lists' into 'develop'  
							
							... 
							
							
							
							Fix removing an account from a list
Closes  #2103 
See merge request pleroma/pleroma!2940  
							
						 
						
							2020-09-02 17:03:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								581f382e71 
								
							 
						 
						
							
							
								
								ListController: DRY up stuff.  
							
							
							
						 
						
							2020-09-02 18:32:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								cbf7f0e029 
								
							 
						 
						
							
							
								
								Disallow password resets for deactivated accounts.  
							
							... 
							
							
							
							Ensure all responses to password reset events are identical. 
							
						 
						
							2020-09-02 09:09:13 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d48fc90978 
								
							 
						 
						
							
							
								
								StatusView: Start fetching rich media cards as soon as possible  
							
							
							
						 
						
							2020-09-02 16:45:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a11f23c130 
								
							 
						 
						
							
							
								
								user agent if Endpoint is not started yet  
							
							
							
						 
						
							2020-09-02 15:45:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								19691389b9 
								
							 
						 
						
							
							
								
								Rich media: Add failure tracking  
							
							
							
						 
						
							2020-09-02 14:59:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								46236d1d87 
								
							 
						 
						
							
							
								
								html.ex: optimize external url extraction  
							
							... 
							
							
							
							By using a :not() selector and only extracting attributes from the
first match. 
							
						 
						
							2020-09-02 12:45:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								47ff425cfd 
								
							 
						 
						
							
							
								
								Merge branch 'fix/2047-rich-media-parser' into 'develop'  
							
							... 
							
							
							
							RichMedia parser fix
Closes  #2047 
See merge request pleroma/pleroma!2941  
							
						 
						
							2020-09-02 09:38:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b2d776d77d 
								
							 
						 
						
							
							
								
								Merge branch 'http-fixes' into 'develop'  
							
							... 
							
							
							
							Improvements and fixes for http requests
See merge request pleroma/pleroma!2904  
							
						 
						
							2020-09-02 09:36:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								84fbf16161 
								
							 
						 
						
							
							
								
								timeout option moved to gun adapter helper  
							
							
							
						 
						
							2020-09-02 10:50:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1c57ef4498 
								
							 
						 
						
							
							
								
								default pool for tz_data client  
							
							
							
						 
						
							2020-09-02 10:33:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								79f65b4374 
								
							 
						 
						
							
							
								
								correct pool and uniform headers format  
							
							
							
						 
						
							2020-09-02 09:16:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5e8adf91b4 
								
							 
						 
						
							
							
								
								don't overwrite passed pool option in http clients  
							
							
							
						 
						
							2020-09-02 09:04:23 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karol Kosek 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								868057871a 
								
							 
						 
						
							
							
								
								search: fix 'following' query parameter  
							
							... 
							
							
							
							The parameter included the accounts that are following you (followers)
instead of those you are actually following.
Co-Authored-By: Haelwenn (lanodan) Monnier <contact@hacktivis.me> 
							
						 
						
							2020-09-02 02:08:43 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
							
							
								
							
							
								0a9c63fb43 
								
							 
						 
						
							
							
								
								Fix frontend install mix task bug  
							
							
							
						 
						
							2020-09-01 12:20:32 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								03d06062ab 
								
							 
						 
						
							
							
								
								don't fail on url fetch  
							
							
							
						 
						
							2020-09-01 19:39:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d872858046 
								
							 
						 
						
							
							
								
								Fix removing an account from a list  
							
							... 
							
							
							
							Mastodon (Frontend) changed a different method for deletes,
keeping old format as mastodon documentation is too loose 
							
						 
						
							2020-09-01 12:49:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								126461942b 
								
							 
						 
						
							
							
								
								User table: ensure bio is always a string  
							
							... 
							
							
							
							Gets rid of '|| ""' in multiple places and fixes  #2067  
							
						 
						
							2020-09-01 10:45:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d9a21e4784 
								
							 
						 
						
							
							
								
								fetcher: Remove fix_object call for Question activities  
							
							
							
						 
						
							2020-09-01 08:35:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b960cede9a 
								
							 
						 
						
							
							
								
								common_fixes: Force inserting context and context_id  
							
							
							
						 
						
							2020-09-01 08:35:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a142da3e4f 
								
							 
						 
						
							
							
								
								Add new Emoji Ecto.Type and fix emoji in Question  
							
							
							
						 
						
							2020-09-01 08:34:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2ecc7d9230 
								
							 
						 
						
							
							
								
								transmogrifier: Remove mastodon emoji-format from emoji field  
							
							
							
						 
						
							2020-09-01 08:29:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								dc3a418c27 
								
							 
						 
						
							
							
								
								application.ex: disable warnings_as_errors at runtime  
							
							... 
							
							
							
							see changed files for rationale 
							
						 
						
							2020-09-01 09:08:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								9d63b2c9db 
								
							 
						 
						
							
							
								
								Merge branch 'chat-relation-constraints' into 'develop'  
							
							... 
							
							
							
							Chats: Add cascading delete on both referenced users.
See merge request pleroma/pleroma!2934  
							
						 
						
							2020-08-31 20:55:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0b621a834a 
								
							 
						 
						
							
							
								
								Chats: Add cascading delete on both referenced users.  
							
							... 
							
							
							
							Also remove the now-superfluous join in the chat controller,
which was only used to filter out these cases. 
							
						 
						
							2020-08-31 16:48:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								0a839d51a7 
								
							 
						 
						
							
							
								
								[ #2497 ] Added Cache-Control response header for media proxy preview endpoint.  
							
							
							
						 
						
							2020-08-31 13:08:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d91c4feebe 
								
							 
						 
						
							
							
								
								Notification: Small refactor.  
							
							
							
						 
						
							2020-08-31 11:02:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3737f38432 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feld-2168-media-preview-proxy  
							
							
							
						 
						
							2020-08-30 11:28:45 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4ef210a587 
								
							 
						 
						
							
							
								
								Credo  
							
							
							
						 
						
							2020-08-30 09:32:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2d2af75777 
								
							 
						 
						
							
							
								
								Support PNG previews to preserve alpha channels  
							
							
							
						 
						
							2020-08-30 09:17:24 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
							
							
								
							
							
								24d522c3b3 
								
							 
						 
						
							
							
								
								QtFastStart: optimize  
							
							... 
							
							
							
							~4-6x faster
~3~4x memory usage reduction (now mostly adds what we are rewriting in
the metadatas) 
							
						 
						
							2020-08-29 13:05:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
							
							
								
							
							
								dfceb03cf4 
								
							 
						 
						
							
							
								
								Rewrite MP4/MOV binaries to be faststart  
							
							... 
							
							
							
							In some cases, MP4/MOV files can have the data _before_ the meta-data.
Thus, ffmpeg (and all similar tools) cannot really process the input if
it's given over stdin/streaming/pipes.
BUT I REALLY DON'T WANT TO MAKE TEMPORARY FILES
so here we go, an implementation of qtfaststart in elixir. 
							
						 
						
							2020-08-28 21:14:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								f0fefc4f5c 
								
							 
						 
						
							
							
								
								marks notifications as read after mute  
							
							
							
						 
						
							2020-08-28 18:17:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4e022fc16c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0  
							
							
							
						 
						
							2020-08-28 11:33:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								5b4d483f52 
								
							 
						 
						
							
							
								
								Add a note about the avatars and banners situation  
							
							
							
						 
						
							2020-08-27 17:28:21 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								67c79394e8 
								
							 
						 
						
							
							
								
								Support static avatars and header images with Mediaproxy Preview  
							
							
							
						 
						
							2020-08-27 17:15:23 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3a5231ec8f 
								
							 
						 
						
							
							
								
								Keep args construction within video/image scopes instead of mangling down in fifo town  
							
							
							
						 
						
							2020-08-27 16:33:37 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								dd1de994d5 
								
							 
						 
						
							
							
								
								Try to trick ffmpeg into working with this named pipe  
							
							
							
						 
						
							2020-08-27 13:10:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f1218a2b4e 
								
							 
						 
						
							
							
								
								ffmpeg needs input from fifo path, not stdin  
							
							
							
						 
						
							2020-08-27 12:47:29 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ef9d12fcc5 
								
							 
						 
						
							
							
								
								Attempt at supporting video thumbnails via ffmpeg  
							
							
							
						 
						
							2020-08-27 12:31:55 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								6b01a09a08 
								
							 
						 
						
							
							
								
								Merge branch '2078-list-fixes' into 'develop'  
							
							... 
							
							
							
							Resolve "List timeline returns incorrectly assigned Account for replies and repeats"
Closes  #2070  and #2078 
See merge request pleroma/pleroma!2923  
							
						 
						
							2020-08-27 17:05:53 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								82bf27172c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0  
							
							
							
						 
						
							2020-08-27 15:38:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								78939c1d16 
								
							 
						 
						
							
							
								
								ChatController: Don't die if the recipient is gone.  
							
							
							
						 
						
							2020-08-27 12:13:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								697bea0473 
								
							 
						 
						
							
							
								
								Move arg for images to the list so we can reuse these fifo functions for videos  
							
							
							
						 
						
							2020-08-26 17:43:25 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9567b96c79 
								
							 
						 
						
							
							
								
								Rename to make it obvious this is for images not videos  
							
							
							
						 
						
							2020-08-26 16:40:13 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2cfe2dc81b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feld-2168-media-preview-proxy  
							
							
							
						 
						
							2020-08-26 16:37:57 -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 
								
							 
						 
						
							
							
							
							
								
							
							
								2c95533ead 
								
							 
						 
						
							
							
								
								Change method of convert using stdout, make progressive jpegs  
							
							
							
						 
						
							2020-08-26 15:37:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d4d1192341 
								
							 
						 
						
							
							
								
								Remove auto-orient; don't use it on previews, only originals  
							
							
							
						 
						
							2020-08-26 14:28:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
							
							
								
							
							
								bc94f0c6da 
								
							 
						 
						
							
							
								
								Use mkfifo to feed ImageMagick  
							
							
							
						 
						
							2020-08-26 16:12:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cfc99fe05c 
								
							 
						 
						
							
							
								
								TimelineController: Keys are atoms now.  
							
							... 
							
							
							
							Closes  #2078 
Closes  #2070  
						
							2020-08-26 15:37:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fc42446755 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0  
							
							
							
						 
						
							2020-08-26 13:17:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								a136e7e9b5 
								
							 
						 
						
							
							
								
								Try specifying fd0, force jpg out  
							
							
							
						 
						
							2020-08-25 18:10:27 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								afa03ca8e2 
								
							 
						 
						
							
							
								
								Allow both stdin and stdout  
							
							
							
						 
						
							2020-08-25 17:36:53 -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 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								fb33321fa2 
								
							 
						 
						
							
							
								
								Merge branch 'feature/1952-read-muted-notifications' into 'develop'  
							
							... 
							
							
							
							Automatically mark notifications about statuses from muted users and threads as read
Closes  #1952 
See merge request pleroma/pleroma!2893  
							
						 
						
							2020-08-25 21:32:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								479578b148 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feld-2168-media-preview-proxy  
							
							
							
						 
						
							2020-08-25 11:57:23 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								112bec5225 
								
							 
						 
						
							
							
								
								Webfinger: Handle bogus ids better.  
							
							
							
						 
						
							2020-08-25 17:35:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ea2b5c07e3 
								
							 
						 
						
							
							
								
								Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0  
							
							
							
						 
						
							2020-08-25 15:38:12 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								b267b751d4 
								
							 
						 
						
							
							
								
								Apply 1 suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2020-08-25 05:38:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								d39abd02ac 
								
							 
						 
						
							
							
								
								Merge branch 'relay-fix-admin-fe' into 'develop'  
							
							... 
							
							
							
							Relay fix for admin-fe
See merge request pleroma/pleroma!2902  
							
						 
						
							2020-08-24 17:03:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								14ec12ac95 
								
							 
						 
						
							
							
								
								added tests  
							
							
							
						 
						
							2020-08-24 15:01:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								98f8851f29 
								
							 
						 
						
							
							
								
								Use the image thumbnail for rich metadata (OGP/Twittercards)  
							
							
							
						 
						
							2020-08-22 15:12:11 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								0922791e4d 
								
							 
						 
						
							
							
								
								updated errors on add emoji  
							
							
							
						 
						
							2020-08-22 10:56:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								f5845ff033 
								
							 
						 
						
							
							
								
								upload emoji zip file  
							
							
							
						 
						
							2020-08-22 10:42:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
							
							
								
							
							
								edde0d9b54 
								
							 
						 
						
							
							
								
								Remove newline for linter  
							
							
							
						 
						
							2020-08-21 17:40:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4e6eb22b4a 
								
							 
						 
						
							
							
								
								Try to warm the cache with the preview image if preview proxy enabled  
							
							
							
						 
						
							2020-08-21 12:19:35 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
							
							
								
							
							
								967afa064b 
								
							 
						 
						
							
							
								
								Fix truncated images  
							
							
							
						 
						
							2020-08-21 17:02:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e1c8c599ff 
								
							 
						 
						
							
							
								
								Merge branch 'features/validators-event' into 'develop'  
							
							... 
							
							
							
							Pipeline Ingestion: Event
See merge request pleroma/pleroma!2909  
							
						 
						
							2020-08-21 16:10:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1f8c32b773 
								
							 
						 
						
							
							
								
								adding actor type in user show  
							
							
							
						 
						
							2020-08-21 10:38:56 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								36c125a071 
								
							 
						 
						
							
							
								
								Pipeline Ingestion: Event  
							
							
							
						 
						
							2020-08-20 21:49:26 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9aae342e7a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio2  
							
							
							
						 
						
							2020-08-19 14:10:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4727030f59 
								
							 
						 
						
							
							
								
								fixes for mix tasks  
							
							... 
							
							
							
							- fix for `mix pleroma.database update_users_following_followers_counts`
- raise error, if fetch was unsuccessful in emoji tasks
- fix for `pleroma.digest test` task 
							
						 
						
							2020-08-19 11:06:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7dc275b69b 
								
							 
						 
						
							
							
								
								relay fix for admin-fe  
							
							
							
						 
						
							2020-08-19 08:41:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								7794d7c694 
								
							 
						 
						
							
							
								
								added Pleroma.Web.PleromaAPI.EmojiFileController  
							
							
							
						 
						
							2020-08-19 06:50:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5316e231b0 
								
							 
						 
						
							
							
								
								Pipeline Ingestion: Audio (Part 2)  
							
							
							
						 
						
							2020-08-19 00:06:31 +02: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 
								
							 
						 
						
							
							
							
							
								
							
							
								3998ef9d64 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio  
							
							
							
						 
						
							2020-08-18 13:31:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								566749f77a 
								
							 
						 
						
							
							
								
								Merge branch 'purge-user' into 'develop'  
							
							... 
							
							
							
							Purge a local user upon deletion, fixes  #2062 
Closes  #2062 
See merge request pleroma/pleroma!2898  
							
						 
						
							2020-08-18 11:31:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								aabc26a573 
								
							 
						 
						
							
							
								
								Pleroma.Upload: Set default upload name / description based on config.  
							
							
							
						 
						
							2020-08-18 13:21:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								548ca43bcf 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators_use_ectotypes  
							
							
							
						 
						
							2020-08-18 12:38:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								72cbe20a58 
								
							 
						 
						
							
							
								
								Purge most user fields upon deletion, "right to be forgotten"  #859  
							
							
							
						 
						
							2020-08-17 23:44:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c12c576ee2 
								
							 
						 
						
							
							
								
								Also purge bio and display name  
							
							
							
						 
						
							2020-08-17 22:11:45 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d55faa2f8f 
								
							 
						 
						
							
							
								
								Purge a local user upon deletion,  fixes   #2062  
							
							
							
						 
						
							2020-08-17 21:52:28 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2f8c3c842d 
								
							 
						 
						
							
							
								
								common_fixes: Remove Utils.make_date call  
							
							
							
						 
						
							2020-08-18 02:24:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c9d6638461 
								
							 
						 
						
							
							
								
								common_fixes: Get fixes common from Audio and Question  
							
							
							
						 
						
							2020-08-18 02:24:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2bc08d5573 
								
							 
						 
						
							
							
								
								Pipeline Ingestion: Audio  
							
							
							
						 
						
							2020-08-18 02:02:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b1fc4fe0ca 
								
							 
						 
						
							
							
								
								fetcher: fallback to [] when to/cc is nil  
							
							... 
							
							
							
							Related: https://git.pleroma.social/pleroma/pleroma/-/issues/2063  
							
						 
						
							2020-08-18 02:02:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7a273087ed 
								
							 
						 
						
							
							
								
								object_validators: Use ecto_types where available  
							
							
							
						 
						
							2020-08-17 23:47:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								34b099fffa 
								
							 
						 
						
							
							
								
								Merge branch 'issue/1936' into 'develop'  
							
							... 
							
							
							
							[#1936 ] Ability to search for banned MediaProxy URLs 
See merge request pleroma/pleroma!2873  
							
						 
						
							2020-08-17 13:05:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e154fcf525 
								
							 
						 
						
							
							
								
								Merge branch '2046-default-restrict-unauthenticated-basing-on-instance-privacy' into 'develop'  
							
							... 
							
							
							
							[#2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy
Closes  #2046 
See merge request pleroma/pleroma!2890  
							
						 
						
							2020-08-17 12:26:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hugo Müller-Downing 
								
							 
						 
						
							
							
							
							
								
							
							
								317b6c6c52 
								
							 
						 
						
							
							
								
								Start :ssl if not started when running migration or rollback  
							
							
							
						 
						
							2020-08-17 17:34:03 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								25c69e271a 
								
							 
						 
						
							
							
								
								Make notifications about new statuses from muted threads read  
							
							
							
						 
						
							2020-08-17 00:11:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								f6da12f45d 
								
							 
						 
						
							
							
								
								fix search media proxy urls  
							
							
							
						 
						
							2020-08-16 06:54:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0865f36965 
								
							 
						 
						
							
							
								
								Mark notifications about statuses from muted users as read automatically  
							
							
							
						 
						
							2020-08-15 15:27:41 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								76ce3a1c9e 
								
							 
						 
						
							
							
								
								Mogrifun: Add a line about the purpose of the module.  
							
							
							
						 
						
							2020-08-14 18:27:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								9b055f7211 
								
							 
						 
						
							
							
								
								fix cron wroker  
							
							
							
						 
						
							2020-08-13 21:03:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								3515cb5c3a 
								
							 
						 
						
							
							
								
								fix Cron.PurgeExpiredActivitiesWorker  
							
							
							
						 
						
							2020-08-13 21:01:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								14a06e63f6 
								
							 
						 
						
							
							
								
								Merge branch 'fix/activity-expirations-again' into 'develop'  
							
							... 
							
							
							
							Fix activity expirations again
See merge request pleroma/pleroma!2866  
							
						 
						
							2020-08-13 17:38:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4f3c955f26 
								
							 
						 
						
							
							
								
								side_effects: Fix typo on notification  
							
							
							
						 
						
							2020-08-13 18:10:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								56470647de 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1936  
							
							
							
						 
						
							2020-08-13 09:00:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								29a7bcd5bb 
								
							 
						 
						
							
							
								
								reverting pinned posts in filtering  
							
							
							
						 
						
							2020-08-12 20:01:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3ab83f837e 
								
							 
						 
						
							
							
								
								don't load pinned activities in due_expirations  
							
							
							
						 
						
							2020-08-12 19:46:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								98058bd06e 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into fix/activity-expirations-again  
							
							
							
						 
						
							2020-08-12 09:42:28 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								f50c653c8d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy  
							
							
							
						 
						
							2020-08-12 17:13:01 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2e347e8286 
								
							 
						 
						
							
							
								
								ActivityPub: Remove reject, move everything to the Pipeline.  
							
							
							
						 
						
							2020-08-12 15:07:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7224bf309e 
								
							 
						 
						
							
							
								
								Transmogrifier: Move Rejects to the Pipeline  
							
							
							
						 
						
							2020-08-12 14:48:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								eec1ba232c 
								
							 
						 
						
							
							
								
								don't expire pinned posts  
							
							
							
						 
						
							2020-08-12 15:15:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bb92ad44a6 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject  
							
							
							
						 
						
							2020-08-12 12:53:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								76462efbfa 
								
							 
						 
						
							
							
								
								fix job monitor  
							
							
							
						 
						
							2020-08-11 22:06:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								500576dcb6 
								
							 
						 
						
							
							
								
								Linting fixes.  
							
							
							
						 
						
							2020-08-11 19:22:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								724ed354f2 
								
							 
						 
						
							
							
								
								Ensure only Note objects are set to expire  
							
							
							
						 
						
							2020-08-11 11:28:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0589e9156a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again  
							
							
							
						 
						
							2020-08-11 17:49:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								25bfee0d12 
								
							 
						 
						
							
							
								
								ActivityPub: Remove ActivityPub.accept  
							
							... 
							
							
							
							Switch to the pipeline in CommonAPI and SideEffects 
							
						 
						
							2020-08-11 17:43:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f988d82e46 
								
							 
						 
						
							
							
								
								Transmogrifier: Handle accepts with the pipeline  
							
							
							
						 
						
							2020-08-11 17:26:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3f6d50111e 
								
							 
						 
						
							
							
								
								Linter fixes.  
							
							
							
						 
						
							2020-08-11 16:07:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								da3f9b9988 
								
							 
						 
						
							
							
								
								Transmogrifier: Remove handling of orphaned accepts  
							
							... 
							
							
							
							This was a Mastodon 2.3 issue and has been fixed for a long time.
According to fediverse.networks, less than one percent of servers
still run a version this old or older. 
							
						 
						
							2020-08-11 15:41:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8b1e8bec2f 
								
							 
						 
						
							
							
								
								AcceptValidation: Codify accept rules.  
							
							
							
						 
						
							2020-08-11 15:32:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f1a0c10b17 
								
							 
						 
						
							
							
								
								AcceptValidator: Add basic validator with tests.  
							
							
							
						 
						
							2020-08-11 15:13:07 +02: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 
								
							 
						 
						
							
							
							
							
								
							
							
								8f9fbc86c0 
								
							 
						 
						
							
							
								
								Transmogrifier: Small readability changes.  
							
							
							
						 
						
							2020-08-11 14:02:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								686002164a 
								
							 
						 
						
							
							
								
								Merge branch '204-fix' into 'develop'  
							
							... 
							
							
							
							Fix 500 errors when returning :no_content, fixes  #2029 
Closes  #2029 
See merge request pleroma/pleroma!2856  
							
						 
						
							2020-08-11 09:18:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								677abbf0ee 
								
							 
						 
						
							
							
								
								Merge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again  
							
							
							
						 
						
							2020-08-11 10:55:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7e4932362b 
								
							 
						 
						
							
							
								
								SideEffects: Handle strange deletion case.  
							
							
							
						 
						
							2020-08-11 10:54:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								345ac512e4 
								
							 
						 
						
							
							
								
								added paginate+search for admin/MediaProxy URLs  
							
							
							
						 
						
							2020-08-11 10:30:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								78484fe0ef 
								
							 
						 
						
							
							
								
								Merge branch 'admin-active-filter' into 'develop'  
							
							... 
							
							
							
							Admin API: Filter out unapproved users when the `active` filter is on
Closes  #2037 
See merge request pleroma/pleroma!2872  
							
						 
						
							2020-08-10 17:16:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								024b7ce0b7 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into fix/activity-expirations-again  
							
							
							
						 
						
							2020-08-10 11:32:24 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								249f21dcbb 
								
							 
						 
						
							
							
								
								Admin API: Filter out unapproved users when the active filter is on  
							
							
							
						 
						
							2020-08-10 18:27:39 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								93fbf39954 
								
							 
						 
						
							
							
								
								Merge branch 'revert-a6d3bb5f' into 'develop'  
							
							... 
							
							
							
							Revert "Merge branch 'issue/1023' into 'develop'"
Closes  #2033 
See merge request pleroma/pleroma!2868  
							
						 
						
							2020-08-10 13:59:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								11fc90744c 
								
							 
						 
						
							
							
								
								Transmogrifier: Remove duplicate code.  
							
							
							
						 
						
							2020-08-10 15:31:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5c4548d5e7 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'issue/1023' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !2763  
							
						 
						
							2020-08-10 13:05:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								66122a11b5 
								
							 
						 
						
							
							
								
								AccountController: Build the correct update activity.  
							
							... 
							
							
							
							Will fix federation issues. 
							
						 
						
							2020-08-10 10:33:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e08ea01d09 
								
							 
						 
						
							
							
								
								Limit expirations for each cron execution to 50.  
							
							... 
							
							
							
							This should prevent servers from being crushed. 50/min is a pretty good rate. 
							
						 
						
							2020-08-08 12:49:02 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								cf4c97242b 
								
							 
						 
						
							
							
								
								Ensure we only expire Create activities with the Mix task  
							
							
							
						 
						
							2020-08-08 12:40:52 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e5557bf8ba 
								
							 
						 
						
							
							
								
								Add mix task to add expiration to all local statuses  
							
							
							
						 
						
							2020-08-08 16:29:40 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								54e2af8293 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into fix/ldap-auth-issues  
							
							
							
						 
						
							2020-08-07 14:55:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								474147a67a 
								
							 
						 
						
							
							
								
								Make a new function instead of overloading register_changeset/3  
							
							
							
						 
						
							2020-08-07 14:54:14 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								673e8e3ac1 
								
							 
						 
						
							
							
								
								Force 204 responses to be empty,  fixes   #2029  
							
							
							
						 
						
							2020-08-07 13:02:39 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e5ab5fbe76 
								
							 
						 
						
							
							
								
								Mix task frontend: Read the docs.  
							
							
							
						 
						
							2020-08-07 15:01:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								34cbe9f44a 
								
							 
						 
						
							
							
								
								Merge branch 'features/poll-validation' into 'develop'  
							
							... 
							
							
							
							Poll and votes pipeline ingestion
Closes  #1362  and #1852 
See merge request pleroma/pleroma!2635  
							
						 
						
							2020-08-07 10:44:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								1298a2ea2c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy  
							
							... 
							
							
							
							# Conflicts:
#	mix.lock 
							
						 
						
							2020-08-07 09:38:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bf95dfb240 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads  
							
							
							
						 
						
							2020-08-06 15:22:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								135ae4e35a 
								
							 
						 
						
							
							
								
								[ #2025 ] Defaulted OAuth login scopes choice to all scopes when user selects no scopes.  
							
							
							
						 
						
							2020-08-06 16:00:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								10b0e55acf 
								
							 
						 
						
							
							
								
								Merge branch 'whole-word-filter-hotfix' into 'develop'  
							
							... 
							
							
							
							Update filter_view.ex to return whole_word actual value
See merge request pleroma/pleroma!2851  
							
						 
						
							2020-08-06 08:35:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2a4bca5bd7 
								
							 
						 
						
							
							
								
								Comments are good when they're precise...  
							
							
							
						 
						
							2020-08-05 11:40:09 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								7569f225f1 
								
							 
						 
						
							
							
								
								Move checks to application startup  
							
							
							
						 
						
							2020-08-05 19:38:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								81126b0142 
								
							 
						 
						
							
							
								
								Add email to user account only if it exists in LDAP  
							
							
							
						 
						
							2020-08-05 11:36:12 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4672b61106 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into command-available-check  
							
							
							
						 
						
							2020-08-05 19:16:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9d7ce1a6d0 
								
							 
						 
						
							
							
								
								CommonValidations: More refactors.  
							
							
							
						 
						
							2020-08-05 17:56:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3655175639 
								
							 
						 
						
							
							
								
								CommonValidations: Refactor same_domain?  
							
							
							
						 
						
							2020-08-05 17:36:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9c96fc052a 
								
							 
						 
						
							
							
								
								CommonValidations: Extract modification right checker  
							
							
							
						 
						
							2020-08-05 17:26:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								8c57a299b4 
								
							 
						 
						
							
							
								
								Handle non-list keys in Config.fetch/1  
							
							
							
						 
						
							2020-08-05 18:23:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2192d1e492 
								
							 
						 
						
							
							
								
								Permit LDAP users to register without capturing their password hash  
							
							... 
							
							
							
							We don't need it, and local auth fallback has been removed. 
							
						 
						
							2020-08-05 10:07:31 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								2299bfe4c1 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/config-get  
							
							
							
						 
						
							2020-08-05 17:46:24 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5221879c35 
								
							 
						 
						
							
							
								
								Fix linting.  
							
							
							
						 
						
							2020-08-05 15:40:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								0f9aecbca4 
								
							 
						 
						
							
							
								
								Remove fallback to local database when LDAP is unavailable.  
							
							... 
							
							
							
							In many environments this will not work as the LDAP password and the copy stored in Pleroma will stay synchronized. 
							
						 
						
							2020-08-05 08:18:16 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f7146583e5 
								
							 
						 
						
							
							
								
								Remove LDAP mail attribute as a requirement for registering an account  
							
							
							
						 
						
							2020-08-05 08:15:57 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f889400d05 
								
							 
						 
						
							
							
								
								Questions: Move fixes to validators.  
							
							
							
						 
						
							2020-08-05 14:51:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b5f0cef156 
								
							 
						 
						
							
							
								
								Apply 1 suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2020-08-05 11:33:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								70522989d9 
								
							 
						 
						
							
							
								
								Apply 1 suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2020-08-05 11:14:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								00c4c6a382 
								
							 
						 
						
							
							
								
								CommonValidations: Remove superfluous function  
							
							... 
							
							
							
							The `is_active` functionality was integrated into the presence
checker. 
							
						 
						
							2020-08-05 12:24:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								6f60ac9f41 
								
							 
						 
						
							
							
								
								Refactor config  
							
							
							
						 
						
							2020-08-05 13:00:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								19c108170e 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation  
							
							
							
						 
						
							2020-08-05 11:12:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									MK Fain 
								
							 
						 
						
							
							
							
							
								
							
							
								f341a8e142 
								
							 
						 
						
							
							
								
								Update filter_view.ex to return whole_word actual value  
							
							
							
						 
						
							2020-08-05 02:01:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karol Kosek 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								577b11167c 
								
							 
						 
						
							
							
								
								templates/layout/app.html.eex: fix link color  
							
							
							
						 
						
							2020-08-05 00:01:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b1b6a7dfa8 
								
							 
						 
						
							
							
								
								Merge branch 'deactivated-user-posts' into 'develop'  
							
							... 
							
							
							
							Deactivated user posts
Closes  #2011 
See merge request pleroma/pleroma!2845  
							
						 
						
							2020-08-04 19:17:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								fede37e4c6 
								
							 
						 
						
							
							
								
								Merge branch 'chore/consolidate-rich-media-http' into 'develop'  
							
							... 
							
							
							
							Consolidate construction of Rich Media Parser HTTP requests
See merge request pleroma/pleroma!2827  
							
						 
						
							2020-08-04 19:16:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								91fbb5b21f 
								
							 
						 
						
							
							
								
								Fix ActivityExpirationPolicy  
							
							
							
						 
						
							2020-08-04 18:26:37 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								878c7f3f30 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation  
							
							
							
						 
						
							2020-08-04 15:28:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								532d6f94ae 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads  
							
							
							
						 
						
							2020-08-04 15:10:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0f088d8ce3 
								
							 
						 
						
							
							
								
								question_validator: Allow content to be an empty-string (blank)  
							
							
							
						 
						
							2020-08-04 14:29:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1a00713744 
								
							 
						 
						
							
							
								
								CommonValidations: Treat deactivated users as not present.  
							
							
							
						 
						
							2020-08-04 14:17:03 +02:00