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 |
|
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
|
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
|
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
|
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 |
|
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 |
|
Sebastian Serth
|
56c59a616e
|
Completely remove old non-structured errors and migrate existing ones.
|
2018-11-30 11:27:25 +01:00 |
|
Sebastian Serth
|
8ccdb79fef
|
Flowr: Return empty array if no submission was found
|
2018-11-28 23:42:37 +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 |
|
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 |
|
Sebastian Serth
|
1131d08e2b
|
Add user_type to RemoteEvaluationMappings
|
2018-11-26 17:56:07 +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 |
|
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 |
|
Sebastian Serth
|
1bed13d941
|
Remove useless .keep files
|
2018-11-06 16:49:41 +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 |
|
Sebastian Serth
|
a77a006e8d
|
Update CSRF chain to prepend checks and resolve comments from PR
Signed-off-by: Sebastian Serth <Sebastian.Serth@student.hpi.de>
|
2018-11-06 16:46:01 +01:00 |
|
Sebastian Serth
|
de52db89f0
|
Upgrade Rails to version 5.2.1 and adopt code & specs where necessary
Signed-off-by: Sebastian Serth <Sebastian.Serth@student.hpi.de>
|
2018-11-06 16:46:00 +01:00 |
|
rteusner
|
c1bcc0c95c
|
Update exercises_controller.rb
? "true" : "false" --> .to_s
|
2018-09-24 17:04:32 +02:00 |
|
Maximilian Grundke
|
097938aa6b
|
Implement server side query building for flowr
|
2018-09-18 10:34:38 +02:00 |
|
Maximilian Grundke
|
fc02c4fe56
|
Refactor
|
2018-08-31 14:10:03 +02:00 |
|
Maximilian Grundke
|
98344a109e
|
Fix overlap bug that occurred after mixing interventions and submissions
|
2018-08-31 13:42:25 +02:00 |
|
Maximilian Grundke
|
11dc48dc96
|
Fix creating exercise collections with exercises
|
2018-08-22 13:41:23 +02:00 |
|
Maximilian Grundke
|
2c9f1a2917
|
Add tests for events controller
|
2018-08-15 14:40:59 +02:00 |
|
Maximilian Grundke
|
7d7234ce63
|
Add simple controller to create events
|
2018-08-14 18:08:25 +02:00 |
|
Ralf Teusner
|
d9d3dc42d4
|
remove all A/B testing code no longer in use.
|
2018-08-09 15:14:52 +02:00 |
|
Maximilian Grundke
|
97e010eba0
|
Merge remote-tracking branch 'origin/master' into feature/improved-tag-stats
|
2018-08-02 10:40:52 +02:00 |
|
Maximilian Grundke
|
9037c84639
|
Link to filtered exercise list
|
2018-08-02 10:40:18 +02:00 |
|
Maximilian Grundke
|
bc33d9211f
|
Allow filtering external user statistics by tag
|
2018-07-20 12:57:57 +02:00 |
|
Maximilian Grundke
|
16cd93d5a4
|
Remove now unnecessary pagination
|
2018-07-20 11:54:27 +02:00 |
|
Maximilian Grundke
|
574116cb1d
|
Save exercise collection items according to sort position
|
2018-07-16 11:18:01 +02:00 |
|
Maximilian Grundke
|
ab2d936165
|
Reduce precision and sort in descending order
|
2018-07-03 14:10:23 +02:00 |
|
Maximilian Grundke
|
804e70ea3b
|
Move tag statistics to its own route for asynchronous loading
|
2018-07-03 13:09:35 +02:00 |
|
Ralf Teusner
|
b92bbec280
|
fix redirect to existing user exercise feedback
|
2018-06-15 14:19:06 +02:00 |
|
Ralf Teusner
|
e2567db4ed
|
merged master into disable_rfcs
|
2018-05-16 17:44:28 +02:00 |
|
Ralf Teusner
|
e9462409fd
|
fixed the query, removed scopes, added paranthesis for clarity.
|
2018-05-16 17:06:04 +02:00 |
|
Maximilian Grundke
|
84ea900e4a
|
Merge remote-tracking branch 'origin/master' into activity-graphs
# Conflicts:
# config/locales/de.yml
# config/locales/en.yml
|
2018-04-25 15:46:38 +02:00 |
|
Maximilian Grundke
|
96ebd392b3
|
Re-use view for user activity
|
2018-04-25 14:12:43 +02:00 |
|
Maximilian Grundke
|
9da3d98654
|
Fix empty parameter causing db exception
|
2018-04-25 13:18:34 +02:00 |
|
Maximilian Grundke
|
dd55b1faee
|
Use sane default values
|
2018-04-24 16:58:31 +02:00 |
|