da24c6aced
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
ec4b8564d3
Fix rails-ujs not being run on some settings pages ( fixes #645 )
2018-08-17 19:51:05 +02:00
be525dd4db
Fix mailer to use webpack core
2018-01-15 21:17:03 -08:00
64f483cc0f
load public.js on vanilla#admin
2018-01-12 18:52:53 -08:00
cd8d0d7b85
fix typo in vanilla names.yml
2018-01-06 16:49:53 -05:00
1ba0732b82
i18n: Update Polish translation
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-04 14:42:58 +01:00
a1c79ef544
Screenshot support for themes
2017-12-10 20:32:28 -08:00
901c08a999
Moved flavour UI into own prefs tab
2017-12-10 20:32:27 -08:00
99e8710095
Javascript intl8n flavour support
2017-12-10 11:08:04 -08:00
f4c233f59f
Ruby intl8n for themes
2017-12-10 11:08:04 -08:00
882055afd0
Rename themes -> flavours ? ?
2017-12-03 23:26:40 -08:00
Thibaut Girka