~cytrogen/masto-fe

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.
0fbefb6f — Eugen Rochko 2 years ago
Update AUTHORS.md (#27018)

8acc7543 — Claire 2 years ago
Change S3 checksum mode to be disabled by default (#27007)

bb6c59a3 — aaaaalbert 2 years ago
Fix #27010: update the copyright year in README (#27016)

5356ddbc — Claire 2 years ago
Fix search results temporarily disappearing while scrolling and loading more results (#27014)

890e3347 — Claire 2 years ago
Add migration tests for negative settings (#27012)

c74670b4 — renovate[bot] 2 years ago
Update dependency glob to v10.3.5 (#27002)

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

Co-authored-by: GitHub Actions <noreply@github.com>
4ed9d9ca — renovate[bot] 2 years ago
Update dependency autoprefixer to v10.4.16 (#27000)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
828eebad — Claire 2 years ago
Add `hide_collections`, `discoverable` and `indexable` attributes to credentials API (#26998)

61fe25fe — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#26988)

Co-authored-by: GitHub Actions <noreply@github.com>
889c4d4b — Claire 2 years ago
Update changelog (#26992)

5efa6ac7 — Claire 2 years ago
Merge pull request #2417 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
6a9e93ae — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
abcc0b38 — Claire 2 years ago
Fix incorrect PostgreSQL version check (#26979)

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
f4b780ba — Claire 2 years ago
Bump version to v4.2.0-rc2 (#26974)

eeab3560 — Claire 2 years ago
Merge pull request from GHSA-v3xf-c9qf-j667

ff32475f — Claire 2 years ago
Merge pull request from GHSA-2693-xr3m-jhqr

Next