mastodon/app/views/settings
Claire fbfc4145fd Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
  Applied the changes there.
2023-08-24 21:01:19 +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 Update haml-lint 0.49.1 (#26118) 2023-07-23 17:48:16 +02:00
deletes Fix style for hashes (#20518) 2022-11-17 11:05:39 +01:00
exports Change user backups to use expiring URLs for download when possible (#24136) 2023-03-16 22:46:52 +01:00
featured_tags Change edit profile page (#25413) 2023-06-14 04:38:07 +02:00
flavours Fix glitch-soc HAML linting issues (#2166) 2023-04-07 20:55:28 +02:00
imports Fix haml-lint Rubocop `Style/StringLiterals` cop (#25948) 2023-07-17 16:57:18 +02:00
login_activities Fix haml-lint `ConsecutiveSilentScripts` rule (#26043) 2023-07-18 09:25:37 +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 Move glitch-soc's “Hide followers count” setting to “Show followers count” under “Privacy and reach” tab 2023-08-22 19:50:37 +02:00
privacy Move glitch-soc's “Hide followers count” setting to “Show followers count” under “Privacy and reach” tab 2023-08-22 19:50:37 +02:00
profiles Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream 2023-08-24 21:01:19 +02:00
shared Add privacy tab in profile settings (#26484) 2023-08-14 18:52:45 +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
verifications Change edit profile page (#25413) 2023-06-14 04:38:07 +02:00