re-add telemeta and south for migration

diff --git a/app/settings.py b/app/settings.py
index c8b82300dfd8b9c0cf999c83fac71f9efd11bf35..fb52fd83dbdc53f2e36eb94df5c775476a1f61b3 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -137,12 +137,12 @@ INSTALLED_APPS = (
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django.contrib.admin',
+    'south',
     'teleforma',
     'teleforma.webclass',
     'teleforma.exam',
     'jsonrpc',
     'teleforma',
-    'south',
     'sorl.thumbnail',
     'django_extensions',
     'pagination',
@@ -163,6 +163,7 @@ INSTALLED_APPS = (
     'quiz',
     'pdfannotator',
     'captcha',
+    'telemeta',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (

diff --git a/requirements.txt b/requirements.txt
index 908b1aecdfa554ea92bc599e203f5ef5c92edd45..00789a5e487d7857248337b3d0385667903254aa 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -142,6 +142,7 @@ sphinx-me==0.2.1
 sqlparse==0.1.10
 stevedore==1.32.0
 texttable==0.8.7
+-e git+https://git.parisson.com/git/telemeta.git@2fced3bcac3055830dab4d3d708d89ff0cc7ddb5#egg=Telemeta
 TimeSide==0.5.3
 traitlets==4.3.1
 ua-parser==0.3.6