mastodon

Author	SHA1	Message	Date
Thibaut Girka	33c80e0783	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/media_attachment.rb	6 years ago
Eugen Rochko	f27d709351	Fix not being able to save e-mail preference for new pending accounts (#10622 )	6 years ago
ysksn	b048926e67	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	e8ffecbd36	Set @body_classes to admin layout (#9081 )	7 years ago
Thibaut Girka	6c233a04a0	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: README.md Discarded upstream changes to the README, kept our version.	7 years ago
Eugen Rochko	075e162319	Whitelist report notification param in Settings::NotificationsController (#8560 ) Bug in #8559	7 years ago
kibigo!	bdbbd06dad	Finalized theme loading and stuff	7 years ago
Eugen Rochko	fbef909c2a	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)	8 years ago
Yamagishi Kazutoshi	178f718a9b	Separate notifications preferences from general preferences (#4447 ) * Separate notifications preferences from general preferences * Refine settings/notifications/show * remove preferences.notifications	8 years ago