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

app/models/person.rb

@@ -34,6 +34,7 @@ class Person
      /^(https?):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*(\.[a-z]{2,5})?(:[0-9]{1,5})?(\/.*)?$/ix
 
   def self.search(query)
+    return Person.all if query.to_s.empty?
     qTokens = query.to_s.strip.split(" ")
     fullQueryText = Regexp.escape( query.to_s.strip )
     p = []

pkg/ubuntu/README.md

@@ -6,7 +6,7 @@ work as a first step towards packaging, but should be usable as is.
 ### Synopsis
 
 Bootstrap the distribution from git:
-    sudo apt-get install git
+    sudo apt-get install git-core
     git clone git://github.com/diaspora/diaspora.git
     cd diaspora/pkg/ubuntu
 
@@ -27,9 +27,6 @@ Initiate and start the server;
     ./script/server
 
 ### Upgrading
-Once diaspora ins installed ,makedist.sh et. al. are available in
-/usr/share/diaspora/master/pkg/ubuntu, so there's no need to checkout
-the stuff using git in this case.
 
 The normal procedure to update is to just
     $ sudo su - diaspora

pkg/ubuntu/diaspora-install-deps

@@ -13,8 +13,9 @@ grep -v '^#' /etc/apt/sources.list | grep -q universe || {
 }
 
 sudo apt-get update
-sudo apt-get install -qy build-essential libxslt1-dev libxml2 ruby-full mongodb \
-     rake python-software-properties git imagemagick libmagick9-dev
+sudo apt-get install -qy --ignore-missing build-essential libxslt1-dev \
+     libxml2 ruby-full mongodb rake python-software-properties git-core \
+     imagemagick libmagick9-dev
 sudo add-apt-repository ppa:maco.m/ruby
 sudo apt-get update
 sudo apt-get install -qy rubygems

public/stylesheets/application.css

@@ -196,7 +196,7 @@ li.message {
         font-weight: bold; }
     li.message .content div.info {
       color: #444444;
-      font-size: 14px; }
+      font-size: 13px; }
       li.message .content div.info a {
         color: #cccccc; }
       li.message .content div.info .time {

public/stylesheets/sass/application.sass

@@ -267,7 +267,7 @@ li.message
 
     div.info
       :color #444
-      :font-size 14px
+      :font-size 13px
       a
         :color #ccc
       .time