Changeset [1309caf4a38ad545b2383e19f9476e196c6a8ddb] by Kalin Harvey

May 20th, 2009 @ 01:26 PM

Merge branch 'master' of git://github.com/graemeworthy/greenbuildingbrain into gm

  • 'master' of git://github.com/graemeworthy/greenbuildingbrain: controller shifted to item from company in spec This is a big commit, there were a few hack sessions to cover.

Conflicts:

app/views/layouts/application.html.erb

http://github.com/greenbuilding/...

Committed by Kalin Harvey

  • M app/controllers/items_controller.rb
  • M app/controllers/stats_controller.rb
  • M app/helpers/items_helper.rb
  • M app/helpers/stats_helper.rb
  • M app/models/item.rb
  • M app/models/page.rb
  • M app/models/stat.rb
  • M app/views/items/_edit_stats.html.erb
  • M app/views/items/_stats.html.erb
  • M app/views/items/_structured_data.html.erb
  • M app/views/items/_version_controls.html.erb
  • M app/views/items/show.html.erb
  • M app/views/layouts/application.html.erb
  • M app/views/stats/edit.html.erb
  • M app/views/stats/index.html.erb
  • M app/views/stats/new.html.erb
  • M config/routes.rb
  • M db/migrate/20090517041301_createfavourites.rb
  • M db/migrate/20090519051308_create_structured_datas.rb
  • M db/schema.rb
  • M public/stylesheets/greenbuildingmap.css
  • M spec/controllers/homepage_controller_spec.rb
  • M spec/controllers/stats_controller_spec.rb
  • M spec/models/comment_spec.rb
  • M spec/models/item_spec.rb
  • M spec/models/stat_spec.rb
  • M spec/routing/companies_routing.spec.rb
  • M spec/views/comments/index.html.erb_spec.rb
  • M spec/views/stats/edit.html.erb_spec.rb
  • M spec/views/stats/index.html.erb_spec.rb
  • M spec/views/stats/new.html.erb_spec.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.