Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								5144d6f4ba 
								
							 
						 
						
							
							
								
								Add OnlyMedia Upload Filter to simplify restricting uploads to audio, image, and video types  
							
							 
							
							... 
							
							
							
							Original: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3897  
							
						 
						
							2023-06-28 01:56:14 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								3e4a279a1b 
								
							 
						 
						
							
							
								
								Merge pull request 'Implement blocklists for MediaProxy' ( #574 ) from XxXCertifiedForkliftDriverXxX/akkoma:feature/mediaproxy-blocklist into develop  
							
							 
							
							... 
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/574  
							
						 
						
							2023-06-28 00:54:25 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									XxXCertifiedForkliftDriverXxX 
								
							 
						 
						
							
							
							
							
								
							
							
								767e1272b3 
								
							 
						 
						
							
							
								
								Use OS CA store for Mint HTTP connections  
							
							 
							
							
							
						 
						
							2023-06-26 15:50:49 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									XxXCertifiedForkliftDriverXxX 
								
							 
						 
						
							
							
							
							
								
							
							
								07b478dc49 
								
							 
						 
						
							
							
								
								Implement blocklists for MediaProxy  
							
							 
							
							
							
						 
						
							2023-06-26 15:18:31 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									XxXCertifiedForkliftDriverXxX 
								
							 
						 
						
							
							
							
							
								
							
							
								1b560d547a 
								
							 
						 
						
							
							
								
								Stop exposing if a user blocks you over the API.  
							
							 
							
							
							
						 
						
							2023-05-28 23:42:27 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								70b0f93865 
								
							 
						 
						
							
							
								
								Apply oembed patch  
							
							 
							
							
							
						 
						
							2023-05-26 20:45:57 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								a388d2503e 
								
							 
						 
						
							
							
								
								revert uploaded-media  
							
							 
							
							
							
						 
						
							2023-05-26 12:06:41 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								7fb9960ccd 
								
							 
						 
						
							
							
								
								Add CSP to mediaproxy links  
							
							 
							
							
							
						 
						
							2023-05-26 11:46:18 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								9d83a1e23f 
								
							 
						 
						
							
							
								
								Add csp  
							
							 
							
							
							
						 
						
							2023-05-26 11:41:22 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								8c208f751d 
								
							 
						 
						
							
							
								
								Fix filtering out incorrect addresses  
							
							 
							
							
							
						 
						
							2023-05-23 13:46:25 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								037f881187 
								
							 
						 
						
							
							
								
								Fix create processing in direct message disabled  
							
							 
							
							
							
						 
						
							2023-05-23 13:16:20 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								ab34680554 
								
							 
						 
						
							
							
								
								switch to using an enum system for DM acceptance  
							
							 
							
							
							
						 
						
							2023-05-23 10:29:08 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								d310f99d6a 
								
							 
						 
						
							
							
								
								Add MRFs for direct message manipulation  
							
							 
							
							
							
						 
						
							2023-05-22 23:53:44 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								f72d773cc3 
								
							 
						 
						
							
							
								
								Merge pull request 'Make UserNote comment default to the empty string.' ( #530 ) from provable_ascent/akkoma:provable_ascent-patch-1 into develop  
							
							 
							
							... 
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/530  
							
						 
						
							2023-05-22 21:33:01 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									midnight 
								
							 
						 
						
							
							
							
							
								
							
							
								f1e66b39c7 
								
							 
						 
						
							
							
								
								Return empty string in the event of no detected language  
							
							 
							
							
							
						 
						
							2023-05-08 18:52:19 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									provable_ascent 
								
							 
						 
						
							
							
							
							
								
							
							
								d8bed0ff63 
								
							 
						 
						
							
							
								
								Make UserNote comment default to the empty string.  
							
							 
							
							... 
							
							
							
							This make the behavior consistent between when UserNote doesn't exist and when comment is null.
The current behavior may return null in APIs, which misleads some clients doing feature detection into thinking the server does not support comments.
For example, see https://codeberg.org/husky/husky/issues/92  
							
						 
						
							2023-04-27 05:22:12 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								b86b3a9e29 
								
							 
						 
						
							
							
								
								Support public key URIs that incomprehensibly have GET args  
							
							 
							
							... 
							
							
							
							Fixes  #528  
							
						 
						
							2023-04-25 13:30:20 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								f2b4e7f86b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of akkoma.dev:AkkomaGang/akkoma into develop  
							
							 
							
							
							
						 
						
							2023-04-14 17:56:56 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								522221f7fb 
								
							 
						 
						
							
							
								
								Mix format  
							
							 
							
							
							
						 
						
							2023-04-14 17:56:34 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Atsuko Karagi 
								
							 
						 
						
							
							
							
							
								
							
							
								1fa3c0b485 
								
							 
						 
						
							
							
								
								Remove support for outdated Create format  
							
							 
							
							
							
						 
						
							2023-04-14 17:46:22 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Atsuko Karagi 
								
							 
						 
						
							
							
							
							
								
							
							
								d2b0d86471 
								
							 
						 
						
							
							
								
								HTTP signatures respect allowlist federation  
							
							 
							
							
							
						 
						
							2023-04-14 17:46:06 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								f12d3cce39 
								
							 
						 
						
							
							
								
								ensure only pickable frontends can be returned  
							
							 
							
							
							
						 
						
							2023-04-14 17:42:40 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								8c86a06ed1 
								
							 
						 
						
							
							
								
								Merge pull request 'Remove "default" image description' ( #493 ) from ilja/akkoma:remove_default_image_description into develop  
							
							 
							
							... 
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/493  
							
						 
						
							2023-04-14 16:27:41 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								4c9c959bb3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into frontend-switcher-9000  
							
							 
							
							
							
						 
						
							2023-04-14 16:56:10 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								9e8e7cc13e 
								
							 
						 
						
							
							
								
								Add note telling people to refresh  
							
							 
							
							
							
						 
						
							2023-04-14 16:55:48 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								a079ec3a3c 
								
							 
						 
						
							
							
								
								in dev, allow dev FE  
							
							 
							
							
							
						 
						
							2023-04-14 16:36:40 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								1b2c24a19e 
								
							 
						 
						
							
							
								
								fix tests  
							
							 
							
							
							
						 
						
							2023-04-14 15:20:55 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								66d162bb9e 
								
							 
						 
						
							
							
								
								Add debug logs to timeline rendering to assist debugging  
							
							 
							
							
							
						 
						
							2023-03-29 12:01:16 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								d85d1e128a 
								
							 
						 
						
							
							
								
								we don't actually need the object on redirect  
							
							 
							
							
							
						 
						
							2023-03-29 11:44:03 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								3f340cbc43 
								
							 
						 
						
							
							
								
								Only even attempt to fetch local activities by object_id  
							
							 
							
							... 
							
							
							
							TODO: PLEASE FOR THE LOVE OF KANATAN CACHE THIS 
							
						 
						
							2023-03-29 03:32:24 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								de64c6c54a 
								
							 
						 
						
							
							
								
								add selection UI  
							
							 
							
							
							
						 
						
							2023-03-28 12:44:52 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								281c4636fa 
								
							 
						 
						
							
							
								
								Merge pull request 'Show bubble_timeline in the api if any instances are set in it' ( #502 ) from foxing/akkoma:foxing-patch-1 into develop  
							
							 
							
							... 
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/502  
							
						 
						
							2023-03-21 10:13:41 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								dd44387f1a 
								
							 
						 
						
							
							
								
								Add timeline visibility options  
							
							 
							
							
							
						 
						
							2023-03-17 15:33:28 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								fe7045632b 
								
							 
						 
						
							
							
								
								also put publicVisibility in preloaded nodeinfo  
							
							 
							
							
							
						 
						
							2023-03-15 22:59:58 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								9464d50562 
								
							 
						 
						
							
							
								
								Add publicTimelineVisibility to nodeinfo  
							
							 
							
							
							
						 
						
							2023-03-15 22:13:18 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									foxing 
								
							 
						 
						
							
							
							
							
								
							
							
								bd040fe96a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into foxing-patch-1  
							
							 
							
							
							
						 
						
							2023-03-13 03:41:15 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									foxing 
								
							 
						 
						
							
							
							
							
								
							
							
								ba635e97c8 
								
							 
						 
						
							
							
								
								Use enum empty instead  
							
							 
							
							
							
						 
						
							2023-03-13 03:40:20 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								377d1483b6 
								
							 
						 
						
							
							
								
								Merge pull request 'Apply security patch from pleroma to prevent nested file names being uploaded to the server.' ( #507 ) from foxing/akkoma:foxing-patch-2 into develop  
							
							 
							
							... 
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/507  
							
						 
						
							2023-03-13 00:29:51 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								643b8c5f15 
								
							 
						 
						
							
							
								
								ensure we send the right files for preferred fe  
							
							 
							
							
							
						 
						
							2023-03-12 23:59:10 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								3d964a9970 
								
							 
						 
						
							
							
								
								Add frontend preference route  
							
							 
							
							
							
						 
						
							2023-03-12 23:24:07 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									foxing 
								
							 
						 
						
							
							
							
							
								
							
							
								c2ae3273d5 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into foxing-patch-2  
							
							 
							
							
							
						 
						
							2023-03-12 19:23:22 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									foxing 
								
							 
						 
						
							
							
							
							
								
							
							
								3f76de76da 
								
							 
						 
						
							
							
								
								Apply Patch  
							
							 
							
							
							
						 
						
							2023-03-12 19:13:56 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									flisk 
								
							 
						 
						
							
							
							
							
								
							
							
								0c77be9308 
								
							 
						 
						
							
							
								
								don't crash on malformed avatar and banner values  
							
							 
							
							... 
							
							
							
							weird values in href will cause base64 encoding to fail later down the
line, so let's make sure the value we're passing on is somewhat sane, or
at the very least a binary
this fixes  #482  
							
						 
						
							2023-03-12 18:14:05 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								6c396fcab4 
								
							 
						 
						
							
							
								
								Remove "default" image description  
							
							 
							
							... 
							
							
							
							When no image description is filled in, Pleroma allowed fallbacks.
Those were (based on a setting) either the filename, or a fixed description.
Neither are good options for image descriptions imo, so here we remove this.
Note that there's two tests removed who supposedly tested something else.
But examining closer, they didn't seem to test what they claimed to test,
so I removed them rather than try to "fix" them. 
							
						 
						
							2023-03-12 08:42:33 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									foxing 
								
							 
						 
						
							
							
							
							
								
							
							
								e17d8f744e 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into foxing-patch-1  
							
							 
							
							
							
						 
						
							2023-03-11 19:09:14 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								70803d7966 
								
							 
						 
						
							
							
								
								Remove mix.env reference  
							
							 
							
							
							
						 
						
							2023-03-11 18:24:44 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								5ca22c2459 
								
							 
						 
						
							
							
								
								ensure we can't have a null in appends  
							
							 
							
							
							
						 
						
							2023-03-11 17:24:49 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									foxing 
								
							 
						 
						
							
							
							
							
								
							
							
								19eb826424 
								
							 
						 
						
							
							
								
								Show bubble_timeline in the api if any instances are set in it, do not show if none are set  
							
							 
							
							
							
						 
						
							2023-03-11 03:26:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								9977588612 
								
							 
						 
						
							
							
								
								we should probably use ||  
							
							 
							
							
							
						 
						
							2023-03-10 18:49:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								e124a109c1 
								
							 
						 
						
							
							
								
								Remove _misskey_reaction matching ( #500 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/500  
							
						 
						
							2023-03-10 18:46:49 +00:00