mastodon/app/views/settings
Claire 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change.
- `app/views/accounts/_header.html.haml`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change.
- `app/views/directories/index.html.haml`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change.
2021-07-08 16:17:19 +02: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
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
identity_proofs Add ability to remove identity proofs from account (#13682) 2020-05-10 11:21:10 +02:00
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 Add (back) option to set redirect notice on account without moving followers (#11994) 2019-09-29 05:03:19 +02:00
preferences Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
profiles Merge branch 'master' into glitch-soc/merge-upstream 2020-05-03 21:23:49 +02: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