Commit Graph

11 Commits

Author SHA1 Message Date
Sebastian Serth
ff8c1f6838 Use index? to validate permissions of classes instead of show? for obj. 2019-01-17 18:34:04 +01:00
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
Sebastian Serth
2125fb1c1d Ensure views only link to those actions allowed for current user 2018-12-12 14:09:19 +01:00
Sebastian Serth
4b251599ff Use admin? or teacher? for permission check instead of internal_user? 2018-12-12 14:09:19 +01:00
Sebastian Serth
a0d8b30ef2 Implement support for some basic embed options for work sheets via LTI
This commit also fixes an issue with the flash messages being positioned too high and displayed for too long
2018-12-11 14:29:36 +01:00
Sebastian Serth
7bdb962616 Update Bootstrap to v4.1, fix chosen.js and pagedown on multiple sites 2018-11-06 16:49:41 +01:00
Sebastian Serth
9666683bd7 Fix error, submission, hints and help views 2018-11-06 16:46:01 +01:00
Hauke Klement
4eef3d70d5 minor refactoring of flash messages 2015-03-23 16:42:57 +01:00
Hauke Klement
466f8967e2 eliminated naming clash with Sorcery 2015-02-23 10:39:04 +01:00
Hauke Klement
7ab57403df minor changes 2015-02-10 10:34:24 +01:00
Hauke Klement
4cbf9970b1 transferred Code Ocean from original repository to GitHub 2015-01-22 10:01:32 +01:00