Merge branch 'develop' into feature/opaqueid

2019-01-09 15:46:47 +01:00
parent 6c20c3ab7f a7af332db6
commit ebb90e5997
74 changed files with 8245 additions and 1410 deletions
--- a/rowers/templates/image_form.html
+++ b/rowers/templates/image_form.html
@@ -171,7 +171,7 @@
  $.ajax({
    data: data,
    type: $(this).attr('method'),
-    url: '/rowers/workout/{{ workout.id|encode }}/image',
+    url: '/rowers/workout/{{ workout.id|encode }}/image/',
    contentType: false,
    processData: false,
    error: function(result) {