12 Commits (f26f1145ac0fab4a657ee1fc784e824858601bd3)

Author	SHA1	Message	Date
Thibaut Girka	f26f1145ac	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x	6 years ago
David Yip	c816701550	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: .travis.yml Gemfile.lock README.md app/controllers/settings/follower_domains_controller.rb app/controllers/statuses_controller.rb app/javascript/mastodon/locales/ja.json app/lib/feed_manager.rb app/models/media_attachment.rb app/models/mute.rb app/models/status.rb app/services/mute_service.rb app/views/home/index.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/ca.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/nl.yml config/locales/pl.yml config/locales/pt-BR.yml config/themes.yml	6 years ago
Jenkins	0e10667fbe	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
kibi!	60ff086960	Fixed improper mailer import	7 years ago
kibi!	cda845ae0e	Fix mailer to use webpack core	7 years ago
kibigo!	dabf66e676	Moved flavour UI into own prefs tab	7 years ago
kibigo!	5bed0f10ed	Various fixes	7 years ago
kibigo!	7c75702d05	Fixed image require	7 years ago
kibigo!	bc4fa6b198	Rename themes -> flavours ? ?	7 years ago
kibigo!	541fe9b110	Skins support	7 years ago
kibigo!	bdbbd06dad	Finalized theme loading and stuff	7 years ago
kibigo!	a9ed857171	WIP static themeing	7 years ago