Merge branch 'leveling'
[edumed.git] / requirements.txt
index c96b02c..50b0286 100644 (file)
@@ -1,18 +1,18 @@
 -i http://pypi.nowoczesnapolska.org.pl/simple
 
 -i http://pypi.nowoczesnapolska.org.pl/simple
 
-Django>=1.5,<1.6
+Django>=1.6,<1.7
 South>=0.7.4
 django-pipeline>=1.2,<1.3
 python-memcached
 South>=0.7.4
 django-pipeline>=1.2,<1.3
 python-memcached
-piwik
+django-piwik
 #pyScss
 #git+git://github.com/Kronuz/pyScss.git@d8f4da23a3c87696a75b3830ed4ab49b75550a93#egg=pyScss
 #TODO: pyScss support, for now just install sass
 
 #pyScss
 #git+git://github.com/Kronuz/pyScss.git@d8f4da23a3c87696a75b3830ed4ab49b75550a93#egg=pyScss
 #TODO: pyScss support, for now just install sass
 
-django-jsonfield>=0.9,<0.10
+jsonfield>=0.9,<0.10
 
 django_cas>=2.1,<2.2
 
 django_cas>=2.1,<2.2
-fnpdjango<0.2
+fnpdjango>=0.1.14,<0.2
 
 Feedparser
 
 
 Feedparser
 
@@ -33,4 +33,6 @@ pybbm>=0.14,<0.15
 django-libravatar
 
 sorl-thumbnail>=11,<12
 django-libravatar
 
 sorl-thumbnail>=11,<12
+pyyaml
 
 
+django-subdomains>=2.0.4,<2.1