kallithea Changeset - 25ab66a26975

Changeset - 25ab66a26975

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Marcin Kuzminski - 15 years ago 2010-08-20 18:43:08
marcin@python-works.com

fix for new bcrypt password.
Some templating updates, added "time ago" to file browser
changed whoosh dep.

5 files changed with 10 insertions and 4 deletions:

pylons_app/model/forms.py

pylons_app/public/css/style.css

pylons_app/templates/admin/users/users.html

pylons_app/templates/files/files_browser.html

setup.py

0 comments (0 inline, 0 general)

pylons_app/model/forms.py

➞

Show inline comments

@@ @@ -24,7 +24,7 @@ from formencode.validators import Unicod @@
     Email, Bool, StringBoolean
 from pylons import session
 from pylons.i18n.translation import _
 from pylons_app.lib.auth import check_password
+from pylons_app.lib.auth import check_password, get_crypt_password
 from pylons_app.model import meta
 from pylons_app.model.db import User, Repository
 from sqlalchemy.exc import OperationalError

pylons_app/public/css/style.css

➞

Show inline comments

@@ @@ -2856,6 +2856,12 @@ div.form div.fields div.buttons input @@
     color: #515151;
+}
 #register div.form div.activation_msg {
 	padding-top:4px;
 	padding-bottom:4px;
+}
 /* -----------------------------------------------------------
 	SUMMARY
 ----------------------------------------------------------- */

pylons_app/templates/admin/users/users.html

➞

Show inline comments

@@ @@ -40,7 +40,7 @@ @@
             %for cnt,user in enumerate(c.users_list):
              %if user.name !='default':
                 <tr class="parity${cnt%2}">
                 	<td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(user.email)}"> </div></td>
+                	<td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(user.email,24)}"> </div></td>
                     <td>${h.link_to(user.username,h.url('edit_user', id=user.user_id))}</td>
                     <td>${user.name}</td>
                     <td>${user.lastname}</td>

pylons_app/templates/files/files_browser.html

➞

Show inline comments

@@ @@ -56,7 +56,7 @@ @@
 		             </td>
 		             <td>
 		             	%if node.is_file():
 		             		${node.last_changeset.date}
+		             		${h.age(node.last_changeset._ctx.date())} - ${node.last_changeset.date}
 		             	%endif
 		             </td>
 		             <td>

setup.py

➞

Show inline comments

@@ @@ -23,7 +23,7 @@ setup( @@
         "pygments>=1.3.0",
         "mercurial>=1.6",
         "pysqlite",
-        "whoosh>=1.0.0b5",
+        "whoosh==1.0.0b9",
         "py-bcrypt",
     ],
     setup_requires=["PasteScript>=1.6.3"],

0 comments (0 inline, 0 general)