Changeset [3f3a24da30d8e7b779fc08809d24373a332a2ce1] by Kalin Harvey
Revision 3f3a24da30d8e7b779fc08809d24373a332a2ce1,
committed by Kalin Harvey
· May 27th, 2009 @ 01:21 PM
Merge branch 'master' of git@github.com:greenbuilding/greenbuildingbrain
- 'master' of git@github.com:greenbuilding/greenbuildingbrain: edit tags ==> + add tags edit mode great tag view! looks like i've got the whole thing using munged titles for url generation dashboard shows totals added more descritive words to ratings pretty pretty dashboard users can now log in with their email addressses, let users see the raw gallery, added backink from comment to item/thing commented_on dashboard fixed added new ie.css
Conflicts:
app/views/items/index.html.erb
35 changed files
-
M
app/controllers/comments_controller.rb -
M
app/controllers/homepage_controller.rb -
M
app/controllers/items_controller.rb -
M
app/controllers/pictures_controller.rb -
M
app/controllers/sessions_controller.rb -
M
app/controllers/stats_controller.rb -
M
app/controllers/tags_controller.rb -
M
app/controllers/versions_controller.rb -
M
app/models/building.rb -
M
app/models/comment.rb -
M
app/models/company.rb -
M
app/models/item.rb -
M
app/models/page.rb -
M
app/models/product.rb -
M
app/models/tags.rb -
M
app/models/user.rb -
M
app/views/homepage/dashboard.html.erb -
M
app/views/items/_edit_gallery.html.erb -
M
app/views/items/_ratings.html.erb -
M
app/views/items/_tags.html.erb -
M
app/views/items/_version_info.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/tags/_tag.html.erb -
M
app/views/tags/index.html.erb -
M
app/views/tags/show.html.erb -
M
config/routes.rb -
M
db/migrate/20090522193401_create_project_teams.rb -
M
public/stylesheets/GBBstyles.css -
M
public/stylesheets/old_gbb.css -
M
spec/controllers/dashboard_controller_spec.rb -
M
spec/controllers/homepage_controller_spec.rb -
M
spec/controllers/items_controller_spec.rb -
M
spec/controllers/versions_controller_spec.rb