Changeset [7369418ddf4d128cb9805469aa6e3318a02034d4] by Graeme Worthy
Revision 7369418ddf4d128cb9805469aa6e3318a02034d4,
committed by Graeme Worthy
· April 21st, 2009 @ 08:25 PM
Merge branch 'master' of git@github.com:greenbuilding/greenbuildingbrain into krh-merge http://github.com/graemeworthy/g...
24 changed files
-
M
app/controllers/map_controller.rb -
M
app/models/building.rb -
M
app/models/edit.rb -
M
app/models/page.rb -
M
app/models/resource.rb -
M
app/models/user.rb -
M
app/views/homepage/index.html.erb -
M
app/views/layouts/application.html.erb -
M
app/views/map/index.html.erb -
M
app/views/sessions/new.html.erb -
M
app/views/users/new.html.erb -
M
db/migrate/20090408043830_create_versioned_building.rb -
M
db/migrate/20090422015024_create_resources.rb -
M
db/migrate/20090422021123_add_resource_table.rb -
M
db/migrate/20090422023937_add_editor_and_author_keys.rb -
M
db/migrate/20090422024653_add_type_to_resource_table.rb -
M
db/migrate/20090422030741_remove_extra_tables.rb -
M
db/schema.rb -
M
public/images/greenbuildingmap.jpg -
M
public/stylesheets/greenbuildingmap.css -
M
spec/fixtures/resources.yml -
M
spec/models/building_spec.rb -
M
spec/models/edit_spec.rb -
M
spec/models/resource_spec.rb