README.md
This commit is contained in:
parent
755e2a744c
commit
e668071ea5
4 changed files with 11 additions and 3 deletions
|
|
@ -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.
|
The privacy aware, personally controlled, do-it-all, open source social network.
|
||||||
|
|
||||||
**DISCLAIMER: THIS IS PRE-ALPHA SOFTWARE AND SHOULD BE TREATED ACCORDINGLY.**
|
**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.
|
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
|
## Preparing your system
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ class AspectsController < ApplicationController
|
||||||
|
|
||||||
def manage
|
def manage
|
||||||
@aspect = :manage
|
@aspect = :manage
|
||||||
@remote_requests = Request.for_user current_user
|
@remote_requests = Request.for_user(current_user).all
|
||||||
end
|
end
|
||||||
|
|
||||||
def update
|
def update
|
||||||
|
|
|
||||||
|
|
@ -85,6 +85,7 @@ class Person
|
||||||
local_person
|
local_person
|
||||||
elsif !identifier.include?("localhost") && !opts[:local]
|
elsif !identifier.include?("localhost") && !opts[:local]
|
||||||
begin
|
begin
|
||||||
|
puts "begin finger"
|
||||||
f = Redfinger.finger(identifier)
|
f = Redfinger.finger(identifier)
|
||||||
rescue SocketError => e
|
rescue SocketError => e
|
||||||
raise "Diaspora server for #{identifier} not found" if e.message =~ /Name or service not known/
|
raise "Diaspora server for #{identifier} not found" if e.message =~ /Name or service not known/
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,8 @@ class Request
|
||||||
validates_presence_of :destination_url, :callback_url
|
validates_presence_of :destination_url, :callback_url
|
||||||
before_validation :clean_link
|
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 = {})
|
def self.instantiate(options = {})
|
||||||
person = options[:from]
|
person = options[:from]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue