~cytrogen/masto-fe

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
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>
04623e2f — renovate[bot] 2 years ago
Update babel monorepo to v7.22.20 (#26946)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
743fede5 — Claire 2 years ago
Merge pull request #2406 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 6273416292090b2f6bfda33f070cea325a1759df
60ecca6a — Claire 2 years ago
Revert tabs background color so they are easier to visually distinguish from contents
d3f14dd7 — Claire 2 years ago
[Glitch] Fix dismiss button overlapping with text in dismissable banners

Port 2a4fcc51fd44cab3e837e43e8f8dd84fefb97729 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
dfc05ec8 — Claire 2 years ago
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.
Next