Changeset [2cc99fd4183a83a1e98631a253c3b735222739ee] by Kalin Harvey
Revision 2cc99fd4183a83a1e98631a253c3b735222739ee,
committed by Kalin Harvey
· May 21st, 2009 @ 06:23 PM
Merge branch 'master' of git@github.com:greenbuilding/greenbuildingbrain
- 'master' of git@github.com:greenbuilding/greenbuildingbrain: related links are now categorised it seemed to want this css file notices were broken, fixed, better look on stats, stats have a notice form , fixed the intermittend current user error on things invisble edit button on stats invisble edit button on stats commented out the geocode ip stuff
Conflicts:
app/controllers/dashboard_controller.rb
app/views/items/show.html.erb
app/views/layouts/_header.html.erb
9 changed files
-
M
app/models/building.rb -
M
app/views/items/_edit_stats.html.erb -
M
app/views/items/_reason.html.erb -
M
app/views/items/_related_links.html.erb -
M
app/views/items/_stats.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
public/stylesheets/greenbuildingmap.css