[Glitch] Add support for custom sign-up URLs Port ca66e61b933b97a74f1f79b820a2fa3bd5ffc5f2 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Fix video player offering to expand in a lightbox when it's in an iframe Port 100840c06e5c771524cb2ef55dbb99b077984911 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream
[Glitch] Use JSX syntax for Fragments Port 5a16bd7bf4591feb852364da9b84407438c9b7d6 to glitch-soc
Merge commit '5a16bd7bf4591feb852364da9b84407438c9b7d6' into glitch-soc/merge-upstream
[Glitch] Use the new JSX transform everywhere Port 8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7 to glitch-soc
Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream
Merge pull request #2236 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes up to e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3
fixup! [Glitch] Upgrade to React 18
Fix glitch-soc-only tests being broken because of test refactor
[Glitch] Rewrite `<TimelineHint />` as FC and TS Port 9a472efe7c21447ce4e246bacff5a857a341e4f3 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Rewrite `<Skeleton/>` as FC and TS Port 8066118d1f558ed9c53d1c775a78553c6167161b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Allow scripts in post embed previews Port 711a03766032a94e0b409f8a545770bc90c14f61 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream
[Glitch] Upgrade to React 18 Port 8d6aea33260dedeacb3d22ac1a6d2f9cc3856a5e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge commit '8d6aea33260dedeacb3d22ac1a6d2f9cc3856a5e' into glitch-soc/merge-upstream
Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream
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.
[Glitch] Add polling and automatic redirection to `/start` on email confirmation Port e60414792d86a99c0f401f3c1bab92ee37835d39 to glitch-soc
Merge commit 'e60414792d86a99c0f401f3c1bab92ee37835d39' into glitch-soc/merge-upstream