Permalink
Browse files

Merge branch 'master' of github.com:Jarred-Sumner/FundingList.us

Conflicts:
	Gemfile
	app/assets/stylesheets/application.css.scss
	app/views/companies/show.html.erb
  • Loading branch information...
2 parents 83fc565 + e55a7aa commit 62bf779508347e962a76288a6c721de6664d0abf Jarred Sumner committed Feb 21, 2012
Showing with 844 additions and 654 deletions.
  1. +7 −1 Gemfile
  2. +8 −1 Gemfile.lock
  3. +303 −434 albipes.sublime-workspace
  4. +4 −0 app/assets/javascripts/accounting.min.js
  5. +0 −29 app/assets/javascripts/application.js
  6. +6 −0 app/assets/javascripts/application.js.coffee
  7. +199 −0 app/assets/javascripts/highcharts.js
  8. +33 −0 app/assets/javascripts/require.js
  9. +24 −3 app/assets/javascripts/round.js.coffee
  10. +11 −4 app/assets/javascripts/search.js.coffee
  11. +54 −1 app/assets/javascripts/show_companies.js.coffee
  12. +12 −3 app/assets/stylesheets/application.css.scss
  13. +27 −79 app/assets/stylesheets/companies.css.scss
  14. +14 −22 app/assets/stylesheets/round.css.scss
  15. +57 −0 app/assets/stylesheets/search.css.scss
  16. +13 −2 app/controllers/companies_controller.rb
  17. +2 −22 app/controllers/round_controller.rb
  18. +1 −1 app/models/company.rb
  19. +4 −0 app/models/person.rb
  20. +1 −1 app/views/companies/_related_people.html.erb
  21. +3 −3 app/views/companies/_rounds.html.erb
  22. +4 −4 app/views/companies/index.html.erb
  23. +5 −1 app/views/companies/search.json.rabl
  24. +3 −6 app/views/companies/show.html.erb
  25. +6 −4 app/views/layouts/application.html.erb
  26. +1 −1 app/views/people/show.html.erb
  27. +9 −9 app/views/round/_related_people.html.erb
  28. +0 −2 app/views/round/_revenue_range.html.erb
  29. +1 −1 app/views/round/_security.html.erb
  30. +3 −3 app/views/round/_start_and_finish.html.erb
  31. +1 −1 app/views/round/_total_investors.html.erb
  32. +0 −2 app/views/round/_use_of_funds.html.erb
  33. +24 −11 app/views/round/show.html.erb
  34. +3 −2 config/database.yml
  35. +1 −1 config/routes.rb
View
@@ -32,7 +32,13 @@ gem 'sqlite3'
gem 'pg'
# Bootstrap
-gem 'bootstrap-sass', '~> 2.0.1'
+gem 'bootstrap-sass'
# Deployment
gem 'capistrano'
+
+# Charts
+gem "highcharts-rails", "~> 2.1.9"
+
+# Ruby variables in JS
+gem 'gon'
View
@@ -50,6 +50,11 @@ GEM
erubis (2.7.0)
execjs (1.3.0)
multi_json (~> 1.0)
+ gon (2.1.0)
+ actionpack (>= 2.3.0)
+ json
+ highcharts-rails (2.1.9)
+ railties (~> 3.1)
highline (1.6.11)
hike (1.2.1)
i18n (0.6.0)
@@ -137,10 +142,12 @@ PLATFORMS
ruby
DEPENDENCIES
- bootstrap-sass (~> 2.0.1)
+ bootstrap-sass
bourbon
capistrano
coffee-rails (~> 3.2.1)
+ gon
+ highcharts-rails (~> 2.1.9)
jquery-rails
nokogiri
pg
Oops, something went wrong.

0 comments on commit 62bf779

Please sign in to comment.