Merge branch 'master' of github.com:openHPI/codeocean

config/code_ocean.yml.example

@@ -1,11 +1,16 @@
 default: &default
   flowr:
     enabled: false
+  code_pilot:
+    enabled: false
 
 development:
   flowr:
     enabled: true
     url: http://example.org:3000/api/exceptioninfo?id=&lang=auto
+  code_pilot:
+    enabled: false
+    url: //localhost:3000
 
 production:
   <<: *default

config/code_ocean.yml.travis

@@ -1,3 +1,5 @@
 test:
   flowr:
     enabled: false
+  code_pilot:
+    enabled: false

config/locales/de.yml

@@ -209,6 +209,15 @@ de:
       start: Mit dem Programmieren beginnen
       test_count: '<span class="number">%{count}</span> Test-Dateien wurden ausgeführt.'
       workspace: Arbeitsbereich
+      comment:
+        a_comment: Kommentar
+        line: Zeile
+        dialogtitle: Kommentieren Sie diese Zeile!
+        others: Andere Kommentare auf dieser Zeile
+        addyours: Fügen Sie Ihren Kommentar hinzu
+        addComment: Kommentieren
+        removeAllOnLine: Alle Kommentare auf dieser Zeile löschen
+        listing: Die neuesten Kommentaranfragen
     index:
       clone: Duplizieren
       implement: Implementieren

config/locales/en.yml

@@ -209,6 +209,15 @@ en:
       start: Start Coding
       test_count: '<span class="number">%{count}</span> test files have been executed.'
       workspace: Workspace
+      comment:
+        a_comment: comment
+        line: line
+        dialogtitle: Comment on this line!
+        others: Other comments on this line
+        addyours: Add your comment
+        addComment: Comment this
+        removeAllOnLine: Remove all comments on this line
+        listing: Listing the newest comment requests
     index:
       clone: Duplicate
       implement: Implement

config/routes.rb

@@ -1,6 +1,16 @@
 FILENAME_REGEXP = /[\w\.]+/ unless Kernel.const_defined?(:FILENAME_REGEXP)
 
 Rails.application.routes.draw do
+  resources :request_for_comments
+  resources :comments, except: [:destroy] do
+    collection do
+      delete :destroy
+    end
+  end
+
+  delete '/comment_by_id', to: 'comments#destroy_by_id'
+  put '/comments', to: 'comments#update'
+
   root to: 'application#welcome'
 
   namespace :admin do