Changeset [aafa99b0245649849e1f81764fa5dc5bcdbf066f] by Graeme Worthy
May 22nd, 2009 @ 01:50 PM
Merge branch 'master' of git@github.com:greenbuilding/greenbuildingbrain into krh-merge
- 'master' of git@github.com:greenbuilding/greenbuildingbrain: larger infobubbles removed info bubbles from dashboard map various map improvments for dashboard, reintro kml, and georss
Conflicts:
app/views/items/_description.html.erb
Committed by Graeme Worthy
- M app/controllers/dashboard_controller.rb
- M app/controllers/items_controller.rb
- M app/controllers/map_controller.rb
- M app/views/dashboard/index.html.erb
- M app/views/items/index.atom.builder
- M app/views/items/index.html.erb
- M app/views/items/index.kml.builder
- M app/views/layouts/application.html.erb
- M app/views/layouts/map.html.erb
- M public/stylesheets/old_gbb.css
- M spec/views/items/show.html.erb_spec.rb
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
The Green Building Brain is an open source and open content tool for collaboration and resource sharing between green building professionals and amateurs.