Commit Graph

1089 Commits

Author SHA1 Message Date
Jakub Syrek
0069841a96 DOCKER_HOST + DOCKER_OPTS 2016-10-23 16:18:26 +02:00
Jakub Syrek
13011e8a31 set DOCKER_OPTS 2016-10-23 15:29:30 +02:00
Jakub Syrek
88079008f3 export DOCKER_HOST 2016-10-23 15:12:02 +02:00
yqbk
3d3d4ec1ae pull docker images on travis 2016-10-23 14:30:34 +02:00
yqbk
46cdbc3b4b change workspace path to /tmp 2016-10-16 17:28:57 +02:00
yqbk
f055e6813d changes in travis 2016-10-16 17:21:54 +02:00
yqbk
043ece68f4 enable container tests 2016-10-16 16:55:24 +02:00
Ralf Teusner
ac88956d27 Put blocking score submission call into a thread to keep the puma server responsive 2016-10-12 18:15:16 +02:00
Ralf Teusner
accf0550d7 reworked the exercise edit dialog. Moved javascript part from editor_edit.js.erb to exercises.js.erb.
Manipulated some further javascript as necessary. It is not super elegant, but this is due to the former structure of the code which uses cloned dummy forms.
Integrating the ace editor made some strange calls necessary.
Also fixed toggling the input area and the file upload dialog
2016-10-12 16:35:21 +02:00
Ralf Teusner
4cf192d0f3 fix wrong link in refactor, since "this" is no longer available in javascript calls. 2016-10-12 14:37:09 +02:00
yqbk
1f24e48c5c enable docker initialize 2016-10-11 16:45:56 +02:00
yqbk
f24f7e0c05 remove docker tag to travis 2016-10-11 16:42:48 +02:00
yqbk
52be496e16 add docker tag to travis 2016-10-11 13:33:30 +02:00
yqbk
7a76c4c6f1 try out new code 2016-10-11 13:12:00 +02:00
yqbk
1945a47109 apply changes after review 2016-10-11 12:44:16 +02:00
yqbk
734a0324d4 Merge branch 'travis-green' of github.com:openHPI/codeocean into travis-green 2016-10-08 20:38:02 +02:00
yqbk
44aca293e9 make travis green again 2016-10-08 20:37:20 +02:00
yqbk
a694d0ca33 solve errors 2016-10-08 20:05:25 +02:00
yqbk
304358af5a merge with master 2016-10-08 19:21:26 +02:00
yqbk
15b7986515 make travis green 4 2016-10-08 19:09:15 +02:00
yqbk
1e6cdd5f39 make travis green 3 2016-10-08 19:02:12 +02:00
yqbk
d7d9212de5 make travis green 2 2016-10-08 18:51:52 +02:00
yqbk
f2f51414b0 make travis green 2016-10-08 18:34:42 +02:00
yqbk
674a594fd6 change concurrent ruby version 2016-10-08 18:22:38 +02:00
yqbk
948e6f7e3e only newest ruby 2016-10-08 18:18:17 +02:00
yqbk
3bae736dce no firefox path 2016-10-08 18:16:06 +02:00
yqbk
d47a440838 changes in travis 2016-10-08 18:04:00 +02:00
yqbk
ea745cbb5b require codeclimate 2016-10-08 17:48:28 +02:00
yqbk
c9d209775b change ruby version in travis settings 2016-10-08 17:43:26 +02:00
Ralf Teusner
c88a57c410 some comments and update of gem conccurrent-ruby 2016-10-07 16:38:22 +02:00
Ralf Teusner
1dfd6f61dc some more relative url roots in editor_edit, removed javascript uglifying for staging, added debug message for docker websocket connection url.
added doku for setting up docker daemon for codeocean
2016-10-07 14:16:24 +02:00
Ralf Teusner
59119e43d5 added relative_url_root to some more javascript calls (ace file path, file template path). 2016-10-06 16:32:20 +02:00
Ralf Teusner
58dac37d77 added relative_url_root to URL for websocket call, needed for staging server 2016-10-06 16:14:51 +02:00
Ralf Teusner
d26a0fa6a4 Enhance codeocean events with user agent and external-id if present 2016-09-27 17:56:16 +02:00
Alexander Kastius
31c4f4b608 FIxed typo. 2016-09-09 18:10:08 +02:00
Alexander Kastius
70040b3c6b Reordered everything again. 2016-09-09 18:08:41 +02:00
Alexander Kastius
87d1b2388d Moved codepilot into dedicated file.
Renamed prompt.js
Moved requestComments out of flowr.js
2016-09-09 17:24:04 +02:00
Alexander Kastius
493bf98850 Removed unused functions. 2016-09-09 17:17:54 +02:00
Alexander Kastius
6ff3d36809 Fixed container-ending on exit. 2016-09-09 17:06:30 +02:00
Alexander Kastius
3fd43fdee2 Sending command 'client_kill' on stop button click now.
Killing a container only if command client_kill was send.
Moved propmpt to prompt.js
2016-09-09 16:41:20 +02:00
Ralf Teusner
2b621e2de6 some more code cleanup and UI optimizations 2016-09-09 16:10:43 +02:00
Ralf Teusner
542ec78076 remove some more tab code not used any longer. 2016-09-09 15:43:50 +02:00
Ralf Teusner
46cb071503 remove code that showed tabs and leftovers of serversend events (runmode) 2016-09-09 15:40:53 +02:00
Ralf Teusner
77452e6c2b move progress into sidebar 2016-09-09 15:40:09 +02:00
Ralf Teusner
3cd224c57e re-applied changes for redirect to request for comments 2016-09-09 14:19:47 +02:00
Ralf Teusner
0f76b1cb90 Merge branch 'master' into editor-frontend-refactor
Conflicts:
	app/assets/javascripts/editor.js.erb
---> kept refactored one
2016-09-09 14:17:42 +02:00
Alexander Kastius
8fe9303288 Merge pull request #80 from openHPI/recommend_request_for_comment
Some tidy up in request for comments (bugfix: removed leftover parts …
2016-09-09 14:12:47 +02:00
Ralf Teusner
e67f1f78c4 cleanup logging statements. 2016-09-09 14:11:38 +02:00
Ralf Teusner
d2dab21292 some changes to resizing 2016-09-09 14:04:51 +02:00
Alexander Kastius
bac86cd466 Made editor-resizing possible. 2016-09-09 13:42:51 +02:00