masto-fe/app/views/settings
Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
  Port upstream's minor refactoring
2022-12-15 20:25:25 +01: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 style for hashes (#20518) 2022-11-17 11:05:39 +01:00
exports Fix reference to non-existing translation in the exports page. (#15894) 2021-03-15 02:17:29 +01:00
featured_tags Render current day formats in the client timezone (#21878) 2022-12-15 16:35:25 +01: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 Fix style for hashes (#20518) 2022-11-17 11:05:39 +01:00
migrations Fix style for hashes (#20518) 2022-11-17 11:05:39 +01:00
preferences Add “Glitch-only” label to glitch-specific settings 2022-11-12 11:30:35 +01:00
profiles Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
shared 2FA controller cleanup (#2296) 2017-04-22 04:23:17 +02:00
two_factor_authentication Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
two_factor_authentication_methods Add WebAuthn as an alternative 2FA method (#14466) 2020-08-24 16:46:27 +02:00