diff --git a/Gemfile b/Gemfile --- a/Gemfile +++ b/Gemfile @@ -50,7 +50,7 @@ # jquery addition gem 'jquery-rails' gem 'jquery-ui-rails' -gem 'jquery-timepicker-addon-rails' +#gem 'jquery-timepicker-addon-rails' gem 'jquery-tablesorter' gem 'jquery-countdown-rails' @@ -62,10 +62,10 @@ gem 'bootstrap-switch-rails' gem 'bootstrap-toggle-rails' gem 'autoprefixer-rails' -gem 'momentjs-rails' +gem 'momentjs-rails', '>= 2.9.0' gem 'rails_bootstrap_sortable' -gem 'bootstrap-datepicker-rails' -gem 'bootstrap3-datetimepicker-rails' +#gem 'bootstrap-datepicker-rails' +gem 'bootstrap3-datetimepicker-rails', '~> 4.17.47' #gem 'jquery-datatables-rails' #----------- user interface ----------------- @@ -75,7 +75,7 @@ #ace editor gem 'ace-rails-ap' #paginator -gem 'will_paginate', '~> 3.0.7' +#gem 'will_paginate', '~> 3.0.7' gem 'mail' gem 'rdiscount'