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.
Fix hashtag bar being sometimes incorrectly hidden (#26960)
Merge branch 'main' into glitch-soc/merge-upstream
Fix error in Web UI when server rules cannot be fetched (#26957)
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.
Convert `actions/account_notes` into Typescript (#26601)
Fix confusing behavior of mute button and volume slider in web UI (#26860)
Add recent searches in web UI (#26834)
Fix mute button and volume slider feeling disconnected in web UI (#26827)
Add some information about Full-text search being disabled in search popout (#26756)
Add `in:` to search popout in web UI (#26807)
Remove obfuscation of reply count in web UI (#26768)
Add infinite scrolling for search results in web UI (#26784)
Improve interaction modal error handling (#26795)