60abcb3c4c
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `config/i18n-tasks.yml`:
Upstream added new ignored strings, glitch-soc has extra ignored strings
because of the theming system.
Added upstream's changes.
2023-01-18 17:38:11 +01:00
3970a6f433
Add option to make the landing page be /about even when trends are enabled ( #20808 )
...
* Add option to make the landing page be /about even when trends are enabled
* Restablish /explore as landing page by default
2023-01-18 16:43:58 +01:00
ab59743c13
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/mailer.html.haml`:
Upstream removed a line close to one modified by glitch-soc.
Removed the line as upstream did.
2023-01-14 22:34:09 +01:00
507e1d22f5
Allow admins to toggle public statistics API ( #22833 )
...
* Allow admins to toggle public statistics API
* Normalize i18n
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-01-13 17:14:39 +01:00
d35fe3d5e3
Add peers API endpoint toggle to Server Settings ( #22810 )
...
* Add peers endpoint toggle to Server Settings
This places the toggle under "Discovery" and expands the hint text to explain further what the endpoint is used for. Added a "Recommended" tag since it was recommended in v3 before it was removed.
Fixes https://github.com/mastodon/mastodon/issues/22222
* i18n normalize step
2023-01-13 16:43:17 +01:00
dcae9edb14
Merge branch 'main' into glitch-soc/merge-upstream
2022-12-11 20:15:04 +01:00
714e68db38
Add noindex setting to Admin settings Discovery page ( #22205 )
...
* Add noindex setting to Admin settings Discovery page
* Replace default_noindex i18n
2022-12-11 07:27:44 +01:00
6a96b17a2d
Add “Glitch-only” label to glitch-specific settings
2022-11-12 11:30:35 +01:00
d26c1cb2fe
Fix missing "not recommended" label on "Allow trends without review" ( #20480 )
2022-11-12 10:54:51 +01:00
cb19be67d1
Merge branch 'main' into glitch-soc/merge-upstream
2022-10-28 19:23:58 +02:00
7c152acb2c
Change settings area to be separated into categories in admin UI ( #19407 )
...
And update all descriptions
2022-10-22 11:44:41 +02:00
Claire