Commit Graph

1317 Commits

Author SHA1 Message Date
f2f51414b0 make travis green 2016-10-08 18:34:42 +02:00
674a594fd6 change concurrent ruby version 2016-10-08 18:22:38 +02:00
948e6f7e3e only newest ruby 2016-10-08 18:18:17 +02:00
3bae736dce no firefox path 2016-10-08 18:16:06 +02:00
d47a440838 changes in travis 2016-10-08 18:04:00 +02:00
ea745cbb5b require codeclimate 2016-10-08 17:48:28 +02:00
c9d209775b change ruby version in travis settings 2016-10-08 17:43:26 +02:00
c88a57c410 some comments and update of gem conccurrent-ruby 2016-10-07 16:38:22 +02:00
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
59119e43d5 added relative_url_root to some more javascript calls (ace file path, file template path). 2016-10-06 16:32:20 +02:00
58dac37d77 added relative_url_root to URL for websocket call, needed for staging server 2016-10-06 16:14:51 +02:00
d26a0fa6a4 Enhance codeocean events with user agent and external-id if present 2016-09-27 17:56:16 +02:00
31c4f4b608 FIxed typo. 2016-09-09 18:10:08 +02:00
70040b3c6b Reordered everything again. 2016-09-09 18:08:41 +02:00
87d1b2388d Moved codepilot into dedicated file.
Renamed prompt.js
Moved requestComments out of flowr.js
2016-09-09 17:24:04 +02:00
493bf98850 Removed unused functions. 2016-09-09 17:17:54 +02:00
6ff3d36809 Fixed container-ending on exit. 2016-09-09 17:06:30 +02:00
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
2b621e2de6 some more code cleanup and UI optimizations 2016-09-09 16:10:43 +02:00
542ec78076 remove some more tab code not used any longer. 2016-09-09 15:43:50 +02:00
46cb071503 remove code that showed tabs and leftovers of serversend events (runmode) 2016-09-09 15:40:53 +02:00
77452e6c2b move progress into sidebar 2016-09-09 15:40:09 +02:00
3cd224c57e re-applied changes for redirect to request for comments 2016-09-09 14:19:47 +02:00
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
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
e67f1f78c4 cleanup logging statements. 2016-09-09 14:11:38 +02:00
d2dab21292 some changes to resizing 2016-09-09 14:04:51 +02:00
bac86cd466 Made editor-resizing possible. 2016-09-09 13:42:51 +02:00
952cc5ec24 Moved buttons to the top. 2016-09-09 13:21:51 +02:00
8f499b72da Feature: Auto-Completion in Source Code
+ allow flags for exercises
2016-09-07 17:34:20 +02:00
e45426635d rename application from Code Ocean to CodeOcean 2016-09-02 15:06:11 +02:00
99f1fe45a3 Allow to specify a branch to deploy for staging 2016-09-02 15:05:48 +02:00
b8da4dea17 Merge branch 'master' into editor-frontend-refactor
Conflicts:
	app/assets/javascripts/editor.js.erb
	app/views/exercises/implement.html.slim
2016-09-02 15:04:18 +02:00
18c8927e86 set height of ace editor to 600px. 2016-09-01 18:47:32 +02:00
ddaed5929b Naming of sidebars 2016-09-01 18:47:16 +02:00
c2bdcc7915 Added more height! 2016-09-01 17:54:04 +02:00
f170fee6a9 Replaced hr with enforced margin. 2016-09-01 17:49:59 +02:00
1670839ecf Fixed part of prompt. 2016-09-01 17:41:00 +02:00
bbd372916a Merge branch 'editor-frontend-refactor' of https://github.com/openHPI/codeocean into editor-frontend-refactor 2016-09-01 17:32:11 +02:00
eacaa665f6 make websocket flush accessible. 2016-09-01 17:31:46 +02:00
11d284b166 Disabled file tree and collapsed sidebar when filetree should be disabled. 2016-09-01 17:31:18 +02:00
0d550a44af send exit commands from rails server when score or test have finished - this is needed to reset the buttons in the frontend correctly. 2016-09-01 17:15:44 +02:00
9ec9f01257 Added handler for exit command. 2016-09-01 17:03:28 +02:00
333a72c996 Added url param. 2016-09-01 16:50:10 +02:00
1f159ce0bd some cleanup,
reducing size of questions sidebar
2016-09-01 16:48:55 +02:00
1c7b4c931b Added german locale. 2016-09-01 16:29:45 +02:00
e42330cf1b Added tooltip to request-comments button.
Added locale for all new texts.
2016-09-01 16:27:40 +02:00
0ca1cbaa14 Fixed file-creation-modal 2016-09-01 15:41:56 +02:00
858bbdab95 Fixed button. 2016-09-01 15:34:54 +02:00
b24db1dca0 Toggle description
Tooltips fixed
Buttons moved
2016-09-01 15:23:58 +02:00