Claire a4fd9b704a Merge commit '284b46fee7ad682b52c99d0455a1134e1d4e3fc3' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream added an experimental feature flag to try out theme refactors.
  Glitch-soc's theming system is too different, so skips the new feature flag.
- `stylelint.config.js`:
  Ditto.

2025-11-19 21:34:53 +01:00

..

aliases

…

applications

…

deletes

…

exports

…

featured_tags

…

flavours

…

imports

Implement CSS theme tokens behind feature flag (#36861)

2025-11-17 09:44:55 +00:00

login_activities

…

migration/redirects

…

migrations

Improve account migration warnings (#20387)

2025-11-05 15:27:40 +00:00

preferences

Remove glitch-soc system emoji font option now that it's superseded by upstream

2025-10-28 22:57:31 +01:00

privacy

Merge commit 'd1f57822af0da2b2836e33baab5f89469ac6fa25' into glitch-soc/merge-upstream

2025-11-03 21:04:45 +01:00

profiles

…

shared

Move "Privacy and reach" from "Public profile" to top-level navigation (#27294)

2025-11-03 17:56:17 +00:00

two_factor_authentication

Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream

2025-05-25 14:36:51 +02:00

two_factor_authentication_methods

…

verifications

Implement quote posts in Moderator UI (#35964)

2025-10-16 13:40:24 +00:00