Changeset [8fb55cca08545a3ebd586c1d732eb68d355e70b7] by Alex Grunenfelder

Revision 8fb55cca08545a3ebd586c1d732eb68d355e70b7, committed by Alex Grunenfelder · February 22nd, 2010 @ 10:02 PM

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

'master' of git://github.com/greenbuilding/greenbuildingbrain: facebox can't handle large images change gbb db so that values of roles can be 'text' rather than varchar... "Architect: Peter Watson" about page now up for 10 sec tours now properly display a map alex's background all right and pretty again fixed about box background item show pages now have audio players too adding audio tours and a tour view homepage spec needed login http://github.com/greenbuilding/greenbuildingbrain/commit/8fb55cca0...

A app/views/items/_search_result.html.erb
A app/views/tours/index.html.erb
A app/views/tours/show.html.erb
A db/migrate/20100220004041_add_s3path_to_audio_files.rb
A db/migrate/20100222223532_change_length_of_roles_for_project_team_members.rb
A public/images/arrowtabs2.png
A public/images/icon_pause.png
A public/images/icon_play.png
A public/javascripts/audio-inline.js
A public/javascripts/inline.js
A public/stylesheets/inline-player.css
M app/controllers/js_controller.rb
M app/controllers/tours_controller.rb
M app/models/audio_file.rb
M app/models/tour.rb
M app/views/dashboard/index.html.erb
M app/views/homepage/dashboard.html.erb
M app/views/items/index.html.erb
M app/views/items/show.html.erb
M app/views/pictures/show.html.erb
M public/stylesheets/gg.css
M spec/controllers/homepage_controller_spec.rb
M spec/controllers/tours_controller_spec.rb
M spec/factories/factories.rb
M spec/models/audio_file_spec.rb
M spec/models/item_spec.rb