~cytrogen/masto-fe

452f15be — Claire 2 years ago
Move glitch-soc's “Hide followers count” setting to “Show followers count” under “Privacy and reach” tab
c053bfc4 — Claire 2 years ago
[Glitch] Fix “legal” report category not showing up in moderation interface

Port 0446394465c505660c4b29185980e58a040da037 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
10404aec — Claire 2 years ago
Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream
245fe855 — Claire 2 years ago
[Glitch] Fix unfollow icon styling in advanced column

Port d9c21293aa6e105cedeff6b5e469af40a20909d9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2126812f — Claire 2 years ago
Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream

Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some settings, where glitch-soc has an extra setting.
  Ported upstream changes, moving the same settings as them.
128daefc — Claire 2 years ago
Remove leftover `.orig` files that were mistakenly included (#2379)

4f1d2262 — Claire 2 years ago
Merge pull request #2378 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 3a8370e1f459f5cf9695a610102ae6e53df36714
724d7738 — mogaminsk 2 years ago
[Glitch] Fix "Create Account" button in interaction modal

Port a664e1570242c98abcfd7d74e78473bdb8b85587 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
7e25e311 — Claire 2 years ago
Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream
1cb978bc — renovate[bot] 2 years ago
Update dependency @material-design-icons/svg to v0.14.11 (#26536)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
581ebf2b — renovate[bot] 2 years ago
Update dependency puma to v6.3.1 (#26537)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
13ffe91c — Nicolai Søborg 2 years ago
Fix `frame_rate` for videos where `ffprobe` reports 0/0 (#26500)

b95867ad — Renaud Chaput 2 years ago
Allow setting a custom HTTP method in CacheBuster (#26528)

Co-authored-by: Jorijn Schrijvershof <jorijn@jorijn.com>
b5acf138 — renovate[bot] 2 years ago
Update dependency pg to v8.11.3 (#26519)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
60b9fa64 — Claire 2 years ago
Fix cached posts including stale stats (#26409)

3ed2bf92 — Claire 2 years ago
Fix case-insensitive comparison of hashtags to do case-folding (#26525)

cc4560d9 — Claire 2 years ago
Change “privacy and reach” settings so that unchecking boxes always increase privacy and checking them always increase reach (#26508)

04463944 — Claire 2 years ago
Fix “legal” report category not showing up in moderation interface (#26509)

f0862bcf — Claire 2 years ago
Fix hashtag bar sometimes including tags that appear in the post's body (#26506)

26eaf058 — renovate[bot] 2 years ago
Update dependency postcss to v8.4.28 (#26502)

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