Added ability to sign in via username; separated email sign in and sign up config settings

web/static/i18n/en.json

@@ -127,6 +127,10 @@
   "admin.email.true": "true",
   "admin.email.false": "false",
   "admin.email.allowSignupDescription": "When true, Mattermost allows team creation and account signup using email and password.  This value should be false only when you want to limit signup to a single-sign-on service like OAuth or LDAP.",
+  "admin.email.allowEmailSignInTitle": "Allow Sign In With Email: ",
+  "admin.email.allowEmailSignInDescription": "When true, Mattermost allows users to sign in using their email and password.",
+  "admin.email.allowUsernameSignInTitle": "Allow Sign In With Username: ",
+  "admin.email.allowUsernameSignInDescription": "When true, Mattermost allows users to sign in using their username and password.  This setting is typically only used when email verification is disabled.",
   "admin.email.notificationsTitle": "Send Email Notifications: ",
   "admin.email.notificationsDescription": "Typically set to true in production. When true, Mattermost attempts to send email notifications. Developers may set this field to false to skip email setup for faster development.<br />Setting this to true removes the Preview Mode banner (requires logging out and logging back in after setting is changed).",
   "admin.email.requireVerificationTitle": "Require Email Verification: ",
@@ -550,6 +554,14 @@
   "login_email.email": "Email",
   "login_email.pwd": "Password",
   "login_email.signin": "Sign in",
+  "login_username.badTeam": "Bad team name",
+  "login_username.usernameReq": "A username is required",
+  "login_username.pwdReq": "A password is required",
+  "login_username.verifyEmailError": "Please verify your email address. Check your inbox for an email.",
+  "login_username.userNotFoundError": "We couldn't find an existing account matching your username for this team.",
+  "login_username.username": "Username",
+  "login_username.pwd": "Password",
+  "login_username.signin": "Sign in",
   "login_ldap.badTeam": "Bad team name",
   "login_ldap.idlReq": "An LDAP ID is required",
   "login_ldap.pwdReq": "An LDAP password is required",