Maximilian Grundke 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

..

assets

Merge remote-tracking branch 'origin/master' into flowr

2018-11-28 13:14:21 +01:00

controllers

Merge remote-tracking branch 'origin/master' into flowr

2018-11-28 13:14:21 +01:00

helpers

Merge pull request #200 from openHPI/remove-ab-tests

2018-11-15 18:02:34 +01:00

javascript/packs

Use webpack to deliver newest d3-tip.js, highlight.js and vis.js

2018-11-06 16:49:43 +01:00

mailers

Remove useless .keep files

2018-11-06 16:49:41 +01:00

models

Add user_type to RemoteEvaluationMappings

2018-11-26 17:56:07 +01:00

policies

Merge remote-tracking branch 'origin/master' into flowr

2018-11-28 13:14:21 +01:00

uploaders

transferred Code Ocean from original repository to GitHub

2015-01-22 10:01:32 +01:00

views

Merge remote-tracking branch 'origin/master' into flowr

2018-11-28 13:14:21 +01:00