Commit Graph

13 Commits

Author SHA1 Message Date
otrapersona 29870d2be6
Glitchsoc translation to 'es' language (#1439)
glitch-soc-specific translation to 'es' language
2020-10-19 22:17:29 +02: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
beatrix 61ef8d643e
fix typo in vanilla names.yml 2018-01-06 16:49:53 -05:00
Marcin Mikołajczak 0f69a90588 i18n: Update Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-04 14:42:58 +01:00
kibigo! bdca1614d5 Screenshot support for themes 2017-12-10 20:32:28 -08:00
kibigo! dabf66e676 Moved flavour UI into own prefs tab 2017-12-10 20:32:27 -08:00
kibigo! b28cd6769c Javascript intl8n flavour support 2017-12-10 11:08:04 -08:00
kibigo! d08d0f9f33 Ruby intl8n for themes 2017-12-10 11:08:04 -08:00
kibigo! bc4fa6b198 Rename themes -> flavours ? ? 2017-12-03 23:26:40 -08:00