From: Matthijs Kooijman <matthijs@stdin.nl>
Date: Tue, 10 Feb 2009 18:01:24 +0000 (+0100)
Subject: Merge branch 'production'
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=dad2574dc3f0cc1d114a85ac44ef440b5baeeaa8;p=matthijs%2Fprojects%2Fxerxes.git

Merge branch 'production'

* production:
  Don't load the uri template tag library.
  Add the influence url to notification emails.
  Make the is_public field unchecked by default.
---

dad2574dc3f0cc1d114a85ac44ef440b5baeeaa8
diff --cc influences/forms.py
index e1a6db3,a060368..db825cc
--- a/influences/forms.py
+++ b/influences/forms.py
@@@ -1,9 -1,7 +1,9 @@@
- from django.forms.fields import CharField
+ from django.forms.fields import CharField, BooleanField
  from django.forms.widgets import Textarea
 +from django.forms.models import ModelMultipleChoiceField
  from threadedcomments.forms import ThreadedCommentForm
  from xerxes.tools.forms import ContextModelForm
 +from xerxes.tools.widgets import DropDownMultiple
  from models import Influence, Character
  
  #