add taggit application, for episode tags

diff --git a/panikweb/settings.py b/panikweb/settings.py
index 5b7f644c3bbad0daa687b0c8febb5016cc853c7f..dfb6e3d811850fd6771d73dcbdec63f79335341c 100644 (file)
--- a/panikweb/settings.py
+++ b/panikweb/settings.py
@@ -125,6 +125,7 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     'django.contrib.admindocs',
     'south',
+    'taggit',
     'panikweb_templates',
     'panikweb.paniktags',
     'jquery',

diff --git a/requirements.txt b/requirements.txt
index 1e4873df4eb678051ecedc5bd8f2b58c02bf1c1f..25f9b5d3a29e5c98ba3779e2c6c0bfcb2921690d 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,3 +4,4 @@ django-ckeditor
 git+https://github.com/toastdriven/django-haystack.git
 django-debug-toolbar<1.0.0
 django-jquery
+django-taggit