Commit Graph

3634 Commits

Author SHA1 Message Date
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
41b0c1e530 solve extension probelm 2016-08-03 17:21:49 +02:00
605f64395f Merge remote-tracking branch 'origin/master' into rspec-tests-controllers 2016-08-03 16:24:28 +02:00
eb03ef1e50 pass file to form 2016-08-03 16:22:35 +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
032c201b94 repair database query 2016-08-03 14:08:01 +02:00
4183a16178 merge with master 2016-08-03 12:09:58 +02:00
5c9311cf76 fix indentation in implement2 2016-08-03 11:29:04 +02:00
f6a7f6ee1c fix indentation in implement 2016-08-03 11:25:52 +02:00
3730376ec1 after merge 2016-08-03 11:22:39 +02:00
984d592426 remove form2 2016-08-02 17:00:52 +02:00
23989dbc6c cleanup + rm 2016-08-02 16:59:24 +02:00
e1d0416a15 remove some files 2016-08-02 16:31:54 +02:00
8be492b083 Merge branch 'ace-editor-exercise-edit' of github.com:openHPI/codeocean into ace-editor-exercise-edit 2016-08-02 16:27:11 +02:00
5b56ac34e2 cleanup 2016-08-02 16:26:55 +02:00
284ab22228 cleanup3 2016-08-02 16:23:44 +02:00
341e4cb5c8 cleanup 2016-08-02 16:07:31 +02:00
cb35a88080 ace editor in edit mode 2016-08-02 15:12:06 +02:00
de866d00ca ace with files 2016-08-02 15:02:02 +02:00
f7eaa24a1d revert mistakes 2016-08-02 12:47:11 +02:00
f204304a2c improvements2 2016-08-02 12:42:27 +02:00
e851101f53 ace editor in edit view! 2016-07-28 18:37:13 +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
e86a8f538e comments 2016-07-27 17:15:07 +02:00
9b66d61998 tests 2016-07-25 18:41:52 +02:00