Thomas Hille
4298e7050e
branched from prExtendByProxyExerciseAndTags
2017-03-21 10:31:32 +01:00
Thomas Hille
0db11884bc
Extended Exercises by worktime, difficulty and tags, added ProxyExercises as prework for recommendations
...
Tags can be added to exercises in the edit view. Tags can monitored under /tags.
Added the concept of ProxyExercises which are a collection of Exercises. They can be found under /proxy_exercises
Added Interventions as prework to show interventions later to the user.
Added exercise/[:id]/working_time to return the working time of the user in this exercise and the average working time of all users in this exercise
2017-03-21 10:31:32 +01:00
Ralf Teusner
8f927d5ac9
some howto text for request_for_comment usage, changed background color of read-only editor.
2017-03-15 16:15:29 +01:00
Ralf Teusner
fce6bb3410
CSS alert fixes for the internet explorer
2017-03-15 11:51:09 +01:00
Ralf Teusner
c37f675893
clickthrough of alert banners, some more positioning, move them to front.
2017-03-15 11:34:27 +01:00
rteusner
5efa1e03af
Merge pull request #92 from openHPI/fixed_error_messages
...
Moved error messages to top of page
2017-03-14 13:04:47 +01:00
Ralf Teusner
b3acc29e25
positioning of flash message
2017-03-14 13:03:53 +01:00
Alexander Kastius
3c9ecda0ad
Moved error messages to top of page
2017-03-13 01:07:05 +01:00
Ralf Teusner
dec45880b9
fix edge compatibility in docker config file (wss:// --> wss: ). also clean up hash removal of url and add docker.yml to the files to be deployed by capistrano
2017-03-07 18:09:31 +01:00
Ralf Teusner
c474ac3d87
removed invisible control characters
2017-03-07 16:00:35 +01:00
Ralf Teusner
4a1721c6aa
switch back from structure.sql to schema.rb
2017-02-22 17:20:26 +01:00
Ralf Teusner
9b8027e4c0
replaced exit-command for containers from 'exit' to '#exit', otherwise it will always really exit the container (which is then in state: exited) if we execute it in bash.
2017-02-14 13:35:21 +01:00
Ralf Teusner
a52b27bb59
render html and or markdown for feedback messages
2017-02-08 16:19:41 +01:00
Tom Staubitz
76c7ddae9b
removed relative_url_root for staging environment.
...
The app can be accessed now via port 3000 instead of a subdirectory.
2017-02-06 20:30:22 +01:00
Ralf Teusner
0ddcf3a5bb
remove # from socket url...
2017-02-03 18:29:22 +01:00
Ralf Teusner
2d5125dfa2
resize ace editors on toggle of description text
2017-02-03 13:53:32 +01:00
Ralf Teusner
252a6ba5d8
strip # from filename if it is there by error.
2017-02-02 12:04:22 +01:00
Ralf Teusner
b63edb8f55
upgraded provision
2017-01-30 11:58:58 +01:00
Tom Staubitz
a53e884cea
refined previous commit
2017-01-21 10:02:34 +01:00
Tom Staubitz
0daf31e5ad
removed un-i18n-ed text extension.
...
At least in case of Python the output is wrong anyway in quite a lot of cases.
2017-01-21 09:56:28 +01:00
Tom Staubitz
a4d8acf96d
removed deprecated warnings again
2017-01-19 21:33:52 +01:00
rteusner
f64c70c5d7
Merge pull request #84 from openHPI/lti_param_model
...
Lti param model
2017-01-19 14:38:47 +01:00
Tom Staubitz
4badd82d58
fixed broken test
2017-01-19 14:34:49 +01:00
Tom Staubitz
95f90def8a
fix previous
2017-01-18 13:51:46 +01:00
Tom Staubitz
de79508efb
repLACED STRING WITH URL
2017-01-18 13:45:30 +01:00
Tom Staubitz
59f2ff436e
removed url helper from model
2017-01-18 13:35:18 +01:00
Tom Staubitz
721c11bf28
fixed staging.rb according to rails update
2017-01-18 11:28:27 +01:00
Tom Staubitz
4674c057a4
Fixed rejection of untagged images
2017-01-18 11:10:34 +01:00
Tom Staubitz
d8fa661c90
changed back "action" to "to" in routes
2017-01-18 10:52:24 +01:00
Tom Staubitz
3a07e7d5f6
Updated nokogiri
2017-01-13 13:46:36 +01:00
Tom Staubitz
e634caf408
fixing tests final nice-up
2017-01-13 11:11:15 +01:00
Tom Staubitz
6bf73757ae
fixing tests p3
2017-01-13 09:56:36 +01:00
Tom Staubitz
4af24d4317
fixing tests p2 lti_spec tests all passed
2017-01-13 00:37:07 +01:00
Tom Staubitz
5fe12bfa78
fixing tests p1
2017-01-12 18:12:36 +01:00
Tom Staubitz
e4daa7ece3
only destroy LTI_parameter when exercise is submitted
2017-01-12 16:03:30 +01:00
Tom Staubitz
43f1735fa0
Merge commit '17f0f6fa9fa57f3fd4b124bb8371dd715ad34c15' into lti_param_model
2017-01-12 15:12:54 +01:00
Tom Staubitz
dd4c789fed
replaced session_paramerters with server params for security reasons
...
cleaned up comments
2017-01-12 15:10:34 +01:00
Ralf Teusner
17f0f6fa9f
prevent calls on nil
2017-01-11 17:13:34 +01:00
Ralf Teusner
254e8c65d1
adjusted log levels for docker exit and kill messages
2017-01-11 16:04:55 +01:00
Ralf Teusner
ab5438d5ed
bumped excon to fix error in docker-api gem
2017-01-05 14:49:55 +01:00
Tom Staubitz
41a61a8507
Fixed the destroy session logic.
...
1. an exercise_id is provided ==> only the LtiParameter object for the current user, consumer, and exercise is deleted.
2. no exercise_id is provided ==> external user and consumer are removed from the session, all LtiParameter objects for this user and consumer are deleted.
This enables users to have several tabs with exercises open and submitting the results to the tool consumer.
When an exercise has been submitted, the user cannot use the back button to get back to CodeOcean and work on the submitted or any other exercise.
For now a warning has been added to the info text to tell users not to do this. (As the LtiParameters have been deleted, the points can no more be submitted to the consumer.)
@TODO disable/redirect back button?
2016-12-31 17:21:46 +01:00
Tom Staubitz
edb813ab14
added separate value for the actual external_id of the external user.
2016-12-31 00:58:36 +01:00
Tom Staubitz
f318c62818
session[:external_user_id] has a somewhat misleading name.
...
As the tests fail however, when the value that fits the name is entered, I switched it back to the old version.
2016-12-31 00:51:07 +01:00
Tom Staubitz
6f57eb0707
tell travis to use postgres 9.5
2016-12-31 00:22:20 +01:00
Tom Staubitz
ca28e0aa87
updated rails from 4.1.13 to 4.2.5. This is required for rails to make use of new features in postgres 9.5
...
@Ralf
TODO: migration /Users/groucho/Documents/HPI/workspace/Xikolo-CodeOcean/codeocean/db/migrate/20160204111716_add_user_to_code_harbor_link.rb
is broken. A reference is made to table users which does not exist.
Workaround: run rake db:schema:load before running db:migrate. Still this should be fixed.
2016-12-31 00:05:23 +01:00
Tom Staubitz
930f417a9f
Added setup instructions for adding a host-only network adapter.
...
This is required so that codeocean on the VM can connect back to openHPI on the host machine.
2016-12-30 09:48:21 +01:00
Tom Staubitz
325ea25849
Replaced session[:lti_parameters] with proper LtiParameter object.
...
Removed all tests that would be failing
TODO: decision if all LtiParameter objects for a certain user/consumer will be deleted when the user/consumer is deleted from the session, or only the LtiParameter object for the current exercise of the user/consumer.
TODO: replace removed tests with proper tests
2016-12-30 09:45:39 +01:00
Tom Staubitz
6f1d8b2d38
Marked more locations that might require to be changed when we switch from session to LtiParameters Object
2016-12-27 07:48:59 +01:00
Tom Staubitz
80e3453395
Merge branch 'master' into lti_param_model
2016-12-27 00:16:32 +01:00
Tom Staubitz
730d76843b
Added some installer scripts for manual setup of local VBox environment running Debian Jessie
2016-12-27 00:15:04 +01:00
