David Yip 95c270f5b1 Merge remote-tracking branch 'origin/master' into gs-master

2017-11-28 11:45:13 -06:00

..

exports

Remove exports/base controller in favor of shared concern (#3444)

2017-05-30 19:06:01 +02:00

two_factor_authentication

…

applications_controller.rb

Use checkboxes for application scope setting (#4671)

2017-08-23 15:16:20 +02:00

deletes_controller.rb

setting-for-account-deletable (#3852)

2017-06-19 15:12:31 +02:00

exports_controller.rb

…

follower_domains_controller.rb

Fix order of paginated accounts in FollowerDomainsController and spec (#3357)

2017-09-30 23:06:09 +02:00

imports_controller.rb

…

keyword_mutes_controller.rb

Assume Glitch::KeywordMute#destroy! works and error out if it doesn't.

2017-10-24 18:56:57 -05:00

migrations_controller.rb

Fix account migration feature (#5837)

2017-11-28 14:31:23 +01:00

notifications_controller.rb

Add option to block direct messages from people you don't follow (#5669)

2017-11-14 21:12:57 +01:00

preferences_controller.rb

Add option to reduce motion (#5393)

2017-10-16 09:36:15 +02:00

profiles_controller.rb

authorize-follow-requests-after-unlocking (#4658)

2017-08-26 12:40:03 +02:00

sessions_controller.rb

Add feature to revoke sessions (#4259)

2017-07-19 04:59:04 +02:00

two_factor_authentications_controller.rb

Fix #4026 - Accept backup codes for disabling 2FA (#4382)

2017-07-26 23:36:33 +02:00