1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-16 19:38:36 +00:00
mastodon/app/views/settings
Claire 59864ff495 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Upstream modified it, but we deleted it in glitch-soc.
  Keep it deleted.
2022-03-22 17:00:38 +01:00
..
aliases Fix IDN domains not being rendered correctly in a few left-over places () 2022-03-22 10:07:11 +01:00
applications Various fixes and improvements () 2020-01-20 15:55:03 +01:00
deletes Fix 2FA challenge and password challenge for non-database users () 2019-09-15 21:08:39 +02:00
exports Fix reference to non-existing translation in the exports page. () 2021-03-15 02:17:29 +01:00
featured_tags Change number_to_human calls to always use 3-digits precision () 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 () 2019-02-03 03:59:51 +01:00
login_activities Add full user agent in tooltips for login activities () 2021-06-23 16:42:23 +02:00
migration/redirects Add (back) option to set redirect notice on account without moving followers () 2019-09-29 05:03:19 +02:00
migrations Fix IDN domains not being rendered correctly in a few left-over places () 2022-03-22 10:07:11 +01:00
preferences Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01: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 () 2020-11-06 11:56:31 +01:00
two_factor_authentication_methods Add WebAuthn as an alternative 2FA method () 2020-08-24 16:46:27 +02:00