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
