~cytrogen/masto-fe

ref: 88ff45a3b2fba3f119796e5f8946bceea0f88be6 masto-fe/app/javascript/mastodon d---------
88ff45a3 — Claire 2 years ago
Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream
8eb09466 — Claire 2 years ago
Merge pull request #2380 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 1cb978bcc3d291a045f367e072ca0af1a1c4dbbc
10404aec — Claire 2 years ago
Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream
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.
4f1d2262 — Claire 2 years ago
Merge pull request #2378 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 3a8370e1f459f5cf9695a610102ae6e53df36714
7e25e311 — Claire 2 years ago
Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream
061fd66e — Renaud Chaput 2 years ago
Remove hashtags from the last line of a status if it only contains hashtags (#26499)

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

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)

df6e7198 — Claire 2 years ago
Add display of out-of-band hashtags in the web interface (#26492)

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
d9c21293 — Claire 2 years ago
Fix unfollow icon styling in advanced column (#26482)

c452ccd9 — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#26444)

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
a664e157 — mogaminsk 2 years ago
Fix "Create Account" button in interaction modal (#26459)

86ba8d3e — Claire 2 years ago
Merge pull request #2368 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 496eb6f7a4fa7de54f26da9642a76e6884648102
92df185b — Claire 2 years ago
Merge commit '496eb6f7a4fa7de54f26da9642a76e6884648102' into glitch-soc/merge-upstream
6530f970 — Claire 2 years ago
Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main

Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
0dfc6ea3 — Claire 2 years ago
Merge pull request #2365 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream up to 425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa
34f30012 — Claire 2 years ago
Fix reply not preserving the language from the replied-to post (#26452)

44a5f1b6 — Claire 2 years ago
Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream

Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
  Upstream updated its README, but glitch-soc has a completely different one.
  Kept glitch-soc's README
Next