Kouhai 
								
							 
						 
						
							
							
							
							
								
							
							
								78a9906dfe 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'glitch/main' ( a21fe8687e)  
							
							
							
						 
						
							2023-11-27 22:59:37 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								0c727a6790 
								
							 
						 
						
							
							
								
								Fix more import style discrepancies  
							
							
							
						 
						
							2023-11-15 17:16:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c226d00490 
								
							 
						 
						
							
							
								
								Fix interaction between CWs and hashtag bars  
							
							
							
						 
						
							2023-11-15 12:56:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								18462ee4b6 
								
							 
						 
						
							
							
								
								[Glitch] Remove hashtags from the last line of a status if it only contains hashtags  
							
							... 
							
							
							
							Port 061fd66ee6 
							
						 
						
							2023-11-15 12:56:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								a81ed84453 
								
							 
						 
						
							
							
								
								[Glitch] Add display of out-of-band hashtags in the web interface  
							
							... 
							
							
							
							Port df6e719898 
							
						 
						
							2023-11-15 12:56:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a97b722ad5 
								
							 
						 
						
							
							
								
								Reduce differences with upstream due to import style ( #2465 )  
							
							... 
							
							
							
							Fix relative / VS absolute style imports, and fix whitespace discrepancies 
							
						 
						
							2023-11-15 12:01:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								d6eacb79c6 
								
							 
						 
						
							
							
								
								[Glitch] Upgrade to react-router v5  
							
							... 
							
							
							
							Port 1b70d7ed7c 
							
						 
						
							2023-10-21 22:14:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kouhai 
								
							 
						 
						
							
							
							
							
								
							
							
								7c7355a964 
								
							 
						 
						
							
							
								
								th: Merge remote-tracking branch 'glitch/main' ( d033fab0ed)  
							
							
							
						 
						
							2023-08-26 22:00:56 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								1461cc53ed 
								
							 
						 
						
							
							
								
								[Glitch] Add alt text for preview card thumbnails  
							
							... 
							
							
							
							Port 8da99ffb0d 
							
						 
						
							2023-08-13 18:56:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								0e6c62a4c7 
								
							 
						 
						
							
							
								
								[Glitch] Add alt text for preview card thumbnails  
							
							... 
							
							
							
							Port ecb00fa5ac 
							
						 
						
							2023-08-13 18:56:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kouhai 
								
							 
						 
						
							
							
							
							
								
							
							
								f8028d190e 
								
							 
						 
						
							
							
								
								th: Merge remote-tracking branch 'glitch/main'  
							
							
							
						 
						
							2023-08-12 18:54:16 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								fef9f157a9 
								
							 
						 
						
							
							
								
								[Glitch] Fix missing action label on sensitive videos and embeds in web UI  
							
							... 
							
							
							
							Port a90d7ac141 
							
						 
						
							2023-07-30 15:50:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								e48a6a5f2c 
								
							 
						 
						
							
							
								
								[Glitch] Fix missing action label on sensitive videos and embeds in web UI  
							
							... 
							
							
							
							Port 714a20697f 
							
						 
						
							2023-07-30 15:50:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gunchleoc 
								
							 
						 
						
							
							
							
							
								
							
							
								9a6d0b04cd 
								
							 
						 
						
							
							
								
								[Glitch] Replace 'favourite' by 'favorite' for American English  
							
							... 
							
							
							
							Port 257fadcec4 
							
						 
						
							2023-07-30 14:44:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gunchleoc 
								
							 
						 
						
							
							
							
							
								
							
							
								09ebf7e37c 
								
							 
						 
						
							
							
								
								[Glitch] Replace 'favourite' by 'favorite' for American English  
							
							... 
							
							
							
							Port 217ef7f2af 
							
						 
						
							2023-07-30 14:44:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								37e80ae4c8 
								
							 
						 
						
							
							
								
								[Glitch] Fix dropdowns being disabled for logged out users in web UI  
							
							... 
							
							
							
							Port 3df957104a 
							
						 
						
							2023-07-14 13:01:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f0d3267fbf 
								
							 
						 
						
							
							
								
								[Glitch] Fix dropdowns being disabled for logged out users in web UI  
							
							... 
							
							
							
							Port a8edbcf963 
							
						 
						
							2023-07-14 13:01:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kouhai 
								
							 
						 
						
							
							
							
							
								
							
							
								fa0f31a8fb 
								
							 
						 
						
							
							
								
								th: merge glitch again (lol)  
							
							
							
						 
						
							2023-07-05 01:14:10 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
							
							
								
							
							
								a804371e21 
								
							 
						 
						
							
							
								
								[Glitch] Change "direct message" nomenclature to "private mention" in web UI ( #2158 )  
							
							... 
							
							
							
							Port 868d478b1b 
							
						 
						
							2023-06-11 13:33:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fefdc3244c 
								
							 
						 
						
							
							
								
								[Glitch] Change "direct message" nomenclature to "private mention" in web UI ( #2158 )  
							
							... 
							
							
							
							Port 68a192e718 
							
						 
						
							2023-06-11 13:33:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b5872b0686 
								
							 
						 
						
							
							
								
								[Glitch] Change design of dropdowns in web UI  
							
							... 
							
							
							
							Port 7abfddd8a5 
							
						 
						
							2023-06-10 17:10:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								fb0d2de8fe 
								
							 
						 
						
							
							
								
								[Glitch] Change design of dropdowns in web UI  
							
							... 
							
							
							
							Port e4fd9503ec 
							
						 
						
							2023-06-10 17:10:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jed Fox 
								
							 
						 
						
							
							
							
							
								
							
							
								2877b12754 
								
							 
						 
						
							
							
								
								[Glitch] Fix spacing of middle dots in the detailed status meta section  
							
							... 
							
							
							
							Port 2d2750c6a9 
							
						 
						
							2023-06-10 16:29:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jed Fox 
								
							 
						 
						
							
							
							
							
								
							
							
								753385d3e0 
								
							 
						 
						
							
							
								
								[Glitch] Fix spacing of middle dots in the detailed status meta section  
							
							... 
							
							
							
							Port acc419b81b 
							
						 
						
							2023-06-10 16:29:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								8b958c0858 
								
							 
						 
						
							
							
								
								[Glitch] Translate CW, poll options and media descriptions  
							
							... 
							
							
							
							Port 971eafc709 
							
						 
						
							2023-06-10 14:48:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								7e25fd9b0c 
								
							 
						 
						
							
							
								
								[Glitch] Translate CW, poll options and media descriptions  
							
							... 
							
							
							
							Port 69057467cb 
							
						 
						
							2023-06-10 14:48:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								615a7d5795 
								
							 
						 
						
							
							
								
								Fix extraneous newlines  
							
							
							
						 
						
							2023-05-28 18:06:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								5ed48e6878 
								
							 
						 
						
							
							
								
								Fix extraneous newlines  
							
							
							
						 
						
							2023-05-28 18:06:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								f58504f2c7 
								
							 
						 
						
							
							
								
								[Glitch] Update inconsistent defaultMessage  
							
							... 
							
							
							
							Port 169f141c4c 
							
						 
						
							2023-05-28 17:14:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								0009b4b574 
								
							 
						 
						
							
							
								
								[Glitch] Update inconsistent defaultMessage  
							
							... 
							
							
							
							Port e58c36d308 
							
						 
						
							2023-05-28 17:14:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2592015ce6 
								
							 
						 
						
							
							
								
								[Glitch] Change share action from being in action bar to being in dropdown in web UI  
							
							... 
							
							
							
							Port 97235baa4f 
							
						 
						
							2023-05-28 16:59:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								e7dc375aab 
								
							 
						 
						
							
							
								
								[Glitch] Change share action from being in action bar to being in dropdown in web UI  
							
							... 
							
							
							
							Port 1caa5ff39e 
							
						 
						
							2023-05-28 16:59:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								a7e6f3df20 
								
							 
						 
						
							
							
								
								Fix import order with ESLint  
							
							... 
							
							
							
							Port 7b5a274836 
							
						 
						
							2023-05-28 16:38:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								7d7db8977b 
								
							 
						 
						
							
							
								
								Fix import order with ESLint  
							
							... 
							
							
							
							Port d27216dc46 
							
						 
						
							2023-05-28 16:38:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								8793625bf3 
								
							 
						 
						
							
							
								
								[Glitch] Use JSX syntax for Fragments  
							
							... 
							
							
							
							Port abbc6dfcba 
							
						 
						
							2023-05-28 14:56:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								a0bc0619ca 
								
							 
						 
						
							
							
								
								[Glitch] Use JSX syntax for Fragments  
							
							... 
							
							
							
							Port 5a16bd7bf4 
							
						 
						
							2023-05-28 14:56:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								fb2bf621eb 
								
							 
						 
						
							
							
								
								[Glitch] Use the new JSX transform everywhere  
							
							... 
							
							
							
							Port 3b0c3e94e0 
							
						 
						
							2023-05-28 14:18:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								6001f5ff36 
								
							 
						 
						
							
							
								
								[Glitch] Use the new JSX transform everywhere  
							
							... 
							
							
							
							Port 8f66126b10 
							
						 
						
							2023-05-28 14:18:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								dc9dcd0fa9 
								
							 
						 
						
							
							
								
								[Glitch] Enable ESLint react/no-deprecated  
							
							... 
							
							
							
							Port b0dd260a7a 
							
						 
						
							2023-05-25 21:07:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								e8fc445e14 
								
							 
						 
						
							
							
								
								[Glitch] Enable ESLint react/no-deprecated  
							
							... 
							
							
							
							Port b878e3d8df 
							
						 
						
							2023-05-25 21:07:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								a3c2519ba0 
								
							 
						 
						
							
							
								
								[Glitch] Add type annotation for DisplayName component  
							
							... 
							
							
							
							Port a150bb4f2e 
							
						 
						
							2023-05-25 20:57:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								7d9b7f28b8 
								
							 
						 
						
							
							
								
								[Glitch] Add type annotation for DisplayName component  
							
							... 
							
							
							
							Port 349cae0b57 
							
						 
						
							2023-05-25 20:57:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								b13b71d1f5 
								
							 
						 
						
							
							
								
								Greatly simplify history management code ( #2230 )  
							
							... 
							
							
							
							Fixes  #2220 
This drops the ability to shift+click on “Back” to get back to a pinned
column, but that was inconsistent, broken, and undocumented.
This also brings us slightly closer to upstream. 
						
							2023-05-25 19:14:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cb6f445b90 
								
							 
						 
						
							
							
								
								Greatly simplify history management code ( #2230 )  
							
							... 
							
							
							
							Fixes  #2220 
This drops the ability to shift+click on “Back” to get back to a pinned
column, but that was inconsistent, broken, and undocumented.
This also brings us slightly closer to upstream. 
						
							2023-05-25 19:14:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kouhai 
								
							 
						 
						
							
							
							
							
								
							
							
								a2e6a7d963 
								
							 
						 
						
							
							
								
								th: Merge remote-tracking branch 'glitch/main'  
							
							
							
						 
						
							2023-05-22 00:10:53 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								bc202f4bc6 
								
							 
						 
						
							
							
								
								th: Merge gitea.treehouse.systems:mirrors/mastodon-glitch into chore/merge-20230511-1  
							
							
							
						 
						
							2023-05-11 17:42:39 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								d0545c950c 
								
							 
						 
						
							
							
								
								[Glitch] Enforce stricter rules for Typescript files  
							
							... 
							
							
							
							Port 85b3823e66 
							
						 
						
							2023-05-09 22:56:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								5f2071d055 
								
							 
						 
						
							
							
								
								[Glitch] Enforce stricter rules for Typescript files  
							
							... 
							
							
							
							Port c8181eb0a4 
							
						 
						
							2023-05-09 22:56:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								62f5d29c25 
								
							 
						 
						
							
							
								
								[Glitch] Change media elements to use aspect-ratio rather than compute height themselves  
							
							... 
							
							
							
							Port 8c43856691 
							
						 
						
							2023-05-08 22:15:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								a8939e9098 
								
							 
						 
						
							
							
								
								[Glitch] Change media elements to use aspect-ratio rather than compute height themselves  
							
							... 
							
							
							
							Port 598e63dad2 
							
						 
						
							2023-05-08 22:15:00 +02:00