Merge branch 'master' into lodging-link

2018-01-05 00:37:27 +05:30 · 2018-01-05 00:37:27 +05:30 · 60de9bae46
commit 60de9bae46
parent 83bdcc969c e5948698db
205 changed files with 1784 additions and 1119 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@ -0,0 +1,15 @@
+**I'm submitting a ..**
+- [ ] Bug Report
+- [ ] Feature Request
+
+**Current behavior:**
+<!-- Describe the bug -->
+
+**Expected correct behavior:**
+<!-- Describe what should happen, without the bug. -->
+
+**Steps to reproduce:**
+<!-- If you are able to illustrate the bug or feature request with an example, please provide steps to reproduce it. -->
+
+**Other information:**
+<!-- List any other information that is relevant to your issue. Stack traces, related issues, suggestions on how to fix, Stack Overflow links, forum links, etc. -->
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -0,0 +1,19 @@
+**Checklist**
+
+- [ ] I have read the [Contribution & Best practices Guide](https://github.com/openSUSE/osem/blob/master/CONTRIBUTING.md).
+- [ ] My branch is up-to-date with the upstream `master` branch.
+- [ ] The tests pass locally with my changes.
+- [ ] I have added tests that prove my fix is effective or that my feature works(if appropriate).
+- [ ] I have added necessary documentation (if appropriate).
+
+**Short description of what this resolves/which [issues](https://github.com/openSUSE/osem/issues) does this fix?:**
+
+<!-- List the issue number resolved with this change; if there is no open issue, describe the problem this request solves -->
+
+-
+
+**Changes proposed in this pull request:**
+
+<!-- Summarize the changes, using declarative language. -->
+
+-
--- a/.haml-lint_todo.yml
+++ b/.haml-lint_todo.yml
@ -121,20 +121,9 @@ linters:
      - "app/views/conference_registrations/_registration_info.html.haml"
      - "app/views/conference_registrations/_volunteer.html.haml"
      - "app/views/conference_registrations/show.html.haml"
-      - "app/views/conferences/_booths.html.haml"
-      - "app/views/conferences/_call_for_paper.html.haml"
      - "app/views/conferences/_conference_details.html.haml"
      - "app/views/conferences/_gallery.html.haml"
-      - "app/views/conferences/_lodging.html.haml"
-      - "app/views/conferences/_program.html.haml"
-      - "app/views/conferences/_registration.html.haml"
-      - "app/views/conferences/_schedule_splashpage.html.haml"
-      - "app/views/conferences/_sponsors.html.haml"
-      - "app/views/conferences/_tickets.html.haml"
-      - "app/views/conferences/_venue.html.haml"
-      - "app/views/conferences/_venue_map.html.haml"
      - "app/views/conferences/index.html.haml"
-      - "app/views/conferences/show.html.haml"
      - "app/views/devise/confirmations/new.html.haml"
      - "app/views/devise/ichain_sessions/new.html.haml"
      - "app/views/devise/ichain_sessions/new_test.html.haml"
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@ -1,19 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-07-14 12:03:16 +0000 using RuboCop version 0.49.1.
+# on 2017-11-27 22:40:12 +0530 using RuboCop version 0.51.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.

-# Offense count: 15
-# Cop supports --auto-correct.
-# Configuration parameters: Include, TreatCommentsAsGroupSeparators.
-# Include: **/Gemfile, **/gems.rb
-Bundler/OrderedGems:
-  Exclude:
-    - 'Gemfile'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
@ -46,7 +38,7 @@ Layout/EmptyLineAfterMagicComment:
  Exclude:
    - 'spec/models/conference_spec.rb'

-# Offense count: 104
+# Offense count: 109
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: empty_lines, no_empty_lines
@ -151,7 +143,7 @@ Layout/MultilineHashBraceLayout:
 Layout/MultilineMethodCallBraceLayout:
  Enabled: false

-# Offense count: 55
+# Offense count: 53
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
 # SupportedStyles: aligned, indented, indented_relative_to_receiver
@ -192,10 +184,11 @@ Layout/SpaceAroundOperators:
  Exclude:
    - 'lib/tasks/data.rake'

-# Offense count: 416
+# Offense count: 463
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle, SupportedStyles, SupportedStylesForEmptyBraces.
 # SupportedStyles: space, no_space
+# SupportedStylesForEmptyBraces: space, no_space
 Layout/SpaceBeforeBlockBraces:
  Enabled: false

@ -205,20 +198,13 @@ Layout/SpaceBeforeComma:
  Exclude:
    - 'lib/tasks/data_demo.rake'

-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment.
-Layout/SpaceBeforeFirstArg:
-  Exclude:
-    - 'spec/controllers/admin/roles_controller_spec.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Layout/SpaceBeforeSemicolon:
  Exclude:
    - 'Guardfile'

-# Offense count: 51
+# Offense count: 54
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces, SpaceBeforeBlockParameters.
 # SupportedStyles: space, no_space
@ -293,6 +279,13 @@ Lint/IneffectiveAccessModifier:
    - 'app/models/conference.rb'

 # Offense count: 2
+Lint/RescueWithoutErrorClass:
+  Exclude:
+    - 'app/controllers/users/omniauth_callbacks_controller.rb'
+    - 'lib/tasks/migrate_config.rake'
+
+# Offense count: 2
+# Cop supports --auto-correct.
 Lint/ScriptPermission:
  Exclude:
    - 'Guardfile'
@ -305,49 +298,41 @@ Lint/UnusedBlockArgument:
  Exclude:
    - 'lib/tasks/user.rake'

-# Offense count: 114
+# Offense count: 136
 Metrics/AbcSize:
  Max: 86

-# Offense count: 233
+# Offense count: 258
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
  Max: 471

-# Offense count: 23
+# Offense count: 28
 Metrics/CyclomaticComplexity:
-  Max: 12
-  Exclude:
-    - 'app/models/track.rb'
+  Max: 14

-# Offense count: 2353
+# Offense count: 2774
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
  Max: 619

-# Offense count: 120
+# Offense count: 133
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
  Max: 56
-  Exclude:
-    - 'app/models/admin_ability.rb'

-# Offense count: 3
+# Offense count: 4
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 159
-  Exclude:
-    - 'app/helpers/format_helper.rb'
-
-# Offense count: 15
-Metrics/PerceivedComplexity:
-  Max: 16
-  Exclude:
-    - 'app/models/track.rb'
+  Max: 171

 # Offense count: 20
-Style/AccessorMethodName:
+Metrics/PerceivedComplexity:
+  Max: 16
+
+# Offense count: 20
+Naming/AccessorMethodName:
  Exclude:
    - 'app/controllers/admin/events_controller.rb'
    - 'app/controllers/application_controller.rb'
@ -356,6 +341,42 @@ Style/AccessorMethodName:
    - 'app/models/target.rb'
    - 'app/models/user.rb'

+# Offense count: 2
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
+Naming/FileName:
+  Exclude:
+    - 'Gemfile'
+    - 'Vagrantfile'
+
+# Offense count: 2
+# Configuration parameters: Blacklist.
+# Blacklist: END, (?-mix:EO[A-Z]{1})
+Naming/HeredocDelimiterNaming:
+  Exclude:
+    - 'spec/factories/users.rb'
+    - 'spec/models/user_spec.rb'
+
+# Offense count: 2
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist, MethodDefinitionMacros.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+# MethodDefinitionMacros: define_method, define_singleton_method
+Naming/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+    - 'app/models/comment.rb'
+    - 'app/models/contact.rb'
+
+# Offense count: 2
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: snake_case, normalcase, non_integer
+Naming/VariableNumber:
+  Exclude:
+    - 'spec/models/ticket_purchase_spec.rb'
+
+
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
@ -386,7 +407,15 @@ Style/ConditionalAssignment:
    - 'db/migrate/20140610165551_migrate_data_person_to_user.rb'
    - 'db/migrate/20140820124117_undo_wrong_migration20140801080705_add_users_to_events.rb'

-# Offense count: 464
+# Offense count: 9
+Style/DateTime:
+  Exclude:
+    - 'app/models/conference.rb'
+    - 'app/models/program.rb'
+    - 'spec/models/conference_spec.rb'
+    - 'spec/models/program_spec.rb'
+
+# Offense count: 488
 Style/Documentation:
  Enabled: false

@ -419,14 +448,13 @@ Style/EmptyMethod:
    - 'db/migrate/20130216122155_set_registration_defaults_to_false.rb'

 # Offense count: 2
-# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
-# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
-Style/FileName:
+# Cop supports --auto-correct.
+Style/Encoding:
  Exclude:
-    - 'Gemfile'
-    - 'Vagrantfile'
+    - 'app/uploaders/picture_uploader.rb'
+    - 'spec/models/conference_spec.rb'

-# Offense count: 24
+# Offense count: 32
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
  Enabled: false
@ -445,7 +473,6 @@ Style/HashSyntax:
 # Configuration parameters: MaxLineLength.
 Style/IfUnlessModifier:
  Exclude:
-    - 'app/controllers/admin/booths_controller.rb'
    - 'app/controllers/admin/events_controller.rb'
    - 'app/controllers/api/v1/events_controller.rb'
    - 'app/controllers/conference_registrations_controller.rb'
@ -454,7 +481,6 @@ Style/IfUnlessModifier:
    - 'app/models/commercial.rb'
    - 'app/models/conference.rb'
    - 'app/models/email_settings.rb'
-    - 'app/models/ticket_purchase.rb'
    - 'app/models/user.rb'
    - 'db/migrate/20151031092713_change_conference_id_to_venue_id_in_rooms.rb'
    - 'lib/tasks/events_registrations.rake'
@ -469,7 +495,7 @@ Style/LineEndConcatenation:
    - 'spec/features/conference_spec.rb'
    - 'spec/features/registration_periods_spec.rb'

-# Offense count: 6
+# Offense count: 9
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: require_parentheses, require_no_parentheses, require_no_parentheses_except_multiline
@ -498,12 +524,14 @@ Style/MutableConstant:

 # Offense count: 4
 # Cop supports --auto-correct.
+# Configuration parameters: Whitelist.
+# Whitelist: be, be_a, be_an, be_between, be_falsey, be_kind_of, be_instance_of, be_truthy, be_within, eq, eql, end_with, include, match, raise_error, respond_to, start_with
 Style/NestedParenthesizedCalls:
  Exclude:
    - 'spec/features/conference_spec.rb'
    - 'spec/models/conference_spec.rb'

-# Offense count: 26
+# Offense count: 27
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
 # SupportedStyles: skip_modifier_ifs, always
@ -548,6 +576,12 @@ Style/OptionalArguments:
  Exclude:
    - 'app/models/event.rb'

+# Offense count: 1
+# Cop supports --auto-correct.
+Style/OrAssignment:
+  Exclude:
+    - 'app/controllers/schedules_controller.rb'
+
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: AllowSafeAssignment.
@ -557,7 +591,7 @@ Style/ParenthesesAroundCondition:
    - 'app/controllers/application_controller.rb'
    - 'app/helpers/format_helper.rb'

-# Offense count: 14
+# Offense count: 15
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
@ -571,20 +605,9 @@ Style/PercentLiteralDelimiters:
    - 'app/models/contact.rb'
    - 'app/models/registration.rb'
    - 'app/models/subscription.rb'
+    - 'app/models/track.rb'
    - 'app/uploaders/picture_uploader.rb'
    - 'spec/models/program_spec.rb'
-    - 'app/models/track.rb'
-
-# Offense count: 2
-# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
-# NamePrefix: is_, has_, have_
-# NamePrefixBlacklist: is_, has_, have_
-# NameWhitelist: is_a?
-Style/PredicateName:
-  Exclude:
-    - 'spec/**/*'
-    - 'app/models/comment.rb'
-    - 'app/models/contact.rb'

 # Offense count: 1
 # Cop supports --auto-correct.
@ -607,16 +630,6 @@ Style/RedundantParentheses:
  Exclude:
    - 'app/controllers/admin/base_controller.rb'

-# Offense count: 9
-# Cop supports --auto-correct.
-# Configuration parameters: AllowMultipleReturnValues.
-Style/RedundantReturn:
-  Exclude:
-    - 'app/helpers/application_helper.rb'
-    - 'app/helpers/format_helper.rb'
-    - 'app/helpers/paths_helper.rb'
-    - 'app/helpers/users_helper.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
@ -662,7 +675,7 @@ Style/StringLiteralsInInterpolation:
  Exclude:
    - 'lib/tasks/dump_db.rake'

-# Offense count: 73
+# Offense count: 79
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, MinSize, SupportedStyles.
 # SupportedStyles: percent, brackets
@ -701,17 +714,3 @@ Style/TrailingCommaInLiteral:
    - 'Guardfile'
    - 'db/migrate/20140701123203_add_events_per_week_to_conference.rb'
    - 'spec/models/conference_spec.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-Style/UnneededInterpolation:
-  Exclude:
-    - 'app/helpers/format_helper.rb'
-    - 'spec/controllers/admin/conferences_controller_spec.rb'
-
-# Offense count: 2
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: snake_case, normalcase, non_integer
-Style/VariableNumber:
-  Exclude:
-    - 'spec/models/ticket_purchase_spec.rb'
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -82,7 +82,7 @@ You can read through current enabled rules in `.rubocop.yml` file. Explanations
 Additionally you can read through the [ruby style-guide](https://github.com/bbatsov/ruby-style-guide) to better understand core principles.

 ### Test Suite
-We are using [rspec](http://rspec.info/)+[capybara](http://jnicklas.github.io/capybara/)+[factory girl](https://github.com/thoughtbot/factory_girl) as a test suite. You can run it locally
+We are using [rspec](http://rspec.info/)+[capybara](http://teamcapybara.github.io/capybara/)+[factory girl](https://github.com/thoughtbot/factory_girl) as a test suite. You can run it locally

 ```shell
 vagrant exec bundle exec rspec
--- a/5
+++ b/5
@ -38,7 +38,10 @@ RUN chown -R osem.root /osem/ && \
 # data directory is used to cache the secret key in a file
 ENV DATA_DIR /data
 RUN install -d -m 0770 -o osem -g root $DATA_DIR
-VOLUME ["$DATA_DIR"]
+# data persistence for uploaded files (logos, other pictures, etc)
+RUN mkdir 0775 -p /osem/tmp/cache /osem/tmp/uploads/ && \
+       chown -R  osem.osem /osem/tmp/
+VOLUME ["$DATA_DIR", "/osem/tmp/uploads/", "/osem/public/system/"]

 USER osem
 EXPOSE 9292
--- a/47
+++ b/47
@ -6,7 +6,10 @@ if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.8.4')
 end

 # as web framework
-gem 'rails', '~> 4.2.8'
+gem 'rails', '~> 5.0.5'
+
+# Use Puma as the app server
+gem 'puma', '~> 3.0'

 # enables serving assets in production and setting your logger to standard out
 # both of which are required to run an application on a twelve-factor provider
@ -27,11 +30,11 @@ gem 'paper_trail'

 # for upload management
 gem 'carrierwave'
-gem 'mini_magick'
 gem 'carrierwave-bombshelter'
+gem 'mini_magick'

 # for internationalizing
-gem 'rails-i18n', '~> 4.0.0'
+gem 'rails-i18n', '~> 5.0.0'

 # as authentification framework
 gem 'devise'
@ -40,15 +43,15 @@ gem 'devise_ichain_authenticatable'
 # for openID authentication
 gem 'omniauth'
 gem 'omniauth-facebook'
-gem 'omniauth-openid'
-gem 'omniauth-google-oauth2'
 gem 'omniauth-github'
+gem 'omniauth-google-oauth2'
+gem 'omniauth-openid'

 # Bot-filtering
 gem 'recaptcha', require: 'recaptcha/rails'

 # as authorization framework
-gem 'cancancan'
+gem 'cancancan', '~> 2.0'

 # for roles
 gem 'rolify'
@ -60,8 +63,8 @@ gem 'unobtrusive_flash', '>=3'
 gem 'transitions', :require => %w( transitions active_record/transitions )

 # for comments
-gem 'awesome_nested_set', '~> 3.1.3'
 gem 'acts_as_commentable_with_threading'
+gem 'awesome_nested_set', '~> 3.1.3'

 # as templating language
 gem 'haml-rails'
@ -73,11 +76,11 @@ gem 'sass-rails', '>= 4.0.2'
 gem 'uglifier', '>= 1.3.0'

 # as the front-end framework
-gem 'bootstrap-sass', '~> 3.3.4.1'
 gem 'autoprefixer-rails'
-gem 'formtastic-bootstrap'
-gem 'formtastic', '~> 3.1.1'
+gem 'bootstrap-sass', '~> 3.3.4.1'
 gem 'cocoon'
+gem 'formtastic', '~> 3.1.5'
+gem 'formtastic-bootstrap'

 # as the JavaScript library
 gem 'jquery-rails'
@ -108,8 +111,8 @@ source 'https://rails-assets.org' do
  gem 'rails-assets-waypoints'
  # for markdown editors
  gem 'rails-assets-bootstrap-markdown'
-  gem 'rails-assets-to-markdown'
  gem 'rails-assets-markdown'
+  gem 'rails-assets-to-markdown'
 end

 # as date picker
@ -129,9 +132,9 @@ gem 'gravtastic'
 gem 'country_select'

 # as PDF generator
+gem 'prawn-qrcode', '~> 0.2.2.1'
 gem 'prawn_rails'
 gem 'rqrcode'
-gem 'prawn-qrcode', '~> 0.2.2.1'

 # to render XLS spreadsheets
 gem 'axlsx', git: 'https://github.com/randym/axlsx.git'
@ -157,12 +160,11 @@ gem 'rdoc-generator-fivefish'

 # for visitor tracking
 gem 'ahoy_matey'
-gem 'activeuuid'
 gem 'piwik_analytics', '~> 1.0.1'

 # for recurring jobs
-gem 'whenever', :require => false
 gem 'delayed_job_active_record'
+gem 'whenever', :require => false

 # to run scripts
 gem 'daemons'
@ -177,7 +179,7 @@ gem 'acts_as_list'
 gem 'bootstrap-switch-rails', '~> 3.0.0'

 # for parsing OEmbed data
-gem 'ruby-oembed'
+gem 'ruby-oembed', '~>0.12.0'

 # for uploading images to the cloud
 gem 'cloudinary'
@ -212,14 +214,17 @@ gem 'selectize-rails'
 # CVE-2017-9049, CVE-2017-9050
 gem 'nokogiri', '>= 1.8.1'

+# memcached binary connector
+gem 'dalli'
+
 # Use guard and spring for testing in development
 group :development do
  # to launch specs when files are modified
  gem 'guard-rspec'
-  gem 'spring-commands-rspec'
  gem 'haml_lint', '~> 0.24.0'
+  gem 'spring-commands-rspec'
  # for static code analisys
-  gem 'rubocop', '~> 0.49.0', require: false
+  gem 'rubocop', '~> 0.51.0', require: false
  # as database
  gem 'sqlite3'
  # to open mails
@ -234,11 +239,11 @@ end

 group :test do
  # as test framework
-  gem 'rspec-rails', '~> 3.5', '>= 3.5.2'
-  gem 'database_cleaner'
  gem 'capybara'
-  gem 'poltergeist'
+  gem 'database_cleaner'
  gem 'phantomjs', :require => 'phantomjs/poltergeist'
+  gem 'poltergeist'
+  gem 'rspec-rails', '~> 3.5', '>= 3.5.2'
  # for measuring test coverage
  gem 'coveralls', require: false
  # for describing models
@ -253,6 +258,8 @@ group :test do
  gem 'stripe-ruby-mock'
  # For validating JSON schemas
  gem 'json-schema'
+  # For using 'assigns' in tests
+  gem 'rails-controller-testing'
 end

 group :development, :test do
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -12,62 +12,65 @@ GEM
  remote: https://rubygems.org/
  remote: https://rails-assets.org/
  specs:
-    actionmailer (4.2.9)
-      actionpack (= 4.2.9)
-      actionview (= 4.2.9)
-      activejob (= 4.2.9)
+    actioncable (5.0.5)
+      actionpack (= 5.0.5)
+      nio4r (>= 1.2, < 3.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.5)
+      actionpack (= 5.0.5)
+      actionview (= 5.0.5)
+      activejob (= 5.0.5)
      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.9)
-      actionview (= 4.2.9)
-      activesupport (= 4.2.9)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.5)
+      actionview (= 5.0.5)
+      activesupport (= 5.0.5)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.9)
-      activesupport (= 4.2.9)
+    actionview (5.0.5)
+      activesupport (= 5.0.5)
      builder (~> 3.1)
      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.0.3)
    active_model_serializers (0.9.4)
      activemodel (>= 3.2)
-    activejob (4.2.9)
-      activesupport (= 4.2.9)
-      globalid (>= 0.3.0)
-    activemodel (4.2.9)
-      activesupport (= 4.2.9)
-      builder (~> 3.1)
-    activerecord (4.2.9)
-      activemodel (= 4.2.9)
-      activesupport (= 4.2.9)
-      arel (~> 6.0)
-    activesupport (4.2.9)
+    activejob (5.0.5)
+      activesupport (= 5.0.5)
+      globalid (>= 0.3.6)
+    activemodel (5.0.5)
+      activesupport (= 5.0.5)
+    activerecord (5.0.5)
+      activemodel (= 5.0.5)
+      activesupport (= 5.0.5)
+      arel (~> 7.0)
+    activesupport (5.0.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (~> 0.7)
      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
      tzinfo (~> 1.1)
-    activeuuid (0.6.1)
-      activerecord (>= 3.1)
-      uuidtools
    acts_as_commentable_with_threading (1.2.0)
      activerecord (>= 3.0)
      activesupport (>= 3.0)
      awesome_nested_set (>= 2.0)
-    acts_as_list (0.4.0)
+    acts_as_list (0.9.7)
      activerecord (>= 3.0)
    addressable (2.5.1)
      public_suffix (~> 2.0, >= 2.0.2)
-    ahoy_matey (1.0.0)
+    ahoy_matey (1.6.0)
      addressable
-      browser (>= 0.4.0)
+      browser (~> 2.0)
      geocoder
-      referer-parser
+      rack-attack (< 6)
+      railties
+      referer-parser (>= 0.3.0)
      request_store
+      safely_block (>= 0.1.1)
      user_agent_parser
      uuidtools
-    arel (6.0.4)
+    arel (7.1.4)
    ast (2.3.0)
    autoprefixer-rails (7.1.1)
      execjs
@ -86,10 +89,10 @@ GEM
    bootstrap-switch-rails (3.0.2)
    bootstrap3-datetimepicker-rails (3.0.3)
      momentjs-rails (>= 2.8.1)
-    browser (0.6.0)
+    browser (2.5.1)
    builder (3.2.3)
    byebug (9.0.6)
-    cancancan (1.13.1)
+    cancancan (2.0.0)
    capybara (2.6.2)
      addressable
      mime-types (>= 1.16)
@ -142,9 +145,10 @@ GEM
      safe_yaml (~> 1.0.0)
    currencies (0.4.2)
    daemons (1.1.9)
+    dalli (2.7.6)
    dante (0.2.0)
    database_cleaner (1.3.0)
-    debug_inspector (0.0.2)
+    debug_inspector (0.0.3)
    delayed_job (4.1.3)
      activesupport (>= 3.0, < 5.2)
    delayed_job_active_record (4.1.2)
@ -166,6 +170,7 @@ GEM
    dotenv-rails (2.2.1)
      dotenv (= 2.2.1)
      railties (>= 3.2, < 5.2)
+    errbase (0.0.3)
    erubis (2.7.0)
    execjs (2.6.0)
    factory_girl (4.5.0)
@ -184,11 +189,11 @@ GEM
    font-awesome-rails (4.7.0.2)
      railties (>= 3.2, < 5.2)
    formatador (0.2.5)
-    formtastic (3.1.3)
+    formtastic (3.1.5)
      actionpack (>= 3.2.13)
    formtastic-bootstrap (3.1.1)
      formtastic (>= 3.0)
-    geocoder (1.2.2)
+    geocoder (1.4.4)
    globalid (0.4.0)
      activesupport (>= 4.2.0)
    gravtastic (3.2.6)
@ -288,9 +293,10 @@ GEM
    multi_json (1.12.1)
    multi_xml (0.5.5)
    multipart-post (2.0.0)
-    mysql2 (0.4.9)
+    mysql2 (0.4.10)
    nenv (0.3.0)
    netrc (0.11.0)
+    nio4r (2.1.0)
    nokogiri (1.8.1)
      mini_portile2 (~> 2.3.0)
    notiffany (0.1.1)
@ -325,9 +331,9 @@ GEM
      activerecord (>= 3.0, < 6.0)
      activesupport (>= 3.0, < 6.0)
      request_store (~> 1.1)
-    parallel (1.11.2)
-    parser (2.4.0.0)
-      ast (~> 2.2)
+    parallel (1.12.0)
+    parser (2.4.0.2)
+      ast (~> 2.3)
    pdf-core (0.2.5)
    phantomjs (2.1.1.0)
    piwik_analytics (1.0.2)
@ -354,23 +360,27 @@ GEM
      method_source (~> 0.8.1)
      slop (~> 3.4)
    public_suffix (2.0.5)
-    rack (1.6.8)
+    puma (3.10.0)
+    rack (2.0.3)
+    rack-attack (5.0.1)
+      rack
    rack-openid (1.3.1)
      rack (>= 1.1.0)
      ruby-openid (>= 2.1.8)
    rack-test (0.6.3)
      rack (>= 1.0)
-    rails (4.2.9)
-      actionmailer (= 4.2.9)
-      actionpack (= 4.2.9)
-      actionview (= 4.2.9)
-      activejob (= 4.2.9)
-      activemodel (= 4.2.9)
-      activerecord (= 4.2.9)
-      activesupport (= 4.2.9)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.9)
-      sprockets-rails
+    rails (5.0.5)
+      actioncable (= 5.0.5)
+      actionmailer (= 5.0.5)
+      actionpack (= 5.0.5)
+      actionview (= 5.0.5)
+      activejob (= 5.0.5)
+      activemodel (= 5.0.5)
+      activerecord (= 5.0.5)
+      activesupport (= 5.0.5)
+      bundler (>= 1.3.0)
+      railties (= 5.0.5)
+      sprockets-rails (>= 2.0.0)
    rails-assets-bootstrap (3.3.6)
      rails-assets-jquery (>= 1.9.1, < 3)
    rails-assets-bootstrap-markdown (2.10.0)
@ -388,30 +398,32 @@ GEM
    rails-assets-to-markdown (1.3.0)
    rails-assets-trianglify (0.4.0)
    rails-assets-waypoints (4.0.0)
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.8)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-controller-testing (1.0.2)
+      actionpack (~> 5.x, >= 5.0.1)
+      actionview (~> 5.x, >= 5.0.1)
+      activesupport (~> 5.x)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
    rails-html-sanitizer (1.0.3)
      loofah (~> 2.0)
-    rails-i18n (4.0.8)
+    rails-i18n (5.0.4)
      i18n (~> 0.7)
-      railties (~> 4.0)
+      railties (~> 5.0)
    rails_12factor (0.0.3)
      rails_serve_static_assets
      rails_stdout_logging
    rails_serve_static_assets (0.0.4)
    rails_stdout_logging (0.0.3)
-    railties (4.2.9)
-      actionpack (= 4.2.9)
-      activesupport (= 4.2.9)
+    railties (5.0.5)
+      actionpack (= 5.0.5)
+      activesupport (= 5.0.5)
+      method_source
      rake (>= 0.8.7)
      thor (>= 0.18.1, < 2.0)
    rainbow (2.2.2)
      rake
-    rake (12.0.0)
+    rake (12.3.0)
    rb-fsevent (0.10.2)
    rb-inotify (0.9.10)
      ffi (>= 0.5.0, < 2)
@ -424,7 +436,7 @@ GEM
    recaptcha (4.6.2)
      json
    redcarpet (3.2.3)
-    referer-parser (0.2.1)
+    referer-parser (0.3.0)
    request_store (1.1.0)
    responders (2.4.0)
      actionpack (>= 4.2.0, < 5.3)
@ -461,19 +473,21 @@ GEM
      rspec-mocks (~> 3.6.0)
      rspec-support (~> 3.6.0)
    rspec-support (3.6.0)
-    rubocop (0.49.1)
+    rubocop (0.51.0)
      parallel (~> 1.10)
      parser (>= 2.3.3.1, < 3.0)
      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 3.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-oembed (0.8.14)
+    ruby-oembed (0.12.0)
    ruby-openid (2.5.0)
-    ruby-progressbar (1.8.1)
+    ruby-progressbar (1.9.0)
    ruby_dep (1.5.0)
    rubyzip (1.2.1)
    safe_yaml (1.0.4)
+    safely_block (0.2.0)
+      errbase
    sass (3.2.19)
    sass-rails (5.0.6)
      railties (>= 4.0.0, < 6)
@ -500,10 +514,10 @@ GEM
    sprockets (3.7.1)
      concurrent-ruby (~> 1.0)
      rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
    sqlite3 (1.3.9)
    stripe (1.43.0)
      rest-client (~> 1.4)
@ -534,11 +548,11 @@ GEM
    unicode_utils (1.4.0)
    unobtrusive_flash (3.1.0)
      railties
-    user_agent_parser (2.1.5)
+    user_agent_parser (2.4.0)
    uuidtools (2.1.5)
    warden (1.2.4)
      rack (>= 1.0)
-    web-console (2.2.1)
+    web-console (2.3.0)
      activemodel (>= 4.0)
      binding_of_caller (>= 0.7.2)
      railties (>= 4.0)
@ -562,7 +576,6 @@ PLATFORMS

 DEPENDENCIES
  active_model_serializers
-  activeuuid
  acts_as_commentable_with_threading
  acts_as_list
  ahoy_matey
@ -574,7 +587,7 @@ DEPENDENCIES
  bootstrap-switch-rails (~> 3.0.0)
  bootstrap3-datetimepicker-rails (~> 3.0.2)
  byebug
-  cancancan
+  cancancan (~> 2.0)
  capybara
  carrierwave
  carrierwave-bombshelter
@ -585,6 +598,7 @@ DEPENDENCIES
  country_select
  coveralls
  daemons
+  dalli
  database_cleaner
  delayed_job_active_record
  devise
@ -594,7 +608,7 @@ DEPENDENCIES
  faker
  feature
  font-awesome-rails
-  formtastic (~> 3.1.1)
+  formtastic (~> 3.1.5)
  formtastic-bootstrap
  gravtastic
  guard-rspec
@ -625,7 +639,8 @@ DEPENDENCIES
  poltergeist
  prawn-qrcode (~> 0.2.2.1)
  prawn_rails
-  rails (~> 4.2.8)
+  puma (~> 3.0)
+  rails (~> 5.0.5)
  rails-assets-bootstrap-markdown!
  rails-assets-date.format!
  rails-assets-holderjs!
@ -637,7 +652,8 @@ DEPENDENCIES
  rails-assets-to-markdown!
  rails-assets-trianglify!
  rails-assets-waypoints!
-  rails-i18n (~> 4.0.0)
+  rails-controller-testing
+  rails-i18n (~> 5.0.0)
  rails_12factor
  rdoc-generator-fivefish
  recaptcha
@ -647,8 +663,8 @@ DEPENDENCIES
  rqrcode
  rspec-activemodel-mocks
  rspec-rails (~> 3.5, >= 3.5.2)
-  rubocop (~> 0.49.0)
-  ruby-oembed
+  rubocop (~> 0.51.0)
+  ruby-oembed (~> 0.12.0)
  sass-rails (>= 4.0.2)
  selectize-rails
  shoulda-matchers
--- a/INSTALL.md
+++ b/INSTALL.md
@ -42,7 +42,7 @@ There are two configurations to deploy OSEM with Docker: *evaluation mode* and *

 If you want to evaluate OSEM to see if it fits your needs, the default configuration in `docker-compose.env` will work perfectly fine for you.
 For convenience reasons, `docker-compose.yml` already contains a [MailHog](https://github.com/mailhog/MailHog) service configuration. MailHog
-is going to catch every email sent by OSEM and displays them on a special web service. Thus, it eliminitates the need to set up an SMTP server just to try out OSEM.
+is going to catch every email sent by OSEM and displays them on a special web service. Thus, it eliminates the need to set up an SMTP server just to try out OSEM.
 Just point your browser to http://localhost:8025 to get access to registration confirmation links etc.

 Run `docker-compose up --build` to start the services. On first run, it will take a few minutes to initialize the database. Thus, wait a few minutes before you open up
@ -105,6 +105,7 @@ There are a couple of environment variables you can set to configure OSEM. Check
 | CLOUDINARY_URL		| *string*			| Configure your cloudinary.com cloud name and api key/secret
 | STRIPE_PUBLISHABLE_KEY    | *string*          | Publishable Key for Stripe Gateway
 | STRIPE_SECRET_KEY    | *string*          | Secret Key for Stripe Gateway
+| OSEM_REDIS_URL | *string* | Redis server URL e.g. redis://localhost:6379/1

 ### Online Ticket Payments
 We use [Stripe](https://stripe.com) for accepting your ticket payments securely over the web.
--- a/app/assets/javascripts/osem-datepickers.js
+++ b/app/assets/javascripts/osem-datepickers.js
@ -79,13 +79,28 @@ $(function () {

  $("#conference-start-datepicker").on("dp.change",function (e) {
      $('#conference-end-datepicker').data("DateTimePicker").setMinDate(e.date);
+      if (!$('#conference-end-datepicker').val()) {
+         $('#conference-end-datepicker').data("DateTimePicker").setDate(e.date);
+      }
  });
+
+  $("#conference-start-datepicker").change(function (e) {
+      $('#conference-start-datepicker').val()?$('#conference-end-datepicker').data("DateTimePicker").setMinDate(e.date):$('#conference-end-datepicker').data("DateTimePicker").setMinDate(null);
+  });
+
  $("#conference-end-datepicker").on("dp.change",function (e) {
      $('#conference-start-datepicker').data("DateTimePicker").setMaxDate(e.date);
  });

+  $("#conference-end-datepicker").change(function (e) {
+      $('#conference-end-datepicker').val()?$('#conference-start-datepicker').data("DateTimePicker").setMaxDate(e.date):$('#conference-start-datepicker').data("DateTimePicker").setMaxDate(null);
+  });
+
  $("#registration-period-start-datepicker").on("dp.change",function (e) {
      $('#registration-period-end-datepicker').data("DateTimePicker").setMinDate(e.date);
+      if (!$('#registration-period-end-datepicker').val()) {
+         $('#registration-period-end-datepicker').data("DateTimePicker").setDate(e.date);
+      }
  });
  $("#registration-period-end-datepicker").on("dp.change",function (e) {
      $('#registration-period-start-datepicker').data("DateTimePicker").setMaxDate(e.date);
--- a/app/assets/stylesheets/breakpoints.css.scss
+++ b/app/assets/stylesheets/breakpoints.css.scss
@ -2,20 +2,20 @@
  @if $class == xs {
    @media (max-width: 767px) { @content; }
  }
- 
+
  @else if $class == sm {
-    @media (min-width: 750px) { @content; }
+    @media (min-width: 768px) and (max-width: 991px) { @content; }
  }
- 
+
  @else if $class == md {
-    @media (min-width: 992px) { @content; }
+    @media (min-width: 992px) and (max-width: 1199px) { @content; }
  }
- 
+
  @else if $class == lg {
    @media (min-width: 1200px) { @content; }
  }
- 
+
  @else {
    @warn "Breakpoint mixin supports: xs, sm, md, lg";
  }
-}
+}
--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@ -1,6 +1,6 @@
 module Admin
  class BaseController < ApplicationController
-    before_filter :verify_user_admin
+    before_action :verify_user_admin

    private

--- a/app/controllers/admin/commercials_controller.rb
+++ b/app/controllers/admin/commercials_controller.rb
@ -49,6 +49,26 @@ module Admin
      end
    end

+    ##
+    # Received a file from user
+    # Reads file and creates commercial for event
+    # File content example:
+    # EventID:MyURL
+    def mass_upload
+      errors = Commercial.read_file(params[:file]) if params[:file]
+
+      if errors.all? { |_k, v| v.blank? }
+        flash[:notice] = 'Successfully added commercials.'
+      else
+        errors_text = ''
+        errors_text << 'Unable to find event with ID: ' + errors[:no_event].join(', ') + '. ' if errors[:no_event].any?
+        errors_text << 'There were some errors: ' + errors[:validation_errors].join('. ') if errors[:validation_errors].any?
+
+        flash[:error] = errors_text
+      end
+      redirect_to :back
+    end
+
    private

    def commercial_params
--- a/app/controllers/admin/conferences_controller.rb
+++ b/app/controllers/admin/conferences_controller.rb
@ -155,7 +155,7 @@ module Admin

      # Set line color using a hash function
      @tickets = []
-      @tickets_data.keys.each do |title|
+      @tickets_data.each_key do |title|
        @tickets.append(short_title: title, color: "\##{Digest::MD5.hexdigest(title)[0..5]}")
      end

--- a/app/controllers/admin/events_controller.rb
+++ b/app/controllers/admin/events_controller.rb
@ -124,6 +124,15 @@ module Admin

    def cancel
      update_state(:cancel, 'Event canceled!')
+      selected_schedule = @event.program.selected_schedule
+      event_schedule = EventSchedule.unscoped.where(event: @event).find_by(schedule: selected_schedule) if selected_schedule
+      Rails.logger.debug "schedule: #{selected_schedule.inspect} and event_schedule #{event_schedule.inspect}"
+      if selected_schedule && event_schedule
+        event_schedule.enabled = false
+        event_schedule.save
+      else
+        @event.event_schedules.destroy_all
+      end
    end

    def reject
--- a/app/controllers/admin/registrations_controller.rb
+++ b/app/controllers/admin/registrations_controller.rb
@ -2,7 +2,7 @@ module Admin
  class RegistrationsController < Admin::BaseController
    load_and_authorize_resource :conference, find_by: :short_title
    load_and_authorize_resource :registration, through: :conference
-    before_filter :set_user, except: [:index]
+    before_action :set_user, except: [:index]

    def index
      authorize! :show, Registration.new(conference_id: @conference.id)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -1,10 +1,10 @@
 class ApplicationController < ActionController::Base
-  before_filter :set_paper_trail_whodunnit
+  before_action :set_paper_trail_whodunnit
  include ApplicationHelper
  add_flash_types :error
-  protect_from_forgery with: :exception
-  before_filter :get_conferences
-  before_filter :store_location
+  protect_from_forgery with: :exception, prepend: true
+  before_action :get_conferences
+  before_action :store_location
  # Ensure every controller authorizes resource or skips authorization (skip_authorization_check)
  check_authorization unless: :devise_controller?

--- a/app/controllers/conference_registrations_controller.rb
+++ b/app/controllers/conference_registrations_controller.rb
@ -1,5 +1,5 @@
 class ConferenceRegistrationsController < ApplicationController
-  before_filter :authenticate_user!, except: [:new, :create]
+  before_action :authenticate_user!, except: [:new, :create]
  load_resource :conference, find_by: :short_title
  authorize_resource :conference_registrations, class: Registration, except: [:new, :create]
  before_action :set_registration, only: [:edit, :update, :destroy, :show]
--- a/app/controllers/conferences_controller.rb
+++ b/app/controllers/conferences_controller.rb
@ -9,19 +9,58 @@ class ConferencesController < ApplicationController
  end

  def show
-    @conference = if params[:id]
-                    Conference.find_by_short_title(params[:id])
-                  else
-                    load_conference_by_domain
-                  end
-    authorize! :show, @conference
-    @program = @conference.program
+    # load conference with header content
+    @conference = Conference.unscoped.eager_load(
+      :splashpage,
+      :program,
+      :registration_period,
+      :contact,
+      venue: :commercial
+    ).find_by(conference_finder_conditions)
+    authorize! :show, @conference # TODO: reduce the 10 queries performed here
+
+    splashpage = @conference.splashpage
+    if splashpage.include_cfp
+      cfps = @conference.program.cfps
+      @call_for_events = cfps.find { |call| call.cfp_type == 'events' }
+      if @call_for_events.try(:open?)
+        @event_types = @conference.event_types.pluck(:title)
+        @track_names = @conference.confirmed_tracks.pluck(:name).sort
+      end
+      @call_for_tracks = cfps.find { |call| call.cfp_type == 'tracks' }
+    end
+    if splashpage.include_program
+      @highlights = @conference.highlighted_events.eager_load(:speakers)
+      if splashpage.include_tracks
+        @tracks = @conference.confirmed_tracks.eager_load(
+          :room
+        ).order('tracks.name')
+      end
+      if splashpage.include_booths
+        @booths = @conference.confirmed_booths.order('title')
+      end
+    end
+    if splashpage.include_registrations || splashpage.include_tickets
+      @tickets = @conference.tickets.order('price_cents')
+    end
+    if splashpage.include_lodgings
+      @lodgings = @conference.lodgings.order('name')
+    end
+    if splashpage.include_sponsors
+      @sponsorship_levels = @conference.sponsorship_levels.eager_load(
+        :sponsors
+      ).order('sponsorship_levels.position ASC', 'sponsors.name')
+    end
  end

  private

-  def load_conference_by_domain
-    Conference.find_by(custom_domain: request.domain)
+  def conference_finder_conditions
+    if params[:id]
+      { short_title: params[:id] }
+    else
+      { custom_domain: request.domain }
+    end
  end

  def respond_to_options
--- a/app/controllers/proposals_controller.rb
+++ b/app/controllers/proposals_controller.rb
@ -91,6 +91,15 @@ class ProposalsController < ApplicationController

    begin
      @event.withdraw
+      selected_schedule = @event.program.selected_schedule
+      event_schedule = @event.event_schedules.find_by(schedule: selected_schedule) if selected_schedule
+      Rails.logger.debug "schedule: #{selected_schedule.inspect} and event_schedule #{event_schedule.inspect}"
+      if selected_schedule && event_schedule
+        event_schedule.enabled = false
+        event_schedule.save
+      else
+        @event.event_schedules.destroy_all
+      end
    rescue Transitions::InvalidTransition
      redirect_to :back, error: "Event can't be withdrawn"
      return
--- a/app/controllers/subscriptions_controller.rb
+++ b/app/controllers/subscriptions_controller.rb
@ -1,5 +1,5 @@
 class SubscriptionsController < ApplicationController
-  before_filter :authenticate_user!
+  before_action :authenticate_user!
  load_resource :conference, find_by: :short_title
  load_and_authorize_resource only: [:create, :destroy], through: :conference

--- a/app/controllers/ticket_purchases_controller.rb
+++ b/app/controllers/ticket_purchases_controller.rb
@ -1,5 +1,5 @@
 class TicketPurchasesController < ApplicationController
-  before_filter :authenticate_user!
+  before_action :authenticate_user!
  load_resource :conference, find_by: :short_title
  authorize_resource :conference_registrations, class: Registration
  authorize_resource
--- a/app/controllers/tickets_controller.rb
+++ b/app/controllers/tickets_controller.rb
@ -1,9 +1,9 @@
 class TicketsController < ApplicationController
-  before_filter :authenticate_user!
+  before_action :authenticate_user!
  load_resource :conference, find_by: :short_title
  load_resource :ticket, through: :conference
  authorize_resource :conference_registrations, class: Registration
-  before_filter :check_load_resource, only: :index
+  before_action :check_load_resource, only: :index

  def index; end

--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@ -11,6 +11,11 @@ module Users

    def handle(provider)
      auth_hash = request.env['omniauth.auth']
+      unless auth_hash.info.email.present?
+        flash[:error] = "Email field is missing in your #{provider} account"
+        redirect_to new_user_registration_path
+        return
+      end
      username = auth_hash.info.email.split('@')[0]
      openid = Openid.find_for_oauth(auth_hash) # Get or create openid
      # If openid exists and is associated with a user, sign in with associated user,
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -56,17 +56,7 @@ module ApplicationHelper
  end

  def tracks(conference)
-    all = conference.program.tracks.confirmed.cfp_active.pluck(:name)
-    first = all[0...-1]
-    last = all[-1]
-    ts = ''
-    if all.length > 1
-      ts << first.join(', ')
-      ts << " and #{last}"
-    else
-      ts = all.join
-    end
-    return ts
+    conference.confirmed_tracks.collect(&:name).to_sentence
  end

  def difficulty_levels(conference)
@ -80,7 +70,7 @@ module ApplicationHelper
    else
      ts = all.join
    end
-    return ts
+    ts
  end

  def unread_notifications(user)
@ -99,7 +89,7 @@ module ApplicationHelper
  end

  def normalize_array_length(hashmap, length)
-    hashmap.each do |_, value|
+    hashmap.each_value do |value|
      if value.length < length
        value.fill(value[-1], value.length...length)
      end
@ -151,8 +141,8 @@ module ApplicationHelper
                              hint: 'The people responsible for the booth. You can only select existing users.'
  end

-  def event_types(conference)
-    conference.program.event_types.map { |et| et.title.pluralize }.to_sentence
+  def event_types_sentence(conference)
+    conference.event_types.map { |et| et.title.pluralize }.to_sentence
  end

  def sign_in_path
@ -191,4 +181,19 @@ module ApplicationHelper
      title: 'Open Source Event Manager'
    )
  end
+
+  # returns the url to be used for logo on basis of sponsorship level position
+  def get_logo(object)
+    if object.try(:sponsorship_level)
+      if object.sponsorship_level.position == 1
+        object.picture.first.url
+      elsif object.sponsorship_level.position == 2
+        object.picture.second.url
+      else
+        object.picture.others.url
+      end
+    else
+      object.picture.large.url
+    end
+  end
 end
--- a/app/helpers/conference_helper.rb
+++ b/app/helpers/conference_helper.rb
@ -0,0 +1,17 @@
+module ConferenceHelper
+  # Return true if only call_for_papers or call_for_tracks is open
+  def one_call_open(*calls)
+    calls.one? { |call| call.try(:open?) }
+  end
+
+  # URL for sponsorship emails
+  def sponsorship_mailto(conference)
+    [
+      'mailto:',
+      conference.contact.sponsor_email,
+      '?subject=',
+      url_encode(conference.short_title),
+      '%20Sponsorship'
+    ].join
+  end
+end
--- a/app/helpers/format_helper.rb
+++ b/app/helpers/format_helper.rb
@ -101,17 +101,17 @@ module FormatHelper

  def icon_for_todo(bool)
    if bool
-      return 'fa fa-check'
+      'fa fa-check'
    else
-      return 'fa fa-times'
+      'fa fa-times'
    end
  end

  def class_for_todo(bool)
    if bool
-      return 'todolist-ok'
+      'todolist-ok'
    else
-      return 'todolist-missing'
+      'todolist-missing'
    end
  end

@ -122,7 +122,7 @@ module FormatHelper
             plural || singular.pluralize
           end

-    "#{word}"
+    word
  end

  # Returns black or white deppending on what of them contrast more with the
--- a/app/helpers/paths_helper.rb
+++ b/app/helpers/paths_helper.rb
@ -5,9 +5,9 @@ module PathsHelper

  def active_nav_li(link)
    if current_page?(link)
-      return 'active'
+      'active'
    else
-      return ''
+      ''
    end
  end
 end
--- a/app/helpers/sponsors_helper.rb
+++ b/app/helpers/sponsors_helper.rb
@ -1,12 +0,0 @@
-module SponsorsHelper
-  # returns the url to be used for logo on basis of sponsorship level position
-  def get_logo(sponsor)
-    if sponsor.sponsorship_level.position == 1
-      sponsor.picture.first.url
-    elsif sponsor.sponsorship_level.position == 2
-      sponsor.picture.second.url
-    else
-      sponsor.picture.others.url
-    end
-  end
-end
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@ -18,7 +18,7 @@ module UsersHelper
      providers << provider if !ENV["OSEM_#{provider.upcase}_KEY"].blank? && !ENV["OSEM_#{provider.upcase}_SECRET"].blank?
    end

-    return providers.uniq
+    providers.uniq
  end

  # Receives a hash, generated from User model, function get_roles
--- a/app/jobs/application_job.rb
+++ b/app/jobs/application_job.rb
@ -0,0 +1,2 @@
+class ApplicationJob < ActiveJob::Base
+end
--- a/app/jobs/conference_cfp_update_mail_job.rb
+++ b/app/jobs/conference_cfp_update_mail_job.rb
@ -1,4 +1,4 @@
-class ConferenceCfpUpdateMailJob < ActiveJob::Base
+class ConferenceCfpUpdateMailJob < ApplicationJob
  queue_as :default

  def perform(conference)
--- a/app/jobs/conference_date_update_mail_job.rb
+++ b/app/jobs/conference_date_update_mail_job.rb
@ -1,4 +1,4 @@
-class ConferenceDateUpdateMailJob < ActiveJob::Base
+class ConferenceDateUpdateMailJob < ApplicationJob
  queue_as :default

  def perform(conference)
--- a/app/jobs/conference_registration_date_update_mail_job.rb
+++ b/app/jobs/conference_registration_date_update_mail_job.rb
@ -1,4 +1,4 @@
-class ConferenceRegistrationDateUpdateMailJob < ActiveJob::Base
+class ConferenceRegistrationDateUpdateMailJob < ApplicationJob
  queue_as :default

  def perform(conference)
--- a/app/jobs/conference_schedule_update_mail_job.rb
+++ b/app/jobs/conference_schedule_update_mail_job.rb
@ -1,4 +1,4 @@
-class ConferenceScheduleUpdateMailJob < ActiveJob::Base
+class ConferenceScheduleUpdateMailJob < ApplicationJob
  queue_as :default

  def perform(conference)
--- a/app/jobs/conference_venue_update_mail_job.rb
+++ b/app/jobs/conference_venue_update_mail_job.rb
@ -1,4 +1,4 @@
-class ConferenceVenueUpdateMailJob < ActiveJob::Base
+class ConferenceVenueUpdateMailJob < ApplicationJob
  queue_as :default

  def perform(conference)
--- a/app/jobs/event_comment_mail_job.rb
+++ b/app/jobs/event_comment_mail_job.rb
@ -1,4 +1,4 @@
-class EventCommentMailJob < ActiveJob::Base
+class EventCommentMailJob < ApplicationJob
  queue_as :default

  def perform(comment)
--- a/app/models/ahoy/event.rb
+++ b/app/models/ahoy/event.rb
@ -1,5 +1,5 @@
 module Ahoy
-  class Event < ActiveRecord::Base
+  class Event < ApplicationRecord
    self.table_name = 'ahoy_events'

    belongs_to :visit
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@ -1,4 +1,4 @@
-class Answer < ActiveRecord::Base
+class Answer < ApplicationRecord
  has_many :qanswers
  has_many :questions, through: :qanswers

--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end
--- a/app/models/booth.rb
+++ b/app/models/booth.rb
@ -1,4 +1,4 @@
-class Booth < ActiveRecord::Base
+class Booth < ApplicationRecord
  include ActiveRecord::Transitions
  has_paper_trail ignore: [:updated_at], meta: { conference_id: :conference_id }

--- a/app/models/booth_request.rb
+++ b/app/models/booth_request.rb
@ -1,4 +1,4 @@
-class BoothRequest < ActiveRecord::Base
+class BoothRequest < ApplicationRecord
  belongs_to :booth
  belongs_to :user

--- a/app/models/campaign.rb
+++ b/app/models/campaign.rb
@ -1,4 +1,4 @@
-class Campaign < ActiveRecord::Base
+class Campaign < ApplicationRecord
  validates :name, :utm_campaign, presence: true

  has_many :targets, dependent: :nullify
--- a/app/models/cfp.rb
+++ b/app/models/cfp.rb
@ -1,6 +1,6 @@
 # cannot delete program if there are events submitted

-class Cfp < ActiveRecord::Base
+class Cfp < ApplicationRecord
  TYPES = %w(events booths tracks).freeze

  has_paper_trail ignore: [:updated_at], meta: { conference_id: :conference_id }
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@ -1,4 +1,4 @@
-class Comment < ActiveRecord::Base
+class Comment < ApplicationRecord
  acts_as_nested_set scope: %i(commentable_id commentable_type)
  validates :body, presence: true
  validates :user, presence: true
--- a/app/models/commercial.rb
+++ b/app/models/commercial.rb
@ -1,11 +1,11 @@
-class Commercial < ActiveRecord::Base
+class Commercial < ApplicationRecord
  require 'oembed'

  belongs_to :commercialable, polymorphic: true

  has_paper_trail ignore: [:updated_at], meta: { conference_id: :conference_id }

-  validates :url, presence: true
+  validates :url, presence: true, uniqueness: { scope: :commercialable }
  validates :url, format: URI::regexp(%w(http https))

  validate :valid_url
@ -20,6 +20,29 @@ class Commercial < ActiveRecord::Base
    end
  end

+  def self.read_file(file)
+    errors = {}
+    errors[:no_event] = []
+    errors[:validation_errors] = []
+
+    file.read.each_line do |line|
+      # Get the event id (text before :)
+      id = line.match(/:/).pre_match.to_i
+      # Get the commercial url (text after :)
+      url = line.match(/:/).post_match
+      event = Event.find_by(id: id)
+
+      # Go to next event, if the event is not found
+      errors[:no_event] << id && next unless event
+
+      commercial = event.commercials.new(url: url)
+      unless commercial.save
+        errors[:validation_errors] << "Could not create commercial for event with ID #{event.id} (" + commercial.errors.full_messages.to_sentence + ')'
+      end
+    end
+    errors
+  end
+
  private

  def valid_url
--- a/app/models/conference.rb
+++ b/app/models/conference.rb
@ -1,4 +1,4 @@
-class Conference < ActiveRecord::Base
+class Conference < ApplicationRecord
  include RevisionCount
  require 'uri'
  serialize :events_per_week, Hash
@ -33,6 +33,7 @@ class Conference < ActiveRecord::Base
  end
  has_many :resources, dependent: :destroy
  has_many :booths, dependent: :destroy
+  has_many :confirmed_booths, -> { where(state: 'confirmed') }, class_name: 'Booth'

  has_many :lodgings, dependent: :destroy
  has_many :registrations, dependent: :destroy
@ -45,7 +46,15 @@ class Conference < ActiveRecord::Base
  has_many :campaigns, dependent: :destroy
  has_many :commercials, as: :commercialable, dependent: :destroy
  has_many :subscriptions, dependent: :destroy
-
+  has_one :call_for_events, -> { where(cfp_type: 'events') }, through: :program, source: :cfps
+  has_one :call_for_booths, -> { where(cfp_type: 'booths') }, through: :program, source: :cfps
+  has_one :call_for_tracks, -> { where(cfp_type: 'tracks') }, through: :program, source: :cfps
+  has_many :confirmed_tracks, -> { where(state: 'confirmed') }, through: :program, source: :tracks
+  has_many :highlighted_events,
+           -> { where(state: :confirmed, is_highlight: true) },
+           through: :program,
+           source:  :events
+  has_many :event_types, through: :program
  accepts_nested_attributes_for :venue
  accepts_nested_attributes_for :tickets, allow_destroy: true
  accepts_nested_attributes_for :sponsorship_levels, allow_destroy: true
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@ -1,4 +1,4 @@
-class Contact < ActiveRecord::Base
+class Contact < ApplicationRecord
  has_paper_trail on: [:update], ignore: [:updated_at], meta: { conference_id: :conference_id }

  belongs_to :conference
--- a/app/models/difficulty_level.rb
+++ b/app/models/difficulty_level.rb
@ -1,4 +1,4 @@
-class DifficultyLevel < ActiveRecord::Base
+class DifficultyLevel < ApplicationRecord
  belongs_to :program
  has_many :events, dependent: :nullify

--- a/app/models/email_settings.rb
+++ b/app/models/email_settings.rb
@ -1,4 +1,4 @@
-class EmailSettings < ActiveRecord::Base
+class EmailSettings < ApplicationRecord
  belongs_to :conference

  has_paper_trail on: [:update], ignore: [:updated_at], meta: { conference_id: :conference_id }
--- a/app/models/event.rb
+++ b/app/models/event.rb
@ -1,4 +1,4 @@
-class Event < ActiveRecord::Base
+class Event < ApplicationRecord
  include ActiveRecord::Transitions
  include RevisionCount
  has_paper_trail on: [:create, :update], ignore: [:updated_at, :guid, :week], meta: { conference_id: :conference_id }
@ -197,6 +197,14 @@ class Event < ActiveRecord::Base
          send(transition)
        end
        save
+        # If the event was previously scheduled, and then withdrawn or cancelled
+        # its event_schedule will have enabled set to false
+        # If the event is now confirmed again, we want it to be available for scheduling
+        Rails.logger.debug "transition is #{transition}"
+        if transition == :confirm
+          Rails.logger.debug "schedules #{EventSchedule.unscoped.where(event: self, enabled: false)}"
+          EventSchedule.unscoped.where(event: self, enabled: false).destroy_all
+        end
      rescue Transitions::InvalidTransition => e
        alert = "Update state failed. #{e.message}"
      end
--- a/app/models/event_schedule.rb
+++ b/app/models/event_schedule.rb
@ -1,4 +1,5 @@
-class EventSchedule < ActiveRecord::Base
+class EventSchedule < ApplicationRecord
+  default_scope { where(enabled: true) }
  belongs_to :schedule
  belongs_to :event
  belongs_to :room
@ -33,7 +34,7 @@ class EventSchedule < ActiveRecord::Base
  # Returns event schedules that are scheduled in the same room and start_time as event
  #
  def intersecting_event_schedules
-    room.event_schedules.where(start_time: start_time, schedule: schedule).where.not(id: id)
+    EventSchedule.unscoped.where(room: room, start_time: start_time, schedule: schedule).where.not(id: id)
  end

  def replacement?
--- a/app/models/event_type.rb
+++ b/app/models/event_type.rb
@ -1,4 +1,4 @@
-class EventType < ActiveRecord::Base
+class EventType < ApplicationRecord
  belongs_to :program
  has_many :events, dependent: :restrict_with_error

--- a/app/models/event_user.rb
+++ b/app/models/event_user.rb
@ -1,4 +1,4 @@
-class EventUser < ActiveRecord::Base
+class EventUser < ApplicationRecord
  # TODO: Do we need these roles?
  ROLES = [%w[Speaker speaker], %w[Submitter submitter], %w[Moderator moderator]]

--- a/app/models/events_registration.rb
+++ b/app/models/events_registration.rb
@ -1,4 +1,4 @@
-class EventsRegistration < ActiveRecord::Base
+class EventsRegistration < ApplicationRecord
  belongs_to :registration
  belongs_to :event

--- a/app/models/lodging.rb
+++ b/app/models/lodging.rb
@ -1,4 +1,4 @@
-class Lodging < ActiveRecord::Base
+class Lodging < ApplicationRecord
  belongs_to :conference

  has_paper_trail ignore: [:updated_at], meta: { conference_id: :conference_id }
--- a/app/models/openid.rb
+++ b/app/models/openid.rb
@ -1,6 +1,6 @@
-class Openid < ActiveRecord::Base
+class Openid < ApplicationRecord
  belongs_to :user
-  validates :provider, :uid, presence: true
+  validates :provider, :uid, :email, presence: true

  # Searches for openid based on provider and uid.
  # Returns found openid or a new openid.
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@ -1,4 +1,4 @@
-class Organization < ActiveRecord::Base
+class Organization < ApplicationRecord
  resourcify :roles, dependent: :delete_all

  has_paper_trail
--- a/app/models/payment.rb
+++ b/app/models/payment.rb
@ -1,4 +1,4 @@
-class Payment < ActiveRecord::Base
+class Payment < ApplicationRecord
  has_many :ticket_purchases
  belongs_to :user
  belongs_to :conference
--- a/app/models/physical_ticket.rb
+++ b/app/models/physical_ticket.rb
@ -1,4 +1,4 @@
-class PhysicalTicket < ActiveRecord::Base
+class PhysicalTicket < ApplicationRecord
  belongs_to :ticket_purchase
  has_one :ticket, through: :ticket_purchase
  has_one :conference, through: :ticket_purchase
--- a/app/models/program.rb
+++ b/app/models/program.rb
@ -1,6 +1,6 @@
 # cannot delete program if there are events submitted

-class Program < ActiveRecord::Base
+class Program < ApplicationRecord
  has_paper_trail on: [:update], ignore: [:updated_at], meta: { conference_id: :conference_id }

  belongs_to :conference
@ -165,7 +165,7 @@ class Program < ActiveRecord::Base
  # * +False+ -> If there is not any event for the given date
  def any_event_for_this_date?(date)
    parsed_date = DateTime.parse("#{date} 00:00").utc
-    EventSchedule.where(schedule: selected_schedule).where(start_time: parsed_date..(parsed_date + 1)).any?
+    EventSchedule.where(schedule: selected_schedule).where(start_time: parsed_date..(parsed_date + 1.day)).any?
  end

  ##
--- a/app/models/qanswer.rb
+++ b/app/models/qanswer.rb
@ -1,4 +1,4 @@
-class Qanswer < ActiveRecord::Base
+class Qanswer < ApplicationRecord
  belongs_to :question
  belongs_to :answer, dependent: :delete

--- a/app/models/question.rb
+++ b/app/models/question.rb
@ -1,4 +1,4 @@
-class Question < ActiveRecord::Base
+class Question < ApplicationRecord
  belongs_to :question_type
  has_and_belongs_to_many :conferences

--- a/app/models/question_type.rb
+++ b/app/models/question_type.rb
@ -1,3 +1,3 @@
-class QuestionType < ActiveRecord::Base
+class QuestionType < ApplicationRecord
  has_many :questions
 end
--- a/app/models/registration.rb
+++ b/app/models/registration.rb
@ -1,4 +1,4 @@
-class Registration < ActiveRecord::Base
+class Registration < ApplicationRecord
  belongs_to :user
  belongs_to :conference

--- a/app/models/registration_period.rb
+++ b/app/models/registration_period.rb
@ -1,4 +1,4 @@
-class RegistrationPeriod < ActiveRecord::Base
+class RegistrationPeriod < ApplicationRecord
  belongs_to :conference

  has_paper_trail ignore: [:updated_at], meta: { conference_id: :conference_id }
--- a/app/models/resource.rb
+++ b/app/models/resource.rb
@ -1,4 +1,4 @@
-class Resource < ActiveRecord::Base
+class Resource < ApplicationRecord
  belongs_to :conference
  validates :name, :used, :quantity, presence: true
  validates :used, :quantity, numericality: { greater_than_or_equal_to: 0, only_integer: true }
--- a/app/models/role.rb
+++ b/app/models/role.rb
@ -1,4 +1,4 @@
-class Role < ActiveRecord::Base
+class Role < ApplicationRecord
  belongs_to :resource, polymorphic: true
  has_many :users_roles
  has_many :users, through: :users_roles
--- a/app/models/room.rb
+++ b/app/models/room.rb
@ -1,4 +1,4 @@
-class Room < ActiveRecord::Base
+class Room < ApplicationRecord
  include RevisionCount
  belongs_to :venue
  has_many :event_schedules, dependent: :destroy
--- a/app/models/schedule.rb
+++ b/app/models/schedule.rb
@ -1,4 +1,4 @@
-class Schedule < ActiveRecord::Base
+class Schedule < ApplicationRecord
  belongs_to :program
  belongs_to :track
  has_many :event_schedules, dependent: :destroy
--- a/app/models/splashpage.rb
+++ b/app/models/splashpage.rb
@ -1,4 +1,4 @@
-class Splashpage < ActiveRecord::Base
+class Splashpage < ApplicationRecord
  belongs_to :conference

  has_paper_trail ignore: [:updated_at], meta: { conference_id: :conference_id }
--- a/app/models/sponsor.rb
+++ b/app/models/sponsor.rb
@ -1,4 +1,4 @@
-class Sponsor < ActiveRecord::Base
+class Sponsor < ApplicationRecord
  belongs_to :sponsorship_level
  belongs_to :conference

--- a/app/models/sponsorship_level.rb
+++ b/app/models/sponsorship_level.rb
@ -1,4 +1,4 @@
-class SponsorshipLevel < ActiveRecord::Base
+class SponsorshipLevel < ApplicationRecord
  validates :title, presence: true
  belongs_to :conference
  acts_as_list scope: :conference
--- a/app/models/subscription.rb
+++ b/app/models/subscription.rb
@ -1,4 +1,4 @@
-class Subscription < ActiveRecord::Base
+class Subscription < ApplicationRecord
  belongs_to :conference
  belongs_to :user

--- a/app/models/target.rb
+++ b/app/models/target.rb
@ -1,4 +1,4 @@
-class Target < ActiveRecord::Base
+class Target < ApplicationRecord
  include ActionView::Helpers::TextHelper

  default_scope { order('due_date ASC') }
--- a/app/models/ticket.rb
+++ b/app/models/ticket.rb
@ -1,4 +1,4 @@
-class Ticket < ActiveRecord::Base
+class Ticket < ApplicationRecord
  belongs_to :conference
  has_many :ticket_purchases, dependent: :destroy
  has_many :buyers, -> { distinct }, through: :ticket_purchases, source: :user
--- a/app/models/ticket_purchase.rb
+++ b/app/models/ticket_purchase.rb
@ -1,4 +1,4 @@
-class TicketPurchase < ActiveRecord::Base
+class TicketPurchase < ApplicationRecord
  belongs_to :ticket
  belongs_to :user
  belongs_to :conference
--- a/app/models/ticket_scanning.rb
+++ b/app/models/ticket_scanning.rb
@ -1,4 +1,4 @@
-class TicketScanning < ActiveRecord::Base
+class TicketScanning < ApplicationRecord
  belongs_to :physical_ticket

  before_create :mark_user_present
--- a/app/models/track.rb
+++ b/app/models/track.rb
@ -1,4 +1,4 @@
-class Track < ActiveRecord::Base
+class Track < ApplicationRecord
  include ActiveRecord::Transitions
  include RevisionCount

--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -4,7 +4,7 @@ end
 class UserDisabled < StandardError
 end

-class User < ActiveRecord::Base
+class User < ApplicationRecord
  rolify
  has_many :physical_tickets, through: :ticket_purchases do
    def by_conference(conference)
@ -45,8 +45,8 @@ class User < ActiveRecord::Base
  attr_accessor :login

  has_many :event_users, dependent: :destroy
-  has_many :events, -> { uniq }, through: :event_users
-  has_many :presented_events, -> { joins(:event_users).where(event_users: {event_role: 'speaker'}).uniq }, through: :event_users, source: :event
+  has_many :events, -> { distinct }, through: :event_users
+  has_many :presented_events, -> { joins(:event_users).where(event_users: {event_role: 'speaker'}).distinct }, through: :event_users, source: :event
  has_many :registrations, dependent: :destroy do
    def for_conference conference
      where(conference: conference).first
@ -216,7 +216,7 @@ class User < ActiveRecord::Base
  end

  def proposals(conference)
-    events.where('program_id = ? AND event_users.event_role=?', conference.program.id, 'submitter')
+    events.where('program_id = ? AND (event_users.event_role=? OR event_users.event_role=?)', conference.program.id, 'submitter', 'speaker')
  end

  def proposal_count(conference)
--- a/app/models/users_role.rb
+++ b/app/models/users_role.rb
@ -1,4 +1,4 @@
-class UsersRole < ActiveRecord::Base
+class UsersRole < ApplicationRecord
  belongs_to :role
  belongs_to :user

--- a/app/models/vchoice.rb
+++ b/app/models/vchoice.rb
@ -1,4 +1,4 @@
-class Vchoice < ActiveRecord::Base
+class Vchoice < ApplicationRecord
  belongs_to :vday
  belongs_to :vposition

--- a/app/models/vday.rb
+++ b/app/models/vday.rb
@ -1,4 +1,4 @@
-class Vday < ActiveRecord::Base
+class Vday < ApplicationRecord
  belongs_to :conference

  has_many :vchoices
--- a/app/models/venue.rb
+++ b/app/models/venue.rb
@ -1,4 +1,4 @@
-class Venue < ActiveRecord::Base
+class Venue < ApplicationRecord
  belongs_to :conference
  has_one :commercial, as: :commercialable, dependent: :destroy
  has_many :rooms, dependent: :destroy
--- a/app/models/visit.rb
+++ b/app/models/visit.rb
@ -1,4 +1,4 @@
-class Visit < ActiveRecord::Base
+class Visit < ApplicationRecord
  has_many :ahoy_events, class_name: 'Ahoy::Event'
  belongs_to :user
 end
--- a/app/models/vote.rb
+++ b/app/models/vote.rb
@ -1,4 +1,4 @@
-class Vote < ActiveRecord::Base
+class Vote < ApplicationRecord
  belongs_to :user
  belongs_to :event

--- a/app/models/vposition.rb
+++ b/app/models/vposition.rb
@ -1,4 +1,4 @@
-class Vposition < ActiveRecord::Base
+class Vposition < ApplicationRecord
  belongs_to :conference

  has_many :vchoices
--- a/app/pdfs/ticket_pdf.rb
+++ b/app/pdfs/ticket_pdf.rb
@ -1,3 +1,5 @@
+require 'open-uri'
+
 class TicketPdf < Prawn::Document
  def initialize(conference, user, physical_ticket, ticket_layout, file_name)
    super(page_layout: ticket_layout, page_size: 'A4', filename: file_name)
@ -43,11 +45,17 @@ class TicketPdf < Prawn::Document
  def draw_second_square
    move_up 150
    if @conference.picture?
-      if 7 * @conference.picture.image[:width] > 12 * @conference.picture.image[:height]
-        image "#{Rails.root}/public#{@conference.picture_url}", at: [@mid_horizontal + 30, cursor], width: 120
-      else
-        image "#{Rails.root}/public#{@conference.picture_url}", at: [@mid_horizontal + 30, cursor], height: 70
-      end
+      conference_image = case @conference.picture.ticket.url[0, 4]
+                         when 'http', 'ftp:' # CDNs
+                           open(@conference.picture.ticket.url)
+                         when '/sys' # local storage
+                           open([
+                             Rails.root,
+                             '/public',
+                             @conference.picture.ticket.url
+                           ].join)
+                         end
+      image conference_image, at: [@mid_horizontal + 30, cursor]
    else
      image "#{Rails.root}/public/img/osem-logo.png", at: [@mid_horizontal + 30, cursor], height: 70
    end
--- a/app/uploaders/picture_uploader.rb
+++ b/app/uploaders/picture_uploader.rb
@ -52,10 +52,6 @@ class PictureUploader < CarrierWave::Uploader::Base
    "system/#{object_class_name}/#{mounted_as}/#{model.id}"
  end

-  def image
-    @image ||= MiniMagick::Image.open(file.file)
-  end
-
  # Create different versions of your uploaded files:
  version :large do
    process resize_to_fit: [300, 300]
@ -80,6 +76,11 @@ class PictureUploader < CarrierWave::Uploader::Base
    process resize_and_pad: [320, 120, 'white']
  end

+  version :ticket, if: :conference?
+  version :ticket do
+    process resize_and_pad: [120, 70]
+  end
+
  # Add a white list of extensions which are allowed to be uploaded.
  # For images you might use something like this:
  def extension_white_list
@ -95,4 +96,8 @@ class PictureUploader < CarrierWave::Uploader::Base
  def sponsor?(_picture)
    object_class_name == 'sponsors'
  end
+
+  def conference?(_picture)
+    object_class_name == 'conferences'
+  end
 end
--- a/app/views/admin/booths/show.html.haml
+++ b/app/views/admin/booths/show.html.haml
@ -1,7 +1,8 @@
 .row
  .col-md-12
    %h3
-      = image_tag(@booth.picture.thumb.url, size: '20%', alt: '')
+      - if @booth.logo_link
+        = image_tag( @booth.picture.thumb.url, size: '20%', alt: '')
      = @booth.title
      .btn-group.pull-right
        = link_to 'Edit', edit_admin_conference_booth_path(@conference.short_title, @booth), class: 'btn btn-mini btn-primary'
--- a/app/views/admin/campaigns/_form.html.haml
+++ b/app/views/admin/campaigns/_form.html.haml
@ -11,7 +11,7 @@
  .col-md-8
    = semantic_form_for(@campaign, url: (@campaign.new_record? ? admin_conference_campaigns_path : admin_conference_campaign_path(@conference.short_title, @campaign))) do |f|
      = f.inputs do
-        = f.input :name
+        = f.input :name, input_html: { autofocus: true }
        = f.inputs name: 'UTM Parameters' do
          = f.input :utm_campaign, label: 'Campaign', hint: 'Groups all of the content from one campaign. E.g. 20percentpromocode'
          = f.input :utm_source, label: 'Source', hint: 'Which website is sending you traffic. E.g. Facebook, google+, blog'
--- a/app/views/admin/cfps/_events_cfp.html.haml
+++ b/app/views/admin/cfps/_events_cfp.html.haml
@ -21,7 +21,7 @@
 %dt
  Event types:
 %dd
-  = event_types(@conference)
+  = event_types_sentence(@conference)
 %dt
  Tracks:
 %dd
--- a/app/views/admin/cfps/index.html.haml
+++ b/app/views/admin/cfps/index.html.haml
@ -7,7 +7,7 @@
 - if @program.cfps
  .row
    .col-md-12
-      %table.table.table-hover.datatable#tickets
+      %table.table.table-hover#tickets
        %thead
          %th Type
          %th Start Date
@ -27,7 +27,7 @@
                = cfp.end_date.strftime('%A, %B %-d. %Y')
              %td
                %p
-                  = markdown(truncate(cfp.description))
+                  = truncate(cfp.description)
              %td
                = pluralize(cfp.remaining_days, 'day')
              %td
--- a/app/views/admin/commercials/index.html.haml
+++ b/app/views/admin/commercials/index.html.haml
@ -14,7 +14,7 @@
  .row
    .col-md-6
      = semantic_form_for(@commercial, url: admin_conference_commercials_path(conference_id: @conference.short_title)) do |f|
-        = f.input :url, label: 'URL', as: :string, input_html: { required: 'required' },
+        = f.input :url, label: 'URL', as: :string, input_html: { required: 'required', autofocus: true },
        hint: 'Just paste the url of your video/photo provider. YouTube, Vimeo, SpeakerDeck, SlideShare, Instagram, Flickr.'
        = f.action :submit, as: :button, button_html: { class: 'btn btn-primary pull-right', disabled: true }
  %hr
--- a/app/views/admin/conferences/_doughnut_chart.html.haml
+++ b/app/views/admin/conferences/_doughnut_chart.html.haml
@ -1,6 +1,6 @@
 .text-center
  %h4 #{title}
-  %canvas.doughnut_chart{ id: "dough_#{title}", 'data-chart' => data.to_json }
+  %canvas.doughnut_chart{ id: "dough_#{title.parameterize.underscore}", 'data-chart' => data.to_json }
 - if data
  - data.each do |key, value|
    %span{ 'style' => "border-bottom: 3px solid #{value['color']}" } #{key}: #{value['value']}
@ -8,7 +8,7 @@
 :javascript
  $(document).ready( function(){

-   var d = $("#dough_#{title}");
+   var d = $("#dough_#{title.parameterize.underscore}");
   var dt = d.get(0).getContext('2d');

   $(window).resize( respondCanvas );
--- a/app/views/admin/contacts/edit.html.haml
+++ b/app/views/admin/contacts/edit.html.haml
@ -8,7 +8,7 @@
  .col-md-8
    = semantic_form_for(@contact, url: admin_conference_contact_path(@conference.short_title), html: {multipart: true}) do |f|
      = f.inputs name: 'Mail' do
-        = f.input :email, hint: 'Contact email address for your conference. Will be used as reply-to address in emails sent out by the system.'
+        = f.input :email, input_html: { autofocus: true }, hint: 'Contact email address for your conference. Will be used as reply-to address in emails sent out by the system.'
        = f.input :sponsor_email, hint: 'This will appear in the sponsor segment of the splash for the sponsors to contact to the organizers'
      = f.inputs name: 'Social Media' do
        = f.input :social_tag, hint: "The hashtag you'll use on Twitter and Google+. Don't include the '#' sign!'"
--- a/app/views/admin/difficulty_levels/_form.html.haml
+++ b/app/views/admin/difficulty_levels/_form.html.haml
@ -9,7 +9,7 @@
 .row
  .col-md-8
    = semantic_form_for(@difficulty_level, url: (@difficulty_level.new_record? ? admin_conference_program_difficulty_levels_path : admin_conference_program_difficulty_level_path(@conference.short_title, @difficulty_level))) do |f|
-      = f.input :title, required: true
+      = f.input :title, input_html: { autofocus: true }, required: true
      = f.input :description, input_html: {rows: 3, class: 'span6'}
      = f.input :color, input_html: {size: 6, type: 'color'}
      %p.text-right
--- a/app/views/admin/event_types/_form.html.haml
+++ b/app/views/admin/event_types/_form.html.haml
@ -9,7 +9,7 @@
 .row
  .col-md-12
    = semantic_form_for(@event_type, url: (@event_type.new_record? ? admin_conference_program_event_types_path : admin_conference_program_event_type_path(@conference.short_title, @event_type))) do |f|
-      = f.input :title
+      = f.input :title, input_html: { autofocus: true }
      = f.input :length, input_html: {size: 3, type: 'number', step: @event_type.program.schedule_interval, min: @event_type.program.schedule_interval}
      = f.input :description
      = f.input :minimum_abstract_length, input_html: {size: 3}
--- a/app/views/admin/events/_proposal.html.haml
+++ b/app/views/admin/events/_proposal.html.haml
@ -165,7 +165,7 @@
        %td= markdown(@event.abstract)
      %tr
        %td
-          %b Description
+          %b Requirements
        %td= simple_format(@event.description)

      - if @conference.program && @conference.program.rating && @conference.program.rating > 0
--- a/app/views/admin/events/index.html.haml
+++ b/app/views/admin/events/index.html.haml
@ -4,37 +4,60 @@
      %h1
        Events
        = "(#{@events.length})" if @events.any?
-        .pull-right
+
+        .btn-group.pull-right
+          %button.btn.btn-primary{ 'data-toggle' => 'modal', 'data-target' => '#mass-commercials-modal', title: 'Mass import of commercials for events' }
+            Add Commercials
+
          - if can? :create, Event
-            =link_to 'Add Event', new_admin_conference_program_event_path(@conference.short_title), class: 'button btn btn-default btn-info'
+            = link_to 'Add Event', new_admin_conference_program_event_path(@conference.short_title), class: 'button btn btn-default btn-info'
+
          - if can? :read, Event
            .btn-group
-              .btn-group
-                %button.btn.btn-default.dropdown-toggle{ 'data-toggle' => 'dropdown', type: 'button', class: 'btn btn-success' }
-                  Export PDF
-                  %span.caret
-                %ul.dropdown-menu{ role: 'menu' }
-                  %li= link_to 'All Events', admin_conference_program_events_path(@conference.short_title, format: :pdf, event_export_option: 'all')
-                  %li= link_to 'Confirmed Events', admin_conference_program_events_path(@conference.short_title, format: :pdf, event_export_option: 'confirmed')
-                  %li= link_to 'All Events with Comments', admin_conference_program_events_path(@conference.short_title, format: :pdf, event_export_option: 'all_with_comments')
-              .btn-group
-                %button.btn.btn-default.dropdown-toggle{ 'data-toggle' => 'dropdown', type: 'button', class: 'btn btn-success' }
-                  Export CSV
-                  %span.caret
-                %ul.dropdown-menu{ role: 'menu' }
-                  %li= link_to 'All', admin_conference_program_events_path(@conference.short_title, format: :csv, event_export_option: 'all')
-                  %li= link_to 'Confirmed', admin_conference_program_events_path(@conference.short_title, format: :csv, event_export_option: 'confirmed')
-                  %li= link_to 'All with Comments', admin_conference_program_events_path(@conference.short_title, format: :csv, event_export_option: 'all_with_comments')
-              .btn-group
-                %button.btn.btn-default.dropdown-toggle{ 'data-toggle' => 'dropdown', type: 'button', class: 'btn btn-success' }
-                  Export XLS
-                  %span.caret
-                %ul.dropdown-menu{ role: 'menu' }
-                  %li= link_to 'All', admin_conference_program_events_path(@conference.short_title, format: :xlsx, event_export_option: 'all')
-                  %li= link_to 'Confirmed', admin_conference_program_events_path(@conference.short_title, format: :xlsx, event_export_option: 'confirmed')
-                  %li= link_to 'All with Comments', admin_conference_program_events_path(@conference.short_title, format: :xlsx, event_export_option: 'all_with_comments')
+              %button.btn.btn-default.dropdown-toggle{ 'data-toggle' => 'dropdown', type: 'button', class: 'btn btn-success' }
+                Export PDF
+                %span.caret
+              %ul.dropdown-menu{ role: 'menu' }
+                %li= link_to 'All Events', admin_conference_program_events_path(@conference.short_title, format: :pdf, event_export_option: 'all')
+                %li= link_to 'Confirmed Events', admin_conference_program_events_path(@conference.short_title, format: :pdf, event_export_option: 'confirmed')
+                %li= link_to 'All Events with Comments', admin_conference_program_events_path(@conference.short_title, format: :pdf, event_export_option: 'all_with_comments')
+            .btn-group
+              %button.btn.btn-default.dropdown-toggle{ 'data-toggle' => 'dropdown', type: 'button', class: 'btn btn-success' }
+                Export CSV
+                %span.caret
+              %ul.dropdown-menu{ role: 'menu' }
+                %li= link_to 'All', admin_conference_program_events_path(@conference.short_title, format: :csv, event_export_option: 'all')
+                %li= link_to 'Confirmed', admin_conference_program_events_path(@conference.short_title, format: :csv, event_export_option: 'confirmed')
+                %li= link_to 'All with Comments', admin_conference_program_events_path(@conference.short_title, format: :csv, event_export_option: 'all_with_comments')
+            .btn-group
+              %button.btn.btn-default.dropdown-toggle{ 'data-toggle' => 'dropdown', type: 'button', class: 'btn btn-success' }
+                Export XLS
+                %span.caret
+              %ul.dropdown-menu{ role: 'menu' }
+                %li= link_to 'All', admin_conference_program_events_path(@conference.short_title, format: :xlsx, event_export_option: 'all')
+                %li= link_to 'Confirmed', admin_conference_program_events_path(@conference.short_title, format: :xlsx, event_export_option: 'confirmed')
+                %li= link_to 'All with Comments', admin_conference_program_events_path(@conference.short_title, format: :xlsx, event_export_option: 'all_with_comments')
+
      %p.text-muted
        All the submissions of your speakers
+
+.modal#mass-commercials-modal
+  .modal-dialog
+    .modal-content
+      .modal-header
+        %h1 Add commercials to events
+        .text-muted
+          Upload your file with data in the following format:
+          %b Event_ID:Commercial_Link
+          , eg.
+          %br
+          %b 11:https://youtube.com/myvideo
+
+      .modal-body
+        = semantic_form_for '', url: mass_upload_commercials_admin_conference_program_path(@conference.short_title), method: :post do |f|
+          = f.input 'file', as: :file
+          .modal-footer
+            = f.submit 'Add', class: 'btn btn-primary'
 .row
  .col-md-4
    = render partial: 'admin/conferences/doughnut_chart', locals: { title: 'Events state', data: @event_distribution }
--- a/Show more
+++ b/Show more