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:
ilya 2010-10-12 18:24:20 -07:00
commit db1a01d51b
5 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/person.rb
View file

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

5
pkg/ubuntu/README.md
View file

@ -6,7 +6,7 @@ work as a first step towards packaging, but should be usable as is.
### Synopsis ### Synopsis
Bootstrap the distribution from git: Bootstrap the distribution from git:
sudo apt-get install git sudo apt-get install git-core
git clone git://github.com/diaspora/diaspora.git git clone git://github.com/diaspora/diaspora.git
cd diaspora/pkg/ubuntu cd diaspora/pkg/ubuntu
@ -27,9 +27,6 @@ Initiate and start the server;
./script/server ./script/server
### Upgrading ### 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 The normal procedure to update is to just
$ sudo su - diaspora $ sudo su - diaspora

5
pkg/ubuntu/diaspora-install-deps
View file

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

2
public/stylesheets/application.css
View file

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

2
public/stylesheets/sass/application.sass
View file

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