Claire dfe851b476 Merge branch 'stable-4.3' into glitch-soc/backports-4.3 ...

Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.

2024-10-05 20:45:05 +02:00

..

aliases

Use material symbols in table link helper (#31359)

2024-08-20 11:48:15 +00:00

applications

Clean up labels on development application form (#32116)

2024-10-04 17:48:03 +02:00

deletes

Fix style for hashes (#20518)

2022-11-17 11:05:39 +01:00

exports

Wrap datetime in time element with attrs (#32177)

2024-10-04 17:48:03 +02:00

featured_tags

Use material symbols in table link helper (#31359)

2024-08-20 11:48:15 +00:00

flavours

Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream

2024-01-17 18:32:15 +01:00

imports

Wrap datetime in time element with attrs (#32177)

2024-10-04 17:48:03 +02:00

login_activities

Replace more font-awesome icons in views/settings (#30963)

2024-08-07 22:52:35 +00:00

migration/redirects

Fix LineLength haml-lint in app/views/settings area (#28663)

2024-01-09 15:28:56 +00:00

migrations

Fix style for hashes (#20518)

2022-11-17 11:05:39 +01:00

preferences

Merge branch 'stable-4.3' into glitch-soc/backports-4.3

2024-10-05 20:45:05 +02:00

privacy

Merge branch 'stable-4.3' into glitch-soc/backports-4.3

2024-10-05 20:45:05 +02:00

profiles

Extract constants for header and avatar geometry (#32151)

2024-10-04 17:48:03 +02:00

shared

Avoid id duplication conflict with main navigation from settings profile link (#32181)

2024-10-04 17:48:03 +02:00

two_factor_authentication

Merge branch 'stable-4.3' into glitch-soc/backports-4.3

2024-10-05 20:45:05 +02:00

two_factor_authentication_methods

Use material symbols in table link helper (#31359)

2024-08-20 11:48:15 +00:00

verifications

Add copyable_input helper method to wrap shared options (#32119)

2024-10-04 17:48:03 +02:00