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

README.md

@@ -12,6 +12,13 @@ GEMS:  We would like to keep external dependencies unduplicated.  We're using No
 The privacy aware, personally controlled, do-it-all, open source social network.
 
 **DISCLAIMER: THIS IS PRE-ALPHA SOFTWARE AND SHOULD BE TREATED ACCORDINGLY.**
+**PLEASE, DO NOT RUN IN PRODUCTION.  IT IS FUN TO GET RUNNING, BUT EXPECT THINGS TO BE BROKEN**
+
+Also, we really want to continue to focus on features and improving the code base. When we think it is 
+ready for general use, we will post more detailed instructions.
+
+
+
 These instructions are for machines running [Ubuntu](http://www.ubuntu.com/), [Fedora](http://www.fedoraproject.org) or Mac OS X.  We are developing Diaspora for the latest and greatest browsers, so please update your Firefox, Chrome or Safari to the latest and greatest.
 
 ## Preparing your system

app/controllers/aspects_controller.rb

@@ -47,7 +47,7 @@ class AspectsController < ApplicationController
 
   def manage
     @aspect = :manage
-    @remote_requests = Request.for_user current_user
+    @remote_requests = Request.for_user(current_user).all
   end
 
   def update

app/models/person.rb

@@ -85,6 +85,7 @@ class Person
        local_person
      elsif  !identifier.include?("localhost") && !opts[:local]
        begin
+         puts "begin finger"
         f = Redfinger.finger(identifier)
        rescue SocketError => e
          raise "Diaspora server for #{identifier} not found" if e.message =~ /Name or service not known/

app/models/request.rb

@@ -26,8 +26,8 @@ class Request
   validates_presence_of :destination_url, :callback_url
   before_validation :clean_link
 
-  scope :for_user,  lambda{ |user| where(:destination_url    => user.person.receive_url) }
+  scope :for_user,  lambda{ |user| where(:destination_url    => user.receive_url) }
-  scope :from_user, lambda{ |user| where(:destination_url.ne => user.person.receive_url) }
+  scope :from_user, lambda{ |user| where(:destination_url.ne => user.receive_url) }
 
   def self.instantiate(options = {})
     person = options[:from]

public/javascripts/fancybox/jquery.fancybox-1.3.1.js

@@ -262,6 +262,11 @@
 				close.show();
 			}
 
+      $("#fancybox-inner input[type='text'], #fancybox-inner textarea").focus(function() {
+          $(document).unbind('keydown.fb');
+      });
+      
+
 			fancybox_set_navigation();
 
 			$(window).bind("resize.fb", $.fancybox.center);

public/stylesheets/application.css

@@ -601,3 +601,6 @@ h1.big_text {
     border: 1px solid #cccccc;
       border-bottom: none;
     padding: 3px 10px; }
+
+#fancybox-close:hover {
+  background-color: transparent; }

public/stylesheets/sass/application.sass

@@ -756,3 +756,7 @@ h1.big_text
       :bottom none
 
     :padding 3px 10px
+
+#fancybox-close:hover
+  :background
+    :color transparent