a0bc0619ca 
								
							 
						 
						
							
							
								
								[Glitch] Use JSX syntax for Fragments  
							
							... 
							
							
							
							Port 5a16bd7bf4 
							
						 
						
							2023-05-28 14:56:24 +02:00  
				
					
						
							
							
								 
						
							
								8278907ff7 
								
							 
						 
						
							
							
								
								Merge commit '5a16bd7bf4591feb852364da9b84407438c9b7d6' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-05-28 14:32:26 +02:00  
				
					
						
							
							
								 
						
							
								6001f5ff36 
								
							 
						 
						
							
							
								
								[Glitch] Use the new JSX transform everywhere  
							
							... 
							
							
							
							Port 8f66126b10 
							
						 
						
							2023-05-28 14:18:43 +02:00  
				
					
						
							
							
								 
						
							
								9381f78166 
								
							 
						 
						
							
							
								
								Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-05-28 13:55:30 +02:00  
				
					
						
							
							
								 
						
							
								0222df6047 
								
							 
						 
						
							
							
								
								Merge pull request  #2236  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes up to e387175fc9 
							
						 
						
							2023-05-27 11:28:10 +02:00  
				
					
						
							
							
								 
						
							
								1347ca6eb0 
								
							 
						 
						
							
							
								
								fixup! [Glitch] Upgrade to React 18  
							
							
							
						 
						
							2023-05-26 18:44:18 +02:00  
				
					
						
							
							
								 
						
							
								55785b1603 
								
							 
						 
						
							
							
								
								Extract methods for user de-duping in maintenance CLI ( #25117 )  
							
							
							
						 
						
							2023-05-26 09:42:16 +02:00  
				
					
						
							
							
								 
						
							
								0f2c16ac4b 
								
							 
						 
						
							
							
								
								Fix RSpec/NoExpectationExample cop ( #25103 )  
							
							
							
						 
						
							2023-05-26 09:41:12 +02:00  
				
					
						
							
							
								 
						
							
								61f6cd45e3 
								
							 
						 
						
							
							
								
								Fix glitch-soc-only tests being broken because of test refactor  
							
							
							
						 
						
							2023-05-26 00:10:57 +02:00  
				
					
						
							
							
								 
						
							
								60c7e559d8 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite `<TimelineHint />` as FC and TS  
							
							... 
							
							
							
							Port 9a472efe7c 
							
						 
						
							2023-05-25 23:58:54 +02:00  
				
					
						
							
							
								 
						
							
								6746e5d430 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite `<Skeleton/>` as FC and TS  
							
							... 
							
							
							
							Port 8066118d1f 
							
						 
						
							2023-05-25 23:55:36 +02:00  
				
					
						
							
							
								 
						
							
								892b3c16f5 
								
							 
						 
						
							
							
								
								[Glitch] Allow scripts in post embed previews  
							
							... 
							
							
							
							Port 711a037660 
							
						 
						
							2023-05-25 23:52:04 +02:00  
				
					
						
							
							
								 
						
							
								e2ab9d4dad 
								
							 
						 
						
							
							
								
								Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-05-25 23:47:28 +02:00  
				
					
						
							
							
								 
						
							
								3b375ee395 
								
							 
						 
						
							
							
								
								[Glitch] Upgrade to React 18  
							
							... 
							
							
							
							Port 8d6aea3326 
							
						 
						
							2023-05-25 23:45:01 +02:00  
				
					
						
							
							
								 
						
							
								45d7358100 
								
							 
						 
						
							
							
								
								Merge commit '8d6aea33260dedeacb3d22ac1a6d2f9cc3856a5e' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-05-25 23:18:57 +02:00  
				
					
						
							
							
								 
						
							
								2e02d03524 
								
							 
						 
						
							
							
								
								Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-05-25 22:59:30 +02:00  
				
					
						
							
							
								 
						
							
								ad1098970b 
								
							 
						 
						
							
							
								
								Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
  Upstream merged our captcha code, but there are some
  conflicts due to glitch-soc's theming system.
- `app/views/admin/settings/registrations/show.html.haml`:
  Upstream merged our captcha code, but there are some
  conflicts due to glitch-soc's theming system.
Additional changes:
- `Gemfile`:
  Upstream added hcaptcha dependency in another place in the file.
- `config/settings.yml`:
  Upstream added the `captcha_enabled` setting in another place in the file. 
							
						 
						
							2023-05-25 22:49:18 +02:00  
				
					
						
							
							
								 
						
							
								ba73f0ea3a 
								
							 
						 
						
							
							
								
								[Glitch] Add polling and automatic redirection to `/start` on email confirmation  
							
							... 
							
							
							
							Port e60414792d 
							
						 
						
							2023-05-25 22:37:14 +02:00  
				
					
						
							
							
								 
						
							
								f959f6cdbb 
								
							 
						 
						
							
							
								
								Merge commit 'e60414792d86a99c0f401f3c1bab92ee37835d39' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-05-25 22:18:55 +02:00  
				
					
						
							
							
								 
						
							
								b0ec3bfcf9 
								
							 
						 
						
							
							
								
								[Glitch] Fix being unable to load past a full page of filtered posts in Home timeline  
							
							... 
							
							
							
							Port 7b54e47d03 
							
						 
						
							2023-05-25 22:00:07 +02:00  
				
					
						
							
							
								 
						
							
								4a1f4cb6a2 
								
							 
						 
						
							
							
								
								[Glitch] Fix UI crash in moderation interface when opening the media modal  
							
							... 
							
							
							
							Port 5241f7b2fd 
							
						 
						
							2023-05-25 21:57:19 +02:00  
				
					
						
							
							
								 
						
							
								d728222121 
								
							 
						 
						
							
							
								
								[Glitch] Change "Sign in" to "Login"  
							
							... 
							
							
							
							Port 3869e8c210 
							
						 
						
							2023-05-25 21:52:37 +02:00  
				
					
						
							
							
								 
						
							
								602ae7f2f6 
								
							 
						 
						
							
							
								
								[Glitch] Fix videos being improperly positioned on safari  
							
							... 
							
							
							
							Port 0eed06073f 
							
						 
						
							2023-05-25 21:47:48 +02:00  
				
					
						
							
							
								 
						
							
								e6a7cfd12e 
								
							 
						 
						
							
							
								
								[Glitch] Add stricter ESLint rules for Typescript files  
							
							... 
							
							
							
							Port 5eeb40bdbe 
							
						 
						
							2023-05-25 21:43:19 +02:00  
				
					
						
							
							
								 
						
							
								e8fc445e14 
								
							 
						 
						
							
							
								
								[Glitch] Enable ESLint react/no-deprecated  
							
							... 
							
							
							
							Port b878e3d8df 
							
						 
						
							2023-05-25 21:07:38 +02:00  
				
					
						
							
							
								 
						
							
								79c43b61a6 
								
							 
						 
						
							
							
								
								[Glitch] Disable RTK safety middlewares  
							
							... 
							
							
							
							Port 6f8db56a01 
							
						 
						
							2023-05-25 20:57:42 +02:00  
				
					
						
							
							
								 
						
							
								7d9b7f28b8 
								
							 
						 
						
							
							
								
								[Glitch] Add type annotation for DisplayName component  
							
							... 
							
							
							
							Port 349cae0b57 
							
						 
						
							2023-05-25 20:57:07 +02:00  
				
					
						
							
							
								 
						
							
								ea1f9b4223 
								
							 
						 
						
							
							
								
								[Glitch] Rename Image component to ServerHeroImage  
							
							... 
							
							
							
							Port ab7716cff4 
							
						 
						
							2023-05-25 20:44:09 +02:00  
				
					
						
							
							
								 
						
							
								b735954971 
								
							 
						 
						
							
							
								
								Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/webpack/generateLocalePacks.js`:
  A dependency update changed how functions are imported.
  Also, some linting fixes not applicable to glitch-soc. 
							
						 
						
							2023-05-25 20:43:25 +02:00  
				
					
						
							
							
								 
						
							
								646cde71d1 
								
							 
						 
						
							
							
								
								Change captcha to be presented even for invited users ( #2227 )  
							
							
							
						 
						
							2023-05-25 20:13:18 +02:00  
				
					
						
							
							
								 
						
							
								69903b5830 
								
							 
						 
						
							
							
								
								Fix margins around small avatars (reply indicators, autocompletion suggestion) ( #2231 )  
							
							... 
							
							
							
							Fix regression from #2156  
							
						 
						
							2023-05-25 19:40:33 +02:00  
				
					
						
							
							
								 
						
							
								cb6f445b90 
								
							 
						 
						
							
							
								
								Greatly simplify history management code ( #2230 )  
							
							... 
							
							
							
							Fixes  #2220 
This drops the ability to shift+click on “Back” to get back to a pinned
column, but that was inconsistent, broken, and undocumented.
This also brings us slightly closer to upstream. 
						
							2023-05-25 19:14:51 +02:00  
				
					
						
							
							
								 
						
							
								2f2f74efd8 
								
							 
						 
						
							
							
								
								[Glitch] Update style of captcha confirmation page to match sign-up form ( #2226 )  
							
							
							
						 
						
							2023-05-25 19:14:37 +02:00  
				
					
						
							
							
								 
						
							
								38c6216082 
								
							 
						 
						
							
							
								
								Rewrite actions/modal and reducers/modal with typescript ( #24833 )  
							
							
							
						 
						
							2023-05-25 15:42:37 +02:00  
				
					
						
							
							
								 
						
							
								4197b5e4c8 
								
							 
						 
						
							
							
								
								Fix export style of `<LoadGap />` based on `<Domain />` ( #25128 )  
							
							
							
						 
						
							2023-05-25 13:03:37 +02:00  
				
					
						
							
							
								 
						
							
								1d588d58f1 
								
							 
						 
						
							
							
								
								Improve various queries against account domains ( #25126 )  
							
							
							
						 
						
							2023-05-25 09:27:16 +02:00  
				
					
						
							
							
								 
						
							
								e58c36d308 
								
							 
						 
						
							
							
								
								Update inconsistent `defaultMessage` ( #25114 )  
							
							
							
						 
						
							2023-05-24 12:38:50 +02:00  
				
					
						
							
							
								 
						
							
								391c089d0d 
								
							 
						 
						
							
							
								
								Bump eslint from 8.40.0 to 8.41.0 ( #25081 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-05-24 12:38:08 +02:00  
				
					
						
							
							
								 
						
							
								384345b0de 
								
							 
						 
						
							
							
								
								Add CLI Base class for command line code ( #25106 )  
							
							
							
						 
						
							2023-05-24 11:55:40 +02:00  
				
					
						
							
							
								 
						
							
								d2e5430d4a 
								
							 
						 
						
							
							
								
								Fix RSpec/ExpectChange cop ( #25101 )  
							
							
							
						 
						
							2023-05-24 11:23:40 +02:00  
				
					
						
							
							
								 
						
							
								1caa5ff39e 
								
							 
						 
						
							
							
								
								Change share action from being in action bar to being in dropdown in web UI ( #25105 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-05-24 11:04:43 +02:00  
				
					
						
							
							
								 
						
							
								f7d93f95e1 
								
							 
						 
						
							
							
								
								Bump capistrano from 3.17.2 to 3.17.3 ( #25113 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-05-24 10:52:10 +02:00  
				
					
						
							
							
								 
						
							
								2e3b1ef13e 
								
							 
						 
						
							
							
								
								Bump eslint-plugin-jsdoc from 44.2.4 to 44.2.5 ( #25112 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-05-24 10:47:50 +02:00  
				
					
						
							
							
								 
						
							
								ac98e9fdbc 
								
							 
						 
						
							
							
								
								Bump fastimage from 2.2.6 to 2.2.7 ( #25111 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-05-24 10:46:10 +02:00  
				
					
						
							
							
								 
						
							
								342daeb389 
								
							 
						 
						
							
							
								
								Update `react-redux` ( #25110 )  
							
							
							
						 
						
							2023-05-24 10:23:17 +02:00  
				
					
						
							
							
								 
						
							
								40b948a1fb 
								
							 
						 
						
							
							
								
								Fix `null` signUp URL handling from  #25014  ( #25108 )  
							
							
							
						 
						
							2023-05-24 09:49:26 +02:00  
				
					
						
							
							
								 
						
							
								7336f3648b 
								
							 
						 
						
							
							
								
								Rewrite `<LoadGap />` as FC and TS ( #25042 )  
							
							
							
						 
						
							2023-05-24 09:20:39 +02:00  
				
					
						
							
							
								 
						
							
								d27216dc46 
								
							 
						 
						
							
							
								
								Enforce import order with ESLint ( #25096 )  
							
							
							
						 
						
							2023-05-23 17:15:17 +02:00  
				
					
						
							
							
								 
						
							
								b896b16cb3 
								
							 
						 
						
							
							
								
								Fix RSpec/PredicateMatcher cop ( #25102 )  
							
							
							
						 
						
							2023-05-23 16:49:11 +02:00  
				
					
						
							
							
								 
						
							
								778e4a7bf7 
								
							 
						 
						
							
							
								
								Fix RSpec/ExpectInHook cop ( #25100 )  
							
							
							
						 
						
							2023-05-23 16:40:21 +02:00