7066e3d5ce
Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
Upstream redesigned the settings page, where glitch-soc had changes because of
the ability to set some custom limits.
Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
Upstream updated dependencies textually close to a glitch-soc-only dependency.
Updated the dependnencies as well.
2023-06-18 13:41:33 +02:00
37d8e2fdcc
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
2b3a57d5c0
Add extended description for glitch-soc only “hide followers count" setting
2022-11-12 11:31:05 +01:00
0b2da756d8
Add “Glitch-only” label to glitch-specific settings
2022-11-12 11:30:35 +01:00
8be820a7c5
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
a3c7b8fe2e
Disable notifications for trending links and trending statuses by default
2022-02-26 10:46:26 +01:00
66f20c8a77
Move glitch-specific ruby-side locales to their own files
2020-05-30 12:54:17 +02:00
Claire