Sebastian Serth d95cf1cffb Merge branch 'master' into add_roles_via_LTI ...

# Conflicts:
#	app/controllers/concerns/lti.rb

2018-12-19 01:44:34 +01:00

..

assets

Merge pull request #237 from openHPI/repair_charts

2018-12-18 15:24:23 +01:00

controllers

Merge branch 'master' into add_roles_via_LTI

2018-12-19 01:44:34 +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 #247 from openHPI/fix_commentors_query

2018-12-14 18:13:06 +01:00

policies

Remove intervention controller, route and policy

2018-12-19 01:43:37 +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-19 01:44:34 +01:00