~cytrogen/masto-fe

e66f961e — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
ddeca3b3 — renovate[bot] 2 years ago
Update babel monorepo to v7.22.15 (#26790)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
cddef4c4 — Claire 2 years ago
Fix language settings for users having selected the `kmr` language (#26787)

ece1ff77 — Eugen Rochko 2 years ago
Add `in:library` syntax to search (#26760)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
ac3f310f — gunchleoc 2 years ago
Remove kmr from language selection (#26014)

3e6a6439 — renovate[bot] 2 years ago
Update dependency stylelint-config-standard-scss to v11 (#26780)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
59361dfd — renovate[bot] 2 years ago
Update dependency rubocop to v1.56.2 (#26568)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
68b4e36c — Eugen Rochko 2 years ago
Fix `#hashtag` matching non-hashtagged posts in search (#26781)

a106c464 — Stanislas Signoud 2 years ago
Fix light mode colors for advanced interface banner (#26759)

ea319297 — Christian Schmidt 2 years ago
Fix invalid Content-Type header for WebP images (#26773)

1f924367 — renovate[bot] 2 years ago
Update DefinitelyTyped types (non-major) (#26785)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
e52d0494 — Eugen Rochko 2 years ago
Fix `before:`, `after:` and `during:` failing when time zone not set (#26782)

173041f0 — renovate[bot] 2 years ago
Update dependency typescript to v5.2.2 (#26786)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
6b0702a3 — Plastikmensch 2 years ago
Add `recent` to search props (#2394)

The new search popout requires the `recent` prop to be set, otherwise onboarding crashes with "recent is undefined"

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
ee02b10e — Claire 2 years ago
Merge pull request #2392 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes into glitch-soc
5c7df20c — Claire 2 years ago
[Glitch] Add admin notifications for new Mastodon versions

Port front-end changes from 16681e0f20e1f8584e11439953c8d59b322571f5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
c107512f — Claire 2 years ago
Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream
4371df7f — Claire 2 years ago
[Glitch] Add `authorized_fetch` server setting in addition to env var

Port SCSS changes from 9e26cd55038084638fdf71b75f526494777d2849 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
728eb6a1 — Eugen Rochko 2 years ago
Fix wrong color on active icons with counters in web UI (#26767)

4ed629cd — Claire 2 years ago
Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream

Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added the notion of overriden settings, while we had extra code for
  pseudo-settings (only used to combine flavour and skin in a single select
  field).
  Ported upstream changes.
- `config/i18n-tasks.yml`:
  Upstream added `simple_form.overridden` to `ignore_unused`,
  we had `simple_form.glitch_only`.
  Added `simple_form.glitch_only` as well.
Next