Changeset [eecec3a4b0aa21c4a16637e90f5155262d249da8] by Kalin Harvey
Revision eecec3a4b0aa21c4a16637e90f5155262d249da8,
committed by Kalin Harvey
· May 5th, 2009 @ 04:14 PM
Merge branch 'master' of git://github.com/graemeworthy/greenbuildingbrain into graeme
- 'master' of git://github.com/graemeworthy/greenbuildingbrain: changed the way that edit fields are handled so the it's more DAMP item pictures was pulling all pictures, now it just pulls from one
Conflicts:
app/controllers/items_controller.rb
7 changed files
-
M
app/controllers/items_controller.rb -
M
app/models/picture.rb -
M
app/views/items/_edit_description.html.erb -
M
app/views/items/_edit_summary.html.erb -
M
app/views/items/_edit_tags.html.erb -
M
app/views/items/_gallery.html.erb -
M
app/views/items/edit.html.erb