Claire 0f90e624c5 Merge commit '672c9f5f05bde788877ae0dcdb6668366c4c8941' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/application_helper.rb`:
  Conflict due to our theming system being different.
  Ported upstream's changes.

2024-05-01 16:10:45 +02:00

..

admin_mailer.text.erb

Use admin_mailer layout with initial salutation (#28085)

2023-11-28 07:41:26 +00:00

admin.html.haml

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

application.html.haml

Merge commit '672c9f5f05bde788877ae0dcdb6668366c4c8941' into glitch-soc/merge-upstream

2024-05-01 16:10:45 +02:00

auth.html.haml

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

embedded.html.haml

Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream

2024-05-01 14:25:47 +02:00

error.html.haml

Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream

2024-05-01 14:25:47 +02:00

helper_frame.html.haml

Change interaction modal in web UI (#26075)

2023-07-27 16:11:17 +02:00

mailer.html.haml

Drop hardcoded reliance on vanilla flavor

2024-04-28 22:38:11 +02:00

mailer.text.erb

Replace tutorial modal with welcome e-mail (#6273)

2018-01-18 19:17:25 +01:00

modal.html.haml

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00