[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Savannah-cvs] [SCM] Savane-cleanup framework branch, master, updated. a
From: |
Jonathan Gonzalez V. |
Subject: |
[Savannah-cvs] [SCM] Savane-cleanup framework branch, master, updated. a2adb476b3c0caf90d3ebe192abb038690045e5c |
Date: |
Tue, 11 Aug 2009 20:52:01 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Savane-cleanup framework".
The branch, master has been updated
via a2adb476b3c0caf90d3ebe192abb038690045e5c (commit)
via 67948910da46e7b0d6e30f47dc273c185d3eca7b (commit)
via 54964c5573bfbedf7d678e0a95dac948a10a2fc8 (commit)
via 93018ab81c7b409054f391af1804680830e50e91 (commit)
from cbbf9b83c5131ac902d5d5b5674bf1f3462d066b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/savane-cleanup/framework.git/commit/?id=a2adb476b3c0caf90d3ebe192abb038690045e5c
commit a2adb476b3c0caf90d3ebe192abb038690045e5c
Merge: 6794891 cbbf9b8
Author: Jonathan Gonzalez V <address@hidden>
Date: Tue Aug 11 16:51:12 2009 -0400
Merge branch 'master' of
ssh://git.sv.gnu.org/srv/git/savane-cleanup/framework
http://git.savannah.gnu.org/cgit/savane-cleanup/framework.git/commit/?id=67948910da46e7b0d6e30f47dc273c185d3eca7b
commit 67948910da46e7b0d6e30f47dc273c185d3eca7b
Author: Jonathan Gonzalez V <address@hidden>
Date: Tue Aug 11 16:50:34 2009 -0400
Just show part of the ssh key on the web view
diff --git a/src/savane/my/views.py b/src/savane/my/views.py
index 0eda8ab..0ee78b6 100644
--- a/src/savane/my/views.py
+++ b/src/savane/my/views.py
@@ -158,7 +158,10 @@ def sv_ssh_gpg( request ):
if keys is not None:
ssh_keys = dict()
for key in keys:
- ssh_keys[key.pk] = key.ssh_key
+ key_len = len(key.ssh_key)
+ head_key = key.ssh_key[0:20]
+ tail_key = key.ssh_key[key_len-20:key_len]
+ ssh_keys[key.pk] = head_key+'[...stripped..]'+tail_key
http://git.savannah.gnu.org/cgit/savane-cleanup/framework.git/commit/?id=54964c5573bfbedf7d678e0a95dac948a10a2fc8
commit 54964c5573bfbedf7d678e0a95dac948a10a2fc8
Merge: 93018ab c24af02
Author: Jonathan Gonzalez V <address@hidden>
Date: Tue Aug 11 16:34:27 2009 -0400
Merge branch 'master' of
ssh://git.sv.gnu.org/srv/git/savane-cleanup/framework
http://git.savannah.gnu.org/cgit/savane-cleanup/framework.git/commit/?id=93018ab81c7b409054f391af1804680830e50e91
commit 93018ab81c7b409054f391af1804680830e50e91
Author: Jonathan Gonzalez V <address@hidden>
Date: Tue Aug 11 16:33:46 2009 -0400
Added current email account to the change email box
diff --git a/template/my/conf.html b/template/my/conf.html
index cc54cb5..7e7e36c 100644
--- a/template/my/conf.html
+++ b/template/my/conf.html
@@ -31,6 +31,8 @@
<div class="boxitem">
<form method="post">
<dl>
+ <dt>Current</dt>
+ <dd>{{ user.email }}</dd>
{% for field in form_mail %}
{% if field.is_hidden %}
{{field}}
-----------------------------------------------------------------------
Summary of changes:
src/savane/my/views.py | 5 ++++-
template/my/conf.html | 2 ++
2 files changed, 6 insertions(+), 1 deletions(-)
hooks/post-receive
--
Savane-cleanup framework
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Savannah-cvs] [SCM] Savane-cleanup framework branch, master, updated. a2adb476b3c0caf90d3ebe192abb038690045e5c,
Jonathan Gonzalez V. <=