~cytrogen/masto-fe

ref: d7254bd3327c5ad208b7f74aade749234441b3bc masto-fe/app/lib d---------
fde89a8f — Claire 2 years ago
Merge pull request #2426 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 57f592fed50747f3c97718a2761e17bafe6c8698
abdb5884 — Claire 2 years ago
Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream
3de6dcf6 — Claire 2 years ago
Add redirection on `/deck` URLs for logged-out users (#27128)

4aaaf0dd — Renaud Chaput 2 years ago
Fix the search documentation URL in system checks (#27036)

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
eeab3560 — Claire 2 years ago
Merge pull request from GHSA-v3xf-c9qf-j667

94893cf2 — Claire 2 years ago
Merge pull request from GHSA-hcqf-fw2r-52g4

* Revert "Fix request URL normalisation for bare domain and 8-bit characters (#26285)"

This reverts commit 8891d8945d837f0da16a3a5aa2dc9783e39b0acd.

* Revert "Do not normalize URL before fetching it (#26219)"

This reverts commit fd284311e79854d6bc2901a9d9363ba9e7e00513.
743fede5 — Claire 2 years ago
Merge pull request #2406 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 6273416292090b2f6bfda33f070cea325a1759df
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.
08b495d9 — Claire 2 years ago
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
5d8c65f2 — Claire 2 years ago
Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream
3ca94f6d — Claire 2 years ago
Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' into glitch-soc/merge-upstream
62734162 — Claire 2 years ago
Fix post edits not being forwarded as expected (#26936)

3a679844 — Eugen Rochko 2 years ago
Fix `account_id`, `max_id` and `min_id` params not working in search (#26847)

a90b0056 — Eugen Rochko 2 years ago
Fix `#hashtag` matching on individual components in search (#26835)

1f99d862 — Claire 2 years ago
Fix blocked domain appears from account feed (#26823)

Co-authored-by: Jeong Arm <kjwonmail@gmail.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
b83e4875 — Claire 2 years ago
Fix moderator rights inconsistencies (#26729)

223f9ca6 — Claire 2 years ago
Fix crash when encountering invalid URL (#26814)

a1df9fdb — Claire 2 years ago
Merge pull request #2397 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
Next