Merge branch 'main' into glitch-soc/merge-upstream
Fix Web UI making duplicate search queries when scrolling (#26959)
Fix error in Web UI when server rules cannot be fetched (#26957)
Fix `Setting.authorized_fetch` not being properly taken into consideration (#26958)
Update formatjs monorepo (#26955) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Update babel monorepo to v7.22.20 (#26946) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Merge pull request #2406 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes up to 6273416292090b2f6bfda33f070cea325a1759df
Revert tabs background color so they are easier to visually distinguish from contents
[Glitch] Fix dismiss button overlapping with text in dismissable banners Port 2a4fcc51fd44cab3e837e43e8f8dd84fefb97729 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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.
Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream
[Glitch] Fix notification permissions being requested immediately after login Port 520b57047403f8819206c938bdc2c93a16ec5f16 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Fix recent search items not handling overflows correctly Port d2cfcdd09efe4914e8956d1b2211114bc7c4179a to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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.
[Glitch] Add recent searches in web UI Port 9b2bc3d1de301c686208b43a8efef5bc808f8e4e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Fix confusing behavior of mute button and volume slider in web UI Port 91040da871dba71a6eb05cd7ae3ed8b9b255680c to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Fix mute button and volume slider feeling disconnected in web UI Port f3a2e15f8e0274b5fdf28e3ce062084dc142cb2e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Change onboarding prompt to use full width of banner in web UI Port 1f141f656dc3fd2b3af5d6edde331bac31bb6526 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
[Glitch] Add some information about Full-text search being disabled in search popout Port 9c1ef8302abe52f6b41eeafadc1bc30dfa079e18 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>