From 34c0c3c89f3aeda6c142f34f63262cdb11edfabc Mon Sep 17 00:00:00 2001
From: Otacon <orfeo18@gmail.com>
Date: Sat, 18 Sep 2010 18:30:00 +0800
Subject: [PATCH 01/13] Added italian translation (it)

---
 config/locales/devise.it.yml | 41 ++++++++++++++++++++++++++++++++++++
 config/locales/it.yml        | 10 +++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 config/locales/devise.it.yml
 create mode 100644 config/locales/it.yml

diff --git a/config/locales/devise.it.yml b/config/locales/devise.it.yml
new file mode 100644
index 000000000..08b255546
--- /dev/null
+++ b/config/locales/devise.it.yml
@@ -0,0 +1,41 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+it:
+  errors:
+    messages:
+      not_found: "non trovato"
+      already_confirmed: "è già stato confermato"
+      not_locked: "non era bloccato"
+
+  devise:
+    failure:
+      unauthenticated: 'Devi effettuare l'accesso o registrarci prima di continuare.'
+      unconfirmed: 'Devi confermare il tuo account prima di continuare.'
+      locked: 'Il tuo account è bloccato.'
+      invalid: 'Email o password errati.'
+      invalid_token: 'Token di autenticazione errato.'
+      timeout: 'La tua sessione è scaduta, effettua di nuovo l'accesso per continuare.'
+      inactive: 'Il tuo account non è ancora stato attivato.'
+    sessions:
+      signed_in: 'Accesso effettuato con successo.'
+      signed_out: 'Disconnessione effettuata con successo.'
+    passwords:
+      send_instructions: 'Tra pochi minuti riceverai una email con le istruzioni su come cambiare la tua password.'
+      updated: 'La tua password è stata modificata. Hai appena effettuato l'accesso.'
+    confirmations:
+      send_instructions: 'Tra pochi minuti riceverai una email per confermare il tuo account.'
+      confirmed: 'Il tuo account è stato confermato con successo. Hai appena effettuato l'accesso.'
+    registrations:
+      signed_up: 'Ti sei iscritto. Se il servizio è disponibile, riceverai una conferma via email.'
+      updated: 'Hai aggiornato il tuo account.'
+      destroyed: 'Ciao!Il tuo account è stato rimosso. Speriamo che tu torni a trovarci presto.'
+    unlocks:
+      send_instructions: 'Tra pochi minuti riceverai una mail con le istruzioni su come sbloccare il tuo account.'
+      unlocked: 'Il tuo account è stato sbloccato. Hai appena effettuato l'accesso.'
+    mailer:
+      confirmation_instructions: 'Istruzioni sulla conferma'
+      reset_password_instructions: 'Istruzioni su come cambiare la password'
+      unlock_instructions: 'Istruzione su come sbloccare l'accont'
diff --git a/config/locales/it.yml b/config/locales/it.yml
new file mode 100644
index 000000000..1da349bf9
--- /dev/null
+++ b/config/locales/it.yml
@@ -0,0 +1,10 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+# Sample localization file for Italian. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+it:
+  hello: "Ciao mondo!"

From f034b180c2247ded4171eb81896b4fa001b409ff Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Sat, 18 Sep 2010 15:36:42 -0700
Subject: [PATCH 02/13] quotation fix in italian locale

---
 config/locales/devise.it.yml | 42 ++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/config/locales/devise.it.yml b/config/locales/devise.it.yml
index 08b255546..75b90affc 100644
--- a/config/locales/devise.it.yml
+++ b/config/locales/devise.it.yml
@@ -12,30 +12,30 @@ it:
 
   devise:
     failure:
-      unauthenticated: 'Devi effettuare l'accesso o registrarci prima di continuare.'
-      unconfirmed: 'Devi confermare il tuo account prima di continuare.'
-      locked: 'Il tuo account è bloccato.'
-      invalid: 'Email o password errati.'
-      invalid_token: 'Token di autenticazione errato.'
-      timeout: 'La tua sessione è scaduta, effettua di nuovo l'accesso per continuare.'
-      inactive: 'Il tuo account non è ancora stato attivato.'
+      unauthenticated: "Devi effettuare l'accesso o registrarci prima di continuare."
+      unconfirmed: "Devi confermare il tuo account prima di continuare."
+      locked: "Il tuo account è bloccato."
+      invalid: "Email o password errati."
+      invalid_token: "Token di autenticazione errato."
+      timeout: "La tua sessione è scaduta, effettua di nuovo l'accesso per continuare."
+      inactive: "Il tuo account non è ancora stato attivato."
     sessions:
-      signed_in: 'Accesso effettuato con successo.'
-      signed_out: 'Disconnessione effettuata con successo.'
+      signed_in: "Accesso effettuato con successo."
+      signed_out: "Disconnessione effettuata con successo."
     passwords:
-      send_instructions: 'Tra pochi minuti riceverai una email con le istruzioni su come cambiare la tua password.'
-      updated: 'La tua password è stata modificata. Hai appena effettuato l'accesso.'
+      send_instructions: "Tra pochi minuti riceverai una email con le istruzioni su come cambiare la tua password."
+      updated: "La tua password è stata modificata. Hai appena effettuato l'accesso."
     confirmations:
-      send_instructions: 'Tra pochi minuti riceverai una email per confermare il tuo account.'
-      confirmed: 'Il tuo account è stato confermato con successo. Hai appena effettuato l'accesso.'
+      send_instructions: "Tra pochi minuti riceverai una email per confermare il tuo account."
+      confirmed: "Il tuo account è stato confermato con successo. Hai appena effettuato l'accesso."
     registrations:
-      signed_up: 'Ti sei iscritto. Se il servizio è disponibile, riceverai una conferma via email.'
-      updated: 'Hai aggiornato il tuo account.'
-      destroyed: 'Ciao!Il tuo account è stato rimosso. Speriamo che tu torni a trovarci presto.'
+      signed_up: "Ti sei iscritto. Se il servizio è disponibile, riceverai una conferma via email."
+      updated: "Hai aggiornato il tuo account."
+      destroyed: "Ciao!Il tuo account è stato rimosso. Speriamo che tu torni a trovarci presto."
     unlocks:
-      send_instructions: 'Tra pochi minuti riceverai una mail con le istruzioni su come sbloccare il tuo account.'
-      unlocked: 'Il tuo account è stato sbloccato. Hai appena effettuato l'accesso.'
+      send_instructions: "Tra pochi minuti riceverai una mail con le istruzioni su come sbloccare il tuo account."
+      unlocked: "Il tuo account è stato sbloccato. Hai appena effettuato l'accesso."
     mailer:
-      confirmation_instructions: 'Istruzioni sulla conferma'
-      reset_password_instructions: 'Istruzioni su come cambiare la password'
-      unlock_instructions: 'Istruzione su come sbloccare l'accont'
+      confirmation_instructions: "Istruzioni sulla conferma"
+      reset_password_instructions: "Istruzioni su come cambiare la password"
+      unlock_instructions: "Istruzione su come sbloccare l'account"

From 6cf5f6c8c7f1d46197e89f4dd79b3f51db9eed40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=99Jarkko?= <’jm60697@gmail.com’>
Date: Sat, 18 Sep 2010 19:37:09 +0800
Subject: [PATCH 03/13] Finnish locales

---
 config/locales/devise.fi.yml | 41 ++++++++++++++++++++++++++++++++++++
 config/locales/fi.yml        | 10 +++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 config/locales/devise.fi.yml
 create mode 100644 config/locales/fi.yml

diff --git a/config/locales/devise.fi.yml b/config/locales/devise.fi.yml
new file mode 100644
index 000000000..591341501
--- /dev/null
+++ b/config/locales/devise.fi.yml
@@ -0,0 +1,41 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+#   Translator: jarkko moilanen, jm60697@gmail.com  
+
+fi:
+  errors:
+    messages:
+      not_found: "ei löytynyt"
+      already_confirmed: "oli jo varmistettu"
+      not_locked: "ei ollut lukittu"
+
+  devise:
+    failure:
+      unauthenticated: 'Kirjaudu tai rekisteröidy ennen kuin voit jatkaa.'
+      unconfirmed: 'Sinun pitää vahvistaa käyttäjätilisi ennen kuin voit jatkaa'
+      locked: 'Käyttäjätilisi on lukittu.'
+      invalid: 'Väärä sähköpostiosoite tai salasana.'
+      invalid_token: 'Viallinen todennus.'
+      timeout: 'Istunto on vanhentunut, kirjaudu uudelleen.'
+      inactive: 'Käyttätiliäsi ei ole vielä vahvistettu.'
+    sessions:
+      signed_in: 'Sisäänkirjautuminen onnistui.'
+      signed_out: 'Uoskirjautuminen onnistui.'
+    passwords:
+      send_instructions: 'Saat hetken päästä sähköpostiisi ohjeet siitä miten asetat salasanasi uudelleen.
+      updated: 'Salasanasi on vaihdettu. Olet nyt kirjautunut sisään.'
+    confirmations:
+      send_instructions: 'Saat hetken päästä sähköpostiisi ohjeet siitä miten vahvistat käyttäjätilisi luonnin.'
+      confirmed: 'Käyttäjätilisi luonti on vahvistettu. Olet nyt kirjautunut sisään.'
+    registrations:
+      signed_up: 'Käyttäjätilin luominen onnistui. Mahdollinen vahvistuspyyntö on lähetetty sähköpostiisi.'
+      updated: 'Käyttäjätilisi on päivitetty.'
+      destroyed: 'Näkemiin! Käyttäjätilisi on poistettu. Toivottavasti näemme sinut pian uudelleen.'
+    unlocks:
+      send_instructions: 'Saat muutaman minuutin kuluttua sähköpostiisi ohjeet siitä miten avaat lukituksen.'
+      unlocked: 'Käyttäjätilisi lukitus on avattu. Olet nyt kirjautunut sisään.'
+    mailer:
+      confirmation_instructions: 'Ohjeet vahvistamiseen/todentamiseen'
+      reset_password_instructions: 'Ohjeet salananan uudelleenasettamiseksi'
+      unlock_instructions: 'Ohjeet lukituksen poistamiseksi'
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
new file mode 100644
index 000000000..5e1a6da32
--- /dev/null
+++ b/config/locales/fi.yml
@@ -0,0 +1,10 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+#   Translator jarkko moilanen, jm60697@gmail.com
+
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+fi:
+  hello: "Terve, maailma"

From ac09f48cf86cd2bb3ab07f1e4f24b56b3ce112d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danillo=20C=C3=A9sar?= <danillos@gmail.com>
Date: Sun, 19 Sep 2010 00:53:39 +0800
Subject: [PATCH 04/13] Added locales files for portuguese brazilian.

---
 config/locales/devise.pt-BR.yml | 41 +++++++++++++++++++++++++++++++++
 config/locales/pt-BR.yml        | 10 ++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 config/locales/devise.pt-BR.yml
 create mode 100644 config/locales/pt-BR.yml

diff --git a/config/locales/devise.pt-BR.yml b/config/locales/devise.pt-BR.yml
new file mode 100644
index 000000000..ba2b3b5de
--- /dev/null
+++ b/config/locales/devise.pt-BR.yml
@@ -0,0 +1,41 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+pt-BR:
+  errors:
+    messages:
+      not_found: "não encontrado"
+      already_confirmed: "já foi confirmado"
+      not_locked: "não foi bloqueado"
+
+  devise:
+    failure:
+      unauthenticated: 'Você precisa fazer login ou se cadastrar antes de continuar.'
+      unconfirmed: 'Você tem que confirmar a sua conta antes de continuar.'
+      locked: 'Sua conta está bloqueada.'
+      invalid: 'E-mail ou senha inválida.'
+      invalid_token: 'Token de autenticação inválida.'
+      timeout: 'Sua sessão expirou, por favor logue-se novamente para continuar.'
+      inactive: 'Sua conta ainda não foi ativada.'
+    sessions:
+      signed_in: 'Você entrou com sucesso.'
+      signed_out: 'Você saiu com sucesso.'
+    passwords:
+      send_instructions: 'Você receberá um email com instruções sobre como redefinir sua senha em alguns minutos.'
+      updated: 'Sua senha foi alterada com sucesso.'
+    confirmations:
+      send_instructions: 'Você receberá um email em alguns minutos com as instruções sobre como confirmar a sua conta.'
+      confirmed: 'Sua conta foi confirmada com sucesso. Você já pode continuar navegando.'
+    registrations:
+      signed_up: 'Você se inscreveu com êxito. Se habilitado, a confirmação foi enviada para seu e-mail.'
+      updated: 'Você atualizou a sua conta com sucesso.'
+      destroyed: 'Sua conta foi cancelada com sucesso. Esperamos vê-lo novamente em breve.'
+    unlocks:
+      send_instructions: 'Você receberá um email em alguns minutos com as instruções sobre como desbloquear a sua conta.'
+      unlocked: 'Sua conta foi desbloqueada com sucesso. Você já pode continuar navegando.'
+    mailer:
+      confirmation_instructions: 'Instruções para confirmarção'
+      reset_password_instructions: 'Instruções para redefinir a senha'
+      unlock_instructions: 'Instruções para o desbloqueio'
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
new file mode 100644
index 000000000..67c077090
--- /dev/null
+++ b/config/locales/pt-BR.yml
@@ -0,0 +1,10 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+# Sample localization file for Portuguese Brazilian. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+pt-BR:
+  hello: "Olá Mundo"

From 2efde8a841c65ae26559047525a31b8449221a3f Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Sat, 18 Sep 2010 15:50:35 -0700
Subject: [PATCH 05/13] added missing quote in finnish locale

---
 config/locales/devise.fi.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/devise.fi.yml b/config/locales/devise.fi.yml
index 591341501..4ee6761f8 100644
--- a/config/locales/devise.fi.yml
+++ b/config/locales/devise.fi.yml
@@ -23,7 +23,7 @@ fi:
       signed_in: 'Sisäänkirjautuminen onnistui.'
       signed_out: 'Uoskirjautuminen onnistui.'
     passwords:
-      send_instructions: 'Saat hetken päästä sähköpostiisi ohjeet siitä miten asetat salasanasi uudelleen.
+      send_instructions: 'Saat hetken päästä sähköpostiisi ohjeet siitä miten asetat salasanasi uudelleen.'
       updated: 'Salasanasi on vaihdettu. Olet nyt kirjautunut sisään.'
     confirmations:
       send_instructions: 'Saat hetken päästä sähköpostiisi ohjeet siitä miten vahvistat käyttäjätilisi luonnin.'

From e9a3f46fbda8fcb749535103a07da0c63ba46221 Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Sat, 18 Sep 2010 16:42:07 -0700
Subject: [PATCH 06/13] fixed query function to go through mongomapper instead
 of custom

---
 app/models/person.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/models/person.rb b/app/models/person.rb
index 1e2a7b18d..aac7b23ae 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -34,11 +34,8 @@ class Person
   validates_format_of :url, :with =>
      /^(https?):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*(\.[a-z]{2,5})?(:[0-9]{1,5})?(\/.*)?$/ix
 
-
   def self.search(query)
-    Person.all('$where' => "function() { return this.diaspora_handle.match(/^#{query}/i) ||
-               this.profile.first_name.match(/^#{query}/i) ||
-               this.profile.last_name.match(/^#{query}/i); }")
+    Person.all('profile.first_name' => /^#{query}/) | Person.all('profile.last_name' => /^#{query}/)
   end
 
   def real_name

From 08f833ba7a5c276668ac5f44ffe3db536bb3ce78 Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Sat, 18 Sep 2010 17:21:18 -0700
Subject: [PATCH 07/13] case insensitivity on search

---
 app/models/person.rb       | 2 +-
 spec/models/person_spec.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/person.rb b/app/models/person.rb
index aac7b23ae..b1e7e3745 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -35,7 +35,7 @@ class Person
      /^(https?):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*(\.[a-z]{2,5})?(:[0-9]{1,5})?(\/.*)?$/ix
 
   def self.search(query)
-    Person.all('profile.first_name' => /^#{query}/) | Person.all('profile.last_name' => /^#{query}/)
+    Person.all('profile.first_name' => /^#{query}/i) | Person.all('profile.last_name' => /^#{query}/i)
   end
 
   def real_name
diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb
index bffe37f85..4f236b733 100644
--- a/spec/models/person_spec.rb
+++ b/spec/models/person_spec.rb
@@ -134,13 +134,13 @@ describe Person do
       people.include?(@friend_three).should == false
       people.include?(@friend_four).should  == false
 
-      people = Person.search("Wei")
+      people = Person.search("wEi")
       people.include?(@friend_two).should   == true
       people.include?(@friend_one).should   == false
       people.include?(@friend_three).should == false
       people.include?(@friend_four).should  == false
 
-      people = Person.search("Gri")
+      people = Person.search("gri")
       people.include?(@friend_one).should   == true
       people.include?(@friend_four).should  == true
       people.include?(@friend_two).should   == false

From b5a29713027a1810234a0df4b1440baa618af64b Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Sat, 18 Sep 2010 17:49:52 -0700
Subject: [PATCH 08/13] search results for people now look like the stream

---
 app/views/people/_person.html.haml       | 26 +++++++++++++++
 app/views/people/index.html.haml         | 42 +++++-------------------
 public/stylesheets/application.css       |  2 ++
 public/stylesheets/sass/application.sass |  3 ++
 4 files changed, 39 insertions(+), 34 deletions(-)
 create mode 100644 app/views/people/_person.html.haml

diff --git a/app/views/people/_person.html.haml b/app/views/people/_person.html.haml
new file mode 100644
index 000000000..ef1c69d28
--- /dev/null
+++ b/app/views/people/_person.html.haml
@@ -0,0 +1,26 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3.  See
+-#   the COPYRIGHT file.
+
+
+%li.message{:id => person.id}
+
+  = person_image_link(person)
+
+  .content
+    %span.from
+      = link_to person.real_name, person
+
+    .info
+      = person.diaspora_handle
+
+    .right{ :style => "display:inline;top:0;" }
+      - if person.id == current_user.person.id
+        thats you!
+      - elsif current_user.pending_requests.find_by_person_id(person.id)
+        = link_to "pending request", aspects_manage_path
+      - else
+        = form_for Request.new do |f|
+          = f.select(:aspect_id, @aspects_dropdown_array)
+          = f.hidden_field :destination_url, :value => person.diaspora_handle
+          = f.submit "add friend"
diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml
index c18ec5d0a..f80a80f3e 100644
--- a/app/views/people/index.html.haml
+++ b/app/views/people/index.html.haml
@@ -14,38 +14,12 @@
 - content_for :left_pane do
   \.
 
-= (@people.count).to_s + search_or_index
-%table
-  %tr
-    %th real name
-    %th diaspora handle
-    %th url
-    - for person in @people
-      %tr
-        - if current_user.friends.include? person
-          %td= link_to person.real_name, person
-        - else
-          %td= person.real_name
+%h1
+  search results for
+  %u= params[:q]
 
-        %td= person.diaspora_handle
-        %td= person.url
-        
-        -if current_user.friends.include? person
-
-        - elsif person.id == current_user.person.id
-          %td
-          %td that's you!
-        -elsif current_user.pending_requests.find_by_person_id(person.id)
-          %td 
-          %td ^-you have a friend request from this person       
-        -elsif current_user.pending_requests.find_by_url(person.receive_url)
-          %td 
-          %td friend request pending
-        -else
-          %td
-          %td
-            = form_for Request.new do |f|
-              = f.select(:aspect_id, @aspects_dropdown_array)
-              = f.hidden_field :destination_url, :value => person.diaspora_handle
-              = f.submit "add friend"
-  = will_paginate @people
+%ul#stream
+  - for person in @people
+    = render 'people/person', :person => person
+    
+= will_paginate @people
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index c6282b1b8..3fb38e98c 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -145,6 +145,8 @@ ul#stream {
     border-bottom: 1px solid #eeeeee; }
   ul#stream > li:first-child {
     padding-top: 0; }
+  ul#stream .right {
+    top: 0; }
 
 li.message {
   position: relative;
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 206c122bd..9f9158741 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -186,6 +186,9 @@ ul#stream
     :padding
       :top 0
 
+  .right
+    :top 0
+
 li.message
   :position relative
   :line-height 140%

From cc4e9f8d3939ff427752074c481024c4cb4bd28c Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Sat, 18 Sep 2010 17:56:26 -0700
Subject: [PATCH 09/13] description text for all boxes in manage page.  search
 box text defaults to query on people#index.

---
 app/views/aspects/manage.html.haml | 14 +++++++++-----
 app/views/people/index.html.haml   |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/views/aspects/manage.html.haml b/app/views/aspects/manage.html.haml
index 667196b85..c579671e1 100644
--- a/app/views/aspects/manage.html.haml
+++ b/app/views/aspects/manage.html.haml
@@ -13,16 +13,20 @@
 
   .requests
     %ul.dropzone
-      - for request in @remote_requests
-        %li.requested_person{:id => request.person.id, :request_id => request.id}
-          = person_image_tag(request.person)
-          .name
-            = request.person.real_name
+      - if @remote_requests.size < 1
+        %li.grey No new requests
+      - else
+        - for request in @remote_requests
+          %li.requested_person{:id => request.person.id, :request_id => request.id}
+            = person_image_tag(request.person)
+            .name
+              = request.person.real_name
   %h1
     Ignore/Remove
 
   %li.remove
     %ul.dropzone
+      %li.grey Drag to ignore/remove
 
 - content_for :publish do
   = link_to("add a new aspect", "#add_aspect_pane", :id => "add_aspect_button", :class => "new_aspect button", :title => "Add a new aspect")
diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml
index f80a80f3e..2cd1dc4a7 100644
--- a/app/views/people/index.html.haml
+++ b/app/views/people/index.html.haml
@@ -8,7 +8,7 @@
     Search
 
   =form_tag '/people', :method => "get" do
-    = text_field_tag :q
+    = text_field_tag :q, params[:q]
     = submit_tag "search"
 
 - content_for :left_pane do

From 5740c72804cb57879436bdf5c2917a5df12f660a Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Sat, 18 Sep 2010 17:27:13 +0800
Subject: [PATCH 10/13] made websocket server host configurable

---
 config/app_config.yml      | 3 +++
 script/websocket_server.rb | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/config/app_config.yml b/config/app_config.yml
index a138424ee..354dc75b2 100644
--- a/config/app_config.yml
+++ b/config/app_config.yml
@@ -7,6 +7,7 @@
 development:
   debug: false
   socket_debug : false
+  socket_host: 0.0.0.0
   socket_port: 8080
   socket_collection_name: 'websocket'
   pubsub_server: 'https://pubsubhubbub.appspot.com/'
@@ -14,11 +15,13 @@ development:
 test:
   debug: false
   socket_debug : false
+  socket_host: 0.0.0.0
   socket_port: 8081
   pubsub_server: 'https://pubsubhubbub.appspot.com/'
 
 production:
   debug: false
   socket_debug : false
+  socket_host: 0.0.0.0
   socket_port: 8080
   pubsub_server: 'https://pubsubhubbub.appspot.com/'
diff --git a/script/websocket_server.rb b/script/websocket_server.rb
index 2fbc1370a..dae054f15 100644
--- a/script/websocket_server.rb
+++ b/script/websocket_server.rb
@@ -24,7 +24,7 @@ begin
     Diaspora::WebSocket.initialize_channels
 
     EventMachine::WebSocket.start(
-                  :host => "0.0.0.0",
+                  :host => APP_CONFIG[:socket_host],
                   :port => APP_CONFIG[:socket_port],
                   :debug =>APP_CONFIG[:socket_debug]) do |ws|
       ws.onopen {

From 7c62a5adf777361ddf4bfde47d5dfa5dad6de2f7 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Sun, 19 Sep 2010 00:29:56 +0800
Subject: [PATCH 11/13] fixed drag & drop on aspect manage page

---
 public/javascripts/aspect-edit.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/javascripts/aspect-edit.js b/public/javascripts/aspect-edit.js
index c7061797d..e07877cb7 100644
--- a/public/javascripts/aspect-edit.js
+++ b/public/javascripts/aspect-edit.js
@@ -42,14 +42,14 @@ $(function() {
 
   });
 
-  $("ul .person .requested_person").draggable({
+  // Multiple classes here won't work
+  $("ul .person").draggable({
     revert: true
   });
   
-  //  Moved class to logic above - unnec duplicate logic
-  //$("ul .requested_person").draggable({
-  //  revert: true
-  //});
+  $("ul .requested_person").draggable({
+    revert: true
+  });
   
   $(".aspect ul").droppable({
     hoverClass: 'active',

From c34e4caafa27ffc724499363bc17ca31ab551cee Mon Sep 17 00:00:00 2001
From: kook <kook@crunchbang.(none)>
Date: Sat, 18 Sep 2010 23:52:49 +0800
Subject: [PATCH 12/13] czech translation

---
 config/locales/cs.yml        | 10 +++++++++
 config/locales/devise.cs.yml | 41 ++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 config/locales/cs.yml
 create mode 100644 config/locales/devise.cs.yml

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
new file mode 100644
index 000000000..91c904dc1
--- /dev/null
+++ b/config/locales/cs.yml
@@ -0,0 +1,10 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+# Sample localization file for Lithuanian. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+cs:
+  hello: "Dobrý Den"
diff --git a/config/locales/devise.cs.yml b/config/locales/devise.cs.yml
new file mode 100644
index 000000000..a8ca9ae84
--- /dev/null
+++ b/config/locales/devise.cs.yml
@@ -0,0 +1,41 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+en:
+  errors:
+    messages:
+      not_found: "nenalezeno"
+      already_confirmed: "již bylo potvrzeno"
+      not_locked: "nebylo zamčeno"
+
+  devise:
+    failure:
+      unauthenticated: 'Pro pokračování se musíte přihlásit nebo si vytvořit účet.'
+      unconfirmed: 'Před pokračováním musíte potvrdit svůj účet.'
+      locked: 'Váš účet je uzamčen.'
+      invalid: 'Neplatný email nebo heslo.'
+      invalid_token: 'Neplatný autentizační token.'
+      timeout: 'Vaše sezení vypršelo, pro pokračování se prosím přihlašte znovu.'
+      inactive: 'Váš účet ještě nebyl aktivován.'
+    sessions:
+      signed_in: 'Přihlášení proběhlo úspěšně.'
+      signed_out: 'Odhlášení proběhlo úspěšně.'
+    passwords:
+      send_instructions: 'Běhěm několika minut obdržíte email s instrukcemi k resetnutí hesla.'
+      updated: 'Vaše heslo bylo úspěšně změněno. Nyní jste přihlášeni'
+    confirmations:
+      send_instructions: 'Během několika minut obdržíte email s instrukcemi k potvrzení vašeho účtu.'
+      confirmed: 'Váš účet byl uspěšně potvrzen. Nyní jste přihlášeni.'
+    registrations:
+      signed_up: 'Úspěšně jste vytvořili účet. Pokud je tak server nastaven, byl vám zaslán potvrzovací email.'
+      updated: 'Úspěšně jste upravili svůj účet.'
+      destroyed: 'Sbohem! Váš účet byl úspěšně zrušen. Brzy naviděnou.'
+    unlocks:
+      send_instructions: 'Během několika minut obdržíte email s instrukcemi k odemknutí vašeho účtu.'
+      unlocked: 'Váš účet byl úspěšně odemknut. Nyní jste přihlášeni.'
+    mailer:
+      confirmation_instructions: 'Instrukce k potvrzení'
+      reset_password_instructions: 'Instrukce k resetnutí hesla'
+      unlock_instructions: 'Instrukce k odemčení'

From 6c6c7be1e50aedf3aa1e2a24082d994bf9e61566 Mon Sep 17 00:00:00 2001
From: kook <kook@crunchbang.(none)>
Date: Sat, 18 Sep 2010 23:54:25 +0800
Subject: [PATCH 13/13] oopsie

---
 config/locales/devise.cs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/devise.cs.yml b/config/locales/devise.cs.yml
index a8ca9ae84..34d9eb7c1 100644
--- a/config/locales/devise.cs.yml
+++ b/config/locales/devise.cs.yml
@@ -3,7 +3,7 @@
 #   the COPYRIGHT file.
 
 
-en:
+cs:
   errors:
     messages:
       not_found: "nenalezeno"