Claire 2126812f65 Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some settings, where glitch-soc has an extra setting.
  Ported upstream changes, moving the same settings as them.

2023-08-22 18:31:28 +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

Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream

2023-08-22 18:31:28 +02:00

privacy

Add privacy tab in profile settings (#26484)

2023-08-14 18:52:45 +02:00

profiles

Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream

2023-08-22 18:31:28 +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

Add WebAuthn as an alternative 2FA method (#14466)

2020-08-24 16:46:27 +02:00

verifications

Change edit profile page (#25413)

2023-06-14 04:38:07 +02:00