hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

MastoAPI and OAuth: allow login with either email or username.

Browse source
This commit is contained in:
eal 2018-04-18 13:13:57 +03:00
commit 947431e9aa
5 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/templates/mastodon_api/mastodon/login.html.eex
View file

@ -3,7 +3,7 @@
<h2><%= @error %></h2>
<% end %>
<%= form_for @conn, mastodon_api_path(@conn, :login), [as: "authorization"], fn f -> %>
<%= text_input f, :name, placeholder: "Username" %>
<%= text_input f, :name, placeholder: "Username or email" %>
<br>
<%= password_input f, :password, placeholder: "Password" %>
<br>