~cytrogen/masto-fe

ref: f05985f8ece0779e4be29cc10c4c9399661e47a0 masto-fe/app/javascript d---------
f05985f8 — Claire 2 years ago 
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our version.
5356ddbc — Claire 2 years ago 
Fix search results temporarily disappearing while scrolling and loading more results (#27014)
effe4728 — github-actions[bot] 2 years ago 
New Crowdin Translations (automated) (#27005)

Co-authored-by: GitHub Actions <noreply@github.com>
61fe25fe — github-actions[bot] 2 years ago 
New Crowdin Translations (automated) (#26988)

Co-authored-by: GitHub Actions <noreply@github.com>
57f47e50 — Claire 2 years ago 
Merge pull request #2416 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
f546b0c9 — Claire 2 years ago 
Merge branch 'main' into glitch-soc/merge-upstream
73ecc4de — github-actions[bot] 2 years ago 
New Crowdin Translations (automated) (#26978)

Co-authored-by: GitHub Actions <noreply@github.com>
6f658680 — Claire 2 years ago 
Merge pull request #2413 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to a83615edc9fc1ce3363ddcf1fc676806421a5f65
22ee4e05 — Claire 2 years ago 
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.
1e87575b — Claire 2 years ago 
Merge commit '6eb6209d02514c5271238a23601be643c7b9f52d' into glitch-soc/merge-upstream
7ea5a2c8 — Claire 2 years ago 
Merge pull request #2411 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 9688c5fcc4659491fa74783f616b1c23583398f1
70cae19b — Claire 2 years ago 
Fix hashtag bar being sometimes incorrectly hidden (#26960)
67eaaa4b — github-actions[bot] 2 years ago 
New Crowdin Translations (automated) (#26966)

Co-authored-by: GitHub Actions <noreply@github.com>
1b4902fa — github-actions[bot] 2 years ago 
New Crowdin Translations (automated) (#26913)

Co-authored-by: GitHub Actions <noreply@github.com>
31dedf46 — Claire 2 years ago 
[Glitch] Fix Web UI making duplicate search queries when scrolling

Port 4c1518a6f3b2b9b71833175bc7afc61cd6a95202 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
f61e29cc — Claire 2 years ago 
[Glitch] Fix error in Web UI when server rules cannot be fetched

Port 893755f4cb8d88fc58e96f34b3bd30fa69365726 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
9688c5fc — Claire 2 years ago 
Merge branch 'main' into glitch-soc/merge-upstream
4c1518a6 — Claire 2 years ago 
Fix Web UI making duplicate search queries when scrolling (#26959)
893755f4 — Claire 2 years ago 
Fix error in Web UI when server rules cannot be fetched (#26957)
743fede5 — Claire 2 years ago 
Merge pull request #2406 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 6273416292090b2f6bfda33f070cea325a1759df
Next