mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-27 00:11:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/views/layouts
History
Claire 555e33a392 Merge commit 'b61ae28f8d4b6f269f50a05c3e65ec7f2c846d32' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Conflict because of our different theming systems.
  Updated accordingly, along with `app/helpers/theme_helper.rb`
  and `app/helpers/theme_helper_spec.rb`.
2024-05-01 18:38:55 +02:00
..
admin.html.haml Replace use_pack, layouts/theme and @theme by new helpers 2024-04-28 15:45:42 +02:00
admin_mailer.text.erb Use admin_mailer layout with initial salutation (#28085) 2023-11-28 07:41:26 +00:00
application.html.haml Merge commit 'b61ae28f8d4b6f269f50a05c3e65ec7f2c846d32' into glitch-soc/merge-upstream 2024-05-01 18:38:55 +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