Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.		2018-07-09 07:13:59 +02:00
..
applications	Add more granular OAuth scopes (#7929)	2018-07-05 18:31:35 +02:00
deletes	Fix autocomplete option in haml files (#4438)	2017-07-29 14:20:31 +02:00
exports	Add hint about 7 day cooldown for archive takeout (#7375)	2018-05-06 10:53:10 +02:00
flavours	Don't show skins selector when there's only one (#256)	2018-01-08 16:45:32 -08:00
follower_domains	Scrollable tables in settings pages (#4857)	2017-09-09 02:26:58 +02:00
imports	Optimize user setting page for mobile browser (#1924)	2017-04-17 10:37:00 +02:00
keyword_mutes	Add apply-to-mentions option to keyword mute UI. #454.	2018-06-04 02:51:28 -05:00
migrations	Add UI for setting up account migration (#5832)	2017-11-27 22:47:06 +01:00
notifications	Add option to block direct messages from people you don't follow (#5669)	2017-11-14 21:12:57 +01:00
preferences	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
profiles	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
shared	2FA controller cleanup (#2296)	2017-04-22 04:23:17 +02:00
two_factor_authentication	Fix autocomplete option in haml files (#4438)	2017-07-29 14:20:31 +02:00
two_factor_authentications	Fix autocomplete option in haml files (#4438)	2017-07-29 14:20:31 +02:00