12 Commits (main)

Author	SHA1	Message	Date
Skye	b98a2f01be	add in hometown's norss ... https://github.com/glitch-soc/mastodon/pull/2002	2 years ago
Claire	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.	2 years ago
Claire	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	2 years ago
Claire	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.	2 years ago
Darius Kazemi	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>	2 years ago
Darius Kazemi	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	2 years ago
Claire	dcae9edb14	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
prplecake	714e68db38	Add noindex setting to Admin settings Discovery page (#22205) ... * Add noindex setting to Admin settings Discovery page * Replace default_noindex i18n	2 years ago
Claire	6a96b17a2d	Add “Glitch-only” label to glitch-specific settings	2 years ago
Eugen Rochko	d26c1cb2fe	Fix missing "not recommended" label on "Allow trends without review" (#20480)	2 years ago
Claire	cb19be67d1	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
Eugen Rochko	7c152acb2c	Change settings area to be separated into categories in admin UI (#19407) ... And update all descriptions	2 years ago