Changeset [691d57f6ec768e7528727ef846e46d4db4b9ed15] by Kalin Harvey
May 5th, 2009 @ 12:57 AM
Merge branch 'master' of git@github.com:greenbuilding/greenbuildingbrain
- 'master' of git@github.com:greenbuilding/greenbuildingbrain: i have now made all the tests pass for pictures, this does not indicate that there are, in fact good tests kalin broke all the tests
Conflicts:
app/controllers/items_controller.rb
app/views/items/show.html.erb
Committed by Kalin Harvey
- M app/controllers/items_controller.rb
- M app/helpers/items_helper.rb
- M app/helpers/pages_helper.rb
- M app/views/items/_edit_summary.html.erb
- M app/views/items/_editlink.html.erb
- M app/views/items/_map.html.erb
- M app/views/items/_summary.html.erb
- M app/views/items/edit.html.erb
- M app/views/items/show.html.erb
- M db/schema.rb
- M spec/controllers/pictures_controller_spec.rb
- M spec/models/picture_spec.rb
- M spec/views/pictures/edit.html.erb_spec.rb
- M spec/views/pictures/index.html.erb_spec.rb
- M spec/views/pictures/show.html.erb_spec.rb
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.