glitchier-soc

Author	SHA1	Message	Date
Thibaut Girka	73bc58c656	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/media_attachment.rb	5 years ago
Eugen Rochko	2ba12c8917	Fix not being able to save e-mail preference for new pending accounts (#10622 )	6 years ago
ysksn	8996de49df	Create Settings::BaseController (#9507 ) Define `Settings::BaseController#set_body_classes` so that sub classes inherit `Settings::BaseController` don't need to define `#set_body_classes` agein.	6 years ago
Yamagishi Kazutoshi	cad03e69b3	Set @body_classes to admin layout (#9081 )	6 years ago
Thibaut Girka	7134c1f522	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: README.md Discarded upstream changes to the README, kept our version.	6 years ago
Eugen Rochko	00d1699a96	Whitelist report notification param in Settings::NotificationsController (#8560 ) Bug in #8559	6 years ago
kibigo!	8aeda4f064	Finalized theme loading and stuff	7 years ago
Eugen Rochko	80873c1134	Add option to block direct messages from people you don't follow (#5669 ) * 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)	7 years ago
Yamagishi Kazutoshi	6bd4e3bf97	Separate notifications preferences from general preferences (#4447 ) * Separate notifications preferences from general preferences * Refine settings/notifications/show * remove preferences.notifications	7 years ago