Merge branch 'release/v2016.06.19'

nz-supermarket · Jun 19, 2016 · fd7372b · fd7372b
2 parents 63b9f55 + 194a5c2
commit fd7372b
Show file tree

Hide file tree

Showing 51 changed files with 310 additions and 31,685 deletions.
diff --git a/Gemfile b/Gemfile
@@ -55,9 +55,6 @@ gem 'jquery-ui-rails'
 # processes and thread
 gem 'parallel'
 
-# highchart javascript library
-gem 'highcharts-rails'
-
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -106,8 +106,6 @@ GEM
       multi_json (~> 1.3)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
-    highcharts-rails (4.1.5)
-      railties (>= 3.1)
     i18n (0.7.0)
     jbuilder (2.3.0)
       activesupport (>= 3.0.0, < 5)
@@ -295,7 +293,6 @@ DEPENDENCIES
   faker
   foreman
   fuubar
-  highcharts-rails
   jbuilder
   jquery-datatables-rails
   jquery-rails

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -12,9 +12,4 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require products
-//= require dataTables/jquery.dataTables
-//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
-//= require highcharts
-//= require highcharts/highcharts-more
 //= require_tree .
diff --git a/app/assets/javascripts/dataTables/bootstrap/2/jquery.dataTables.bootstrap.js b/app/assets/javascripts/dataTables/bootstrap/2/jquery.dataTables.bootstrap.js
diff --git a/app/assets/javascripts/dataTables/bootstrap/3/jquery.dataTables.bootstrap.js b/app/assets/javascripts/dataTables/bootstrap/3/jquery.dataTables.bootstrap.js