Changeset [d176116752cf251831375183edad22d6fa821c95] by Graeme Worthy
Revision d176116752cf251831375183edad22d6fa821c95,
committed by Graeme Worthy
· June 5th, 2009 @ 01:20 AM
Merge branch 'master' of git@github.com:greenbuilding/greenbuildingbrain into krh-merge
- 'master' of git@github.com:greenbuilding/greenbuildingbrain: added api key for mosso deploy changed deploy for new server removed auto_complete error made add links do nothing instead of fail for deploy added related links for all categories, add links don't work yet fixed failing tests, and added missing links class into old css took out deprecated models and filters
Conflicts:
app/views/items/_stats.html.erb
app/views/items/show.html.erb
app/views/layouts/application.html.erb
app/views/pictures/index.html.erb
spec/models/user_spec.rb
24 changed files
-
M
app/controllers/application_controller.rb -
M
app/controllers/items_controller.rb -
M
app/controllers/versions_controller.rb -
M
app/models/item.rb -
M
app/views/dashboard/index.html.erb -
M
app/views/items/_description.html.erb -
M
app/views/items/_related_links.html.erb -
M
app/views/items/new.html.erb -
M
app/views/items/show.html.erb -
M
app/views/layouts/_header.html.erb -
M
app/views/layouts/_map_header.html.erb -
M
app/views/layouts/application.html.erb -
M
app/views/map/index.js.rjs -
M
app/views/pictures/edit.html.erb -
M
app/views/sessions/new.html.erb -
M
app/views/users/edit.html.erb -
M
app/views/users/new.html.erb -
M
config/deploy.rb -
M
config/gmaps_api_key.yml -
M
public/images/add.png -
M
public/javascripts/application.js -
M
public/stylesheets/old_gbb.css -
M
spec/models/item_spec.rb -
M
spec/views/pictures/index.html.erb_spec.rb