Merge branch 'master' of github.com:diaspora/diaspora

app/views/groups/index.html.haml

@@ -6,7 +6,7 @@
 
 %ul#stream
   - for post in @posts
-    = render type_partial(post), :post => post
+    = render type_partial(post), :post => post unless post.class == Album
 #pagination
   = will_paginate @posts
 

app/views/photos/_photo.haml

@@ -8,7 +8,10 @@
       = link_to post.album.name, object_path(post.album)
 
     %br
-  = link_to (image_tag post.url(:thumb_large)), object_path(post)
+    
+  = render "albums/album", :post => post.album
+   
+  = link_to (image_tag post.url(:thumb_medium)), object_path(post)
     
   %div.time
     = link_to(how_long_ago(post), photo_path(post))