Add infinite scrolling for search results in web UI (#26784)
Merge pull request #2396 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge branch 'main' into glitch-soc/merge-upstream
Fix light mode colors for advanced interface banner (#26759)
Merge pull request #2392 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes into glitch-soc
Fix wrong color on active icons with counters in web UI (#26767)
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.
Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-releases.yml`:
Upstream changed comments close to a line we modified to account for
different container image repositories.
Updated the comments as upstream did.
Add admin notifications for new Mastodon versions (#26582)
Add `authorized_fetch` server setting in addition to env var (#25798)
Allow filter form in profiles directory to wrap (#26682)
Add an explanation banner on switching to single column mode (#26019)
Fix sign up steps progress layout in right-to-left locales (#26728)
Fix colors and typography on hashtag bar in web UI (#26666)
Add search options to search popout in web UI (#26662)