7134c1f522
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
README.md
Discarded upstream changes to the README, kept our version.
6 years ago
00d1699a96
Whitelist report notification param in Settings::NotificationsController ( #8560 )
...
Bug in #8559
6 years ago
8aeda4f064
Finalized theme loading and stuff
7 years ago
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
6bd4e3bf97
Separate notifications preferences from general preferences ( #4447 )
...
* Separate notifications preferences from general preferences
* Refine settings/notifications/show
* remove preferences.notifications
7 years ago
Thibaut Girka
Eugen Rochko
kibigo!
Yamagishi Kazutoshi