Fix wrong gradient color on collapsed private mentions (#2402)
Upstream changed the background color of private mentions, but the gradient used for collapsed toots still used the old color.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Add `in:` to search popout in web UI (#26807)
Remove obfuscation of reply count in web UI (#26768)
Add infinite scrolling for search results in web UI (#26784)
Improve interaction modal error handling (#26795)
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)
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>
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.