Changeset [7be4239032bf014d0f76941b92ed9f514b3d1809] by Kalin Harvey
Revision 7be4239032bf014d0f76941b92ed9f514b3d1809,
committed by Kalin Harvey
· February 19th, 2010 @ 01:39 PM
Merge branch 'master' of git://github.com/graemeworthy/greenbuildingbrain
- 'master' of git://github.com/graemeworthy/greenbuildingbrain: green guide takes welcome message added in alex's changes feature > featured slideshow on frontpage small change to about page text models and controllers for Tours fixed all outdated specs all new datatypes their specs pass static controller tests were attempting to activate 'sponsors controller' featured image, and a lot of commented out stuff for widgets changes to thumbnail layout on homepage layout changes to edit button layout changes to edit button and edit notification
Conflicts:
app/views/dashboard/index.html.erb
http://github.com/greenbuilding/greenbuildingbrain/commit/7be423903...
38 changed files
-
A
app/controllers/tours_controller.rb -
A
app/helpers/tours_helper.rb -
A
app/models/tour.rb -
A
app/views/items/show.widget.erb.orig -
A
db/migrate/20100218200858_create_tours.rb -
A
public/images/arrowtabs.png -
A
spec/controllers/tours_controller_spec.rb -
A
spec/factories/factories.rb -
A
spec/fixtures/tours.yml -
A
spec/helpers/tours_helper_spec.rb -
A
spec/models/tour_spec.rb -
R
db/schema.rb -
M
app/controllers/dashboard_controller.rb -
M
app/models/certification.rb -
M
app/models/item.rb -
M
app/models/project_team_member.rb -
M
app/models/stat.rb -
M
app/views/audiofiles/listen.xml.erb -
M
app/views/dashboard/index.html.erb -
M
app/views/items/index.html.erb -
M
app/views/items/show.html.erb -
M
app/views/layouts/_header.html.erb -
M
app/views/layouts/application.html.erb -
M
app/views/static/about.html.erb -
M
config/routes.rb -
M
db/migrate/20100131225405_add_featured_image.rb -
M
public/stylesheets/gg.css -
M
public/stylesheets/ie7-ag.css -
M
spec/controllers/items_controller_spec.rb -
M
spec/controllers/static_controller_spec.rb -
M
spec/factories/users.rb -
M
spec/models/company_spec.rb -
M
spec/models/infrastructure_spec.rb -
M
spec/models/item_spec.rb -
M
spec/models/neighbourhood_spec.rb -
M
spec/models/open_space_spec.rb -
M
spec/models/program_spec.rb -
M
spec/models/project_team_member_spec.rb