fixed issue that was thrown stating could not find file jquery.datatables - warvox - VoIP based wardialing tool, forked from rapid7/warvox.
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
---
(DIR) commit e23374a007b861e1c440fd3fee65dbc9d29a4f94
(DIR) parent 7300d25e27097084779bef8eb909a16ff23ff6a8
(HTM) Author: zeknox <mccann.brandon@gmail.com>
Date: Fri, 23 Oct 2015 15:53:31 -0500
fixed issue that was thrown stating could not find file jquery.datatables
Diffstat:
M Gemfile | 3 ++-
M Gemfile.lock | 20 ++++++++++++++------
M app/assets/stylesheets/application… | 2 +-
3 files changed, 17 insertions(+), 8 deletions(-)
---
(DIR) diff --git a/Gemfile b/Gemfile
@@ -5,7 +5,7 @@ gem 'rails', '>=4.1.9', '< 4.2.0'
gem 'pg', '>=0.17'
gem 'jquery-rails', '>= 3.1.2'
-gem 'jquery-datatables-rails', '>= 2.2.3'
+gem 'jquery-datatables-rails', git: 'https://github.com/rweng/jquery-datatables-rails.git'
#gem 'postgres_ext', :git => 'git://github.com/dockyard/postgres_ext.git'
gem 'kissfft'
@@ -35,3 +35,4 @@ gem 'will_paginate-bootstrap'
gem 'dynamic_form', '>= 1.1.4'
gem 'psych_shield'
gem 'scrypt'
+
(DIR) diff --git a/Gemfile.lock b/Gemfile.lock
@@ -6,6 +6,16 @@ GIT
activerecord (>= 3.0)
activesupport (>= 3.0.0)
+GIT
+ remote: https://github.com/rweng/jquery-datatables-rails.git
+ revision: 9eee0a1975b5a22e50bdc73fcca7db7f8a12c143
+ specs:
+ jquery-datatables-rails (3.3.0)
+ actionpack (>= 3.1)
+ jquery-rails
+ railties (>= 3.1)
+ sass-rails
+
GEM
remote: http://rubygems.org/
specs:
@@ -71,11 +81,6 @@ GEM
formtastic (>= 3.0)
hike (1.2.3)
i18n (0.7.0)
- jquery-datatables-rails (3.3.0)
- actionpack (>= 3.1)
- jquery-rails
- railties (>= 3.1)
- sass-rails
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
@@ -167,7 +172,7 @@ DEPENDENCIES
font-awesome-rails
formtastic (>= 3.0.0)
formtastic-bootstrap (>= 3.0.0)
- jquery-datatables-rails (>= 2.2.3)
+ jquery-datatables-rails!
jquery-rails (>= 3.1.2)
kissfft
pg (>= 0.17)
@@ -184,3 +189,6 @@ DEPENDENCIES
unicorn
will_paginate (~> 3.0)
will_paginate-bootstrap
+
+BUNDLED WITH
+ 1.10.6
(DIR) diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb
@@ -4,7 +4,7 @@
*= require formtastic-bootstrap
*= require formtastic-overrides
*= require bootstrap-lightbox
- *= require jquery.dataTables
+ *= require dataTables/jquery.dataTables
*= require font-awesome
*/