Changeset [286e07fb493b82e4b905ebf08745d102151723cd] by Alex Grunenfelder

March 4th, 2010 @ 10:29 PM

Merge branch 'master' of git://github.com/greenbuilding/greenbuildingbrain into dcs_portal

  • 'master' of git://github.com/greenbuilding/greenbuildingbrain: added static audiotour page and route, clarified where bubbles come from added descriptions to audio tours and put in copy for index page tour title isn't smushed up against the map

Conflicts:

app/views/tours/show.html.erb

http://github.com/greenbuilding/greenbuildingbrain/commit/286e07fb4...

Committed by Alex Grunenfelder

  • A db/migrate/20100305043656_add_description_to_tour.rb
  • M app/views/items/summary.html.erb
  • M app/views/map/index.html.erb
  • M app/views/tours/index.html.erb
  • M app/views/tours/show.html.erb
  • M config/routes.rb
  • M db/schema.rb
  • M public/stylesheets/common.css
New-ticket 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.