Merge branch 'develop' into feature/underarmour

rowers/views.py

@@ -5287,7 +5287,12 @@ def workout_upload_view(request,message="",
 			      args=[str(message)])
 		response = HttpResponseRedirect(url)
                 return response
-
+            elif id == -1:
+                message = 'The zip archive will be processed in the background. The files in the archive will only be uploaded without the extra actions. You will receive email when the workouts are ready.'
+                url = reverse(workout_upload_view,
+                               args=[str(message)])
+                response = HttpResponseRedirect(url)
+                return response
             else:
                 if message:
                     url = reverse(workout_edit_view,