Sebastian Serth 1a26d67c82 Merge branch 'master' into add_roles_via_LTI ...

# Conflicts:
#	app/views/application/_breadcrumbs.html.slim
#	app/views/application/welcome.html.slim
#	app/views/exercise_collections/show.html.slim
#	app/views/external_users/index.html.slim
#	app/views/layouts/application.html.slim
#	app/views/proxy_exercises/index.html.slim
#	app/views/user_exercise_feedbacks/index.html.slim
#	app/views/user_mailer/send_thank_you_note.slim

2018-12-14 00:53:06 +01:00

..

common_behavior.rb

fixed multiple style guide violations

2015-02-17 10:23:01 +01:00

file_parameters.rb

Use file template to generate new file content

2016-06-10 13:41:38 +02:00

lti.rb

Merge branch 'master' into add_roles_via_LTI

2018-12-14 00:53:06 +01:00

remote_evaluation_parameters.rb

Upgrade Rails to version 5.2.1 and adopt code & specs where necessary

2018-11-06 16:46:00 +01:00

submission_parameters.rb

Upgrade Rails to version 5.2.1 and adopt code & specs where necessary

2018-11-06 16:46:00 +01:00

submission_scoring.rb

Implement support for some basic embed options for work sheets via LTI

2018-12-11 14:29:36 +01:00