Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								92fa9d34b0 
								
							 
						 
						
							
							
								
								Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
  Small conflict due to our theming system.
- `streaming/index.js`:
  Upstream refactored part of the streaming server.
  We had some extra logic for handling local-only posts.
  Applied the refactor. 
							
						 
						
							2023-07-30 16:11:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								879c7ed2d3 
								
							 
						 
						
							
							
								
								[Glitch] Fix missing GIF badge in account gallery  
							
							... 
							
							
							
							Port a4b69bec2e 
							
						 
						
							2023-07-30 15:58:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								88ba538aad 
								
							 
						 
						
							
							
								
								[Glitch] Preserve translation on status re-import  
							
							... 
							
							
							
							Port 6781dc6462 
							
						 
						
							2023-07-30 15:57:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								454d8567d4 
								
							 
						 
						
							
							
								
								Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-30 15:54:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								450f75b6f7 
								
							 
						 
						
							
							
								
								[Glitch] Add published date and author to news on the explore screen in web UI  
							
							... 
							
							
							
							Port f826a95f6e 
							
						 
						
							2023-07-30 15:50:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								887a17bb83 
								
							 
						 
						
							
							
								
								[Glitch] Revert poll colors to green outside of compose form  
							
							... 
							
							
							
							Port ce1f35d7e2 
							
						 
						
							2023-07-30 15:50:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Wolf 
								
							 
						 
						
							
							
							
							
								
							
							
								e92dde0b16 
								
							 
						 
						
							
							
								
								[Glitch] fix poll input active style  
							
							... 
							
							
							
							Port 49d2e8979f 
							
						 
						
							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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4b26e44ef4 
								
							 
						 
						
							
							
								
								[Glitch] Fix missing border on error screen in light theme in web UI  
							
							... 
							
							
							
							Port d1a9f601c7 
							
						 
						
							2023-07-30 15:23:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gol-cha 
								
							 
						 
						
							
							
							
							
								
							
							
								168fadb6b9 
								
							 
						 
						
							
							
								
								[Glitch] Fix UI Overlap with the loupe icon in the Explore Tab  
							
							... 
							
							
							
							Port 9a567ec1d1 
							
						 
						
							2023-07-30 15:22:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								1d4df97049 
								
							 
						 
						
							
							
								
								[Glitch] Add lang attribute to trending links  
							
							... 
							
							
							
							Port 76fce34ebb 
							
						 
						
							2023-07-30 15:18:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Wolf 
								
							 
						 
						
							
							
							
							
								
							
							
								f3bd96c91c 
								
							 
						 
						
							
							
								
								[Glitch] change poll form element colors to fit with the rest of the ui  
							
							... 
							
							
							
							Port 80809ef33e 
							
						 
						
							2023-07-30 15:18:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								bd349cb850 
								
							 
						 
						
							
							
								
								Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `db/schema.rb`:
  Upstream regenerated the schema file using Rails 7, the conflicts are
  caused by our extra columns.
  Applied upstream's changes, but keeping our extra columns. 
							
						 
						
							2023-07-30 14:58:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gunchleoc 
								
							 
						 
						
							
							
							
							
								
							
							
								09ebf7e37c 
								
							 
						 
						
							
							
								
								[Glitch] Replace 'favourite' by 'favorite' for American English  
							
							... 
							
							
							
							Port 217ef7f2af 
							
						 
						
							2023-07-30 14:44:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								b2515feb29 
								
							 
						 
						
							
							
								
								Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-30 14:33:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								5914dfdd69 
								
							 
						 
						
							
							
								
								[Glitch] Change thread view to scroll to the selected post rather than the post being replied to  
							
							... 
							
							
							
							Port e4ea80d808 
							
						 
						
							2023-07-30 14:26:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								42f36aa55a 
								
							 
						 
						
							
							
								
								Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream fixed an issue that was not present in glitch-soc.
  Kept our version. 
							
						 
						
							2023-07-30 13:49:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislas Signoud 
								
							 
						 
						
							
							
							
							
								
							
							
								f05effeb8f 
								
							 
						 
						
							
							
								
								[Glitch] Fix a missing redirection on getting-started in multi column mode  
							
							... 
							
							
							
							Port 586b1c9dca 
							
						 
						
							2023-07-30 13:32:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								d3d6147286 
								
							 
						 
						
							
							
								
								[Glitch] Wrong count in response when removing favourite/reblog  
							
							... 
							
							
							
							Port 4c18928a93 
							
						 
						
							2023-07-30 13:31:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								993d0a9950 
								
							 
						 
						
							
							
								
								Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/account.rb`:
  Upstream added new validations close to lines on which glitch-soc had
  modified validations to handle custom limits set through environment
  variables.
  Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
  Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
  completely different.
  Added `AZURE_ALIAS_HOST` to our version of the file. 
							
						 
						
							2023-07-30 13:15:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3a14104411 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2338 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-07-30 13:09:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d4807a5e64 
								
							 
						 
						
							
							
								
								Change aspect ratios on link previews in web UI ( #26250 )  
							
							
							
						 
						
							2023-07-30 03:35:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4d3a129212 
								
							 
						 
						
							
							
								
								Fix public TL not indicating new toots when onlyRemote is enabled ( #26247 )  
							
							... 
							
							
							
							Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-29 20:18:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1cc3fcf7d0 
								
							 
						 
						
							
							
								
								Fix Public TL not indicating new toots when onlyRemote or allowLocalOnly is enabled ( #2336 )  
							
							... 
							
							
							
							Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-29 16:45:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								feaf3cf780 
								
							 
						 
						
							
							
								
								Fix firehose not indicating new toots in "All" ( #2335 )  
							
							... 
							
							
							
							When "Show local-only toots in All" is enabled, the column never indicated there are new toots, since `hasUnread` was always false.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-29 08:37:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e69fe94669 
								
							 
						 
						
							
							
								
								Fix "All" live feed not loading automatically. ( #2332 )  
							
							... 
							
							
							
							The dispatch to expand the timeline was missing the `allowLocalOnly` param.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-27 19:25:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8864d5b580 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2327 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-07-27 19:25:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6256cee034 
								
							 
						 
						
							
							
								
								Change error boundary to upstream's ( #2323 )  
							
							
							
						 
						
							2023-07-27 19:25:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a4ec187a20 
								
							 
						 
						
							
							
								
								Change the wording of the dismissable explore prompt ( #25917 )  
							
							
							
						 
						
							2023-07-27 16:51:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bbea052935 
								
							 
						 
						
							
							
								
								Fix emoji picker button scrolling with textarea content in single-column view ( #25304 )  
							
							
							
						 
						
							2023-07-27 16:20:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b4e739ff0f 
								
							 
						 
						
							
							
								
								Change interaction modal in web UI ( #26075 )  
							
							... 
							
							
							
							Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> 
							
						 
						
							2023-07-27 16:11:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1e4ccc655a 
								
							 
						 
						
							
							
								
								Add role badges to the WebUI ( #25649 )  
							
							
							
						 
						
							2023-07-27 16:05:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b9adea9695 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #26072 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-07-26 13:46:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a4b69bec2e 
								
							 
						 
						
							
							
								
								Fix missing GIF badge in account gallery ( #26166 )  
							
							
							
						 
						
							2023-07-26 03:33:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6781dc6462 
								
							 
						 
						
							
							
								
								Preserve translation on status re-import ( #26168 )  
							
							
							
						 
						
							2023-07-25 20:29:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ce1f35d7e2 
								
							 
						 
						
							
							
								
								Revert poll colors to green outside of compose form ( #26164 )  
							
							
							
						 
						
							2023-07-25 15:32:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Wolf 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								49d2e8979f 
								
							 
						 
						
							
							
								
								fix poll input active style ( #26162 )  
							
							
							
						 
						
							2023-07-25 13:39:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f826a95f6e 
								
							 
						 
						
							
							
								
								Add published date and author to news on the explore screen in web UI ( #26155 )  
							
							
							
						 
						
							2023-07-25 00:57:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4299208487 
								
							 
						 
						
							
							
								
								Fix lang for UI texts in link preview ( #26149 )  
							
							
							
						 
						
							2023-07-24 23:01:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								714a20697f 
								
							 
						 
						
							
							
								
								Fix missing action label on sensitive videos and embeds in web UI ( #26135 )  
							
							
							
						 
						
							2023-07-24 22:04:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d1a9f601c7 
								
							 
						 
						
							
							
								
								Fix missing border on error screen in light theme in web UI ( #26152 )  
							
							
							
						 
						
							2023-07-24 19:53:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gol-cha 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9a567ec1d1 
								
							 
						 
						
							
							
								
								Fix UI Overlap with the loupe icon in the Explore Tab ( #26113 )  
							
							
							
						 
						
							2023-07-24 17:56:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								76fce34ebb 
								
							 
						 
						
							
							
								
								Add lang attribute to trending links ( #26111 )  
							
							
							
						 
						
							2023-07-24 13:48:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Wolf 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								80809ef33e 
								
							 
						 
						
							
							
								
								change poll form element colors to fit with the rest of the ui ( #26139 )  
							
							
							
						 
						
							2023-07-24 13:48:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6b2952d1dd 
								
							 
						 
						
							
							
								
								Change design of link previews in web UI ( #26136 )  
							
							
							
						 
						
							2023-07-24 13:47:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4d01d1a1ee 
								
							 
						 
						
							
							
								
								Remove 16:9 cropping from web UI ( #26132 )  
							
							
							
						 
						
							2023-07-24 13:46:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cf9affdeac 
								
							 
						 
						
							
							
								
								Apply padding to all notifications in notif-cleaning mode ( #2325 )  
							
							... 
							
							
							
							* Add missing padding to notif-cleaning for admin-sign-up
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Apply padding to all notification types instead
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-23 18:50:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5e8cbb5f82 
								
							 
						 
						
							
							
								
								Remove back button from bookmarks, favourites and lists screens in web UI ( #26126 )  
							
							
							
						 
						
							2023-07-23 17:55:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cfd50f30bb 
								
							 
						 
						
							
							
								
								Fix focus and hover styles in web UI ( #26125 )  
							
							
							
						 
						
							2023-07-23 17:55:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								51311c1978 
								
							 
						 
						
							
							
								
								Fix CW icon being on wrong side in app settings in RTL languages ( #2324 )  
							
							... 
							
							
							
							Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-23 17:19:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeong Arm 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								944c29033d 
								
							 
						 
						
							
							
								
								Fix relationship-tag background color ( #2322 )  
							
							
							
						 
						
							2023-07-23 14:40:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9ec43107f2 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2319 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-07-23 14:31:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								49767d20bd 
								
							 
						 
						
							
							
								
								Fix glitch local settings navigation items not being proper buttons ( #2320 )  
							
							
							
						 
						
							2023-07-23 14:31:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dd09535bda 
								
							 
						 
						
							
							
								
								Annotate doodle parameters to please eslint ( #2321 )  
							
							
							
						 
						
							2023-07-23 14:31:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								52500965cc 
								
							 
						 
						
							
							
								
								Fix “Open in advanced web interface” being shown on mobile view ( #2318 )  
							
							... 
							
							
							
							Fixes  #2307  
						
							2023-07-22 17:22:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9a45198ab0 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2317 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-07-22 09:53:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									наб 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1b4cf0eba0 
								
							 
						 
						
							
							
								
								Favourits -> Favorites ( #26109 )  
							
							
							
						 
						
							2023-07-21 21:13:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gunchleoc 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								217ef7f2af 
								
							 
						 
						
							
							
								
								Replace 'favourite' by 'favorite' for American English ( #26009 )  
							
							
							
						 
						
							2023-07-21 19:09:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Wolf 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								59478a1b46 
								
							 
						 
						
							
							
								
								change focus ui for keyboard only input ( #25935 )  
							
							
							
						 
						
							2023-07-21 13:20:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e4ea80d808 
								
							 
						 
						
							
							
								
								Change thread view to scroll to the selected post rather than the post being replied to ( #24685 )  
							
							
							
						 
						
							2023-07-21 13:14:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e7cb6c6c44 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2314 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-07-21 09:26:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislas Signoud 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								586b1c9dca 
								
							 
						 
						
							
							
								
								Fix a missing redirection on getting-started in multi column mode ( #26070 )  
							
							
							
						 
						
							2023-07-20 14:46:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4c18928a93 
								
							 
						 
						
							
							
								
								Wrong count in response when removing favourite/reblog ( #24365 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-07-19 09:02:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								0092fe50ac 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream entirely refactored this, while we changed the docker repository
  to upload to and disabled the “latest” tag.
  Applied the repository change to `.github/workflows/build-*.yml`, as well
  as disabling native ARMv64 builds.
- `README.md`:
  We have a completely different README.
  Kept ours.
- `app/views/admin/settings/shared/_links.html.haml`:
  Upstream refactored, we had an extra item.
  Refactored as upstream did.
- `spec/controllers/api/v1/timelines/public_controller_spec.rb`:
  Upstream deleted this file, to be replaced by a request spec at
  `spec/requests/api/v1/timelines/public_spec.rb`.
  We had an extra bit about enabling the public timelines because we have
  different defaults than upstream.
  Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb` 
							
						 
						
							2023-07-19 07:35:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								111686c38b 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #2306 )  
							
							... 
							
							
							
							* New translations en.json (French)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Afrikaans)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations en.json (Punjabi)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (English, United Kingdom)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Uyghur)
[ci skip]
* New translations en.json (Tatar)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Latin)
[ci skip]
* New translations en.json (Bosnian)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Cornish)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Igbo)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations simple_form.en.yml (Italian)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (French, Quebec)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip] 
							
						 
						
							2023-07-19 07:05:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								47832a1ac0 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #26054 )  
							
							... 
							
							
							
							Co-authored-by: renchap <renchap@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-07-18 21:13:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								0c45bed333 
								
							 
						 
						
							
							
								
								[Glitch] Fix “Back” button sometimes redirecting out of Mastodon  
							
							... 
							
							
							
							Port a442a1d1c6 
							
						 
						
							2023-07-17 19:12:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c04f2d0cf7 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  had a different lambda due to its theming system.
  Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  removed some code just after the lambda.
  Applied the same code style changes. 
							
						 
						
							2023-07-17 19:02:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a442a1d1c6 
								
							 
						 
						
							
							
								
								Fix “Back” button sometimes redirecting out of Mastodon ( #25281 )  
							
							
							
						 
						
							2023-07-17 17:32:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Stanclift 
								
							 
						 
						
							
							
							
							
								
							
							
								12e7f5fabd 
								
							 
						 
						
							
							
								
								[Glitch] Fix for "follows you" indicator in light web UI not readable  
							
							... 
							
							
							
							Port 97ce47e451 
							
						 
						
							2023-07-17 13:01:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Terence Eden 
								
							 
						 
						
							
							
							
							
								
							
							
								27f7e5b0f3 
								
							 
						 
						
							
							
								
								[Glitch] Prevent split line between icon and number on reposts & favourites  
							
							... 
							
							
							
							Port b923a4c755 
							
						 
						
							2023-07-17 13:01:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c943f17b1b 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-17 12:52:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Stanclift 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								97ce47e451 
								
							 
						 
						
							
							
								
								Fix for "follows you" indicator in light web UI not readable ( #25993 )  
							
							
							
						 
						
							2023-07-17 11:51:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								23197cebce 
								
							 
						 
						
							
							
								
								Reduce dropdown menu margin and padding ( #2301 )  
							
							... 
							
							
							
							* Reduce dropdown menu margin and padding
* Change horizontal padding back to what it was
* Reduce separator vertical margins for consistency 
							
						 
						
							2023-07-16 18:23:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Terence Eden 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b923a4c755 
								
							 
						 
						
							
							
								
								Prevent split line between icon and number on reposts & favourites ( #26004 )  
							
							
							
						 
						
							2023-07-16 10:06:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c45a965bf7 
								
							 
						 
						
							
							
								
								[Glitch] Change “About” and “Privacy policy” links to open in a new tab in advanced interface  
							
							... 
							
							
							
							Port 71db616fed 
							
						 
						
							2023-07-14 13:01:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislas Signoud 
								
							 
						 
						
							
							
							
							
								
							
							
								9bd012b7cb 
								
							 
						 
						
							
							
								
								[Glitch] Change links in multi-column mode so tabs are open in single-column mode  
							
							... 
							
							
							
							Port 5fad7bd58a 
							
						 
						
							2023-07-14 13:01:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								0d61985713 
								
							 
						 
						
							
							
								
								Remove layout glitch-soc settings  
							
							
							
						 
						
							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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								a98b5c2246 
								
							 
						 
						
							
							
								
								[Glitch] Fix embed dropdown menu item for unauthenticated users  
							
							... 
							
							
							
							Port 41f65edb21 
							
						 
						
							2023-07-13 22:42:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								d9adda1a99 
								
							 
						 
						
							
							
								
								Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-13 22:40:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								470ded3687 
								
							 
						 
						
							
							
								
								Fix notifications not loading when slow mode active ( #2292 )  
							
							... 
							
							
							
							When slow mode is enabled, clicking a notification filter when a new notification was received will render an empty column.
This change has been missed in e91bf82083 
							
						 
						
							2023-07-13 21:36:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								e271d018b7 
								
							 
						 
						
							
							
								
								Fix home timeline's regexp field  
							
							
							
						 
						
							2023-07-13 19:33:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								71db616fed 
								
							 
						 
						
							
							
								
								Change “About” and “Privacy policy” links to open in a new tab in advanced interface ( #25973 )  
							
							
							
						 
						
							2023-07-13 17:59:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislas Signoud 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5fad7bd58a 
								
							 
						 
						
							
							
								
								Change links in multi-column mode so tabs are open in single-column mode ( #25893 )  
							
							
							
						 
						
							2023-07-13 17:18:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								41f65edb21 
								
							 
						 
						
							
							
								
								Fix embed dropdown menu item for unauthenticated users ( #25964 )  
							
							
							
						 
						
							2023-07-13 15:53:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								98e5589ed4 
								
							 
						 
						
							
							
								
								[Glitch] Fix follow link style in embeds  
							
							... 
							
							
							
							Port 5a3f174d56 
							
						 
						
							2023-07-13 14:52:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								18f55567b0 
								
							 
						 
						
							
							
								
								[Glitch] Upgrade to typescript-eslint v6  
							
							... 
							
							
							
							Port a7253075d1 
							
						 
						
							2023-07-13 14:51:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								3be4f4266d 
								
							 
						 
						
							
							
								
								Fix incorrect types in DisplayName  
							
							
							
						 
						
							2023-07-13 14:51:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								25571b18ed 
								
							 
						 
						
							
							
								
								Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-13 14:22:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								447ab7ab24 
								
							 
						 
						
							
							
								
								[Glitch] Convert Home timeline components to Typescript  
							
							... 
							
							
							
							Port a75138d073 
							
						 
						
							2023-07-13 14:21:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								177497b367 
								
							 
						 
						
							
							
								
								Merge commit '3ed9b55cb3987e3d32c56f857cb6903ca8bec3d4' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-13 14:02:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								0870c7c95e 
								
							 
						 
						
							
							
								
								[Glitch] Upgrade to Prettier 3  
							
							... 
							
							
							
							Port 73b64b8917 
							
						 
						
							2023-07-13 14:01:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								95a1fde6b6 
								
							 
						 
						
							
							
								
								Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file. 
							
						 
						
							2023-07-13 13:49:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5a3f174d56 
								
							 
						 
						
							
							
								
								Fix follow link style in embeds ( #25965 )  
							
							
							
						 
						
							2023-07-13 12:58:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a7253075d1 
								
							 
						 
						
							
							
								
								Upgrade to typescript-eslint v6 ( #25904 )  
							
							
							
						 
						
							2023-07-13 11:49:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a75138d073 
								
							 
						 
						
							
							
								
								Convert Home timeline components to Typescript ( #25583 )  
							
							
							
						 
						
							2023-07-13 11:28:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								73b64b8917 
								
							 
						 
						
							
							
								
								Upgrade to Prettier 3 ( #25902 )  
							
							
							
						 
						
							2023-07-13 11:26:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c2bfbf53a1 
								
							 
						 
						
							
							
								
								Fix various CSS issues  
							
							
							
						 
						
							2023-07-12 19:13:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								9ae60f8738 
								
							 
						 
						
							
							
								
								Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file. 
							
						 
						
							2023-07-12 16:03:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislas Signoud 
								
							 
						 
						
							
							
							
							
								
							
							
								ec95f62cb4 
								
							 
						 
						
							
							
								
								[Glitch] Fix sounds not being loaded from assets host  
							
							... 
							
							
							
							Port 1392f31ed8 
							
						 
						
							2023-07-12 16:00:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								2aadebc769 
								
							 
						 
						
							
							
								
								Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed how releases are tagged, we don't have releases.
  Ignored the changes 
							
						 
						
							2023-07-12 15:54:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Wolf 
								
							 
						 
						
							
							
							
							
								
							
							
								15f6fa8d47 
								
							 
						 
						
							
							
								
								[Glitch] fix buttons showing inconsistent styles  
							
							... 
							
							
							
							Port ea10febd25 
							
						 
						
							2023-07-12 15:50:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c3af91ce48 
								
							 
						 
						
							
							
								
								[Glitch] Fix filters not applying to explore tab  
							
							... 
							
							
							
							Port af54bf52c8 
							
						 
						
							2023-07-12 15:48:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c699dc0908 
								
							 
						 
						
							
							
								
								[Glitch] Add forward_to_domains parameter to POST /api/v1/reports  
							
							... 
							
							
							
							Port c27b82a437 
							
						 
						
							2023-07-12 15:47:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								075887e1d6 
								
							 
						 
						
							
							
								
								Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-12 15:44:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								71f8c45c18 
								
							 
						 
						
							
							
								
								[Glitch] Change label and design of sensitive and unavailable media in web UI  
							
							... 
							
							
							
							Port 338a0e70cc 
							
						 
						
							2023-07-12 15:43:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								dd0002e1fe 
								
							 
						 
						
							
							
								
								Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/trends.rb`:
  Conflict due to glitch-soc's code splitting trends mailing depending on type.
  Ported upstream's changes. 
							
						 
						
							2023-07-12 15:38:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c250b37f0a 
								
							 
						 
						
							
							
								
								[Glitch] Fix explore page being inaccessible when opted-out of trends in web UI  
							
							... 
							
							
							
							Port ceeb2b8c41 
							
						 
						
							2023-07-12 15:34:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								82eebd0482 
								
							 
						 
						
							
							
								
								Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream renamed an initial state parameter, where we had extra ones.
  Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
  Upstream wrapped database query in a block, we had extra database
  queries because of the DM timeline.
  Moved everything in the block. 
							
						 
						
							2023-07-12 15:27:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								9e311f95aa 
								
							 
						 
						
							
							
								
								[Glitch] simplify counters  
							
							... 
							
							
							
							Port e0d230fb37 
							
						 
						
							2023-07-12 15:18:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									alfe 
								
							 
						 
						
							
							
							
							
								
							
							
								5b9e43187c 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite <ShortNumber /> as FC and TS  
							
							... 
							
							
							
							Port 20e85c0e83 
							
						 
						
							2023-07-12 15:17:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								55ea79165a 
								
							 
						 
						
							
							
								
								[Glitch] Convert <DismissableBanner> to Typescript  
							
							... 
							
							
							
							Port 4534498a8e 
							
						 
						
							2023-07-12 15:09:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								0bfa4a990f 
								
							 
						 
						
							
							
								
								[Glitch] Fix translate button position  
							
							... 
							
							
							
							Port 9f078e238d 
							
						 
						
							2023-07-12 15:05:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								7e54a30f06 
								
							 
						 
						
							
							
								
								Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-12 15:00:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								67055b0343 
								
							 
						 
						
							
							
								
								Fix import order inconsistencies ( #2289 )  
							
							
							
						 
						
							2023-07-12 15:00:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ecd8e0d612 
								
							 
						 
						
							
							
								
								Update Stylelint ( #25819 )  
							
							
							
						 
						
							2023-07-12 12:31:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislas Signoud 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1392f31ed8 
								
							 
						 
						
							
							
								
								Fix sounds not being loaded from assets host ( #25931 )  
							
							
							
						 
						
							2023-07-12 03:02:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislas Signoud 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ca955ada0b 
								
							 
						 
						
							
							
								
								Use invariant colors on notification toasts ( #25919 )  
							
							
							
						 
						
							2023-07-11 23:30:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Wolf 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ea10febd25 
								
							 
						 
						
							
							
								
								fix buttons showing inconsistent styles ( #25903 )  
							
							
							
						 
						
							2023-07-11 12:26:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								af54bf52c8 
								
							 
						 
						
							
							
								
								Fix filters not applying to explore tab ( #25887 )  
							
							
							
						 
						
							2023-07-10 19:33:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c27b82a437 
								
							 
						 
						
							
							
								
								Add forward_to_domains parameter to POST /api/v1/reports ( #25866 )  
							
							
							
						 
						
							2023-07-10 18:26:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								338a0e70cc 
								
							 
						 
						
							
							
								
								Change label and design of sensitive and unavailable media in web UI ( #25712 )  
							
							
							
						 
						
							2023-07-08 20:05:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								41a505513f 
								
							 
						 
						
							
							
								
								Remove unused missed_update state ( #25832 )  
							
							
							
						 
						
							2023-07-08 20:02:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a7ca33ad96 
								
							 
						 
						
							
							
								
								Add toast with option to open post after publishing in web UI ( #25564 )  
							
							
							
						 
						
							2023-07-08 20:01:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a8edbcf963 
								
							 
						 
						
							
							
								
								Fix dropdowns being disabled for logged out users in web UI ( #25714 )  
							
							
							
						 
						
							2023-07-08 20:00:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ceeb2b8c41 
								
							 
						 
						
							
							
								
								Fix explore page being inaccessible when opted-out of trends in web UI ( #25716 )  
							
							
							
						 
						
							2023-07-08 20:00:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4534498a8e 
								
							 
						 
						
							
							
								
								Convert <DismissableBanner> to Typescript ( #25582 )  
							
							
							
						 
						
							2023-07-08 11:12:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									alfe 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								20e85c0e83 
								
							 
						 
						
							
							
								
								Rewrite <ShortNumber /> as FC and TS ( #25492 )  
							
							
							
						 
						
							2023-07-08 11:11:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e0d230fb37 
								
							 
						 
						
							
							
								
								simplify counters ( #25541 )  
							
							
							
						 
						
							2023-07-08 11:11:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9f078e238d 
								
							 
						 
						
							
							
								
								Fix translate button position ( #25807 )  
							
							
							
						 
						
							2023-07-08 00:12:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								513078de7a 
								
							 
						 
						
							
							
								
								Fix incorrect secondary button size ( #2276 )  
							
							
							
						 
						
							2023-07-07 09:50:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c0fa85b8dd 
								
							 
						 
						
							
							
								
								[Glitch] Fix regression of icon button colors in web UI  
							
							... 
							
							
							
							Port 69e124e2ed 
							
						 
						
							2023-07-05 13:31:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Wolf 
								
							 
						 
						
							
							
							
							
								
							
							
								4719d88117 
								
							 
						 
						
							
							
								
								[Glitch] Change button colors to increase hover/focus contrast and consistency  
							
							... 
							
							
							
							Port 54cb679c19 
							
						 
						
							2023-07-05 13:30:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a117c953d0 
								
							 
						 
						
							
							
								
								[Glitch] Add button to see results for polls in web UI  
							
							... 
							
							
							
							Port b7910bc751 
							
						 
						
							2023-07-05 12:42:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b3f209370b 
								
							 
						 
						
							
							
								
								[Glitch] Add canonical link tags in web UI  
							
							... 
							
							
							
							Port 000b835803 
							
						 
						
							2023-07-05 12:41:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mogaminsk 
								
							 
						 
						
							
							
							
							
								
							
							
								c6246807f5 
								
							 
						 
						
							
							
								
								[Glitch] Fix local live feeds does not expand  
							
							... 
							
							
							
							Port 6268188543 
							
						 
						
							2023-07-05 12:39:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									forsamori 
								
							 
						 
						
							
							
							
							
								
							
							
								ac74374311 
								
							 
						 
						
							
							
								
								[Glitch] Add at-symbol prepended to mention span title  
							
							... 
							
							
							
							Port d9a5c1acfa 
							
						 
						
							2023-07-05 12:38:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								0a5271629c 
								
							 
						 
						
							
							
								
								[Glitch] Change labels of live feeds tabs in web UI  
							
							... 
							
							
							
							Port 54a10523e2 
							
						 
						
							2023-07-05 12:37:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								5de49e74d4 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-05 12:01:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								000b835803 
								
							 
						 
						
							
							
								
								Add canonical link tags in web UI ( #25715 )  
							
							
							
						 
						
							2023-07-05 11:25:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b7910bc751 
								
							 
						 
						
							
							
								
								Add button to see results for polls in web UI ( #25726 )  
							
							
							
						 
						
							2023-07-05 10:32:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Wolf 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								182fd93a07 
								
							 
						 
						
							
							
								
								fix read more button overlapping thread line bug ( #25706 )  
							
							
							
						 
						
							2023-07-04 14:57:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mogaminsk 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6268188543 
								
							 
						 
						
							
							
								
								Fix local live feeds does not expand ( #25694 )  
							
							
							
						 
						
							2023-07-04 00:37:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									forsamori 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d9a5c1acfa 
								
							 
						 
						
							
							
								
								Add at-symbol prepended to mention span title ( #25684 )  
							
							... 
							
							
							
							Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com> 
							
						 
						
							2023-07-03 22:58:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								54a10523e2 
								
							 
						 
						
							
							
								
								Change labels of live feeds tabs in web UI ( #25683 )  
							
							
							
						 
						
							2023-07-03 22:57:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								69e124e2ed 
								
							 
						 
						
							
							
								
								Fix regression of icon button colors in web UI ( #25679 )  
							
							
							
						 
						
							2023-07-03 16:51:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ed15893eed 
								
							 
						 
						
							
							
								
								Add regex filter back to firehose ( #2266 )  
							
							... 
							
							
							
							* Add regex filter back to firehose
The regex filter will apply to all tabs and not be automatically applied when pinned.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Keep regex when pinned
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-03 15:41:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Wolf 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								54cb679c19 
								
							 
						 
						
							
							
								
								Change button colors to increase hover/focus contrast and consistency ( #25677 )  
							
							
							
						 
						
							2023-07-03 11:32:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b422b5eebd 
								
							 
						 
						
							
							
								
								Fix showing local only toots in "All" ( #2265 )  
							
							... 
							
							
							
							* Fix warnings about missing dependency in hooks
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Add `allowLocalOnly` to timelineId
Without this local-only toots will never be loaded.
feedType is checked to be public to not show local-only toots in the "Remote" tab.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-03 07:00:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								9f3c3f5209 
								
							 
						 
						
							
							
								
								Show local-only posts in “All” by default, and add back option to toggle it  
							
							
							
						 
						
							2023-07-02 20:28:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mogaminsk 
								
							 
						 
						
							
							
							
							
								
							
							
								587ddc2c7f 
								
							 
						 
						
							
							
								
								[Glitch] Prevent duplicate concurrent calls of /api/*/instance in web UI  
							
							... 
							
							
							
							Port 5b46345459 
							
						 
						
							2023-07-02 12:00:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c49e339c89 
								
							 
						 
						
							
							
								
								[Glitch] Change dropdown icon above compose form from ellipsis to bars in web UI  
							
							... 
							
							
							
							Port 0512537eb6 
							
						 
						
							2023-07-02 11:59:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								7cc2c1be29 
								
							 
						 
						
							
							
								
								[Glitch] Change local and federated timelines to be in a single firehose column  
							
							... 
							
							
							
							Port cea9db5a0b 
							
						 
						
							2023-07-02 11:58:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								eb1cb8224a 
								
							 
						 
						
							
							
								
								[Glitch] Use an Immutable Record as the root state  
							
							... 
							
							
							
							Port 78ba12f0bf 
							
						 
						
							2023-07-02 11:55:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								2ba4773ebe 
								
							 
						 
						
							
							
								
								[Glitch] Fix onboarding prompt being displayed because of disconnection gaps  
							
							... 
							
							
							
							Port 9934949fc4 
							
						 
						
							2023-07-02 11:55:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								b75aa6b819 
								
							 
						 
						
							
							
								
								[Glitch] Remove the search button from UI header when logged out  
							
							... 
							
							
							
							Port 285a691936 
							
						 
						
							2023-07-02 11:54:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								44e98a2740 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-02 11:49:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mogaminsk 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5b46345459 
								
							 
						 
						
							
							
								
								Prevent duplicate concurrent calls of /api/*/instance in web UI ( #25663 )  
							
							
							
						 
						
							2023-07-02 11:12:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0512537eb6 
								
							 
						 
						
							
							
								
								Change dropdown icon above compose form from ellipsis to bars in web UI ( #25661 )  
							
							
							
						 
						
							2023-07-02 10:39:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cea9db5a0b 
								
							 
						 
						
							
							
								
								Change local and federated timelines to be in a single firehose column ( #25641 )  
							
							
							
						 
						
							2023-07-02 00:05:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								78ba12f0bf 
								
							 
						 
						
							
							
								
								Use an Immutable Record as the root state ( #25584 )  
							
							
							
						 
						
							2023-06-30 17:03:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9934949fc4 
								
							 
						 
						
							
							
								
								Fix onboarding prompt being displayed because of disconnection gaps ( #25617 )  
							
							
							
						 
						
							2023-06-30 16:32:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								285a691936 
								
							 
						 
						
							
							
								
								Remove the search button from UI header when logged out ( #25631 )  
							
							
							
						 
						
							2023-06-28 14:57:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								c43cfd2406 
								
							 
						 
						
							
							
								
								[Glitch] Improve dismissable banner buttons when they dont fit on 1 line  
							
							... 
							
							
							
							Port ae30a60b1f 
							
						 
						
							2023-06-27 13:25:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4faa4eb3c4 
								
							 
						 
						
							
							
								
								[Glitch] Fix onboarding prompt flashing while home feed is loading in web UI  
							
							... 
							
							
							
							Port 65aa04647a 
							
						 
						
							2023-06-27 13:21:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2f996375e5 
								
							 
						 
						
							
							
								
								[Glitch] Fix search not being easily findable on smaller screens in web UI  
							
							... 
							
							
							
							Port 2b78c07ef1 
							
						 
						
							2023-06-27 13:21:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								80a5c16ae1 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-06-27 13:15:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ae30a60b1f 
								
							 
						 
						
							
							
								
								Improve dismissable banner buttons when they dont fit on 1 line ( #25580 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-06-26 12:31:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ed96e28c9e 
								
							 
						 
						
							
							
								
								Fix compose form not being shown when clicking “Make your first post” on mobile ( #25581 )  
							
							
							
						 
						
							2023-06-26 12:30:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7b024baf50 
								
							 
						 
						
							
							
								
								Change header backgrounds to use fewer different colors in web UI ( #25577 )  
							
							
							
						 
						
							2023-06-26 05:27:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								65aa04647a 
								
							 
						 
						
							
							
								
								Fix onboarding prompt flashing while home feed is loading in web UI ( #25579 )  
							
							
							
						 
						
							2023-06-26 05:26:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2b78c07ef1 
								
							 
						 
						
							
							
								
								Fix search not being easily findable on smaller screens in web UI ( #25576 )  
							
							
							
						 
						
							2023-06-26 05:26:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								5def74a436 
								
							 
						 
						
							
							
								
								[Glitch] Remove unique accounts condition from Home onboarding prompt  
							
							... 
							
							
							
							Port 0842a68532 
							
						 
						
							2023-06-25 17:40:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								6fb34258a4 
								
							 
						 
						
							
							
								
								[Glitch] Add onboarding prompt when home feed too slow in web UI  
							
							... 
							
							
							
							Port 00ec43914a 
							
						 
						
							2023-06-25 17:40:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								7d160d2272 
								
							 
						 
						
							
							
								
								[Glitch] Fix j/k keyboard shortcuts on some status lists  
							
							... 
							
							
							
							Port a8c1c8bd37 
							
						 
						
							2023-06-25 17:40:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mogaminsk 
								
							 
						 
						
							
							
							
							
								
							
							
								222713a768 
								
							 
						 
						
							
							
								
								[Glitch] Fix custom signup URL may not loaded  
							
							... 
							
							
							
							Port 8d2c26834f 
							
						 
						
							2023-06-25 14:27:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ian 
								
							 
						 
						
							
							
							
							
								
							
							
								6fe345c383 
								
							 
						 
						
							
							
								
								[Glitch] Change emoji picker icon  
							
							... 
							
							
							
							Port 69db507924 
							
						 
						
							2023-06-25 14:27:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
							
							
								
							
							
								c71fc42f4e 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite <AutosuggestHashtag /> as FC and TS  
							
							... 
							
							
							
							Port 804488d38e 
							
						 
						
							2023-06-25 14:27:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								178e151019 
								
							 
						 
						
							
							
								
								Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a constraint on a setting textually close
  to glitch-soc-only settings.
  Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for the `translate` attribute on a few elements,
  where glitch-soc had a different set of allowed elements and attributes.
  Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored to use RSpec's `instance_double` instead of `double`,
  but glitch-soc had changes to tests due to configurable max toot chars.
  Applied upstream's changes while keeping tests against configurable max
  toot chars. 
							
						 
						
							2023-06-25 14:27:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								55e7c08a83 
								
							 
						 
						
							
							
								
								Fix verified badge in account lists potentially including rel="me" links ( #25561 )  
							
							
							
						 
						
							2023-06-24 17:24:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a985d587e1 
								
							 
						 
						
							
							
								
								Change labels and styles on the onboarding screen in web UI ( #25559 )  
							
							
							
						 
						
							2023-06-23 16:34:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0842a68532 
								
							 
						 
						
							
							
								
								Remove unique accounts condition from Home onboarding prompt ( #25556 )  
							
							
							
						 
						
							2023-06-23 14:44:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								00ec43914a 
								
							 
						 
						
							
							
								
								Add onboarding prompt when home feed too slow in web UI ( #25267 )  
							
							
							
						 
						
							2023-06-22 23:48:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a8c1c8bd37 
								
							 
						 
						
							
							
								
								Fix j/k keyboard shortcuts on some status lists ( #25554 )  
							
							
							
						 
						
							2023-06-22 17:54:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mogaminsk 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8d2c26834f 
								
							 
						 
						
							
							
								
								Fix custom signup URL may not loaded ( #25531 )  
							
							
							
						 
						
							2023-06-22 12:10:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ian 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								69db507924 
								
							 
						 
						
							
							
								
								Change emoji picker icon ( #25479 )  
							
							
							
						 
						
							2023-06-21 17:58:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								804488d38e 
								
							 
						 
						
							
							
								
								Rewrite <AutosuggestHashtag /> as FC and TS ( #25481 )  
							
							
							
						 
						
							2023-06-19 14:11:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								3b04e39534 
								
							 
						 
						
							
							
								
								[Glitch] Fix non-interactive upload container being given a button role and tabIndex  
							
							... 
							
							
							
							Port c9d06d10d4 
							
						 
						
							2023-06-18 14:10:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								6c99479ef4 
								
							 
						 
						
							
							
								
								Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/views/settings/profiles/show.html.haml`:
  Upstream redesigned the settings page, where glitch-soc had changes because of
  the ability to set some custom limits.
  Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
  Upstream updated dependencies textually close to a glitch-soc-only dependency.
  Updated the dependnencies as well. 
							
						 
						
							2023-06-18 13:41:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								d795c2c70c 
								
							 
						 
						
							
							
								
								[Glitch] Fix CAPTCHA page not following design pattern of sign-up flow  
							
							... 
							
							
							
							Port 39110d1d0a 
							
						 
						
							2023-06-18 12:11:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
							
							
								
							
							
								b1b95ddd1f 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite emoji_mart_data_light as TS  
							
							... 
							
							
							
							Port 3b5e302f7f 
							
						 
						
							2023-06-18 12:11:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									alfe 
								
							 
						 
						
							
							
							
							
								
							
							
								9bf63257fb 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite <LoadingIndicator/> as FC and TS ( #25364 )  
							
							... 
							
							
							
							Port a86886b1fd 
							
						 
						
							2023-06-18 12:10:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								0a212cfa7f 
								
							 
						 
						
							
							
								
								[Glitch] Add missing report category translation  
							
							... 
							
							
							
							Port 1cb4514d0e 
							
						 
						
							2023-06-18 10:43:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									alfe 
								
							 
						 
						
							
							
							
							
								
							
							
								cdec45eca9 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite <LoadPending /> as FC and TS  
							
							... 
							
							
							
							Port dfaf59d99a 
							
						 
						
							2023-06-18 10:42:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f815bd5fd9 
								
							 
						 
						
							
							
								
								[Glitch] Change "bot" label to "automated"  
							
							... 
							
							
							
							Port 432a5d2d4b 
							
						 
						
							2023-06-18 10:40:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								65cbcce997 
								
							 
						 
						
							
							
								
								Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-06-18 10:36:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c9d06d10d4 
								
							 
						 
						
							
							
								
								Fix non-interactive upload container being given a button role and tabIndex ( #25462 )  
							
							
							
						 
						
							2023-06-16 12:03:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f20698000f 
								
							 
						 
						
							
							
								
								Fix always redirecting to onboarding in web UI ( #25396 )  
							
							
							
						 
						
							2023-06-14 09:05:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								39110d1d0a 
								
							 
						 
						
							
							
								
								Fix CAPTCHA page not following design pattern of sign-up flow ( #25395 )  
							
							
							
						 
						
							2023-06-13 22:30:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3b5e302f7f 
								
							 
						 
						
							
							
								
								Rewrite emoji_mart_data_light as TS ( #25138 )  
							
							
							
						 
						
							2023-06-13 19:28:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									alfe 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a86886b1fd 
								
							 
						 
						
							
							
								
								Rewrite <LoadingIndicator/> as FC and TS  ( #25364 )  
							
							
							
						 
						
							2023-06-13 19:26:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1cb4514d0e 
								
							 
						 
						
							
							
								
								Add missing report category translation ( #25400 )  
							
							
							
						 
						
							2023-06-13 15:05:40 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									alfe 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dfaf59d99a 
								
							 
						 
						
							
							
								
								Rewrite <LoadPending /> as FC and TS ( #25363 )  
							
							
							
						 
						
							2023-06-11 04:47:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								432a5d2d4b 
								
							 
						 
						
							
							
								
								Change "bot" label to "automated" ( #25356 )  
							
							
							
						 
						
							2023-06-11 04:47:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								20718a8b59 
								
							 
						 
						
							
							
								
								Fix some translation strings inconsistencies  
							
							
							
						 
						
							2023-06-10 19:21:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								34efd1a24c 
								
							 
						 
						
							
							
								
								Switch to using a common runtime chunk rather than locales  
							
							
							
						 
						
							2023-06-10 17:43:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								fb0d2de8fe 
								
							 
						 
						
							
							
								
								[Glitch] Change design of dropdowns in web UI  
							
							... 
							
							
							
							Port e4fd9503ec 
							
						 
						
							2023-06-10 17:10:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									alfe 
								
							 
						 
						
							
							
							
							
								
							
							
								83ae40e192 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite <LoadMore /> as FC and TS  
							
							... 
							
							
							
							Port fb5bf5cbf8 
							
						 
						
							2023-06-10 16:59:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c48ec9cb8c 
								
							 
						 
						
							
							
								
								Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/initializers/content_security_policy.rb`:
  Kept our version, it was not affected by upstream's bug. 
							
						 
						
							2023-06-10 16:48:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								88c5ad3136 
								
							 
						 
						
							
							
								
								[Glitch] Add data-nosnippet so Google doesn't use trending posts in snippets for /  
							
							... 
							
							
							
							Port 1483a3ddfe 
							
						 
						
							2023-06-10 16:38:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									S.H 
								
							 
						 
						
							
							
							
							
								
							
							
								5a961f84cf 
								
							 
						 
						
							
							
								
								[Glitch] Fix not shown announcements in hometimeline.  
							
							... 
							
							
							
							Port a6c898f501 
							
						 
						
							2023-06-10 16:37:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								475185a2ee 
								
							 
						 
						
							
							
								
								[Glitch] Fix design issues with recent react-intl upgrade  
							
							... 
							
							
							
							Port c2c396157f 
							
						 
						
							2023-06-10 16:36:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Darius Kazemi 
								
							 
						 
						
							
							
							
							
								
							
							
								a8a30f1298 
								
							 
						 
						
							
							
								
								[Glitch] Add exclusive lists  
							
							... 
							
							
							
							Port bacb674921 
							
						 
						
							2023-06-10 16:36:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								bf23afa059 
								
							 
						 
						
							
							
								
								[Glitch] Add card with who invited you to join when displaying rules on sign-up  
							
							... 
							
							
							
							Port SCSS from 0766c9a631 
							
						 
						
							2023-06-10 16:30:36 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								d8b0a732aa 
								
							 
						 
						
							
							
								
								Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/initializers/simple_form.rb`:
  Upstream added a new simple_form component, where we had an extra one.
  Kept both components. 
							
						 
						
							2023-06-10 16:22:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								9e66c07be7 
								
							 
						 
						
							
							
								
								[Glitch] Fix /share and cleanup and reorganize frontend locale loading  
							
							... 
							
							
							
							Port b0780cfeed 
							
						 
						
							2023-06-10 16:18:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								734e186717 
								
							 
						 
						
							
							
								
								Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/mastodon/load_locale.js`:
  The file moved to `app/javascript/mastodon/locales/load_locale.ts`.
  Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`.
- `app/javascript/mastodon/locales/index.js`:
  The file moved to `app/javascript/mastodon/locales/index.ts`.
  Did *not* port the changes as I want to try something a bit different. 
							
						 
						
							2023-06-10 15:32:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									S.H 
								
							 
						 
						
							
							
							
							
								
							
							
								a4d7a17089 
								
							 
						 
						
							
							
								
								[Glitch] Fix using Date.now() instead of intl.now()  
							
							... 
							
							
							
							Port b3f9a0da52 
							
						 
						
							2023-06-10 15:21:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								aa57f7e3e2 
								
							 
						 
						
							
							
								
								Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-06-10 15:17:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								9af04d5a46 
								
							 
						 
						
							
							
								
								[Glitch] Add a confirmation screen when suspending a domain  
							
							... 
							
							
							
							Port e9385e93e9 
							
						 
						
							2023-06-10 15:10:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								b27a9a5903 
								
							 
						 
						
							
							
								
								Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-06-10 15:09:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								8188522bde 
								
							 
						 
						
							
							
								
								[Glitch] Fix prev/next buttons color in media viewer  
							
							... 
							
							
							
							Port 675672feb6 
							
						 
						
							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 
								
							 
						 
						
							
							
							
							
								
							
							
								93c714417f 
								
							 
						 
						
							
							
								
								Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `package.json`:
  Upstream changed various script definitions in lines surrounding the one for
  `i18n:extract`, which had glitch-soc-specific changes.
  Updated the scripts as upstream did, while keeping our changes to
  `i18n:extract`. 
							
						 
						
							2023-06-10 14:38:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								9e133e2527 
								
							 
						 
						
							
							
								
								[Glitch] Upgrade react-intl  
							
							... 
							
							
							
							Port 44cd88adc4 
							
						 
						
							2023-06-10 14:37:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								85722a918d 
								
							 
						 
						
							
							
								
								Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, but we've deleted it.
  Keep it deleted.
- `app/javascript/mastodon/locales/index.js`:
  Reworked upstream, but the code was mostly in
  `app/javascript/locales/index.js` in glitch-soc.
  Updated that file accordingly.
- `app/javascript/packs/public.jsx`:
  Not a real conflict, but different imports in
  glitch-soc and upstream.
- `app/views/layouts/application.html.haml`:
  Conflict due to locales loading and theme system
  discrepancies.
  Updated in our own way.
- `app/views/layouts/embedded.html.haml`:
  Conflict due to locales loading and theme system
  discrepancies.
  Updated in our own way.
- `config/webpack/generateLocalePacks.js`:
  Deleted upstream, as upstream now directly loads the
  JSON at runtime.
  Deleted as well, will switch to runtime loading in
  an upcoming commit.
- `config/webpack/shared.js`:
  Not a real conflict, but different imports in
  glitch-soc and upstream.
- `config/webpack/translationRunner.js`:
  Mostly deleted upstream, to be replaced with `formatjs-formatter.js`
  instead.
  Moved the glitch-soc logic there and deleted the file. 
							
						 
						
							2023-06-10 12:38:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								67d17ce194 
								
							 
						 
						
							
							
								
								Add legal as report category ( #23941 )  
							
							
							
						 
						
							2023-06-06 23:41:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e4fd9503ec 
								
							 
						 
						
							
							
								
								Change design of dropdowns in web UI ( #25107 )  
							
							
							
						 
						
							2023-06-06 21:49:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									alfe 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fb5bf5cbf8 
								
							 
						 
						
							
							
								
								Rewrite <LoadMore /> as FC and TS  ( #25259 )  
							
							
							
						 
						
							2023-06-06 11:28:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6833732852 
								
							 
						 
						
							
							
								
								Fix autocomplete suggestions being cut off in compose form ( #25275 )  
							
							
							
						 
						
							2023-06-06 11:05:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0ddc895282 
								
							 
						 
						
							
							
								
								Change follow button in account row to be more obvious in web UI ( #24956 )  
							
							
							
						 
						
							2023-06-06 04:14:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1483a3ddfe 
								
							 
						 
						
							
							
								
								Add data-nosnippet so Google doesn't use trending posts in snippets for / ( #25279 )  
							
							
							
						 
						
							2023-06-05 17:32:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									S.H 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a6c898f501 
								
							 
						 
						
							
							
								
								Fix not shown announcements in hometimeline. ( #25251 )  
							
							
							
						 
						
							2023-06-05 14:49:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								7fc1297c3e 
								
							 
						 
						
							
							
								
								[Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0  
							
							... 
							
							
							
							Port 89d6341c80 
							
						 
						
							2023-06-05 13:31:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								5e876c2901 
								
							 
						 
						
							
							
								
								[Glitch] Fix null signUp URL in various places  
							
							... 
							
							
							
							Port 14bb6bb29a 
							
						 
						
							2023-06-05 13:28:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									y.takahashi 
								
							 
						 
						
							
							
							
							
								
							
							
								4993b6e800 
								
							 
						 
						
							
							
								
								[Glitch] Handle Surrogate Pairs in truncate()  
							
							... 
							
							
							
							Port 64b960b6b3 
							
						 
						
							2023-06-05 13:28:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c22fc2fa80 
								
							 
						 
						
							
							
								
								Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's changes. 
							
						 
						
							2023-06-05 13:25:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c2c396157f 
								
							 
						 
						
							
							
								
								Fix design issues with recent react-intl upgrade ( #25272 )  
							
							
							
						 
						
							2023-06-05 09:52:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Darius Kazemi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bacb674921 
								
							 
						 
						
							
							
								
								Add exclusive lists ( #22048 )  
							
							... 
							
							
							
							Co-authored-by: Liam Cooke <liam@liamcooke.com>
Co-authored-by: John Holdun <john@johnholdun.com>
Co-authored-by: Effy Elden <effy@effy.space>
Co-authored-by: Lina Reyne <git@lina.pizza>
Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-06-05 09:37:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4a5464f360 
								
							 
						 
						
							
							
								
								Change "Follow 7 people" to "Find at least 7 people to follow" in web UI ( #24954 )  
							
							
							
						 
						
							2023-06-05 01:42:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ee771f5bad 
								
							 
						 
						
							
							
								
								Fix closeModal invocation ( #2239 )  
							
							... 
							
							
							
							Fixes  #2238 
Some call sites where missed in 382b2a506a 
						
							2023-06-04 22:05:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0766c9a631 
								
							 
						 
						
							
							
								
								Add card with who invited you to join when displaying rules on sign-up ( #23475 )  
							
							
							
						 
						
							2023-06-02 18:35:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jed Fox 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								acc419b81b 
								
							 
						 
						
							
							
								
								Fix spacing of middle dots in the detailed status meta section ( #25247 )  
							
							
							
						 
						
							2023-06-02 15:40:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b0780cfeed 
								
							 
						 
						
							
							
								
								Fix /share and cleanup and reorganize frontend locale loading ( #25240 )  
							
							
							
						 
						
							2023-06-02 15:00:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5fae2de454 
								
							 
						 
						
							
							
								
								Fix overflow behavior of account rows ( #25131 )  
							
							
							
						 
						
							2023-06-01 14:47:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									S.H 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b3f9a0da52 
								
							 
						 
						
							
							
								
								Fix using Date.now() instead of intl.now() ( #25234 )  
							
							
							
						 
						
							2023-06-01 13:46:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e9385e93e9 
								
							 
						 
						
							
							
								
								Add a confirmation screen when suspending a domain ( #25144 )  
							
							
							
						 
						
							2023-06-01 09:37:38 +02:00