7 Commits (5ffdc5426eb6394ae9e92411a0433aa2dd52d0b0)

Author	SHA1	Message	Date
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.	6 years ago
Thibaut Girka	69d4fa3bc5	Fix rails-ujs not being run on some settings pages (fixes #645)	6 years ago
kibi!	cda845ae0e	Fix mailer to use webpack core	7 years ago
Gô Shoemake	3a0b47982d	load public.js on vanilla#admin	7 years ago
kibigo!	bdca1614d5	Screenshot support for themes	7 years ago
kibigo!	b28cd6769c	Javascript intl8n flavour support	7 years ago
kibigo!	bc4fa6b198	Rename themes -> flavours ? ?	7 years ago