Merge branch 'main' into glitch-soc/merge-upstream
Add canonical link tags in web UI (#25715)
Add button to see results for polls in web UI (#25726)
Fix OAuth apps page crashing when listing apps with certain admin API scopes (#25713)
Fix re-activated accounts being deleted by AccountDeletionWorker (#25711)
fix read more button overlapping thread line bug (#25706)
Fix local live feeds does not expand (#25694)
Add at-symbol prepended to mention span title (#25684) Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
Change labels of live feeds tabs in web UI (#25683)
Fix `/api/v2/search` not working with following query param (#25681)
Fix regression of icon button colors in web UI (#25679)
Add regex filter back to firehose (#2266) * Add regex filter back to firehose The regex filter will apply to all tabs and not be automatically applied when pinned. Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> * Keep regex when pinned Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> --------- Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Change button colors to increase hover/focus contrast and consistency (#25677)
Fix showing local only toots in "All" (#2265) * Fix warnings about missing dependency in hooks Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> * Add `allowLocalOnly` to timelineId Without this local-only toots will never be loaded. feedType is checked to be public to not show local-only toots in the "Remote" tab. Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> --------- Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Merge pull request #2263 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes
Show local-only posts in “All” by default, and add back option to toggle it
Add users index on unconfirmed_email (#25672)
Fix inefficient query when requesting a new confirmation email from a logged-in account (#25669)
[Glitch] Prevent duplicate concurrent calls of `/api/*/instance` in web UI Port 5b463454593e1aa3ab3d23446cdf57d606e933d5 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Change dropdown icon above compose form from ellipsis to bars in web UI Port 0512537eb6722f1d52a690a6e1b22c8d0a99103b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>