|
|
b9dce854c4
|
Merge remote-tracking branch 'origin/master' into flowr
# Conflicts:
# app/assets/javascripts/editor/evaluation.js
# app/assets/javascripts/editor/participantsupport.js
# app/views/exercises/_editor_output.html.slim
# config/code_ocean.yml.example
# config/routes.rb
|
2018-11-28 13:14:21 +01:00 |
|
|
|
0fbbe97ae4
|
revert 8acd77d9c4
|
2018-11-16 10:38:36 +01:00 |
|
|
|
8acd77d9c4
|
temporary changes to render pictures again.
|
2018-11-13 13:07:49 +01:00 |
|
|
|
7bdb962616
|
Update Bootstrap to v4.1, fix chosen.js and pagedown on multiple sites
|
2018-11-06 16:49:41 +01:00 |
|
|
|
15b1670511
|
Update Turbolinks, load additional assets only on request, fix JS
Signed-off-by: Sebastian Serth <Sebastian.Serth@student.hpi.de>
|
2018-11-06 16:46:01 +01:00 |
|
