Changeset [fa8ea5489af5a51f90e3329ac51c9ff884fc1257] by Kalin Harvey
Revision fa8ea5489af5a51f90e3329ac51c9ff884fc1257,
committed by Kalin Harvey
· May 22nd, 2009 @ 02:43 AM
Merge branch 'master' of git@github.com:greenbuilding/greenbuildingbrain
- 'master' of git@github.com:greenbuilding/greenbuildingbrain: added an introduction page and a way for users to resend their activation codes [x] related links categorized (this is mostly a ruby thing)
Conflicts:
app/views/layouts/application.html.erb
16 changed files
-
M
app/controllers/items_controller.rb -
M
app/controllers/users_controller.rb -
M
app/helpers/items_helper.rb -
M
app/views/items/_description.html.erb -
M
app/views/items/_related_links.html.erb -
M
app/views/items/_stats.html.erb -
M
app/views/items/_toc.html.erb -
M
app/views/items/show.html.erb -
M
app/views/layouts/application.html.erb -
M
app/views/users/introduction.html.erb -
M
app/views/users/new.html.erb -
M
config/routes.rb -
M
public/images/icons/16-heart-gold-s.png -
M
public/images/icons/16-heart-gold-xxs.png -
M
public/images/icons/gray-heart.png -
M
public/images/icons/red-heart.png