bf6e57b420 
								
							 
						 
						
							
							
								
								Further reduce CSS and markup differences with upstream ( #2637 )  
							
							... 
							
							
							
							* Reduce differences in `MovedNote` markup and styling
* Remove unused setting toggle meta text support
* Fix various CSS discrepancies with upstream
* Further reduce differences with upstream 
							
						 
						
							2024-02-20 23:06:17 +01:00  
				
					
						
							
							
								 
						
							
								5f50b634cf 
								
							 
						 
						
							
							
								
								Further reduce CSS and markup differences with upstream ( #2635 )  
							
							... 
							
							
							
							* Further reduce CSS differences with upstream
* Reduce differences in markup and CSS with upstream
* Redo collapsible post notifications
* Reduce CSS differences further
* Reduce differences with upstream regarding `.status` and `.status__wrapper`
* Further reduce differences with upstream
* Reduce differences with upstream in DisplayName 
							
						 
						
							2024-02-20 18:49:59 +01:00  
				
					
						
							
							
								 
						
							
								9a2b9d1484 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29298 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-02-20 09:23:40 +00:00  
				
					
						
							
							
								 
						
							
								bde4df6be6 
								
							 
						 
						
							
							
								
								Remove CSS definitions for some unused classes ( #29279 )  
							
							
							
						 
						
							2024-02-20 09:18:44 +00:00  
				
					
						
							
							
								 
						
							
								b8b2f20b16 
								
							 
						 
						
							
							
								
								Change explore icon from hashtag to compass in web UI ( #29294 )  
							
							
							
						 
						
							2024-02-20 09:10:44 +00:00  
				
					
						
							
							
								 
						
							
								0a2b95c4f5 
								
							 
						 
						
							
							
								
								Adopt upstream's design for preview cards ( #2634 )  
							
							... 
							
							
							
							Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Christian Schmidt <github@chsc.dk> 
							
						 
						
							2024-02-19 22:47:01 +01:00  
				
					
						
							
							
								 
						
							
								89ea492d70 
								
							 
						 
						
							
							
								
								Further reduce CSS changes with upstream ( #2632 )  
							
							
							
						 
						
							2024-02-19 19:54:51 +01:00  
				
					
						
							
							
								 
						
							
								c645490d55 
								
							 
						 
						
							
							
								
								Fix `sensitive` flag not being removed when removing CW in new compose form ( #29248 )  
							
							
							
						 
						
							2024-02-19 13:31:16 +00:00  
				
					
						
							
							
								 
						
							
								ad16362efe 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29255 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-02-19 13:25:45 +00:00  
				
					
						
							
							
								 
						
							
								63f4ea055a 
								
							 
						 
						
							
							
								
								Change follow suggestions design in web UI ( #29272 )  
							
							
							
						 
						
							2024-02-19 11:09:58 +00:00  
				
					
						
							
							
								 
						
							
								bbecf1c56b 
								
							 
						 
						
							
							
								
								Further reduce differences with upstream ( #2631 )  
							
							... 
							
							
							
							* Further reduce CSS diffs with upstream
* Remove superfluous “Sensitive content” label in media galleries and clean up dead code 
							
						 
						
							2024-02-18 22:30:20 +01:00  
				
					
						
							
							
								 
						
							
								034be5ad50 
								
							 
						 
						
							
							
								
								Further reduce CSS differences with upstream ( #2630 )  
							
							
							
						 
						
							2024-02-18 20:45:36 +01:00  
				
					
						
							
							
								 
						
							
								9a11b077f7 
								
							 
						 
						
							
							
								
								Reduce CSS and markup differences with upstream ( #2629 )  
							
							
							
						 
						
							2024-02-18 19:12:23 +01:00  
				
					
						
							
							
								 
						
							
								e078ede097 
								
							 
						 
						
							
							
								
								Remove status content from mobile actions modal ( #2615 )  
							
							
							
						 
						
							2024-02-18 19:10:58 +01:00  
				
					
						
							
							
								 
						
							
								8a10feb8dc 
								
							 
						 
						
							
							
								
								[Glitch] Fix Web UI not displaying appropriate explanation when a user hides their follows/followers  
							
							... 
							
							
							
							Port 9b06c0f24a 
							
						 
						
							2024-02-17 20:15:25 +01:00  
				
					
						
							
							
								 
						
							
								d86b642dc6 
								
							 
						 
						
							
							
								
								Fix dead and misapplied CSS ( #2627 )  
							
							
							
						 
						
							2024-02-17 18:52:59 +01:00  
				
					
						
							
							
								 
						
							
								41c85e3b6d 
								
							 
						 
						
							
							
								
								Change list title input design to fit upstream ( #2626 )  
							
							... 
							
							
							
							* Change settings input field design to match upstream's
* Fix light theme discrepancies
* Restore regexp inputs as glitch-soc-specific styles 
							
						 
						
							2024-02-17 18:52:37 +01:00  
				
					
						
							
							
								 
						
							
								50d9cd66d3 
								
							 
						 
						
							
							
								
								[Glitch] Use container queries to hide profile share button  
							
							... 
							
							
							
							Port c94bedf4e6 
							
						 
						
							2024-02-16 18:18:17 +01:00  
				
					
						
							
							
								 
						
							
								ce3978246b 
								
							 
						 
						
							
							
								
								[Glitch] Add prominent share/copy button on profiles in web UI  
							
							... 
							
							
							
							Port 87696ea26e 
							
						 
						
							2024-02-16 18:17:55 +01:00  
				
					
						
							
							
								 
						
							
								c0279385d7 
								
							 
						 
						
							
							
								
								Adopt upstream's design for account profiles ( #2622 )  
							
							... 
							
							
							
							* Mostly adopt upstream's design for account profiles
* Reduce some margins 
							
						 
						
							2024-02-16 17:57:43 +01:00  
				
					
						
							
							
								 
						
							
								1c93d625c6 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29195 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-02-16 07:51:13 +00:00  
				
					
						
							
							
								 
						
							
								476a043fc5 
								
							 
						 
						
							
							
								
								Fix modal container bounds ( #29185 )  
							
							
							
						 
						
							2024-02-13 12:58:21 +00:00  
				
					
						
							
							
								 
						
							
								e3c4e90646 
								
							 
						 
						
							
							
								
								Fix new list button being blank ( #2616 )  
							
							
							
						 
						
							2024-02-13 12:48:01 +01:00  
				
					
						
							
							
								 
						
							
								5de1ce23c3 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29182 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-02-13 09:08:55 +00:00  
				
					
						
							
							
								 
						
							
								6482948547 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29156 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-02-12 09:59:05 +00:00  
				
					
						
							
							
								 
						
							
								c249c10f74 
								
							 
						 
						
							
							
								
								Fix account suggestion size inconsistency with upstream  
							
							
							
						 
						
							2024-02-11 21:55:36 +01:00  
				
					
						
							
							
								 
						
							
								c07028b2fa 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29152 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-02-09 09:55:30 +00:00  
				
					
						
							
							
								 
						
							
								d391e01b59 
								
							 
						 
						
							
							
								
								Revert notification bar color for now  
							
							
							
						 
						
							2024-02-08 21:12:57 +01:00  
				
					
						
							
							
								 
						
							
								ca8fbda5d0 
								
							 
						 
						
							
							
								
								Add end-to-end test for OCR in media uploads ( #29148 )  
							
							
							
						 
						
							2024-02-08 19:13:44 +00:00  
				
					
						
							
							
								 
						
							
								3f89cec3c9 
								
							 
						 
						
							
							
								
								Further reduce differences with upstream  
							
							
							
						 
						
							2024-02-08 19:52:03 +01:00  
				
					
						
							
							
								 
						
							
								f6f62002c7 
								
							 
						 
						
							
							
								
								Remove leftovers from glitch-soc's layout option  
							
							
							
						 
						
							2024-02-08 19:21:35 +01:00  
				
					
						
							
							
								 
						
							
								189b70cd6a 
								
							 
						 
						
							
							
								
								Merge SCSS in a single `components.scss` file  
							
							
							
						 
						
							2024-02-08 18:50:38 +01:00  
				
					
						
							
							
								 
						
							
								67ec192d7d 
								
							 
						 
						
							
							
								
								Clean up some unused CSS definitions ( #29146 )  
							
							
							
						 
						
							2024-02-08 11:40:22 +00:00  
				
					
						
							
							
								 
						
							
								2a362d62a8 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29145 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-02-08 09:43:02 +00:00  
				
					
						
							
							
								 
						
							
								17052714a2 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29121 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-02-07 12:38:37 +00:00  
				
					
						
							
							
								 
						
							
								a2611d782c 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #2588 )  
							
							... 
							
							
							
							* New Crowdin translations
* Fix bogus translation files
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2024-02-06 20:45:07 +01:00  
				
					
						
							
							
								 
						
							
								541cbdd963 
								
							 
						 
						
							
							
								
								Add env variable support for number of followable hashtags in feed column ( #2500 )  
							
							... 
							
							
							
							* Add env variable support for number of followable hashtags in feed column.
* Add a note about performance concerns for higher values.
See discussion in https://github.com/glitch-soc/mastodon/pull/2500 
* Update .devcontainer/docker-compose.yml
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2024-02-06 20:23:36 +01:00  
				
					
						
							
							
								 
						
							
								08e511cecb 
								
							 
						 
						
							
							
								
								Fix doodle modal icons ( #2597 )  
							
							
							
						 
						
							2024-02-06 20:22:42 +01:00  
				
					
						
							
							
								 
						
							
								90ccf7beb2 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28965 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-02-06 18:47:44 +00:00  
				
					
						
							
							
								 
						
							
								7ee93b7431 
								
							 
						 
						
							
							
								
								Change `source` attribute of `Suggestion` entity in `/api/v2/suggestions` back to a string ( #29108 )  
							
							
							
						 
						
							2024-02-06 17:10:17 +00:00  
				
					
						
							
							
								 
						
							
								9ce914cc89 
								
							 
						 
						
							
							
								
								Fix report reason selector in moderation interface not unselecting rules when changing category ( #29026 )  
							
							
							
						 
						
							2024-02-06 09:35:36 +00:00  
				
					
						
							
							
								 
						
							
								3c315a68af 
								
							 
						 
						
							
							
								
								Fix 'focus the compose textarea' shortcut is not working ( #29059 )  
							
							
							
						 
						
							2024-02-02 06:33:53 +00:00  
				
					
						
							
							
								 
						
							
								9cdc60ecc6 
								
							 
						 
						
							
							
								
								Change onboarding prompt to follow suggestions carousel in web UI ( #28878 )  
							
							
							
						 
						
							2024-02-01 13:37:04 +00:00  
				
					
						
							
							
								 
						
							
								8b87673f5e 
								
							 
						 
						
							
							
								
								Remove obsolete locale file ( #2596 )  
							
							
							
						 
						
							2024-01-30 23:21:35 +01:00  
				
					
						
							
							
								 
						
							
								3ede233146 
								
							 
						 
						
							
							
								
								Fix crash in private mention conversations in glitch-soc flavor ( #2595 )  
							
							
							
						 
						
							2024-01-30 22:42:22 +01:00  
				
					
						
							
							
								 
						
							
								b3075a9993 
								
							 
						 
						
							
							
								
								Remove unused l18n messages ( #28964 )  
							
							
							
						 
						
							2024-01-30 15:34:07 +00:00  
				
					
						
							
							
								 
						
							
								1467f1e1e1 
								
							 
						 
						
							
							
								
								Fixed the toggle emoji dropdown bug  ( #29012 )  
							
							
							
						 
						
							2024-01-30 13:38:49 +00:00  
				
					
						
							
							
								 
						
							
								80308d384a 
								
							 
						 
						
							
							
								
								[Glitch] Refactor conversations components in web UI ( #2589 )  
							
							... 
							
							
							
							Port 3205a654ca 
							
						 
						
							2024-01-28 14:53:08 +01:00  
				
					
						
							
							
								 
						
							
								54ece5040d 
								
							 
						 
						
							
							
								
								[Glitch] Use active variants for boost icons and increase icon size  
							
							... 
							
							
							
							Port 5a838ceaa9 
							
						 
						
							2024-01-26 20:53:53 +01:00  
				
					
						
							
							
								 
						
							
								e5f50478b5 
								
							 
						 
						
							
							
								
								[Glitch] Add confirmation when redirecting logged-out requests to permalink  
							
							... 
							
							
							
							Port SCSS changes from b19ae521b7 
							
						 
						
							2024-01-26 20:51:08 +01:00  
				
					
						
							
							
								 
						
							
								5fa2821853 
								
							 
						 
						
							
							
								
								Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-26 20:47:20 +01:00  
				
					
						
							
							
								 
						
							
								ae9c675930 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #2564 )  
							
							... 
							
							
							
							* New Crowdin translations
* Fix bogus translation files
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2024-01-26 19:45:04 +01:00  
				
					
						
							
							
								 
						
							
								805dba7f8d 
								
							 
						 
						
							
							
								
								Change compose form to use server-provided post character limit ( #28928 )  
							
							
							
						 
						
							2024-01-26 14:09:45 +00:00  
				
					
						
							
							
								 
						
							
								45287049ab 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28923 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-01-26 09:15:55 +00:00  
				
					
						
							
							
								 
						
							
								6936e5aa69 
								
							 
						 
						
							
							
								
								Change design of compose form in web UI ( #28119 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2024-01-25 15:41:31 +00:00  
				
					
						
							
							
								 
						
							
								3205a654ca 
								
							 
						 
						
							
							
								
								Refactor conversations components in web UI ( #28833 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2024-01-25 14:34:26 +00:00  
				
					
						
							
							
								 
						
							
								59d2ea0d82 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28899 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-01-25 13:00:44 +00:00  
				
					
						
							
							
								 
						
							
								22e419f95e 
								
							 
						 
						
							
							
								
								[Glitch] Fix search form re-rendering spuriously in web UI  
							
							... 
							
							
							
							Port 01ce9df880 
							
						 
						
							2024-01-24 20:53:15 +01:00  
				
					
						
							
							
								 
						
							
								22cfab0ebf 
								
							 
						 
						
							
							
								
								Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `tsconfig.json`:
  Upstream made style fixes, while glitch-soc had extra options.
  Ported upstream's style fixes. 
							
						 
						
							2024-01-24 20:42:53 +01:00  
				
					
						
							
							
								 
						
							
								5a838ceaa9 
								
							 
						 
						
							
							
								
								Use active variants for boost icons and increase icon size ( #27924 )  
							
							
							
						 
						
							2024-01-24 12:37:43 +00:00  
				
					
						
							
							
								 
						
							
								b19ae521b7 
								
							 
						 
						
							
							
								
								Add confirmation when redirecting logged-out requests to permalink ( #27792 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2024-01-24 10:49:19 +00:00  
				
					
						
							
							
								 
						
							
								01ce9df880 
								
							 
						 
						
							
							
								
								Fix search form re-rendering spuriously in web UI ( #28876 )  
							
							
							
						 
						
							2024-01-24 07:03:30 +00:00  
				
					
						
							
							
								 
						
							
								78ee1453f9 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28857 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-01-23 10:11:37 +00:00  
				
					
						
							
							
								 
						
							
								72bae7e170 
								
							 
						 
						
							
							
								
								[Glitch] Fix duplicate and missing keys in search popout component in web UI  
							
							... 
							
							
							
							Port 9f8e3cca9a 
							
						 
						
							2024-01-22 19:21:02 +01:00  
				
					
						
							
							
								 
						
							
								102eff7c05 
								
							 
						 
						
							
							
								
								Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-22 19:19:40 +01:00  
				
					
						
							
							
								 
						
							
								1d381c1664 
								
							 
						 
						
							
							
								
								[Glitch] Update dependency react-redux to v9.1.0  
							
							... 
							
							
							
							Port 163db814c2 
							
						 
						
							2024-01-22 19:15:02 +01:00  
				
					
						
							
							
								 
						
							
								0700eb58bc 
								
							 
						 
						
							
							
								
								Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-22 19:12:05 +01:00  
				
					
						
							
							
								 
						
							
								76e383ea1e 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28827 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-01-22 11:52:26 +00:00  
				
					
						
							
							
								 
						
							
								9f8e3cca9a 
								
							 
						 
						
							
							
								
								Fix duplicate and missing keys in search popout component in web UI ( #28834 )  
							
							
							
						 
						
							2024-01-21 07:44:46 +00:00  
				
					
						
							
							
								 
						
							
								9cd17020bc 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28798 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-01-19 09:41:57 +00:00  
				
					
						
							
							
								 
						
							
								163db814c2 
								
							 
						 
						
							
							
								
								Update dependency react-redux to v9.1.0 ( #28717 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com> 
							
						 
						
							2024-01-19 09:41:03 +00:00  
				
					
						
							
							
								 
						
							
								86cc88c216 
								
							 
						 
						
							
							
								
								Fix banner image not showing in follow emails ( #28814 )  
							
							
							
						 
						
							2024-01-19 09:23:59 +00:00  
				
					
						
							
							
								 
						
							
								07b6777c99 
								
							 
						 
						
							
							
								
								Fix styling issue in account fields ( #2578 )  
							
							
							
						 
						
							2024-01-18 20:27:47 +01:00  
				
					
						
							
							
								 
						
							
								036e25f19d 
								
							 
						 
						
							
							
								
								[Glitch] Improve display of lock icon in account headers  
							
							... 
							
							
							
							Port 30b193b856 
							
						 
						
							2024-01-17 18:37:04 +01:00  
				
					
						
							
							
								 
						
							
								0207c4b055 
								
							 
						 
						
							
							
								
								[Glitch] Change media “ALT” label to a specific class  
							
							... 
							
							
							
							Port e817fe4c35 
							
						 
						
							2024-01-17 18:36:09 +01:00  
				
					
						
							
							
								 
						
							
								e8294925e6 
								
							 
						 
						
							
							
								
								[Glitch] Fix various icon alignment issues  
							
							... 
							
							
							
							Port baab58c80b 
							
						 
						
							2024-01-17 18:34:57 +01:00  
				
					
						
							
							
								 
						
							
								c59fb65ddc 
								
							 
						 
						
							
							
								
								Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/helpers/accounts_helper.rb`:
  Conflict due to glitch-soc's option to hide followers count.
  Ported upstream changes.
Additional changes:
- `app/views/application/mailer/_account.html.haml`:
  Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
  Ported the `frontend_asset_url` helper change to glitch-soc. 
							
						 
						
							2024-01-17 18:32:15 +01:00  
				
					
						
							
							
								 
						
							
								d56e9fb873 
								
							 
						 
						
							
							
								
								[Glitch] Update devDependencies (non-major)  
							
							... 
							
							
							
							Port 4e277f83dc 
							
						 
						
							2024-01-17 18:12:00 +01:00  
				
					
						
							
							
								 
						
							
								8485bedddc 
								
							 
						 
						
							
							
								
								Merge commit '4e277f83dc740b3a842c7fd8ed167c3c76fcabf8' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-17 18:09:15 +01:00  
				
					
						
							
							
								 
						
							
								30b193b856 
								
							 
						 
						
							
							
								
								Improve display of lock icon in account headers ( #28780 )  
							
							
							
						 
						
							2024-01-17 16:32:30 +00:00  
				
					
						
							
							
								 
						
							
								e817fe4c35 
								
							 
						 
						
							
							
								
								Change media “ALT” label to a specific class ( #28777 )  
							
							
							
						 
						
							2024-01-17 15:32:56 +00:00  
				
					
						
							
							
								 
						
							
								1a3859d8e2 
								
							 
						 
						
							
							
								
								Update follow and follow_request emails ( #28755 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2024-01-17 14:37:04 +00:00  
				
					
						
							
							
								 
						
							
								1ab42ad12b 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28749 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-01-17 14:23:14 +00:00  
				
					
						
							
							
								 
						
							
								baab58c80b 
								
							 
						 
						
							
							
								
								Fix various icon alignment issues ( #28775 )  
							
							
							
						 
						
							2024-01-17 10:42:47 +00:00  
				
					
						
							
							
								 
						
							
								4e277f83dc 
								
							 
						 
						
							
							
								
								Update devDependencies (non-major) ( #28728 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com> 
							
						 
						
							2024-01-16 18:34:22 +00:00  
				
					
						
							
							
								 
						
							
								411efdc2d3 
								
							 
						 
						
							
							
								
								Fix getting started misc column on dev env ( #2575 )  
							
							... 
							
							
							
							* Fix getting started misc column on dev
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2024-01-16 17:40:03 +01:00  
				
					
						
							
							
								 
						
							
								5b67389bba 
								
							 
						 
						
							
							
								
								[Glitch] Add a new `@/` alias for the root frontend directory and use it where possible  
							
							... 
							
							
							
							Port 01b6c83c36 
							
						 
						
							2024-01-16 12:21:13 +01:00  
				
					
						
							
							
								 
						
							
								e4d07c7bcc 
								
							 
						 
						
							
							
								
								Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-16 12:04:11 +01:00  
				
					
						
							
							
								 
						
							
								01b6c83c36 
								
							 
						 
						
							
							
								
								Add a new `@/` alias for the root frontend directory and use it where possible ( #28753 )  
							
							
							
						 
						
							2024-01-16 10:27:26 +00:00  
				
					
						
							
							
								 
						
							
								01df34b9db 
								
							 
						 
						
							
							
								
								Remove bypass and use use glitch-soc's theming system for inert.css  
							
							
							
						 
						
							2024-01-15 22:16:26 +01:00  
				
					
						
							
							
								 
						
							
								34c9f77b3e 
								
							 
						 
						
							
							
								
								Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/views/layouts/mailer.html.haml`:
  Conflict caused by glitch-soc's theming system.
  Used glitch-soc's path for the mailer pack. 
							
						 
						
							2024-01-15 21:30:00 +01:00  
				
					
						
							
							
								 
						
							
								6e4d5b4736 
								
							 
						 
						
							
							
								
								Fix some icon-related styling issues  
							
							
							
						 
						
							2024-01-15 21:05:54 +01:00  
				
					
						
							
							
								 
						
							
								a1920425ca 
								
							 
						 
						
							
							
								
								[Glitch] Switch from 48px weight 600 material symbol icons to 24px weight 400 icons  
							
							... 
							
							
							
							Port 6bbcd9348e 
							
						 
						
							2024-01-15 20:53:08 +01:00  
				
					
						
							
							
								 
						
							
								2f521bc84a 
								
							 
						 
						
							
							
								
								Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-15 20:27:41 +01:00  
				
					
						
							
							
								 
						
							
								8cad0a4d6b 
								
							 
						 
						
							
							
								
								[Glitch] Change icon SVG imports to use a default import  
							
							... 
							
							
							
							Port 608f66f978 
							
						 
						
							2024-01-15 20:20:38 +01:00  
				
					
						
							
							
								 
						
							
								464051c2d2 
								
							 
						 
						
							
							
								
								Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-15 20:06:31 +01:00  
				
					
						
							
							
								 
						
							
								60298af3c4 
								
							 
						 
						
							
							
								
								Merge commit 'c6684aa1e392f2dd86af4362b4259809549abaad' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream changed how the `inert.css` file is included.
  The conflict is caused by glitch-soc's theming system.
  Ported the upstream change.
Additional changes:
- `config/webpack/shared.js`: bypass glitch-soc's theming
  system for `inert` pack. 
							
						 
						
							2024-01-15 20:01:36 +01:00  
				
					
						
							
							
								 
						
							
								1323dfac80 
								
							 
						 
						
							
							
								
								Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-15 19:19:04 +01:00  
				
					
						
							
							
								 
						
							
								7f471e70c0 
								
							 
						 
						
							
							
								
								Update new email templates ( #28416 )  
							
							... 
							
							
							
							Co-authored-by: Matt Jankowski <matt@jankowski.online> 
							
						 
						
							2024-01-15 18:18:59 +00:00  
				
					
						
							
							
								 
						
							
								82d28ac956 
								
							 
						 
						
							
							
								
								Merge pull request  #2567  from ClearlyClaire/glitch-soc/ports/convert-utils-hashtags-typescript  
							
							... 
							
							
							
							Convert utils and hashtags to Typescript 
							
						 
						
							2024-01-15 12:41:22 +01:00  
				
					
						
							
							
								 
						
							
								50188ad211 
								
							 
						 
						
							
							
								
								[Glitch] Use helpers to check environment in frontend ( #2571 )  
							
							... 
							
							
							
							Port 277e6968f5 
							
						 
						
							2024-01-15 12:16:05 +01:00  
				
					
						
							
							
								 
						
							
								1012ffac9e 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28721 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-01-15 11:06:25 +00:00  
				
					
						
							
							
								 
						
							
								f8941c41a5 
								
							 
						 
						
							
							
								
								[Glitch] Converted hashtag.jsx to TypeScript  
							
							... 
							
							
							
							Port 3a7f10c3f1 
							
						 
						
							2024-01-14 19:22:39 +01:00  
				
					
						
							
							
								 
						
							
								695dcc6ca8 
								
							 
						 
						
							
							
								
								[Glitch] Converted app/javascript/flavours/glitch/utils/ folder to TypeScript  
							
							... 
							
							
							
							Port 1142f4c79e 
							
						 
						
							2024-01-14 19:22:39 +01:00  
				
					
						
							
							
								 
						
							
								52c023a305 
								
							 
						 
						
							
							
								
								Convert `Permalink` to Typescript  
							
							
							
						 
						
							2024-01-14 19:22:39 +01:00  
				
					
						
							
							
								 
						
							
								16499bc097 
								
							 
						 
						
							
							
								
								Rewrite `Permalink` as functional component  
							
							
							
						 
						
							2024-01-14 19:22:39 +01:00  
				
					
						
							
							
								 
						
							
								0213ae6b37 
								
							 
						 
						
							
							
								
								Extract glitch-soc-only i18n string  
							
							
							
						 
						
							2024-01-14 16:32:08 +01:00  
				
					
						
							
							
								 
						
							
								6772bf611e 
								
							 
						 
						
							
							
								
								[Glitch] Fix wrong color on active icons with counters in web UI  
							
							... 
							
							
							
							Port 728eb6a153 
							
						 
						
							2024-01-14 16:32:08 +01:00  
				
					
						
							
							
								 
						
							
								cc363629be 
								
							 
						 
						
							
							
								
								[Glitch] Fix focus and hover styles in web UI  
							
							... 
							
							
							
							Port cfd50f30bb 
							
						 
						
							2024-01-14 16:32:08 +01:00  
				
					
						
							
							
								 
						
							
								7565a328d0 
								
							 
						 
						
							
							
								
								[Glitch] change column link to add a better keyboard focus indicator  
							
							... 
							
							
							
							Port 6308dca76a 
							
						 
						
							2024-01-14 16:32:08 +01:00  
				
					
						
							
							
								 
						
							
								c1e28c8913 
								
							 
						 
						
							
							
								
								[Glitch] change focus ui for keyboard only input  
							
							... 
							
							
							
							Port 59478a1b46 
							
						 
						
							2024-01-14 16:32:08 +01:00  
				
					
						
							
							
								 
						
							
								a7bad8f45c 
								
							 
						 
						
							
							
								
								[Glitch] Fix profile setup showing default avatar in web UI  
							
							... 
							
							
							
							Port 01f0a6ca4f 
							
						 
						
							2024-01-14 16:32:08 +01:00  
				
					
						
							
							
								 
						
							
								b534532eaf 
								
							 
						 
						
							
							
								
								[Glitch] Change to single opt-in during profile setup in onboarding in web UI  
							
							... 
							
							
							
							Port 0e9801443f 
							
						 
						
							2024-01-14 16:32:08 +01:00  
				
					
						
							
							
								 
						
							
								bacb9134cc 
								
							 
						 
						
							
							
								
								[Glitch] Add profile setup to onboarding in web UI  
							
							... 
							
							
							
							Port d67bd44ca1 
							
						 
						
							2024-01-14 16:32:08 +01:00  
				
					
						
							
							
								 
						
							
								2653651bfa 
								
							 
						 
						
							
							
								
								[Glitch] Simplify column headers  
							
							... 
							
							
							
							Port 13d310e64d 
							
						 
						
							2024-01-14 14:31:49 +01:00  
				
					
						
							
							
								 
						
							
								ca17c2d35a 
								
							 
						 
						
							
							
								
								[Glitch] Use a context to propagate column-related Props, and remove `forceUpdate` usage  
							
							... 
							
							
							
							Port 537442853f 
							
						 
						
							2024-01-14 14:31:49 +01:00  
				
					
						
							
							
								 
						
							
								e2c7c370dc 
								
							 
						 
						
							
							
								
								Fix size of glitch-soc status info icons  
							
							
							
						 
						
							2024-01-14 00:09:28 +01:00  
				
					
						
							
							
								 
						
							
								e2ba5f6e35 
								
							 
						 
						
							
							
								
								Fix glitch-soc high color privacy icons  
							
							
							
						 
						
							2024-01-14 00:04:09 +01:00  
				
					
						
							
							
								 
						
							
								e227e959f7 
								
							 
						 
						
							
							
								
								Fix glitch-soc textarea icons  
							
							
							
						 
						
							2024-01-13 23:53:23 +01:00  
				
					
						
							
							
								 
						
							
								6333900006 
								
							 
						 
						
							
							
								
								Fix glitch-soc CW media icons  
							
							
							
						 
						
							2024-01-13 23:48:37 +01:00  
				
					
						
							
							
								 
						
							
								46128f25b6 
								
							 
						 
						
							
							
								
								Fix glitch-soc status media icons  
							
							
							
						 
						
							2024-01-13 23:35:53 +01:00  
				
					
						
							
							
								 
						
							
								731f01adb1 
								
							 
						 
						
							
							
								
								[Glitch] Fix reply icon display in picture-in-picture footer  
							
							... 
							
							
							
							Port 1cba91d6d1 
							
						 
						
							2024-01-13 23:19:01 +01:00  
				
					
						
							
							
								 
						
							
								dd56900fac 
								
							 
						 
						
							
							
								
								[Glitch] Fixes dropdown target without a `buttonRef` (edit history)  
							
							... 
							
							
							
							Port 7b1d390734 
							
						 
						
							2024-01-13 23:19:01 +01:00  
				
					
						
							
							
								 
						
							
								a8c59c2506 
								
							 
						 
						
							
							
								
								[Glitch] Add icons for private and disabled boost in web UI  
							
							... 
							
							
							
							Port 7e3c10dec6 
							
						 
						
							2024-01-13 23:19:01 +01:00  
				
					
						
							
							
								 
						
							
								b2a6386b7d 
								
							 
						 
						
							
							
								
								[Glitch] Adjust transform origin for favorite star  
							
							... 
							
							
							
							Port e4e752c26e 
							
						 
						
							2024-01-13 23:19:01 +01:00  
				
					
						
							
							
								 
						
							
								6230d50f3f 
								
							 
						 
						
							
							
								
								[Glitch] Fix various icon styles in web UI  
							
							... 
							
							
							
							Port fa7e64df1d 
							
						 
						
							2024-01-13 23:19:01 +01:00  
				
					
						
							
							
								 
						
							
								b67d977e20 
								
							 
						 
						
							
							
								
								[Glitch] Add missing ban icons  
							
							... 
							
							
							
							Port a4e6fe36cb 
							
						 
						
							2024-01-13 23:19:01 +01:00  
				
					
						
							
							
								 
						
							
								9b32a37b6f 
								
							 
						 
						
							
							
								
								[Glitch] Fix missing icon props  
							
							... 
							
							
							
							Port f08ca3f042 
							
						 
						
							2024-01-13 23:19:01 +01:00  
				
					
						
							
							
								 
						
							
								d54414866c 
								
							 
						 
						
							
							
								
								[Glitch] Change icons in web UI  
							
							... 
							
							
							
							Port 134de736dc 
							
						 
						
							2024-01-13 23:19:01 +01:00  
				
					
						
							
							
								 
						
							
								5f8618443c 
								
							 
						 
						
							
							
								
								Merge pull request  #2566  from ClearlyClaire/glitch-soc/ports/badge-design  
							
							... 
							
							
							
							Port upstream's role badge design 
							
						 
						
							2024-01-13 14:25:55 +01:00  
				
					
						
							
							
								 
						
							
								eae3275fff 
								
							 
						 
						
							
							
								
								[Glitch] Change design of role badges in web UI  
							
							... 
							
							
							
							Port 2cbdff97ce 
							
						 
						
							2024-01-13 13:09:04 +01:00  
				
					
						
							
							
								 
						
							
								a40ce78f11 
								
							 
						 
						
							
							
								
								[Glitch] Add role badges to the WebUI  
							
							... 
							
							
							
							Port 1e4ccc655a 
							
						 
						
							2024-01-13 12:50:27 +01:00  
				
					
						
							
							
								 
						
							
								a25e03dbc3 
								
							 
						 
						
							
							
								
								Revert "Add role badges to WebUI ( #2096 )"  
							
							... 
							
							
							
							This reverts commit d9a078e6d3 
							
						 
						
							2024-01-13 12:43:25 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								277e6968f5 
								
							 
						 
						
							
							
								
								Use helpers to check environment in frontend ( #27633 )  
							
							
							
						 
						
							2023-10-31 16:05:44 +00:00  
				
					
						
							
							
								 
						
							
								0e3401bc1c 
								
							 
						 
						
							
							
								
								Improve Babel configuration and automatically load polyfills ( #27333 )  
							
							
							
						 
						
							2023-10-31 10:55:13 +00:00  
				
					
						
							
							
								 
						
							
								9c8891b39a 
								
							 
						 
						
							
							
								
								Rewrite `AutosuggestTextarea` as Functional Component ( #27618 )  
							
							
							
						 
						
							2023-10-31 10:17:37 +00:00  
				
					
						
							
							
								 
						
							
								e5b7ae9576 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27630 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-10-31 08:43:17 +00:00  
				
					
						
							
							
								 
						
							
								a918208ec6 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27596 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-10-30 14:19:25 +00:00  
				
					
						
							
							
								 
						
							
								08bdd5751e 
								
							 
						 
						
							
							
								
								Fix account click on detailed status ( #27587 )  
							
							
							
						 
						
							2023-10-27 14:03:21 +00:00  
				
					
						
							
							
								 
						
							
								13d310e64d 
								
							 
						 
						
							
							
								
								Simplify column headers ( #27557 )  
							
							
							
						 
						
							2023-10-27 13:21:07 +00:00  
				
					
						
							
							
								 
						
							
								fa7e64df1d 
								
							 
						 
						
							
							
								
								Fix various icon styles in web UI ( #27579 )  
							
							
							
						 
						
							2023-10-26 23:37:58 +00:00  
				
					
						
							
							
								 
						
							
								2d8f759a34 
								
							 
						 
						
							
							
								
								Add HTML lang attribute to preview card descriptions ( #27503 )  
							
							
							
						 
						
							2023-10-26 20:34:15 +00:00  
				
					
						
							
							
								 
						
							
								3427b51d63 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27567 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-10-26 11:05:47 +00:00  
				
					
						
							
							
								 
						
							
								537442853f 
								
							 
						 
						
							
							
								
								Use a context to propagate column-related Props, and remove `forceUpdate` usage ( #27548 )  
							
							
							
						 
						
							2023-10-26 11:00:10 +00:00  
				
					
						
							
							
								 
						
							
								62620956d5 
								
							 
						 
						
							
							
								
								Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-25 19:59:17 +02:00  
				
					
						
							
							
								 
						
							
								a4e6fe36cb 
								
							 
						 
						
							
							
								
								Add missing ban icons ( #27555 )  
							
							
							
						 
						
							2023-10-25 12:47:37 +00:00  
				
					
						
							
							
								 
						
							
								85d4846d8a 
								
							 
						 
						
							
							
								
								[Glitch] Fix `<ColumnBackButtonSlim>`  
							
							... 
							
							
							
							Port cb92cdf9af 
							
						 
						
							2023-10-25 12:22:59 +02:00  
				
					
						
							
							
								 
						
							
								6e9f89e5b6 
								
							 
						 
						
							
							
								
								Merge commit 'c85e0a6b047f1a72ad970bc04c4e1be3f028b3d1' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/packs/admin.jsx`:
  Upstream fixed `@rails/ujs` imports.
  Already taken care of in 8a131fb7bc8a131fb7bc 
							
						 
						
							2023-10-25 12:18:45 +02:00  
				
					
						
							
							
								 
						
							
								ba527c071f 
								
							 
						 
						
							
							
								
								Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
  Upstream changed how icons are handled, including on a line modified by
  glitch-soc to bump the number of poll options.
  Applied upstream's change, while keeping the increased number of poll
  options. 
							
						 
						
							2023-10-25 12:14:24 +02:00  
				
					
						
							
							
								 
						
							
								c85e0a6b04 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27544 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-10-25 07:36:07 +00:00  
				
					
						
							
							
								 
						
							
								cb92cdf9af 
								
							 
						 
						
							
							
								
								Fix `<ColumnBackButtonSlim>` ( #27540 )  
							
							
							
						 
						
							2023-10-24 20:43:55 +00:00  
				
					
						
							
							
								 
						
							
								f08ca3f042 
								
							 
						 
						
							
							
								
								Fix missing icon props ( #27539 )  
							
							
							
						 
						
							2023-10-24 20:43:06 +00:00  
				
					
						
							
							
								 
						
							
								bc3afb6311 
								
							 
						 
						
							
							
								
								Update `rails/ujs` delegate method usage ( #27538 )  
							
							
							
						 
						
							2023-10-24 20:38:19 +00:00  
				
					
						
							
							
								 
						
							
								8123e86623 
								
							 
						 
						
							
							
								
								[Glitch] Fix double scroll bars in some columns in advanced interface  
							
							... 
							
							
							
							Port 37bbd3c106 
							
						 
						
							2023-10-24 20:46:11 +02:00  
				
					
						
							
							
								 
						
							
								b73e4b59fc 
								
							 
						 
						
							
							
								
								[Glitch] Fix history handling not properly handling states after update to react-router v5  
							
							... 
							
							
							
							Port 15182d1e5e 
							
						 
						
							2023-10-24 20:34:30 +02:00  
				
					
						
							
							
								 
						
							
								c6f990997d 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite `emoji_unicode_mapping_light` to TS  
							
							... 
							
							
							
							Port 9482810703 
							
						 
						
							2023-10-24 20:33:55 +02:00  
				
					
						
							
							
								 
						
							
								4ef66d6538 
								
							 
						 
						
							
							
								
								Merge commit '15182d1e5e595b21c47b48c5d258f30a0251e753' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.rubocop_todo.yml`:
  glitch-soc had extra ignores.
  Removed them. 
							
						 
						
							2023-10-24 20:31:20 +02:00  
				
					
						
							
							
								 
						
							
								8a131fb7bc 
								
							 
						 
						
							
							
								
								Fix `@rails/ujs` imports  
							
							
							
						 
						
							2023-10-24 20:23:31 +02:00  
				
					
						
							
							
								 
						
							
								4b0fb764c3 
								
							 
						 
						
							
							
								
								Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts and ported changes:
- updated `@rails/ujs` imports 
							
						 
						
							2023-10-24 19:59:19 +02:00  
				
					
						
							
							
								 
						
							
								134de736dc 
								
							 
						 
						
							
							
								
								Change icons in web UI ( #27385 )  
							
							... 
							
							
							
							Co-authored-by: Renaud Chaput <renchap@gmail.com> 
							
						 
						
							2023-10-24 17:45:08 +00:00  
				
					
						
							
							
								 
						
							
								69ea596e55 
								
							 
						 
						
							
							
								
								[Glitch] Fix explore page reloading when you navigate back to it in web UI  
							
							... 
							
							
							
							Port d9503a1965 
							
						 
						
							2023-10-24 19:22:39 +02:00  
				
					
						
							
							
								 
						
							
								e6c3d3c744 
								
							 
						 
						
							
							
								
								Merge commit 'd9503a1965a16328b62ea7bf0bb54e87cbe30d29' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-24 19:21:01 +02:00  
				
					
						
							
							
								 
						
							
								5323f0eeca 
								
							 
						 
						
							
							
								
								[Glitch] Fix incorrect proptypes from react-router-v5 update  
							
							... 
							
							
							
							Port 0ad66175bf 
							
						 
						
							2023-10-24 19:03:16 +02:00  
				
					
						
							
							
								 
						
							
								9325cb5759 
								
							 
						 
						
							
							
								
								[Glitch] Convert `<Button>` to Typescript  
							
							... 
							
							
							
							Port 9d45a444f9 
							
						 
						
							2023-10-24 19:03:16 +02:00  
				
					
						
							
							
								 
						
							
								1138d44c7d 
								
							 
						 
						
							
							
								
								[Glitch] Fix missing background behind dismissable banner in web UI  
							
							... 
							
							
							
							Port 33bd8eccd5 
							
						 
						
							2023-10-24 18:46:08 +02:00  
				
					
						
							
							
								 
						
							
								b0c76eaadd 
								
							 
						 
						
							
							
								
								Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream changed one import, close to a glitch-soc-only import to handle
  different max character counts.
  Ported upstream's change. 
							
						 
						
							2023-10-24 18:41:20 +02:00  
				
					
						
							
							
								 
						
							
								15182d1e5e 
								
							 
						 
						
							
							
								
								Fix history handling not properly handling states after update to react-router v5 ( #27526 )  
							
							
							
						 
						
							2023-10-24 13:24:57 +00:00  
				
					
						
							
							
								 
						
							
								50b7ea810e 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27523 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-10-24 09:51:34 +00:00  
				
					
						
							
							
								 
						
							
								9482810703 
								
							 
						 
						
							
							
								
								Rewrite `emoji_unicode_mapping_light` to TS ( #25444 )  
							
							... 
							
							
							
							Co-authored-by: taichi.fukuda ひ <taichi.fukuda@systemi.co.jp> 
							
						 
						
							2023-10-24 08:06:14 +00:00  
				
					
						
							
							
								 
						
							
								e93a75f1a1 
								
							 
						 
						
							
							
								
								Rails 7.1 update ( #25963 )  
							
							
							
						 
						
							2023-10-23 17:58:29 +00:00  
				
					
						
							
							
								 
						
							
								d9503a1965 
								
							 
						 
						
							
							
								
								Fix explore page reloading when you navigate back to it in web UI ( #27489 )  
							
							
							
						 
						
							2023-10-23 17:07:13 +02:00  
				
					
						
							
							
								 
						
							
								0ad66175bf 
								
							 
						 
						
							
							
								
								Fix incorrect proptypes from react-router-v5 update ( #27507 )  
							
							
							
						 
						
							2023-10-23 11:39:53 +02:00  
				
					
						
							
							
								 
						
							
								70fd819935 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27490 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-10-23 10:04:54 +02:00  
				
					
						
							
							
								 
						
							
								9d45a444f9 
								
							 
						 
						
							
							
								
								Convert `<Button>` to Typescript ( #27492 )  
							
							
							
						 
						
							2023-10-23 09:43:00 +02:00  
				
					
						
							
							
								 
						
							
								d6eacb79c6 
								
							 
						 
						
							
							
								
								[Glitch] Upgrade to react-router v5  
							
							... 
							
							
							
							Port 1b70d7ed7c 
							
						 
						
							2023-10-21 22:14:24 +02:00  
				
					
						
							
							
								 
						
							
								245513d630 
								
							 
						 
						
							
							
								
								Merge commit '1b70d7ed7c0fd3a9fcf028bf76b8c62ac8b3897f' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-21 14:33:33 +02:00  
				
					
						
							
							
								 
						
							
								284c719f64 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27480 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-10-20 10:11:40 +02:00  
				
					
						
							
							
								 
						
							
								33bd8eccd5 
								
							 
						 
						
							
							
								
								Fix missing background behind dismissable banner in web UI ( #27479 )  
							
							
							
						 
						
							2023-10-20 04:08:13 +02:00  
				
					
						
							
							
								 
						
							
								5d9df170cf 
								
							 
						 
						
							
							
								
								[Glitch] Do not display the navigation banner in the logo container  
							
							... 
							
							
							
							Port 126cd7705d 
							
						 
						
							2023-10-19 20:50:44 +02:00  
				
					
						
							
							
								 
						
							
								cc000c8859 
								
							 
						 
						
							
							
								
								Merge commit '126cd7705dbeca5712da941a72661e26c189658b' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-19 20:48:22 +02:00  
				
					
						
							
							
								 
						
							
								1a3248dc90 
								
							 
						 
						
							
							
								
								[Glitch] Consider shown and pending status in explore prompt calculation  
							
							... 
							
							
							
							Port f76e5111f0 
							
						 
						
							2023-10-19 20:23:08 +02:00  
				
					
						
							
							
								 
						
							
								41f58e945c 
								
							 
						 
						
							
							
								
								[Glitch] The `class` props should be `className`  
							
							... 
							
							
							
							Port 10df97c542 
							
						 
						
							2023-10-19 20:23:08 +02:00  
				
					
						
							
							
								 
						
							
								1b70d7ed7c 
								
							 
						 
						
							
							
								
								Upgrade to react-router v5 ( #25047 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-10-19 19:44:55 +02:00  
				
					
						
							
							
								 
						
							
								126cd7705d 
								
							 
						 
						
							
							
								
								Do not display the navigation banner in the logo container ( #27476 )  
							
							
							
						 
						
							2023-10-19 19:36:08 +02:00  
				
					
						
							
							
								 
						
							
								74fd46d3ab 
								
							 
						 
						
							
							
								
								Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-19 19:14:04 +02:00  
				
					
						
							
							
								 
						
							
								68401fc426 
								
							 
						 
						
							
							
								
								[Glitch] Support "in:public" search filter  
							
							... 
							
							
							
							Port ad44d832b8 
							
						 
						
							2023-10-19 18:56:18 +02:00  
				
					
						
							
							
								 
						
							
								1ffd5a98a9 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27465 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-10-19 14:31:25 +02:00  
				
					
						
							
							
								 
						
							
								f76e5111f0 
								
							 
						 
						
							
							
								
								Consider shown and pending status in explore prompt calculation ( #27466 )  
							
							... 
							
							
							
							Co-authored-by: Brian Campbell <brcampbell@beta.team> 
							
						 
						
							2023-10-19 14:25:57 +02:00  
				
					
						
							
							
								 
						
							
								10df97c542 
								
							 
						 
						
							
							
								
								The `class` props should be `className` ( #27462 )  
							
							
							
						 
						
							2023-10-19 13:22:44 +02:00  
				
					
						
							
							
								 
						
							
								4612576c68 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27454 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-10-18 11:08:10 +02:00  
				
					
						
							
							
								 
						
							
								63179f0bf4 
								
							 
						 
						
							
							
								
								Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-17 21:59:58 +02:00  
				
					
						
							
							
								 
						
							
								8bbbd012d4 
								
							 
						 
						
							
							
								
								[Glitch] Fix missing redirections to make sure /home redirect to the advanced UI  
							
							... 
							
							
							
							Port 935d54124e 
							
						 
						
							2023-10-17 21:48:36 +02:00  
				
					
						
							
							
								 
						
							
								c10a667ac2 
								
							 
						 
						
							
							
								
								Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-17 21:42:49 +02:00  
				
					
						
							
							
								 
						
							
								b867d4581e 
								
							 
						 
						
							
							
								
								Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `spec/controllers/api/v1/timelines/tag_controller_spec.rb`:
  Glitch-soc had a few extra lines in this file to account for a different
  default setting. This file got replaced by
  `spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc
  additions were moved too.
Additional changes:
- `spec/requests/api/v1/statuses/sources_spec.rb`:
  Add glitch-soc-only attribute `content_type`. 
							
						 
						
							2023-10-17 21:35:07 +02:00  
				
					
						
							
							
								 
						
							
								656a41db2a 
								
							 
						 
						
							
							
								
								Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  Upstream has updated its README, we have a completely different one.
  Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
  Upstream refactored stuff and the conflict is because of glitch-soc's theming
  system.
  Ported upstream changes while accounting for the different theming system. 
							
						 
						
							2023-10-17 20:59:18 +02:00  
				
					
						
							
							
								 
						
							
								ad44d832b8 
								
							 
						 
						
							
							
								
								Support "in:public" search filter ( #26976 )  
							
							
							
						 
						
							2023-10-17 16:12:03 +02:00  
				
					
						
							
							
								 
						
							
								935d54124e 
								
							 
						 
						
							
							
								
								Fix missing redirections to make sure /home redirect to the advanced UI ( #27378 )  
							
							
							
						 
						
							2023-10-17 14:59:07 +02:00  
				
					
						
							
							
								 
						
							
								13456efd7b 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27410 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-10-16 11:31:52 +02:00  
				
					
						
							
							
								 
						
							
								773d25e8df 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27388 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-10-13 11:01:40 +02:00  
				
					
						
							
							
								 
						
							
								c348b904a5 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27376 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-10-12 10:07:40 +02:00  
				
					
						
							
							
								 
						
							
								f1ae72ba46 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27364 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-10-11 16:37:01 +02:00  
				
					
						
							
							
								 
						
							
								99c72830bc 
								
							 
						 
						
							
							
								
								[Glitch] Fix scroll position in thread view reseting when closing a modal  
							
							... 
							
							
							
							Port 9d1c3d0678 
							
						 
						
							2023-10-10 19:53:59 +02:00  
				
					
						
							
							
								 
						
							
								3735e6f79d 
								
							 
						 
						
							
							
								
								Merge commit '27e84c069112a3d2abfad947642457cc997a261a' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-10 19:53:41 +02:00  
				
					
						
							
							
								 
						
							
								9d1c3d0678 
								
							 
						 
						
							
							
								
								Fix scroll position in thread view reseting when closing a modal ( #27350 )  
							
							
							
						 
						
							2023-10-10 11:35:32 +02:00  
				
					
						
							
							
								 
						
							
								1a2a4c389f 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27347 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-10-10 10:06:37 +02:00  
				
					
						
							
							
								 
						
							
								05159d2f94 
								
							 
						 
						
							
							
								
								[Glitch] Fix clicking on already-loaded thread scrolling to the top of the thread  
							
							... 
							
							
							
							Port 4c2aca777f 
							
						 
						
							2023-10-09 21:15:59 +02:00  
				
					
						
							
							
								 
						
							
								8ef1a95b1c 
								
							 
						 
						
							
							
								
								Merge commit '4c2aca777f6ae6942d0cf11aee56a925694ccdef' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-09 21:14:57 +02:00  
				
					
						
							
							
								 
						
							
								7b325aa81b 
								
							 
						 
						
							
							
								
								[Glitch] Autofix missing comma and indentation in JS files  
							
							... 
							
							
							
							Port 774e1189d2 
							
						 
						
							2023-10-09 21:14:25 +02:00  
				
					
						
							
							
								 
						
							
								4a9cdfb928 
								
							 
						 
						
							
							
								
								Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-09 21:12:28 +02:00  
				
					
						
							
							
								 
						
							
								b63d526590 
								
							 
						 
						
							
							
								
								[Glitch] Fix clicking on already-opened thread post scrolling to the top of the thread  
							
							... 
							
							
							
							Port c310374a2f 
							
						 
						
							2023-10-09 21:11:44 +02:00  
				
					
						
							
							
								 
						
							
								3da7afdeed 
								
							 
						 
						
							
							
								
								Merge commit 'c310374a2f83a890520ace50e41c1e3d046e15e1' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-09 21:10:47 +02:00  
				
					
						
							
							
								 
						
							
								4c2aca777f 
								
							 
						 
						
							
							
								
								Fix clicking on already-loaded thread scrolling to the top of the thread ( #27338 )  
							
							
							
						 
						
							2023-10-09 16:46:09 +02:00  
				
					
						
							
							
								 
						
							
								774e1189d2 
								
							 
						 
						
							
							
								
								Change `eslint` config to autofix missing comma and indentation in JS files ( #26711 )  
							
							
							
						 
						
							2023-10-09 13:38:29 +02:00  
				
					
						
							
							
								 
						
							
								c310374a2f 
								
							 
						 
						
							
							
								
								Fix clicking on already-opened thread post scrolling to the top of the thread ( #27331 )  
							
							
							
						 
						
							2023-10-09 12:21:02 +02:00  
				
					
						
							
							
								 
						
							
								89b48681cf 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27321 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-10-09 10:32:06 +02:00  
				
					
						
							
							
								 
						
							
								967bd543bb 
								
							 
						 
						
							
							
								
								[Glitch] Fix auto-loading-more when not scrolled  
							
							... 
							
							
							
							Port 2b98e2ecd6 
							
						 
						
							2023-10-08 17:34:10 +02:00  
				
					
						
							
							
								 
						
							
								53f5b27bd1 
								
							 
						 
						
							
							
								
								Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-08 17:30:48 +02:00  
				
					
						
							
							
								 
						
							
								86c9c5afa0 
								
							 
						 
						
							
							
								
								Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Upstream changed the order of Action Controller filters for web app
  controllers.
  Glitch-soc has an extra filter due to its theming system.
  Changed the order accordingly.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to an extra newline in glitch-soc.
  Removed that newline and applied upstream's changes. 
							
						 
						
							2023-10-08 17:26:43 +02:00  
				
					
						
							
							
								 
						
							
								74c27e33e3 
								
							 
						 
						
							
							
								
								Merge commit '37bbd3c1064380a756b4e821655d7697105f99f5' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-08 17:10:39 +02:00  
				
					
						
							
							
								 
						
							
								8eb09c6f72 
								
							 
						 
						
							
							
								
								[Glitch] Keep version string displayed without breakpoints in UI  
							
							... 
							
							
							
							Port 5a437edc7f 
							
						 
						
							2023-10-08 17:09:02 +02:00  
				
					
						
							
							
								 
						
							
								a5dbb1ee5a 
								
							 
						 
						
							
							
								
								Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-08 17:05:40 +02:00  
				
					
						
							
							
								 
						
							
								e83059fd9d 
								
							 
						 
						
							
							
								
								[Glitch] Fix explore prompt appearing because of posts being received out of order  
							
							... 
							
							
							
							Port d80a819fc6 
							
						 
						
							2023-10-08 17:03:40 +02:00  
				
					
						
							
							
								 
						
							
								e9a181c52c 
								
							 
						 
						
							
							
								
								Merge commit 'e95d25e1013b6328457b81bd98e8d6a841d45ec2' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-08 16:53:05 +02:00  
				
					
						
							
							
								 
						
							
								702d162998 
								
							 
						 
						
							
							
								
								Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/auth/registrations_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
- `app/controllers/auth/sessions_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did. 
							
						 
						
							2023-10-08 16:48:19 +02:00  
				
					
						
							
							
								 
						
							
								cfc0da77ac 
								
							 
						 
						
							
							
								
								[Glitch] Fix retention dashboard not displaying correct month  
							
							... 
							
							
							
							Port 7fddeca190 
							
						 
						
							2023-10-08 16:33:37 +02:00  
				
					
						
							
							
								 
						
							
								19ebf7797e 
								
							 
						 
						
							
							
								
								Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-08 16:30:00 +02:00  
				
					
						
							
							
								 
						
							
								4d59dfb1c6 
								
							 
						 
						
							
							
								
								Fix some remote posts getting truncated ( #27307 )  
							
							
							
						 
						
							2023-10-06 12:58:02 +02:00  
				
					
						
							
							
								 
						
							
								e0b54ed3e1 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27304 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-10-06 11:49:09 +02:00  
				
					
						
							
							
								 
						
							
								2b98e2ecd6 
								
							 
						 
						
							
							
								
								Fix auto-loading-more when not scrolled ( #27286 )  
							
							
							
						 
						
							2023-10-05 16:33:54 +02:00  
				
					
						
							
							
								 
						
							
								32ab474472 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27277 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-10-05 13:13:14 +02:00  
				
					
						
							
							
								 
						
							
								8e4251f9e7 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27270 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-10-04 10:53:04 +02:00  
				
					
						
							
							
								 
						
							
								37bbd3c106 
								
							 
						 
						
							
							
								
								Fix double scroll bars in some columns in advanced interface ( #27187 )  
							
							
							
						 
						
							2023-10-03 13:12:39 +02:00  
				
					
						
							
							
								 
						
							
								5a437edc7f 
								
							 
						 
						
							
							
								
								Keep version string displayed without breakpoints in UI ( #26986 )  
							
							
							
						 
						
							2023-10-03 11:52:21 +02:00  
				
					
						
							
							
								 
						
							
								e95d25e101 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27260 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-10-03 10:47:28 +02:00  
				
					
						
							
							
								 
						
							
								ee866ec0e0 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27220 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-10-02 13:35:29 +02:00  
				
					
						
							
							
								 
						
							
								d80a819fc6 
								
							 
						 
						
							
							
								
								Fix explore prompt appearing because of posts being received out of order ( #27211 )  
							
							
							
						 
						
							2023-09-29 15:51:36 +02:00  
				
					
						
							
							
								 
						
							
								695e42de0d 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27202 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-09-29 10:04:18 +02:00  
				
					
						
							
							
								 
						
							
								1da3c588ca 
								
							 
						 
						
							
							
								
								Fix link handling of mentions in user profiles when logged out ( #27185 )  
							
							
							
						 
						
							2023-09-28 15:29:07 +02:00  
				
					
						
							
							
								 
						
							
								b93ce7d8b3 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27168 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-09-28 10:44:16 +02:00  
				
					
						
							
							
								 
						
							
								6d0767558a 
								
							 
						 
						
							
							
								
								Make notification respect reduce-motion ( #27178 )  
							
							
							
						 
						
							2023-09-28 10:39:38 +02:00  
				
					
						
							
							
								 
						
							
								7fddeca190 
								
							 
						 
						
							
							
								
								Fix retention dashboard not displaying correct month ( #27180 )  
							
							
							
						 
						
							2023-09-28 10:16:15 +02:00  
				
					
						
							
							
								 
						
							
								1eeaa0d84f 
								
							 
						 
						
							
							
								
								[Glitch] Fix width of large text icon buttons  
							
							... 
							
							
							
							Port 38753acaa5 
							
						 
						
							2023-09-26 13:25:01 +02:00  
				
					
						
							
							
								 
						
							
								ca7d16912e 
								
							 
						 
						
							
							
								
								[Glitch] Fix line wrapping of language selection button with long locale codes  
							
							... 
							
							
							
							Port 88fa8e710a 
							
						 
						
							2023-09-26 13:24:29 +02:00  
				
					
						
							
							
								 
						
							
								02e6d9f8f9 
								
							 
						 
						
							
							
								
								[Glitch] Fix explore prompt sometimes showing up when the home TL is loading  
							
							... 
							
							
							
							Port a001ae2f39 
							
						 
						
							2023-09-26 13:20:18 +02:00  
				
					
						
							
							
								 
						
							
								919ed0e469 
								
							 
						 
						
							
							
								
								[Glitch] Convert `dropdown_menu` state to Typescript  
							
							... 
							
							
							
							Port 4b7bc1f07c 
							
						 
						
							2023-09-26 13:19:27 +02:00  
				
					
						
							
							
								 
						
							
								b2d67fbe33 
								
							 
						 
						
							
							
								
								[Glitch] Improve modals reducer types  
							
							... 
							
							
							
							Port b93ffb74bb 
							
						 
						
							2023-09-26 13:17:08 +02:00  
				
					
						
							
							
								 
						
							
								abdb58840a 
								
							 
						 
						
							
							
								
								Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-26 13:13:27 +02:00  
				
					
						
							
							
								 
						
							
								57f592fed5 
								
							 
						 
						
							
							
								
								Add Typescript types for some API objects ( #26602 )  
							
							
							
						 
						
							2023-09-26 11:25:01 +02:00  
				
					
						
							
							
								 
						
							
								5ea3e8e765 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27144 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-09-26 10:47:16 +02:00  
				
					
						
							
							
								 
						
							
								a001ae2f39 
								
							 
						 
						
							
							
								
								Fix explore prompt sometimes showing up when the home TL is loading ( #27062 )  
							
							
							
						 
						
							2023-09-25 17:07:01 +02:00  
				
					
						
							
							
								 
						
							
								38753acaa5 
								
							 
						 
						
							
							
								
								Fix width of large text icon buttons ( #27127 )  
							
							
							
						 
						
							2023-09-25 15:06:57 +02:00  
				
					
						
							
							
								 
						
							
								88fa8e710a 
								
							 
						 
						
							
							
								
								Fix line wrapping of language selection button with long locale codes ( #27100 )  
							
							
							
						 
						
							2023-09-25 12:59:37 +02:00  
				
					
						
							
							
								 
						
							
								736fe75346 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27080 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-09-25 10:50:09 +02:00  
				
					
						
							
							
								 
						
							
								4b7bc1f07c 
								
							 
						 
						
							
							
								
								Convert `dropdown_menu` state to Typescript ( #25585 )  
							
							
							
						 
						
							2023-09-22 18:18:46 +02:00  
				
					
						
							
							
								 
						
							
								b93ffb74bb 
								
							 
						 
						
							
							
								
								Improve modals reducer types ( #26610 )  
							
							
							
						 
						
							2023-09-22 16:41:50 +02:00  
				
					
						
							
							
								 
						
							
								e824585523 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27052 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-09-22 11:06:48 +02:00  
				
					
						
							
							
								 
						
							
								6760e67c64 
								
							 
						 
						
							
							
								
								[Glitch] Fix search results temporarily disappearing while scrolling and loading more results  
							
							... 
							
							
							
							Port 5356ddbcca 
							
						 
						
							2023-09-21 15:14:38 +02:00  
				
					
						
							
							
								 
						
							
								f05985f8ec 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our version. 
							
						 
						
							2023-09-21 15:12:00 +02:00  
				
					
						
							
							
								 
						
							
								5356ddbcca 
								
							 
						 
						
							
							
								
								Fix search results temporarily disappearing while scrolling and loading more results ( #27014 )  
							
							
							
						 
						
							2023-09-21 13:51:21 +02:00  
				
					
						
							
							
								 
						
							
								effe4728cf 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27005 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-09-21 11:06:04 +02:00  
				
					
						
							
							
								 
						
							
								61fe25fe74 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #26988 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-09-20 13:05:56 +02:00  
				
					
						
							
							
								 
						
							
								f546b0c999 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-19 17:07:29 +02:00  
				
					
						
							
							
								 
						
							
								73ecc4de6e 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #26978 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-09-19 16:26:51 +02:00  
				
					
						
							
							
								 
						
							
								22ee4e057d 
								
							 
						 
						
							
							
								
								Merge commit 'a83615edc9fc1ce3363ddcf1fc676806421a5f65' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `streaming/index.js`:
  Upstream has added a parameter to `streamFrom`, while glitch-soc had an
  extra parameter.
  Ported upstream changes. 
							
						 
						
							2023-09-19 12:59:23 +02:00  
				
					
						
							
							
								 
						
							
								1e87575b70 
								
							 
						 
						
							
							
								
								Merge commit '6eb6209d02514c5271238a23601be643c7b9f52d' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-19 12:53:32 +02:00  
				
					
						
							
							
								 
						
							
								70cae19b6b 
								
							 
						 
						
							
							
								
								Fix hashtag bar being sometimes incorrectly hidden ( #26960 )  
							
							
							
						 
						
							2023-09-19 12:25:39 +02:00  
				
					
						
							
							
								 
						
							
								67eaaa4b90 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #26966 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-09-19 10:41:48 +02:00  
				
					
						
							
							
								 
						
							
								1b4902fabf 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #26913 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-09-18 13:46:07 +02:00  
				
					
						
							
							
								 
						
							
								31dedf4697 
								
							 
						 
						
							
							
								
								[Glitch] Fix Web UI making duplicate search queries when scrolling  
							
							... 
							
							
							
							Port 4c1518a6f3 
							
						 
						
							2023-09-18 12:12:55 +02:00  
				
					
						
							
							
								 
						
							
								f61e29cc7e 
								
							 
						 
						
							
							
								
								[Glitch] Fix error in Web UI when server rules cannot be fetched  
							
							... 
							
							
							
							Port 893755f4cb 
							
						 
						
							2023-09-18 12:11:09 +02:00  
				
					
						
							
							
								 
						
							
								9688c5fcc4 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-18 12:09:37 +02:00  
				
					
						
							
							
								 
						
							
								4c1518a6f3 
								
							 
						 
						
							
							
								
								Fix Web UI making duplicate search queries when scrolling ( #26959 )  
							
							
							
						 
						
							2023-09-18 11:20:09 +02:00  
				
					
						
							
							
								 
						
							
								893755f4cb 
								
							 
						 
						
							
							
								
								Fix error in Web UI when server rules cannot be fetched ( #26957 )  
							
							
							
						 
						
							2023-09-18 09:51:52 +02:00  
				
					
						
							
							
								 
						
							
								60ecca6acb 
								
							 
						 
						
							
							
								
								Revert tabs background color so they are easier to visually distinguish from contents  
							
							
							
						 
						
							2023-09-16 09:50:00 +02:00  
				
					
						
							
							
								 
						
							
								d3f14dd7d4 
								
							 
						 
						
							
							
								
								[Glitch] Fix dismiss button overlapping with text in dismissable banners  
							
							... 
							
							
							
							Port 2a4fcc51fd 
							
						 
						
							2023-09-15 21:48:36 +02:00  
				
					
						
							
							
								 
						
							
								dfc05ec8df 
								
							 
						 
						
							
							
								
								Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream modified this file close to a line modified by glitch-soc to
  disable the ARMv64 builder (as glitch-soc doesn't have one).
  Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
  Upstream modified this file close to lines changed by glitch-soc to
  change the Docker image repositories used (only ghcr, and based on the
  organization's name).
  Ported upstream's changes. 
							
						 
						
							2023-09-15 21:43:49 +02:00  
				
					
						
							
							
								 
						
							
								5ed72f668f 
								
							 
						 
						
							
							
								
								Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-15 21:39:21 +02:00  
				
					
						
							
							
								 
						
							
								cf8b242c4c 
								
							 
						 
						
							
							
								
								[Glitch] Fix notification permissions being requested immediately after login  
							
							... 
							
							
							
							Port 520b570474 
							
						 
						
							2023-09-15 21:33:28 +02:00  
				
					
						
							
							
								 
						
							
								0b5903af7c 
								
							 
						 
						
							
							
								
								[Glitch] Fix recent search items not handling overflows correctly  
							
							... 
							
							
							
							Port d2cfcdd09e 
							
						 
						
							2023-09-15 21:31:46 +02:00  
				
					
						
							
							
								 
						
							
								e193c848fe 
								
							 
						 
						
							
							
								
								Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream added some code to add the Identity Provider's sign-in endpoint to
  the `form-action` Content Security Policy directive but our version of the
  file is pretty different.
  Ported the change. 
							
						 
						
							2023-09-15 21:25:05 +02:00  
				
					
						
							
							
								 
						
							
								7384015505 
								
							 
						 
						
							
							
								
								[Glitch] Add recent searches in web UI  
							
							... 
							
							
							
							Port 9b2bc3d1de 
							
						 
						
							2023-09-15 21:15:41 +02:00  
				
					
						
							
							
								 
						
							
								263d601c25 
								
							 
						 
						
							
							
								
								[Glitch] Fix confusing behavior of mute button and volume slider in web UI  
							
							... 
							
							
							
							Port 91040da871 
							
						 
						
							2023-09-15 21:12:53 +02:00  
				
					
						
							
							
								 
						
							
								58514651c3 
								
							 
						 
						
							
							
								
								[Glitch] Fix mute button and volume slider feeling disconnected in web UI  
							
							... 
							
							
							
							Port f3a2e15f8e 
							
						 
						
							2023-09-15 21:12:13 +02:00  
				
					
						
							
							
								 
						
							
								15c865808a 
								
							 
						 
						
							
							
								
								[Glitch] Change onboarding prompt to use full width of banner in web UI  
							
							... 
							
							
							
							Port 1f141f656d 
							
						 
						
							2023-09-15 21:09:28 +02:00  
				
					
						
							
							
								 
						
							
								08b495d95c 
								
							 
						 
						
							
							
								
								Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-15 21:06:45 +02:00  
				
					
						
							
							
								 
						
							
								9f3df3edee 
								
							 
						 
						
							
							
								
								[Glitch] Add some information about Full-text search being disabled in search popout  
							
							... 
							
							
							
							Port 9c1ef8302a 
							
						 
						
							2023-09-15 21:01:40 +02:00  
				
					
						
							
							
								 
						
							
								5d8c65f2a7 
								
							 
						 
						
							
							
								
								Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-15 20:57:40 +02:00  
				
					
						
							
							
								 
						
							
								526f457ebc 
								
							 
						 
						
							
							
								
								[Glitch] Add infinite scrolling for search results in web UI  
							
							... 
							
							
							
							Port 5d20733d8d 
							
						 
						
							2023-09-15 20:54:20 +02:00  
				
					
						
							
							
								 
						
							
								f7a4d77d90 
								
							 
						 
						
							
							
								
								[Glitch] Add `in:` to search popout in web UI  
							
							... 
							
							
							
							Port d8bdba2f9f 
							
						 
						
							2023-09-15 20:33:51 +02:00  
				
					
						
							
							
								 
						
							
								3ca94f6d4a 
								
							 
						 
						
							
							
								
								Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-15 20:21:40 +02:00  
				
					
						
							
							
								 
						
							
								e5269c6a65 
								
							 
						 
						
							
							
								
								[Glitch] Improve interaction modal error handling  
							
							... 
							
							
							
							Port 548c032dbb 
							
						 
						
							2023-09-15 20:11:18 +02:00  
				
					
						
							
							
								 
						
							
								e14372c2d1 
								
							 
						 
						
							
							
								
								Merge commit '548c032dbb90ae9c06b05fc05724c49d0b552fd9' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-15 20:08:09 +02:00  
				
					
						
							
							
								 
						
							
								2a4fcc51fd 
								
							 
						 
						
							
							
								
								Fix dismiss button overlapping with text in dismissable banners ( #26935 )  
							
							
							
						 
						
							2023-09-15 19:53:28 +02:00  
				
					
						
							
							
								 
						
							
								921c6fe654 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #26498 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-09-13 15:10:41 +02:00  
				
					
						
							
							
								 
						
							
								075ee0b2d4 
								
							 
						 
						
							
							
								
								Fix wrong gradient color on collapsed private mentions ( #2402 )  
							
							... 
							
							
							
							Upstream changed the background color of private mentions, but the gradient used for collapsed toots still used the old color.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-09-13 08:44:40 +02:00  
				
					
						
							
							
								 
						
							
								520b570474 
								
							 
						 
						
							
							
								
								Fix notification permissions being requested immediately after login ( #26472 )  
							
							
							
						 
						
							2023-09-12 18:27:01 +02:00  
				
					
						
							
							
								 
						
							
								287520453c 
								
							 
						 
						
							
							
								
								Fix front-end bug when processing relationship-related account actions ( #26902 )  
							
							
							
						 
						
							2023-09-12 16:30:03 +02:00  
				
					
						
							
							
								 
						
							
								0712cc2b99 
								
							 
						 
						
							
							
								
								Fix Redux types ( #26899 )  
							
							
							
						 
						
							2023-09-12 12:18:19 +02:00  
				
					
						
							
							
								 
						
							
								d2cfcdd09e 
								
							 
						 
						
							
							
								
								Fix recent search items not handling overflows correctly ( #26893 )  
							
							
							
						 
						
							2023-09-12 04:20:57 +02:00  
				
					
						
							
							
								 
						
							
								bd06c13204 
								
							 
						 
						
							
							
								
								Convert `actions/account_notes` into Typescript ( #26601 )  
							
							
							
						 
						
							2023-09-11 16:09:22 +02:00  
				
					
						
							
							
								 
						
							
								91040da871 
								
							 
						 
						
							
							
								
								Fix confusing behavior of mute button and volume slider in web UI ( #26860 )  
							
							
							
						 
						
							2023-09-08 20:39:29 +02:00  
				
					
						
							
							
								 
						
							
								9b2bc3d1de 
								
							 
						 
						
							
							
								
								Add recent searches in web UI ( #26834 )  
							
							
							
						 
						
							2023-09-07 14:56:19 +02:00  
				
					
						
							
							
								 
						
							
								f3a2e15f8e 
								
							 
						 
						
							
							
								
								Fix mute button and volume slider feeling disconnected in web UI ( #26827 )  
							
							
							
						 
						
							2023-09-07 04:24:24 +02:00  
				
					
						
							
							
								 
						
							
								1f141f656d 
								
							 
						 
						
							
							
								
								Change onboarding prompt to use full width of banner in web UI ( #26829 )  
							
							
							
						 
						
							2023-09-07 04:24:11 +02:00  
				
					
						
							
							
								 
						
							
								398635c0c4 
								
							 
						 
						
							
							
								
								Fix paragraph margins resulting in irregular read-more cut-off in web UI ( #26828 )  
							
							
							
						 
						
							2023-09-07 04:24:01 +02:00  
				
					
						
							
							
								 
						
							
								9c1ef8302a 
								
							 
						 
						
							
							
								
								Add some information about Full-text search being disabled in search popout ( #26756 )  
							
							
							
						 
						
							2023-09-06 17:23:58 +02:00  
				
					
						
							
							
								 
						
							
								d8bdba2f9f 
								
							 
						 
						
							
							
								
								Add `in:` to search popout in web UI ( #26807 )  
							
							
							
						 
						
							2023-09-06 06:46:26 +02:00  
				
					
						
							
							
								 
						
							
								9d290c23d2 
								
							 
						 
						
							
							
								
								Remove obfuscation of reply count in web UI ( #26768 )  
							
							
							
						 
						
							2023-09-05 23:57:03 +02:00  
				
					
						
							
							
								 
						
							
								5d20733d8d 
								
							 
						 
						
							
							
								
								Add infinite scrolling for search results in web UI ( #26784 )  
							
							
							
						 
						
							2023-09-05 23:54:24 +02:00  
				
					
						
							
							
								 
						
							
								548c032dbb 
								
							 
						 
						
							
							
								
								Improve interaction modal error handling ( #26795 )  
							
							
							
						 
						
							2023-09-05 23:49:48 +02:00  
				
					
						
							
							
								 
						
							
								d6f5c27fa9 
								
							 
						 
						
							
							
								
								[Glitch] Fix light mode colors for advanced interface banner  
							
							... 
							
							
							
							Port a106c46478 
							
						 
						
							2023-09-04 18:31:00 +02:00  
				
					
						
							
							
								 
						
							
								e66f961e05 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-04 18:27:46 +02:00  
				
					
						
							
							
								 
						
							
								a106c46478 
								
							 
						 
						
							
							
								
								Fix light mode colors for advanced interface banner ( #26759 )  
							
							
							
						 
						
							2023-09-04 10:14:01 +02:00  
				
					
						
							
							
								 
						
							
								6b0702a3b5 
								
							 
						 
						
							
							
								
								Add `recent` to search props ( #2394 )  
							
							... 
							
							
							
							The new search popout requires the `recent` prop to be set, otherwise onboarding crashes with "recent is undefined"
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-09-03 08:46:30 +02:00  
				
					
						
							
							
								 
						
							
								5c7df20c13 
								
							 
						 
						
							
							
								
								[Glitch] Add admin notifications for new Mastodon versions  
							
							... 
							
							
							
							Port front-end changes from 16681e0f20 
							
						 
						
							2023-09-02 15:20:06 +02:00  
				
					
						
							
							
								 
						
							
								c107512fa6 
								
							 
						 
						
							
							
								
								Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-02 15:02:29 +02:00  
				
					
						
							
							
								 
						
							
								4371df7fbe 
								
							 
						 
						
							
							
								
								[Glitch] Add `authorized_fetch` server setting in addition to env var  
							
							... 
							
							
							
							Port SCSS changes from 9e26cd5503 
							
						 
						
							2023-09-02 15:01:37 +02:00  
				
					
						
							
							
								 
						
							
								728eb6a153 
								
							 
						 
						
							
							
								
								Fix wrong color on active icons with counters in web UI ( #26767 )  
							
							
							
						 
						
							2023-09-02 14:46:26 +02:00  
				
					
						
							
							
								 
						
							
								4ed629cd7e 
								
							 
						 
						
							
							
								
								Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added the notion of overriden settings, while we had extra code for
  pseudo-settings (only used to combine flavour and skin in a single select
  field).
  Ported upstream changes.
- `config/i18n-tasks.yml`:
  Upstream added `simple_form.overridden` to `ignore_unused`,
  we had `simple_form.glitch_only`.
  Added `simple_form.glitch_only` as well. 
							
						 
						
							2023-09-02 14:44:47 +02:00  
				
					
						
							
							
								 
						
							
								807c0591e1 
								
							 
						 
						
							
							
								
								[Glitch] Fix search popout including full-text search instructions when full-text search is disabled  
							
							... 
							
							
							
							Port 6c4c72497a 
							
						 
						
							2023-09-02 13:56:20 +02:00  
				
					
						
							
							
								 
						
							
								64e661b930 
								
							 
						 
						
							
							
								
								[Glitch] Allow filter form in profiles directory to wrap  
							
							... 
							
							
							
							Port f1d250135c 
							
						 
						
							2023-09-02 13:55:53 +02:00  
				
					
						
							
							
								 
						
							
								6c05ac4068 
								
							 
						 
						
							
							
								
								[Glitch] Add an explanation banner on switching to single column mode  
							
							... 
							
							
							
							Port 40b69cc1cd 
							
						 
						
							2023-09-02 13:54:33 +02:00  
				
					
						
							
							
								 
						
							
								ac2dae0d11 
								
							 
						 
						
							
							
								
								Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/workflows/build-releases.yml`:
  Upstream changed comments close to a line we modified to account for
  different container image repositories.
  Updated the comments as upstream did. 
							
						 
						
							2023-09-02 13:50:16 +02:00  
				
					
						
							
							
								 
						
							
								f5bd2014e2 
								
							 
						 
						
							
							
								
								[Glitch] Fix sign up steps progress layout in right-to-left locales  
							
							... 
							
							
							
							Port 21ec596dab 
							
						 
						
							2023-09-02 13:42:50 +02:00  
				
					
						
							
							
								 
						
							
								beb5fcd0dc 
								
							 
						 
						
							
							
								
								[Glitch] Fix bug with reblogged view on Toots only showing latest reblogging accounts  
							
							... 
							
							
							
							Port 74eb7dbf2d 
							
						 
						
							2023-09-02 13:42:15 +02:00  
				
					
						
							
							
								 
						
							
								871ab84854 
								
							 
						 
						
							
							
								
								[Glitch] Fix bug with favourited view on Toots only showing latest favouriting accounts  
							
							... 
							
							
							
							Port ae6cf33321 
							
						 
						
							2023-09-02 13:39:02 +02:00  
				
					
						
							
							
								 
						
							
								ffb486648c 
								
							 
						 
						
							
							
								
								Merge commit 'cb9f96036cf78835e22aafb30b80717b5a8b7394' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-02 13:34:54 +02:00  
				
					
						
							
							
								 
						
							
								6ee3e382df 
								
							 
						 
						
							
							
								
								Merge commit '0719216368bf3a90fdb7ab27201a0607b63ea203' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/packs/public.jsx`:
  Some of the removed dead code was split from this code in
  `app/javascript/core/public.js` and `app/javascript/core/settings.js`.
  Removed this dead code, and removed `app/javascript/core/public.js`
  altogether. 
							
						 
						
							2023-09-02 13:18:16 +02:00  
				
					
						
							
							
								 
						
							
								fbbe9f1c12 
								
							 
						 
						
							
							
								
								Merge commit 'a7d96e6affd4a2da65f09f3f4ffa1b9350bb9a42' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-02 12:20:33 +02:00  
				
					
						
							
							
								 
						
							
								cb50d95c06 
								
							 
						 
						
							
							
								
								[Glitch] Add search options to search popout in web UI  
							
							... 
							
							
							
							Port bceb893159 
							
						 
						
							2023-09-02 12:09:07 +02:00  
				
					
						
							
							
								 
						
							
								c8aa3d6d06 
								
							 
						 
						
							
							
								
								Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-02 12:02:23 +02:00  
				
					
						
							
							
								 
						
							
								3c7dbf3a16 
								
							 
						 
						
							
							
								
								Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `.github/workflows/build-push-pr.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream changed how the version string is built from environment variables.
  Adapted the logic to account for the `+glitch` in glitch-soc. 
							
						 
						
							2023-09-02 11:56:09 +02:00  
				
					
						
							
							
								 
						
							
								023673c0d9 
								
							 
						 
						
							
							
								
								[Glitch] Add `data-nosnippet` attribute to remote posts and local posts with `noindex`  
							
							... 
							
							
							
							Port c3a42e1280 
							
						 
						
							2023-09-02 11:49:35 +02:00  
				
					
						
							
							
								 
						
							
								6b7c47311d 
								
							 
						 
						
							
							
								
								Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-02 11:41:40 +02:00  
				
					
						
							
							
								 
						
							
								16681e0f20 
								
							 
						 
						
							
							
								
								Add admin notifications for new Mastodon versions ( #26582 )  
							
							
							
						 
						
							2023-09-01 17:47:07 +02:00  
				
					
						
							
							
								 
						
							
								9e26cd5503 
								
							 
						 
						
							
							
								
								Add `authorized_fetch` server setting in addition to env var ( #25798 )  
							
							
							
						 
						
							2023-09-01 15:41:10 +02:00  
				
					
						
							
							
								 
						
							
								6c4c72497a 
								
							 
						 
						
							
							
								
								Fix search popout including full-text search instructions when full-text search is disabled ( #26755 )  
							
							
							
						 
						
							2023-09-01 15:13:27 +02:00  
				
					
						
							
							
								 
						
							
								f1d250135c 
								
							 
						 
						
							
							
								
								Allow filter form in profiles directory to wrap ( #26682 )  
							
							
							
						 
						
							2023-08-31 14:15:58 +02:00  
				
					
						
							
							
								 
						
							
								40b69cc1cd 
								
							 
						 
						
							
							
								
								Add an explanation banner on switching to single column mode ( #26019 )  
							
							
							
						 
						
							2023-08-31 12:18:46 +02:00  
				
					
						
							
							
								 
						
							
								21ec596dab 
								
							 
						 
						
							
							
								
								Fix sign up steps progress layout in right-to-left locales ( #26728 )  
							
							
							
						 
						
							2023-08-30 16:29:52 +02:00  
				
					
						
							
							
								 
						
							
								74eb7dbf2d 
								
							 
						 
						
							
							
								
								Fix bug with reblogged view on Toots only showing latest reblogging accounts ( #26574 )  
							
							
							
						 
						
							2023-08-29 14:42:20 +02:00  
				
					
						
							
							
								 
						
							
								ae6cf33321 
								
							 
						 
						
							
							
								
								Fix bug with favourited view on Toots only showing latest favouriting accounts ( #26577 )  
							
							
							
						 
						
							2023-08-29 10:56:19 +02:00  
				
					
						
							
							
								 
						
							
								0719216368 
								
							 
						 
						
							
							
								
								Remove dead code from public.jsx ( #26547 )  
							
							
							
						 
						
							2023-08-29 10:16:18 +02:00  
				
					
						
							
							
								 
						
							
								786e586686 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2388 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-08-29 08:28:45 +02:00  
				
					
						
							
							
								 
						
							
								10b06436d1 
								
							 
						 
						
							
							
								
								Fix colors and typography on hashtag bar in web UI ( #26666 )  
							
							
							
						 
						
							2023-08-28 19:49:38 +02:00  
				
					
						
							
							
								 
						
							
								bceb893159 
								
							 
						 
						
							
							
								
								Add search options to search popout in web UI ( #26662 )  
							
							
							
						 
						
							2023-08-28 13:18:39 +02:00  
				
					
						
							
							
								 
						
							
								9d9de8d219 
								
							 
						 
						
							
							
								
								Update dependency @testing-library/jest-dom to v6 ( #26479 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com> 
							
						 
						
							2023-08-28 12:19:42 +02:00  
				
					
						
							
							
								 
						
							
								efb1888320 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2376 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-08-26 22:53:46 +02:00  
				
					
						
							
							
								 
						
							
								71641766f2 
								
							 
						 
						
							
							
								
								Fix toast saying "published" instead of "saved" after editing post in web UI ( #26664 )  
							
							
							
						 
						
							2023-08-25 22:03:04 +02:00  
				
					
						
							
							
								 
						
							
								c3a42e1280 
								
							 
						 
						
							
							
								
								Add `data-nosnippet` attribute to remote posts and local posts with `noindex` ( #26648 )  
							
							
							
						 
						
							2023-08-25 11:31:20 +02:00  
				
					
						
							
							
								 
						
							
								685270f3f7 
								
							 
						 
						
							
							
								
								[Glitch] Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode  
							
							... 
							
							
							
							Port e90649b064 
							
						 
						
							2023-08-24 22:00:27 +02:00  
				
					
						
							
							
								 
						
							
								66e82cb8e1 
								
							 
						 
						
							
							
								
								[Glitch] Fix selecting domains to forward reports to not passing the information correctly  
							
							... 
							
							
							
							Port b2ac93dd73 
							
						 
						
							2023-08-24 22:00:00 +02:00  
				
					
						
							
							
								 
						
							
								941a9df28a 
								
							 
						 
						
							
							
								
								Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed how the nightly builds are versioned, the conflict
  is because glitch-soc modified adjacent lines relative to the docker
  repositories the images are pushed to.
  Applied upstream's changes.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Upstream moved some settings around. Glitch-soc had more settings.
  Applied upstream's changes, moving glitch-soc's extra settings
  accordingly. 
							
						 
						
							2023-08-24 21:56:00 +02:00  
				
					
						
							
							
								 
						
							
								406f3942a9 
								
							 
						 
						
							
							
								
								[Glitch] Change opacity of the delete icon in the search field to be more visible  
							
							... 
							
							
							
							Port 9a8190da4a 
							
						 
						
							2023-08-24 21:51:13 +02:00  
				
					
						
							
							
								 
						
							
								32e67e78a3 
								
							 
						 
						
							
							
								
								Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-08-24 21:50:14 +02:00  
				
					
						
							
							
								 
						
							
								def58f8ac3 
								
							 
						 
						
							
							
								
								[Glitch] Fix some React warnings  
							
							... 
							
							
							
							Port 152b10b624 
							
						 
						
							2023-08-24 21:49:26 +02:00  
				
					
						
							
							
								 
						
							
								b6b68b44a1 
								
							 
						 
						
							
							
								
								Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `Vagrantfile`:
  Upstream bumped a bunch of values, including one that was already bumped by
  glitch-soc.
  Took upstream's version.
- `lib/paperclip/transcoder.rb`:
  glitch-soc already had a partial fix for this.
  Took upstream's version. 
							
						 
						
							2023-08-24 21:46:17 +02:00  
				
					
						
							
							
								 
						
							
								bdce78187c 
								
							 
						 
						
							
							
								
								[Glitch] Fix layout of the closed registrations modal  
							
							... 
							
							
							
							Port fe31571965 
							
						 
						
							2023-08-24 21:38:08 +02:00  
				
					
						
							
							
								 
						
							
								9b094f3653 
								
							 
						 
						
							
							
								
								[Glitch] Fix profile picture preview  
							
							... 
							
							
							
							Port SCSS changes from bb23116e8d 
							
						 
						
							2023-08-24 21:36:42 +02:00  
				
					
						
							
							
								 
						
							
								296b3d1560 
								
							 
						 
						
							
							
								
								Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.rubocop_todo.yml`:
  Upstream re-generated the file, while glitch-soc has a specific ignore
  for some file.
  Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
  Upstream added a plugin, but our files are pretty different.
  Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored tests, but part of them were different because
  of glitch-soc's theming system.
  Applied the refactoring to glitch-soc's change. 
							
						 
						
							2023-08-24 21:26:27 +02:00  
				
					
						
							
							
								 
						
							
								88ff45a3b2 
								
							 
						 
						
							
							
								
								Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-08-24 21:03:56 +02:00  
				
					
						
							
							
								 
						
							
								fbfc4145fd 
								
							 
						 
						
							
							
								
								Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
  Applied the changes there. 
							
						 
						
							2023-08-24 21:01:19 +02:00  
				
					
						
							
							
								 
						
							
								e67c28a5fe 
								
							 
						 
						
							
							
								
								[Glitch] Remove redundant ready() wrapper  
							
							... 
							
							
							
							Port bb51c0676d 
							
						 
						
							2023-08-24 20:35:22 +02:00  
				
					
						
							
							
								 
						
							
								7b09f585fa 
								
							 
						 
						
							
							
								
								Merge commit 'bb51c0676d0cf27babc2c01ee337ca5fd24ae37c' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream refactored slightly (but touching almost all the lines in the code),
  glitch-soc had moved a few of the code to another file.
  Refactored as upstream did. 
							
						 
						
							2023-08-24 20:34:14 +02:00  
				
					
						
							
							
								 
						
							
								e90649b064 
								
							 
						 
						
							
							
								
								Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode ( #26633 )  
							
							... 
							
							
							
							Co-authored-by: Plastikmensch <Plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-08-24 14:10:48 +02:00  
				
					
						
							
							
								 
						
							
								b2ac93dd73 
								
							 
						 
						
							
							
								
								Fix selecting domains to forward reports to not passing the information correctly ( #26636 )  
							
							
							
						 
						
							2023-08-24 14:06:27 +02:00  
				
					
						
							
							
								 
						
							
								9a8190da4a 
								
							 
						 
						
							
							
								
								Change opacity of the delete icon in the search field to be more visible ( #26449 )  
							
							
							
						 
						
							2023-08-23 15:51:07 +02:00  
				
					
						
							
							
								 
						
							
								613cfd625c 
								
							 
						 
						
							
							
								
								Change hashtag bar tags to be de-emphasized ( #26606 )  
							
							
							
						 
						
							2023-08-23 15:44:52 +02:00  
				
					
						
							
							
								 
						
							
								152b10b624 
								
							 
						 
						
							
							
								
								Fix some React warnings ( #26609 )  
							
							
							
						 
						
							2023-08-23 15:43:41 +02:00  
				
					
						
							
							
								 
						
							
								44ba785242 
								
							 
						 
						
							
							
								
								Change the hashtag bar to be hidden when there is a CW and the post is not expanded ( #26615 )  
							
							
							
						 
						
							2023-08-23 15:40:31 +02:00  
				
					
						
							
							
								 
						
							
								58acaa9ae6 
								
							 
						 
						
							
							
								
								Better hashtag normalization when processing a post ( #26614 )  
							
							
							
						 
						
							2023-08-23 08:18:07 +02:00  
				
					
						
							
							
								 
						
							
								c053bfc45a 
								
							 
						 
						
							
							
								
								[Glitch] Fix “legal” report category not showing up in moderation interface  
							
							... 
							
							
							
							Port 0446394465 
							
						 
						
							2023-08-22 18:54:22 +02:00  
				
					
						
							
							
								 
						
							
								10404aece8 
								
							 
						 
						
							
							
								
								Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-08-22 18:50:14 +02:00  
				
					
						
							
							
								 
						
							
								245fe855be 
								
							 
						 
						
							
							
								
								[Glitch] Fix unfollow icon styling in advanced column  
							
							... 
							
							
							
							Port d9c21293aa 
							
						 
						
							2023-08-22 18:48:23 +02:00  
				
					
						
							
							
								 
						
							
								2126812f65 
								
							 
						 
						
							
							
								
								Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some settings, where glitch-soc has an extra setting.
  Ported upstream changes, moving the same settings as them. 
							
						 
						
							2023-08-22 18:31:28 +02:00  
				
					
						
							
							
								 
						
							
								128daefc7a 
								
							 
						 
						
							
							
								
								Remove leftover `.orig` files that were mistakenly included ( #2379 )  
							
							
							
						 
						
							2023-08-22 18:24:03 +02:00  
				
					
						
							
							
								 
						
							
								fe31571965 
								
							 
						 
						
							
							
								
								Fix layout of the closed registrations modal ( #26593 )  
							
							
							
						 
						
							2023-08-22 09:11:59 +02:00  
				
					
						
							
							
								 
						
							
								724d773844 
								
							 
						 
						
							
							
								
								[Glitch] Fix "Create Account" button in interaction modal  
							
							... 
							
							
							
							Port a664e15702 
							
						 
						
							2023-08-21 21:08:56 +02:00  
				
					
						
							
							
								 
						
							
								7e25e311d5 
								
							 
						 
						
							
							
								
								Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-08-21 21:07:39 +02:00  
				
					
						
							
							
								 
						
							
								061fd66ee6 
								
							 
						 
						
							
							
								
								Remove hashtags from the last line of a status if it only contains hashtags ( #26499 )  
							
							
							
						 
						
							2023-08-21 19:39:01 +02:00  
				
					
						
							
							
								 
						
							
								bb23116e8d 
								
							 
						 
						
							
							
								
								Fix profile picture preview ( #26538 )  
							
							
							
						 
						
							2023-08-18 18:24:32 +02:00  
				
					
						
							
							
								 
						
							
								bb51c0676d 
								
							 
						 
						
							
							
								
								Remove redundant ready() wrapper ( #26533 )  
							
							
							
						 
						
							2023-08-18 12:06:08 +02:00  
				
					
						
							
							
								 
						
							
								3ed2bf92d0 
								
							 
						 
						
							
							
								
								Fix case-insensitive comparison of hashtags to do case-folding ( #26525 )  
							
							
							
						 
						
							2023-08-17 12:49:52 +02:00  
				
					
						
							
							
								 
						
							
								0446394465 
								
							 
						 
						
							
							
								
								Fix “legal” report category not showing up in moderation interface ( #26509 )  
							
							
							
						 
						
							2023-08-16 16:38:33 +02:00  
				
					
						
							
							
								 
						
							
								f0862bcf98 
								
							 
						 
						
							
							
								
								Fix hashtag bar sometimes including tags that appear in the post's body ( #26506 )  
							
							
							
						 
						
							2023-08-16 11:47:59 +02:00  
				
					
						
							
							
								 
						
							
								85ecadb630 
								
							 
						 
						
							
							
								
								Fix hashtag bar display when status is in a thread ( #26497 )  
							
							
							
						 
						
							2023-08-16 09:06:04 +02:00  
				
					
						
							
							
								 
						
							
								df6e719898 
								
							 
						 
						
							
							
								
								Add display of out-of-band hashtags in the web interface ( #26492 )  
							
							... 
							
							
							
							Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> 
							
						 
						
							2023-08-14 23:42:30 +02:00  
				
					
						
							
							
								 
						
							
								d9c21293aa 
								
							 
						 
						
							
							
								
								Fix unfollow icon styling in advanced column ( #26482 )  
							
							
							
						 
						
							2023-08-14 19:02:47 +02:00  
				
					
						
							
							
								 
						
							
								c452ccd913 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #26444 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-08-14 14:54:31 +02:00  
				
					
						
							
							
								 
						
							
								a664e15702 
								
							 
						 
						
							
							
								
								Fix "Create Account" button in interaction modal ( #26459 )  
							
							
							
						 
						
							2023-08-14 12:04:04 +02:00  
				
					
						
							
							
								 
						
							
								987f190839 
								
							 
						 
						
							
							
								
								[Glitch] Fix reply not preserving the language from the replied-to post  
							
							... 
							
							
							
							Port 34f3001278 
							
						 
						
							2023-08-13 19:24:50 +02:00  
				
					
						
							
							
								 
						
							
								92df185be7 
								
							 
						 
						
							
							
								
								Merge commit '496eb6f7a4fa7de54f26da9642a76e6884648102' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-08-13 19:23:22 +02:00  
				
					
						
							
							
								 
						
							
								e28727aab3 
								
							 
						 
						
							
							
								
								[Glitch] Change the hashtag column to not display the hashtag header on pinned columns  
							
							... 
							
							
							
							Port 4caa9f0e69 
							
						 
						
							2023-08-13 19:13:11 +02:00  
				
					
						
							
							
								 
						
							
								7c4b115e7d 
								
							 
						 
						
							
							
								
								[Glitch] Fix interaction modal layout  
							
							... 
							
							
							
							Port cd6f2b3cbc 
							
						 
						
							2023-08-13 19:12:42 +02:00  
				
					
						
							
							
								 
						
							
								0f8ddf367c 
								
							 
						 
						
							
							
								
								[Glitch] Change header of hashtag timelines in web UI  
							
							... 
							
							
							
							Port e325443b02 
							
						 
						
							2023-08-13 19:11:52 +02:00  
				
					
						
							
							
								 
						
							
								d9451feef0 
								
							 
						 
						
							
							
								
								[Glitch] Fix report modal secondary buttons style  
							
							... 
							
							
							
							Port 79936c584f 
							
						 
						
							2023-08-13 19:08:08 +02:00  
				
					
						
							
							
								 
						
							
								2f50b77ae8 
								
							 
						 
						
							
							
								
								[Glitch] Fix confirmation when closing media edition modal with unsaved changes  
							
							... 
							
							
							
							Port b59053ff8c 
							
						 
						
							2023-08-13 19:06:02 +02:00  
				
					
						
							
							
								 
						
							
								f0ad745506 
								
							 
						 
						
							
							
								
								[Glitch] Fix light theme select option for hashtags  
							
							... 
							
							
							
							Port 93372fee1e 
							
						 
						
							2023-08-13 19:05:24 +02:00  
				
					
						
							
							
								 
						
							
								03ae73bdc5 
								
							 
						 
						
							
							
								
								[Glitch] Change design of hidden media overlay (again) in web UI  
							
							... 
							
							
							
							Port 04e7efac3f 
							
						 
						
							2023-08-13 19:04:07 +02:00  
				
					
						
							
							
								 
						
							
								8247df3a8d 
								
							 
						 
						
							
							
								
								[Glitch] Change reblogs to be excluded from "Posts and replies" tab in web UI  
							
							... 
							
							
							
							Port 9d719bcd85 
							
						 
						
							2023-08-13 19:02:17 +02:00  
				
					
						
							
							
								 
						
							
								64fc66d3db 
								
							 
						 
						
							
							
								
								[Glitch] Add direct link to the Single-Sign On provider if there is only one sign up method available ( #26083 )  
							
							... 
							
							
							
							Port 120f5802c0 
							
						 
						
							2023-08-13 19:00:25 +02:00  
				
					
						
							
							
								 
						
							
								1461cc53ed 
								
							 
						 
						
							
							
								
								[Glitch] Add alt text for preview card thumbnails  
							
							... 
							
							
							
							Port 8da99ffb0d 
							
						 
						
							2023-08-13 18:56:58 +02:00  
				
					
						
							
							
								 
						
							
								6530f9709c 
								
							 
						 
						
							
							
								
								Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main  
							
							... 
							
							
							
							Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore. 
							
						 
						
							2023-08-13 18:47:15 +02:00  
				
					
						
							
							
								 
						
							
								57a4e7927a 
								
							 
						 
						
							
							
								
								[Glitch] Add client-side timeout on resend confirmation button  
							
							... 
							
							
							
							Port 2f932cb2bb 
							
						 
						
							2023-08-12 09:38:57 +02:00  
				
					
						
							
							
								 
						
							
								ea8802a05a 
								
							 
						 
						
							
							
								
								Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-08-12 09:36:38 +02:00  
				
					
						
							
							
								 
						
							
								150cfcf3ae 
								
							 
						 
						
							
							
								
								Fix border-radius on “sensitive media” overlay for full-width media ( #2364 )  
							
							
							
						 
						
							2023-08-12 09:30:27 +02:00  
				
					
						
							
							
								 
						
							
								34f3001278 
								
							 
						 
						
							
							
								
								Fix reply not preserving the language from the replied-to post ( #26452 )  
							
							
							
						 
						
							2023-08-12 00:06:37 +02:00  
				
					
						
							
							
								 
						
							
								882e770400 
								
							 
						 
						
							
							
								
								[Glitch] Change interaction modal input to disable browser spell-checking, capitalization and autocomplete  
							
							... 
							
							
							
							Port 71fd70335a 
							
						 
						
							2023-08-11 22:26:27 +02:00  
				
					
						
							
							
								 
						
							
								44a5f1b64a 
								
							 
						 
						
							
							
								
								Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
  Upstream updated its README, but glitch-soc has a completely different one.
  Kept glitch-soc's README 
							
						 
						
							2023-08-11 22:15:41 +02:00  
				
					
						
							
							
								 
						
							
								3378bdb01f 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2354 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-08-11 22:03:11 +02:00  
				
					
						
							
							
								 
						
							
								8cbf4a5296 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #26373 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-08-10 09:47:42 +02:00  
				
					
						
							
							
								 
						
							
								4caa9f0e69 
								
							 
						 
						
							
							
								
								Change the hashtag column to not display the hashtag header on pinned columns ( #26416 )  
							
							
							
						 
						
							2023-08-09 16:32:40 +02:00  
				
					
						
							
							
								 
						
							
								cd6f2b3cbc 
								
							 
						 
						
							
							
								
								Fix interaction modal layout ( #26368 )  
							
							
							
						 
						
							2023-08-07 17:58:29 +02:00  
				
					
						
							
							
								 
						
							
								d2dbaba407 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #26209 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-08-07 13:37:54 +02:00  
				
					
						
							
							
								 
						
							
								e325443b02 
								
							 
						 
						
							
							
								
								Change header of hashtag timelines in web UI ( #26362 )  
							
							
							
						 
						
							2023-08-07 09:46:11 +02:00  
				
					
						
							
							
								 
						
							
								79936c584f 
								
							 
						 
						
							
							
								
								Fix report modal secondary buttons style ( #26341 )  
							
							
							
						 
						
							2023-08-04 16:25:44 +02:00  
				
					
						
							
							
								 
						
							
								b59053ff8c 
								
							 
						 
						
							
							
								
								Fix confirmation when closing media edition modal with unsaved changes ( #26342 )  
							
							
							
						 
						
							2023-08-04 15:48:29 +02:00  
				
					
						
							
							
								 
						
							
								93372fee1e 
								
							 
						 
						
							
							
								
								Fix light theme select option for hashtags ( #26311 )  
							
							
							
						 
						
							2023-08-04 09:41:17 +02:00  
				
					
						
							
							
								 
						
							
								04e7efac3f 
								
							 
						 
						
							
							
								
								Change design of hidden media overlay (again) in web UI ( #26330 )  
							
							
							
						 
						
							2023-08-03 20:39:45 +02:00  
				
					
						
							
							
								 
						
							
								9d719bcd85 
								
							 
						 
						
							
							
								
								Change reblogs to be excluded from "Posts and replies" tab in web UI ( #26302 )  
							
							
							
						 
						
							2023-08-03 20:39:33 +02:00  
				
					
						
							
							
								 
						
							
								120f5802c0 
								
							 
						 
						
							
							
								
								Add direct link to the Single-Sign On provider if there is only one sign up method available ( #26083 )  
							
							
							
						 
						
							2023-08-03 16:43:15 +02:00  
				
					
						
							
							
								 
						
							
								8da99ffb0d 
								
							 
						 
						
							
							
								
								Add alt text for preview card thumbnails ( #26184 )  
							
							
							
						 
						
							2023-08-03 15:41:51 +02:00  
				
					
						
							
							
								 
						
							
								2f932cb2bb 
								
							 
						 
						
							
							
								
								Add client-side timeout on resend confirmation button ( #26300 )  
							
							
							
						 
						
							2023-08-03 01:51:10 +02:00  
				
					
						
							
							
								 
						
							
								6308dca76a 
								
							 
						 
						
							
							
								
								change column link to add a better keyboard focus indicator ( #26278 )  
							
							
							
						 
						
							2023-08-02 19:33:41 +02:00  
				
					
						
							
							
								 
						
							
								2cbdff97ce 
								
							 
						 
						
							
							
								
								Change design of role badges in web UI ( #26281 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-08-02 17:24:32 +02:00  
				
					
						
							
							
								 
						
							
								01f0cffc2c 
								
							 
						 
						
							
							
								
								Fix line clamp for link previews in web UI ( #26286 )  
							
							
							
						 
						
							2023-08-02 04:17:23 +02:00  
				
					
						
							
							
								 
						
							
								4c999a736c 
								
							 
						 
						
							
							
								
								Fix wrong border radius on link cards in web UI ( #26287 )  
							
							
							
						 
						
							2023-08-02 01:57:31 +02:00  
				
					
						
							
							
								 
						
							
								71fd70335a 
								
							 
						 
						
							
							
								
								Change interaction modal input to disable browser spell-checking, capitalization and autocomplete ( #26267 )  
							
							
							
						 
						
							2023-08-01 17:11:30 +02:00  
				
					
						
							
							
								 
						
							
								3b49b5a880 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2348 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-07-31 07:44:04 +02:00  
				
					
						
							
							
								 
						
							
								e02510c428 
								
							 
						 
						
							
							
								
								Remove .orig files ( #2347 )  
							
							... 
							
							
							
							Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-31 07:43:46 +02:00  
				
					
						
							
							
								 
						
							
								e96a90480b 
								
							 
						 
						
							
							
								
								Merge pull request  #2339  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							* Cleanup unused portions of statuses/status partial (#26045 )
* Wrong count in response when removing favourite/reblog (#24365 )
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
* Paperclip: add support for Azure blob storage (#23607 )
* Fix a missing redirection on getting-started in multi column mode (#26070 )
* Fix haml-lint Rubocop `Style/NumericPredicate` cop (#26040 )
* Change casing for 'Server Settings' string (#26011 )
* Move localized subject mailer shared example to separate file (#25889 )
* Fix haml-lint Rubocop `Lint/UnusedBlockArguments` cop (#26039 )
* Fix `Lint/Void` cop (#25922 )
* Add stricter protocol fields validation for accounts (#25937 )
* Improve the bug report templates (#25621 )
* Fix the crossorigin attribute (#26096 )
* Fix replica being used even if not explicitly defined (#26074 )
* Clean up unused application records (#24871 )
* Change thread view to scroll to the selected post rather than the post being replied to (#24685 )
* Change default KeyGenerator digest to SHA1 to fix cookies in rolling upgrades (#26023 )
* change focus ui for keyboard only input (#25935 )
* Use username as display name for suspended users or users with blank display names (#25276 )
* Fix CSP headers being unintendedly wide (#26105 )
* Fix linting issue (#26106 )
* Replace 'favourite' by 'favorite' for American English (#26009 )
* Override default Action Mailer `preview_path` (#26110 )
* Favourits -> Favorites (#26109 )
* Bump version to v4.1.5 (#26108 )
* Fix incorrect connect timeout in outgoing requests (#26116 )
* Fix missing translation strings for importing lists (#26120 )
* Use valid email address for first account (#26114 )
* Update haml-lint 0.49.1 (#26118 )
* Fix focus and hover styles in web UI (#26125 )
* Remove back button from bookmarks, favourites and lists screens in web UI (#26126 )
* Remove 16:9 cropping from web UI (#26132 )
* Change design of link previews in web UI (#26136 )
* change poll form element colors to fit with the rest of the ui (#26139 )
* Add `lang` attribute to trending links (#26111 )
* Update dependency rdf-normalize to v0.6.1 (#26130 )
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Update dependency brakeman to v6.0.1 (#26141 )
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Update dependency postcss to v8.4.27 (#26144 )
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Fix unexpected redirection to /explore after sign-in (#26143 )
* Update dependency aws-sdk-s3 to v1.131.0 (#26145 )
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Add report.updated webhook (#24211 )
* Fix LinkCrawlWorker crashing on `null` `created_at` (#26151 )
* Fix UI Overlap with the loupe icon in the Explore Tab (#26113 )
* Fix missing border on error screen in light theme in web UI (#26152 )
* Fix missing action label on sensitive videos and embeds in web UI (#26135 )
* Fix `lang` for UI texts in link preview (#26149 )
* Add published date and author to news on the explore screen in web UI (#26155 )
* Coverage for `Auth::OmniauthCallbacks` controller (#26147 )
* fix poll input active style (#26162 )
* Add `published_at` attribute to preview cards (#26153 )
* Update dependency sass to v1.64.1 (#26146 )
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Revert poll colors to green outside of compose form (#26164 )
* Preserve translation on status re-import (#26168 )
* Fix missing GIF badge in account gallery (#26166 )
* Reformat large text arg in `FetchLinkCardService` spec (#26183 )
* Ignore long line in regex initializer (#26182 )
* Reformat large key values in service specs (#26181 )
* Reformat large hash in `ContextHelper` module (#26180 )
* Use heredoc SQL blocks in `AddFromAccountIdToNotifications` migration (#26178 )
* Extract private methods in `StatusCacheHydrator` (#26177 )
* New Crowdin Translations (automated) (#26072 )
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
* Remove the `sr` locale override .rb files (#25927 )
* Use correct naming on controller concern specs (#26197 )
* Migrate to request specs in `/api/v2/filters` (#25721 )
* Fix wrong filters sometimes applying in streaming (#26159 )
* Refactor streaming's filtering logic & improve documentation (#26213 )
* Add role badges to the WebUI (#25649 )
* Change interaction modal in web UI (#26075 )
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
* Fix crash when processing Flag activity with no status (#26189 )
* Storage: add :azure to remaining callers (#26080 )
* Remove queued_at value from pubsub payloads (#26173 )
* Fix emoji picker button scrolling with textarea content in single-column view (#25304 )
* Change the wording of the dismissable explore prompt (#25917 )
* Update dependency haml_lint to v0.49.2 (#26222 )
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Fix: Streaming server memory leak in HTTP EventSource cleanup (#26228 )
* Swap debug statements in streaming server (#26231 )
* Fix missing return values in streaming (#26233 )
* [Glitch] Wrong count in response when removing favourite/reblog
Port 4c18928a93586b1c9dcae4ea80d808217ef7f2af80809ef33e76fce34ebb9a567ec1d1d1a9f601c7714a20697f49d2e8979fce1f35d7e2f826a95f6e6781dc6462a4b69bec2eb4e739ff0fa4ec187a20 
							
						 
						
							2023-07-30 21:35:47 +02:00  
				
					
						
							
							
								 
						
							
								ebfa184e74 
								
							 
						 
						
							
							
								
								Port search popout changes from upstream ( #2333 )  
							
							... 
							
							
							
							* [Glitch] Change search pop-out in web UI
Port 2b113764116028d047b9e38b39194051b83ed19573b64b8917 
							
						 
						
							2023-07-30 18:42:35 +02:00  
				
					
						
							
							
								 
						
							
								403a5c0f3f 
								
							 
						 
						
							
							
								
								[Glitch] Change the wording of the dismissable explore prompt  
							
							... 
							
							
							
							Port a4ec187a20 
							
						 
						
							2023-07-30 17:01:29 +02:00  
				
					
						
							
							
								 
						
							
								aa1789f0dd 
								
							 
						 
						
							
							
								
								[Glitch] Change interaction modal in web UI  
							
							... 
							
							
							
							Port b4e739ff0f 
							
						 
						
							2023-07-30 16:59:32 +02:00  
				
					
						
							
							
								 
						
							
								a1f1424e76 
								
							 
						 
						
							
							
								
								Fix interaction modal being broken because of glitch-soc's theming system  
							
							
							
						 
						
							2023-07-30 16:45:50 +02:00  
				
					
						
							
							
								 
						
							
								92fa9d34b0 
								
							 
						 
						
							
							
								
								Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
  Small conflict due to our theming system.
- `streaming/index.js`:
  Upstream refactored part of the streaming server.
  We had some extra logic for handling local-only posts.
  Applied the refactor. 
							
						 
						
							2023-07-30 16:11:55 +02:00  
				
					
						
							
							
								 
						
							
								879c7ed2d3 
								
							 
						 
						
							
							
								
								[Glitch] Fix missing GIF badge in account gallery  
							
							... 
							
							
							
							Port a4b69bec2e 
							
						 
						
							2023-07-30 15:58:20 +02:00  
				
					
						
							
							
								 
						
							
								88ba538aad 
								
							 
						 
						
							
							
								
								[Glitch] Preserve translation on status re-import  
							
							... 
							
							
							
							Port 6781dc6462 
							
						 
						
							2023-07-30 15:57:45 +02:00  
				
					
						
							
							
								 
						
							
								454d8567d4 
								
							 
						 
						
							
							
								
								Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-30 15:54:34 +02:00  
				
					
						
							
							
								 
						
							
								450f75b6f7 
								
							 
						 
						
							
							
								
								[Glitch] Add published date and author to news on the explore screen in web UI  
							
							... 
							
							
							
							Port f826a95f6e 
							
						 
						
							2023-07-30 15:50:53 +02:00  
				
					
						
							
							
								 
						
							
								887a17bb83 
								
							 
						 
						
							
							
								
								[Glitch] Revert poll colors to green outside of compose form  
							
							... 
							
							
							
							Port ce1f35d7e2 
							
						 
						
							2023-07-30 15:50:53 +02:00  
				
					
						
							
							
								 
						
							
								e92dde0b16 
								
							 
						 
						
							
							
								
								[Glitch] fix poll input active style  
							
							... 
							
							
							
							Port 49d2e8979f 
							
						 
						
							2023-07-30 15:50:53 +02:00  
				
					
						
							
							
								 
						
							
								e48a6a5f2c 
								
							 
						 
						
							
							
								
								[Glitch] Fix missing action label on sensitive videos and embeds in web UI  
							
							... 
							
							
							
							Port 714a20697f 
							
						 
						
							2023-07-30 15:50:53 +02:00  
				
					
						
							
							
								 
						
							
								4b26e44ef4 
								
							 
						 
						
							
							
								
								[Glitch] Fix missing border on error screen in light theme in web UI  
							
							... 
							
							
							
							Port d1a9f601c7 
							
						 
						
							2023-07-30 15:23:08 +02:00  
				
					
						
							
							
								 
						
							
								168fadb6b9 
								
							 
						 
						
							
							
								
								[Glitch] Fix UI Overlap with the loupe icon in the Explore Tab  
							
							... 
							
							
							
							Port 9a567ec1d1 
							
						 
						
							2023-07-30 15:22:28 +02:00  
				
					
						
							
							
								 
						
							
								1d4df97049 
								
							 
						 
						
							
							
								
								[Glitch] Add `lang` attribute to trending links  
							
							... 
							
							
							
							Port 76fce34ebb 
							
						 
						
							2023-07-30 15:18:40 +02:00  
				
					
						
							
							
								 
						
							
								f3bd96c91c 
								
							 
						 
						
							
							
								
								[Glitch] change poll form element colors to fit with the rest of the ui  
							
							... 
							
							
							
							Port 80809ef33e 
							
						 
						
							2023-07-30 15:18:07 +02:00  
				
					
						
							
							
								 
						
							
								bd349cb850 
								
							 
						 
						
							
							
								
								Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `db/schema.rb`:
  Upstream regenerated the schema file using Rails 7, the conflicts are
  caused by our extra columns.
  Applied upstream's changes, but keeping our extra columns. 
							
						 
						
							2023-07-30 14:58:56 +02:00  
				
					
						
							
							
								 
						
							
								09ebf7e37c 
								
							 
						 
						
							
							
								
								[Glitch] Replace 'favourite' by 'favorite' for American English  
							
							... 
							
							
							
							Port 217ef7f2af 
							
						 
						
							2023-07-30 14:44:36 +02:00  
				
					
						
							
							
								 
						
							
								b2515feb29 
								
							 
						 
						
							
							
								
								Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-30 14:33:28 +02:00  
				
					
						
							
							
								 
						
							
								5914dfdd69 
								
							 
						 
						
							
							
								
								[Glitch] Change thread view to scroll to the selected post rather than the post being replied to  
							
							... 
							
							
							
							Port e4ea80d808 
							
						 
						
							2023-07-30 14:26:52 +02:00  
				
					
						
							
							
								 
						
							
								42f36aa55a 
								
							 
						 
						
							
							
								
								Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream fixed an issue that was not present in glitch-soc.
  Kept our version. 
							
						 
						
							2023-07-30 13:49:35 +02:00  
				
					
						
							
							
								 
						
							
								f05effeb8f 
								
							 
						 
						
							
							
								
								[Glitch] Fix a missing redirection on getting-started in multi column mode  
							
							... 
							
							
							
							Port 586b1c9dca 
							
						 
						
							2023-07-30 13:32:16 +02:00  
				
					
						
							
							
								 
						
							
								d3d6147286 
								
							 
						 
						
							
							
								
								[Glitch] Wrong count in response when removing favourite/reblog  
							
							... 
							
							
							
							Port 4c18928a93 
							
						 
						
							2023-07-30 13:31:41 +02:00  
				
					
						
							
							
								 
						
							
								993d0a9950 
								
							 
						 
						
							
							
								
								Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/account.rb`:
  Upstream added new validations close to lines on which glitch-soc had
  modified validations to handle custom limits set through environment
  variables.
  Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
  Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
  completely different.
  Added `AZURE_ALIAS_HOST` to our version of the file. 
							
						 
						
							2023-07-30 13:15:01 +02:00  
				
					
						
							
							
								 
						
							
								3a14104411 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2338 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-07-30 13:09:02 +02:00  
				
					
						
							
							
								 
						
							
								d4807a5e64 
								
							 
						 
						
							
							
								
								Change aspect ratios on link previews in web UI ( #26250 )  
							
							
							
						 
						
							2023-07-30 03:35:17 +02:00  
				
					
						
							
							
								 
						
							
								4d3a129212 
								
							 
						 
						
							
							
								
								Fix public TL not indicating new toots when `onlyRemote` is enabled ( #26247 )  
							
							... 
							
							
							
							Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-29 20:18:38 +02:00  
				
					
						
							
							
								 
						
							
								1cc3fcf7d0 
								
							 
						 
						
							
							
								
								Fix Public TL not indicating new toots when `onlyRemote` or `allowLocalOnly` is enabled ( #2336 )  
							
							... 
							
							
							
							Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-29 16:45:37 +02:00  
				
					
						
							
							
								 
						
							
								feaf3cf780 
								
							 
						 
						
							
							
								
								Fix firehose not indicating new toots in "All" ( #2335 )  
							
							... 
							
							
							
							When "Show local-only toots in All" is enabled, the column never indicated there are new toots, since `hasUnread` was always false.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-29 08:37:29 +02:00  
				
					
						
							
							
								 
						
							
								e69fe94669 
								
							 
						 
						
							
							
								
								Fix "All" live feed not loading automatically. ( #2332 )  
							
							... 
							
							
							
							The dispatch to expand the timeline was missing the `allowLocalOnly` param.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-27 19:25:55 +02:00  
				
					
						
							
							
								 
						
							
								8864d5b580 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2327 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-07-27 19:25:29 +02:00  
				
					
						
							
							
								 
						
							
								6256cee034 
								
							 
						 
						
							
							
								
								Change error boundary to upstream's ( #2323 )  
							
							
							
						 
						
							2023-07-27 19:25:07 +02:00  
				
					
						
							
							
								 
						
							
								a4ec187a20 
								
							 
						 
						
							
							
								
								Change the wording of the dismissable explore prompt ( #25917 )  
							
							
							
						 
						
							2023-07-27 16:51:02 +02:00  
				
					
						
							
							
								 
						
							
								bbea052935 
								
							 
						 
						
							
							
								
								Fix emoji picker button scrolling with textarea content in single-column view ( #25304 )  
							
							
							
						 
						
							2023-07-27 16:20:33 +02:00  
				
					
						
							
							
								 
						
							
								b4e739ff0f 
								
							 
						 
						
							
							
								
								Change interaction modal in web UI ( #26075 )  
							
							... 
							
							
							
							Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> 
							
						 
						
							2023-07-27 16:11:17 +02:00  
				
					
						
							
							
								 
						
							
								1e4ccc655a 
								
							 
						 
						
							
							
								
								Add role badges to the WebUI ( #25649 )  
							
							
							
						 
						
							2023-07-27 16:05:24 +02:00  
				
					
						
							
							
								 
						
							
								b9adea9695 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #26072 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-07-26 13:46:16 +02:00  
				
					
						
							
							
								 
						
							
								a4b69bec2e 
								
							 
						 
						
							
							
								
								Fix missing GIF badge in account gallery ( #26166 )  
							
							
							
						 
						
							2023-07-26 03:33:31 +02:00  
				
					
						
							
							
								 
						
							
								6781dc6462 
								
							 
						 
						
							
							
								
								Preserve translation on status re-import ( #26168 )  
							
							
							
						 
						
							2023-07-25 20:29:31 +02:00  
				
					
						
							
							
								 
						
							
								ce1f35d7e2 
								
							 
						 
						
							
							
								
								Revert poll colors to green outside of compose form ( #26164 )  
							
							
							
						 
						
							2023-07-25 15:32:59 +02:00  
				
					
						
							
							
								 
						
							
								49d2e8979f 
								
							 
						 
						
							
							
								
								fix poll input active style ( #26162 )  
							
							
							
						 
						
							2023-07-25 13:39:15 +02:00  
				
					
						
							
							
								 
						
							
								f826a95f6e 
								
							 
						 
						
							
							
								
								Add published date and author to news on the explore screen in web UI ( #26155 )  
							
							
							
						 
						
							2023-07-25 00:57:15 +02:00  
				
					
						
							
							
								 
						
							
								4299208487 
								
							 
						 
						
							
							
								
								Fix `lang` for UI texts in link preview ( #26149 )  
							
							
							
						 
						
							2023-07-24 23:01:31 +02:00  
				
					
						
							
							
								 
						
							
								714a20697f 
								
							 
						 
						
							
							
								
								Fix missing action label on sensitive videos and embeds in web UI ( #26135 )  
							
							
							
						 
						
							2023-07-24 22:04:38 +02:00  
				
					
						
							
							
								 
						
							
								d1a9f601c7 
								
							 
						 
						
							
							
								
								Fix missing border on error screen in light theme in web UI ( #26152 )  
							
							
							
						 
						
							2023-07-24 19:53:33 +02:00  
				
					
						
							
							
								 
						
							
								9a567ec1d1 
								
							 
						 
						
							
							
								
								Fix UI Overlap with the loupe icon in the Explore Tab ( #26113 )  
							
							
							
						 
						
							2023-07-24 17:56:20 +02:00  
				
					
						
							
							
								 
						
							
								76fce34ebb 
								
							 
						 
						
							
							
								
								Add `lang` attribute to trending links ( #26111 )  
							
							
							
						 
						
							2023-07-24 13:48:23 +02:00  
				
					
						
							
							
								 
						
							
								80809ef33e 
								
							 
						 
						
							
							
								
								change poll form element colors to fit with the rest of the ui ( #26139 )  
							
							
							
						 
						
							2023-07-24 13:48:09 +02:00  
				
					
						
							
							
								 
						
							
								6b2952d1dd 
								
							 
						 
						
							
							
								
								Change design of link previews in web UI ( #26136 )  
							
							
							
						 
						
							2023-07-24 13:47:28 +02:00  
				
					
						
							
							
								 
						
							
								4d01d1a1ee 
								
							 
						 
						
							
							
								
								Remove 16:9 cropping from web UI ( #26132 )  
							
							
							
						 
						
							2023-07-24 13:46:55 +02:00  
				
					
						
							
							
								 
						
							
								cf9affdeac 
								
							 
						 
						
							
							
								
								Apply padding to all notifications in notif-cleaning mode ( #2325 )  
							
							... 
							
							
							
							* Add missing padding to notif-cleaning for admin-sign-up
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Apply padding to all notification types instead
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-23 18:50:24 +02:00  
				
					
						
							
							
								 
						
							
								5e8cbb5f82 
								
							 
						 
						
							
							
								
								Remove back button from bookmarks, favourites and lists screens in web UI ( #26126 )  
							
							
							
						 
						
							2023-07-23 17:55:20 +02:00  
				
					
						
							
							
								 
						
							
								cfd50f30bb 
								
							 
						 
						
							
							
								
								Fix focus and hover styles in web UI ( #26125 )  
							
							
							
						 
						
							2023-07-23 17:55:13 +02:00  
				
					
						
							
							
								 
						
							
								51311c1978 
								
							 
						 
						
							
							
								
								Fix CW icon being on wrong side in app settings in RTL languages ( #2324 )  
							
							... 
							
							
							
							Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-23 17:19:09 +02:00  
				
					
						
							
							
								 
						
							
								944c29033d 
								
							 
						 
						
							
							
								
								Fix relationship-tag background color ( #2322 )  
							
							
							
						 
						
							2023-07-23 14:40:37 +02:00  
				
					
						
							
							
								 
						
							
								9ec43107f2 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2319 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-07-23 14:31:38 +02:00  
				
					
						
							
							
								 
						
							
								49767d20bd 
								
							 
						 
						
							
							
								
								Fix glitch local settings navigation items not being proper buttons ( #2320 )  
							
							
							
						 
						
							2023-07-23 14:31:16 +02:00  
				
					
						
							
							
								 
						
							
								dd09535bda 
								
							 
						 
						
							
							
								
								Annotate doodle parameters to please eslint ( #2321 )  
							
							
							
						 
						
							2023-07-23 14:31:05 +02:00  
				
					
						
							
							
								 
						
							
								52500965cc 
								
							 
						 
						
							
							
								
								Fix “Open in advanced web interface” being shown on mobile view ( #2318 )  
							
							... 
							
							
							
							Fixes  #2307  
						
							2023-07-22 17:22:04 +02:00  
				
					
						
							
							
								 
						
							
								9a45198ab0 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2317 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-07-22 09:53:26 +02:00  
				
					
						
							
							
								 
						
							
								1b4cf0eba0 
								
							 
						 
						
							
							
								
								Favourits -> Favorites ( #26109 )  
							
							
							
						 
						
							2023-07-21 21:13:20 +02:00  
				
					
						
							
							
								 
						
							
								217ef7f2af 
								
							 
						 
						
							
							
								
								Replace 'favourite' by 'favorite' for American English ( #26009 )  
							
							
							
						 
						
							2023-07-21 19:09:13 +02:00  
				
					
						
							
							
								 
						
							
								59478a1b46 
								
							 
						 
						
							
							
								
								change focus ui for keyboard only input ( #25935 )  
							
							
							
						 
						
							2023-07-21 13:20:14 +02:00  
				
					
						
							
							
								 
						
							
								e4ea80d808 
								
							 
						 
						
							
							
								
								Change thread view to scroll to the selected post rather than the post being replied to ( #24685 )  
							
							
							
						 
						
							2023-07-21 13:14:30 +02:00  
				
					
						
							
							
								 
						
							
								e7cb6c6c44 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2314 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-07-21 09:26:08 +02:00  
				
					
						
							
							
								 
						
							
								586b1c9dca 
								
							 
						 
						
							
							
								
								Fix a missing redirection on getting-started in multi column mode ( #26070 )  
							
							
							
						 
						
							2023-07-20 14:46:02 +02:00  
				
					
						
							
							
								 
						
							
								4c18928a93 
								
							 
						 
						
							
							
								
								Wrong count in response when removing favourite/reblog ( #24365 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-07-19 09:02:30 +02:00  
				
					
						
							
							
								 
						
							
								0092fe50ac 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream entirely refactored this, while we changed the docker repository
  to upload to and disabled the “latest” tag.
  Applied the repository change to `.github/workflows/build-*.yml`, as well
  as disabling native ARMv64 builds.
- `README.md`:
  We have a completely different README.
  Kept ours.
- `app/views/admin/settings/shared/_links.html.haml`:
  Upstream refactored, we had an extra item.
  Refactored as upstream did.
- `spec/controllers/api/v1/timelines/public_controller_spec.rb`:
  Upstream deleted this file, to be replaced by a request spec at
  `spec/requests/api/v1/timelines/public_spec.rb`.
  We had an extra bit about enabling the public timelines because we have
  different defaults than upstream.
  Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb` 
							
						 
						
							2023-07-19 07:35:51 +02:00  
				
					
						
							
							
								 
						
							
								111686c38b 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #2306 )  
							
							... 
							
							
							
							* New translations en.json (French)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Afrikaans)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations en.json (Punjabi)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (English, United Kingdom)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Uyghur)
[ci skip]
* New translations en.json (Tatar)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Latin)
[ci skip]
* New translations en.json (Bosnian)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Cornish)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Igbo)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations simple_form.en.yml (Italian)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (French, Quebec)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip] 
							
						 
						
							2023-07-19 07:05:33 +02:00  
				
					
						
							
							
								 
						
							
								47832a1ac0 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #26054 )  
							
							... 
							
							
							
							Co-authored-by: renchap <renchap@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-07-18 21:13:25 +02:00  
				
					
						
							
							
								 
						
							
								0c45bed333 
								
							 
						 
						
							
							
								
								[Glitch] Fix “Back” button sometimes redirecting out of Mastodon  
							
							... 
							
							
							
							Port a442a1d1c6 
							
						 
						
							2023-07-17 19:12:09 +02:00  
				
					
						
							
							
								 
						
							
								c04f2d0cf7 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  had a different lambda due to its theming system.
  Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  removed some code just after the lambda.
  Applied the same code style changes. 
							
						 
						
							2023-07-17 19:02:23 +02:00  
				
					
						
							
							
								 
						
							
								a442a1d1c6 
								
							 
						 
						
							
							
								
								Fix “Back” button sometimes redirecting out of Mastodon ( #25281 )  
							
							
							
						 
						
							2023-07-17 17:32:46 +02:00  
				
					
						
							
							
								 
						
							
								12e7f5fabd 
								
							 
						 
						
							
							
								
								[Glitch] Fix for "follows you" indicator in light web UI not readable  
							
							... 
							
							
							
							Port 97ce47e451 
							
						 
						
							2023-07-17 13:01:47 +02:00  
				
					
						
							
							
								 
						
							
								27f7e5b0f3 
								
							 
						 
						
							
							
								
								[Glitch] Prevent split line between icon and number on reposts & favourites  
							
							... 
							
							
							
							Port b923a4c755 
							
						 
						
							2023-07-17 13:01:07 +02:00  
				
					
						
							
							
								 
						
							
								c943f17b1b 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-17 12:52:15 +02:00  
				
					
						
							
							
								 
						
							
								97ce47e451 
								
							 
						 
						
							
							
								
								Fix for "follows you" indicator in light web UI not readable ( #25993 )  
							
							
							
						 
						
							2023-07-17 11:51:00 +02:00  
				
					
						
							
							
								 
						
							
								23197cebce 
								
							 
						 
						
							
							
								
								Reduce dropdown menu margin and padding ( #2301 )  
							
							... 
							
							
							
							* Reduce dropdown menu margin and padding
* Change horizontal padding back to what it was
* Reduce separator vertical margins for consistency 
							
						 
						
							2023-07-16 18:23:07 +02:00  
				
					
						
							
							
								 
						
							
								b923a4c755 
								
							 
						 
						
							
							
								
								Prevent split line between icon and number on reposts & favourites ( #26004 )  
							
							
							
						 
						
							2023-07-16 10:06:33 +02:00  
				
					
						
							
							
								 
						
							
								c45a965bf7 
								
							 
						 
						
							
							
								
								[Glitch] Change “About” and “Privacy policy” links to open in a new tab in advanced interface  
							
							... 
							
							
							
							Port 71db616fed 
							
						 
						
							2023-07-14 13:01:31 +02:00  
				
					
						
							
							
								 
						
							
								9bd012b7cb 
								
							 
						 
						
							
							
								
								[Glitch] Change links in multi-column mode so tabs are open in single-column mode  
							
							... 
							
							
							
							Port 5fad7bd58a 
							
						 
						
							2023-07-14 13:01:31 +02:00  
				
					
						
							
							
								 
						
							
								0d61985713 
								
							 
						 
						
							
							
								
								Remove layout glitch-soc settings  
							
							
							
						 
						
							2023-07-14 13:01:31 +02:00  
				
					
						
							
							
								 
						
							
								f0d3267fbf 
								
							 
						 
						
							
							
								
								[Glitch] Fix dropdowns being disabled for logged out users in web UI  
							
							... 
							
							
							
							Port a8edbcf963 
							
						 
						
							2023-07-14 13:01:31 +02:00  
				
					
						
							
							
								 
						
							
								a98b5c2246 
								
							 
						 
						
							
							
								
								[Glitch] Fix embed dropdown menu item for unauthenticated users  
							
							... 
							
							
							
							Port 41f65edb21 
							
						 
						
							2023-07-13 22:42:15 +02:00  
				
					
						
							
							
								 
						
							
								d9adda1a99 
								
							 
						 
						
							
							
								
								Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-13 22:40:15 +02:00  
				
					
						
							
							
								 
						
							
								470ded3687 
								
							 
						 
						
							
							
								
								Fix notifications not loading when slow mode active ( #2292 )  
							
							... 
							
							
							
							When slow mode is enabled, clicking a notification filter when a new notification was received will render an empty column.
This change has been missed in e91bf82083 
							
						 
						
							2023-07-13 21:36:15 +02:00  
				
					
						
							
							
								 
						
							
								e271d018b7 
								
							 
						 
						
							
							
								
								Fix home timeline's regexp field  
							
							
							
						 
						
							2023-07-13 19:33:58 +02:00  
				
					
						
							
							
								 
						
							
								71db616fed 
								
							 
						 
						
							
							
								
								Change “About” and “Privacy policy” links to open in a new tab in advanced interface ( #25973 )  
							
							
							
						 
						
							2023-07-13 17:59:15 +02:00  
				
					
						
							
							
								 
						
							
								5fad7bd58a 
								
							 
						 
						
							
							
								
								Change links in multi-column mode so tabs are open in single-column mode ( #25893 )  
							
							
							
						 
						
							2023-07-13 17:18:09 +02:00  
				
					
						
							
							
								 
						
							
								41f65edb21 
								
							 
						 
						
							
							
								
								Fix embed dropdown menu item for unauthenticated users ( #25964 )  
							
							
							
						 
						
							2023-07-13 15:53:03 +02:00  
				
					
						
							
							
								 
						
							
								98e5589ed4 
								
							 
						 
						
							
							
								
								[Glitch] Fix follow link style in embeds  
							
							... 
							
							
							
							Port 5a3f174d56 
							
						 
						
							2023-07-13 14:52:36 +02:00  
				
					
						
							
							
								 
						
							
								18f55567b0 
								
							 
						 
						
							
							
								
								[Glitch] Upgrade to `typescript-eslint` v6  
							
							... 
							
							
							
							Port a7253075d1 
							
						 
						
							2023-07-13 14:51:24 +02:00  
				
					
						
							
							
								 
						
							
								3be4f4266d 
								
							 
						 
						
							
							
								
								Fix incorrect types in DisplayName  
							
							
							
						 
						
							2023-07-13 14:51:24 +02:00  
				
					
						
							
							
								 
						
							
								25571b18ed 
								
							 
						 
						
							
							
								
								Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-13 14:22:20 +02:00  
				
					
						
							
							
								 
						
							
								447ab7ab24 
								
							 
						 
						
							
							
								
								[Glitch] Convert Home timeline components to Typescript  
							
							... 
							
							
							
							Port a75138d073 
							
						 
						
							2023-07-13 14:21:08 +02:00  
				
					
						
							
							
								 
						
							
								177497b367 
								
							 
						 
						
							
							
								
								Merge commit '3ed9b55cb3987e3d32c56f857cb6903ca8bec3d4' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-13 14:02:28 +02:00  
				
					
						
							
							
								 
						
							
								0870c7c95e 
								
							 
						 
						
							
							
								
								[Glitch] Upgrade to Prettier 3  
							
							... 
							
							
							
							Port 73b64b8917 
							
						 
						
							2023-07-13 14:01:40 +02:00  
				
					
						
							
							
								 
						
							
								95a1fde6b6 
								
							 
						 
						
							
							
								
								Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file. 
							
						 
						
							2023-07-13 13:49:58 +02:00  
				
					
						
							
							
								 
						
							
								5a3f174d56 
								
							 
						 
						
							
							
								
								Fix follow link style in embeds ( #25965 )  
							
							
							
						 
						
							2023-07-13 12:58:56 +02:00  
				
					
						
							
							
								 
						
							
								a7253075d1 
								
							 
						 
						
							
							
								
								Upgrade to `typescript-eslint` v6 ( #25904 )  
							
							
							
						 
						
							2023-07-13 11:49:16 +02:00  
				
					
						
							
							
								 
						
							
								a75138d073 
								
							 
						 
						
							
							
								
								Convert Home timeline components to Typescript ( #25583 )  
							
							
							
						 
						
							2023-07-13 11:28:55 +02:00  
				
					
						
							
							
								 
						
							
								73b64b8917 
								
							 
						 
						
							
							
								
								Upgrade to Prettier 3 ( #25902 )  
							
							
							
						 
						
							2023-07-13 11:26:45 +02:00  
				
					
						
							
							
								 
						
							
								c2bfbf53a1 
								
							 
						 
						
							
							
								
								Fix various CSS issues  
							
							
							
						 
						
							2023-07-12 19:13:31 +02:00  
				
					
						
							
							
								 
						
							
								9ae60f8738 
								
							 
						 
						
							
							
								
								Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file. 
							
						 
						
							2023-07-12 16:03:05 +02:00  
				
					
						
							
							
								 
						
							
								ec95f62cb4 
								
							 
						 
						
							
							
								
								[Glitch] Fix sounds not being loaded from assets host  
							
							... 
							
							
							
							Port 1392f31ed8 
							
						 
						
							2023-07-12 16:00:20 +02:00  
				
					
						
							
							
								 
						
							
								2aadebc769 
								
							 
						 
						
							
							
								
								Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed how releases are tagged, we don't have releases.
  Ignored the changes 
							
						 
						
							2023-07-12 15:54:58 +02:00  
				
					
						
							
							
								 
						
							
								15f6fa8d47 
								
							 
						 
						
							
							
								
								[Glitch] fix buttons showing inconsistent styles  
							
							... 
							
							
							
							Port ea10febd25 
							
						 
						
							2023-07-12 15:50:56 +02:00  
				
					
						
							
							
								 
						
							
								c3af91ce48 
								
							 
						 
						
							
							
								
								[Glitch] Fix filters not applying to explore tab  
							
							... 
							
							
							
							Port af54bf52c8 
							
						 
						
							2023-07-12 15:48:13 +02:00  
				
					
						
							
							
								 
						
							
								c699dc0908 
								
							 
						 
						
							
							
								
								[Glitch] Add `forward_to_domains` parameter to `POST /api/v1/reports`  
							
							... 
							
							
							
							Port c27b82a437 
							
						 
						
							2023-07-12 15:47:43 +02:00  
				
					
						
							
							
								 
						
							
								075887e1d6 
								
							 
						 
						
							
							
								
								Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-12 15:44:33 +02:00  
				
					
						
							
							
								 
						
							
								71f8c45c18 
								
							 
						 
						
							
							
								
								[Glitch] Change label and design of sensitive and unavailable media in web UI  
							
							... 
							
							
							
							Port 338a0e70cc 
							
						 
						
							2023-07-12 15:43:10 +02:00  
				
					
						
							
							
								 
						
							
								dd0002e1fe 
								
							 
						 
						
							
							
								
								Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/trends.rb`:
  Conflict due to glitch-soc's code splitting trends mailing depending on type.
  Ported upstream's changes. 
							
						 
						
							2023-07-12 15:38:35 +02:00  
				
					
						
							
							
								 
						
							
								c250b37f0a 
								
							 
						 
						
							
							
								
								[Glitch] Fix explore page being inaccessible when opted-out of trends in web UI  
							
							... 
							
							
							
							Port ceeb2b8c41 
							
						 
						
							2023-07-12 15:34:12 +02:00  
				
					
						
							
							
								 
						
							
								82eebd0482 
								
							 
						 
						
							
							
								
								Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream renamed an initial state parameter, where we had extra ones.
  Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
  Upstream wrapped database query in a block, we had extra database
  queries because of the DM timeline.
  Moved everything in the block. 
							
						 
						
							2023-07-12 15:27:32 +02:00  
				
					
						
							
							
								 
						
							
								9e311f95aa 
								
							 
						 
						
							
							
								
								[Glitch] simplify counters  
							
							... 
							
							
							
							Port e0d230fb37 
							
						 
						
							2023-07-12 15:18:41 +02:00  
				
					
						
							
							
								 
						
							
								5b9e43187c 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite `<ShortNumber />` as FC and TS  
							
							... 
							
							
							
							Port 20e85c0e83 
							
						 
						
							2023-07-12 15:17:18 +02:00  
				
					
						
							
							
								 
						
							
								55ea79165a 
								
							 
						 
						
							
							
								
								[Glitch] Convert `<DismissableBanner>` to Typescript  
							
							... 
							
							
							
							Port 4534498a8e 
							
						 
						
							2023-07-12 15:09:14 +02:00  
				
					
						
							
							
								 
						
							
								0bfa4a990f 
								
							 
						 
						
							
							
								
								[Glitch] Fix translate button position  
							
							... 
							
							
							
							Port 9f078e238d 
							
						 
						
							2023-07-12 15:05:24 +02:00  
				
					
						
							
							
								 
						
							
								7e54a30f06 
								
							 
						 
						
							
							
								
								Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-12 15:00:41 +02:00  
				
					
						
							
							
								 
						
							
								67055b0343 
								
							 
						 
						
							
							
								
								Fix import order inconsistencies ( #2289 )  
							
							
							
						 
						
							2023-07-12 15:00:10 +02:00  
				
					
						
							
							
								 
						
							
								ecd8e0d612 
								
							 
						 
						
							
							
								
								Update Stylelint ( #25819 )  
							
							
							
						 
						
							2023-07-12 12:31:23 +02:00  
				
					
						
							
							
								 
						
							
								1392f31ed8 
								
							 
						 
						
							
							
								
								Fix sounds not being loaded from assets host ( #25931 )  
							
							
							
						 
						
							2023-07-12 03:02:32 +02:00  
				
					
						
							
							
								 
						
							
								ca955ada0b 
								
							 
						 
						
							
							
								
								Use invariant colors on notification toasts ( #25919 )  
							
							
							
						 
						
							2023-07-11 23:30:21 +02:00  
				
					
						
							
							
								 
						
							
								ea10febd25 
								
							 
						 
						
							
							
								
								fix buttons showing inconsistent styles ( #25903 )  
							
							
							
						 
						
							2023-07-11 12:26:09 +02:00  
				
					
						
							
							
								 
						
							
								af54bf52c8 
								
							 
						 
						
							
							
								
								Fix filters not applying to explore tab ( #25887 )  
							
							
							
						 
						
							2023-07-10 19:33:07 +02:00  
				
					
						
							
							
								 
						
							
								c27b82a437 
								
							 
						 
						
							
							
								
								Add `forward_to_domains` parameter to `POST /api/v1/reports` ( #25866 )  
							
							
							
						 
						
							2023-07-10 18:26:56 +02:00  
				
					
						
							
							
								 
						
							
								338a0e70cc 
								
							 
						 
						
							
							
								
								Change label and design of sensitive and unavailable media in web UI ( #25712 )  
							
							
							
						 
						
							2023-07-08 20:05:33 +02:00  
				
					
						
							
							
								 
						
							
								41a505513f 
								
							 
						 
						
							
							
								
								Remove unused `missed_update` state ( #25832 )  
							
							
							
						 
						
							2023-07-08 20:02:14 +02:00  
				
					
						
							
							
								 
						
							
								a7ca33ad96 
								
							 
						 
						
							
							
								
								Add toast with option to open post after publishing in web UI ( #25564 )  
							
							
							
						 
						
							2023-07-08 20:01:08 +02:00  
				
					
						
							
							
								 
						
							
								a8edbcf963 
								
							 
						 
						
							
							
								
								Fix dropdowns being disabled for logged out users in web UI ( #25714 )  
							
							
							
						 
						
							2023-07-08 20:00:52 +02:00  
				
					
						
							
							
								 
						
							
								ceeb2b8c41 
								
							 
						 
						
							
							
								
								Fix explore page being inaccessible when opted-out of trends in web UI ( #25716 )  
							
							
							
						 
						
							2023-07-08 20:00:12 +02:00  
				
					
						
							
							
								 
						
							
								4534498a8e 
								
							 
						 
						
							
							
								
								Convert `<DismissableBanner>` to Typescript ( #25582 )  
							
							
							
						 
						
							2023-07-08 11:12:20 +02:00  
				
					
						
							
							
								 
						
							
								20e85c0e83 
								
							 
						 
						
							
							
								
								Rewrite `<ShortNumber />` as FC and TS ( #25492 )  
							
							
							
						 
						
							2023-07-08 11:11:58 +02:00  
				
					
						
							
							
								 
						
							
								e0d230fb37 
								
							 
						 
						
							
							
								
								simplify counters ( #25541 )  
							
							
							
						 
						
							2023-07-08 11:11:22 +02:00  
				
					
						
							
							
								 
						
							
								9f078e238d 
								
							 
						 
						
							
							
								
								Fix translate button position ( #25807 )  
							
							
							
						 
						
							2023-07-08 00:12:31 +02:00  
				
					
						
							
							
								 
						
							
								513078de7a 
								
							 
						 
						
							
							
								
								Fix incorrect secondary button size ( #2276 )  
							
							
							
						 
						
							2023-07-07 09:50:06 +02:00  
				
					
						
							
							
								 
						
							
								c0fa85b8dd 
								
							 
						 
						
							
							
								
								[Glitch] Fix regression of icon button colors in web UI  
							
							... 
							
							
							
							Port 69e124e2ed 
							
						 
						
							2023-07-05 13:31:26 +02:00  
				
					
						
							
							
								 
						
							
								4719d88117 
								
							 
						 
						
							
							
								
								[Glitch] Change button colors to increase hover/focus contrast and consistency  
							
							... 
							
							
							
							Port 54cb679c19 
							
						 
						
							2023-07-05 13:30:52 +02:00  
				
					
						
							
							
								 
						
							
								a117c953d0 
								
							 
						 
						
							
							
								
								[Glitch] Add button to see results for polls in web UI  
							
							... 
							
							
							
							Port b7910bc751 
							
						 
						
							2023-07-05 12:42:24 +02:00  
				
					
						
							
							
								 
						
							
								b3f209370b 
								
							 
						 
						
							
							
								
								[Glitch] Add canonical link tags in web UI  
							
							... 
							
							
							
							Port 000b835803 
							
						 
						
							2023-07-05 12:41:52 +02:00  
				
					
						
							
							
								 
						
							
								c6246807f5 
								
							 
						 
						
							
							
								
								[Glitch] Fix local live feeds does not expand  
							
							... 
							
							
							
							Port 6268188543 
							
						 
						
							2023-07-05 12:39:46 +02:00  
				
					
						
							
							
								 
						
							
								ac74374311 
								
							 
						 
						
							
							
								
								[Glitch] Add at-symbol prepended to mention span title  
							
							... 
							
							
							
							Port d9a5c1acfa 
							
						 
						
							2023-07-05 12:38:54 +02:00  
				
					
						
							
							
								 
						
							
								0a5271629c 
								
							 
						 
						
							
							
								
								[Glitch] Change labels of live feeds tabs in web UI  
							
							... 
							
							
							
							Port 54a10523e2 
							
						 
						
							2023-07-05 12:37:37 +02:00  
				
					
						
							
							
								 
						
							
								5de49e74d4 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-05 12:01:26 +02:00  
				
					
						
							
							
								 
						
							
								000b835803 
								
							 
						 
						
							
							
								
								Add canonical link tags in web UI ( #25715 )  
							
							
							
						 
						
							2023-07-05 11:25:27 +02:00  
				
					
						
							
							
								 
						
							
								b7910bc751 
								
							 
						 
						
							
							
								
								Add button to see results for polls in web UI ( #25726 )  
							
							
							
						 
						
							2023-07-05 10:32:04 +02:00  
				
					
						
							
							
								 
						
							
								182fd93a07 
								
							 
						 
						
							
							
								
								fix read more button overlapping thread line bug ( #25706 )  
							
							
							
						 
						
							2023-07-04 14:57:46 +02:00  
				
					
						
							
							
								 
						
							
								6268188543 
								
							 
						 
						
							
							
								
								Fix local live feeds does not expand ( #25694 )  
							
							
							
						 
						
							2023-07-04 00:37:57 +02:00  
				
					
						
							
							
								 
						
							
								d9a5c1acfa 
								
							 
						 
						
							
							
								
								Add at-symbol prepended to mention span title ( #25684 )  
							
							... 
							
							
							
							Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com> 
							
						 
						
							2023-07-03 22:58:10 +02:00  
				
					
						
							
							
								 
						
							
								54a10523e2 
								
							 
						 
						
							
							
								
								Change labels of live feeds tabs in web UI ( #25683 )  
							
							
							
						 
						
							2023-07-03 22:57:18 +02:00  
				
					
						
							
							
								 
						
							
								69e124e2ed 
								
							 
						 
						
							
							
								
								Fix regression of icon button colors in web UI ( #25679 )  
							
							
							
						 
						
							2023-07-03 16:51:04 +02:00  
				
					
						
							
							
								 
						
							
								ed15893eed 
								
							 
						 
						
							
							
								
								Add regex filter back to firehose ( #2266 )  
							
							... 
							
							
							
							* Add regex filter back to firehose
The regex filter will apply to all tabs and not be automatically applied when pinned.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Keep regex when pinned
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-03 15:41:50 +02:00  
				
					
						
							
							
								 
						
							
								54cb679c19 
								
							 
						 
						
							
							
								
								Change button colors to increase hover/focus contrast and consistency ( #25677 )  
							
							
							
						 
						
							2023-07-03 11:32:31 +02:00  
				
					
						
							
							
								 
						
							
								b422b5eebd 
								
							 
						 
						
							
							
								
								Fix showing local only toots in "All" ( #2265 )  
							
							... 
							
							
							
							* Fix warnings about missing dependency in hooks
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Add `allowLocalOnly` to timelineId
Without this local-only toots will never be loaded.
feedType is checked to be public to not show local-only toots in the "Remote" tab.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-03 07:00:38 +02:00  
				
					
						
							
							
								 
						
							
								9f3c3f5209 
								
							 
						 
						
							
							
								
								Show local-only posts in “All” by default, and add back option to toggle it  
							
							
							
						 
						
							2023-07-02 20:28:02 +02:00  
				
					
						
							
							
								 
						
							
								587ddc2c7f 
								
							 
						 
						
							
							
								
								[Glitch] Prevent duplicate concurrent calls of `/api/*/instance` in web UI  
							
							... 
							
							
							
							Port 5b46345459 
							
						 
						
							2023-07-02 12:00:03 +02:00  
				
					
						
							
							
								 
						
							
								c49e339c89 
								
							 
						 
						
							
							
								
								[Glitch] Change dropdown icon above compose form from ellipsis to bars in web UI  
							
							... 
							
							
							
							Port 0512537eb6 
							
						 
						
							2023-07-02 11:59:31 +02:00  
				
					
						
							
							
								 
						
							
								7cc2c1be29 
								
							 
						 
						
							
							
								
								[Glitch] Change local and federated timelines to be in a single firehose column  
							
							... 
							
							
							
							Port cea9db5a0b 
							
						 
						
							2023-07-02 11:58:51 +02:00  
				
					
						
							
							
								 
						
							
								eb1cb8224a 
								
							 
						 
						
							
							
								
								[Glitch] Use an Immutable Record as the root state  
							
							... 
							
							
							
							Port 78ba12f0bf 
							
						 
						
							2023-07-02 11:55:34 +02:00  
				
					
						
							
							
								 
						
							
								2ba4773ebe 
								
							 
						 
						
							
							
								
								[Glitch] Fix onboarding prompt being displayed because of disconnection gaps  
							
							... 
							
							
							
							Port 9934949fc4 
							
						 
						
							2023-07-02 11:55:08 +02:00  
				
					
						
							
							
								 
						
							
								b75aa6b819 
								
							 
						 
						
							
							
								
								[Glitch] Remove the search button from UI header when logged out  
							
							... 
							
							
							
							Port 285a691936 
							
						 
						
							2023-07-02 11:54:47 +02:00  
				
					
						
							
							
								 
						
							
								44e98a2740 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-02 11:49:08 +02:00  
				
					
						
							
							
								 
						
							
								5b46345459 
								
							 
						 
						
							
							
								
								Prevent duplicate concurrent calls of `/api/*/instance` in web UI ( #25663 )  
							
							
							
						 
						
							2023-07-02 11:12:16 +02:00  
				
					
						
							
							
								 
						
							
								0512537eb6 
								
							 
						 
						
							
							
								
								Change dropdown icon above compose form from ellipsis to bars in web UI ( #25661 )  
							
							
							
						 
						
							2023-07-02 10:39:55 +02:00  
				
					
						
							
							
								 
						
							
								cea9db5a0b 
								
							 
						 
						
							
							
								
								Change local and federated timelines to be in a single firehose column ( #25641 )  
							
							
							
						 
						
							2023-07-02 00:05:10 +02:00  
				
					
						
							
							
								 
						
							
								78ba12f0bf 
								
							 
						 
						
							
							
								
								Use an Immutable Record as the root state ( #25584 )  
							
							
							
						 
						
							2023-06-30 17:03:25 +02:00  
				
					
						
							
							
								 
						
							
								9934949fc4 
								
							 
						 
						
							
							
								
								Fix onboarding prompt being displayed because of disconnection gaps ( #25617 )  
							
							
							
						 
						
							2023-06-30 16:32:12 +02:00  
				
					
						
							
							
								 
						
							
								285a691936 
								
							 
						 
						
							
							
								
								Remove the search button from UI header when logged out ( #25631 )  
							
							
							
						 
						
							2023-06-28 14:57:51 +02:00  
				
					
						
							
							
								 
						
							
								c43cfd2406 
								
							 
						 
						
							
							
								
								[Glitch] Improve dismissable banner buttons when they dont fit on 1 line  
							
							... 
							
							
							
							Port ae30a60b1f 
							
						 
						
							2023-06-27 13:25:21 +02:00