Ralf Teusner f2db88f952 Merge branch 'master' into travis-green-docker ...

took all the newer versions. Only thing I deleted is the part #to pass the test "it executes the run command" ...
We need to shortly discuss this yqbk.

Conflicts:
	lib/docker_client.rb

2016-11-09 18:25:02 +01:00

..

assets

fix retrieval of relative_url_root also for other calls.

2016-10-28 17:22:31 +02:00

controllers

Merge branch 'master' into travis-green-docker

2016-11-09 18:25:02 +01:00

helpers

make travis green again

2016-10-08 20:37:20 +02:00

mailers

First working version of mails on comments.

2016-06-17 14:48:57 +02:00

models

clean pull request

2016-10-24 23:02:44 +02:00

policies

merge with master

2016-08-03 12:09:58 +02:00

uploaders

transferred Code Ocean from original repository to GitHub

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

views

reworked the exercise edit dialog. Moved javascript part from editor_edit.js.erb to exercises.js.erb.

2016-10-12 16:35:21 +02:00