~cytrogen/masto-fe

ref: 44e98a2740b251ae4fe4c976afb3b30b23d3a6b7 masto-fe/app/javascript/mastodon/features/ui/components/header.jsx -rw-r--r-- 3.4 KiB
44e98a27 — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
285a6919 — Claire 2 years ago
Remove the search button from UI header when logged out (#25631)

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

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

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

Merge upstream changes
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
9381f781 — Claire 2 years ago
Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream
0222df60 — Claire 2 years ago
Merge pull request #2236 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3
b7359549 — Claire 2 years ago
Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream

Conflicts:
- `config/webpack/generateLocalePacks.js`:
  A dependency update changed how functions are imported.
  Also, some linting fixes not applicable to glitch-soc.
38c62160 — fusagiko / takayamaki 2 years ago
Rewrite actions/modal and reducers/modal with typescript (#24833)

40b948a1 — Renaud Chaput 2 years ago
Fix `null` signUp URL handling from #25014 (#25108)

d27216dc — Renaud Chaput 2 years ago
Enforce import order with ESLint (#25096)

ca66e61b — Claire 2 years ago
Add support for custom sign-up URLs (#25014)

Next