Commit Graph

1285 Commits

Author SHA1 Message Date
c498d2b08b Allow sign in via case insensitive email address 2019-01-17 18:44:11 +01:00
ff8c1f6838 Use index? to validate permissions of classes instead of show? for obj. 2019-01-17 18:34:04 +01:00
0b5ec1820d Fix link for external users 2019-01-15 17:37:34 +01:00
7eab61dc8f Show nice name for StudyGroups 2019-01-15 17:36:57 +01:00
d45dc04a3e Limit redirect to host 2019-01-15 17:36:32 +01:00
9087d42088 Fix usage of incorrect downcase method 2018-12-19 19:47:16 +01:00
ac7e41d8b3 Merge pull request #248 from openHPI/improve_groups
Improve groups with a view and always create a group
2018-12-19 13:57:41 +01:00
d95cf1cffb Merge branch 'master' into add_roles_via_LTI
# Conflicts:
#	app/controllers/concerns/lti.rb
2018-12-19 01:44:34 +01:00
71cd9e3488 Remove user_exercise_feedback index and show routes / views 2018-12-19 01:43:37 +01:00
0e8c663039 Remove intervention controller, route and policy 2018-12-19 01:43:37 +01:00
c0608b6f50 Don't set admin privileges through LTI 2018-12-19 01:43:37 +01:00
f74c241141 Update app/views/shared/_file.html.slim 2018-12-18 17:05:18 +01:00
6e6e7f4765 Update app/views/execution_environments/statistics.html.slim 2018-12-18 16:29:30 +01:00
ebd8b56ebf Merge pull request #237 from openHPI/repair_charts
Improve working time bar graph
2018-12-18 15:24:23 +01:00
86f2f42fa1 Merge pull request #247 from openHPI/fix_commentors_query
fix active record induced error on postgres by removing distinct.
2018-12-14 18:13:06 +01:00
7dc83065eb Create study groups for every LTI launch 2018-12-14 15:11:50 +01:00
7983c0797a Add view for StudyGroups 2018-12-14 14:52:04 +01:00
76079bb47d one line the loop, thanks for the hint @MrSerth 2018-12-14 13:36:24 +01:00
2c29bf4e2b Merge branch 'master' into add_groups 2018-12-14 00:57:26 +01:00
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
6c46566174 Merge pull request #242 from openHPI/fix_proxy_exercise
Add user (ID and type) to proxy exercise
2018-12-13 16:23:51 +01:00
ff701e52bb Merge pull request #244 from openHPI/specify_embed_options
Implement support for some basic embed options for work sheets via LTI
2018-12-13 16:21:55 +01:00
8558c5041f fix active record induced error on postgres by removing distinct.
Inlining the code did not turn out well, as we have to cope with the polymorphic association of user here..
2018-12-13 16:16:12 +01:00
88081bb541 Replace usage of name in favor of displayname 2018-12-13 14:27:55 +01:00
4a1cd3037c Fix execution of code via Ajax.
Add output message for program runs without any output
2018-12-13 13:55:45 +01:00
d45a68a123 Minor: Fix spelling in comment 2018-12-13 12:57:49 +01:00
b4b9ab48d0 External User: Set name to displayname and introduce real_name 2018-12-12 16:47:49 +01:00
25602972ab Prevent delivery of mails to non-existent empty mail addresses 2018-12-12 14:11:57 +01:00
3665058435 Fix tests and slightly refactor some policies 2018-12-12 14:09:20 +01:00
2125fb1c1d Ensure views only link to those actions allowed for current user 2018-12-12 14:09:19 +01:00
d3f67ab4c7 Rethink permissions in CodeOcean for usage in schools and adopt views 2018-12-12 14:09:19 +01:00
7a63a9c1c1 Hide navigation elements in the UI based on policies 2018-12-12 14:09:19 +01:00
4b251599ff Use admin? or teacher? for permission check instead of internal_user? 2018-12-12 14:09:19 +01:00
71fd3b9b07 Add role to ExternalUser and update it via LTI 2018-12-12 14:09:19 +01:00
b137e64020 Add StudyGroups with ExternalUsers only 2018-12-12 12:09:52 +01:00
141450a840 Migrate User to abstract class 2018-12-12 11:45:11 +01:00
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
59257d17f2 Add user (ID and type) to proxy exercise
This is required for the existing policies to work
2018-12-06 00:31:45 +01:00
1833435268 Use CodeOceanEditor.active_file to access file selected in JSFileTree 2018-12-05 13:46:44 +01:00
95503c7b7d Include some improvements from current master 2018-12-02 15:09:39 +01:00
b6ff7ede99 Rebase repair-charts onto master 2018-11-30 15:45:39 +01:00
8dfcef3e45 Merge pull request #235 from openHPI/remove_old_hints
Completely remove old hints connected to the execution environment
2018-11-30 15:41:01 +01:00
c452fa16bd Merge pull request #238 from openHPI/fix_editing_exercises
Fix adding files to exercises (as admin)
2018-11-30 15:39:58 +01:00
58e01880df Merge pull request #208 from openHPI/flowr
Flowr Revival
2018-11-30 15:26:23 +01:00
56c59a616e Completely remove old non-structured errors and migrate existing ones. 2018-11-30 11:27:25 +01:00
b94289f36f Fix adding files to exercises (as admin)
Prevent hidden selection field from being removed after cloning the dummy. Also ensure the caret looks nice and add the file extension if possible
2018-11-29 22:32:12 +01:00
8ccdb79fef Flowr: Return empty array if no submission was found 2018-11-28 23:42:37 +01:00
64d5a0f9b2 Fix caret to show down (collapsed state) after initial load 2018-11-28 22:54:40 +01:00
08ce579e8d Add comment about #insights? in SubmissionPolicy 2018-11-28 15:55:44 +01:00
832b48ba62 Refactor /insights to throw a Pundit exception if no current_user is set 2018-11-28 15:44:45 +01:00