Commit Graph

756 Commits

Author SHA1 Message Date
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
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
b4b9ab48d0 External User: Set name to displayname and introduce real_name 2018-12-12 16:47:49 +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
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
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
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
212867f300 Fix flowr output to work with Bootstrap 4 2018-11-28 15:22:21 +01:00
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
efacb5a6a9 Completely remove old hints connected to the execution environment 2018-11-28 01:21:13 +01:00
d7dcbdc799 Merge pull request #200 from openHPI/remove-ab-tests
Remove ab tests
2018-11-15 18:02:34 +01:00
d06ed21171 Restyle user exercise feedback to look nicer (not nice) 2018-11-06 17:18:27 +01:00
78037ab37a Increase font weight for headings, reduce size of result card headings 2018-11-06 16:49:44 +01:00
cc48361a15 Remove unused scrollbars in /implement 2018-11-06 16:49:44 +01:00
248c3214cb Move font-weight 2018-11-06 16:49:44 +01:00
c44478783a Fix bootstrap CSS issues in Safari and Chrome 2018-11-06 16:49:44 +01:00
d7befd60e5 Change button on implement page to be gray if score cannot be submitted 2018-11-06 16:49:43 +01:00
dd0f56659e Use webpack to deliver newest d3-tip.js, highlight.js and vis.js 2018-11-06 16:49:43 +01:00
3ecb5bd778 Use webpack to deliver font-awesome (and use newest version) 2018-11-06 16:49:43 +01:00
41bd5bac10 Convert .html.erb templates to .html.slim 2018-11-06 16:49:42 +01:00
7bdb962616 Update Bootstrap to v4.1, fix chosen.js and pagedown on multiple sites 2018-11-06 16:49:41 +01:00
4d1cf972e4 Include Webpack and use it for jQuery, Bootstrap and chosen.js 2018-11-06 16:46:01 +01:00
9666683bd7 Fix error, submission, hints and help views 2018-11-06 16:46:01 +01:00
15b1670511 Update Turbolinks, load additional assets only on request, fix JS
Signed-off-by: Sebastian Serth <Sebastian.Serth@student.hpi.de>
2018-11-06 16:46:01 +01:00
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
2bb5ea138c Display branch and commit info in dashboard 2018-10-10 13:41:05 +02:00
4e6d7f8b8a Order files by name by default
Explicit ordering in the view (!) is now no longer necessary.
2018-09-30 00:40:21 +02:00
b9054bbcba Localize flowr heading 2018-09-18 15:13:44 +02:00
816c6fcbf6 Fix highlighting for submissions occurring in the same second 2018-08-31 14:11:10 +02:00
159e587254 Show working time until intervention 2018-08-31 13:41:15 +02:00
eb2af34543 Cache rendered templates 2018-08-20 14:59:40 +02:00
d9d3dc42d4 remove all A/B testing code no longer in use. 2018-08-09 15:14:52 +02:00
5eb6df87a1 Merge pull request #198 from openHPI/experimental-exercise-description-design
Experimental exercise description design
2018-08-08 10:14:40 +02:00
f058e6074e Merge pull request #197 from openHPI/feature/anomaly_feedback_ui
Feature/anomaly feedback ui
2018-08-08 10:10:14 +02:00
11137fa5f6 Style exercise description as a card and display an additional (more obvious) toggle 2018-08-03 14:38:58 +02:00
064a7b8690 Show icon and tooltip for user feedback that was generated through the anomaly detection cycle 2018-08-03 13:21:05 +02:00
97e010eba0 Merge remote-tracking branch 'origin/master' into feature/improved-tag-stats 2018-08-02 10:40:52 +02:00
6a1dbe4853 Add exercise title to statistics tooltip 2018-07-20 13:28:03 +02:00
bc33d9211f Allow filtering external user statistics by tag 2018-07-20 12:57:57 +02:00