Skip to content

Commit

Permalink
Update to dashing 1.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Jay Zoldak committed Mar 2, 2014
1 parent eaf8363 commit 777c83c
Show file tree
Hide file tree
Showing 21 changed files with 2,461 additions and 757 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*DS_STORE
history.yml
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'dashing'
gem 'dashing', "1.3.2"
gem 'nokogiri'
gem 'execjs'
gem 'therubyracer'
70 changes: 38 additions & 32 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,70 +1,76 @@
GEM
remote: http://rubygems.org/
remote: https://rubygems.org/
specs:
backports (3.1.1)
atomic (1.1.15)
backports (3.6.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.6.2)
coffee-script-source (1.7.0)
daemons (1.1.9)
dashing (1.0.4)
coffee-script
dashing (1.3.2)
coffee-script (>= 1.6.2)
execjs (>= 2.0.0)
rack
rufus-scheduler
rufus-scheduler (~> 2.0)
sass
sinatra
sinatra-contrib
sprockets
thin
thor
eventmachine (1.0.3)
execjs (1.4.0)
multi_json (~> 1.0)
hike (1.2.1)
libv8 (3.11.8.17)
multi_json (1.7.2)
nokogiri (1.5.9)
execjs (2.0.2)
hike (1.2.3)
libv8 (3.16.14.3)
mini_portile (0.5.2)
multi_json (1.8.4)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
rack (1.5.2)
rack-protection (1.5.0)
rack-protection (1.5.2)
rack
rack-test (0.6.2)
rack (>= 1.0)
ref (1.0.4)
rufus-scheduler (2.0.18)
tzinfo (>= 0.3.23)
sass (3.2.7)
sinatra (1.3.6)
ref (1.0.5)
rufus-scheduler (2.0.24)
tzinfo (>= 0.3.22)
sass (3.2.14)
sinatra (1.4.4)
rack (~> 1.4)
rack-protection (~> 1.3)
tilt (~> 1.3, >= 1.3.3)
sinatra-contrib (1.3.2)
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
sinatra-contrib (1.4.2)
backports (>= 2.0)
eventmachine
multi_json
rack-protection
rack-test
sinatra (~> 1.3.0)
sinatra (~> 1.4.0)
tilt (~> 1.3)
sprockets (2.9.0)
sprockets (2.11.0)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
therubyracer (0.11.4)
libv8 (~> 3.11.8.12)
therubyracer (0.12.1)
libv8 (~> 3.16.14.0)
ref
thin (1.5.1)
thin (1.6.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
eventmachine (>= 1.0.0)
rack (>= 1.0.0)
thor (0.18.0)
tilt (1.3.6)
tzinfo (0.3.37)
thor (0.18.1)
thread_safe (0.2.0)
atomic (>= 1.1.7, < 2)
tilt (1.4.1)
tzinfo (1.1.0)
thread_safe (~> 0.1)

PLATFORMS
ruby

DEPENDENCIES
dashing
dashing (= 1.3.2)
execjs
nokogiri
therubyracer
Binary file modified assets/fonts/fontawesome-webfont.eot
Binary file not shown.
640 changes: 392 additions & 248 deletions assets/fonts/fontawesome-webfont.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/fonts/fontawesome-webfont.ttf
Binary file not shown.
Binary file modified assets/fonts/fontawesome-webfont.woff
Binary file not shown.
1 change: 0 additions & 1 deletion assets/javascripts/application.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
console.log("Yeah! The dashboard has started!")

Dashing.on 'ready', ->
Dashing.debugMode = false
Dashing.widget_margins ||= [5, 5]
Dashing.widget_base_dimensions ||= [300, 360]
Dashing.numColumns ||= 4
Expand Down
5 changes: 5 additions & 0 deletions assets/javascripts/d3-3.2.8.js

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions assets/javascripts/d3.v2.min.js

This file was deleted.

Loading

0 comments on commit 777c83c

Please sign in to comment.