Merge pull request #141 from fsek/revert-139-revert-88-cafebokning

Merge Cafebokning into master, third times a charm!

.gitignore

@@ -18,6 +18,7 @@ config/database.yml
 config/initializers/secret_token.rb
 config/secrets.yml
 /storage/
+
 ## Environment normalisation:
 /.bundle
 /vendor/bundle

Gemfile

@@ -14,6 +14,7 @@ gem 'coffee-rails'
 # Set to 1.8 due to https://github.com/jashkenas/coffeescript/issues/3829
 gem 'coffee-script-source', '1.8.0'
 gem 'devise'
+gem 'bootstrap3-datetimepicker-rails', '~> 4.7.14'
 gem 'fancybox2-rails'
 gem 'font-awesome-rails'
 gem 'fullcalendar-rails'
@@ -23,7 +24,7 @@ gem 'jbuilder'
 gem 'jquery-rails'
 gem 'jquery-turbolinks'
 gem 'jquery-ui-rails'
-gem 'momentjs-rails'
+gem 'momentjs-rails', "~> 2.9.0"
 gem 'mysql2'
 gem 'paperclip'
 gem 'prawn-rails'
@@ -55,4 +56,3 @@ group :test do
   gem 'database_cleaner'
   gem 'shoulda-matchers', require: false
 end
-

Gemfile.lock

@@ -44,6 +44,8 @@ GEM
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
+    bootstrap3-datetimepicker-rails (4.7.14)
+      momentjs-rails (>= 2.8.1)
     builder (3.2.2)
     byebug (4.0.3)
       columnize (= 0.9.0)
@@ -314,6 +316,7 @@ PLATFORMS
 
 DEPENDENCIES
   better_errors
+  bootstrap3-datetimepicker-rails (~> 4.7.14)
   cancancan
   capistrano (~> 3.1.0)
   capistrano-bundler (~> 1.1.2)
@@ -336,7 +339,7 @@ DEPENDENCIES
   jquery-turbolinks
   jquery-ui-rails
   mailcatcher
-  momentjs-rails
+  momentjs-rails (~> 2.9.0)
   mysql2
   paperclip
   poltergeist