d6609635cb 
								
							 
						 
						
							
							
								
								[Glitch] Add a version comment to the emoji preval-ed file so it is regenerated  
							
							... 
							
							
							
							Port 383be173af 
							
						 
						
							2024-01-13 12:39:09 +01:00  
				
					
						
							
							
								 
						
							
								ca31b4de3a 
								
							 
						 
						
							
							
								
								[Glitch] Add new emojis from `jdecked/twemoji` 15.0  
							
							... 
							
							
							
							Port b6e353537b 
							
						 
						
							2024-01-13 12:39:09 +01:00  
				
					
						
							
							
								 
						
							
								a3b6a85521 
								
							 
						 
						
							
							
								
								Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.prettierignore`:
  Conflict due to glitch-soc-only files.
  Kept those at the end of the file. 
							
						 
						
							2024-01-13 12:11:29 +01:00  
				
					
						
							
							
								 
						
							
								6bbcd9348e 
								
							 
						 
						
							
							
								
								Switch from 48px weight 600 material symbol icons to 24px weight 400 icons ( #28064 )  
							
							
							
						 
						
							2024-01-12 20:16:48 +00:00  
				
					
						
							
							
								 
						
							
								608f66f978 
								
							 
						 
						
							
							
								
								Change icon SVG imports to use a default import ( #28709 )  
							
							
							
						 
						
							2024-01-12 10:31:24 +00:00  
				
					
						
							
							
								 
						
							
								c6684aa1e3 
								
							 
						 
						
							
							
								
								Use the assets pipeline to load `inert.css` ( #28701 )  
							
							
							
						 
						
							2024-01-12 09:32:45 +00:00  
				
					
						
							
							
								 
						
							
								b86083f0dc 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28708 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-01-12 09:17:10 +00:00  
				
					
						
							
							
								 
						
							
								383be173af 
								
							 
						 
						
							
							
								
								Add a version comment to the emoji preval-ed file so it is regenerated ( #28700 )  
							
							
							
						 
						
							2024-01-12 03:39:11 +00:00  
				
					
						
							
							
								 
						
							
								15bc13c65b 
								
							 
						 
						
							
							
								
								Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-11 20:15:19 +01:00  
				
					
						
							
							
								 
						
							
								b6e353537b 
								
							 
						 
						
							
							
								
								Add new emojis from `jdecked/twemoji` 15.0 ( #28404 )  
							
							
							
						 
						
							2024-01-11 16:15:08 +00:00  
				
					
						
							
							
								 
						
							
								630b245bb4 
								
							 
						 
						
							
							
								
								Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/lib/settings/scoped_settings.rb`:
  Removed upstream, while glitch-soc had a change related to its theming system.
  Removed as well, as it's unused. 
							
						 
						
							2024-01-11 12:59:27 +01:00  
				
					
						
							
							
								 
						
							
								e5b97eadd5 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #2502 )  
							
							... 
							
							
							
							* New Crowdin translations
* Update no.yml
* Update simple_form.no.yml
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2024-01-11 12:56:56 +01:00  
				
					
						
							
							
								 
						
							
								204bbf49d2 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28692 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-01-11 10:08:49 +00:00  
				
					
						
							
							
								 
						
							
								47d213e701 
								
							 
						 
						
							
							
								
								Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-10 18:41:04 +01:00  
				
					
						
							
							
								 
						
							
								09376a8207 
								
							 
						 
						
							
							
								
								[Glitch] Upgrade Redux packages  
							
							... 
							
							
							
							Port a0e237a96f 
							
						 
						
							2024-01-10 18:34:23 +01:00  
				
					
						
							
							
								 
						
							
								51d2d98174 
								
							 
						 
						
							
							
								
								Merge commit 'a0e237a96fca2774d3c9ed43063a45e395bb7f40' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-10 18:26:47 +01:00  
				
					
						
							
							
								 
						
							
								7cd88ae2f4 
								
							 
						 
						
							
							
								
								[Glitch] Fix scrolling to detailed status not always working  
							
							... 
							
							
							
							Port d0fd14f851 
							
						 
						
							2024-01-10 18:02:37 +01:00  
				
					
						
							
							
								 
						
							
								0b2c7cdb02 
								
							 
						 
						
							
							
								
								Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/lib/content_security_policy.rb`:
  Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
  environment variable.
  Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`. 
							
						 
						
							2024-01-10 17:51:12 +01:00  
				
					
						
							
							
								 
						
							
								173953c23e 
								
							 
						 
						
							
							
								
								Fix ISO code for Canadian French ( #26015 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2024-01-09 10:56:13 +00:00  
				
					
						
							
							
								 
						
							
								8e7d5fe2ac 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28658 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-01-09 09:30:33 +00:00  
				
					
						
							
							
								 
						
							
								cc67943df2 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28627 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-01-08 12:46:25 +00:00  
				
					
						
							
							
								 
						
							
								a0e237a96f 
								
							 
						 
						
							
							
								
								Upgrade Redux packages ( #28585 )  
							
							
							
						 
						
							2024-01-08 10:57:40 +00:00  
				
					
						
							
							
								 
						
							
								43d800ada6 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28604 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-01-05 11:29:19 +00:00  
				
					
						
							
							
								 
						
							
								d0fd14f851 
								
							 
						 
						
							
							
								
								Fix scrolling to detailed status not always working ( #28577 )  
							
							
							
						 
						
							2024-01-04 14:17:38 +00:00  
				
					
						
							
							
								 
						
							
								bdf4750633 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28590 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-01-04 09:24:13 +00:00  
				
					
						
							
							
								 
						
							
								9d9008666b 
								
							 
						 
						
							
							
								
								Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-03 12:38:49 +01:00  
				
					
						
							
							
								 
						
							
								7cce2a41f2 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28573 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-01-03 09:19:46 +00:00  
				
					
						
							
							
								 
						
							
								48c9192b47 
								
							 
						 
						
							
							
								
								[Glitch] Fix loading local accounts with extraneous domain part in WebUI  
							
							... 
							
							
							
							Port 65ea097f1d 
							
						 
						
							2024-01-02 18:16:57 +01:00  
				
					
						
							
							
								 
						
							
								f685c953e5 
								
							 
						 
						
							
							
								
								Merge commit '3944b12b5eec8c6ae4666ec922411b32b3442dd6' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-02 18:12:28 +01:00  
				
					
						
							
							
								 
						
							
								65ea097f1d 
								
							 
						 
						
							
							
								
								Fix loading local accounts with extraneous domain part in WebUI ( #28559 )  
							
							
							
						 
						
							2024-01-02 15:02:25 +00:00  
				
					
						
							
							
								 
						
							
								0cd497ba7d 
								
							 
						 
						
							
							
								
								[Glitch] Fix OCR when using S3/CDN for assets  
							
							... 
							
							
							
							Port fdec8d7ffb 
							
						 
						
							2024-01-02 13:37:04 +01:00  
				
					
						
							
							
								 
						
							
								b3542ac57b 
								
							 
						 
						
							
							
								
								Merge commit '1184887b012e863fbf44f65ef5c65e0049123c27' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept our README. 
							
						 
						
							2024-01-02 13:35:11 +01:00  
				
					
						
							
							
								 
						
							
								0374e11091 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28529 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-01-02 09:11:53 +00:00  
				
					
						
							
							
								 
						
							
								fdec8d7ffb 
								
							 
						 
						
							
							
								
								Fix OCR when using S3/CDN for assets ( #28551 )  
							
							
							
						 
						
							2024-01-02 09:09:54 +00:00  
				
					
						
							
							
								 
						
							
								eb342a6082 
								
							 
						 
						
							
							
								
								Fix media attachments not being hidden in report modal in glitch flavor  
							
							
							
						 
						
							2023-12-29 17:47:30 +01:00  
				
					
						
							
							
								 
						
							
								df43bb124c 
								
							 
						 
						
							
							
								
								[Glitch] Fix destructive actions in dropdowns not using error color in light theme  
							
							... 
							
							
							
							Port 3599622b5b 
							
						 
						
							2023-12-29 17:43:53 +01:00  
				
					
						
							
							
								 
						
							
								35b6583371 
								
							 
						 
						
							
							
								
								Merge commit '6374358357ee81b5f137f471f028a56974109155' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-12-29 17:40:57 +01:00  
				
					
						
							
							
								 
						
							
								6374358357 
								
							 
						 
						
							
							
								
								Change media to be hidden/blurred by default in report modal ( #28522 )  
							
							
							
						 
						
							2023-12-29 16:34:13 +00:00  
				
					
						
							
							
								 
						
							
								3599622b5b 
								
							 
						 
						
							
							
								
								Fix destructive actions in dropdowns not using error color in light theme ( #28484 )  
							
							
							
						 
						
							2023-12-29 11:32:40 +00:00  
				
					
						
							
							
								 
						
							
								7df9c4f6f3 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28481 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-12-29 10:39:10 +00:00  
				
					
						
							
							
								 
						
							
								1cba91d6d1 
								
							 
						 
						
							
							
								
								Fix reply icon display in picture-in-picture footer ( #28519 )  
							
							
							
						 
						
							2023-12-29 09:48:27 +00:00  
				
					
						
							
							
								 
						
							
								c5b0e6d5a0 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-12-28 16:57:10 +01:00  
				
					
						
							
							
								 
						
							
								72ff0d30d8 
								
							 
						 
						
							
							
								
								Fix submitting post from content warning field not working properly ( #2538 )  
							
							
							
						 
						
							2023-12-22 17:23:15 +01:00  
				
					
						
							
							
								 
						
							
								e70a65761a 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28467 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-12-22 07:58:20 +00:00  
				
					
						
							
							
								 
						
							
								1c041356a1 
								
							 
						 
						
							
							
								
								Fix error on viewing a profile when unlogged ( #28465 )  
							
							
							
						 
						
							2023-12-21 20:19:18 +00:00  
				
					
						
							
							
								 
						
							
								92aa6e2ec9 
								
							 
						 
						
							
							
								
								Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-12-21 19:42:13 +01:00  
				
					
						
							
							
								 
						
							
								f5b7307890 
								
							 
						 
						
							
							
								
								Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's version of the conflicting lines. 
							
						 
						
							2023-12-21 19:24:10 +01:00  
				
					
						
							
							
								 
						
							
								7a0be26367 
								
							 
						 
						
							
							
								
								[Glitch] Fix empty column explainer getting cropped under certain conditions  
							
							... 
							
							
							
							Port 3f1ec16377 
							
						 
						
							2023-12-21 19:08:43 +01:00  
				
					
						
							
							
								 
						
							
								a60b9acf3c 
								
							 
						 
						
							
							
								
								Merge commit 'b2f915b31ae884e3893e93a99da4e2b8d7e9ef7b' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-12-21 19:04:20 +01:00  
				
					
						
							
							
								 
						
							
								6e56f95285 
								
							 
						 
						
							
							
								
								Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  Upstream modified its README, we have a completely different one.
  Kept our README file. 
							
						 
						
							2023-12-21 18:17:17 +01:00  
				
					
						
							
							
								 
						
							
								5976d3702f 
								
							 
						 
						
							
							
								
								Change "Follow" to "Follow back" and "Mutual" when appropriate in web UI ( #28452 )  
							
							
							
						 
						
							2023-12-21 09:44:09 +00:00  
				
					
						
							
							
								 
						
							
								9e5ddc1745 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28451 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-12-21 09:09:00 +00:00  
				
					
						
							
							
								 
						
							
								01f0a6ca4f 
								
							 
						 
						
							
							
								
								Fix profile setup showing default avatar in web UI ( #28453 )  
							
							
							
						 
						
							2023-12-21 08:32:25 +00:00  
				
					
						
							
							
								 
						
							
								01e77a0f34 
								
							 
						 
						
							
							
								
								[Glitch] Enable the eslint `react/no-unknown-property` rule  
							
							... 
							
							
							
							Port ee83d5c760 
							
						 
						
							2023-12-20 22:24:40 +01:00  
				
					
						
							
							
								 
						
							
								077e0c6812 
								
							 
						 
						
							
							
								
								Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `Gemfile.lock`:
  Conflict caused by the `json` gem thing once again.
  Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored a bunch of specs, including one place that differs
  because of glitch-soc's theming system.
  Refactored as upstream did, adapting it for glitch-soc's theming system. 
							
						 
						
							2023-12-20 22:16:50 +01:00  
				
					
						
							
							
								 
						
							
								5de551002d 
								
							 
						 
						
							
							
								
								[Glitch] Fix onboarding step descriptions being truncated on narrow screens  
							
							... 
							
							
							
							Port b20af17a2c 
							
						 
						
							2023-12-20 21:59:58 +01:00  
				
					
						
							
							
								 
						
							
								8a5f2442cc 
								
							 
						 
						
							
							
								
								Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-12-20 21:58:18 +01:00  
				
					
						
							
							
								 
						
							
								b41af99673 
								
							 
						 
						
							
							
								
								[Glitch] Change dismissed banners to be stored server-side  
							
							... 
							
							
							
							Port 7faa27e17d 
							
						 
						
							2023-12-20 20:40:47 +01:00  
				
					
						
							
							
								 
						
							
								b8209c3b96 
								
							 
						 
						
							
							
								
								Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
  Upstream reworked the CSP, we kept our version for now. 
							
						 
						
							2023-12-20 20:10:45 +01:00  
				
					
						
							
							
								 
						
							
								a4a728b01d 
								
							 
						 
						
							
							
								
								[Glitch] Fix the loading bar with the new Redux actions  
							
							... 
							
							
							
							Port 8b1eeb2f90 
							
						 
						
							2023-12-20 19:49:44 +01:00  
				
					
						
							
							
								 
						
							
								93c71e2c7c 
								
							 
						 
						
							
							
								
								[Glitch] Fix notification sounds  
							
							... 
							
							
							
							Port f3864db409 
							
						 
						
							2023-12-20 19:49:44 +01:00  
				
					
						
							
							
								 
						
							
								70652e49eb 
								
							 
						 
						
							
							
								
								[Glitch] Fix error when muting users from Web UI  
							
							... 
							
							
							
							Port 32319187ee 
							
						 
						
							2023-12-20 19:49:44 +01:00  
				
					
						
							
							
								 
						
							
								e94fecdcc8 
								
							 
						 
						
							
							
								
								[Glitch] Fix the `notificationsUpdate` call  
							
							... 
							
							
							
							Port f476d9dab2 
							
						 
						
							2023-12-20 19:49:44 +01:00  
				
					
						
							
							
								 
						
							
								79678cf841 
								
							 
						 
						
							
							
								
								[Glitch] Fixes website not loading for unlogged users  
							
							... 
							
							
							
							Port 6712bf86cd 
							
						 
						
							2023-12-20 19:49:44 +01:00  
				
					
						
							
							
								 
						
							
								7fe5623a27 
								
							 
						 
						
							
							
								
								[Glitch] Use Immutable `Record` for accounts in Redux state  
							
							... 
							
							
							
							Port 3bf2a7296e 
							
						 
						
							2023-12-20 19:49:44 +01:00  
				
					
						
							
							
								 
						
							
								3b7caa00e2 
								
							 
						 
						
							
							
								
								[Glitch] Add Typescript types for some API objects  
							
							... 
							
							
							
							Port 57f592fed5 
							
						 
						
							2023-12-20 19:49:44 +01:00  
				
					
						
							
							
								 
						
							
								a3a58c041e 
								
							 
						 
						
							
							
								
								Merge pull request  #2527  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes up to 8ebc94dd22 
							
						 
						
							2023-12-20 19:48:45 +01:00  
				
					
						
							
							
								 
						
							
								fecc07856c 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28439 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-12-20 09:15:30 +00:00  
				
					
						
							
							
								 
						
							
								b7cb17fecf 
								
							 
						 
						
							
							
								
								Fix the poll option add button attempting to submit a form ( #2530 )  
							
							
							
						 
						
							2023-12-20 08:24:28 +01:00  
				
					
						
							
							
								 
						
							
								9bfb699c4c 
								
							 
						 
						
							
							
								
								[Glitch] Change search popout to not list unusable search options when logged out  
							
							... 
							
							
							
							Port 6e70819840 
							
						 
						
							2023-12-19 21:25:55 +01:00  
				
					
						
							
							
								 
						
							
								b135b6ba8f 
								
							 
						 
						
							
							
								
								Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
  Conflict caused by glitch-soc having a different file size limit constant
  name.
  Updated like upstream did while keeping glitch-soc's constant name. 
							
						 
						
							2023-12-19 21:24:01 +01:00  
				
					
						
							
							
								 
						
							
								2e786e13cb 
								
							 
						 
						
							
							
								
								Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/validators/status_pin_validator.rb`:
  Upstream refactored that file, while glitch-soc had configurable limits for
  pinned statuses.
  Updated the code with upstream's refactor, while keeping glitch-soc's
  configurability. 
							
						 
						
							2023-12-19 20:51:37 +01:00  
				
					
						
							
							
								 
						
							
								d288a6162a 
								
							 
						 
						
							
							
								
								Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-12-19 20:40:05 +01:00  
				
					
						
							
							
								 
						
							
								7db68e2dca 
								
							 
						 
						
							
							
								
								[Glitch] Fix upper border radius of onboarding columns  
							
							... 
							
							
							
							Port 0a6ec048a8 
							
						 
						
							2023-12-19 20:26:22 +01:00  
				
					
						
							
							
								 
						
							
								b24f676cf1 
								
							 
						 
						
							
							
								
								Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-12-19 20:24:57 +01:00  
				
					
						
							
							
								 
						
							
								94c4c7f330 
								
							 
						 
						
							
							
								
								[Glitch] Fix open status on media modal  
							
							... 
							
							
							
							Port 922f086253 
							
						 
						
							2023-12-19 20:17:45 +01:00  
				
					
						
							
							
								 
						
							
								3ad92e8d0d 
								
							 
						 
						
							
							
								
								Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-12-19 20:17:23 +01:00  
				
					
						
							
							
								 
						
							
								7b1d390734 
								
							 
						 
						
							
							
								
								Fixes dropdown target without a `buttonRef` (edit history) ( #28427 )  
							
							
							
						 
						
							2023-12-19 10:47:53 +00:00  
				
					
						
							
							
								 
						
							
								fa987db738 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28423 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-12-19 09:40:37 +00:00  
				
					
						
							
							
								 
						
							
								3598c2e1db 
								
							 
						 
						
							
							
								
								Revert "Feature - Prevents multiple audio/video attachments from being played at the same time ( #24717 )" ( #28251 )  
							
							
							
						 
						
							2023-12-19 05:08:52 +00:00  
				
					
						
							
							
								 
						
							
								8b1eeb2f90 
								
							 
						 
						
							
							
								
								Fix the loading bar with the new Redux actions ( #28422 )  
							
							
							
						 
						
							2023-12-18 23:19:27 +00:00  
				
					
						
							
							
								 
						
							
								4259f4a4aa 
								
							 
						 
						
							
							
								
								[Glitch] Fix "Hide these posts from home" list setting not refreshing when switching lists  
							
							... 
							
							
							
							Port 4aa06cbdbf 
							
						 
						
							2023-12-18 20:59:33 +01:00  
				
					
						
							
							
								 
						
							
								a111fd7a0b 
								
							 
						 
						
							
							
								
								Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-12-18 20:47:27 +01:00  
				
					
						
							
							
								 
						
							
								6261db2a26 
								
							 
						 
						
							
							
								
								[Glitch] Fix modal content not being selectable  
							
							... 
							
							
							
							Port ed79713f3a 
							
						 
						
							2023-12-18 19:15:57 +01:00  
				
					
						
							
							
								 
						
							
								d6ad9d351e 
								
							 
						 
						
							
							
								
								Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-12-18 19:10:43 +01:00  
				
					
						
							
							
								 
						
							
								f5de9fe99a 
								
							 
						 
						
							
							
								
								[Glitch] Allow viewing and severing relationships with suspended accounts  
							
							... 
							
							
							
							Port c451bbe249 
							
						 
						
							2023-12-18 18:49:48 +01:00  
				
					
						
							
							
								 
						
							
								dee28c3fbf 
								
							 
						 
						
							
							
								
								[Glitch] Do not try to update an undefined video element  
							
							... 
							
							
							
							Port 7840c6b75b 
							
						 
						
							2023-12-18 18:42:30 +01:00  
				
					
						
							
							
								 
						
							
								372c455218 
								
							 
						 
						
							
							
								
								[Glitch] Add volume saving/reuse to video player  
							
							... 
							
							
							
							Port 58f01a5c9a 
							
						 
						
							2023-12-18 18:42:07 +01:00  
				
					
						
							
							
								 
						
							
								b474cbbd28 
								
							 
						 
						
							
							
								
								Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/api/v1/accounts/relationships_controller.rb`:
  We differed by listing suspended users when requesting relationships.
  Updated to upstream's code. 
							
						 
						
							2023-12-18 18:40:58 +01:00  
				
					
						
							
							
								 
						
							
								46ddaffd40 
								
							 
						 
						
							
							
								
								Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-12-18 18:34:25 +01:00  
				
					
						
							
							
								 
						
							
								bc33be0342 
								
							 
						 
						
							
							
								
								Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `Gemfile.lock`:
  Conflict because we had updated the `json-ld` gem to fix a yanked dependency.
  Kept our version of `json-ld` while updating other dependencies. 
							
						 
						
							2023-12-18 18:07:24 +01:00  
				
					
						
							
							
								 
						
							
								3d3fa75c81 
								
							 
						 
						
							
							
								
								Reduce composer differences with upstream and simplify code ( #2518 )  
							
							
							
						 
						
							2023-12-18 13:20:08 +01:00  
				
					
						
							
							
								 
						
							
								f99e05710e 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28373 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-12-18 08:25:21 +00:00  
				
					
						
							
							
								 
						
							
								4113fbf6e8 
								
							 
						 
						
							
							
								
								Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream enforced new code style rules, where we had different code.
  Applied the new code style rules. 
							
						 
						
							2023-12-17 23:04:16 +01:00  
				
					
						
							
							
								 
						
							
								cc265f760e 
								
							 
						 
						
							
							
								
								[Glitch] Fix inserting emojis from emoji picker fails with TypeError  
							
							... 
							
							
							
							Port ac8e4ed38d 
							
						 
						
							2023-12-17 18:03:22 +01:00  
				
					
						
							
							
								 
						
							
								bb4fa0c374 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite `AutosuggestTextarea` as Functional Component  
							
							... 
							
							
							
							Port 9c8891b39a 
							
						 
						
							2023-12-17 17:59:33 +01:00  
				
					
						
							
							
								 
						
							
								e22c3cd768 
								
							 
						 
						
							
							
								
								[Glitch] Improve Babel configuration and automatically load polyfills  
							
							... 
							
							
							
							Port 0e3401bc1c 
							
						 
						
							2023-12-17 17:50:31 +01:00  
				
					
						
							
							
								 
						
							
								ddf3ad9541 
								
							 
						 
						
							
							
								
								Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main  
							
							... 
							
							
							
							Conflicts:
- `package.json`:
  Upstream removed a dependency textually close to a glitch-only dependency.
  Updated as upstream while keeping our dependency. 
							
						 
						
							2023-12-17 17:43:30 +01:00  
				
					
						
							
							
								 
						
							
								1474318691 
								
							 
						 
						
							
							
								
								Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main  
							
							... 
							
							
							
							Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream fixed a bug in the trending post condition.
  Glitch-soc's condition is different because we potentially allow CWed content
  to trend.
  Ported upstream's fix while keeping glitch-soc's change.
- `config/initializers/content_security_policy.rb`:
  Kept our version for now, we will switch to upstream later down the road. 
							
						 
						
							2023-12-17 15:32:29 +01:00  
				
					
						
							
							
								 
						
							
								b2f915b31a 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28344 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-12-13 09:52:37 +00:00  
				
					
						
							
							
								 
						
							
								3f1ec16377 
								
							 
						 
						
							
							
								
								Fix empty column explainer getting cropped under certain conditions ( #28337 )  
							
							
							
						 
						
							2023-12-12 14:31:37 +00:00  
				
					
						
							
							
								 
						
							
								14e64bc880 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28334 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-12-12 11:45:10 +00:00  
				
					
						
							
							
								 
						
							
								f3864db409 
								
							 
						 
						
							
							
								
								Fix notification sounds ( #28316 )  
							
							
							
						 
						
							2023-12-11 14:23:30 +00:00  
				
					
						
							
							
								 
						
							
								79a81da69c 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28291 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-12-11 08:22:52 +00:00  
				
					
						
							
							
								 
						
							
								9f92b05bd2 
								
							 
						 
						
							
							
								
								Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  Upstream has updated their README but we have a completely different one.
  Kept our version of `README.md` 
							
						 
						
							2023-12-10 18:05:02 +01:00  
				
					
						
							
							
								 
						
							
								df5c64fe57 
								
							 
						 
						
							
							
								
								Further reduce differences with upstream  
							
							
							
						 
						
							2023-12-09 21:19:43 +01:00  
				
					
						
							
							
								 
						
							
								cc1d68ace8 
								
							 
						 
						
							
							
								
								[Glitch] Show announcements in reverse chronological order  
							
							... 
							
							
							
							Port f1f0400adc8e2530ea16 
							
						 
						
							2023-12-09 21:19:43 +01:00  
				
					
						
							
							
								 
						
							
								4b2ddaf106 
								
							 
						 
						
							
							
								
								Further reduce differences with upstream  
							
							
							
						 
						
							2023-12-09 21:19:43 +01:00  
				
					
						
							
							
								 
						
							
								408d4710ed 
								
							 
						 
						
							
							
								
								Further reduce differences with upstream  
							
							
							
						 
						
							2023-12-09 20:58:50 +01:00  
				
					
						
							
							
								 
						
							
								a27abb4802 
								
							 
						 
						
							
							
								
								Further reduce code differences with upstream ( #2509 )  
							
							
							
						 
						
							2023-12-09 20:29:23 +01:00  
				
					
						
							
							
								 
						
							
								1ddf2012ee 
								
							 
						 
						
							
							
								
								Fix status avatar size discrepancies ( #2510 )  
							
							... 
							
							
							
							Follow-up to #2508  
							
						 
						
							2023-12-09 20:29:15 +01:00  
				
					
						
							
							
								 
						
							
								b2647bc3f2 
								
							 
						 
						
							
							
								
								[Glitch] Update `Avatar`, `AvatarComposite`, and `AvatarOverlay` components ( #2508 )  
							
							... 
							
							
							
							Various ports including 8dfe5179eed1de7fb7fa9f8d34620b 
							
						 
						
							2023-12-09 18:33:42 +01:00  
				
					
						
							
							
								 
						
							
								ca1b7efb06 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28275 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-12-08 09:52:32 +00:00  
				
					
						
							
							
								 
						
							
								e0dacf6b4c 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28264 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-12-07 09:38:44 +00:00  
				
					
						
							
							
								 
						
							
								ee83d5c760 
								
							 
						 
						
							
							
								
								Enable the eslint `react/no-unknown-property` rule ( #28217 )  
							
							
							
						 
						
							2023-12-06 13:42:12 +00:00  
				
					
						
							
							
								 
						
							
								954169966b 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28245 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-12-06 08:52:55 +00:00  
				
					
						
							
							
								 
						
							
								4238ec844d 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28120 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-12-05 16:07:53 +00:00  
				
					
						
							
							
								 
						
							
								9fcf5d4192 
								
							 
						 
						
							
							
								
								[Glitch] Fix emoji picker button scrolling with textarea content in single-column view ( #2501 )  
							
							... 
							
							
							
							Port bbea052935 
							
						 
						
							2023-12-04 13:30:27 +01:00  
				
					
						
							
							
								 
						
							
								a46b6af1d6 
								
							 
						 
						
							
							
								
								Fix constant redirects to onboarding page ( #2505 )  
							
							
							
						 
						
							2023-12-04 13:30:17 +01:00  
				
					
						
							
							
								 
						
							
								23ee393fdd 
								
							 
						 
						
							
							
								
								Merge pull request  #2499  from ClearlyClaire/glitch-soc/port-toasts  
							
							... 
							
							
							
							Port upstream's toast changes 
							
						 
						
							2023-12-03 20:57:42 +01:00  
				
					
						
							
							
								 
						
							
								cede2f533c 
								
							 
						 
						
							
							
								
								[Glitch] Fix toast saying "published" instead of "saved" after editing post in web UI  
							
							... 
							
							
							
							Port 71641766f2 
							
						 
						
							2023-12-03 19:39:08 +01:00  
				
					
						
							
							
								 
						
							
								9ac73a1fbf 
								
							 
						 
						
							
							
								
								[Glitch] Change `eslint` config to autofix missing comma and indentation in JS files  
							
							... 
							
							
							
							Partial port of 774e1189d2 
							
						 
						
							2023-12-03 16:44:40 +01:00  
				
					
						
							
							
								 
						
							
								ea004108b8 
								
							 
						 
						
							
							
								
								[Glitch] Make notification respect reduce-motion  
							
							... 
							
							
							
							Port 6d0767558a 
							
						 
						
							2023-12-03 16:38:41 +01:00  
				
					
						
							
							
								 
						
							
								811b8b200e 
								
							 
						 
						
							
							
								
								[Glitch] Use invariant colors on notification toasts  
							
							... 
							
							
							
							Port ca955ada0b 
							
						 
						
							2023-12-03 16:38:41 +01:00  
				
					
						
							
							
								 
						
							
								3bbe39f233 
								
							 
						 
						
							
							
								
								[Glitch] Add toast with option to open post after publishing in web UI  
							
							... 
							
							
							
							Port a7ca33ad96 
							
						 
						
							2023-12-03 16:38:41 +01:00  
				
					
						
							
							
								 
						
							
								046cb408b7 
								
							 
						 
						
							
							
								
								[Glitch] Fix front-end bug when processing relationship-related account actions  
							
							... 
							
							
							
							Port 287520453c 
							
						 
						
							2023-12-03 13:19:10 +01:00  
				
					
						
							
							
								 
						
							
								c3a0d5aca3 
								
							 
						 
						
							
							
								
								[Glitch] Fix Redux types  
							
							... 
							
							
							
							Port 0712cc2b99 
							
						 
						
							2023-12-03 13:19:10 +01:00  
				
					
						
							
							
								 
						
							
								6fb5fafd28 
								
							 
						 
						
							
							
								
								[Glitch] Convert `actions/account_notes` into Typescript  
							
							... 
							
							
							
							Port bd06c13204 
							
						 
						
							2023-12-03 13:19:10 +01:00  
				
					
						
							
							
								 
						
							
								ee58f680e8 
								
							 
						 
						
							
							
								
								[Glitch] Fix autocomplete suggestions being cut off in compose form  
							
							... 
							
							
							
							Port 6833732852 
							
						 
						
							2023-12-03 11:23:12 +01:00  
				
					
						
							
							
								 
						
							
								6269a5336f 
								
							 
						 
						
							
							
								
								[Glitch] Change composer highlight border size to be more noticeable  
							
							... 
							
							
							
							Port aa4c9730f6 
							
						 
						
							2023-12-03 11:23:12 +01:00  
				
					
						
							
							
								 
						
							
								204fe83fcc 
								
							 
						 
						
							
							
								
								[Glitch] Fix compose textarea scroll behavior  
							
							... 
							
							
							
							Port 746979f75d 
							
						 
						
							2023-12-03 11:23:12 +01:00  
				
					
						
							
							
								 
						
							
								a8f6a5b40f 
								
							 
						 
						
							
							
								
								Update translation strings  
							
							
							
						 
						
							2023-12-03 11:23:12 +01:00  
				
					
						
							
							
								 
						
							
								786b42e2b5 
								
							 
						 
						
							
							
								
								Fix SCSS and JS linting issues  
							
							
							
						 
						
							2023-12-03 11:23:12 +01:00  
				
					
						
							
							
								 
						
							
								a0943b8f6d 
								
							 
						 
						
							
							
								
								Remove glitch-soc's old onboarding modal  
							
							
							
						 
						
							2023-12-03 11:23:12 +01:00  
				
					
						
							
							
								 
						
							
								6dc812dd51 
								
							 
						 
						
							
							
								
								[Glitch] Upgrade to react-router v5 in onboarding code  
							
							... 
							
							
							
							Port 1b70d7ed7c 
							
						 
						
							2023-12-03 11:23:12 +01:00  
				
					
						
							
							
								 
						
							
								06e819537b 
								
							 
						 
						
							
							
								
								[Glitch] Change labels and styles on the onboarding screen in web UI  
							
							... 
							
							
							
							Port a985d587e1 
							
						 
						
							2023-12-03 11:23:12 +01:00  
				
					
						
							
							
								 
						
							
								d5bad93460 
								
							 
						 
						
							
							
								
								[Glitch] Change "Follow 7 people" to "Find at least 7 people to follow" in web UI  
							
							... 
							
							
							
							Port 4a5464f360 
							
						 
						
							2023-12-03 11:23:12 +01:00  
				
					
						
							
							
								 
						
							
								c2c25122e8 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite <Check /> as FC  
							
							... 
							
							
							
							Port 6fdbee240c 
							
						 
						
							2023-12-03 11:23:12 +01:00  
				
					
						
							
							
								 
						
							
								a1667ba796 
								
							 
						 
						
							
							
								
								[Glitch] Upgrade react-intl usage in onboarding code  
							
							... 
							
							
							
							Port remaining of 44cd88adc4 
							
						 
						
							2023-12-03 11:23:12 +01:00  
				
					
						
							
							
								 
						
							
								e47c582283 
								
							 
						 
						
							
							
								
								Fix import order  
							
							
							
						 
						
							2023-12-03 11:23:12 +01:00  
				
					
						
							
							
								 
						
							
								ba4c8a9b41 
								
							 
						 
						
							
							
								
								[Glitch] Use the new JSX transform in onboarding code  
							
							... 
							
							
							
							Port the remaining of 8f66126b10 
							
						 
						
							2023-12-03 11:23:12 +01:00  
				
					
						
							
							
								 
						
							
								6e4497ab2d 
								
							 
						 
						
							
							
								
								[Glitch] Fix spelling of "Lets" on the onboarding page after clicking the confirmation email  
							
							... 
							
							
							
							Port 52d36f0f98 
							
						 
						
							2023-12-03 11:23:12 +01:00  
				
					
						
							
							
								 
						
							
								1cb8df655b 
								
							 
						 
						
							
							
								
								[Glitch] Fix Onboarding Errors  
							
							... 
							
							
							
							Port b8a2430642 
							
						 
						
							2023-12-03 11:23:12 +01:00  
				
					
						
							
							
								 
						
							
								0b1556b7f7 
								
							 
						 
						
							
							
								
								[Glitch] Enforce stricter rules for Typescript files  
							
							... 
							
							
							
							Port c8181eb0a4 
							
						 
						
							2023-12-03 11:23:12 +01:00  
				
					
						
							
							
								 
						
							
								542f2fb1e0 
								
							 
						 
						
							
							
								
								[Glitch] Add default post text to onboarding flow in web UI  
							
							... 
							
							
							
							Port 8979b70975 
							
						 
						
							2023-12-03 11:23:12 +01:00  
				
					
						
							
							
								 
						
							
								e0b401e295 
								
							 
						 
						
							
							
								
								[Glitch] Add more tips to onboarding flow in web UI  
							
							... 
							
							
							
							Port c35e3cb6ac 
							
						 
						
							2023-12-03 11:23:12 +01:00  
				
					
						
							
							
								 
						
							
								4537b4b961 
								
							 
						 
						
							
							
								
								[Glitch] Add new onboarding flow to web UI  
							
							... 
							
							
							
							Port 0461f83320 
							
						 
						
							2023-12-03 11:23:12 +01:00  
				
					
						
							
							
								 
						
							
								335cfab32f 
								
							 
						 
						
							
							
								
								Change account note design to match upstream's ( #2495 )  
							
							
							
						 
						
							2023-12-03 11:22:38 +01:00  
				
					
						
							
							
								 
						
							
								f1241b4a3a 
								
							 
						 
						
							
							
								
								Fix translation string for `status.favourite` not having been changed everywhere ( #2494 )  
							
							
							
						 
						
							2023-12-03 09:51:29 +01:00  
				
					
						
							
							
								 
						
							
								edd96ce786 
								
							 
						 
						
							
							
								
								Merge pull request  #2492  from ClearlyClaire/glitch-soc/painful-backports  
							
							... 
							
							
							
							Port account rows design change from upstream 
							
						 
						
							2023-12-03 09:51:07 +01:00  
				
					
						
							
							
								 
						
							
								21df2a68ac 
								
							 
						 
						
							
							
								
								Hide followers count when hidden by instance or user  
							
							
							
						 
						
							2023-12-02 17:38:07 +01:00  
				
					
						
							
							
								 
						
							
								09062d393f 
								
							 
						 
						
							
							
								
								Fix more styling issues  
							
							
							
						 
						
							2023-12-02 17:38:07 +01:00  
				
					
						
							
							
								 
						
							
								28d4f3ab70 
								
							 
						 
						
							
							
								
								Fix account component styling wrt. upstream  
							
							
							
						 
						
							2023-12-02 17:05:54 +01:00  
				
					
						
							
							
								 
						
							
								dc917cfcdf 
								
							 
						 
						
							
							
								
								[Glitch] Fix account.jsx imports ( #25541 )  
							
							... 
							
							
							
							Port remaining part of e0d230fb3720e85c0e839d45a444f9 
							
						 
						
							2023-12-02 16:59:40 +01:00  
				
					
						
							
							
								 
						
							
								17372a3ec0 
								
							 
						 
						
							
							
								
								[Glitch] Change labels and styles on the onboarding screen in `Account` component  
							
							... 
							
							
							
							Partial port of a985d587e1 
							
						 
						
							2023-12-02 16:59:40 +01:00  
				
					
						
							
							
								 
						
							
								0421b44f22 
								
							 
						 
						
							
							
								
								[Glitch] Change follow button in account row to be more obvious in web UI ( #24956 )  
							
							... 
							
							
							
							Port 0ddc895282 
							
						 
						
							2023-12-02 16:59:40 +01:00  
				
					
						
							
							
								 
						
							
								f1691eca55 
								
							 
						 
						
							
							
								
								[Glitch] Fix overflow behavior of account rows  
							
							... 
							
							
							
							Port 5fae2de454 
							
						 
						
							2023-12-02 16:59:40 +01:00  
				
					
						
							
							
								 
						
							
								98a7b95058 
								
							 
						 
						
							
							
								
								[Glitch] Update inconsistent `defaultMessage` in `Account` component  
							
							... 
							
							
							
							Partial port of e58c36d308 
							
						 
						
							2023-12-02 16:59:40 +01:00  
				
					
						
							
							
								 
						
							
								b047b981cd 
								
							 
						 
						
							
							
								
								[Glitch] Enforce import order with ESLint  
							
							... 
							
							
							
							Port d27216dc46 
							
						 
						
							2023-12-02 16:59:40 +01:00  
				
					
						
							
							
								 
						
							
								b8cbaba283 
								
							 
						 
						
							
							
								
								[Glitch] Split `EmptyAccount` out of `Account` component  
							
							... 
							
							
							
							Partial port of b8a2430642 
							
						 
						
							2023-12-02 16:59:40 +01:00  
				
					
						
							
							
								 
						
							
								32ec0d2472 
								
							 
						 
						
							
							
								
								[Glitch] Fix verified badge in account lists potentially including rel="me" links  
							
							... 
							
							
							
							Port 55e7c08a83 
							
						 
						
							2023-12-02 16:59:40 +01:00  
				
					
						
							
							
								 
						
							
								e7ec2641a0 
								
							 
						 
						
							
							
								
								[Glitch] Fix linting issues with VerifiedBadge component  
							
							... 
							
							
							
							Signed-off-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-12-02 16:59:40 +01:00  
				
					
						
							
							
								 
						
							
								2efb22f455 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite VerifiedBadge component as function component  
							
							... 
							
							
							
							Port 140aa6b054 
							
						 
						
							2023-12-02 16:59:40 +01:00  
				
					
						
							
							
								 
						
							
								00db5c8ade 
								
							 
						 
						
							
							
								
								[Glitch] Split VerifiedBadge from Account component  
							
							... 
							
							
							
							Partial port of 0461f83320 
							
						 
						
							2023-12-02 16:59:40 +01:00  
				
					
						
							
							
								 
						
							
								e0aba64a64 
								
							 
						 
						
							
							
								
								[Glitch] Fix regressions from change in account row design in web UI  
							
							... 
							
							
							
							Port 46483ae849 
							
						 
						
							2023-12-02 16:59:40 +01:00  
				
					
						
							
							
								 
						
							
								a262f990f8 
								
							 
						 
						
							
							
								
								Change design of account rows in web UI ( #24247 )  
							
							... 
							
							
							
							Signed-off-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-12-02 16:59:40 +01:00  
				
					
						
							
							
								 
						
							
								5b0382abc5 
								
							 
						 
						
							
							
								
								Remove redundant asset preload ( #2488 )  
							
							... 
							
							
							
							* Remove redundant asset preload
preloading these is already handled by glitch-soc theming system, meaning glitch packs get preloaded and if the user is signed in, vanilla packs.
The theming system preloads these unconditionally though.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove preload of getting started
This matches upstreams preloads
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-12-02 14:54:26 +01:00  
				
					
						
							
							
								 
						
							
								b20af17a2c 
								
							 
						 
						
							
							
								
								Fix onboarding step descriptions being truncated on narrow screens ( #28021 )  
							
							
							
						 
						
							2023-11-30 13:47:07 +00:00  
				
					
						
							
							
								 
						
							
								7faa27e17d 
								
							 
						 
						
							
							
								
								Change dismissed banners to be stored server-side ( #27055 )  
							
							
							
						 
						
							2023-11-30 11:45:54 +00:00  
				
					
						
							
							
								 
						
							
								3a7f10c3f1 
								
							 
						 
						
							
							
								
								Converted hashtag.jsx to TypeScript ( #27872 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com> 
							
						 
						
							2023-11-28 18:20:10 +00:00  
				
					
						
							
							
								 
						
							
								1142f4c79e 
								
							 
						 
						
							
							
								
								Converted app/javascript/mastodon/utils/ folder to TypeScript ( #27895 )  
							
							
							
						 
						
							2023-11-28 17:47:55 +00:00  
				
					
						
							
							
								 
						
							
								af02484714 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28096 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-11-28 08:59:48 +00:00  
				
					
						
							
							
								 
						
							
								fad9343bab 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28069 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-11-27 10:06:35 +00:00  
				
					
						
							
							
								 
						
							
								b3581d1e2f 
								
							 
						 
						
							
							
								
								Fix @rails/ujs import on public.jsx ( #2482 )  
							
							... 
							
							
							
							Related: 8a131fb7bc 
							
						 
						
							2023-11-24 17:40:31 +01:00  
				
					
						
							
							
								 
						
							
								8521238677 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28060 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-11-24 10:25:39 +00:00  
				
					
						
							
							
								 
						
							
								6e70819840 
								
							 
						 
						
							
							
								
								Change search popout to not list unusable search options when logged out ( #27918 )  
							
							
							
						 
						
							2023-11-24 09:27:54 +00:00  
				
					
						
							
							
								 
						
							
								c810b197ad 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28050 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-11-23 09:34:50 +00:00  
				
					
						
							
							
								 
						
							
								d3ed03fd6b 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28036 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-11-22 15:48:12 +00:00  
				
					
						
							
							
								 
						
							
								32319187ee 
								
							 
						 
						
							
							
								
								Fix error when muting users from Web UI ( #28016 )  
							
							
							
						 
						
							2023-11-21 11:16:16 +00:00  
				
					
						
							
							
								 
						
							
								3c3e0c25ef 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28015 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-11-21 10:35:02 +00:00  
				
					
						
							
							
								 
						
							
								f00fcda785 
								
							 
						 
						
							
							
								
								Reduce differences with upstream in `Account` component  
							
							
							
						 
						
							2023-11-20 13:24:02 +01:00  
				
					
						
							
							
								 
						
							
								9ab1aa15e9 
								
							 
						 
						
							
							
								
								Change `ReplyIndicator` implementation and markup to match upstream's  
							
							
							
						 
						
							2023-11-20 13:24:02 +01:00  
				
					
						
							
							
								 
						
							
								8ceae2bce6 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27966 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-11-20 08:47:34 +00:00  
				
					
						
							
							
								 
						
							
								0e9801443f 
								
							 
						 
						
							
							
								
								Change to single opt-in during profile setup in onboarding in web UI ( #27876 )  
							
							
							
						 
						
							2023-11-17 10:37:04 +00:00  
				
					
						
							
							
								 
						
							
								9c68741f46 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27914 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-11-17 09:16:12 +00:00  
				
					
						
							
							
								 
						
							
								d3ae5b21d2 
								
							 
						 
						
							
							
								
								Reduce code and markup discrepancies on reply indicator  
							
							
							
						 
						
							2023-11-16 18:33:16 +01:00  
				
					
						
							
							
								 
						
							
								e023acfd00 
								
							 
						 
						
							
							
								
								Remove unnecessary proptype discrepancy  
							
							
							
						 
						
							2023-11-16 17:57:13 +01:00  
				
					
						
							
							
								 
						
							
								0a6ec048a8 
								
							 
						 
						
							
							
								
								Fix upper border radius of onboarding columns ( #27890 )  
							
							
							
						 
						
							2023-11-16 13:43:02 +00:00  
				
					
						
							
							
								 
						
							
								c94bedf4e6 
								
							 
						 
						
							
							
								
								Use container queries to hide profile share button ( #27889 )  
							
							
							
						 
						
							2023-11-16 11:59:45 +00:00  
				
					
						
							
							
								 
						
							
								87696ea26e 
								
							 
						 
						
							
							
								
								Add prominent share/copy button on profiles in web UI ( #27865 )  
							
							
							
						 
						
							2023-11-16 10:23:14 +00:00  
				
					
						
							
							
								 
						
							
								7232d4750d 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27884 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-11-16 10:08:22 +00:00  
				
					
						
							
							
								 
						
							
								36f25ea067 
								
							 
						 
						
							
							
								
								Fix more import discrepancies  
							
							
							
						 
						
							2023-11-15 22:50:23 +01:00  
				
					
						
							
							
								 
						
							
								4101057b9a 
								
							 
						 
						
							
							
								
								Fix various code discrepancies  
							
							
							
						 
						
							2023-11-15 22:50:23 +01:00  
				
					
						
							
							
								 
						
							
								09a5a78527 
								
							 
						 
						
							
							
								
								Fix discrepancy for `autosuggest-emoji` class  
							
							
							
						 
						
							2023-11-15 22:50:23 +01:00  
				
					
						
							
							
								 
						
							
								f69f1e9429 
								
							 
						 
						
							
							
								
								Fix code discrepancies with upstream  
							
							
							
						 
						
							2023-11-15 21:52:19 +01:00  
				
					
						
							
							
								 
						
							
								d358a3cc61 
								
							 
						 
						
							
							
								
								Merge pull request  #2468  from ClearlyClaire/glitch-soc/cleanup  
							
							... 
							
							
							
							Clean up some more and reduce unwarranted differences with upstream further 
							
						 
						
							2023-11-15 21:49:50 +01:00  
				
					
						
							
							
								 
						
							
								0d877a3076 
								
							 
						 
						
							
							
								
								[Glitch] Change compose form checkbox to native input with `appearance: none`  
							
							... 
							
							
							
							Port d3b4d4d4f3 
							
						 
						
							2023-11-15 17:20:44 +01:00  
				
					
						
							
							
								 
						
							
								e7b3598f04 
								
							 
						 
						
							
							
								
								No need to have a separate localStorage key for home instance  
							
							
							
						 
						
							2023-11-15 17:16:21 +01:00  
				
					
						
							
							
								 
						
							
								0c727a6790 
								
							 
						 
						
							
							
								
								Fix more import style discrepancies  
							
							
							
						 
						
							2023-11-15 17:16:21 +01:00  
				
					
						
							
							
								 
						
							
								50eb673494 
								
							 
						 
						
							
							
								
								Fix some markup discrepancies  
							
							
							
						 
						
							2023-11-15 17:16:21 +01:00  
				
					
						
							
							
								 
						
							
								349579e318 
								
							 
						 
						
							
							
								
								Fix more code discrepancies  
							
							
							
						 
						
							2023-11-15 17:16:21 +01:00  
				
					
						
							
							
								 
						
							
								1023c2f90b 
								
							 
						 
						
							
							
								
								Fix more whitespace and comment discrepancies  
							
							
							
						 
						
							2023-11-15 17:16:21 +01:00  
				
					
						
							
							
								 
						
							
								7e5d00720b 
								
							 
						 
						
							
							
								
								Merge pull request  #2391  from ClearlyClaire/glitch-soc/port-upstream-hashtags  
							
							... 
							
							
							
							Port upstream's hashtag handling to glitch-soc 
							
						 
						
							2023-11-15 17:15:21 +01:00  
				
					
						
							
							
								 
						
							
								cd3a636b7f 
								
							 
						 
						
							
							
								
								[Glitch] Fix some remote posts getting truncated  
							
							... 
							
							
							
							Port 4d59dfb1c6 
							
						 
						
							2023-11-15 12:59:06 +01:00  
				
					
						
							
							
								 
						
							
								6a8623588a 
								
							 
						 
						
							
							
								
								[Glitch] Fix colors and typography on hashtag bar in web UI  
							
							... 
							
							
							
							Port 10b06436d1 
							
						 
						
							2023-11-15 12:56:58 +01:00  
				
					
						
							
							
								 
						
							
								c226d00490 
								
							 
						 
						
							
							
								
								Fix interaction between CWs and hashtag bars  
							
							
							
						 
						
							2023-11-15 12:56:58 +01:00  
				
					
						
							
							
								 
						
							
								7ae45676c8 
								
							 
						 
						
							
							
								
								Fix hashtag bar styling  
							
							
							
						 
						
							2023-11-15 12:56:58 +01:00  
				
					
						
							
							
								 
						
							
								45690b01d1 
								
							 
						 
						
							
							
								
								[Glitch] Change hashtag bar tags to be de-emphasized  
							
							... 
							
							
							
							Port 613cfd625c 
							
						 
						
							2023-11-15 12:56:58 +01:00  
				
					
						
							
							
								 
						
							
								fc514fa8c6 
								
							 
						 
						
							
							
								
								[Glitch] Better hashtag normalization when processing a post  
							
							... 
							
							
							
							Port 58acaa9ae6 
							
						 
						
							2023-11-15 12:56:58 +01:00  
				
					
						
							
							
								 
						
							
								18462ee4b6 
								
							 
						 
						
							
							
								
								[Glitch] Remove hashtags from the last line of a status if it only contains hashtags  
							
							... 
							
							
							
							Port 061fd66ee6 
							
						 
						
							2023-11-15 12:56:58 +01:00  
				
					
						
							
							
								 
						
							
								2ce03420d6 
								
							 
						 
						
							
							
								
								[Glitch] Fix case-insensitive comparison of hashtags to do case-folding  
							
							... 
							
							
							
							Port 3ed2bf92d0 
							
						 
						
							2023-11-15 12:56:58 +01:00  
				
					
						
							
							
								 
						
							
								fe8d9f6221 
								
							 
						 
						
							
							
								
								[Glitch] Fix hashtag bar sometimes including tags that appear in the post's body  
							
							... 
							
							
							
							Port f0862bcf98 
							
						 
						
							2023-11-15 12:56:58 +01:00  
				
					
						
							
							
								 
						
							
								a81ed84453 
								
							 
						 
						
							
							
								
								[Glitch] Add display of out-of-band hashtags in the web interface  
							
							... 
							
							
							
							Port df6e719898 
							
						 
						
							2023-11-15 12:56:58 +01:00  
				
					
						
							
							
								 
						
							
								3b210e093a 
								
							 
						 
						
							
							
								
								Fix more code style discrepancies  
							
							
							
						 
						
							2023-11-15 12:53:21 +01:00  
				
					
						
							
							
								 
						
							
								542d95c2bc 
								
							 
						 
						
							
							
								
								Fix import style discrepancy  
							
							
							
						 
						
							2023-11-15 12:53:21 +01:00  
				
					
						
							
							
								 
						
							
								8b24a9a507 
								
							 
						 
						
							
							
								
								Fix missed relative import discrepancy  
							
							
							
						 
						
							2023-11-15 12:53:21 +01:00  
				
					
						
							
							
								 
						
							
								b1f0457cb8 
								
							 
						 
						
							
							
								
								Fix whitespace and comment discrepancies  
							
							
							
						 
						
							2023-11-15 12:53:21 +01:00  
				
					
						
							
							
								 
						
							
								08ac91c40b 
								
							 
						 
						
							
							
								
								[Glitch] Fix follow relationships not loading after notifications fetch  
							
							... 
							
							
							
							Port 4f7f6b3922 
							
						 
						
							2023-11-15 12:53:21 +01:00  
				
					
						
							
							
								 
						
							
								103c0ca4f7 
								
							 
						 
						
							
							
								
								[Glitch] Hide loading bar on status interactions  
							
							... 
							
							
							
							Port eb2425b53b 
							
						 
						
							2023-11-15 12:53:21 +01:00  
				
					
						
							
							
								 
						
							
								21653beb30 
								
							 
						 
						
							
							
								
								Reduce more unwarranted differences with upstream  
							
							
							
						 
						
							2023-11-15 12:53:21 +01:00  
				
					
						
							
							
								 
						
							
								7b922c2d90 
								
							 
						 
						
							
							
								
								Reduce unwarranted differences with upstream  
							
							... 
							
							
							
							Ports part of 0758b00bfd897199910f 
							
						 
						
							2023-11-15 12:53:21 +01:00  
				
					
						
							
							
								 
						
							
								2f61b65b1e 
								
							 
						 
						
							
							
								
								Remove dead code  
							
							
							
						 
						
							2023-11-15 12:53:11 +01:00  
				
					
						
							
							
								 
						
							
								9bbb0f13e0 
								
							 
						 
						
							
							
								
								Fix inconsistent React imports in JSX files ( #2466 )  
							
							
							
						 
						
							2023-11-15 12:52:30 +01:00  
				
					
						
							
							
								 
						
							
								d67bd44ca1 
								
							 
						 
						
							
							
								
								Add profile setup to onboarding in web UI ( #27829 )  
							
							
							
						 
						
							2023-11-15 11:13:53 +00:00  
				
					
						
							
							
								 
						
							
								a97b722ad5 
								
							 
						 
						
							
							
								
								Reduce differences with upstream due to import style ( #2465 )  
							
							... 
							
							
							
							Fix relative / VS absolute style imports, and fix whitespace discrepancies 
							
						 
						
							2023-11-15 12:01:51 +01:00  
				
					
						
							
							
								 
						
							
								d8074128f9 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27866 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-11-15 09:41:24 +00:00  
				
					
						
							
							
								 
						
							
								922f086253 
								
							 
						 
						
							
							
								
								Fix open status on media modal ( #27867 )  
							
							
							
						 
						
							2023-11-15 09:29:10 +00:00  
				
					
						
							
							
								 
						
							
								f7d3b74e03 
								
							 
						 
						
							
							
								
								Merge pull request  #2389  from glitch-soc/i18n/crowdin/translations  
							
							... 
							
							
							
							New Crowdin Translations (automated) 
							
						 
						
							2023-11-15 09:42:30 +01:00  
				
					
						
							
							
								 
						
							
								c1e071f634 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27848 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-11-14 10:53:47 +00:00  
				
					
						
							
							
								 
						
							
								4aa06cbdbf 
								
							 
						 
						
							
							
								
								Fix "Hide these posts from home" list setting not refreshing when switching lists ( #27763 )  
							
							
							
						 
						
							2023-11-14 00:39:54 +00:00  
				
					
						
							
							
								 
						
							
								bd6da814b5 
								
							 
						 
						
							
							
								
								Fix recurring "switch to advanced interface" warning by adding missing class to the navigation-panel__banner element  
							
							
							
						 
						
							2023-11-13 13:20:51 -08:00  
				
					
						
							
							
								 
						
							
								7e3c10dec6 
								
							 
						 
						
							
							
								
								Add icons for private and disabled boost in web UI ( #27817 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-11-13 14:39:45 +00:00  
				
					
						
							
							
								 
						
							
								ed79713f3a 
								
							 
						 
						
							
							
								
								Fix modal content not being selectable ( #27813 )  
							
							
							
						 
						
							2023-11-13 13:27:50 +00:00  
				
					
						
							
							
								 
						
							
								e5a7b73ef4 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27815 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-11-13 13:21:02 +00:00  
				
					
						
							
							
								 
						
							
								46a28fc41f 
								
							 
						 
						
							
							
								
								New Crowdin translations  
							
							
							
						 
						
							2023-11-11 04:27:29 +00:00  
				
					
						
							
							
								 
						
							
								ac62b995ef 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27804 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-11-10 13:07:04 +00:00  
				
					
						
							
							
								 
						
							
								7840c6b75b 
								
							 
						 
						
							
							
								
								Do not try to update an undefined video element ( #27798 )  
							
							
							
						 
						
							2023-11-09 22:35:53 +00:00  
				
					
						
							
							
								 
						
							
								c451bbe249 
								
							 
						 
						
							
							
								
								Allow viewing and severing relationships with suspended accounts ( #27667 )  
							
							
							
						 
						
							2023-11-09 14:50:25 +00:00  
				
					
						
							
							
								 
						
							
								9b06c0f24a 
								
							 
						 
						
							
							
								
								Fix Web UI not displaying appropriate explanation when a user hides their follows/followers ( #27791 )  
							
							
							
						 
						
							2023-11-09 12:58:02 +00:00  
				
					
						
							
							
								 
						
							
								5c328ae674 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27768 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-11-08 12:40:09 +00:00  
				
					
						
							
							
								 
						
							
								d3cd37d73e 
								
							 
						 
						
							
							
								
								Feature - Prevents multiple audio/video attachments from being played at the same time ( #24717 )  
							
							
							
						 
						
							2023-11-07 23:37:58 +00:00  
				
					
						
							
							
								 
						
							
								27cbdc6f22 
								
							 
						 
						
							
							
								
								Change alt text to empty string for avatars ( #21875 )  
							
							... 
							
							
							
							Co-authored-by: Renaud Chaput <renchap@gmail.com> 
							
						 
						
							2023-11-07 21:46:08 +00:00  
				
					
						
							
							
								 
						
							
								58f01a5c9a 
								
							 
						 
						
							
							
								
								Add volume saving/reuse to video player ( #27488 )  
							
							
							
						 
						
							2023-11-07 18:15:38 +00:00  
				
					
						
							
							
								 
						
							
								f476d9dab2 
								
							 
						 
						
							
							
								
								Fix the `notificationsUpdate` call ( #27758 )  
							
							
							
						 
						
							2023-11-07 14:18:59 +00:00  
				
					
						
							
							
								 
						
							
								1b28ab7263 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27687 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-11-07 09:03:59 +00:00  
				
					
						
							
							
								 
						
							
								e4e752c26e 
								
							 
						 
						
							
							
								
								Adjust transform origin for favorite star ( #27700 )  
							
							
							
						 
						
							2023-11-06 11:14:46 +00:00  
				
					
						
							
							
								 
						
							
								6712bf86cd 
								
							 
						 
						
							
							
								
								Fixes website not loading for unlogged users ( #27698 )  
							
							
							
						 
						
							2023-11-04 21:52:56 +00:00  
				
					
						
							
							
								 
						
							
								3bf2a7296e 
								
							 
						 
						
							
							
								
								Use Immutable `Record` for accounts in Redux state ( #26559 )  
							
							
							
						 
						
							2023-11-03 15:00:03 +00:00  
				
					
						
							
							
								 
						
							
								2d548e273e 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27646 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-11-03 10:10:13 +00:00  
				
					
						
							
							
								 
						
							
								ac8e4ed38d 
								
							 
						 
						
							
							
								
								Fix inserting emojis from emoji picker fails with TypeError ( #27647 )  
							
							
							
						 
						
							2023-11-01 07:22:02 +00:00