~cytrogen/masto-fe

ref: a5dbb1ee5a59fd3d4f99a9b28ac3822546ac712f masto-fe/app/javascript/styles/mastodon/components.scss -rw-r--r-- 158.9 KiB
a5dbb1ee — Claire 2 years ago
Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream
19ebf779 — Claire 2 years ago
Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream
5a437edc — Michael Stanclift 2 years ago
Keep version string displayed without breakpoints in UI (#26986)

6d076755 — Christian Schmidt 2 years ago
Make notification respect reduce-motion (#27178)

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

Merge upstream changes up to 57f592fed50747f3c97718a2761e17bafe6c8698
abdb5884 — Claire 2 years ago
Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream
88fa8e71 — gunchleoc 2 years ago
Fix line wrapping of language selection button with long locale codes (#27100)

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.
e193c848 — Claire 2 years ago
Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream

Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream added some code to add the Identity Provider's sign-in endpoint to
  the `form-action` Content Security Policy directive but our version of the
  file is pretty different.
  Ported the change.
08b495d9 — Claire 2 years ago
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
5d8c65f2 — Claire 2 years ago
Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream
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)

d2cfcdd0 — Santiago Kozak 2 years ago
Fix recent search items not handling overflows correctly (#26893)

1f141f65 — Eugen Rochko 2 years ago
Change onboarding prompt to use full width of banner in web UI (#26829)

398635c0 — Eugen Rochko 2 years ago
Fix paragraph margins resulting in irregular read-more cut-off in web UI (#26828)

5d20733d — Eugen Rochko 2 years ago
Add infinite scrolling for search results in web UI (#26784)

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

Merge upstream changes
e66f961e — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
Next