Changeset [fd257af92a6efcb3a544ab963a52c3bb0029747d] by Kalin Harvey

Revision fd257af92a6efcb3a544ab963a52c3bb0029747d, committed by Kalin Harvey · April 9th, 2009 @ 01:12 PM

Merge branch 'master' of git://github.com/graemeworthy/greenbuildingbrain into newgraeme

Conflicts:

db/migrate/20090302066666_rename_building_tags.rb
db/schema.rb

http://github.com/graemeworthy/g...

85 changed files

M app/controllers/homepage_controller.rb
M app/controllers/sessions_controller.rb
M app/controllers/users_controller.rb
M app/helpers/homepage_helper.rb
M app/helpers/sessions_helper.rb
M app/helpers/users_helper.rb
M app/models/user.rb
M app/models/user_mailer.rb
M app/models/user_observer.rb
M app/views/homepage/index.html.erb
M app/views/layouts/_footer.html.erb
M app/views/layouts/_header.html.erb
M app/views/layouts/application.html.erb
M app/views/sessions/new.html.erb
M app/views/user_mailer/activation.erb
M app/views/user_mailer/signup_notification.erb
M app/views/users/_user_bar.html.erb
M app/views/users/new.html.erb
M config/environment.rb
M config/initializers/site_keys.rb
M config/routes.rb
M db/migrate/20090408041031_use_restful_authentication_user_model.rb
M db/migrate/20090408042410_add_activation.rb
M db/migrate/20090408044949_drop_users.rb
M db/migrate/20090408045326_re_create_users.rb
M db/schema.rb
M features/accounts.feature
M features/sessions.feature
M features/step_definitions/ra_env.rb
M features/step_definitions/ra_navigation_steps.rb
M features/step_definitions/ra_resource_steps.rb
M features/step_definitions/ra_response_steps.rb
M features/step_definitions/rest_auth_features_helper.rb
M features/step_definitions/user_steps.rb
M http_auth.rb
M lib/authenticated_system.rb
M lib/authenticated_test_helper.rb
M public/images/logo.png
M public/images/rails.png
M public/stylesheets/all.css
M public/stylesheets/greenbuildingmap.css
M public/stylesheets/ie.css
M public/stylesheets/print.css
M public/stylesheets/readme.txt
M public/stylesheets/screen.css
M public/stylesheets/src/grid.png
M spec/controllers/access_control_spec.rb
M spec/controllers/authenticated_system_spec.rb
M spec/controllers/buildings_routing_spec.rb
M spec/controllers/homepage_controller_spec.rb
M spec/controllers/sessions_controller_spec.rb
M spec/controllers/users_controller_spec.rb
M spec/fixtures/users.yml
M spec/helpers/homepage_helper_spec.rb
M spec/helpers/users_helper_spec.rb
M spec/models/building_spec.rb
M spec/models/user_spec.rb
M vendor/gems/rubyist-aasm-2.0.5/.specification
M vendor/gems/rubyist-aasm-2.0.5/CHANGELOG
M vendor/gems/rubyist-aasm-2.0.5/MIT-LICENSE
M vendor/gems/rubyist-aasm-2.0.5/README.rdoc
M vendor/gems/rubyist-aasm-2.0.5/Rakefile
M vendor/gems/rubyist-aasm-2.0.5/TODO
M vendor/gems/rubyist-aasm-2.0.5/doc/jamis.rb
M vendor/gems/rubyist-aasm-2.0.5/lib/aasm.rb
M vendor/gems/rubyist-aasm-2.0.5/lib/event.rb
M vendor/gems/rubyist-aasm-2.0.5/lib/persistence.rb
M vendor/gems/rubyist-aasm-2.0.5/lib/persistence/active_record_persistence.rb
M vendor/gems/rubyist-aasm-2.0.5/lib/state.rb
M vendor/gems/rubyist-aasm-2.0.5/lib/state_machine.rb
M vendor/gems/rubyist-aasm-2.0.5/lib/state_transition.rb
M vendor/plugins/acts_as_state_machine/CHANGELOG
M vendor/plugins/acts_as_state_machine/MIT-LICENSE
M vendor/plugins/acts_as_state_machine/README
M vendor/plugins/acts_as_state_machine/Rakefile
M vendor/plugins/acts_as_state_machine/TODO
M vendor/plugins/acts_as_state_machine/init.rb
M vendor/plugins/acts_as_state_machine/lib/acts_as_state_machine.rb
M vendor/plugins/acts_as_state_machine/test/acts_as_state_machine_test.rb
M vendor/plugins/acts_as_state_machine/test/database.yml
M vendor/plugins/acts_as_state_machine/test/fixtures/conversation.rb
M vendor/plugins/acts_as_state_machine/test/fixtures/conversations.yml
M vendor/plugins/acts_as_state_machine/test/fixtures/person.rb
M vendor/plugins/acts_as_state_machine/test/schema.rb
M vendor/plugins/acts_as_state_machine/test/test_helper.rb