htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,349 Commits 2 Branches 0 Tags
8ff77c771fc01c9743f42d458061eb0ab51f1268
Commit Graph

1371 Commits

Author SHA1 Message Date
MrSerth
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
Sebastian Serth
7dc83065eb Create study groups for every LTI launch 2018-12-14 15:11:50 +01:00
Sebastian Serth
7983c0797a Add view for StudyGroups 2018-12-14 14:52:04 +01:00
Ralf Teusner
76079bb47d one line the loop, thanks for the hint @MrSerth 2018-12-14 13:36:24 +01:00
rteusner
2c29bf4e2b Merge branch 'master' into add_groups 2018-12-14 00:57:26 +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
rteusner
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
rteusner
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
Ralf Teusner
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
Sebastian Serth
88081bb541 Replace usage of name in favor of displayname 2018-12-13 14:27:55 +01:00
Sebastian Serth
4a1cd3037c Fix execution of code via Ajax. 
Add output message for program runs without any output
 2018-12-13 13:55:45 +01:00
Sebastian Serth
d45a68a123 Minor: Fix spelling in comment 2018-12-13 12:57:49 +01:00
Sebastian Serth
b4b9ab48d0 External User: Set name to displayname and introduce real_name 2018-12-12 16:47:49 +01:00
Sebastian Serth
25602972ab Prevent delivery of mails to non-existent empty mail addresses 2018-12-12 14:11:57 +01:00
Sebastian Serth
3665058435 Fix tests and slightly refactor some policies 2018-12-12 14:09:20 +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
d3f67ab4c7 Rethink permissions in CodeOcean for usage in schools and adopt views 2018-12-12 14:09:19 +01:00
Sebastian Serth
7a63a9c1c1 Hide navigation elements in the UI based on policies 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
71fd3b9b07 Add role to ExternalUser and update it via LTI 2018-12-12 14:09:19 +01:00
Sebastian Serth
b137e64020 Add StudyGroups with ExternalUsers only 2018-12-12 12:09:52 +01:00
Sebastian Serth
141450a840 Migrate User to abstract class 2018-12-12 11:45:11 +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
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
Sebastian Serth
1833435268 Use CodeOceanEditor.active_file to access file selected in JSFileTree 2018-12-05 13:46:44 +01:00
Sebastian Serth
95503c7b7d Include some improvements from current master 2018-12-02 15:09:39 +01:00
Sebastian Serth
b6ff7ede99 Rebase repair-charts onto master 2018-11-30 15:45:39 +01:00
rteusner
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
rteusner
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
rteusner
58e01880df Merge pull request #208 from openHPI/flowr 
Flowr Revival
 2018-11-30 15:26:23 +01:00
Sebastian Serth
56c59a616e Completely remove old non-structured errors and migrate existing ones. 2018-11-30 11:27:25 +01:00
Sebastian Serth
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
Sebastian Serth
8ccdb79fef Flowr: Return empty array if no submission was found 2018-11-28 23:42:37 +01:00
Sebastian Serth
64d5a0f9b2 Fix caret to show down (collapsed state) after initial load 2018-11-28 22:54:40 +01:00
Sebastian Serth
08ce579e8d Add comment about #insights? in SubmissionPolicy 2018-11-28 15:55:44 +01:00
Sebastian Serth
832b48ba62 Refactor /insights to throw a Pundit exception if no current_user is set 2018-11-28 15:44:45 +01:00
Sebastian Serth
8381b4f1ba Specify file as optional for testruns 
(no file is present for `run` but e.g. for `assess`)
 2018-11-28 15:23:32 +01:00
Sebastian Serth
212867f300 Fix flowr output to work with Bootstrap 4 2018-11-28 15:22:21 +01:00
Maximilian Grundke
b9dce854c4 Merge remote-tracking branch 'origin/master' into flowr 
# Conflicts:
#	app/assets/javascripts/editor/evaluation.js
#	app/assets/javascripts/editor/participantsupport.js
#	app/views/exercises/_editor_output.html.slim
#	config/code_ocean.yml.example
#	config/routes.rb
 2018-11-28 13:14:21 +01:00
Sebastian Serth
efacb5a6a9 Completely remove old hints connected to the execution environment 2018-11-28 01:21:13 +01:00
rteusner
5d13ee0e56 Merge pull request #230 from openHPI/fix_download 
Specify `ExternalUser` as class for `user` in `RemoteEvaluationMapping`
 2018-11-27 15:49:18 +01:00
rteusner
85088a60d0 Merge pull request #228 from openHPI/fix_flash_messages 
Fix flash messages
 2018-11-27 15:42:14 +01:00
Sebastian Serth
1131d08e2b Add user_type to RemoteEvaluationMappings 2018-11-26 17:56:07 +01:00
Sebastian Serth
16a5345a71 Migrate jQuery function use for ajax in case of success or failure 
Deprecation Notice:

The jqXHR.success(), jqXHR.error(), and jqXHR.complete() callbacks will be deprecated in jQuery 1.8. To prepare your code for their eventual removal, use jqXHR.done(), jqXHR.fail(), and jqXHR.always() instead.
 2018-11-26 12:23:30 +01:00
Sebastian Serth
c4f9c2fc85 Prevent redirection if possible 
This will just show the flash message on prevent the browser from changing the location. Works great with Turbolinks!
 2018-11-22 19:00:01 +01:00
Sebastian Serth
bb10e191ed Specify ExternalUser as class for user in RemoteEvaluationMapping 
Otherwise, the download of submissions will no longer work in Rails 5
 2018-11-22 18:57:58 +01:00
Ralf Teusner
0fbbe97ae4 revert 8acd77d9c4 2018-11-16 10:38:36 +01:00
rteusner
d7dcbdc799 Merge pull request #200 from openHPI/remove-ab-tests 
Remove ab tests
 2018-11-15 18:02:34 +01:00
Ralf Teusner
9507bdb329 cleanup duplicate code 2018-11-15 17:15:57 +01:00
Ralf Teusner
23bb698f74 Fix retrieval of user_exercise_feedback and exercise 2018-11-15 16:54:30 +01:00