Commit Graph

1116 Commits

Author SHA1 Message Date
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
2c23d96fae split code between editors 2016-08-12 16:43:19 +02:00
31b0c3ba25 Ace editor for each file form 2016-08-12 15:29:06 +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
528c039cfc cleanup of editor, removed unused methods and variables. ( code from server send event ) 2016-08-12 14:42:52 +02:00
0ca52a9b8f Fixed turtle. 2016-08-12 14:42:35 +02:00
c12ee49d01 precompile of markdown buttons for edit of exercises. 2016-08-12 14:41:54 +02:00
728489c2fb refactor initTurtle, hiding and showing of canvas. 2016-08-12 14:41:20 +02:00
b6cf5d313a migration 2016-08-12 13:33:55 +02:00
37f4e501c5 Merge remote-tracking branch 'origin/master' into ace-editor-exercise-edit 2016-08-12 13:23:02 +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
6e6c9143cd Some tidy up in request for comments (bugfix: removed leftover parts of requested_at attribute, some UI changes in comment dialog)
Redirect to open rfc if an exercise has been solved
2016-08-11 18:13:33 +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
b8e1cb8dfd additional pending 2016-08-04 16:57:08 +02:00
7efcfa632b come back to green light! 2016-08-04 16:54:55 +02:00
c4a9cd88d8 Merge pull request #78 from openHPI/admin-sumbission-remove
[WIP]Admin sumbission remove
2016-08-04 16:35:26 +02:00