Claire d8b0a732aa Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream ...

Conflicts:
- `config/initializers/simple_form.rb`:
  Upstream added a new simple_form component, where we had an extra one.
  Kept both components.

2023-06-10 16:22:14 +02:00

..

challenges

Fix style for hashes (#20518)

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

confirmations

[Glitch] Update style of captcha confirmation page to match sign-up form (#2226)

2023-05-25 19:14:37 +02:00

passwords

Fix style for hashes (#20518)

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

registrations

Add card with who invited you to join when displaying rules on sign-up (#23475)

2023-06-02 18:35:37 +02:00

sessions

Merge branch 'main' into glitch-soc/merge-upstream

2023-03-16 23:12:59 +01:00

setup

[Glitch] Add polling and automatic redirection to /start on email confirmation

2023-05-25 22:37:14 +02:00

shared

Add progress indicator to sign-up flow (#24545)

2023-04-16 07:01:24 +02:00