1551491f16docker conf
Jan Renz
2015-10-16 10:43:15 +02:00
6223378413use wss
Jan Renz
2015-10-16 10:30:42 +02:00
db11feaa19Gemfile
Jan Renz
2015-10-16 10:21:21 +02:00
4d20cfbdddMerge pull request #24 from openHPI/webpython-hybrid
jprberlin
2015-10-16 10:05:19 +02:00
5f76c78411add /workspace to PYTHONPATH (must be matched in the CodeOcean constant in docker_client.rb
Ralf Teusner
2015-10-15 15:29:13 +02:00
91cb2a3391set correct newlines in output
Ralf Teusner
2015-10-15 15:27:57 +02:00
f1067feb36push gemfile.lock for test execution
Ralf Teusner
2015-10-14 19:08:43 +02:00
3b34be818csome paths added nad fixed
Tom Staubitz
2015-10-14 18:44:07 +02:00
5da6e74c1cforgot to push the according migration to hiding the file tree...
Ralf Teusner
2015-10-08 18:57:48 +02:00
56f2cc221afilter and hide run_command and test_command in websocket message
Ralf Teusner
2015-09-25 12:53:45 +02:00
3657fe3e93remove instructions tab (the actual tab, before I just removed the header), set the turtle canvas to have a size of 400x400.
Ralf Teusner
2015-09-25 12:52:52 +02:00
6672491bc3commented out translation to line breaks, as they seem not to be needed (and corrected the linebreak tag), thanks to martin for hinting at this. Discuss with janusch why he needed this.
Ralf Teusner
2015-09-25 12:19:13 +02:00
632b41da23editor has an option whether it should remember the last used tab and show it, or whether it should display the first tab. currently, it shows the first tab. (as users whished for this behaviour)
Ralf Teusner
2015-09-25 12:13:08 +02:00
caf47a9251correct tab shortcuts (following the removal of the introduction tab)
Ralf Teusner
2015-09-25 11:56:04 +02:00
10da12f950option to hide the file tree in exercises.
Ralf Teusner
2015-09-22 18:22:25 +02:00
4e35579a7dfixed the tests by deleting the root of all evil: the 's'.
Ralf Teusner
2015-09-21 18:14:40 +02:00
13a6207602Make tests work
Janusch Jacoby
2015-09-21 16:46:46 +02:00
13be0f65ddImprove error and output handling
Janusch Jacoby
2015-09-16 19:14:36 +02:00
3ccde378aaMerge branch 'webpython-hybrid' of ssh://github.com/openHPI/codeocean into webpython-hybrid
Janusch Jacoby
2015-09-16 18:37:59 +02:00
d292fec47cCode Cleanup: Usage of Polymorphic User instead of ExternalUser and InternalUser Renamed requestor_user_id -> user_id Index of request_for_comments now returns the n (5?) newest requests per user. Solved via sliding windows in postgres, code added to model. Added route to /my_request_for_comments/ that shows all requests for the current user. Changed view from ERB to slim
Ralf Teusner
2015-09-03 19:04:38 +02:00
f229a85603Code Cleanup: Usage of Polymorphic User instead of ExternalUser and InternalUser Renamed requestor_user_id -> user_id Index of request_for_comments now returns the n (5?) newest requests per user. Solved via sliding windows in postgres, code added to model. Added route to /my_request_for_comments/ that shows all requests for the current user. Changed view from ERB to slim
Ralf Teusner
2015-09-03 19:04:38 +02:00
8e9f19f41dMerge pull request #20 from openHPI/rt/comments
jprberlin
2015-09-02 16:17:50 +02:00
369d045466Merge pull request #22 from loewis/master
jprberlin
2015-09-02 16:08:48 +02:00
67b0c9a930Merge branch 'master' into rt/comments
Ralf Teusner
2015-08-31 19:34:49 +02:00
5650cf25b6some bugfixes concerning comments, add first code for learning analytics
Ralf Teusner
2015-08-31 19:19:19 +02:00
e14ee6def3Merge branch 'master' into rt/comments
Ralf Teusner
2015-08-31 19:23:53 +02:00
43d2428ca1some bugfixes concerning comments, add first code for learning analytics
Ralf Teusner
2015-08-31 19:19:19 +02:00
4d5cefb7a3Add shared folder.
Martin v. Löwis
2015-08-27 23:07:20 +02:00
8a38e08f98Add code_ocean.yml to copied configuration.
Martin v. Löwis
2015-08-27 21:49:35 +02:00
1c795c0796Provide deployment into vagrant box. Closes#21.
Martin v. Löwis
2015-08-27 21:18:16 +02:00
73d01df9b7copy and paste detection, + some cleanup
Ralf Teusner
2015-08-27 17:38:42 +02:00
44cb0150ccremoved the last(100) filter on the index method of submission, since it did not work this way. ToDo: check whether this breaks anything, discuss with JanR.
Ralf Teusner
2015-08-26 11:52:52 +02:00
b417231c12a more defensive version of scoring to please the tests..
Ralf Teusner
2015-08-26 11:51:33 +02:00
bc51948adafixed some tests..
Ralf Teusner
2015-08-25 16:02:14 +02:00
8bb98dc8e9fixed some errors concerning pooling, container cleanup, timeouts etc.
Ralf Teusner
2015-08-21 16:32:25 +02:00
3f4eea9738Update Added instruction about linux-paths to LOCAL_SETUP.md
Alexander Kastius
2015-08-20 18:52:45 +02:00
dc0b3a2294cleanup of passed parameters, user_id and user_type are extracted from current user and not used from the passed POST values..
Ralf Teusner
2015-08-19 15:35:25 +02:00
e520914385Some correction of column names. Support for internal as well as external users. Added column user_type and used it where necessary
Ralf Teusner
2015-08-18 17:44:31 +02:00
512e90ebd7Show correct usernames on comments, have correct linenumbers on request_for_comments
Ralf Teusner
2015-08-18 16:32:56 +02:00
b4527aef50implemented autosave, save button is now hidden. there is a label to show the last save timestamp. Code is saved on browser close.
Ralf Teusner
2015-08-12 17:38:34 +02:00
e49f0dc063hide run success message, adjust wording of locales for run success and run failure (run_success, run_failure)
Ralf Teusner
2015-08-07 16:13:35 +02:00
eec5832a65allow requesting comments only once per submission
Ralf Teusner
2015-08-04 15:16:06 +02:00
5d753e1ed8Merge commit '51fa137b9d5e36eb3ac569505f7d90ba43ca4ce6' into rt/comments
Ralf Teusner
2015-08-04 15:14:12 +02:00
51fa137b9dtry to delete volume dir of any killed execution dcontainer on container deletion
Jan Renz
2015-07-27 16:07:46 +02:00
c67c6e38f7Merge branch 'master' into rt/comments
Ralf Teusner
2015-07-16 15:19:31 +02:00
5c678ce703Merge pull request #19 from flxw/master
rteusner
2015-07-16 15:14:48 +02:00
1d93e854f0Merge branch 'master' of github.com:openHPI/codeocean
Felix Wolff
2015-07-16 15:10:59 +02:00
06131e6e63Remove logic to find newest submission for an exercise and user. This is no longer necessary, since we update the file ids in editor.js
Ralf Teusner
2015-07-09 16:08:26 +02:00
81d2d69d11Display request for comments button if we are working on a non binary submission. Introduced needed data attributes for that and assigned them to the frame (instead of the editor). Data Attributes get updated by the CreateSubmissionCallback. Adjusted comment checks to also use the attributes of the frame.
Ralf Teusner
2015-07-09 12:03:03 +02:00
a49ffc978bonly allow comments on submissions, not on templates
Ralf Teusner
2015-06-26 18:25:03 +02:00
283bfb38d6Merge branch 'master' into rt/comments
Ralf Teusner
2015-06-26 10:59:45 +02:00
8ad787b3fccheck whether QaApi is defined before accessing it to prevent page load failure
Ralf Teusner
2015-06-25 11:42:28 +02:00
3e04222367setting correct ids for the files in the editor after creating a new submission. Still a bit clumsy concerning the passed json parameters, but does the job.
Ralf Teusner
2015-06-24 20:22:53 +02:00
6229b5de8dre-activate copying of comments, and also show comments of original file author in show method
Ralf Teusner
2015-06-24 20:21:02 +02:00
6af614ca7cuse stdout
Jan Renz
2015-06-18 20:13:43 +02:00
278e30ccf8Fix adapter
Jan Renz
2015-06-18 19:34:28 +02:00
7f5a76038fFix adapter
Jan Renz
2015-06-18 19:04:35 +02:00
fc68b3b3b0Merge remote-tracking branch 'origin/master'
Jan Renz
2015-06-17 15:30:04 +02:00
35b2177c71Add mocha adpater
Jan Renz
2015-06-17 15:29:35 +02:00