merge master

app/assets/javascripts/application.js

@@ -13,8 +13,8 @@
 //= require jquery
 //= require jquery_ujs
 //= require jquery.mobile.custom.min
-//= require jquery.ui.draggable
-//= require jquery.ui.droppable
+//= require jquery-ui/widgets/draggable
+//= require jquery-ui/widgets/droppable
 //= require waypoints/jquery.waypoints
 
 //= require datatables/jquery.dataTables

app/controllers/admin/booths_controller.rb

@@ -10,7 +10,7 @@ module Admin
       @booth_export_option = params[:booth_export_option]
       respond_to do |format|
         format.html
-        # Explicity call #to_json to avoid the use of EventSerializer
+        # Explicitly call #to_json to avoid the use of EventSerializer
         format.json { render json: Booth.where(state: :confirmed, program: @program).to_json }
         format.xlsx do
           response.headers['Content-Disposition'] = "attachment; filename=\"#{@file_name}.xlsx\""

app/controllers/admin/events_controller.rb

@@ -24,7 +24,7 @@ module Admin
 
       respond_to do |format|
         format.html
-        # Explicity call #to_json to avoid the use of EventSerializer
+        # Explicitly call #to_json to avoid the use of EventSerializer
         format.json { render json: Event.where(state: :confirmed, program: @program).to_json }
         format.xlsx do
           response.headers['Content-Disposition'] = "attachment; filename=\"#{@file_name}.xlsx\""

app/controllers/admin/tracks_controller.rb

@@ -15,7 +15,7 @@ module Admin
 
       respond_to do |format|
         format.html
-        # Explicity call #to_json to avoid the use of EventSerializer
+        # Explicitly call #to_json to avoid the use of EventSerializer
         format.json { render json: Track.where(state: :confirmed, program: @program).to_json }
         format.xlsx do
           response.headers['Content-Disposition'] = "attachment; filename=\"#{@file_name}.xlsx\""

app/controllers/application_controller.rb

@@ -53,7 +53,7 @@ class ApplicationController < ActionController::Base
     Rails.logger.debug('IChain Record was not Unique!')
     sign_out(current_user)
     redirect_to root_path,
-                error: 'Your E-Mail adress is already registered at OSEM. Please contact the admin if you want to attach your openSUSE Account to OSEM!'
+                error: 'Your E-Mail address is already registered at OSEM. Please contact the admin if you want to attach your openSUSE Account to OSEM!'
   end
 
   rescue_from UserDisabled do

app/helpers/application_helper.rb

@@ -69,7 +69,7 @@ module ApplicationHelper
     Comment.accessible_by(current_ability).find_since_last_login(user)
   end
 
-  # Recieves a PaperTrail::Version object
+  # Receives a PaperTrail::Version object
   # Outputs the list of attributes that were changed in the version (ignoring changes from one blank value to another)
   # Eg: If version.changeset = '{"title"=>[nil, "Premium"], "description"=>[nil, "Premium = Super cool"], "conference_id"=>[nil, 3]}'
   # Output will be 'title, description and conference'