Changeset [e71238c6e33872bff3bbbe6cc90c5a0a4b8a793f] by Kalin Harvey
Revision e71238c6e33872bff3bbbe6cc90c5a0a4b8a793f,
committed by Kalin Harvey
· May 5th, 2009 @ 02:06 AM
Merge branch 'master' of git@github.com:greenbuilding/greenbuildingbrain
- 'master' of git@github.com:greenbuilding/greenbuildingbrain: items can now have pictures and we can upload those pictures to items
Conflicts:
app/controllers/items_controller.rb
config/routes.rb
9 changed files
-
M
app/controllers/items_controller.rb -
M
app/controllers/pictures_controller.rb -
M
app/models/item.rb -
M
app/models/picture.rb -
M
app/views/items/_gallery.html.erb -
M
app/views/items/_version_controls.html.erb -
M
config/routes.rb -
M
db/migrate/20090503114213_add_itemto_picture.rb -
M
spec/views/items/edit.html.erb_spec.rb