Changeset [ec63a64d428b678ea1b822953b5b1e72d81e2dab] by Alex Grunenfelder
March 30th, 2010 @ 02:13 PM
Merge branch 'master' of git://github.com/greenbuilding/greenbuildingbrain into dcs_portal
- 'master' of git://github.com/greenbuilding/greenbuildingbrain: no border on right side of main window gallery fixed failing spec in version controller use .becomes to avoid form malarky Picture view specs were failing.
Conflicts:
app/views/dashboard/_infrastructure.html.erb
http://github.com/greenbuilding/greenbuildingbrain/commit/ec63a64d4...
Committed by Alex Grunenfelder
- R spec/fixtures/pictures.yml
- R spec/helpers/pictures_helper_spec.rb
- M app/controllers/dashboard_controller.rb
- M app/controllers/items_controller.rb
- M app/controllers/versions_controller.rb
- M app/views/dashboard/_infrastructure.html.erb
- M app/views/dashboard/index.html.erb
- M app/views/items/_edit_address.html.erb
- M app/views/items/_edit_certifications.html.erb
- M app/views/items/_edit_description.html.erb
- M app/views/items/_edit_name.html.erb
- M app/views/items/_edit_project_team.html.erb
- M app/views/items/_edit_stats.html.erb
- M app/views/items/_edit_summary.html.erb
- M app/views/items/_edit_tags.html.erb
- M app/views/items/new.html.erb
- M app/views/pictures/new.html.erb
- M spec/controllers/versions_controller_spec.rb
- M spec/views/items/new.html.erb_spec.rb
- M spec/views/items/show.html.erb_spec.rb
- M spec/views/pictures/edit.html.erb_spec.rb
- M spec/views/pictures/index.html.erb_spec.rb
- M spec/views/pictures/new.html.erb_spec.rb
- M spec/views/pictures/show.html.erb_spec.rb
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.