Changeset [7d3fd8381adfdcd032f5e6f6c4eca63783403bf5] by Kalin Harvey

June 5th, 2009 @ 02:13 AM

Merge branch 'master' of git@github.com:greenbuilding/greenbuildingbrain

  • 'master' of git@github.com:greenbuilding/greenbuildingbrain: 'edit mode works again' deploy to new server json api for importing items and updating them got a good start on making stats work as a browseable set of things Phase one security patching: no edit links visible ever if not logged in. analtyics only enabled in production picture pagination spec is passing autospec, now with things that are not dots removed buildings controller, the whole thing was commented out anyway

Conflicts:

app/controllers/items_controller.rb

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

Committed by Kalin Harvey

  • M app/controllers/buildings_controller.rb
  • M app/controllers/items_controller.rb
  • M app/controllers/library_controller.rb
  • M app/controllers/stats_controller.rb
  • M app/models/stat.rb
  • M app/views/comments/index.html.erb
  • M app/views/items/_address.html.erb
  • M app/views/items/_certifications.html.erb
  • M app/views/items/_description.html.erb
  • M app/views/items/_edit_address.html.erb
  • M app/views/items/_gallery.html.erb
  • M app/views/items/_project_team.html.erb
  • M app/views/items/_project_team_members.html.erb
  • M app/views/items/_ratings.html.erb
  • M app/views/items/_reason.html.erb
  • M app/views/items/_stats.html.erb
  • M app/views/items/_summary.html.erb
  • M app/views/items/_tags.html.erb
  • M app/views/items/edit.html.erb
  • M app/views/items/show.html.erb
  • M app/views/layouts/application.html.erb
  • M app/views/pictures/edit.html.erb
  • M app/views/pictures/index.html.erb
  • M app/views/pictures/show.html.erb
  • M app/views/stats/index.html.erb
  • M app/views/stats/show.html.erb
  • M config/deploy.rb
  • M config/environment.rb
  • M config/environments/development.rb
  • M config/routes.rb
  • M public/stylesheets/old_gbb.css
  • M spec/controllers/library_controller_spec.rb
  • M spec/models/user_spec.rb
  • M spec/spec.opts
  • M spec/views/pictures/index.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.