Claire 077183a121 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change.		2022-08-28 11:31:00 +02:00
..
aliases	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01: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 how hashtags are normalized (#18795)	2022-07-13 15:03:28 +02:00
flavours
imports
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	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
preferences	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-28 11:31:00 +02:00
profiles	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-08 20:22:54 +01:00
shared
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