diff --git a/README.md b/README.md
index 066e4171c635857870401010fce94abfa1078760..0bc06f27f643e31adbbe4fcb7b1efbc7db1b16f9 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ We need you to fill out a [contributor agreement form](https://spreadsheets.goog
All commits must be tested, and after each commit, all tests should be green before a pull request is sent. Please write your tests in Rspec.
-GEMS: We would like to keep external dependencies unduplicated. We're using Nokogiri, and Mongomapper, and EM::HttpRequest as much as possible. We have a few gems in the project we'd rather not use, but if you can, use dependencies we already have.
+GEMS: We would like to keep external dependencies unduplicated. We're using Nokogiri, Mongomapper, and EM::HttpRequest as much as possible. We have a few gems in the project we'd rather not use, but if you can, use dependencies we already have.
# Diaspora
@@ -69,22 +69,28 @@ If you're on **Mac OS X**, you already have Ruby on your system. Yay!
### MongoDB
-To install MongoDB on **Ubuntu**, add the official MongoDB repository from this link:
-
-http://www.mongodb.org/display/DOCS/Ubuntu+and+Debian+packages
+To install MongoDB on **Ubuntu**, add the official MongoDB repository [here](http://www.mongodb.org/display/DOCS/Ubuntu+and+Debian+packages).
For Lucid, add the following line to your /etc/apt/sources.list (for other distros, see http://www.mongodb.org/display/DOCS/Ubuntu+and+Debian+packages):
deb http://downloads.mongodb.org/distros/ubuntu 10.4 10gen
-And then run:
+Then run:
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv 7F0CEB10
sudo apt-get update
sudo apt-get install mongodb-stable
You can also run the binary directly by doing the following:
-If you're running a 32-bit system, run `wget http://fastdl.mongodb.org/linux/mongodb-linux-i686-1.6.2.tgz`. If you're running a 64-bit system, run `wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-1.6.2.tgz`.
+If you're running a 32-bit system, run:
+
+ wget http://fastdl.mongodb.org/linux/mongodb-linux-i686-1.6.2.tgz
+
+If you're running a 64-bit system, run:
+
+ wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-1.6.2.tgz
+
+Then run:
# extract
tar xzf mongodb-linux-i686-1.4.0.tgz
@@ -193,11 +199,11 @@ To start the app server for the first time, you need to use Bundler to install D
### Start Mongo
If you installed the Ubuntu package, MongoDB should already be running (if not, run `service mongodb start`). If you installed the binary manually, run `sudo mongod` from where mongo is installed to start mongo.
-If you installed the Fedora package, MongoDB will need to be started via `service mongodb start`. If you installed the binary manually, run `sudo mongod` from where mongo is installed to start mongo.
+If you installed the Fedora package, MongoDB will need to be started via `service mongodb start`. If you installed the binary manually, run `sudo mongod` from where Mongo is installed to start Mongo.
If you installed the OsX package through "brew", MongoDB will need to be started via `sudo launchctl load /Library/LaunchDaemons/org.mongodb.mongod.plist`. (before you have to go to /Library/LaunchDaemons and add a symlink to /usr/local/Cellar/mongodb/1.6.2-x86_64/org.mongodb.mongod.plist)
-Diaspora will not run unless mongo is running. Mongo will not run by default, and will need to be started every time you wish to use or run the test suite for Diaspora.
+Diaspora will not run unless Mongo is running. Mongo will not run by default, and will need to be started every time you wish to use or run the test suite for Diaspora.
### Run the server
`./script/server` will start both thin and the websocket server. If you want to run a different app server, you will have to run them separately. See below for instructions.
@@ -208,7 +214,7 @@ Once mongo is running and bundler has finished, run `bundle exec thin start` fro
### Run the websocket server
run `bundle exec ruby ./script/websocket_server` to start the websocket server on port 8080. Change the port in config/app_config.yml.
-### Logging in
+### Logging in with a sample user
Run `rake db:seed:tom`, then login with user `tom` and password `evankorth`. More details in db/seeds/tom.rb.
@@ -223,9 +229,10 @@ Ongoing discussion:
- [Diaspora Developer Google Group](http://groups.google.com/group/diaspora-dev)
- [Diaspora Discussion Google Group](http://groups.google.com/group/diaspora-discuss)
- [Diaspora Q&A site](http://diaspora.shapado.com/)
-- [#diaspora-dev](irc://irc.freenode.net/#diaspora-dev)
+- [#diaspora-dev IRC channel](irc://irc.freenode.net/#diaspora-dev)
+ ([join via the web client](http://webchat.freenode.net?channels=diaspora-dev))
-More general info and updates about the project can be found on our [blog](http://joindiaspora.com), [twitter](http://twitter.com/joindiaspora). Also, be sure to join the official [mailing list](http://http://eepurl.com/Vebk).
+More general info and updates about the project can be found on our [blog](http://joindiaspora.com), [and on Twitter](http://twitter.com/joindiaspora). Also, be sure to join the official [mailing list](http://http://eepurl.com/Vebk).
If you wish to contact us privately about any exploits in Diaspora you may find, you can email [exploits@joindiaspora.com](mailto:exploits@joindiaspora.com).
diff --git a/app/views/people/_person.html.haml b/app/views/people/_person.html.haml
index ef1c69d28527f73a8a784415e893ed51c5b30eb0..646d0b333d526a0a304474e7b7082821255e32d9 100644
--- a/app/views/people/_person.html.haml
+++ b/app/views/people/_person.html.haml
@@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file.
-
%li.message{:id => person.id}
= person_image_link(person)
@@ -17,6 +16,8 @@
.right{ :style => "display:inline;top:0;" }
- if person.id == current_user.person.id
thats you!
+ - elsif current_user.friends.include?(person)
+ Already friends
- elsif current_user.pending_requests.find_by_person_id(person.id)
= link_to "pending request", aspects_manage_path
- else
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 23617a3f3e66d49191cb9e5544c8b8048fdb5b2b..093df34661d5a59a767ff3423f98ed169fc704d7 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -3,7 +3,7 @@
# the COPYRIGHT file.
-# Sample localization file for English. Add more files in this directory for other locales.
+# Localization file for German. Add more files in this directory for other locales.
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
de:
@@ -11,7 +11,7 @@ de:
layouts:
application:
edit_profile: "Profil bearbeiten"
- logout: "Ausloggen"
+ logout: "Abmelden"
shared:
aspect_nav:
all_aspects: "Alle Aspekte"
diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml
index 34947cbc21eaf472a8dd82d5bf657ca83d34a90b..7c0e0e75843c28b95c391367ae306943ce1c5ce8 100644
--- a/config/locales/devise.de.yml
+++ b/config/locales/devise.de.yml
@@ -17,7 +17,7 @@ de:
locked: 'Dein Konto ist gesperrt.'
invalid: 'Ungültige E-Mail-Adresse oder Passwort.'
invalid_token: 'Ungültiger Authentifizierungstoken.'
- timeout: 'Deine Sitzung ist abgelaufen, bitte melde dich wieder an um fortzufahren.'
+ timeout: 'Deine Sitzung ist abgelaufen, bitte melde dich erneut an um fortzufahren.'
inactive: 'Dein Konto wurde noch nicht aktiviert.'
sessions:
signed_in: 'Erfolgreich angemeldet.'
@@ -31,7 +31,7 @@ de:
registrations:
signed_up: 'Du hast dich erfolgreich registriert. Sofern aktiviert, wurde dir eine Bestätigung per E-Mail gesendet.'
updated: 'Dein Konto wurde aktualisiert.'
- destroyed: 'Tschüss! Dein Konto wurde erfolgreich abgemeldet. Wir hoffen dich bald wiederzusehen.'
+ destroyed: 'Tschüss! Dein Konto wurde erfolgreich gekündigt. Wir hoffen dich bald wiederzusehen.'
unlocks:
send_instructions: 'Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto entsperren kannst.'
unlocked: 'Dein Konto wurde erfolgreich entsperrt. Du bist nun angemeldet.'
diff --git a/config/thin.yml b/config/thin.yml
index b0a3abf8dbbf84a37132b772d0f6316c8c2c637f..ad91436c1a55b7b5ad4d6edc63a878d1a2cd2128 100644
--- a/config/thin.yml
+++ b/config/thin.yml
@@ -13,7 +13,7 @@ max_conns: 1024
require: []
max_persistent_conns: 512
-environment: production
+environment: development
servers: 1
daemonize: true
#chdir: /usr/applications/localhash/current