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 67da47d081 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.		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
identity_proofs	Add ability to remove identity proofs from account (#13682)	5 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 'master' into glitch-soc/merge-upstream	5 years ago
shared	2FA controller cleanup (#2296)	8 years ago
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