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

app/controllers/aspects_controller.rb

@@ -49,8 +49,8 @@ class AspectsController < ApplicationController
   end
 
   def public
-    @fb_access_url = MiniFB.oauth_url(FB_APP_ID, APP_CONFIG[:pod_url] + "services/create",
-                                      :scope=>MiniFB.scopes.join(","))
+   # @fb_access_url = MiniFB.oauth_url(FB_APP_ID, APP_CONFIG[:pod_url] + "services/create",
+    #                                  :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'
 

app/views/users/_profile.haml

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

lib/hcard.rb

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