Merge branch 'develop' into feature/uploadpage

rowers/mailprocessing.py

@@ -24,6 +24,11 @@ import zipfile
 import os
 import rowers.dataprep as dataprep
 
+import django_rq
+queue = django_rq.get_queue('default')
+queuelow = django_rq.get_queue('low')
+queuehigh = django_rq.get_queue('default')
+
 # Sends a confirmation with a link to the workout
 def send_confirm(u,name,link):
     fullemail = u.email
@@ -184,7 +189,7 @@ def make_new_workout_from_email(rr,f2,name,cntr=0):
 	    res = queuehigh.enqueue(handle_sendemail_unrecognized,
 				    f2,"roosendaalsander@gmail.com")
 
-	return 0
+	return 1
 		
     summary = ''
     # handle non-Painsled