Merge branch 'master' of git@github.com:pinax/pinax

justquick · Feb 22, 2010 · 85cefba · 85cefba
2 parents b6ff35e + c2ee991
commit 85cefba
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/pinax/locale/de/LC_MESSAGES/django.po b/pinax/locale/de/LC_MESSAGES/django.po
@@ -109,7 +109,7 @@ msgstr "Passwort ändern"
 #: templates/default/account/password_set.html:6
 #: templates/default/account/password_set.html:9
 msgid "Set Password"
-msgstr ""
+msgstr "Set Password"
 
 #: templates/default/account/base.html:19
 #: templates/default/account/password_delete.html:5
@@ -163,8 +163,9 @@ msgid "remove"
 msgstr "entfernen"
 
 #: templates/default/account/email.html:60
+#, fuzzy
 msgid "None"
-msgstr ""
+msgstr "Keine"
 
 #: templates/default/account/email.html:60
 msgid "You should really add one so you can receive notifications, reset your password if you forget it, etc."

diff --git a/pinax/projects/intranet_project/settings.py b/pinax/projects/intranet_project/settings.py
@@ -234,6 +234,7 @@
     r"^/account/password_reset",
     r"^/account/confirm_email",
     r"^/openid",
+    r"^/__debug__",
 ]
 
 DEBUG_TOOLBAR_CONFIG = {

diff --git a/pinax/projects/private_beta_project/settings.py b/pinax/projects/private_beta_project/settings.py
@@ -223,6 +223,7 @@
     r"^/account/confirm_email",
     r"/openid",
     r"^/waitinglist",
+    r"^/__debug__",
 ]
 
 DEBUG_TOOLBAR_CONFIG = {

diff --git a/pinax/projects/social_project/requirements.txt b/pinax/projects/social_project/requirements.txt
@@ -15,7 +15,7 @@ python-yadis==1.1.0
 simplejson==2.0.9
 textile==2.1.3
 vobject==0.8.1c
-BeautifulSoup==3.0.7a
+
 ybrowserauth==1.2
 Markdown==2.0.1
 diff-match-patch==20090804

diff --git a/pinax/templates/default/account/signup.html b/pinax/templates/default/account/signup.html
@@ -17,7 +17,7 @@ <h1>{% trans "Sign Up" %}</h1>
             {% csrf_token %}
             <fieldset class="inlineLabels">
                 {{ form|as_uni_form }}
-                <div  class="form_block">
+                <div class="form_block">
                     <input type="submit" value="{% trans "Sign Up &raquo;" %}" />
                 </div>
             </fieldset>
@@ -45,4 +45,4 @@ <h1>{% trans "Sign Up" %}</h1>
             $("#id_username").focus();
         });
     </script>
-{% endblock %}
+{% endblock %}
diff --git a/requirements/0.9alpha1/release.txt b/requirements/0.9alpha1/release.txt
@@ -12,7 +12,7 @@ pytz==2009u
 simplejson==2.0.9
 textile==2.1.3
 vobject==0.8.1c
-BeautifulSoup==3.0.7a
+
 Markdown==2.0.1
 ybrowserauth==1.2
 geopy==0.93dev-r0

diff --git a/requirements/libs.txt b/requirements/libs.txt
@@ -14,7 +14,6 @@ pytz==2009u
 simplejson==2.0.9
 textile==2.1.3
 vobject==0.8.1c
-BeautifulSoup==3.0.7a
 Markdown==2.0.1
 ybrowserauth==1.2
 geopy==0.93dev-r0