d76106da12 
								
							 
						 
						
							
							
								
								Merge commit 'ccb6aeddacbab950d7d7f1b0d2b64212d7aa99eb' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-24 17:08:21 +02:00  
				
					
						
							
							
								 
						
							
								54351d01f2 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30410 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-05-24 08:26:38 +00:00  
				
					
						
							
							
								 
						
							
								8ea2726376 
								
							 
						 
						
							
							
								
								Fix a leftover argument to `api()` ( #30405 )  
							
							
							
						 
						
							2024-05-24 08:25:42 +00:00  
				
					
						
							
							
								 
						
							
								e32bfad88a 
								
							 
						 
						
							
							
								
								[Glitch] Fix `createDataLoadingThunk` and related actions  
							
							... 
							
							
							
							Port b6fd14f0e2 
							
						 
						
							2024-05-23 20:37:00 +02:00  
				
					
						
							
							
								 
						
							
								8d6058b40a 
								
							 
						 
						
							
							
								
								[Glitch] Proposal: a modern & typed way of writing Redux actions doing API requests  
							
							... 
							
							
							
							Port 10ec421dd4 
							
						 
						
							2024-05-23 20:33:05 +02:00  
				
					
						
							
							
								 
						
							
								51631c785f 
								
							 
						 
						
							
							
								
								Merge commit 'b6fd14f0e2842eca269ef8962e3c5bd560a76357' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/lib/activitypub/parser/status_parser.rb`:
  Glitch-soc had changes to adjacent lines.
  Ported upstream's changes. 
							
						 
						
							2024-05-23 20:30:23 +02:00  
				
					
						
							
							
								 
						
							
								b6fd14f0e2 
								
							 
						 
						
							
							
								
								Fix `createDataLoadingThunk` and related actions ( #30408 )  
							
							
							
						 
						
							2024-05-23 18:22:42 +00:00  
				
					
						
							
							
								 
						
							
								c465ef7560 
								
							 
						 
						
							
							
								
								[Glitch] Fix some API calls that should not use an API token  
							
							... 
							
							
							
							Port 15d3070754 
							
						 
						
							2024-05-23 20:11:20 +02:00  
				
					
						
							
							
								 
						
							
								0e8633f6c7 
								
							 
						 
						
							
							
								
								Merge commit '3a862439dfc989c6c5741e007c2f4e0335fffe33' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-23 20:11:12 +02:00  
				
					
						
							
							
								 
						
							
								10ec421dd4 
								
							 
						 
						
							
							
								
								Proposal: a modern & typed way of writing Redux actions doing API requests ( #30270 )  
							
							
							
						 
						
							2024-05-23 09:50:13 +00:00  
				
					
						
							
							
								 
						
							
								5b5a35cf96 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30402 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-05-23 08:26:29 +00:00  
				
					
						
							
							
								 
						
							
								15d3070754 
								
							 
						 
						
							
							
								
								Fix some API calls that should not use an API token ( #30401 )  
							
							
							
						 
						
							2024-05-23 07:30:48 +00:00  
				
					
						
							
							
								 
						
							
								3e9298370d 
								
							 
						 
						
							
							
								
								[Glitch] Remove the access token from Redux & context  
							
							... 
							
							
							
							Port 2c5ab8f647 
							
						 
						
							2024-05-22 21:14:54 +02:00  
				
					
						
							
							
								 
						
							
								22d12229b2 
								
							 
						 
						
							
							
								
								Merge commit '2c5ab8f647841ea8075ece50ccc9e12c21af8720' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-22 21:05:19 +02:00  
				
					
						
							
							
								 
						
							
								2c5ab8f647 
								
							 
						 
						
							
							
								
								Remove the access token from Redux & context ( #30275 )  
							
							
							
						 
						
							2024-05-22 14:45:18 +00:00  
				
					
						
							
							
								 
						
							
								a2b4c29c8f 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30394 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-05-22 07:57:51 +00:00  
				
					
						
							
							
								 
						
							
								dc35563f65 
								
							 
						 
						
							
							
								
								[Glitch] Fix announcements icon rotating like settings one  
							
							... 
							
							
							
							Port cd0c547936 
							
						 
						
							2024-05-21 17:45:59 +02:00  
				
					
						
							
							
								 
						
							
								5ab111554e 
								
							 
						 
						
							
							
								
								Merge commit 'cd0c5479362260082dbe1cbc42e364017853bbfc' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-21 17:45:21 +02:00  
				
					
						
							
							
								 
						
							
								cd0c547936 
								
							 
						 
						
							
							
								
								Fix announcements icon rotating like settings one ( #30388 )  
							
							
							
						 
						
							2024-05-21 15:24:51 +00:00  
				
					
						
							
							
								 
						
							
								d3136e6d58 
								
							 
						 
						
							
							
								
								Merge commit '89f89d738f5840c80ff938f8bf6734cdafe0fa83' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-21 12:06:38 +02:00  
				
					
						
							
							
								 
						
							
								eda2bdfc7a 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30383 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-05-21 08:48:36 +00:00  
				
					
						
							
							
								 
						
							
								ca5955ed76 
								
							 
						 
						
							
							
								
								[Glitch] Use a modern React context for identity in the app  
							
							... 
							
							
							
							Port a178ba7cd5 
							
						 
						
							2024-05-20 12:53:52 +02:00  
				
					
						
							
							
								 
						
							
								e46321e63d 
								
							 
						 
						
							
							
								
								Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-20 12:17:36 +02:00  
				
					
						
							
							
								 
						
							
								8b75d18371 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30358 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-05-20 07:41:38 +00:00  
				
					
						
							
							
								 
						
							
								990a0c19a9 
								
							 
						 
						
							
							
								
								Fix a warning when running JS Tests because of FakeIdentityContext using deprecated context API ( #30368 )  
							
							
							
						 
						
							2024-05-20 07:29:27 +00:00  
				
					
						
							
							
								 
						
							
								a178ba7cd5 
								
							 
						 
						
							
							
								
								Use a modern React context for identity in the app ( #30098 )  
							
							
							
						 
						
							2024-05-19 17:07:32 +00:00  
				
					
						
							
							
								 
						
							
								7b078b46a2 
								
							 
						 
						
							
							
								
								[Glitch] Fix Web UI trying to save user settings when logged out  
							
							... 
							
							
							
							Port 66906a1bc1 
							
						 
						
							2024-05-16 19:34:50 +02:00  
				
					
						
							
							
								 
						
							
								061464a563 
								
							 
						 
						
							
							
								
								[Glitch] Fix incorrect element selector from  #30221  
							
							... 
							
							
							
							Port 94493cff92 
							
						 
						
							2024-05-16 19:34:17 +02:00  
				
					
						
							
							
								 
						
							
								2810231180 
								
							 
						 
						
							
							
								
								Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Upstream renamed a helper method everywhere.
  There was one glitch-soc line involving changes because of the local-only post
  feature.
  Ported upstream's change. 
							
						 
						
							2024-05-16 19:30:10 +02:00  
				
					
						
							
							
								 
						
							
								66906a1bc1 
								
							 
						 
						
							
							
								
								Fix Web UI trying to save user settings when logged out ( #30324 )  
							
							
							
						 
						
							2024-05-16 13:01:01 +00:00  
				
					
						
							
							
								 
						
							
								cdb042ae86 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30319 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-05-16 07:50:19 +00:00  
				
					
						
							
							
								 
						
							
								94493cff92 
								
							 
						 
						
							
							
								
								Fix incorrect element selector from  #30221  ( #30307 )  
							
							
							
						 
						
							2024-05-16 07:33:29 +00:00  
				
					
						
							
							
								 
						
							
								aad5e841b5 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30290 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-05-15 08:53:57 +00:00  
				
					
						
							
							
								 
						
							
								47ce5f4ca9 
								
							 
						 
						
							
							
								
								[Glitch] Fix missing prop warning for `<Account>`  
							
							... 
							
							
							
							Port 1bf661cddb 
							
						 
						
							2024-05-14 20:53:40 +02:00  
				
					
						
							
							
								 
						
							
								160823716a 
								
							 
						 
						
							
							
								
								[Glitch] Add active animation to header settings button  
							
							... 
							
							
							
							Port cb93c1edf0 
							
						 
						
							2024-05-14 20:53:01 +02:00  
				
					
						
							
							
								 
						
							
								666760f450 
								
							 
						 
						
							
							
								
								Merge commit '1bf661cddbc614d4076e9d9e855575fc29e976c0' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `package.json`:
  Upstream fixed a command we have modified in glitch-soc.
  Updated as upstream did. 
							
						 
						
							2024-05-14 20:47:14 +02:00  
				
					
						
							
							
								 
						
							
								1bf661cddb 
								
							 
						 
						
							
							
								
								Fix missing prop warning for `<Account>` ( #30291 )  
							
							
							
						 
						
							2024-05-14 18:15:42 +00:00  
				
					
						
							
							
								 
						
							
								3a7aec2807 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30254 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-05-13 11:30:41 +00:00  
				
					
						
							
							
								 
						
							
								cb93c1edf0 
								
							 
						 
						
							
							
								
								Add active animation to header settings button ( #30221 )  
							
							
							
						 
						
							2024-05-13 09:19:42 +00:00  
				
					
						
							
							
								 
						
							
								f65a6d50f1 
								
							 
						 
						
							
							
								
								[Glitch] Fix typo  
							
							... 
							
							
							
							Port c36a8786c1 
							
						 
						
							2024-05-11 22:44:41 +02:00  
				
					
						
							
							
								 
						
							
								f35ba6963d 
								
							 
						 
						
							
							
								
								Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-11 22:10:56 +02:00  
				
					
						
							
							
								 
						
							
								c9557bdd3b 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30215 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-05-10 09:34:48 +00:00  
				
					
						
							
							
								 
						
							
								c36a8786c1 
								
							 
						 
						
							
							
								
								Fix typo ( #30224 )  
							
							
							
						 
						
							2024-05-10 09:19:27 +00:00  
				
					
						
							
							
								 
						
							
								f7dadc9f0b 
								
							 
						 
						
							
							
								
								Merge commit '5cd13ee4f19c112ea855063c2495e2874746f23a' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-07 12:13:02 +02:00  
				
					
						
							
							
								 
						
							
								ed556db395 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30201 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-05-07 09:36:16 +00:00  
				
					
						
							
							
								 
						
							
								016d194274 
								
							 
						 
						
							
							
								
								Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, upstream added helpers right next to glitch-soc only
  helpers.
  Added upstream's helpers.
- `spec/models/status_spec.rb`:
  Not a real conflict, upstream added specs right next to glitch-soc only
  specs.
  Added upstream's tests. 
							
						 
						
							2024-05-06 17:53:51 +02:00  
				
					
						
							
							
								 
						
							
								9be2c02e52 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30169 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-05-06 08:36:29 +00:00  
				
					
						
							
							
								 
						
							
								c59f6ef5b8 
								
							 
						 
						
							
							
								
								[Glitch] Convert `entrypoints/two_factor_authentication` to Typescript  
							
							... 
							
							
							
							Port 9e260014c7 
							
						 
						
							2024-05-04 16:30:24 +02:00  
				
					
						
							
							
								 
						
							
								b6ada33ad4 
								
							 
						 
						
							
							
								
								[Glitch] Fix word breaking in filtered notifications badge  
							
							... 
							
							
							
							Port 616e2f2666 
							
						 
						
							2024-05-04 16:30:05 +02:00  
				
					
						
							
							
								 
						
							
								3789d9f825 
								
							 
						 
						
							
							
								
								Merge commit 'b7902225d698a107df2cf8b4ca221caad38fa464' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS`
  while glitch-soc had custom code to read from `MAX_TOOT_CHARS`.
  Switched to using upstream's implementation of the tests. 
							
						 
						
							2024-05-04 16:28:30 +02:00