Changeset [3f107143b85e2ac382acefdafe709a43f0c680c3] by Graeme Worthy

Revision 3f107143b85e2ac382acefdafe709a43f0c680c3, committed by Graeme Worthy · April 16th, 2009 @ 04:46 PM

Merge git://github.com/krrh/greenbuildingbrain into kalin-merge

Conflicts:

app/models/user_mailer.rb
public/images/logo.png

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

48 changed files

M app/controllers/application_controller.rb
M app/controllers/homepage_controller.rb
M app/controllers/library_controller.rb
M app/controllers/map_controller.rb
M app/controllers/sessions_controller.rb
M app/controllers/users_controller.rb
M app/helpers/library_helper.rb
M app/models/user_mailer.rb
M app/views/buildings/_building.html.erb
M app/views/buildings/_recent.html.erb
M app/views/buildings/index.html.erb
M app/views/buildings/show.html.erb
M app/views/homepage/index.html.erb
M app/views/layouts/_header.html.erb
M app/views/layouts/application.html.erb
M app/views/layouts/map.html.erb
M app/views/library/index.html.erb
M app/views/map/index.html.erb
M app/views/users/new.html.erb
M config/environment.rb
M config/routes.rb
M lib/empty.atom
M lib/rss_parser.rb
M lib/tasks/heckle.rake
M public/stylesheets/greenbuildingmap.css
M spec/controllers/library_controller_spec.rb
M spec/controllers/sessions_controller_spec.rb
M spec/controllers/users_controller_spec.rb
M spec/helpers/library_helper_spec.rb
M spec/views/library/index.html.erb_spec.rb
M vendor/gems/simple-rss-1.2/.specification
M vendor/gems/simple-rss-1.2/LICENSE
M vendor/gems/simple-rss-1.2/README
M vendor/gems/simple-rss-1.2/Rakefile
M vendor/gems/simple-rss-1.2/lib/simple-rss.rb
M vendor/gems/simple-rss-1.2/test/base/base_test.rb
M vendor/gems/simple-rss-1.2/test/data/atom.xml
M vendor/gems/simple-rss-1.2/test/data/not-rss.xml
M vendor/gems/simple-rss-1.2/test/data/rss09.rdf
M vendor/gems/simple-rss-1.2/test/data/rss20.xml
M vendor/gems/simple-rss-1.2/test/test_helper.rb
M vendor/plugins/gravatar-plugin/MIT-LICENSE
M vendor/plugins/gravatar-plugin/README.rdoc
M vendor/plugins/gravatar-plugin/Rakefile
M vendor/plugins/gravatar-plugin/about.yml
M vendor/plugins/gravatar-plugin/init.rb
M vendor/plugins/gravatar-plugin/lib/gravatar.rb
M vendor/plugins/gravatar-plugin/spec/gravatar_spec.rb