Changeset [3497265e435c800e74f40c98055734290e8103e0] by Alex Grunenfelder

February 1st, 2010 @ 03:15 PM

Merge branch 'master' of git://github.com/kalin/greenbuildingbrain into dcs_portal

  • 'master' of git://github.com/kalin/greenbuildingbrain: update to make tests pass and reduce complaining on autospec 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: http://github.com/greenbuilding/greenbuildingbrain/commit/3497265e4...

Committed by Alex Grunenfelder

  • 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/company_spec.rb
  • M spec/models/picture_spec.rb
  • M vendor/rails/activerecord/lib/activerecord.rb
  • M vendor/rails/activeresource/lib/activeresource.rb
  • M vendor/rails/activesupport/lib/activesupport.rb
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.