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:
Raphael 2010-10-06 18:39:12 -07:00
commit c74f210464
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/aspects_controller.rb
View file

@ -49,8 +49,8 @@ class AspectsController < ApplicationController
end end
def public def public
@fb_access_url = MiniFB.oauth_url(FB_APP_ID, APP_CONFIG[:pod_url] + "services/create", # @fb_access_url = MiniFB.oauth_url(FB_APP_ID, APP_CONFIG[:pod_url] + "services/create",
:scope=>MiniFB.scopes.join(",")) # :scope=>MiniFB.scopes.join(","))
@posts = current_user.visible_posts(:person_id => current_user.person.id, :public => true).paginate :page => params[:page], :per_page => 15, :order => 'created_at DESC' @posts = current_user.visible_posts(:person_id => current_user.person.id, :public => true).paginate :page => params[:page], :per_page => 15, :order => 'created_at DESC'

4
app/views/users/_profile.haml
View file

@ -49,10 +49,10 @@
= p.text_field :last_name, :value => @profile.last_name = p.text_field :last_name, :value => @profile.last_name
%p %p
= f.label :password = f.label :password
= f.text_field :password = f.password_field :password
%p %p
= f.label :password_confirmation = f.label :password_confirmation
= f.text_field :password_confirmation = f.password_field :password_confirmation
#submit_block #submit_block

2
lib/hcard.rb
View file

@ -8,6 +8,6 @@ module HCard
{:given_name => doc.css(".given_name").text, {:given_name => doc.css(".given_name").text,
:family_name => doc.css(".family_name").text, :family_name => doc.css(".family_name").text,
:url => doc.css("#pod_location").text, :url => doc.css("#pod_location").text,
:photo => doc.css(".photo").src} :photo => doc.css(".photo[src]").text}
end end
end end