MastoAPI and OAuth: allow login with either email or username.
authoreal <eal@waifu.club>
Wed, 18 Apr 2018 10:13:57 +0000 (13:13 +0300)
committereal <eal@waifu.club>
Wed, 18 Apr 2018 10:13:57 +0000 (13:13 +0300)
commit947431e9aa1d4dbf85f9ccc270f1989737744ed4
tree24a65608c90e7962a4b15d1676a0895301d6404f
parente153b364a71de431787db236c57114f229162ddf
MastoAPI and OAuth: allow login with either email or username.
lib/pleroma/user.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/oauth/oauth_controller.ex
lib/pleroma/web/templates/mastodon_api/mastodon/login.html.eex
lib/pleroma/web/templates/o_auth/o_auth/show.html.eex