Changeset [293afbbdeb1c21f3bacc8463e41d45efab5273a9] by Graeme Worthy
Revision 293afbbdeb1c21f3bacc8463e41d45efab5273a9,
committed by Graeme Worthy
· June 9th, 2009 @ 10:27 PM
Merge branch 'master' of git@github.com:greenbuilding/greenbuildingbrain
- 'master' of git@github.com:greenbuilding/greenbuildingbrain: updating dashboard map to have clustering and other things http://github.com/greenbuilding/...
23 changed files
-
M
app/controllers/dashboard_controller.rb -
M
app/models/item.rb -
M
app/views/dashboard/index.html.erb -
M
app/views/layouts/application.html.erb -
M
public/images/conv30.png -
M
public/images/conv40.png -
M
public/images/conv50.png -
M
public/images/m1.png -
M
public/images/m2.png -
M
public/images/m3.png -
M
public/images/m4.png -
M
public/images/m5.png -
M
public/images/map30.png -
M
public/images/map35.png -
M
public/images/map40.png -
M
public/images/map45.png -
M
public/images/map50.png -
M
public/images/map55.png -
M
public/images/map_cluster.psd -
M
public/javascripts/application.js -
M
public/javascripts/maps.js -
M
public/javascripts/markerclusterer.js -
M
public/javascripts/scripts.js