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  
				
					
						
							
							
								 
						
							
								3425b99a9a 
								
							 
						 
						
							
							
								
								Merge pull request  #2569  from ClearlyClaire/glitch-soc/ports/column-changes  
							
							... 
							
							
							
							Port upstream's column refactor of column and column header code 
							
						 
						
							2024-01-14 16:31:46 +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  
				
					
						
							
							
								 
						
							
								04f786abd0 
								
							 
						 
						
							
							
								
								Merge pull request  #2568  from ClearlyClaire/glitch-soc/ports/dreaded-icon-change-please-save-me  
							
							... 
							
							
							
							Port upstream's icon changes 
							
						 
						
							2024-01-14 14:31:16 +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  
				
					
						
							
							
								 
						
							
								b7eaae4acd 
								
							 
						 
						
							
							
								
								Merge pull request  #2565  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes up to cd37048439 
							
						 
						
							2024-01-13 14:04:34 +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  
				
					
						
							
							
								 
						
							
								e76b7ebe89 
								
							 
						 
						
							
							
								
								Merge pull request  #2563  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes up to 2954279e9c 
							
						 
						
							2024-01-12 13:19:14 +01:00  
				
					
						
							
							
								 
						
							
								cd37048439 
								
							 
						 
						
							
							
								
								Move followable_by coverage to suggestions ( #28697 )  
							
							
							
						 
						
							2024-01-12 09:11:34 +00:00  
				
					
						
							
							
								 
						
							
								32eeca9c7b 
								
							 
						 
						
							
							
								
								Refresh instance counts in spec (fixes intermittent failure) ( #28698 )  
							
							
							
						 
						
							2024-01-12 09:10:37 +00:00  
				
					
						
							
							
								 
						
							
								923fc83190 
								
							 
						 
						
							
							
								
								Improve `lint-staged` config ( #28704 )  
							
							
							
						 
						
							2024-01-12 09:09:57 +00:00  
				
					
						
							
							
								 
						
							
								575ab085be 
								
							 
						 
						
							
							
								
								Disable `Rails/ApplicationController` for `HealthController` ( #28705 )  
							
							
							
						 
						
							2024-01-12 09:08:17 +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  
				
					
						
							
							
								 
						
							
								cbc951627c 
								
							 
						 
						
							
							
								
								Merge pull request  #2562  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes up to 0a7cff53c2 
							
						 
						
							2024-01-11 18:41:33 +01:00  
				
					
						
							
							
								 
						
							
								8b26614fa7 
								
							 
						 
						
							
							
								
								Combine results include check in spec/models/account ( #28471 )  
							
							
							
						 
						
							2024-01-11 16:17:45 +00:00  
				
					
						
							
							
								 
						
							
								185c806d69 
								
							 
						 
						
							
							
								
								Extract spec helper for verifing to/from public AP collection namespace ( #28472 )  
							
							
							
						 
						
							2024-01-11 16:17:21 +00:00  
				
					
						
							
							
								 
						
							
								b6e353537b 
								
							 
						 
						
							
							
								
								Add new emojis from `jdecked/twemoji` 15.0 ( #28404 )  
							
							
							
						 
						
							2024-01-11 16:15:08 +00:00  
				
					
						
							
							
								 
						
							
								22d866ee1b 
								
							 
						 
						
							
							
								
								Update dependency @material-symbols/svg-600 to v0.14.4 ( #28603 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2024-01-11 15:43:45 +00:00  
				
					
						
							
							
								 
						
							
								2954279e9c 
								
							 
						 
						
							
							
								
								Remove double subject call in `api/v1/admin/trends/links/links` spec ( #28695 )  
							
							
							
						 
						
							2024-01-11 15:13:11 +00:00  
				
					
						
							
							
								 
						
							
								95bd46d32a 
								
							 
						 
						
							
							
								
								Remove double subject call in `api/v1/admin/ip_blocks` spec ( #28696 )  
							
							
							
						 
						
							2024-01-11 15:11:57 +00:00  
				
					
						
							
							
								 
						
							
								b68f185573 
								
							 
						 
						
							
							
								
								Reduce `LineLength` for `react_component` helper in views/admin ( #28694 )  
							
							
							
						 
						
							2024-01-11 13:14:24 +00:00  
				
					
						
							
							
								 
						
							
								782a0165c7 
								
							 
						 
						
							
							
								
								Update dependency node to 20.11 ( #28670 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2024-01-11 12:48:01 +00:00  
				
					
						
							
							
								 
						
							
								08304075be 
								
							 
						 
						
							
							
								
								Fix old glitch-soc migration using removed `add_column_with_default` helper  
							
							
							
						 
						
							2024-01-11 13:26:17 +01:00  
				
					
						
							
							
								 
						
							
								23d8bd8ce1 
								
							 
						 
						
							
							
								
								Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-11 13:24:20 +01:00  
				
					
						
							
							
								 
						
							
								5dcb8d92c3 
								
							 
						 
						
							
							
								
								Fix lint issue in glitch-soc-only setting form  
							
							
							
						 
						
							2024-01-11 13:22:39 +01:00  
				
					
						
							
							
								 
						
							
								63acdebc5d 
								
							 
						 
						
							
							
								
								Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict because of a code style fix, while some changed lines are
  absent from glitch-soc.
  Ignored the deleted lines. 
							
						 
						
							2024-01-11 13:17:13 +01: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