##// END OF EJS Templates
fix for new bcrypt password....
marcink -
r416:25ab66a2 default
parent child Browse files
Show More
@@ -24,7 +24,7 b' from formencode.validators import Unicod'
24 Email, Bool, StringBoolean
24 Email, Bool, StringBoolean
25 from pylons import session
25 from pylons import session
26 from pylons.i18n.translation import _
26 from pylons.i18n.translation import _
27 from pylons_app.lib.auth import check_password
27 from pylons_app.lib.auth import check_password, get_crypt_password
28 from pylons_app.model import meta
28 from pylons_app.model import meta
29 from pylons_app.model.db import User, Repository
29 from pylons_app.model.db import User, Repository
30 from sqlalchemy.exc import OperationalError
30 from sqlalchemy.exc import OperationalError
@@ -2856,6 +2856,12 b' div.form div.fields div.buttons input'
2856 color: #515151;
2856 color: #515151;
2857 }
2857 }
2858
2858
2859 #register div.form div.activation_msg {
2860 padding-top:4px;
2861 padding-bottom:4px;
2862
2863 }
2864
2859 /* -----------------------------------------------------------
2865 /* -----------------------------------------------------------
2860 SUMMARY
2866 SUMMARY
2861 ----------------------------------------------------------- */
2867 ----------------------------------------------------------- */
@@ -40,7 +40,7 b''
40 %for cnt,user in enumerate(c.users_list):
40 %for cnt,user in enumerate(c.users_list):
41 %if user.name !='default':
41 %if user.name !='default':
42 <tr class="parity${cnt%2}">
42 <tr class="parity${cnt%2}">
43 <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(user.email)}"> </div></td>
43 <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(user.email,24)}"> </div></td>
44 <td>${h.link_to(user.username,h.url('edit_user', id=user.user_id))}</td>
44 <td>${h.link_to(user.username,h.url('edit_user', id=user.user_id))}</td>
45 <td>${user.name}</td>
45 <td>${user.name}</td>
46 <td>${user.lastname}</td>
46 <td>${user.lastname}</td>
@@ -56,7 +56,7 b''
56 </td>
56 </td>
57 <td>
57 <td>
58 %if node.is_file():
58 %if node.is_file():
59 ${node.last_changeset.date}
59 ${h.age(node.last_changeset._ctx.date())} - ${node.last_changeset.date}
60 %endif
60 %endif
61 </td>
61 </td>
62 <td>
62 <td>
@@ -23,7 +23,7 b' setup('
23 "pygments>=1.3.0",
23 "pygments>=1.3.0",
24 "mercurial>=1.6",
24 "mercurial>=1.6",
25 "pysqlite",
25 "pysqlite",
26 "whoosh>=1.0.0b5",
26 "whoosh==1.0.0b9",
27 "py-bcrypt",
27 "py-bcrypt",
28 ],
28 ],
29 setup_requires=["PasteScript>=1.6.3"],
29 setup_requires=["PasteScript>=1.6.3"],
General Comments 0
You need to be logged in to leave comments. Login now