~cytrogen/masto-fe

ref: 685270f3f7ea6d4a8a48ec641e8fdfd9fc2e2d7f masto-fe/app/javascript/mastodon d---------
941a9df2 — Claire 2 years ago
Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream

Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed how the nightly builds are versioned, the conflict
  is because glitch-soc modified adjacent lines relative to the docker
  repositories the images are pushed to.
  Applied upstream's changes.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Upstream moved some settings around. Glitch-soc had more settings.
  Applied upstream's changes, moving glitch-soc's extra settings
  accordingly.
b6b68b44 — Claire 2 years ago
Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream

Conflicts:
- `Vagrantfile`:
  Upstream bumped a bunch of values, including one that was already bumped by
  glitch-soc.
  Took upstream's version.
- `lib/paperclip/transcoder.rb`:
  glitch-soc already had a partial fix for this.
  Took upstream's version.
88ff45a3 — Claire 2 years ago
Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream
e90649b0 — Claire 2 years ago
Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode (#26633)

Co-authored-by: Plastikmensch <Plastikmensch@users.noreply.github.com>
b2ac93dd — Claire 2 years ago
Fix selecting domains to forward reports to not passing the information correctly (#26636)

8eb09466 — Claire 2 years ago
Merge pull request #2380 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 1cb978bcc3d291a045f367e072ca0af1a1c4dbbc
613cfd62 — Claire 2 years ago
Change hashtag bar tags to be de-emphasized (#26606)

152b10b6 — Christian Schmidt 2 years ago
Fix some React warnings (#26609)

44ba7852 — Renaud Chaput 2 years ago
Change the hashtag bar to be hidden when there is a CW and the post is not expanded (#26615)

58acaa9a — Renaud Chaput 2 years ago
Better hashtag normalization when processing a post (#26614)

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)

Next