~cytrogen/masto-fe

ref: 80a5c16ae1b2371e4896c5fc25abe2feb882bbc8 masto-fe/app/javascript 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>
ed96e28c — Claire 2 years ago
Fix compose form not being shown when clicking “Make your first post” on mobile (#25581)

7b024baf — Eugen Rochko 2 years ago
Change header backgrounds to use fewer different colors in web UI (#25577)

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
5def74a4 — Claire 2 years ago
[Glitch] Remove unique accounts condition from Home onboarding prompt

Port 0842a68532b1d1f5732e0ba6f2c62b5522114167 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
6fb34258 — Eugen Rochko 2 years ago
[Glitch] Add onboarding prompt when home feed too slow in web UI

Port 00ec43914aeded13bb369483f795fdb24dfb4b42 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
7d160d22 — Claire 2 years ago
[Glitch] Fix j/k keyboard shortcuts on some status lists

Port a8c1c8bd377263677bfb654513a4160caeac77bb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
222713a7 — mogaminsk 2 years ago
[Glitch] Fix custom signup URL may not loaded

Port 8d2c26834f7a485e6fd9083b17b025ad5030e471 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Change emoji picker icon

Port 69db507924d6d9350cca8a7127e773d46f9b8f48 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
c71fc42f — たいち ひ 2 years ago
[Glitch] Rewrite `<AutosuggestHashtag />` as FC and TS

Port 804488d38e9942280f7d320af8c7fef7860a4ee5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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.
55e7c08a — Claire 2 years ago
Fix verified badge in account lists potentially including rel="me" links (#25561)

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)

Next