Commit Graph

903 Commits

Author SHA1 Message Date
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
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
aec7c593d8 Moved sockets. Fixed sockets. 2016-08-17 17:25:27 +02:00
97c1c5e455 Fixed context-error in jump to source line. 2016-08-12 14:50:49 +02:00
c04fc85c3b Added docker.yml.erb to gitignore.
Added docker.yml.erb.example
2016-08-12 14:45:08 +02:00
0ca52a9b8f Fixed turtle. 2016-08-12 14:42:35 +02:00
fbb1cfb67b Cleaned up code. 2016-08-12 13:22:52 +02:00
842a38c13a Moved everything into new files. Made editor.js.erb really small. 2016-08-11 23:24:38 +02:00
63f62a8efc Reconfigured docker-yml and added missing (something) to application.rb 2016-08-11 19:01:44 +02:00
269c592bb8 removed jruby from travis build 2016-08-05 14:19:54 +02:00
89391f8c4a removed web-console gem from test environment 2016-08-05 14:19:17 +02:00
c4a9cd88d8 Merge pull request #78 from openHPI/admin-sumbission-remove
[WIP]Admin sumbission remove
2016-08-04 16:35:26 +02:00
0f79c1b1d3 Merge pull request #76 from openHPI/markup-description
Markup description
2016-08-03 15:08:21 +02:00
778b2cdd63 Merge pull request #79 from openHPI/dropdown3
implement dropdown menu
2016-08-03 14:39:31 +02:00
37aac677d1 remove author 2016-08-03 14:37:55 +02:00
bc8abf851d remove statistics 2016-08-03 14:35:15 +02:00
b72b595388 implement dropdown menu 2016-08-03 14:32:01 +02:00
3730376ec1 after merge 2016-08-03 11:22:39 +02:00
81b3299917 Merge pull request #64 from openHPI/score-websocket
Score websocket
2016-07-28 15:52:21 +02:00
79309f6697 prevent printing out "undefined" if no container could be fetched and thus the response has no stdout or stderr. 2016-07-28 15:49:23 +02:00
87901bd89b Merge branch 'master' into score-websocket
Conflicts:
	app/assets/javascripts/editor.js.erb
2016-07-28 15:32:22 +02:00
3e6279d99e Merge pull request #66 from openHPI/feature-file-templates
Feature file templates
2016-07-28 15:23:45 +02:00
ed3526a578 Merge branch 'master' into feature-file-templates
Conflicts:
	app/views/application/_navigation.html.slim
	config/locales/de.yml
	config/locales/en.yml
	db/schema.rb
2016-07-28 15:16:11 +02:00