Changeset [5f94467bc392ed5f21dbddf50a06a4ecaf754b2c] by Graeme Worthy

May 3rd, 2009 @ 06:02 PM

Merge git@github.com:greenbuilding/greenbuildingbrain into krh-merge merge kalin's code cleanup changes, got my features back

  • git@github.com:greenbuilding/greenbuildingbrain: fixed serious bug in item show template fixed serious bug in item show template checked out smaller blueprint from previous commit cleaning up failing specs repaired failing item controller specs

Conflicts:

app/controllers/items_controller.rb
spec/controllers/items_controller_spec.rb
spec/controllers/pictures_controller_spec.rb
spec/views/items/show.html.erb_spec.rb
spec/views/pictures/edit.html.erb_spec.rb
spec/views/pictures/index.html.erb_spec.rb
spec/views/pictures/show.html.erb_spec.rb

http://github.com/graemeworthy/g...

Committed by Graeme Worthy

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.