You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 759226e116 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version.		3 years ago
..
aliases	Fix account aliases page (#13452)	5 years ago
applications	Various fixes and improvements (#12878)	5 years ago
deletes	Fix 2FA challenge and password challenge for non-database users (#11831)	5 years ago
exports	Fix reference to non-existing translation in the exports page. (#15894)	4 years ago
featured_tags	Change number_to_human calls to always use 3-digits precision (#16469)	3 years ago
flavours	Fix settings/flavours	6 years ago
imports	Add option to overwrite imported data (#9962)	6 years ago
login_activities	Add full user agent in tooltips for login activities (#16428)	3 years ago
migration/redirects	Add (back) option to set redirect notice on account without moving followers (#11994)	5 years ago
migrations	Add (back) option to set redirect notice on account without moving followers (#11994)	5 years ago
preferences	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
profiles	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
shared	…
two_factor_authentication	Add subresource integrity for JS and CSS assets (#15096)	4 years ago
two_factor_authentication_methods	Add WebAuthn as an alternative 2FA method (#14466)	4 years ago