~cytrogen/masto-fe

ref: 80a5c16ae1b2371e4896c5fc25abe2feb882bbc8 masto-fe/app/javascript/mastodon/features/ui/components d---------
80a5c16a — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
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.
8d2c2683 — mogaminsk 2 years ago
Fix custom signup URL may not loaded (#25531)

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

Merge upstream changes
65cbcce9 — Claire 2 years ago
Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream
Rewrite `<LoadingIndicator/>` as FC and TS  (#25364)

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

Merge upstream changes
93c71441 — Claire 2 years ago
Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream

Conflicts:
- `package.json`:
  Upstream changed various script definitions in lines surrounding the one for
  `i18n:extract`, which had glitch-soc-specific changes.
  Updated the scripts as upstream did, while keeping our changes to
  `i18n:extract`.
d907e791 — Claire 2 years ago
Merge pull request #2242 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 00c222377db0e305ac3f4a15bf1c18eb89c1f45f
c22fc2fa — Claire 2 years ago
Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream

Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's changes.
fca2dff2 — Claire 2 years ago
Merge pull request #2237 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
69057467 — Christian Schmidt 2 years ago
Translate CW, poll options and media descriptions (#24175)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
14bb6bb2 — Claire 2 years ago
Fix `null` signUp URL in various places (#25190)

0669783d — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
0e746671 — Claire 2 years ago
Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream

Conflicts:
- `.github/dependabot.yml`:
  We removed it from glitch-soc.
  Keep it deleted.
1cd7f5ff — Claire 2 years ago
Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream

Conflicts:
- `.eslintrc.js`:
  Upstream moved a configuration block in which we had added a glitch-only
  path.
  Moved the configuration block as upstream did.
- other files:
  Upstream reordered imports, and those files had different ones.
  Kept our version and reordered imports using the same rules.
6dbd44fa — Claire 2 years ago
Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream
8278907f — Claire 2 years ago
Merge commit '5a16bd7bf4591feb852364da9b84407438c9b7d6' into glitch-soc/merge-upstream
Next