Jeremy Kescher
|
2379efb52f
|
Merge remote-tracking branch 'upstream/main' into reactions
# Conflicts:
# app/javascript/flavours/glitch/locales/de.js
# app/javascript/flavours/glitch/locales/en.js
# app/javascript/flavours/glitch/locales/fr.js
# app/javascript/mastodon/actions/interactions.js
# app/javascript/mastodon/locales/fr.json
# config/locales-glitch/de.yml
# config/locales-glitch/fr.yml
# config/locales-glitch/simple_form.de.yml
# config/locales-glitch/simple_form.fr.yml
|
2022-12-21 23:45:28 +01:00 |
|
Claire
|
18bcabf26a
|
Change i18n-tasks config to consider glitch-soc translation files (#2027)
* Change i18n-tasks config to consider glitch-soc translation files
* Normalize locales-glitch YML files
* Consider upstream Rails translations as external
* Add simple_form.glitch_only to ignore_unused
* Remove unused keybase-related strings
|
2022-12-21 22:13:04 +01:00 |
|
fef
|
598f3b9b31
|
move emoji reaction strings to locales-glitch
|
2022-12-20 18:27:57 +01:00 |
|
Claire
|
af89b14628
|
Add extended description for glitch-soc only “hide followers count" setting
|
2022-11-12 11:31:05 +01:00 |
|
Claire
|
6a96b17a2d
|
Add “Glitch-only” label to glitch-specific settings
|
2022-11-12 11:30:35 +01:00 |
|
prplecake
|
b3030187a4
|
Use DEFAULT_FIELDS_SIZE/MAX_PROFILE_FIELDS value in settings form hint (#1870)
Use `Account::DEFAULT_FIELDS_SIZE` in the hint, which would fallback to
4 if the environment variable isn't set.
|
2022-10-21 12:01:37 +02:00 |
|
Claire
|
c6df6686af
|
Disable notifications for trending links and trending statuses by default
|
2022-02-26 10:46:26 +01:00 |
|
Thibaut Girka
|
041c769182
|
Move glitch-specific ruby-side locales to their own files
|
2020-05-30 12:54:17 +02:00 |
|