Noa Himesaka
b75fc7c551
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-08-27 00:38:28 +09:00
Claire
452f15be78
Move glitch-soc's “Hide followers count” setting to “Show followers count” under “Privacy and reach” tab
2023-08-22 19:50:37 +02:00
fef
c1f7ff6129
move emoji reaction strings to locales-glitch
2023-07-07 21:57:40 +02:00
Claire
6c99479ef4
Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' 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
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
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
