Commit Graph

443 Commits

Author SHA1 Message Date
Ralf Teusner
3657fe3e93 remove instructions tab (the actual tab, before I just removed the header), set the turtle canvas to have a size of 400x400. 2015-09-25 12:52:52 +02:00
Ralf Teusner
6672491bc3 commented 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. 2015-09-25 12:19:13 +02:00
Ralf Teusner
632b41da23 editor 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) 2015-09-25 12:13:08 +02:00
Ralf Teusner
caf47a9251 correct tab shortcuts (following the removal of the introduction tab) 2015-09-25 12:11:17 +02:00
Ralf Teusner
10da12f950 option to hide the file tree in exercises. 2015-09-22 18:22:25 +02:00
Ralf Teusner
4e35579a7d fixed the tests by deleting the root of all evil: the 's'. 2015-09-21 18:14:40 +02:00
Janusch Jacoby
13a6207602 Make tests work 2015-09-21 16:46:46 +02:00
Janusch Jacoby
13be0f65dd Improve error and output handling
Display websocket and container status messages as well as line feeds
to the user.
2015-09-16 19:14:36 +02:00
Janusch Jacoby
3ccde378aa Merge branch 'webpython-hybrid' of ssh://github.com/openHPI/codeocean into webpython-hybrid 2015-09-16 18:37:59 +02:00
Alexander Kastius
b591138fb6 Merge branch 'webpython-hybrid' of https://github.com/openHPI/codeocean into webpython-hybrid 2015-09-16 18:36:29 +02:00
Alexander Kastius
ec570b3226 Added .idea to gitignore 2015-09-16 18:35:47 +02:00
Alexander Kastius
81aa5d5d8f Fixed submission-scoring.
Added parsing of exit cmd.
2015-09-16 18:34:04 +02:00
Janusch Jacoby
c451f9a3d0 Remove assess.py dependency 2015-09-16 18:04:36 +02:00
Janusch Jacoby
76a9443b3e Fix scoring bug 2015-09-16 17:07:09 +02:00
Janusch Jacoby
f21310e5fe Add webpython + instructions 2015-09-15 19:56:10 +02:00
Janusch Jacoby
e6eeebfd4b Filter and colour output, handle exit properly 2015-09-15 19:34:22 +02:00
Janusch Jacoby
c8253a6ba0 Manually merge changes from webpython branch. 2015-09-15 16:55:16 +02:00
Ralf Teusner
db90c9c61f Merge branch 'master' of https://github.com/openHPI/codeocean
Conflicts:
	app/views/request_for_comments/index.html.slim
2015-09-04 14:07:06 +02:00
Ralf Teusner
d292fec47c Code 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
2015-09-04 14:05:30 +02:00
Ralf Teusner
f229a85603 Code 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
2015-09-03 19:04:38 +02:00
jprberlin
8e9f19f41d Merge pull request #20 from openHPI/rt/comments
Rt/comments
2015-09-02 16:17:50 +02:00
jprberlin
369d045466 Merge pull request #22 from loewis/master
Provide deployment into vagrant box. Closes #21.
2015-09-02 16:08:48 +02:00
Ralf Teusner
1dab25b636 fixed broken merge... 2015-08-31 19:43:16 +02:00
Ralf Teusner
67b0c9a930 Merge branch 'master' into rt/comments
Conflicts:
	app/assets/javascripts/editor.js
2015-08-31 19:34:49 +02:00
Ralf Teusner
5650cf25b6 some bugfixes concerning comments, add first code for learning analytics 2015-08-31 19:33:03 +02:00
Ralf Teusner
e14ee6def3 Merge branch 'master' into rt/comments
Conflicts:
	app/assets/javascripts/editor.js
2015-08-31 19:23:53 +02:00
Ralf Teusner
43d2428ca1 some bugfixes concerning comments, add first code for learning analytics 2015-08-31 19:19:19 +02:00
Martin v. Löwis
4d5cefb7a3 Add shared folder. 2015-08-27 23:07:20 +02:00
Martin v. Löwis
8a38e08f98 Add code_ocean.yml to copied configuration. 2015-08-27 21:49:35 +02:00
Martin v. Löwis
1c795c0796 Provide deployment into vagrant box. Closes #21. 2015-08-27 21:18:16 +02:00
Ralf Teusner
73d01df9b7 copy and paste detection, + some cleanup 2015-08-27 17:38:42 +02:00
Ralf Teusner
44cb0150cc removed 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. 2015-08-26 11:52:52 +02:00
Ralf Teusner
b417231c12 a more defensive version of scoring to please the tests.. 2015-08-26 11:51:33 +02:00
Ralf Teusner
bc51948ada fixed some tests.. 2015-08-25 16:02:14 +02:00
Ralf Teusner
8bb98dc8e9 fixed some errors concerning pooling, container cleanup, timeouts etc. 2015-08-21 16:32:25 +02:00
Ralf Teusner
d1297609f8 Merge remote-tracking branch 'origin/master' into rt/comments 2015-08-21 14:45:02 +02:00
Ralf Teusner
646e45700b some changes on logging output (better readability) 2015-08-21 14:43:57 +02:00
Alexander Kastius
3f4eea9738 Update Added instruction about linux-paths to LOCAL_SETUP.md 2015-08-20 18:52:45 +02:00
Ralf Teusner
dc0b3a2294 cleanup of passed parameters, user_id and user_type are extracted from current user and not used from the passed POST values.. 2015-08-19 15:35:25 +02:00
Ralf Teusner
e520914385 Some correction of column names.
Support for internal as well as external users. Added column user_type and used it where necessary
2015-08-18 17:44:31 +02:00
Ralf Teusner
512e90ebd7 Show correct usernames on comments, have correct linenumbers on request_for_comments 2015-08-18 16:32:56 +02:00
Ralf Teusner
aa64d0be43 Merge remote-tracking branch 'origin/master' into rt/comments 2015-08-13 15:57:20 +02:00
Ralf Teusner
b4527aef50 implemented autosave, save button is now hidden. there is a label to show the last save timestamp. Code is saved on browser close. 2015-08-12 17:38:34 +02:00
Ralf Teusner
e49f0dc063 hide run success message, adjust wording of locales for run success and run failure (run_success, run_failure) 2015-08-07 16:13:35 +02:00
Ralf Teusner
eec5832a65 allow requesting comments only once per submission 2015-08-04 15:16:06 +02:00
Ralf Teusner
5d753e1ed8 Merge commit '51fa137b9d5e36eb3ac569505f7d90ba43ca4ce6' into rt/comments 2015-08-04 15:14:12 +02:00
Jan Renz
51fa137b9d try to delete volume dir of any killed execution dcontainer on container deletion 2015-07-27 16:07:57 +02:00
Ralf Teusner
c67c6e38f7 Merge branch 'master' into rt/comments
Conflicts:
	app/views/exercises/_editor_file_tree.html.slim
2015-07-16 15:19:31 +02:00
rteusner
5c678ce703 Merge pull request #19 from flxw/master
merged flxws changes
2015-07-16 15:14:48 +02:00
Felix Wolff
1d93e854f0 Merge branch 'master' of github.com:openHPI/codeocean 2015-07-16 15:10:59 +02:00