[Glitch] Fix missing action label on sensitive videos and embeds in web UI Port 714a20697f5e2f7994df012a5a8bbb49bc56f2e7 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Fix missing border on error screen in light theme in web UI Port d1a9f601c7eac36f94e91814d3b28ecebaf6ff32 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Fix UI Overlap with the loupe icon in the Explore Tab Port 9a567ec1d1fdb50573c882b7e454285ef7f4200c to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Add `lang` attribute to trending links Port 76fce34ebb455d88a34290154ad8f02f582a67c0 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] change poll form element colors to fit with the rest of the ui Port 80809ef33efcb80e18ff2193eb6ec30b3bb0fdf7 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream Conflicts: - `db/schema.rb`: Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns. Applied upstream's changes, but keeping our extra columns.
[Glitch] Replace 'favourite' by 'favorite' for American English Port 217ef7f2aff08575c505368199f059c3c9d79df5 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream
[Glitch] Change thread view to scroll to the selected post rather than the post being replied to Port e4ea80d8089110790bf11f7d4021dbe7b6a866de to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream Conflicts: - `config/initializers/content_security_policy.rb`: Upstream fixed an issue that was not present in glitch-soc. Kept our version.
Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream Conflicts: - `app/views/layouts/application.html.haml`: Upstream removed the `crossorigin` attribute from `preload_pack_asset`. Glitch-soc had different calls to `preload_pack_asset` because of the different theming system. Ported the change. - `app/views/layouts/embedded.html.haml`: Upstream removed the `crossorigin` attribute from `preload_pack_asset`. Glitch-soc had different calls to `preload_pack_asset` because of the different theming system. Ported the change.
[Glitch] Fix a missing redirection on getting-started in multi column mode Port 586b1c9dca07c894af4248f59c847e7a3bf6d786 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Wrong count in response when removing favourite/reblog Port 4c18928a931c8dc149fa3e0bd7de8ce4f6242715 to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream Conflicts: - `app/models/account.rb`: Upstream added new validations close to lines on which glitch-soc had modified validations to handle custom limits set through environment variables. Ported upstream changes. - `config/initializers/content_security_policy.rb`: Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is completely different. Added `AZURE_ALIAS_HOST` to our version of the file.
New Crowdin translations (#2338) Co-authored-by: GitHub Actions <noreply@github.com>
Fix Public TL not indicating new toots when `onlyRemote` or `allowLocalOnly` is enabled (#2336) Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Fix firehose not indicating new toots in "All" (#2335) When "Show local-only toots in All" is enabled, the column never indicated there are new toots, since `hasUnread` was always false. Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Fix "All" live feed not loading automatically. (#2332) The dispatch to expand the timeline was missing the `allowLocalOnly` param. Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
New Crowdin translations (#2327) Co-authored-by: GitHub Actions <noreply@github.com>
Change error boundary to upstream's (#2323)