nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
zhitomirskiyi 2010-10-26 14:49:52 -07:00
commit b36ce1ac80
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/aspects_controller.rb
View file

@ -48,7 +48,7 @@ class AspectsController < ApplicationController
render :file => "#{Rails.root}/public/404.html", :layout => false, :status => 404
else
@friends = @aspect.people
@posts = current_user.visible_posts( :by_members_of => @aspect ).paginate :per_page => 15, :order => 'created_at DESC'
@posts = current_user.visible_posts( :by_members_of => @aspect ).paginate :page => params[:page], :per_page => 15, :order => 'created_at DESC'
respond_with @aspect
end
end

2
public/javascripts/aspect-edit.js
View file

@ -92,7 +92,7 @@ $(function() {
'aspect_id' : person.attr('data-aspect_id') }
});
}
person.fadeOut('slow', $(this).remove());
person.fadeOut(400, function(){person.remove();});
}
}
});