Commit Graph

916 Commits

Author SHA1 Message Date
012e11857f ignore staging files 2016-09-01 13:53:57 +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
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
528c039cfc cleanup of editor, removed unused methods and variables. ( code from server send event ) 2016-08-12 14:42:52 +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
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
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
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