Merge branch 'development' into feature/aframe-canvasManipulator

Author: AaronSil

.travis.yml

@@ -1,18 +1,18 @@
 before_script:
-  - cp evaluationserver/config/database.travis.yml evaluationserver/config/database.yml
-  - "mysql -e 'create database eval_server_test;'"
-  - cd evaluationserver/
-  - bundle install
-env: 
-  - RAILS_ENV=test
+- cp evaluationserver/config/database.travis.yml evaluationserver/config/database.yml
+- mysql -e 'create database eval_server_test;'
+- cd evaluationserver/
+- bundle install
+env:
+  secure: Nyq2gajx/TWjeIZtGZSkHREgpE0BhuQg6VOscDKKrenN/CPZ/8wT/h3DYrXOTq+Pz4yOGBgDbptXdT4szu88H5lCNcCfzTnyp/Y+NE/t12nheNFrzlm2L4ryF5IvpAHEXJLYkoJRHXvD4FWTsp/SI3RPLMu9ah2J7gheGSHomZKoApYTLp1NjVSRAgrWGjodMHIYC7d40pNoMyMa/i3EDUHLQ3kNc1U3GGmzaj3Et1Ak6UMQeRE5ph9bfYOZy83Cit9DedeEdbdrnvLa23z/UVp/dmpEchd/844MOKoeX8HPpYW1x/1CovYn3/dshf/bhAkMvngTtJCgyrEpWgy9bb5bwnvjOz2FxBFB8eb/7hfK//6fynCCe5XmPahnIddp7kSNmHwaT4zwUSlFIFegaeZyr6uC5JYFue9i1rICSbAKqOc4EmrL9nKY9Mh6CvW232qiSTvNN02CiSZsAKdA61ou3H7X9UK7WeEAIC43WHkuM5Rn9leB6QC5nwp0UUqY6jbGknoDtvq87t2tVIiAy5aPmpKnrf0C4uUmaz6zZWz4vvjHok6Kuh6ut2LucwVvisCJ7wTRSXB43ubCsuOMSDkd7u4JJUPJPlzc57rQoXSBm68bnuy7SQ2l/epQbl/O9lrxkQLA52JxNF8zdMT7ZKfoGQkQZjXF1YNhp4VHmfA=
 language: ruby
 rvm:
-  - 2.5.0
+- 2.5.0
 script:
-  - bundle exec rails db:migrate RAILS_ENV=test
-  - bundle exec rspec
+- bundle exec rails db:migrate RAILS_ENV=test
+- bundle exec rspec
 after_failure:
-  - "mysql -e 'show databases;'"
-  - "cat ./config/database.yml"
-  - "echo $RAILS_ENV"
-  - "bundle exec rake --version"
+- mysql -e 'show databases;'
+- cat ./config/database.yml
+- echo $RAILS_ENV
+- bundle exec rake --version

README.md

@@ -24,7 +24,7 @@ An academic publication about Getaviz you can find [here](https://www.researchga
 
 ### Main Contributors
 
-Getaviz is developed by the research group [Software Visualization In 3D And Virtual Reality](https://home.uni-leipzig.de/svis/) of Leipzig University. It has been developed over several years and is the basic for many scientific publications. In 2018 we released Getaviz as open source to simplify collaboration and practical use of our research prototype. 
+Getaviz is developed by the research group [Visual Software Analytics](https://home.uni-leipzig.de/svis/) at Leipzig University. It has been developed over several years and is the basic for many scientific publications. In 2018 we released Getaviz as open source to simplify collaboration and practical use of our research prototype. 
 
 Currently, four developers are contributung actively to Getaviz:
 * [Richard Müller](https://github.com/rmllr)

evaluationserver/Dockerfile.prod

@@ -74,8 +74,8 @@ gem "font-awesome-rails"
 gem "therubyracer"
 gem "less-rails" #Sprockets (what Rails 3.1 uses for its asset pipeline) supports LESS
 gem 'bootstrap-sass', '~> 3.2.0'
-gem "paperclip", "~> 4.1"
-gem "nokogiri", '1.8.1'
+gem "paperclip"
+gem "nokogiri"
 gem "rubyzip"
 gem "actionmailer"
 #gem "jquery-sortable-rails"

evaluationserver/Gemfile

@@ -42,7 +42,7 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    acts_as_list (0.9.12)
+    acts_as_list (0.9.15)
       activerecord (>= 3.0)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
@@ -52,21 +52,19 @@ GEM
       rails (>= 4.0.0)
     bootstrap-sass (3.2.0.2)
       sass (~> 3.2)
-    brakeman (4.3.0)
+    brakeman (4.3.1)
     builder (3.2.3)
-    capybara (3.1.1)
+    capybara (3.4.1)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      xpath (~> 3.0)
+      xpath (~> 3.1)
     capybara-screenshot (1.0.21)
       capybara (>= 1.0, < 4)
       launchy
     climate_control (0.2.0)
-    cocaine (0.5.8)
-      climate_control (>= 0.0.3, < 1.0)
     cocoon (1.2.11)
     commonjs (0.2.7)
     concurrent-ruby (1.0.5)
@@ -84,15 +82,15 @@ GEM
     factory_bot_rails (4.10.0)
       factory_bot (~> 4.10.0)
       railties (>= 3.0.0)
-    faker (1.8.7)
+    faker (1.9.1)
       i18n (>= 0.7)
-    ffi (1.9.23)
+    ffi (1.9.25)
     font-awesome-rails (4.7.0.4)
       railties (>= 3.2, < 6.0)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     grease (0.3.1)
-    highline (1.7.10)
+    highline (2.0.0)
     i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     i18n-tasks (0.9.21)
@@ -146,21 +144,22 @@ GEM
     multi-select-rails (0.9.12)
       railties (>= 3.0)
     multi_json (1.13.1)
-    mysql2 (0.5.1)
+    mysql2 (0.5.2)
     nio4r (2.3.1)
-    nokogiri (1.8.1)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
-    paperclip (4.2.4)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-      cocaine (~> 0.5.5)
+    paperclip (6.0.0)
+      activemodel (>= 4.2.0)
+      activesupport (>= 4.2.0)
       mime-types
-    parser (2.5.1.0)
+      mimemagic (~> 0.3.0)
+      terrapin (~> 0.6.0)
+    parser (2.5.1.2)
       ast (~> 2.4.0)
     public_suffix (3.0.2)
-    puma (3.11.4)
+    puma (3.12.0)
     rack (2.0.5)
-    rack-test (1.0.0)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.2.0)
       actioncable (= 5.2.0)
@@ -189,7 +188,7 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
     rake (12.3.1)
-    ranked-model (0.4.0)
+    ranked-model (0.4.1)
       activerecord (>= 3.1.12)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
@@ -215,7 +214,7 @@ GEM
     rspec-support (3.7.1)
     ruby_dep (1.5.0)
     rubyzip (1.2.1)
-    sass (3.5.6)
+    sass (3.5.7)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -233,7 +232,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -242,23 +241,25 @@ GEM
       sprockets (>= 3.0.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
+    terrapin (0.6.0)
+      climate_control (>= 0.0.3, < 1.0)
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
     thor (0.20.0)
     thread (0.2.2)
     thread_safe (0.3.6)
     tilt (2.0.8)
-    tinymce-rails (4.7.13)
+    tinymce-rails (4.8.0)
       railties (>= 3.1.1)
     turbolinks (5.1.1)
       turbolinks-source (~> 5.1)
     turbolinks-source (5.1.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.10)
+    uglifier (4.1.15)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.3.3)
+    unicode-display_width (1.4.0)
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
@@ -289,8 +290,8 @@ DEPENDENCIES
   listen
   multi-select-rails
   mysql2
-  nokogiri (= 1.8.1)
-  paperclip (~> 4.1)
+  nokogiri
+  paperclip
   puma
   rails
   rails_serve_static_assets

evaluationserver/Gemfile.lock

@@ -0,0 +1,4 @@
+<li><%= link_to t(:privacy_declaration, scope: :layout), "http://home.uni-leipzig.de/svis/privacy-policy/", target: :_blank %></li>
+<li><%= link_to t(:imprint, scope: :layout), "http://home.uni-leipzig.de/svis/impressum/", target: :_blank %></li>
+
+	 

evaluationserver/app/views/application/_navbar_gdpr_links.html.erb

@@ -13,6 +13,9 @@
 
     <!-- Collect the nav links, forms, and other content for toggling -->
     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+		  <ul class="nav navbar-nav navbar-right">
+				<%= render :partial => "navbar_gdpr_links" %>
+		  </ul>
     </div><!-- /.navbar-collapse -->
   </div><!-- /.container-fluid -->
 </nav>

evaluationserver/app/views/layouts/_blank_header.html.erb

@@ -29,7 +29,8 @@
         </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
-        <li><%= link_to t(:admin_off, scope: :layout), admin_mode_off_path %></li>
+			 <%= render :partial => "navbar_gdpr_links" %>
+			 <li><%= link_to t(:admin_off, scope: :layout), admin_mode_off_path %></li>
       </ul>
     </div><!-- /.navbar-collapse -->
   </div><!-- /.container-fluid -->

evaluationserver/app/views/layouts/_header.html.erb

@@ -14,8 +14,10 @@
 
     <!-- Collect the nav links, forms, and other content for toggling -->
     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right">
-		  <% if content_for?(:remarks) %>
+        <ul class="nav navbar-nav navbar-right">
+				<%= render :partial => "navbar_gdpr_links" %>
+
+			 <% if content_for?(:remarks) %>
 		  <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">Remarks<span class="caret"></span></a>
 			 <ul class="dropdown-menu" role="menu">

evaluationserver/app/views/layouts/_navbar_header.html.erb

@@ -18,6 +18,7 @@
 		  <li><%= link_to t(:experiments, scope: :layout), experiments_path %></li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
+			 <%= render :partial => "navbar_gdpr_links" %>
         <li><%= link_to t(:admin_on, scope: :layout), admin_mode_on_path %></li>
       </ul>
     </div><!-- /.navbar-collapse -->