Commit Graph

12 Commits (6c0a6097ff7ddc23e9f024d3826a4f7cc1520f69)

Author SHA1 Message Date
Claire cb19be67d1 Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
Claire 28ec7def58 Fix missing javascript in some admin pages 2022-02-12 00:10:28 +01:00
Eugen Rochko 7aec1bc308 [Glitch] Add graphs and retention metrics to admin dashboard (#16829)
Port 07341e7aa6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-10-14 21:45:01 +02:00
Claire 4acb5c90a2 Use “public.js” pack for auth pages for form validation helpers 2020-12-10 13:01:51 +01:00
Thibaut Girka 0fbe90e2d3 Fix settings/flavours
Update theming system to use new paths for media files
2019-03-16 16:21:20 +01:00
Thibaut Girka 369a475a70 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/serializers/rest/instance_serializer.rb
- app/views/layouts/error.html.haml
- public/oops.png
  Took our version (same as upstream but without the things that only
  make sense in an animation).

Additional changes:
- app/javascript/flavours/vanilla/theme.yml
  Include upstream's javascript in error pages.
2019-02-17 12:26:55 +01:00
Thibaut Girka 69d4fa3bc5 Fix rails-ujs not being run on some settings pages (fixes #645) 2018-08-17 19:51:05 +02:00
kibi! cda845ae0e Fix mailer to use webpack core 2018-01-15 21:17:03 -08:00
Gô Shoemake 3a0b47982d
load public.js on vanilla#admin 2018-01-12 18:52:53 -08:00
kibigo! bdca1614d5 Screenshot support for themes 2017-12-10 20:32:28 -08:00
kibigo! b28cd6769c Javascript intl8n flavour support 2017-12-10 11:08:04 -08:00
kibigo! bc4fa6b198 Rename themes -> flavours ? ? 2017-12-03 23:26:40 -08:00