Changeset [288da191373eceec5607d868e396e09d3033709b] by Graeme Worthy
Revision 288da191373eceec5607d868e396e09d3033709b,
committed by Graeme Worthy
· May 18th, 2009 @ 03:14 AM
Merge branch 'favourites'
- favourites: a favourites system
Conflicts:
spec/controllers/homepage_controller_spec.rb
25 changed files
-
M
app/controllers/favourites_controller.rb -
M
app/controllers/items_controller.rb -
M
app/controllers/pictures_controller.rb -
M
app/helpers/favourites_helper.rb -
M
app/helpers/items_helper.rb -
M
app/models/favourite.rb -
M
app/models/item.rb -
M
app/models/picture.rb -
M
app/models/user.rb -
M
app/views/favourites/index.html.erb -
M
app/views/favourites/new.erb.html -
M
app/views/items/show.html.erb -
M
config/routes.rb -
M
db/migrate/20090517041301_createfavourites.rb -
M
db/schema.rb -
M
spec/controllers/favourites_controller_spec.rb -
M
spec/controllers/homepage_controller_spec.rb -
M
spec/models/favourite_spec.rb -
M
temp/favs.rb -
M
temp/revisions.rb -
M
temp/revisionsauthor.rb -
M
temp/revisionsedits.rb -
M
temp/spec/revisions_spec.rb -
M
temp/spec/revisionsauthor_spec.rb -
M
temp/spec/revisionsedits_spec.rb