~cytrogen/masto-fe

ref: d35cbe44734ec55effc6a0983e9fbb6d120ab945 masto-fe/spec d---------
c04b08a3 — Claire 2 years ago
Merge pull request #2419 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
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.
828eebad — Claire 2 years ago
Add `hide_collections`, `discoverable` and `indexable` attributes to credentials API (#26998)

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
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.
5ed72f66 — Claire 2 years ago
Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream
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
62734162 — Claire 2 years ago
Fix post edits not being forwarded as expected (#26936)

20666482 — Robert R George 2 years ago
Added admin api for managing tags (#26872)

4d9186a4 — jsgoldstein 2 years ago
Add search tests (#26703)

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

81caafbe — Claire 2 years ago
Fix performances of profile directory (#26842)

355e3fb5 — Claire 2 years ago
Simplify `Account.by_recent_status` and `Account.by_recent_sign_in` scopes (#26840)

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)

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

Merge upstream changes
Next