Skip to content

Commit

Permalink
Updates to badger and badger_multiplayer; broken test fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
lmorchard committed Mar 12, 2012
1 parent 3e8ea88 commit 6ad7700
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
5 changes: 5 additions & 0 deletions settings.py
Expand Up @@ -67,6 +67,7 @@

AUTHENTICATION_BACKENDS = (
'django_browserid.auth.BrowserIDBackend',
'django.contrib.auth.backends.ModelBackend'
)
AUTH_PROFILE_MODULE = "profiles.UserProfile"

Expand All @@ -86,3 +87,7 @@ def username_algo(email):

LOGIN_REDIRECT_URL = '/profiles/home'
LOGIN_REDIRECT_URL_FAILURE = '/'

SOUTH_LOGGING_ON = False
SOUTH_TESTS_MIGRATE = False
SKIP_SOUTH_TESTS = True
6 changes: 3 additions & 3 deletions templates/badger/includes/award_full.html
@@ -1,10 +1,10 @@
<dl class="award">
<dt>Awarded to:</dt>
<dd><a href="{{ award.user.get_absolute_url() }}"
<dd class="awarded_to"><a href="{{ award.user.get_absolute_url() }}"
class="username">{{ award.user }}</a></dd>
<dt>Awarded by:</dt>
<dd><a href="{{ award.creator.get_absolute_url() }}"
<dd class="awarded_by"><a href="{{ award.creator.get_absolute_url() }}"
class="username">{{ award.creator }}</a></dd>
<dt>Issued on:</dt>
<dd>{{ award.created }}</dd>
<dd class="issued">{{ award.created }}</dd>
</dl>
2 changes: 1 addition & 1 deletion vendor-local
Submodule vendor-local updated from b22782 to 6410a1

0 comments on commit 6ad7700

Please sign in to comment.