~cytrogen/masto-fe

ref: 80a5c16ae1b2371e4896c5fc25abe2feb882bbc8 masto-fe/app/javascript/mastodon/features d---------
80a5c16a — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
ae30a60b — Renaud Chaput 2 years ago
Improve dismissable banner buttons when they dont fit on 1 line (#25580)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
65aa0464 — Eugen Rochko 2 years ago
Fix onboarding prompt flashing while home feed is loading in web UI (#25579)

2b78c07e — Eugen Rochko 2 years ago
Fix search not being easily findable on smaller screens in web UI (#25576)

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

Merge upstream changes
178e1510 — Claire 2 years ago
Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream

Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a constraint on a setting textually close
  to glitch-soc-only settings.
  Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for the `translate` attribute on a few elements,
  where glitch-soc had a different set of allowed elements and attributes.
  Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored to use RSpec's `instance_double` instead of `double`,
  but glitch-soc had changes to tests due to configurable max toot chars.
  Applied upstream's changes while keeping tests against configurable max
  toot chars.
a985d587 — Eugen Rochko 2 years ago
Change labels and styles on the onboarding screen in web UI (#25559)

0842a685 — Claire 2 years ago
Remove unique accounts condition from Home onboarding prompt (#25556)

00ec4391 — Eugen Rochko 2 years ago
Add onboarding prompt when home feed too slow in web UI (#25267)

a8c1c8bd — Claire 2 years ago
Fix j/k keyboard shortcuts on some status lists (#25554)

8d2c2683 — mogaminsk 2 years ago
Fix custom signup URL may not loaded (#25531)

Change emoji picker icon (#25479)

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

Merge upstream changes
6c99479e — Claire 2 years ago
Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream

Conflicts:
- `app/views/settings/profiles/show.html.haml`:
  Upstream redesigned the settings page, where glitch-soc had changes because of
  the ability to set some custom limits.
  Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
  Upstream updated dependencies textually close to a glitch-soc-only dependency.
  Updated the dependnencies as well.
65cbcce9 — Claire 2 years ago
Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream
c9d06d10 — Claire 2 years ago
Fix non-interactive upload container being given a `button` role and tabIndex (#25462)

f2069800 — Eugen Rochko 2 years ago
Fix always redirecting to onboarding in web UI (#25396)

3b5e302f — たいち ひ 2 years ago
Rewrite `emoji_mart_data_light` as TS (#25138)

Rewrite `<LoadingIndicator/>` as FC and TS  (#25364)

1cb4514d — Renaud Chaput 2 years ago
Add missing report category translation (#25400)

Next