Claire 322e907e04 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Upstream renamed some helper functions that were used in a part of the settings page which glitch-soc slightly changed the layout of. Ported the change.		2022-02-09 17:28:33 +01:00
..
aliases	Fix account aliases page (#13452)	2020-04-13 06:41:43 +02:00
applications	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
deletes	Fix 2FA challenge and password challenge for non-database users (#11831)	2019-09-15 21:08:39 +02:00
exports	Fix reference to non-existing translation in the exports page. (#15894)	2021-03-15 02:17:29 +01:00
featured_tags	Change number_to_human calls to always use 3-digits precision (#16469)	2021-07-07 21:13:08 +02:00
flavours	Fix settings/flavours	2019-03-16 16:21:20 +01:00
imports	Add option to overwrite imported data (#9962)	2019-02-03 03:59:51 +01:00
login_activities	Add full user agent in tooltips for login activities (#16428)	2021-06-23 16:42:23 +02:00
migration/redirects	Add (back) option to set redirect notice on account without moving followers (#11994)	2019-09-29 05:03:19 +02:00
migrations	Add (back) option to set redirect notice on account without moving followers (#11994)	2019-09-29 05:03:19 +02:00
preferences	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-09 17:28:33 +01:00
profiles	Merge branch 'main' into glitch-soc/merge-upstream	2021-08-20 16:14:45 +02:00
shared	2FA controller cleanup (#2296)	2017-04-22 04:23:17 +02:00
two_factor_authentication	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +01:00
two_factor_authentication_methods	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00