Commit Graph

997 Commits

Author SHA1 Message Date
e788e145f1 Update LOCAL_SETUP.md ( Make docker daemon useable without sudo ) 2016-11-11 15:40:48 +01:00
0b3271f3da Update LOCAL_SETUP.md 2016-11-10 18:04:12 +01:00
bf98b86215 Update LOCAL_SETUP.md 2016-11-10 18:03:14 +01:00
2b5bbcb84f Update LOCAL_SETUP.md 2016-11-10 18:01:36 +01:00
4389bae57f Update LOCAL_SETUP.md 2016-11-10 17:15:12 +01:00
216afb6c64 Update LOCAL_SETUP.md 2016-11-10 17:14:57 +01:00
d69ab5dd98 Update LOCAL_SETUP.md 2016-11-10 17:08:16 +01:00
822d4b67ae Update LOCAL_SETUP.md 2016-11-10 17:06:10 +01:00
b7bced65c5 Merge pull request #81 from openHPI/editor-frontend-refactor
Editor frontend refactor
2016-11-09 18:11:02 +01:00
bfa12899a5 adjust german locales to comply with the standard form of address 2016-11-09 18:09:24 +01:00
1511941d3d Merge branch 'master' into editor-frontend-refactor
Conflicts:
	codeocean-dockerconfig.md
2016-11-09 18:00:40 +01:00
ff7446fde6 redirect to RFCs on max score: redirect users to their own RFCs if they are open, fixed wrong usage of user_id (external_id is not used in RFCs, normal id has to be used!). 2016-11-09 17:58:10 +01:00
e8f93cb870 Removed bin folder from linked_dirs in deploy, otherwise no rails console can be started on the servers, because the directory will be empty (as stated on several stackoverflow questions, for example: http://stackoverflow.com/questions/29039927/rails-4-doesnt-detect-application-after-capistrano-deployment ) 2016-11-09 17:56:56 +01:00
b0ceeea650 fix retrieval of relative_url_root also for other calls. 2016-10-28 17:22:31 +02:00
181578ca87 change call to retrieve relative_url_root 2016-10-28 17:13:21 +02:00
ac88956d27 Put blocking score submission call into a thread to keep the puma server responsive 2016-10-12 18:15:16 +02:00
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
4cf192d0f3 fix wrong link in refactor, since "this" is no longer available in javascript calls. 2016-10-12 14:37:09 +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