Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream Conflicts: - `app/views/settings/preferences/other/show.html.haml`: Upstream moved some settings, where glitch-soc has an extra setting. Ported upstream changes, moving the same settings as them.
Merge pull request #2378 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes up to 3a8370e1f459f5cf9695a610102ae6e53df36714
Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream
Fix unfollow icon styling in advanced column (#26482)
New Crowdin Translations (automated) (#26444) Co-authored-by: GitHub Actions <noreply@github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Fix "Create Account" button in interaction modal (#26459)
Merge pull request #2368 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes up to 496eb6f7a4fa7de54f26da9642a76e6884648102
Merge commit '496eb6f7a4fa7de54f26da9642a76e6884648102' into glitch-soc/merge-upstream
Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore.
Merge pull request #2365 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream up to 425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa
Fix reply not preserving the language from the replied-to post (#26452)
Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore. - `README.md`: Upstream updated its README, but glitch-soc has a completely different one. Kept glitch-soc's README
New Crowdin Translations (automated) (#26373) Co-authored-by: GitHub Actions <noreply@github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Change the hashtag column to not display the hashtag header on pinned columns (#26416)
Fix interaction modal layout (#26368)
New Crowdin Translations (automated) (#26209) Co-authored-by: GitHub Actions <noreply@github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Change header of hashtag timelines in web UI (#26362)
Fix confirmation when closing media edition modal with unsaved changes (#26342)
Change reblogs to be excluded from "Posts and replies" tab in web UI (#26302)
Add direct link to the Single-Sign On provider if there is only one sign up method available (#26083)