Ralf Teusner b8da4dea17 Merge branch 'master' into editor-frontend-refactor ...

Conflicts:
	app/assets/javascripts/editor.js.erb
	app/views/exercises/implement.html.slim

2016-09-02 15:04:18 +02:00

..

assets

Merge branch 'master' into editor-frontend-refactor

2016-09-02 15:04:18 +02:00

controllers

send exit commands from rails server when score or test have finished - this is needed to reset the buttons in the frontend correctly.

2016-09-01 17:15:44 +02:00

helpers

Scaffold CodeHarbourLink with field oauth2token

2016-02-04 11:02:26 +01:00

mailers

First working version of mails on comments.

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

models

Merge branch 'master' into feature-file-templates

2016-07-28 15:16:11 +02:00

policies

Merge branch 'master' into feature-file-templates

2016-07-28 15:16:11 +02:00

uploaders

transferred Code Ocean from original repository to GitHub

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

views

Merge branch 'master' into editor-frontend-refactor

2016-09-02 15:04:18 +02:00