merging old commit with current master

[oweals/karmaworld.git] / reqs / common.txt

diff --git a/reqs/common.txt b/reqs/common.txt
index 90fac6444231d4c92674c32d8bb8900f1c134de6..bce89ee187923f94718be3978aef370449fcdae6 100644 (file)
--- a/reqs/common.txt
+++ b/reqs/common.txt
@@ -1,18 +1,16 @@
-Django>=1.4.0,<=1.4.9
+Django>=1.5.0,<1.6.0
 django-celery==3.0.21
 django-compressor==1.2
 Fabric==1.5.3
-South==0.7.6
+South==0.8.4
 supervisor==3.0b1
 oauth2client==1.0
 urllib3==1.5
 google-api-python-client==1.0
-django-grappelli==2.4.3
-lxml==3.1.0
-git+https://github.com/FinalsClub/django-taggit.git
-django-filepicker==0.1.5
+django-grappelli==2.4.8
+django-taggit
+git+https://github.com/btbonval/django-filepicker.git
 filemagic==1.6
-fabric-virtualenv
 requests
 beautifulsoup4
 pyopenssl
@@ -21,3 +19,8 @@ gdshortener
 git+https://github.com/flaptor/indextank-py.git
 html2text
 django-allauth
+boto==2.6.0
+django-storages==1.1.4
+django-reversion
+django-ajax-selects
+git+https://github.com/btbonval/django-ajax-selects-cascade.git