7 Commits (9b093dfcde80096d02a4fedb198b68aebdf5f380)

Author	SHA1	Message	Date
Thibaut Girka	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.	6 years ago
Thibaut Girka	ec4b8564d3	Fix rails-ujs not being run on some settings pages (fixes #645)	6 years ago
kibi!	be525dd4db	Fix mailer to use webpack core	7 years ago
Gô Shoemake	64f483cc0f	load public.js on vanilla#admin	7 years ago
kibigo!	a1c79ef544	Screenshot support for themes	7 years ago
kibigo!	99e8710095	Javascript intl8n flavour support	7 years ago
kibigo!	882055afd0	Rename themes -> flavours ? ?	7 years ago