Merge branch 'deploy-fix' into paralapraca

Author: brunosmartin

bower.json

@@ -37,8 +37,8 @@
     "angular-scroll": "^1.0.0",
     "angular-click-outside": "^2.10.1",
     "bluebird": "^3.4.7",
-    "html2canvas": "^0.4.1",
-    "jspdf": "^1.3.2",
+    "html2canvas": "0.4.1",
+    "jspdf": "1.3.2",
     "angular-filter": "^0.5.14"
   },
   "resolutions": {

requirements/base.txt

@@ -23,9 +23,9 @@ pandas==0.20.3
 requests~=2.18  # for communication with the rocketchat API
 
 # django-cards dependencies
-django-taggit~=0.22
-django-taggit-serializer~=0.1
-drf-writable-nested~=0.3
+django-taggit==0.22
+django-taggit-serializer==0.1
+drf-writable-nested==0.3
 
 # django-filter==0.7
 django-filter==0.10.0

requirements/paralapraca.txt

@@ -1,4 +1,4 @@
 
 -e git+https://github.com/hacklabr/paralapraca#egg=paralapraca
--e git+https://github.com/hacklabr/django-discussion#egg=django-discussion
+-e git+https://github.com/hacklabr/django-discussion@paralapraca#egg=django-discussion
 -e git+https://github.com/hacklabr/django-cards#egg=django-cards