9 Commits

Author	SHA1	Message	Date
Thibaut Girka	33c80e0783	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb	2019-05-04 16:37:26 +02:00
Eugen Rochko	f27d709351	Fix not being able to save e-mail preference for new pending accounts (#10622)	2019-04-25 02:49:06 +02:00
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.	2018-12-12 22:32:13 +01:00
Yamagishi Kazutoshi	e8ffecbd36	Set @body_classes to admin layout (#9081)	2018-10-25 00:10:01 +02:00
Thibaut Girka	6c233a04a0	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: README.md Discarded upstream changes to the README, kept our version.	2018-09-03 14:33:06 +02:00
Eugen Rochko	075e162319	Whitelist report notification param in Settings::NotificationsController (#8560) ... Bug in #8559	2018-09-02 02:05:32 +02:00
kibigo!	bdbbd06dad	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
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)	2017-11-14 21:12:57 +01:00
Yamagishi Kazutoshi	178f718a9b	Separate notifications preferences from general preferences (#4447) ... * Separate notifications preferences from general preferences * Refine settings/notifications/show * remove preferences.notifications	2017-10-04 10:22:52 +02:00