mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2019-05-04	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - app/models/media_attachment.rb
2019-04-25	Fix not being able to save e-mail preference for new pending accounts (#10622)	Eugen Rochko

2018-12-12	Create Settings::BaseController (#9507)	ysksn
	Define `Settings::BaseController#set_body_classes` so that sub classes inherit `Settings::BaseController` don't need to define `#set_body_classes` agein.
2018-10-25	Set @body_classes to admin layout (#9081)	Yamagishi Kazutoshi

2018-09-03	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: README.md Discarded upstream changes to the README, kept our version.
2018-09-02	Whitelist report notification param in Settings::NotificationsController (#8560)	Eugen Rochko
	Bug in #8559
2017-11-20	Finalized theme loading and stuff	kibigo!

2017-11-14	Add option to block direct messages from people you don't follow (#5669)	Eugen Rochko
	* Add option to block direct messages from people you don't follow Fix #5326 * If the DM responds to a toot by recipient, allow it through * i18n: Update Polish translation (for #5669) (#5673)
2017-10-04	Separate notifications preferences from general preferences (#4447)	Yamagishi Kazutoshi
	* Separate notifications preferences from general preferences * Refine settings/notifications/show * remove preferences.notifications