Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Used Timepicker gem from https://github.com/tkrotoff/jquery-timepicke…

…r-rails to deal with #264 - but the styles were borked before this and still need fixing
  • Loading branch information...
commit b1e4ac60d1e6dd2a89ddd1da90f993fe474efdb3 1 parent dd129fc
@augustf augustf authored
View
3  .gitmodules
@@ -1,6 +1,3 @@
[submodule "vendor/tools/closure"]
path = vendor/tools/closure
url = https://github.com/jarib/google-closure-library
-[submodule "vendor/assets/javascripts/timepicker"]
- path = vendor/assets/javascripts/timepicker
- url = https://github.com/jonthornton/jquery-timepicker.git
View
1  Gemfile
@@ -30,6 +30,7 @@ group :assets do
end
gem 'jquery-rails'
+gem 'jquery-timepicker-rails'
# In production we prefer MySQL over sqlite3. If you are only
# interested in development and don't want to bother with production,
View
7 Gemfile.lock
@@ -75,6 +75,8 @@ GEM
jquery-rails (2.2.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
+ jquery-timepicker-rails (0.2.0)
+ railties (>= 3.1.0)
json (1.7.6)
libv8 (3.11.8.13)
mail (2.4.4)
@@ -109,7 +111,7 @@ GEM
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (< 2.0, >= 0.14.6)
+ thor (>= 0.14.6, < 2.0)
rake (10.0.3)
rdoc (3.12)
json (~> 1.4)
@@ -149,7 +151,7 @@ GEM
tzinfo (0.3.35)
uglifier (1.3.0)
execjs (>= 0.3.0)
- multi_json (>= 1.0.2, ~> 1.0)
+ multi_json (~> 1.0, >= 1.0.2)
warden (1.2.1)
rack (>= 1.0)
@@ -168,6 +170,7 @@ DEPENDENCIES
execjs
girl_friday
jquery-rails
+ jquery-timepicker-rails
json
mysql2
rails (= 3.2.11)
View
2  app/assets/javascripts/application.js
@@ -15,7 +15,7 @@
//= require jquery-ui
//= require html5_shiv/html5
//= require jquery.qtip.min
-//= require timepicker/jquery.timepicker
+//= require jquery.timepicker.js
//= require_tree .
// require turbolinks
1  vendor/assets/javascripts/timepicker
@@ -1 +0,0 @@
-Subproject commit 780bec4c7facf0c69f8404a41a4f094de42eb7aa
Please sign in to comment.
Something went wrong with that request. Please try again.