Merge branch 'master' into add_roles_via_LTI

# Conflicts: # app/controllers/concerns/lti.rb
2018-12-19 01:44:34 +01:00
parent 1693824690 ebd8b56ebf
commit d95cf1cffb
17 changed files with 203 additions and 154 deletions
--- a/app/views/exercises/statistics.html.slim
+++ b/app/views/exercises/statistics.html.slim
@@ -33,7 +33,7 @@ h1 = @exercise
      -working_time_array.push working_time
    hr
    .d-none#data data-working-time=ActiveSupport::JSON.encode(working_time_array)
-    .graph-functions
+    .working-time-graphs
    div#chart_1
    hr
    div#chart_2