322e907e04
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream renamed some helper functions that were used in a part of the
settings page which glitch-soc slightly changed the layout of.
Ported the change.
2022-02-09 17:28:33 +01:00
3aebe711fd
Change languages to be listed under standard instead of native name in admin UI ( #17485 )
2022-02-09 04:15:38 +01:00
692963d43b
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-08 18:23:53 +01:00
35850f8195
Fix localization of cold-start follow recommendations ( #17479 )
2022-02-08 01:53:49 +01:00
4b115d070c
Fix the follow recommendation admin page on glitch-soc
2021-04-20 12:22:50 +02:00
480d7c9478
Fix missing source strings and inconsistent lead text style in admin UI ( #16052 )
2021-04-17 11:12:49 +02:00
f7117646af
Add cold-start follow recommendations ( #15945 )
2021-04-12 12:37:14 +02:00
Claire
Eugen Rochko