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.

Thibaut Girka 3216868024 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.github/ISSUE_TEMPLATE/bug_report.md`: Upstream added the `bug` label to bug reports. Did the same. - `app/services/fan_out_on_write_service.rb`: Upstream put DMs back into timelines, glitch-soc was already doing it. Ignored upstream changes.		4 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	Add import/export feature for bookmarks (#14956)	4 years ago
featured_tags	Changed tag most_used to recently_used (#14760)	4 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
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