Fix explore prompt appearing because of posts being received out of order (#27211)
Fix explore prompt sometimes showing up when the home TL is loading (#27062)
Fix width of large text icon buttons (#27127)
Convert `dropdown_menu` state to Typescript (#25585)
Merge pull request #2419 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
Upstream changed their README, we have a completely different one.
Kept our version.
Fix search results temporarily disappearing while scrolling and loading more results (#27014)
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.