Changeset [b69ce4d06efdb0b3138def3d4b113baf1bab4873] by Kalin Harvey
Revision b69ce4d06efdb0b3138def3d4b113baf1bab4873,
committed by Kalin Harvey
· February 1st, 2010 @ 08:03 AM
Merge branch 'master' of git://github.com/graemeworthy/greenbuildingbrain into graeme
- 'master' of git://github.com/graemeworthy/greenbuildingbrain: featured image, now you can hit 'feature this image' and it will get set as the featured image, it's pretty cool pictures controller doesn't worry about forgery Items Controller:
Conflicts:
spec/fixtures/users.yml
http://github.com/greenbuilding/greenbuildingbrain/commit/b69ce4d06...
15 changed files
-
A
db/migrate/20100131225405_add_featured_image.rb -
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/_edit_address.html.erb -
M
app/views/items/_edit_description.html.erb -
M
app/views/items/_edit_name.html.erb -
M
app/views/items/_edit_summary.html.erb -
M
app/views/items/_gallery.html.erb -
M
app/views/items/_picture.html.erb -
M
app/views/pictures/index.html.erb -
M
db/schema.rb -
M
spec/fixtures/users.yml -
M
spec/models/picture_spec.rb