~cytrogen/masto-fe

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
a83615ed — renovate[bot] 2 years ago
Update eslint (non-major) (#26954)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
0f3f9b61 — Eugen Rochko 2 years ago
Change video bitrate to always fit within size limit (#26970)

70cae19b — Claire 2 years ago
Fix hashtag bar being sometimes incorrectly hidden (#26960)

fbfceb9c — Emelia Smith 2 years ago
Add additional metrics for streaming (#26945)

6eb6209d — renovate[bot] 2 years ago
Update DefinitelyTyped types (non-major) (#26953)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
c6a535a1 — renovate[bot] 2 years ago
Update dependency node to 20.7 (#26963)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
6f9f9011 — renovate[bot] 2 years ago
Update dependency postcss to v8.4.30 (#26964)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
67eaaa4b — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#26966)

Co-authored-by: GitHub Actions <noreply@github.com>
200312e8 — Rob Thomas 2 years ago
Fix crash when viewing a moderation appeal and the moderator account has been deleted (#25900)

Co-authored-by: Claire <claire.github-309c@sitedethib.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)

392c07f2 — Claire 2 years ago
Fix `Setting.authorized_fetch` not being properly taken into consideration (#26958)

8b5c61ae — renovate[bot] 2 years ago
Update formatjs monorepo (#26955)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Next