Claire 29124990a2 Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream reworked how CSS classes for the document's body are computed.
  Slight conflict due to glitch-soc's different theming system.
  Updated as upstream did.

2024-09-06 19:25:31 +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

Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream

2024-09-06 19:25:31 +02:00

application.html.haml

Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream

2024-08-20 18:31:50 +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 '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream

2024-08-20 18:31:50 +02:00

error.html.haml

Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream

2024-08-20 18:31:50 +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

Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream

2024-09-06 19:25:31 +02:00