|
|
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 |
|
|
|
fc1266d0d1
|
Added tooltips to sidebar buttons.
|
2016-09-01 14:35:08 +02:00 |
|
|
|
012e11857f
|
ignore staging files
|
2016-09-01 13:53:57 +02:00 |
|
|
|
9895490fa7
|
Merge branch 'editor-js-refactor' into editor-frontend-refactor
|
2016-09-01 12:04:29 +02:00 |
|
|
|
3c6c601b0a
|
Merge branch 'editor-js-refactor' of https://github.com/openHPI/codeocean into editor-js-refactor
|
2016-09-01 12:03:14 +02:00 |
|
|
|
c224cb35a3
|
Merge branch 'editor-js-refactor' into editor-frontend-refactor
|
2016-09-01 12:02:47 +02:00 |
|
|
|
7bf0200094
|
Fixed filetree selection.
|
2016-09-01 12:01:20 +02:00 |
|
|
|
6e516ca31e
|
some minor fixes
|
2016-09-01 11:54:05 +02:00 |
|
|
|
7eea48e705
|
Merge branch 'editor-js-refactor' into editor-frontend-refactor
|
2016-09-01 11:52:05 +02:00 |
|
|
|
7903447a31
|
Fixed autosavelabel.
|
2016-09-01 11:47:49 +02:00 |
|
|
|
5f61c24dc6
|
Fixed socket calls.
|
2016-09-01 11:18:28 +02:00 |
|
|
|
378472f4ed
|
Merge branch 'editor-js-refactor' into editor-frontend-refactor
|
2016-09-01 11:02:08 +02:00 |
|
|
|
81fca2b8c7
|
fixed qa_api binding, changed formatting ...
|
2016-09-01 11:01:44 +02:00 |
|
|
|
dca26cf237
|
Refactored frontend.
Moved output to editor tab.
Added collapse function to sidebar.
|
2016-09-01 10:49:55 +02:00 |
|
|
|
7cfa6a21ee
|
add staging settings for docker.yml.erb
|
2016-08-31 16:03:19 +02:00 |
|
|
|
a9b273a902
|
Changes to support deploy staging
|
2016-08-31 15:54:19 +02:00 |
|
|
|
18d54f4293
|
Merge pull request #77 from openHPI/ace-editor-exercise-edit
Ace editor exercise edit
|
2016-08-29 13:02:57 +02:00 |
|
|
|
21699952ff
|
some renaming
|
2016-08-29 13:00:12 +02:00 |
|
|
|
8abc0bb15a
|
cleanup
|
2016-08-26 13:22:16 +02:00 |
|
|
|
112a8bde42
|
done
|
2016-08-26 13:19:39 +02:00 |
|
|
|
e17782b18d
|
done
|
2016-08-26 13:16:38 +02:00 |
|
|
|
0b6dc5e409
|
Merge branch 'master' into ace-editor-exercise-edit
|
2016-08-26 11:41:07 +02:00 |
|
|
|
cba44680ef
|
save properly
|
2016-08-26 11:38:17 +02:00 |
|
|
|
f757737606
|
fields for instead form for (solved problem with sibmission button)
|
2016-08-26 11:37:57 +02:00 |
|
|
|
12cec1ac22
|
fields for instead form for (solved problem with sibmission button)
|
2016-08-24 14:08:07 +02:00 |
|
|
|
1964c4a31f
|
removed nginx.conf which is not necessary here
|
2016-08-19 16:33:28 +02:00 |
|
|
|
ea21b0cc8d
|
removed tag from travis configuration
|
2016-08-19 16:18:51 +02:00 |
|
|
|
aec7c593d8
|
Moved sockets. Fixed sockets.
|
2016-08-17 17:25:27 +02:00 |
|
|
|
7bead2c473
|
implementation ready for testing
|
2016-08-17 15:53:16 +02:00 |
|
|
|
476188990f
|
separate file for editor in edit view
|
2016-08-17 15:37:36 +02:00 |
|
|
|
9a47f126e4
|
routing error
|
2016-08-17 13:50:01 +02:00 |
|
|
|
6a6ed9f453
|
separate editor for each file
|
2016-08-15 16:06:15 +02:00 |
|
|
|
aa254366db
|
adjustments in file form
|
2016-08-15 15:39:42 +02:00 |
|
