~cytrogen/masto-fe

ref: 1ff70886a12e05cdc2f0789e78dcdabccaef6d18 masto-fe/app/javascript/mastodon/components d---------
22ee4e05 — Claire 2 years ago
Merge commit 'a83615edc9fc1ce3363ddcf1fc676806421a5f65' into glitch-soc/merge-upstream

Conflicts:
- `streaming/index.js`:
  Upstream has added a parameter to `streamFrom`, while glitch-soc had an
  extra parameter.
  Ported upstream changes.
70cae19b — Claire 2 years ago
Fix hashtag bar being sometimes incorrectly hidden (#26960)

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.
3ca94f6d — Claire 2 years ago
Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' into glitch-soc/merge-upstream
2a4fcc51 — Claire 2 years ago
Fix dismiss button overlapping with text in dismissable banners (#26935)

9d290c23 — Eugen Rochko 2 years ago
Remove obfuscation of reply count in web UI (#26768)

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

Merge upstream changes into glitch-soc
fbbe9f1c — Claire 2 years ago
Merge commit 'a7d96e6affd4a2da65f09f3f4ffa1b9350bb9a42' into glitch-soc/merge-upstream
6b7c4731 — Claire 2 years ago
Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream
10b06436 — Eugen Rochko 2 years ago
Fix colors and typography on hashtag bar in web UI (#26666)

c3a42e12 — Claire 2 years ago
Add `data-nosnippet` attribute to remote posts and local posts with `noindex` (#26648)

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

Merge upstream changes
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>
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)

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)

Next