From: Linda Nichols <lynnaloo@gmail.com>
Date: Sun, 24 Aug 2014 22:38:29 +0000 (+0000)
Subject: Merge branch '4_7_1' into 18683
X-Git-Tag: v4.7.0-beta.2~49^2~1
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=011f6a9992c73d0761e5b71af1fd01897326f6b7;p=xtuple

Merge branch '4_7_1' into 18683
---

011f6a9992c73d0761e5b71af1fd01897326f6b7
diff --cc node-datasource/views/login.ejs
index 4aaddc206,428928348..0a21145a5
--- a/node-datasource/views/login.ejs
+++ b/node-datasource/views/login.ejs
@@@ -22,9 -22,10 +22,10 @@@
      <section id="main">
        <div style="transform: translateZ(0px); opacity: 1;" id="form-fields">
          <form name="loginForm" action="/login" method="post">
+           <input type="hidden" id="hash" name="hash">
            <div class="login-label" id="form-fields_idLabel">Username</div>
            <input class="login-input" id="form-fields_id" name="id" placeholder="Username">
 -          <div class="login-label" id="form-fields_passwordLabel">Password</div>
 +          <div class="login-label" id="form-fields_passwordLabel" autocapitalize="off" autocorrect="off">Password</div>
            <input class="login-input" id="form-fields_password" placeholder="Password" name="password" type="password">
            <div class="login-label" id="form-fields_databaseLabel">Database</div>
            <select class="login-input" id="form-fields_database" name="database">