Ralf Teusner c67c6e38f7 Merge branch 'master' into rt/comments ...

Conflicts:
	app/views/exercises/_editor_file_tree.html.slim

2015-07-16 15:19:31 +02:00

..

admin/dashboard

added dynamic container pool graph to administrator dashboard

2015-02-17 14:07:48 +01:00

application

minor refactoring of flash messages

2015-03-23 16:42:57 +01:00

code_ocean/files

extended execution environments by a default file type that is used as the default for associated exercises' files

2015-03-10 18:14:26 +01:00

comments

bugfixes, policies, errors now have a link to the submissions

2015-04-10 20:23:38 +02:00

consumers

added pagination for all resources

2015-03-11 16:13:45 +01:00

errors

added pagination for all resources

2015-03-11 16:13:45 +01:00

execution_environments

extended execution environments index

2015-03-17 17:14:46 +01:00

exercises

Merge branch 'master' into rt/comments

2015-07-16 15:19:31 +02:00

external_users

added pagination for all resources

2015-03-11 16:13:45 +01:00

file_types

added pagination for all resources

2015-03-11 16:13:45 +01:00

hints

added pagination for all resources

2015-03-11 16:13:45 +01:00

internal_users

don't preselect the administrator role when creating a new internal user

2015-03-11 16:14:37 +01:00

layouts

Merge branch 'master' of github.com:openHPI/codeocean

2015-04-11 21:30:13 +02:00

request_for_comments

Comment code via popovers

2015-05-05 13:52:53 +02:00

sessions

Disable average count as this breaks on some exercises...

2015-04-13 16:25:48 +02:00

shared

fix

2015-03-19 15:41:14 +01:00

submissions

setting correct ids for the files in the editor after creating a new submission. Still a bit clumsy concerning the passed json parameters, but does the job.

2015-06-24 20:22:53 +02:00

teams

added pagination for all resources

2015-03-11 16:13:45 +01:00

user_mailer

transferred Code Ocean from original repository to GitHub

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