Commit Graph

5 Commits

Author SHA1 Message Date
Claire
80af1ea434 Merge commit '825312d4b0587c0da5575f8eaabe038438746cd3' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict because of different theming system.
  Adapted upstream's changes.
- `vite.config.mts`:
  Conflict because of different theming system.
  Adapted upstream's changes.
2025-06-12 20:32:25 +02:00
Claire
f49940db85 Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream
Too many conflicts to list, because of webpack → vite migration.
2025-05-25 14:36:51 +02:00
Echo
3bfc576a49 [Glitch] Fix SASS deprecation notices
Port 8a3bed1933 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-03-27 21:29:33 +01:00
Michal Dvorak
859db01268 initial translation of Glitch-specific texts into Czech (#1997) 2022-12-08 10:38:52 +01:00
kibigo!
d08d0f9f33 Ruby intl8n for themes 2017-12-10 11:08:04 -08:00