close #885 update timepicker and specify new location of datepair

concerto · Feb 18, 2014 · 0fc9037 · 0fc9037
1 parent 00e5e4c
commit 0fc9037
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -36,7 +36,7 @@ end
 
 gem 'jquery-rails'
 gem 'turbolinks'
-gem 'jquery-timepicker-rails', '1.2.5.0'
+gem 'jquery-timepicker-rails', '~> 1.3'
 gem 'bootstrap-datepicker-rails'
 gem 'twitter-bootstrap-rails-confirm'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -115,7 +115,7 @@ GEM
     jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-timepicker-rails (1.2.5.0)
+    jquery-timepicker-rails (1.3.3)
       railties (>= 3.1.0)
     json (1.7.7)
     jwt (0.1.11)
@@ -242,7 +242,7 @@ DEPENDENCIES
   foreman
   girl_friday
   jquery-rails
-  jquery-timepicker-rails (= 1.2.5.0)
+  jquery-timepicker-rails (~> 1.3)
   json (= 1.7.7)
   kaminari (= 0.14.1)
   mysql2

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -19,6 +19,6 @@
 //= require bootstrap-datepicker/core
 //  NOTE: right now only the English (default) is provided for the bootstrap-datepicker; if all internationalizations should be included, just remove the '/core' part of the line above and make it just 'require bootstrap-datepicker'
 //= require jquery.timepicker.js
-//= require datepair.js
+//= require jquery.datepair.js
 //= require jquery.iframe-transport
 //= require_tree .