mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2018-07-16	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	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
2018-05-03	Merge remote-tracking branch 'origin/master' into gs-master	David Yip
	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
2018-01-24	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	Jenkins

2018-01-15	Fixed improper mailer import	kibi!

2018-01-15	Fix mailer to use webpack core	kibi!

2017-12-10	Moved flavour UI into own prefs tab	kibigo!

2017-12-04	Various fixes	kibigo!

2017-12-03	Fixed image require	kibigo!

2017-12-03	Rename themes -> flavours ? ?	kibigo!

2017-11-30	Skins support	kibigo!

2017-11-20	Finalized theme loading and stuff	kibigo!

2017-11-18	WIP static themeing	kibigo!