Commit Graph

663 Commits

Author SHA1 Message Date
Janusch Jacoby
0b9cda4f84 Fix container pooling #2 2015-10-19 15:13:42 +02:00
Janusch Jacoby
25191ab263 Merge branch 'webpython-hybrid' of ssh://github.com/openHPI/codeocean into webpython-hybrid 2015-10-19 14:47:49 +02:00
Janusch Jacoby
1360408dce Fix container pooling with websockets 2015-10-19 14:46:32 +02:00
Ralf Teusner
8e8efcb8cc use Modernizr to check whether websockets and server send events are supported 2015-10-16 17:10:50 +02:00
Ralf Teusner
6151afcb55 some I18n, stop command for server send event code (score), updated readme 2015-10-16 17:06:23 +02:00
tstaubitz
1ce4822732 Update provision.sh 2015-10-16 16:28:56 +02:00
tstaubitz
adcd06686a Update LOCAL_SETUP.md 2015-10-16 16:26:21 +02:00
tstaubitz
5b5a5bf311 Update webpython.py 2015-10-16 15:58:38 +02:00
tstaubitz
c6c958fca1 Update turtle.py 2015-10-16 15:53:59 +02:00
tstaubitz
8d1dd79f9e Update assess.py 2015-10-16 15:49:10 +02:00
Jan Renz
1551491f16 docker conf 2015-10-16 10:43:15 +02:00
Jan Renz
6223378413 use wss 2015-10-16 10:30:42 +02:00
Jan Renz
db11feaa19 Gemfile 2015-10-16 10:21:21 +02:00
jprberlin
4d20cfbddd Merge pull request #24 from openHPI/webpython-hybrid
Webpython hybrid
2015-10-16 10:05:19 +02:00
Ralf Teusner
5f76c78411 add /workspace to PYTHONPATH (must be matched in the CodeOcean constant in docker_client.rb 2015-10-15 15:29:13 +02:00
Ralf Teusner
91cb2a3391 set correct newlines in output 2015-10-15 15:27:57 +02:00
Ralf Teusner
f1067feb36 push gemfile.lock for test execution 2015-10-14 19:08:43 +02:00
Tom Staubitz
3b34be818c some paths added nad fixed 2015-10-14 18:44:44 +02:00
Ralf Teusner
5da6e74c1c forgot to push the according migration to hiding the file tree... 2015-10-08 18:57:48 +02:00
Ralf Teusner
56f2cc221a filter and hide run_command and test_command in websocket message 2015-09-25 12:53:45 +02:00
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