colinyoung · Apr 18, 2016 · Apr 18, 2016 · Apr 18, 2016 · Apr 18, 2016 · May 10, 2016
diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+2.3.0
diff --git a/.rvmrc b/.rvmrc
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,59 +1,62 @@
 PATH
   remote: .
   specs:
-    pikaday-gem (1.1.0.0)
-      railties (>= 3.1)
+    pikaday-gem (1.4.0.0)
+      railties (>= 3.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
+    actionpack (4.2.6)
+      actionview (= 4.2.6)
+      activesupport (= 4.2.6)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.6)
+      activesupport (= 4.2.6)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    builder (3.0.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activesupport (4.2.6)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    builder (3.2.2)
     erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.7.7)
-    multi_json (1.6.1)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
+    i18n (0.7.0)
+    json (1.8.3)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mini_portile2 (2.0.0)
+    minitest (5.8.4)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    rack (1.6.4)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (4.2.6)
+      actionpack (= 4.2.6)
+      activesupport (= 4.2.6)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.17.0)
-    tilt (1.3.6)
+      thor (>= 0.18.1, < 2.0)
+    rake (11.1.2)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   java
@@ -62,3 +65,6 @@ PLATFORMS
 DEPENDENCIES
   bundler (>= 1.2.2)
   pikaday-gem!
+
+BUNDLED WITH
+   1.11.2
diff --git a/README.md b/README.md
@@ -3,6 +3,8 @@
 
 [Pikaday datepicker][pikaday] as a Ruby gem.
 
+This repo uses the `owenmead/Pikaday` version of Pikaday to include timepicker support.
+
 ## Getting Started
 
 Add the gem to your Gemfile:
@@ -53,4 +55,4 @@ Then the maintainer of the gem will need to do the following steps:
 1. Update [the changelog](CHANGELOG.md)
 1. `rake release`
 
-[pikaday]: https://github.com/dbushell/Pikaday
+[pikaday]: https://github.com/dbushell/Pikaday
diff --git a/Rakefile b/Rakefile
@@ -40,7 +40,7 @@ task :download do |t|
   puts "Target version: #{version.chomp('/')}"
 
   # Get the different versions
-  tags_url = 'https://api.github.com/repos/dbushell/Pikaday/tags'
+  tags_url = 'https://api.github.com/repos/owenmead/Pikaday/tags'
   result = JSON.parse(open(tags_url).read)
   versions = result.map { |item| item['name'] }
 
@@ -66,7 +66,7 @@ task :download do |t|
   create_dir dir_css, get_version
 
   # Download the right files
-  url_root = 'https://raw.github.com/dbushell/Pikaday/' + commit + '/'
+  url_root = 'https://raw.github.com/owenmead/Pikaday/' + commit + '/'
   url_js = url_root + 'pikaday.js'
   url_css = url_root + '/css/pikaday.css'
 

diff --git a/lib/pikaday-gem/version.rb b/lib/pikaday-gem/version.rb
@@ -1,3 +1,3 @@
 module PikadayGem
-  VERSION = "1.1.0.0"
+  VERSION = "1.4.0.0"
 end
diff --git a/pickaday-gem.gemspec b/pickaday-gem.gemspec
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.description = "Include the Pikaday datepicker from @dbushell in your Rails projects"
 
   s.files = Dir["{app,config,db,lib,vendor}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md"]
-  s.add_dependency "railties", [">= 3.1"]
+  s.add_dependency "railties", [">= 3.2"]
 
   s.add_development_dependency "bundler", [">= 1.2.2"]
 end