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

..

assets

Minor: Fix spelling in comment

2018-12-13 12:57:49 +01:00

controllers

Merge branch 'master' into add_roles_via_LTI

2018-12-14 00:53:06 +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

Merge branch 'master' into add_roles_via_LTI

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

models

Merge pull request #242 from openHPI/fix_proxy_exercise

2018-12-13 16:23:51 +01:00

policies

Fix tests and slightly refactor some policies

2018-12-12 14:09:20 +01:00

uploaders

transferred Code Ocean from original repository to GitHub

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

views

Merge branch 'master' into add_roles_via_LTI

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