diff --git a/.gitignore b/.gitignore
index 89b33da60180d91df81c80b1c3b2849b3c7cd5f9..0025a86f53a22fea18824e93fa20865a1f343bb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ gpg/diaspora-production/*.gpg
gpg/*/random_seed
public/uploads/*
.rvmrc
+config/app_config.yml
diff --git a/COPYRIGHT b/COPYRIGHT
index 243dd10667f73cd956e3dbb530496f3930d65959..f1bed1a6b30769f7f9d1bade1bf007066e75a4f6 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1 +1,23 @@
-Diaspora is copyright Diaspora Inc., 2010, and files herein are licensed under the Affero General Public License version 3, the text of which can be found in GNU-AGPL-3.0, unless otherwise noted. Components of Diaspora, including Rails, JQuery, and Devise, are licensed under the MIT/X11 license. Blueprint-CSS is licensed under a modified version of the MIT/X11 license. All unmodified files from these and other sources retain their original copyright and license notices: see the relevand individual files. Attribution information for Diaspora is contained in the AUTHORS file.
+Diaspora is copyright Diaspora Inc., 2010, and files herein are licensed
+under the Affero General Public License version 3, the text of which can
+be found in GNU-AGPL-3.0, or any later version of the AGPL, unless otherwise
+noted. Components of Diaspora, including Rails, JQuery, and Devise, are
+licensed under the MIT/X11 license. Blueprint-CSS is licensed under a
+modified version of the MIT/X11 license. All unmodified files from these
+and other sources retain their original copyright and license notices: see
+the relevant individual files. Attribution information for Diaspora is
+contained in the AUTHORS file.
+
+In addition, as a special exception, the copyright holders give
+permission to link the code of portions of this program with the
+OpenSSL library under certain conditions as described in each
+individual source file, and distribute linked combinations
+including the two.
+
+You must obey the GNU Affero General Public License V3 or later in all respects
+for all of the code used other than OpenSSL or the components mentioned
+above. If you modify file(s) with this exception, you may extend this
+exception to your version of the file(s), but you are not obligated to
+do so. If you do not wish to do so, delete this exception statement from your
+version. If you delete this exception statement from all source files in the
+program, then also delete it here.
diff --git a/Gemfile b/Gemfile
index 193cc0eb7374c47b73f3cd72f39f891e23d1ac8e..2b3cd008c1597e7b6e8c2ca1df6b45fa0a757931 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,9 +28,12 @@ gem 'redfinger', :git => 'git://github.com/rsofaer/redfinger.git'
#EventMachine
gem 'em-http-request',:git => 'git://github.com/igrigorik/em-http-request.git', :require => 'em-http'
-gem 'em-websocket'
gem 'thin'
+#Websocket
+gem 'em-websocket'
+gem 'magent', :git => 'http://github.com/dcu/magent.git'
+
#File uploading
gem 'carrierwave', :git => 'git://github.com/rsofaer/carrierwave.git' , :branch => 'master' #Untested mongomapper branch
gem 'mini_magick'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4002245ca4d1eb001a0d513ec3c98579e392c668..ecee78c7707450041eb299cb74fee320efe7b320 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,6 +47,14 @@ GIT
bcrypt-ruby (~> 2.1.2)
warden (~> 0.10.7)
+GIT
+ remote: http://github.com/dcu/magent.git
+ revision: 06513f3dac812469a55f2e365c349af4d2abc92a
+ specs:
+ magent (0.4.2)
+ mongo (>= 0.1.0)
+ uuidtools (>= 2.0.0)
+
GIT
remote: http://github.com/jnunemaker/mongomapper.git
revision: 931dab779011aa7acf60c1a4c7ad19e1ba838345
@@ -206,6 +214,7 @@ GEM
treetop (1.4.8)
polyglot (>= 0.3.1)
tzinfo (0.3.23)
+ uuidtools (2.1.1)
warden (0.10.7)
rack (>= 1.0.0)
webmock (1.3.5)
@@ -235,6 +244,7 @@ DEPENDENCIES
haml
jnunemaker-validatable (= 1.8.4)!
json
+ magent!
mini_magick
mocha
mongo_mapper (= 0.8.4)!
diff --git a/README.md b/README.md
index 5252f5670bc27f332d22048f42b437b954c93ac7..ded281e4ab94d8278916edb1bc4ab04561d2d663 100644
--- a/README.md
+++ b/README.md
@@ -1,218 +1,60 @@
## Commit Guidlines
-You are welcome to contribute, add and extend Diaspora however you see fit. We will do our best to incorporate everything that meets our guidelines.
-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 or Test-Unit.
+You are welcome to contribute, add to and extend Diaspora however you see fit. We
+will do our best to incorporate everything that meets our guidelines.
-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.
+We need you to fill out a
+[contributor agreement form](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq)
+before we can accept your patches. The agreement gives Diaspora joint
+ownership of the patch so the copyright isn't scattered. You can find it
+[here](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq).
-# Diaspora
-
-The privacy aware, personally controlled, do-it-all, open source social network.
-
-**DISCLAIMER: THIS IS PRE-ALPHA SOFTWARE AND SHOULD BE TREATED ACCORDINGLY.**
-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
-In order to run Diaspora, you will need to download the following dependencies (specific instructions follow):
-
-- Build Tools - Packages needed to compile the components that follow.
-- [Ruby](http://www.ruby-lang.org) - The Ruby programming language. (We're using **1.8.7**. It comes preinstalled on Mac OS X.)
-- [MongoDB](http://www.mongodb.org) - A snappy noSQL database.
-- [OpenSSL](http://www.openssl.org/) - An encryption library. (It comes preinstalled on Mac OS X and Ubuntu.)
-- [ImageMagick](http://www.imagemagick.org/) - An Image processing library used to resize uploaded photos.
-- [Git](http://git-scm.com/) - The fast version control system.
-
-After you have Ruby installed on your system, you will need to get RubyGems, then install Bundler:
-
-- [RubyGems](http://rubygems.org/) - Source for Ruby gems.
-- [Bundler](http://gembundler.com/) - Gem management tool for Ruby projects.
-
-**We suggest using a package management system to download these dependencies. Trust us, it's going to make your life a lot easier. If you're using Mac OS X, you can use [homebrew](http://mxcl.github.com/homebrew/); if you're using Ubuntu, just use [Synaptic](http://www.nongnu.org/synaptic/) (it comes pre-installed); if you're using Fedora simply use [yum](http://yum.baseurl.org/). The instructions below assume you have these installed.**
-
-### Build Tools
-
-To install build tools on **Ubuntu**, run the following (includes the gcc and xml parsing dependencies):
-
- sudo apt-get install build-essential libxslt1.1 libxslt1-dev libxml2
-
-To install build tools on **Fedora**, run the following:
-
- sudo yum install libxslt libxslt-devel libxml2 libxml2-devel
-
-To install build tools on **Mac OS X**, you need to download and install [Xcode](http://developer.apple.com/technologies/tools/xcode.html).
-
-### Ruby
-
-To install Ruby 1.8.7 on **Ubuntu**, run the following command:
-
- sudo apt-get install ruby-full
-
-At this time Fedora does not have Ruby 1.8.7. As a workaround it is possible to use [rvm](http://rvm.beginrescueend.com/) with a locally compiled Ruby installation. A semi automated method for doing this is available. It is highly recommended that you review the script before running it so you understand what will occur. The script can be executed by running the following command:
-
- ./script/bootstrap-fedora-diaspora.sh
-
-After reviewing and executing the above script you will need to follow the "MongoDB" section and then you should skip all the way down to "Start Mongo".
-
-
-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
-
-For Lucid, add the following line to your /etc/apt/sources.list:
-
- deb http://downloads.mongodb.org/distros/ubuntu 10.4 10gen
-
-And 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`.
-
- # extract
- tar xzf mongodb-linux-i686-1.4.0.tgz
- # create the required data directory
- sudo mkdir -p /data/db
- sudo chmod -Rv 777 /data/
-
-
-To install MongoDB on a x86_64 **Fedora** system, add the official MongoDB repository from MongoDB (http://www.mongodb.org/display/DOCS/CentOS+and+Fedora+Packages) into /etc/yum.repos.d/10gen.repo:
-
- [10gen]
- name=10gen Repository
- baseurl=http://downloads.mongodb.org/distros/fedora/13/os/x86_64/
- gpgcheck=0
- enabled=1
-
-
-Then use yum to install the packages:
-
- sudo yum install mongo-stable mongo-stable-server
-
-
-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`.
-
- # extract
- tar xzf mongodb-linux-i686-1.4.0.tgz
- # create the required data directory
- sudo mkdir -p /data/db
- sudo chmod -Rv 777 /data/
-
-
-To install MongoDB on **Mac OS X**, run the following:
+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.
- brew install mongo
+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.
-### OpenSSL
-
-If you're running either **Ubuntu**, **Fedora** or **Mac OS X** you already have OpenSSL installed!
-
-### ImageMagick
-
-To install ImageMagick on **Ubuntu**, run the following:
-
- sudo apt-get install imagemagick libmagick9-dev
-
-To install ImageMagick on **Fedora**, run the following:
-
- sudo yum install ImageMagick
-
-To install ImageMagick on **Mac OS X**, run the following:
-
- brew install imagemagick
-
-### Git
-
-To install Git on **Ubuntu**, run the following:
-
- sudo apt-get install git-core
-
-To install Git on **Fedora**, run the following:
-
- sudo yum install git
-
-
-To install Git on **Mac OS X**, run the following:
-
- brew install git
-
-
-### Rubygems
-
-On **Ubuntu**, run the following:
-
- wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz
- tar -xf rubygems-1.3.7.tgz
- cd rubygems-1.3.7
- sudo ruby setup.rb
- sudo ln -s /usr/bin/gem1.8 /usr/bin/gem
-
-On **Fedora**, run the following:
-
- sudo yum install rubygems
-
-On **Mac OS X**, RubyGems comes preinstalled; however, you might need to update it for use with the latest Bundler. To update RubyGems, run `sudo gem update --system`.
-
-
-### Bundler
-
-After RubyGems is updated, simply run `sudo gem install bundler` to get Bundler.
-
-
-## Getting Diaspora
-
- git clone http://github.com/diaspora/diaspora.git
-
-If you have never used github before, their [help desk](http://help.github.com/) has a pretty awesome guide on getting setup.
-
-
-## Running Diaspora
-
-### Install required gems
-To start the app server for the first time, you need to use Bundler to install Diaspora's gem depencencies. Run `bundle install` from Diaspora's root directory. Bundler will also warn you if there is a new dependency and you need to bundle install again.
-
-### 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.
+# Diaspora
-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.
+The privacy aware, personally controlled, do-it-all, open source social
+network.
-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.
+**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**
-### Run the app server
-Once mongo is running and bundler has finished, run `bundle exec thin start` from the root Diaspora directory. This will start the app server in development mode[.](http://bit.ly/9mwtUw)
+Some initial installation instructions are [here](http://github.com/diaspora/diaspora/wiki/Installing-and-Running-Diaspora).
-### Logging in
-Run `rake db:seed:tom`, then login with user `tom` and password `evankorth`. More details in db/seeds/tom.rb.
+We are continuing to build features and improve the code base.
+When we think it is ready for general use, we will post more final
+instructions.
-### Testing
-Diaspora's test suite uses [rspec](http://rspec.info/), a behavior driven testing framework. In order to run the tests, run `bundle exec rspec spec`.
## Resources
-We are maintaining a [public tracker project](http://www.pivotaltracker.com/projects/61641) and a [roadmap](https://github.com/diaspora/diaspora/wiki/Roadmap). Also, you can file [bug reports](https://github.com/diaspora/diaspora/issues) right here on github.
+We are maintaining a
+[public tracker project](http://www.pivotaltracker.com/projects/61641)
+and a
+[roadmap](https://github.com/diaspora/diaspora/wiki/Roadmap). Also, you can
+file [bug reports](https://github.com/diaspora/diaspora/issues) right here on
+github.
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-dev](irc://irc.freenode.net/#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).
-
-
-## License
-Copyright 2010 Diaspora Inc.
-
-Diaspora is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
-
-Diaspora is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
-
+- [Diaspora Q&A site](http://diaspora.shapado.com/)
+- [#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),
+[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/controllers/albums_controller.rb b/app/controllers/albums_controller.rb
index f4d797a46af529561e660b24236b2b750f680e0c..9e48598302c26a42768fe5a7c0e9940df22dfb9c 100644
--- a/app/controllers/albums_controller.rb
+++ b/app/controllers/albums_controller.rb
@@ -9,14 +9,18 @@ class AlbumsController < ApplicationController
respond_to :json, :only => [:index, :show]
def index
- @albums = current_user.albums_by_aspect(@aspect).paginate
+ @albums = current_user.albums_by_aspect(@aspect).paginate :page => params[:page], :per_page => 9, :order => 'created_at DESC'
+ @aspect = :all
respond_with @albums, :aspect => @aspect
end
def create
- aspect = params[:album][:to]
- @album = current_user.post(:album, params[:album])
- flash[:notice] = "You've created an album called #{@album.name}."
+ aspect = params[:album][:to]
+
+ data = clean_hash(params[:album])
+
+ @album = current_user.post(:album, data)
+ flash[:notice] = I18n.t 'albums.create.success', :name => @album.name
redirect_to :action => :show, :id => @album.id, :aspect => aspect
end
@@ -25,34 +29,43 @@ class AlbumsController < ApplicationController
end
def destroy
- @album = Album.find_by_id params[:id]
+ @album = current_user.find_visible_post_by_id params[:id]
@album.destroy
- flash[:notice] = "Album #{@album.name} deleted."
+ flash[:notice] = I18n.t 'albums.destroy.success', :name => @album.name
respond_with :location => albums_url
end
def show
@photo = Photo.new
- @album = Album.find_by_id params[:id]
+ @album = current_user.find_visible_post_by_id( params[:id] )
@album_photos = @album.photos
-
respond_with @album
end
def edit
- @album = Album.find_by_id params[:id]
+ @album = current_user.find_visible_post_by_id params[:id]
redirect_to @album unless current_user.owns? @album
end
def update
- @album = Album.find_params_by_id params[:id]
- if @album.update_attributes params[:album]
- flash[:notice] = "Album #{@album.name} successfully edited."
+ @album = current_user.find_visible_post_by_id params[:id]
+
+ data = clean_hash(params[:album])
+
+ if current_user.update_post( @album, data )
+ flash[:notice] = I18n.t 'albums.update.success', :name => @album.name
respond_with @album
else
- flash[:error] = "Failed to edit album #{@album.name}."
+ flash[:error] = I18n.t 'albums.update.failure', :name => @album.name
render :action => :edit
end
end
+ private
+ def clean_hash(params)
+ return {
+ :name => params[:name],
+ :to => params[:to]
+ }
+ end
end
diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index 87c41f0974ce59563bf32fc1f0d2f3bf6084235f..2bf1edb769a42d5099f659786b7fb14e3310668b 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -16,7 +16,7 @@ class AspectsController < ApplicationController
def create
@aspect = current_user.aspect params[:aspect]
- flash[:notice] = "Click on the plus on the left side to tell Diaspora who can see your new aspect."
+ flash[:notice] = I18n.t('aspects.create.success')
respond_with :location => aspects_manage_path
end
@@ -25,14 +25,20 @@ class AspectsController < ApplicationController
end
def destroy
- @aspect = Aspect.find_by_id params[:id]
- @aspect.destroy
- flash[:notice] = "You are no longer sharing the aspect called #{@aspect.name}."
- respond_with :location => aspects_url
+ @aspect = current_user.aspect_by_id params[:id]
+
+ begin
+ current_user.drop_aspect @aspect
+ flash[:notice] = i18n.t 'aspects.destroy.success',:name => @aspect.name
+ rescue RuntimeError => e
+ flash[:error] = e.message
+ end
+
+ respond_with :location => aspects_manage_path
end
def show
- @aspect = Aspect.find_by_id params[:id]
+ @aspect = current_user.aspect_by_id params[:id]
@friends = @aspect.people
@posts = current_user.visible_posts( :by_members_of => @aspect ).paginate :per_page => 15, :order => 'created_at DESC'
@@ -41,13 +47,15 @@ class AspectsController < ApplicationController
def manage
@aspect = :manage
- @remote_requests = Request.for_user current_user
+ @remote_requests = Request.for_user(current_user).all
end
def update
- @aspect = Aspect.find_by_id(params[:id])
- @aspect.update_attributes(params[:aspect])
- flash[:notice] = "Your aspect, #{@aspect.name}, has been successfully edited."
+ @aspect = current_user.aspect_by_id(params[:id])
+
+ data = clean_hash(params[:aspect])
+ @aspect.update_attributes( data )
+ flash[:notice] = i18n.t 'aspects.update.success',:name => @aspect.name
respond_with @aspect
end
@@ -55,26 +63,34 @@ class AspectsController < ApplicationController
params[:moves].each{ |move|
move = move[1]
unless current_user.move_friend(move)
- flash[:error] = "Aspect editing failed for friend #{Person.find_by_id( move[:friend_id] ).real_name}."
- redirect_to Aspect.first, :action => "edit"
+ flash[:error] = i18n.t 'aspects.move_friends.failure', :real_name => Person.find_by_id( move[:friend_id] ).real_name
+ redirect_to aspects_manage_path
return
end
}
- flash[:notice] = "Aspects edited successfully."
- redirect_to Aspect.first, :action => "edit"
+ flash[:notice] = i18n.t 'aspects.move_friends.success'
+ redirect_to aspects_manage_path
end
def move_friend
unless current_user.move_friend( :friend_id => params[:friend_id], :from => params[:from], :to => params[:to][:to])
- flash[:error] = "didn't work #{params.inspect}"
+ flash[:error] = I18n.t 'aspects.move_friend.error',:inspect => params.inspect
end
- if aspect = Aspect.first(:id => params[:to][:to])
- flash[:notice] = "You are now showing your friend a different aspect of yourself."
- respond_with aspect
+ if aspect = current_user.aspect_by_id(params[:to][:to])
+ flash[:notice] = I18n.t 'aspects.move_friend.success'
+ render :nothing => true
else
- flash[:notice] = "You are now showing your friend a different aspect of yourself."
- respond_with Person.first(:id => params[:friend_id])
+ flash[:notice] = I18n.t 'aspects.move_friend.failure'
+ render aspects_manage_path
end
end
+
+ private
+ def clean_hash(params)
+ return {
+ :name => params[:name]
+ }
+ end
+
end
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index dc115ab5b2cf0fa3b26222a5f281432d8a979a5e..fe11cb8ae28782923f3a90defc676587da9e39f5 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -10,16 +10,11 @@ class CommentsController < ApplicationController
respond_to :json, :only => :show
def create
- target = Post.find_by_id params[:comment][:post_id]
+ target = current_user.find_visible_post_by_id params[:comment][:post_id]
text = params[:comment][:text]
@comment = current_user.comment text, :on => target
render :nothing => true
end
- def show
- @comment = Comment.find_by_id params[:id]
- respond_with @comment
- end
-
end
diff --git a/app/controllers/dev_utilities_controller.rb b/app/controllers/dev_utilities_controller.rb
index bcb0dd4f7870d9104fbd2bbd211c7fdbee2c0de3..30d1a1799922ce1211fc5a1e3894e0d6f8808a0d 100644
--- a/app/controllers/dev_utilities_controller.rb
+++ b/app/controllers/dev_utilities_controller.rb
@@ -7,24 +7,6 @@ class DevUtilitiesController < ApplicationController
before_filter :authenticate_user!, :except => [:set_backer_number]
include ApplicationHelper
include RequestsHelper
-def warzombie
- render :nothing => true
- if current_user.email == "tom@tom.joindiaspora.com" && StatusMessage.where(:message => "There's a bomb in the lasagna!?").first == nil
- current_user.post(:status_message, :message => "There's a bomb in the lasagna!?")
- current_user.post(:status_message, :message => "xkcd \nhttp://xkcd.com/743/" )
- current_user.post(:status_message, :message => "I switched to Motoroi today, a Motorola Android-based phone, in Korea. Now, I am using Android phones in both the U.S. and Korea", :created_at => Time.now-930)
- current_user.post(:status_message, :message => "I had 5 hours to study for it :-( GREs on Thursday. Wunderbar.", :created_at => Time.now-43990)
- current_user.post(:status_message, :message => "Spotted in toy story 3: google maps, OSX, and windows XP. Two out of three isn't bad.", :created_at => Time.now-4390)
- current_user.post(:status_message, :message => "Reddit\nhttp://reddit.com", :created_at => Time.now-54390)
- current_user.post(:status_message, :message => "Commercials for IE make me SO MAD and my friends just don't get why.", :created_at => Time.now-30900)
- current_user.post(:status_message, :message => "Zombo.com\nhttp://zombo.com", :created_at => Time.now-9090)
- current_user.post(:status_message, :message => "Why do I have \"No More Heroes\" by Westlife on repeat all day?", :created_at => Time.now-590000)
- current_user.post(:status_message, :message => "Mmm. Friday night. Acknowledged.", :created_at => Time.now-503900)
- current_user.post(:status_message, :message => "Getting a universal remote is the epitome of laziness, I do declare.", :created_at => Time.now-4400)
- current_user.post(:status_message, :message => "Does anyone know how to merge two Skype contact entries of the same person? (i.e. one Skype ID and one mobile number)", :created_at => Time.now-400239)
- current_user.post(:status_message, :message => "A cool, cool morning for once.", :created_at => Time.now-150000)
- end
- end
def zombiefriends
render :nothing => true
diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
index 78b0803c0f1b038e66ca0b76d08265161d3d7df9..08acdd4241dd3980bf766d4e76c439621ccc9241 100644
--- a/app/controllers/people_controller.rb
+++ b/app/controllers/people_controller.rb
@@ -11,7 +11,9 @@ class PeopleController < ApplicationController
def index
@aspects_dropdown_array = current_user.aspects.collect{|x| [x.to_s, x.id]}
- @people = Person.search params[:q]
+ @aspect = :all
+ @people = Person.search(params[:q]).paginate :page => params[:page], :per_page => 25, :order => 'created_at DESC'
+
respond_with @people
end
@@ -20,7 +22,7 @@ class PeopleController < ApplicationController
@profile = @person.profile
@aspects_with_person = current_user.aspects_with_person(@person)
@aspects_dropdown_array = current_user.aspects.collect{|x| [x.to_s, x.id]}
- @posts = current_user.visible_posts_from_others(:from => @person).paginate :page => params[:page], :order => 'created_at DESC'
+ @posts = current_user.visible_posts(:from => @person).paginate :page => params[:page], :order => 'created_at DESC'
@latest_status_message = current_user.raw_visible_posts.find_all_by__type_and_person_id("StatusMessage", params[:id]).last
@post_count = @posts.count
respond_with @person
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index cefc8f5d6e3d890ac126c25f2a490c56c592f1a5..3433c0cf4a47fd5ae51f2e3bfcc19a7ac0f6b1b0 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -10,9 +10,7 @@ class PhotosController < ApplicationController
respond_to :json, :only => :show
def create
-
album = Album.find_by_id params[:album_id]
-
begin
######################## dealing with local files #############
@@ -33,22 +31,26 @@ class PhotosController < ApplicationController
params[:user_file] = file
- @photo = current_user.post(:photo, params)
+
+ data = clean_hash(params)
+
+
+ @photo = current_user.post(:photo, data)
respond_to do |format|
format.json{render(:layout => false , :json => {"success" => true, "data" => @photo}.to_json )}
end
rescue TypeError
- message = "Photo upload failed. Are you sure an image was added?"
+ message = I18n.t 'photos.create.type_error'
respond_with :location => album, :error => message
rescue CarrierWave::IntegrityError
- message = "Photo upload failed. Are you sure that was an image?"
+ message = I18n.t 'photos.create.integrity_error'
respond_with :location => album, :error => message
rescue RuntimeError => e
- message = "Photo upload failed. Are you sure that your seatbelt is fastened?"
+ message = I18n.t 'photos.create.runtime_error'
respond_with :location => album, :error => message
raise e
end
@@ -61,34 +63,55 @@ class PhotosController < ApplicationController
end
def destroy
- @photo = Photo.find_by_id params[:id]
+ @photo = current_user.find_visible_post_by_id params[:id]
+
@photo.destroy
- flash[:notice] = "Photo deleted."
+ flash[:notice] = I18n.t 'photos.destroy.notice'
respond_with :location => @photo.album
end
def show
- @photo = Photo.find_by_id params[:id]
+ @photo = current_user.find_visible_post_by_id params[:id]
@album = @photo.album
-
respond_with @photo, @album
end
def edit
- @photo = Photo.find_by_id params[:id]
+ @photo = current_user.find_visible_post_by_id params[:id]
@album = @photo.album
redirect_to @photo unless current_user.owns? @album
end
def update
- @photo = Photo.find_by_id params[:id]
- if @photo.update_attributes params[:photo]
- flash[:notice] = "Photo successfully updated."
+ @photo = current_user.find_visible_post_by_id params[:id]
+
+ data = clean_hash(params)
+
+ if current_user.update_post( @photo, data[:photo] )
+ flash[:notice] = I18n.t 'photos.update.notice'
respond_with @photo
else
- flash[:error] = "Failed to edit photo."
+ flash[:error] = I18n.t 'photos.update.error'
render :action => :edit
end
end
+
+
+ private
+ def clean_hash(params)
+ if params[:photo]
+ return {
+ :photo => {
+ :caption => params[:photo][:caption],
+ }
+ }
+ else
+ return{
+ :album_id => params[:album_id],
+ :user_file => params[:user_file]
+ }
+ end
+ end
+
end
diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb
index cd3812fe7a0cd756d036016c85fd020f6febf311..6be195e302b9298a2265ffb76510e6182524ae72 100644
--- a/app/controllers/publics_controller.rb
+++ b/app/controllers/publics_controller.rb
@@ -10,7 +10,6 @@ class PublicsController < ApplicationController
def hcard
@person = Person.find_by_id params[:id]
- puts @person
unless @person.nil? || @person.owner.nil?
render 'hcard'
end
@@ -21,9 +20,11 @@ class PublicsController < ApplicationController
end
def webfinger
- @person = Person.by_webfinger(params[:q])
+ @person = Person.by_webfinger(params[:q], :local => true) if params[:q]
unless @person.nil? || @person.owner.nil?
render 'webfinger', :content_type => 'application/xrd+xml'
+ else
+ render :nothing => true
end
end
@@ -31,9 +32,10 @@ class PublicsController < ApplicationController
render :nothing => true
return unless params[:xml]
begin
- @user = Person.first(:id => params[:id]).owner
+ person = Person.first(:id => params[:id])
+ @user = person.owner
rescue NoMethodError => e
- Rails.logger.error("Received post #{params[:xml]} for nonexistent person #{params[:id]}")
+ Rails.logger.error("Received post for nonexistent person #{params[:id]}")
return
end
@user.receive_salmon params[:xml]
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 8241aa2946ce3cbe0e84c18ce10ff39fab9ef636..b630c6617d240c7617067e096aac664c32681cf2 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -15,9 +15,7 @@ class RegistrationsController < Devise::RegistrationsController
flash[:error] = e.message
end
if user
- #set_flash_message :notice, :signed_up
- flash[:notice] = "You've joined Diaspora!"
- #redirect_to root_url
+ flash[:notice] = I18n.t 'registrations.create.success'
sign_in_and_redirect(:user, user)
else
redirect_to new_user_registration_path
diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb
index 5983c0e2e48322a0046e8547ab11af410cc19f41..44e1a801685838b98d0d993b2960240d16c2fce9 100644
--- a/app/controllers/requests_controller.rb
+++ b/app/controllers/requests_controller.rb
@@ -13,15 +13,15 @@ class RequestsController < ApplicationController
if params[:accept]
if params[:aspect_id]
@friend = current_user.accept_and_respond( params[:id], params[:aspect_id])
- flash[:notice] = "You are now friends."
+ flash[:notice] = I18n.t 'requests.destroy.success'
respond_with :location => current_user.aspect_by_id(params[:aspect_id])
else
- flash[:error] = "Please select an aspect!"
+ flash[:error] = I18n.t 'requests.destroy.error'
respond_with :location => requests_url
end
else
current_user.ignore_friend_request params[:id]
- flash[:notice] = "Ignored friend request."
+ flash[:notice] = I18n.t 'requests.destroy.ignore'
respond_with :location => requests_url
end
end
@@ -36,27 +36,31 @@ class RequestsController < ApplicationController
begin
rel_hash = relationship_flow(params[:request][:destination_url])
rescue Exception => e
- flash[:error] = "No diaspora seed found with this email!"
+ raise e unless e.message.include? "not found"
+ flash[:error] = I18n.t 'requests.create.error'
respond_with :location => aspect
return
end
+
+
+ # rel_hash = {:friend => params[:friend_handle]}
Rails.logger.debug("Sending request: #{rel_hash}")
begin
@request = current_user.send_friend_request_to(rel_hash[:friend], aspect)
rescue Exception => e
- raise e unless e.message.include? "already friends"
- flash[:notice] = "You are already friends with #{params[:request][:destination_url]}!"
+ raise e unless e.message.include? "already"
+ flash[:notice] = I18n.t 'requests.create.already_friends', :destination_url => params[:request][:destination_url]
respond_with :location => aspect
return
end
if @request
- flash[:notice] = "A friend request was sent to #{@request.destination_url}."
+ flash[:notice] = I18n.t 'requests.create.success',:destination_url => @request.destination_url
respond_with :location => aspect
else
- flash[:error] = "Something went horribly wrong."
+ flash[:error] = I18n.t 'requests.create.horribly_wrong'
respond_with :location => aspect
end
end
diff --git a/app/controllers/sockets_controller.rb b/app/controllers/sockets_controller.rb
index 2852a71607b178ac53f0d8890acdbb6a7bfab318..9b90ea83177a7447f778d704dd2b4bbededa1103 100644
--- a/app/controllers/sockets_controller.rb
+++ b/app/controllers/sockets_controller.rb
@@ -14,7 +14,7 @@ class SocketsController < ApplicationController
def outgoing(uid,object,opts={})
@_request = ActionDispatch::Request.new({})
- Diaspora::WebSocket.push_to_user(uid, action_hash(uid, object, opts))
+ Diaspora::WebSocket.queue_to_user(uid, action_hash(uid, object, opts))
end
end
diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index 5a588fb99faa7684da838b4f55f57a6ce34c07a1..5a8efbe066d41cc7da845fe51dd838050aefed0c 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -11,18 +11,29 @@ class StatusMessagesController < ApplicationController
def create
params[:status_message][:to] = params[:aspect_ids]
- @status_message = current_user.post(:status_message, params[:status_message])
+
+ data = clean_hash params[:status_message]
+
+ @status_message = current_user.post(:status_message, data)
respond_with @status_message
end
def destroy
- @status_message = StatusMessage.find_by_id params[:id]
+ @status_message = current_user.find_visible_post_by_id params[:id]
@status_message.destroy
respond_with :location => root_url
end
def show
- @status_message = StatusMessage.find_by_id params[:id]
+ @status_message = current_user.find_visible_post_by_id params[:id]
respond_with @status_message
end
+
+ private
+ def clean_hash(params)
+ return {
+ :message => params[:message],
+ :to => params[:to]
+ }
+ end
end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4a36672bc41d3734f3a67ba194593cd561d1b972..dbb69d1a20668c90989ac07f51c6fed21174899e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -7,13 +7,6 @@ class UsersController < ApplicationController
before_filter :authenticate_user!, :except => [:new, :create]
respond_to :html
- respond_to :json, :only => :show
-
- def show
- @user = User.find_by_id params[:id]
- @user_profile = @user.person.profile
- respond_with @user
- end
def edit
@user = current_user
@@ -23,15 +16,16 @@ class UsersController < ApplicationController
end
def update
- @user = User.find_by_id params[:id]
- prep_image_url(params[:user])
+ @user = current_user
- @user.update_profile params[:user]
+ data = clean_hash params[:user]
+ prep_image_url(data)
+
+ @user.update_profile data
respond_with(@user, :location => root_url)
end
private
-
def prep_image_url(params)
if params[:profile][:image_url].empty?
params[:profile].delete(:image_url)
@@ -39,4 +33,16 @@ class UsersController < ApplicationController
params[:profile][:image_url] = "http://" + request.host + ":" + request.port.to_s + params[:profile][:image_url]
end
end
+
+ def clean_hash(params)
+ return {
+ :profile =>
+ {
+ :first_name => params[:profile][:first_name],
+ :last_name => params[:profile][:last_name],
+ :image_url => params[:profile][:image_url]
+ }
+ }
+ end
+
end
diff --git a/app/helpers/albums_helper.rb b/app/helpers/albums_helper.rb
index 50b7fbaf776fa58aa5c085b0f36fa3ca199e61d9..9a1e78fd19f2bbf60455147c9f03be9e3609d797 100644
--- a/app/helpers/albums_helper.rb
+++ b/app/helpers/albums_helper.rb
@@ -6,17 +6,17 @@
module AlbumsHelper
def friends_albums_link
if params[:friends]
- "Friends Albums"
+ I18n.t('albums.helper.friends_albums')
else
- link_to 'Friends Albums', albums_path({:friends => true})
+ link_to I18n.t('albums.helper.friends_albums'), albums_path({:friends => true})
end
end
def your_albums_link
if params[:friends]
- link_to 'Your Albums', albums_path
+ link_to I18n.t('albums.helper.your_albums'), albums_path
else
- 'Your Albums'
+ I18n.t('albums.helper.your_albums')
end
end
end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6c4240578939080d8fe180427e208cbb10447ba1..89df261556cb6780f131bec08d2ba8e6f1810e43 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -4,12 +4,12 @@
module ApplicationHelper
-
def current_aspect?(aspect)
!@aspect.is_a?(Symbol) && @aspect.id == aspect.id
end
def object_path(object, opts = {})
+ object = object.person if object.is_a? User
eval("#{object.class.to_s.underscore}_path(object, opts)")
end
@@ -27,7 +27,7 @@ module ApplicationHelper
end
def how_long_ago(obj)
- "#{time_ago_in_words(obj.created_at)} ago."
+ "#{time_ago_in_words(obj.created_at)} ago"
end
def person_url(person)
@@ -37,16 +37,16 @@ module ApplicationHelper
when "Person"
person_path(person)
else
- "unknown person"
+ I18n.t('application.helper.unknown_person')
end
end
def owner_image_tag
- person_image_tag(current_user)
+ person_image_tag(current_user.person)
end
def owner_image_link
- person_image_link(current_user)
+ person_image_link(current_user.person)
end
def person_image_tag(person)
@@ -61,11 +61,10 @@ module ApplicationHelper
end
def new_request(request_count)
- "new_requests" if request_count > 0
+ I18n.t('application.helper.new_requests') if request_count > 0
end
def post_yield_tag(post)
(':' + post.id.to_s).to_sym
end
-
end
diff --git a/app/helpers/aspects_helper.rb b/app/helpers/aspects_helper.rb
index adceab8fdd2d1a4c05401062cfeb9ce586159c14..536bb8b0b8f2f31e330c9fc192c269dd25c5b852 100644
--- a/app/helpers/aspects_helper.rb
+++ b/app/helpers/aspects_helper.rb
@@ -7,4 +7,12 @@ module AspectsHelper
def link_for_aspect( aspect )
link_to aspect.name, aspect
end
+
+ def remove_link( aspect )
+ if aspect.people.size == 0
+ link_to I18n.t('aspects.helper.remove'), aspect, :method => :delete
+ else
+ "<span class='grey' title=#{I18n.t('aspects.helper.aspect_not_empty')}>#{I18n.t('aspects.helper.remove')}</span>"
+ end
+ end
end
diff --git a/app/helpers/dashboards_helper.rb b/app/helpers/dashboards_helper.rb
index 542d938eed03d79b00c89c0dbfc81cfdd07bc74e..271b6825374dfd49a6cd4bf9ea7ccd0f6d315bed 100644
--- a/app/helpers/dashboards_helper.rb
+++ b/app/helpers/dashboards_helper.rb
@@ -4,8 +4,7 @@
module DashboardsHelper
-
def title_for_page
- 'home'
+ I18n.t('dashboards.helper.home')
end
end
diff --git a/app/helpers/error_messages_helper.rb b/app/helpers/error_messages_helper.rb
index 699070b705bac0049eeeaf513decb6267cded360..274d60edf381576ca2471e58fa9817c13df478d1 100644
--- a/app/helpers/error_messages_helper.rb
+++ b/app/helpers/error_messages_helper.rb
@@ -7,8 +7,8 @@ module ErrorMessagesHelper
# Render error messages for the given objects. The :message and :header_message options are allowed.
def error_messages_for(*objects)
options = objects.extract_options!
- options[:header_message] ||= "Invalid Fields"
- options[:message] ||= "Correct the following errors and try again."
+ options[:header_message] ||= I18n.t('error_messages.helper.invalid_fields')
+ options[:message] ||= I18n.t('error_messages.helper.correct_the_following_errors_and_try_again')
messages = objects.compact.map { |o| o.errors.full_messages }.flatten
unless messages.empty?
content_tag(:div, :class => "error_messages") do
diff --git a/app/helpers/people_helper.rb b/app/helpers/people_helper.rb
index 37d18d20f135a05c039403e880eb9a26a5583ab1..90ffb517d310a1865d94e34e936ef75370a5a9aa 100644
--- a/app/helpers/people_helper.rb
+++ b/app/helpers/people_helper.rb
@@ -7,9 +7,9 @@ module PeopleHelper
def search_or_index
if params[:q]
- " results for #{params[:q]}"
+ I18n.t 'people.helper.results_for',:params => params[:q]
else
- " people on pod is aware of"
+ I18n.t "people.helper.people_on_pod_are_aware_of"
end
end
diff --git a/app/helpers/photos_helper.rb b/app/helpers/photos_helper.rb
index 2d0ddad6e00ace59543d600ff790ecaea48eb942..2737d3a2d0d9f77dec91c1a601f37775966d62f2 100644
--- a/app/helpers/photos_helper.rb
+++ b/app/helpers/photos_helper.rb
@@ -4,7 +4,6 @@
module PhotosHelper
-
def linked_scaled_photo(photo, album)
link_to (image_tag photo.url(:scaled_full)), photo_path(album.next_photo(photo)), :rel => "prefetch"
end
diff --git a/app/helpers/publics_helper.rb b/app/helpers/publics_helper.rb
index 9e76f59f73992fb468a6d0c7cce819c2a65f9139..46e778e2bd0a1219421d5b264e0dd886b7372f00 100644
--- a/app/helpers/publics_helper.rb
+++ b/app/helpers/publics_helper.rb
@@ -9,7 +9,6 @@ module PublicsHelper
subscriber ||= Subscriber.new(:url => opts[:callback], :topic => opts[:topic])
if subscriber.save
-
if opts[:verify] == 'sync'
204
elsif opts[:verify] == 'async'
diff --git a/app/helpers/requests_helper.rb b/app/helpers/requests_helper.rb
index 32ce79fd9af1d28d6524b89ba4f79095a01b990e..fec093aac6ae860f1daa04ef9b9917c237e14383 100644
--- a/app/helpers/requests_helper.rb
+++ b/app/helpers/requests_helper.rb
@@ -4,7 +4,6 @@
module RequestsHelper
-
def subscription_mode(profile)
if diaspora?(profile)
:friend
@@ -39,5 +38,4 @@ module RequestsHelper
end
{ action => person }
end
-
end
diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb
index cbe465e7bbe07b3b5cb4668c3da0c4e8cabcce55..69135092a2bfe143d80ba6dbc9a9032fd5bc30fc 100644
--- a/app/helpers/sockets_helper.rb
+++ b/app/helpers/sockets_helper.rb
@@ -33,7 +33,4 @@ module SocketsHelper
action_hash.to_json
end
-
-
-
end
diff --git a/app/helpers/status_messages_helper.rb b/app/helpers/status_messages_helper.rb
index ff6c2674a03ea4a7bb889e76a04de20e3745c726..7c1322762584f7d1db5f4c9d3bd1eb87f136b7b3 100644
--- a/app/helpers/status_messages_helper.rb
+++ b/app/helpers/status_messages_helper.rb
@@ -8,7 +8,7 @@ module StatusMessagesHelper
unless @latest_status_message.nil?
return @latest_status_message.message
else
- return "No message to display."
+ return I18n.t('status_messages.helper.no_message_to_display')
end
end
end
diff --git a/app/models/aspect.rb b/app/models/aspect.rb
index 96f94e8fe935502ffbaf1e21775eba057395e911..b6014267137eb9d1a8ed04a0cf29e972681f0ff9 100644
--- a/app/models/aspect.rb
+++ b/app/models/aspect.rb
@@ -39,5 +39,6 @@ class Aspect
}
}
end
+
end
diff --git a/app/models/person.rb b/app/models/person.rb
index daf1828325abf9629000eb722e3ab2302a129f9d..a94f4106c3ac8b596edb5db03205fa29efc02929 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -34,11 +34,9 @@ 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); }")
+ query = Regexp.escape( query.to_s.strip )
+ Person.all('profile.first_name' => /^#{query}/i) | Person.all('profile.last_name' => /^#{query}/i)
end
def real_name
@@ -78,18 +76,23 @@ class Person
@serialized_key = new_key
end
- def self.by_webfinger( identifier )
- local_person = Person.first(:diaspora_handle => identifier.gsub('acct:', ''))
-
+ def self.by_webfinger( identifier, opts = {})
+ #need to check if this is a valid email structure, maybe should do in JS
+ local_person = Person.first(:diaspora_handle => identifier.gsub('acct:', '').to_s.downcase)
+
if local_person
+ Rails.logger.info("Do not need to webfinger, found a local person #{local_person.real_name}")
local_person
- elsif !identifier.include?("localhost")
+ elsif !identifier.include?("localhost") && !opts[:local]
begin
+ Rails.logger.info("Webfingering #{identifier}")
f = Redfinger.finger(identifier)
rescue SocketError => e
raise "Diaspora server for #{identifier} not found" if e.message =~ /Name or service not known/
+ rescue Errno::ETIMEDOUT => e
+ raise "Connection timed out to Diaspora server for #{identifier}"
end
- raise "No webfinger profile found at #{identifier}" unless f
+ raise "No webfinger profile found at #{identifier}" if f.nil? || f.links.empty?
Person.from_webfinger_profile(identifier, f )
end
end
@@ -97,8 +100,12 @@ class Person
def self.from_webfinger_profile( identifier, profile)
new_person = Person.new
- public_key = profile.links.select{|x| x.rel == 'diaspora-public-key'}.first.href
- new_person.exported_key = Base64.decode64 public_key
+ public_key_entry = profile.links.select{|x| x.rel == 'diaspora-public-key'}
+
+ return nil unless public_key_entry
+
+ pubkey = public_key_entry.first.href
+ new_person.exported_key = Base64.decode64 pubkey
guid = profile.links.select{|x| x.rel == 'http://joindiaspora.com/guid'}.first.href
new_person.id = guid
diff --git a/app/models/post.rb b/app/models/post.rb
index 7e20354af4dae2c67097ce24f9d0453c4918a8c7..431d1c7e0ab77c01e88b7698e774886d48069435 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -5,6 +5,7 @@
class Post
require File.expand_path('../../../lib/encryptable', __FILE__)
+ require File.expand_path('../../../lib/diaspora/websocket', __FILE__)
include MongoMapper::Document
include ApplicationHelper
include ROXML
@@ -17,7 +18,7 @@ class Post
key :person_id, ObjectId
key :user_refs, Integer, :default => 0
- many :comments, :class_name => 'Comment', :foreign_key => :post_id
+ many :comments, :class_name => 'Comment', :foreign_key => :post_id, :order => 'created_at ASC'
belongs_to :person, :class_name => 'Person'
timestamps!
diff --git a/app/models/request.rb b/app/models/request.rb
index 7082515cf7db5ae13b74d8c92e255c1655da4a2a..bf9dd872164b6711668257084fae25cefc3e7fd9 100644
--- a/app/models/request.rb
+++ b/app/models/request.rb
@@ -26,8 +26,8 @@ class Request
validates_presence_of :destination_url, :callback_url
before_validation :clean_link
- scope :for_user, lambda{ |user| where(:destination_url => user.receive_url) }
- scope :from_user, lambda{ |user| where(:destination_url.ne => user.receive_url) }
+ scope :for_user, lambda{ |user| where(:destination_url => user.person.receive_url) }
+ scope :from_user, lambda{ |user| where(:destination_url.ne => user.person.receive_url) }
def self.instantiate(options = {})
person = options[:from]
diff --git a/app/models/user.rb b/app/models/user.rb
index 8e7fb1373ab2f6967053e3e9edaef9b43b520c00..c1aebfd53dd5f08cdc4d2ee6bc808c3a2423f17b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -5,12 +5,14 @@
require File.expand_path('../../../lib/diaspora/user/friending', __FILE__)
require File.expand_path('../../../lib/diaspora/user/querying', __FILE__)
+require File.expand_path('../../../lib/diaspora/user/receiving', __FILE__)
require File.expand_path('../../../lib/salmon/salmon', __FILE__)
class User
include MongoMapper::Document
include Diaspora::UserModules::Friending
include Diaspora::UserModules::Querying
+ include Diaspora::UserModules::Receiving
include Encryptor::Private
QUEUE = MessageHandler.new
@@ -23,8 +25,6 @@ class User
key :visible_post_ids, Array
key :visible_person_ids, Array
- key :url, String
-
one :person, :class_name => 'Person', :foreign_key => :owner_id
many :friends, :in => :friend_ids, :class_name => 'Person'
@@ -34,7 +34,6 @@ class User
many :aspects, :class_name => 'Aspect'
-
after_create :seed_aspects
before_validation_on_create :downcase_username
@@ -65,6 +64,15 @@ class User
Aspect.create(opts)
end
+ def drop_aspect( aspect )
+ if aspect.people.size == 0
+ aspect.destroy
+ else
+ raise "Aspect not empty"
+ end
+ end
+
+
def move_friend( opts = {})
return true if opts[:to] == opts[:from]
friend = Person.first(:_id => opts[:friend_id])
@@ -87,7 +95,6 @@ class User
######## Posting ########
def post(class_name, options = {})
-
if class_name == :photo
raise ArgumentError.new("No album_id given") unless options[:album_id]
aspect_ids = aspects_with_post( options[:album_id] )
@@ -96,17 +103,47 @@ class User
aspect_ids = options.delete(:to)
end
- aspect_ids = [aspect_ids.to_s] if aspect_ids.is_a? BSON::ObjectId
- raise ArgumentError.new("You must post to someone.") if aspect_ids.nil? || aspect_ids.empty?
+ aspect_ids = validate_aspect_permissions(aspect_ids)
- post = build_post(class_name, options)
+ intitial_post(class_name, aspect_ids, options)
+ end
+
+ def intitial_post(class_name, aspect_ids, options = {})
+ post = build_post(class_name, options)
post.socket_to_uid(id, :aspect_ids => aspect_ids) if post.respond_to?(:socket_to_uid)
push_to_aspects(post, aspect_ids)
+ post
+ end
+ def repost( post, options = {} )
+ aspect_ids = validate_aspect_permissions(options[:to])
+ push_to_aspects(post, aspect_ids)
post
end
+ def update_post( post, post_hash = {} )
+ if self.owns? post
+ post.update_attributes(post_hash)
+ end
+ end
+
+ def validate_aspect_permissions(aspect_ids)
+ aspect_ids = [aspect_ids.to_s] if aspect_ids.is_a? BSON::ObjectId
+
+ if aspect_ids.nil? || aspect_ids.empty?
+ raise ArgumentError.new("You must post to someone.")
+ end
+
+ aspect_ids.each do |aspect_id|
+ unless aspect_id == "all" || self.aspects.find(aspect_id)
+ raise ArgumentError.new("Cannot post to an aspect you do not own.")
+ end
+ end
+
+ aspect_ids
+ end
+
def build_post( class_name, options = {})
options[:person] = self.person
model_class = class_name.to_s.camelize.constantize
@@ -209,92 +246,19 @@ class User
end
end
- ###### Receiving #######
- def receive_salmon ciphertext
- cleartext = decrypt( ciphertext)
- Rails.logger.info("Received a salmon: #{cleartext}")
- salmon = Salmon::SalmonSlap.parse cleartext
- if salmon.verified_for_key?(salmon.author.public_key)
- Rails.logger.info("data in salmon: #{salmon.data}")
- self.receive(salmon.data)
- end
- end
-
- def receive xml
- object = Diaspora::Parser.from_xml(xml)
- Rails.logger.debug("Receiving object for #{self.real_name}:\n#{object.inspect}")
- Rails.logger.debug("From: #{object.person.inspect}") if object.person
-
- if object.is_a? Retraction
- if object.type == 'Person'
-
- Rails.logger.info( "the person id is #{object.post_id} the friend found is #{visible_person_by_id(object.post_id).inspect}")
- unfriended_by visible_person_by_id(object.post_id)
-
- else
- object.perform self.id
- aspects = self.aspects_with_person(object.person)
- aspects.each{ |aspect| aspect.post_ids.delete(object.post_id.to_id)
- aspect.save
- }
- end
- elsif object.is_a? Request
- person = Diaspora::Parser.parse_or_find_person_from_xml( xml )
- person.serialized_key ||= object.exported_key
- object.person = person
- object.person.save
- old_request = Request.first(:id => object.id)
- object.aspect_id = old_request.aspect_id if old_request
- object.save
- receive_friend_request(object)
- elsif object.is_a? Profile
- person = Diaspora::Parser.owner_id_from_xml xml
- person.profile = object
- person.save
-
- elsif object.is_a?(Comment)
- object.person = Diaspora::Parser.parse_or_find_person_from_xml( xml ).save if object.person.nil?
- self.visible_people = self.visible_people | [object.person]
- self.save
- Rails.logger.debug("The person parsed from comment xml is #{object.person.inspect}") unless object.person.nil?
- object.person.save
- Rails.logger.debug("From: #{object.person.inspect}") if object.person
- raise "In receive for #{self.real_name}, signature was not valid on: #{object.inspect}" unless object.post.person == self.person || object.verify_post_creator_signature
- object.save
- unless owns?(object)
- dispatch_comment object
- end
- object.socket_to_uid(id) if (object.respond_to?(:socket_to_uid) && !self.owns?(object))
- else
- Rails.logger.debug("Saving object: #{object}")
- object.user_refs += 1
- object.save
-
- self.raw_visible_posts << object
- self.save
-
- aspects = self.aspects_with_person(object.person)
- aspects.each{ |aspect|
- aspect.posts << object
- aspect.save
- object.socket_to_uid(id, :aspect_ids => [aspect.id]) if (object.respond_to?(:socket_to_uid) && !self.owns?(object))
- }
-
- end
-
- end
-
###Helpers############
def self.instantiate!( opts = {} )
- opts[:person][:diaspora_handle] = "#{opts[:username]}@#{opts[:url]}"
+ opts[:person][:diaspora_handle] = "#{opts[:username]}@#{APP_CONFIG[:terse_pod_url]}"
+ opts[:person][:url] = APP_CONFIG[:pod_url]
opts[:person][:serialized_key] = generate_key
- User.create!(opts)
+ User.create(opts)
end
def seed_aspects
aspect(:name => "Family")
aspect(:name => "Work")
end
+<<<<<<< HEAD
def self.create(opts ={})
puts opts.inspect
@@ -305,9 +269,12 @@ class User
terse = terse.chop! if terse[-1, 1] == '/'
terse
end
+=======
+
+>>>>>>> master
def diaspora_handle
- "#{self.username}@#{self.terse_url}"
+ "#{self.username}@#{APP_CONFIG[:terse_pod_url]}"
end
def downcase_username
diff --git a/app/views/albums/_album.html.haml b/app/views/albums/_album.html.haml
index f4893ed8ff76ecf98586d2045151737dbc99cdc1..a2d2eb46ba606b1157f4ed6fc9e71364adb12b99 100644
--- a/app/views/albums/_album.html.haml
+++ b/app/views/albums/_album.html.haml
@@ -8,7 +8,7 @@
%div.time
by
- = link_to ((current_user.person == post.person)? 'you' : post.person.real_name), person_path(post.person)
+ = link_to ((current_user.person == post.person)? t('.you') : post.person.real_name), person_path(post.person)
%br
= link_to(how_long_ago(post), object_path(post, :aspect => @aspect))
diff --git a/app/views/albums/_new_album.haml b/app/views/albums/_new_album.haml
index 8a37cb2c03746de7ccffd53ce85d9c932328740c..daefe15f3cf655dfa0d7149e6cd361fb56f74141 100644
--- a/app/views/albums/_new_album.haml
+++ b/app/views/albums/_new_album.haml
@@ -3,7 +3,7 @@
-# the COPYRIGHT file.
-%h1 Add a new album
+%h1=t('.add_a_new_album')
= form_for Album.new do |f|
= f.error_messages
@@ -11,4 +11,4 @@
= f.label :name
= f.text_field :name
= f.hidden_field :to, :value => aspect
- = f.submit 'create', :class => 'button'
+ = f.submit t('.create'), :class => 'button'
diff --git a/app/views/albums/edit.html.haml b/app/views/albums/edit.html.haml
index a4bf3aef656c3b8bf54c5edae4fadd3fe0cef1b1..4dfb2294caa3f27f5ef3dc520517a0e3088663a9 100644
--- a/app/views/albums/edit.html.haml
+++ b/app/views/albums/edit.html.haml
@@ -6,10 +6,10 @@
.back= link_to "⇧ #{@album.name}", @album
%h1.big_text
- = "Editing #{@album.name}"
+ = "#{t('.editing')} #{@album.name}"
.sub_header
- ="updated #{how_long_ago(@album)}"
+ ="#{t('.updated')} #{how_long_ago(@album)}"
- form_for @album do |a|
= a.error_messages
@@ -21,12 +21,12 @@
.photo_edit_block= image_tag photo.url(:thumb_medium)
#submit_block
- = link_to "Cancel", root_path
+ = link_to t('.cancel'), root_path
or
= a.submit
.button.delete
- = link_to 'Delete Album', @album, :confirm => 'Are you sure?', :method => :delete
+ = link_to t('.delete_album'), @album, :confirm => t('.are_you_sure'), :method => :delete
#content_bottom
.back
diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml
index fa4098c180fec72eb1c815a66f0a19c0cdb3f966..af83b53ebbb54a9bd4e09dadb1ddbdf514cf202f 100644
--- a/app/views/albums/index.html.haml
+++ b/app/views/albums/index.html.haml
@@ -10,7 +10,7 @@
});
= content_for :page_title do
- = link_to "â—‚ Home", aspects_path, :aspect => params[:aspect]
+ = link_to "â—‚ #{t('.home')}", aspects_path, :aspect => params[:aspect]
- content_for :left_pane do
= render "shared/aspect_friends"
@@ -19,7 +19,7 @@
%h1
Albums
.right
- = link_to 'New Album', '#new_album_pane', {:class => "button", :id => "add_album_button"}
+ = link_to t('.new_album'), '#new_album_pane', {:class => "button", :id => "add_album_button"}
.yo{:style => "display:none;" }
#new_album_pane
@@ -34,4 +34,4 @@
#content_bottom
.back
- = link_to "⇧ home", root_path
+ = link_to "⇧ #{t('.home')}", root_path
diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml
index 84352322335cbfb8fcb1292fbf43e047bea02d33..7b5e6c8be16b8bf292051d040d770aea58aa5252 100644
--- a/app/views/albums/show.html.haml
+++ b/app/views/albums/show.html.haml
@@ -11,33 +11,32 @@
});
= content_for :page_title do
- = link_to "â—‚ Albums", albums_path(:aspect => @aspect)
+ = link_to "â—‚ #{t('.albums')}", albums_path(:aspect => @aspect)
- content_for :left_pane do
= render "shared/aspect_friends"
- content_for :publish do
+ -if current_user.owns? @album
+ .right
+ =render 'photos/new_photo'
+ = link_to t('.edit_album'), edit_album_path(@album), :class => 'button'
%h1
= @album.name
- ="updated #{how_long_ago(@album)}"
+ ="#{t('.updated')} #{how_long_ago(@album)}"
+
.album_id{:id => @album.id, :style => "display:hidden;"}
-unless current_user.owns? @album
- %h4= "by #{@album.person.real_name}"
+ %h4= "#{t('.by')} #{@album.person.real_name}"
#thumbnails
- for photo in @album_photos
.image_thumb
= link_to (image_tag photo.url(:thumb_medium)), object_path(photo)
- -if current_user.owns? @album
- =render 'photos/new_photo'
#content_bottom
.back
- = link_to "⇧ albums", albums_path
-
- -if current_user.owns? @album
- .right
- = link_to 'Edit Album', edit_album_path(@album), :class => 'button'
+ = link_to "⇧ #{t('.albums')}", albums_path
diff --git a/app/views/aspects/_new_aspect.haml b/app/views/aspects/_new_aspect.haml
index b5bc7ace3fce10d83c4dd75fe01e0e2178fcdf54..9f0b662dd85e6aec01acbc7a7c9b31a79871bb84 100644
--- a/app/views/aspects/_new_aspect.haml
+++ b/app/views/aspects/_new_aspect.haml
@@ -3,10 +3,10 @@
-# the COPYRIGHT file.
-%h1 Add a new aspect
+%h1=t('.add_a_new_aspect')
= form_for Aspect.new do |f|
= f.error_messages
%p
= f.label :name
= f.text_field :name
- = f.submit 'create', :class => 'button'
+ = f.submit t('.create'), :class => 'button'
diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml
index 5ea9cadb31fda44da0fc9cdbed4ff0f2b9c1c8c8..47a68ffeb4bff8103bf449c38a205b9beee51244 100644
--- a/app/views/aspects/index.html.haml
+++ b/app/views/aspects/index.html.haml
@@ -4,7 +4,7 @@
- content_for :page_title do
- = link_to "photos", albums_path(:aspect => @aspect)
+ = link_to t('.photos'), albums_path(:aspect => @aspect)
- content_for :left_pane do
diff --git a/app/views/aspects/manage.html.haml b/app/views/aspects/manage.html.haml
index 8a6ed97ac0a521135e17dd63a00ecf1adb8666f6..af64fcc231b838940dd534f261fd0705f00bb239 100644
--- a/app/views/aspects/manage.html.haml
+++ b/app/views/aspects/manage.html.haml
@@ -8,24 +8,26 @@
= javascript_include_tag 'aspect-edit.js'
- content_for :left_pane do
- %h1
- Requests
+ %h1=t('.requests')
.requests
- %ul
- - 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
+ %ul.dropzone
+ - 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=t('.ignore_remove')
%li.remove
- %ul
+ %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")
+ = link_to(t('.add_a_new_aspect'), "#add_aspect_pane", :id => "add_aspect_button", :class => "new_aspect button", :title => t('.add_a_new_aspect'))
@@ -34,14 +36,16 @@
%li.aspect
.aspect_name
- %h1{:contenteditable => true}= aspect.name
+ %span.edit_name_field
+ %h1{:contenteditable => true}= aspect.name
+ %span.tip click to edit
- .tools
- = link_to "add a new friend", "#add_request_pane_#{aspect.id}", :class => 'add_request_button'
- |
- = link_to "show", aspect_path(aspect)
+ %ul.tools
+ %li= link_to t('.add_a_new_friend'), "#add_request_pane_#{aspect.id}", :class => 'add_request_button'
+ %li= link_to t('.show'), aspect_path(aspect)
+ %li!= remove_link(aspect)
- %ul{:id => aspect.id}
+ %ul.dropzone{:id => aspect.id}
-if aspect.people.size < 1
%li.grey Drag to add people
@@ -52,13 +56,9 @@
%li.person{:id => person.id, :from_aspect_id => aspect.id}
= person_image_tag(person)
.name
- = person.real_name
+ = link_to person.real_name, person
.yo{:style => 'display:none'}
%div{:id => "add_request_pane_#{aspect.id}"}
= render "requests/new_request", :aspect => aspect
-%p
- %br
- = link_to 'Update Aspects', '#', :class => 'button', :id => "move_friends_link"
-
#content_bottom
diff --git a/app/views/aspects/show.html.haml b/app/views/aspects/show.html.haml
index f10ccee74658c7ebb9c7da3609500c0ebbbc3404..d4262f838ccda14e2ca5dca8a82a6553fa06505a 100644
--- a/app/views/aspects/show.html.haml
+++ b/app/views/aspects/show.html.haml
@@ -4,7 +4,7 @@
- content_for :page_title do
- = link_to "photos", albums_path(:aspect => @aspect)
+ = link_to t('.photos'), albums_path(:aspect => @aspect)
- content_for :left_pane do
= render "shared/aspect_friends"
diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml
index 6b6c1dab5eb6d87d6a870a707d15d5de867ff9ad..4fd46eb56c89f10d5e9dd757106839be04033801 100644
--- a/app/views/comments/_comment.html.haml
+++ b/app/views/comments/_comment.html.haml
@@ -7,6 +7,6 @@
= person_image_tag(post.person)
%span.from
= link_to post.person.real_name, post.person
- = auto_link post.text
+ = post.text
%div.time
- = "#{time_ago_in_words(post.updated_at)} ago"
+ = "#{time_ago_in_words(post.updated_at)} #{t('.ago')}"
diff --git a/app/views/comments/_new_comment.html.haml b/app/views/comments/_new_comment.html.haml
index e998d98b76f44442cce1755bb238f6d047fbb222..a4268082d8844d4aacfe532ba0bbcb49e5dbba90 100644
--- a/app/views/comments/_new_comment.html.haml
+++ b/app/views/comments/_new_comment.html.haml
@@ -9,4 +9,4 @@
= f.text_area :text, :rows => 1, :id => "comment_text_on_#{post.id}", :class => "comment_box"
= f.hidden_field :post_id, :value => post.id
%p{:style => "text-align:right;"}
- = f.submit "Comment", :class => "comment_submit button"
+ = f.submit t('.comment'), :class => "comment_submit button"
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index 1840d7acc2bea61498a8c0acf2d7bc793f982a66..a2de719b59676cdcbee875a51cee3db4078b0b5a 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -1,10 +1,16 @@
+%h1
+ This is a technology preview, do not provide any private information.
+%h3
+ your account may be deleted until we move into a more stable development period.
+%h3
+ USE AT YOUR OWN RISK!!
= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
#user
%p.username
= f.label :username
= f.text_field :username
%p.user_network
- ="@#{request.host}"
+ ="@#{APP_CONFIG[:terse_pod_url]}"
%p
= f.label :password
@@ -14,6 +20,7 @@
/ = f.check_box :remember_me
/ = f.label :remember_me
= f.submit "Sign in"
+ = link_to "Have a problem? Find an answer here", 'http://diaspora.shapado.com/'
%p
= render :partial => "devise/shared/links"
diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
index 483621625e3e0efd430ba17b5da0e298d8537326..33af68cce8e3fc3caffe46129e56d1be7a614f42 100644
--- a/app/views/js/_websocket_js.haml
+++ b/app/views/js/_websocket_js.haml
@@ -9,7 +9,7 @@
$(document).ready(function(){
function debug(str){ $("#debug").append("<p>" + str); };
- ws = new WebSocket("ws://#{request.host}:8080/#{CGI::escape(current_user.id.to_s)}");
+ ws = new WebSocket("ws://#{request.host}:#{APP_CONFIG[:socket_port]}/#{CGI::escape(current_user.id.to_s)}");
//Attach onmessage to websocket
ws.onmessage = function(evt) {
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 4a3ec2dbb21d31304a3fb8222ce6e6923bd5ce5f..7a48d7ed708149056550c99555336a1fd517722b 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -50,8 +50,8 @@
= text_field_tag 'q'
%li= link_to current_user.real_name, current_user.person
- %li= link_to "edit profile", edit_user_path(current_user)
- %li= link_to "logout", destroy_user_session_path
+ %li= link_to t('.edit_profile'), edit_user_path(current_user)
+ %li= link_to t('.logout.'), destroy_user_session_path
= render "shared/aspect_nav"
= render "shared/sub_header"
diff --git a/app/views/people/_person.html.haml b/app/views/people/_person.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..7e22a5570b274f5534d48ed2d5b2543db2b45067
--- /dev/null
+++ b/app/views/people/_person.html.haml
@@ -0,0 +1,27 @@
+-# 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_path(person)
+
+ .info
+ = person.diaspora_handle
+
+ .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 =t('.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 t('.add_friend')
diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml
index 57bd5b56019e714a3554436c443a07805db7901f..2cd1dc4a7b3fec973e4942942a53d70fce0ba180 100644
--- a/app/views/people/index.html.haml
+++ b/app/views/people/index.html.haml
@@ -8,43 +8,18 @@
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
\.
-= (@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"
+%ul#stream
+ - for person in @people
+ = render 'people/person', :person => person
+
+= will_paginate @people
diff --git a/app/views/people/new.html.haml b/app/views/people/new.html.haml
index b2203eb3f9081c04f48ccae208b56ac768b154f5..25821ed373b12282e6a5adb2c81114fb79760602 100644
--- a/app/views/people/new.html.haml
+++ b/app/views/people/new.html.haml
@@ -3,7 +3,7 @@
-# the COPYRIGHT file.
-- title "New Person"
+- title=t('.new_person')
= form_for @person do |f|
= f.error_messages
@@ -29,4 +29,4 @@
= f.submit
-%p= link_to "Back to List", people_path
+%p= link_to t('.back_to_list'), people_path
diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml
index 4f76f18cff0bdcb0aa4c56c56f045d56c0ed220f..23e6ea64dad85a05958088c030f075b1fae4bb60 100644
--- a/app/views/people/show.html.haml
+++ b/app/views/people/show.html.haml
@@ -4,7 +4,7 @@
- content_for :page_title do
- = @person.real_name
+ profile
- content_for :left_pane do
#profile
@@ -13,19 +13,19 @@
%ul
-unless @posts.first.nil?
%li
- %i= "last seen: #{how_long_ago(@posts.first)}"
+ %i= t(".last_seen",:how_long_ago => how_long_ago(@posts.first))
- if @person != current_user.person && current_user.friends.include?(@person)
%li
- %i= "friends since: #{how_long_ago(@person)}"
+ %i= t(".friends_since",:how_long_ago => how_long_ago(@person))
%li
= form_tag move_friend_path
= select :to, :to, @aspects_dropdown_array, :selected => @aspects_with_person.first.id
= hidden_field_tag :from, :from, :value => @aspects_with_person.first.id
= hidden_field_tag :friend_id, :friend_id, :value => @person.id
- = submit_tag "save"
+ = submit_tag t('.save')
- if @person != current_user.person && current_user.friends.include?(@person)
- = link_to 'remove friend', @person, :confirm => 'Are you sure?', :method => :delete, :class => "button"
+ = link_to t('.remove_friend'), @person, :confirm => t('.are_you_sure'), :method => :delete, :class => "button"
.span-20.last
@@ -36,4 +36,4 @@
= render type_partial(post), :post => post unless post.class == Album
= will_paginate @posts
- else
- %h3 no posts to display!
+ %h3=t('no posts to display!')
diff --git a/app/views/photos/_new_photo.haml b/app/views/photos/_new_photo.haml
index f6777fa4ae98ddf732dd2e5aa8e45bc795f73a8e..abb8cf5282c47a6f0381ae9913c056cb24c7cdea 100644
--- a/app/views/photos/_new_photo.haml
+++ b/app/views/photos/_new_photo.haml
@@ -8,8 +8,8 @@
var uploader = new qq.FileUploader({
element: document.getElementById('file-upload'),
params: {'album_id' : "#{@album.id}"},
- allowedExtensions: ['jpg', 'jpeg', 'png'],
- action: "/photos"
+ allowedExtensions: ['jpg', 'jpeg', 'png', 'gif'],
+ action: "#{photos_path}"
});
}
window.onload = createUploader;
diff --git a/app/views/photos/_photo.haml b/app/views/photos/_photo.haml
index f0a3f2c830bb6966f6858fd0447c9e38c3e3c993..ae8829c6142e135fc86b51fe9383f22d57f86b0e 100644
--- a/app/views/photos/_photo.haml
+++ b/app/views/photos/_photo.haml
@@ -11,7 +11,7 @@
%span.from
= link_to post.person.real_name, post.person
%b
- posted a new photo to
+ =t('.posted_a_new_photo_to')
= link_to post.album.name, object_path(post.album)
%br
@@ -21,5 +21,5 @@
.info
= link_to(how_long_ago(post), photo_path(post))
\--
- = link_to "show comments (#{post.comments.count})", '#', :class => "show_post_comments"
+ = link_to "#{t('.show_comments')} (#{post.comments.count})", '#', :class => "show_post_comments"
= render "comments/comments", :post => post
diff --git a/app/views/photos/edit.html.haml b/app/views/photos/edit.html.haml
index f695f850d05b9c760fc89fba19acb6c62cf5d5cb..1f36ae99fbf16ba29f2fbced4ba4b7a31a379ff2 100644
--- a/app/views/photos/edit.html.haml
+++ b/app/views/photos/edit.html.haml
@@ -6,7 +6,7 @@
%h1.big_text
.back
= link_to "⇧ #{@album.name}", album_path(@album)
- = "Editing #{@photo.image}"
+ = "#{t('.editing')} #{@photo.image}"
%div{:id => @photo.id}
@@ -22,5 +22,5 @@
= link_to "⇧ #{@album.name}", album_path(@album)
-if current_user.owns? @album
.button.right
- = link_to 'Delete Photo', @photo, :confirm => 'Are you sure?', :method => :delete
+ = link_to t('.delete_photo'), @photo, :confirm => t('.are_you_sure'), :method => :delete
diff --git a/app/views/photos/new.html.haml b/app/views/photos/new.html.haml
index a8814d7704306b04308d604c4803a73f9bf76503..1fdf71a8451743168eede304294a02b8507c0d60 100644
--- a/app/views/photos/new.html.haml
+++ b/app/views/photos/new.html.haml
@@ -3,12 +3,12 @@
-# the COPYRIGHT file.
-- title "New Photo"
+- title t('.new_photo')
= form_for( @photo, :html => {:multipart => true}) do |f|
= f.error_messages
%p
= f.file_field :image
- = f.submit 'post it!', :class => 'button'
+ = f.submit t('.post_it'), :class => 'button'
-%p= link_to "Back to List", photos_path
+%p= link_to t('.back_to_list'), photos_path
diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index 654bea89251ab93b41604f549295b130f7a67e68..21ce721811e9f84c7107b8b68bda410f4818f825 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -25,15 +25,15 @@
%h1
= @photo.image
- = link_to "<< prev", url_to_prev(@photo, @album)
+ = link_to "<< #{t('.prev')}", url_to_prev(@photo, @album)
|
- = link_to "full size", @photo.url
+ = link_to "#{t('.full_size')}", @photo.url
|
- = link_to "next >>", url_to_next(@photo, @album)
+ = link_to "#{t('.next')} >>", url_to_next(@photo, @album)
.right
-if current_user.owns? @album
- = link_to 'Edit Photo', edit_photo_path(@photo), :class => "button"
+ = link_to t('.edit_photo'), edit_photo_path(@photo), :class => "button"
%div{:id => @photo.id}
@@ -48,9 +48,9 @@
-if current_user.owns? @album
.right
- = link_to 'Delete Photo', @photo, :confirm => 'Are you sure?', :method => :delete, :class => 'button'
+ = link_to t('.delete_photo'), @photo, :confirm => t('.are_you_sure'), :method => :delete, :class => 'button'
%h4{:class => "show_post_comments"}
- = "comments (#{@photo.comments.count})"
+ = "#{t('.comments')} (#{@photo.comments.count})"
= render "comments/comments", :post => @photo
diff --git a/app/views/posts/_debug.haml b/app/views/posts/_debug.haml
index 27d508cf25264e310c7cacf307fd28a5ffd66783..17d7baad8340a204dc116c6fce51c8f4db476bf9 100644
--- a/app/views/posts/_debug.haml
+++ b/app/views/posts/_debug.haml
@@ -7,6 +7,9 @@
%h5 DEBUG INFO
#debug_more{ :style => "display:none;" }
%ul
+ %li
+ %b
+ = GIT_INFO
%li
%b params
= params.inspect
@@ -14,3 +17,4 @@
%b websocket status
#debug
.msg
+
diff --git a/app/views/registrations/new.html.haml b/app/views/registrations/new.html.haml
index eefa9451961e0cfea547c37e906587671b8d6677..f837c92de2db94090b87ae17e12fd48027bfec4c 100644
--- a/app/views/registrations/new.html.haml
+++ b/app/views/registrations/new.html.haml
@@ -2,7 +2,6 @@
= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f|
- = f.hidden_field :url, :value => request.host
%p
= f.label :username
= f.text_field :username
@@ -17,8 +16,6 @@
= f.password_field :password_confirmation
= f.fields_for :person do |p|
- = p.hidden_field :url, :value => request.host
-
= p.fields_for :profile do |pr|
%p
= pr.label :first_name
@@ -27,5 +24,5 @@
= pr.label :last_name
= pr.text_field :last_name
- = f.submit "Sign up"
+ = f.submit t('.sign_up')
= render :partial => "devise/shared/links"
diff --git a/app/views/requests/_new_request.haml b/app/views/requests/_new_request.haml
index b7e5819f69cbf5534b2013577e9597b988b488de..70c204e7cb5a9e0ee9001f8484df58c092fb74e0 100644
--- a/app/views/requests/_new_request.haml
+++ b/app/views/requests/_new_request.haml
@@ -4,18 +4,18 @@
%h1
- Add a new friend to
+ =t('.add_a_new_friend_to')
%i= aspect.name
= form_for Request.new do |f|
= f.error_messages
- Enter a Diaspora username:
+ =t('.enter_a_diaspora_username')
%br
- %i= "Your Diaspora username is: #{current_user.diaspora_handle}"
+ %i= t '.your_diaspora_username_is', :diaspora_handle => current_user.diaspora_handle
%p
- = f.label :destination_url, "Friend's username"
+ = f.label :destination_url, t(".friends_username")
= f.text_field :destination_url
= f.hidden_field :aspect_id, :value => aspect.id
= f.submit
diff --git a/app/views/shared/_aspect_friends.haml b/app/views/shared/_aspect_friends.haml
index 6ab286a819b40c3ec41f4cada401265a2495e258..5e1dfe213e9e8bfad8ae6e304e19361e60a9d15f 100644
--- a/app/views/shared/_aspect_friends.haml
+++ b/app/views/shared/_aspect_friends.haml
@@ -16,5 +16,5 @@
= render "requests/new_request", :aspect => @aspect
-else
.clear
- = link_to "add friends", aspects_manage_path
+ = link_to t('.add_friends'), aspects_manage_path
diff --git a/app/views/shared/_aspect_nav.haml b/app/views/shared/_aspect_nav.haml
index b61def9f51faa0d322cfe55ccc46db086b89794a..8e900e42d6b35e35cf86288001691c6706049c8f 100644
--- a/app/views/shared/_aspect_nav.haml
+++ b/app/views/shared/_aspect_nav.haml
@@ -6,15 +6,15 @@
#aspect_nav
%ul
- for aspect in @aspects
- %li{:id => aspect.id, :class => ("selected" if current_aspect?(aspect))}
+ %li{:class => ("selected" if current_aspect?(aspect))}
= link_for_aspect aspect
%ul{ :style => "position:absolute;right:0;bottom:0.01em;"}
%li{:class => ("selected" if @aspect == :all)}
- = link_to "All Aspects", root_url
+ = link_to t('.all_aspects'), root_url
%li{ :style => "margin-right:0;", :class => ("selected" if @aspect == :manage)}
- = link_to ( (@request_count == 0)? "manage" : "manage (#{@request_count})"), {:controller => :aspects, :action => :manage}, :class => "edit_aspect_button", :class => new_request(@request_count), :title => "Manage your Aspects"
+ = link_to ( (@request_count == 0)? t('.manage') : "#{t('.manage')} (#{@request_count})"), {:controller => :aspects, :action => :manage}, :class => "edit_aspect_button", :class => new_request(@request_count), :title => t('.manage_your_aspects')
.yo{ :style => "display:none;"}
#add_aspect_pane
diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml
index 4645ec65c6d888e8b302da8a2d7296fbba9d2f94..040d3e3c2b912e5fd892a283dee8d25eb3999a37 100644
--- a/app/views/shared/_publisher.haml
+++ b/app/views/shared/_publisher.haml
@@ -10,7 +10,7 @@
= f.error_messages
%p
%label{:for => "status_message_message"} Message
- = f.text_area :message, :rows => 2
+ = f.text_area :message, :rows => 2, :value => params[:prefill]
%ul.aspect_selector{ :style => "display:none;"}
going to...
@@ -19,4 +19,4 @@
= check_box_tag("aspect_ids[]", aspect.id, @aspect == :all || current_aspect?(aspect) )
= aspect.name
- = f.submit "Share"
+ = f.submit t('.share')
diff --git a/app/views/shared/_reshare.haml b/app/views/shared/_reshare.haml
new file mode 100644
index 0000000000000000000000000000000000000000..0b4120d5216b5ffd2391cf4558ccd4f239d96f18
--- /dev/null
+++ b/app/views/shared/_reshare.haml
@@ -0,0 +1,27 @@
+-# Copyright (c) 2010, Diaspora Inc. This file is
+-# licensed under the Affero General Public License version 3. See
+-# the COPYRIGHT file.
+
+
+
+:javascript
+ $(".reshare_button").toggle(function(e){
+ e.preventDefault();
+ $(this).parent(".reshare_pane").children(".reshare_box").fadeIn(200);
+ }, function(e) {
+ e.preventDefault();
+ $(this).parent(".reshare_pane").children(".reshare_box").fadeOut(200);
+ });
+
+.reshare_pane
+ %span.reshare_button
+ = link_to "Reshare", "#"
+
+ %ul.reshare_box
+ - for aspect in current_user.aspects_with_post( post.id )
+
+ %li.currently_sharing= aspect.name
+
+ - for aspect in current_user.aspects
+ - unless aspect.posts.include? post
+ %li.aspect_to_share= link_to aspect, :controller => "aspects", :action => "show", :id => aspect.id, :prefill => post.message
diff --git a/app/views/shared/_sub_header.haml b/app/views/shared/_sub_header.haml
index badf8783d75bfa433cab4b054ba2e8e355882f20..d8ad6c603e9179c31556bdfe56c1a73494ce3cf8 100644
--- a/app/views/shared/_sub_header.haml
+++ b/app/views/shared/_sub_header.haml
@@ -7,9 +7,9 @@
- else
%h1
- if @aspect == :all
- = link_to "All Aspects", root_path
+ = link_to t('.all_aspects'), root_path
- elsif @aspect == :manage
- = link_to "Manage Aspects", root_path
+ = link_to t('.manage_aspects'), root_path
- else
= link_to @aspect.name, @aspect
diff --git a/app/views/status_messages/_new_status_message.haml b/app/views/status_messages/_new_status_message.haml
index 329e72d660198de985e3e4d8716729af3fcee838..b515dadffaf37e1eb4c04e011c39103c7a6274f3 100644
--- a/app/views/status_messages/_new_status_message.haml
+++ b/app/views/status_messages/_new_status_message.haml
@@ -6,5 +6,5 @@
= form_for StatusMessage.new, :remote => true do |f|
= f.error_messages
%p
- = f.text_field :message, :value => "tell me something good"
- = f.submit 'oh yeah!', :class => 'button'
+ = f.text_field :message, :value => t('.tell_me_something_good')
+ = f.submit t('.oh_yeah'), :class => 'button'
diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml
index a22098afa75d35429eb18cd1973a138ea62069c0..4d73f42519cdd05abd224072fe937ad3e952619f 100644
--- a/app/views/status_messages/_status_message.html.haml
+++ b/app/views/status_messages/_status_message.html.haml
@@ -10,16 +10,16 @@
.content
%span.from
= link_to post.person.real_name, post.person
- = auto_link sanitize post.message
+ = post.message
.info
- = link_to(how_long_ago(post), object_path(post))
+ %span.time= link_to(how_long_ago(post), object_path(post))
\--
- = link_to "show comments (#{post.comments.count})", '#', :class => "show_post_comments"
-
- = render "comments/comments", :post => post
+ = link_to "#{t('.show_comments')} (#{post.comments.count})", '#', :class => "show_post_comments"
+ = render "comments/comments", :post => post
- if current_user.owns?(post)
.destroy_link
- = link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "delete"
+ = link_to t('.delete'), status_message_path(post), :confirm => t('.are_you_sure'), :method => :delete, :remote => true, :class => "delete"
+ = render "shared/reshare", :post => post, :current_user => current_user
diff --git a/app/views/status_messages/show.html.haml b/app/views/status_messages/show.html.haml
index 358c2244bd3c575ea697ca7e2d3bd063a1fde141..ae4ece073bcf9540e73b2bfeae35e2681edf86e7 100644
--- a/app/views/status_messages/show.html.haml
+++ b/app/views/status_messages/show.html.haml
@@ -2,21 +2,13 @@
-# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file.
-
-- title "Status Message"
-
-%p
- %strong Message:
+%h1
+ = link_to @status_message.person.real_name, @status_message.person
= @status_message.message
-
-%p
- %strong Owner:
- = @status_message.person.real_name
-%h4= "comments (#{@status_message.comments.count})"
+%h4= "#{t('.comments')} (#{@status_message.comments.count})"
= render "comments/comments", :post => @status_message
%p
- = link_to "Destroy", @status_message, :confirm => 'Are you sure?', :method => :delete
- |
- = link_to "View All", status_messages_path
+ - if current_user.owns? @status_message
+ = link_to t('.destroy'), @status_message, :confirm => t('are_you_sure?'), :method => :delete
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index cddec8d772c2a5009ce5492a47a5f68d9f248efd..25668776f903abd7ab4b361bf8ed34c6c81edb69 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -4,8 +4,7 @@
- content_for :publish do
- %h1
- Editing profile
+ %h1="#{t('.editing_profile')}"
- content_for :left_pane do
\.
@@ -15,13 +14,13 @@
= f.fields_for :profile do |p|
- %h3 Picture
+ %h3="#{t('.picture')}"
%div#image_picker
- = p.hidden_field :image_url, :value => (@profile.image_url.sub(@user.url,'/') if @profile.image_url), :id => 'image_url_field'
+ = p.hidden_field :image_url, :value => (@profile.image_url if @profile.image_url), :id => 'image_url_field'
- unless @photos.nil? || @photos.empty?
- for photo in @photos
- - if @profile.image_url && (photo.url(:thumb_medium) == @profile.image_url.sub(@user.url,'/'))
+ - if @profile.image_url && @profile.image_url.include?(photo.url(:thumb_medium))
%div.small_photo{:id => photo.url(:thumb_medium), :class=>'selected'}
= check_box_tag 'checked_photo', true, true
= link_to image_tag(photo.url(:thumb_medium)), "#"
@@ -31,19 +30,19 @@
= link_to image_tag(photo.url(:thumb_medium)), "#"
- else
- You don't have any photos! Go to the
- = link_to "albums", albums_path(:aspect => 'all')
- page to upload some.
+ =t('.you_dont_have_any_photos')
+ = link_to t('.albums'), albums_path(:aspect => 'all')
+ =t('.page_to_upload_some')
=will_paginate @photos
%br
- %h3 Info
+ %h3="#{t('.info')}"
%p
%b
- DIASPORA USERNAME:
+ ="#{t('.diaspora_username')}:"
= @user.diaspora_handle
%p
@@ -53,15 +52,11 @@
= p.label :last_name
= p.text_field :last_name, :value => @profile.last_name
- %p
- = f.label :email
- = f.text_field :email
-
#submit_block
- = link_to "Cancel", root_path
+ = link_to t('.cancel'), root_path
or
- = f.submit "Update Profile"
+ = f.submit t('.update_profile')
#content_bottom
.back
- = link_to "⇧ home", root_path
+ = link_to "⇧ #{t('.home')}", root_path
diff --git a/config/app_config.yml b/config/app_config.yml.example
similarity index 60%
rename from config/app_config.yml
rename to config/app_config.yml.example
index 0a206c366b678ab021fff66c06d83fa2e772b155..75568dd1143c0480ac74de5734d0606ed591f651 100644
--- a/config/app_config.yml
+++ b/config/app_config.yml.example
@@ -3,21 +3,21 @@
# the COPYRIGHT file.
-
-development:
+default:
+ pod_url: "http://example.org/"
debug: false
socket_debug : false
+ socket_host: 0.0.0.0
socket_port: 8080
+ socket_collection_name: 'websocket'
pubsub_server: 'https://pubsubhubbub.appspot.com/'
+ mongo_host: 'localhost'
+ mongo_port: 27017
+
+development:
test:
- debug: false
- socket_debug : false
+ pod_url: "http://example.org/"
socket_port: 8081
- pubsub_server: 'https://pubsubhubbub.appspot.com/'
production:
- debug: false
- socket_debug : false
- socket_port: 8080
- pubsub_server: 'https://pubsubhubbub.appspot.com/'
diff --git a/config/application.rb b/config/application.rb
index 7cfa694b25c431ca6a42ca80b72c04572a030669..79302a2894fa8c92e17dd1d1d683e4e934ddec9e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -6,9 +6,9 @@
require File.expand_path('../boot', __FILE__)
-require "action_controller/railtie"
-require "action_mailer/railtie"
-require "active_resource/railtie"
+require 'action_controller/railtie'
+require 'action_mailer/railtie'
+require 'active_resource/railtie'
# If you have a Gemfile, require the gems listed there, including any gems
# you've limited to :test, :development, or :production.
Bundler.require(:default, Rails.env) if defined?(Bundler)
@@ -51,5 +51,6 @@ module Diaspora
# Configure sensitive parameters which will be filtered from the log file.
config.filter_parameters += [:password]
+ config.filter_parameters += [:xml]
end
end
diff --git a/config/deploy.rb b/config/deploy.rb
index b4870f94dee4754448ed27a87ac884be4df629d3..2f8065134d50f494dc3e5658cdeb69c586661b76 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -39,8 +39,6 @@ backers.each{ |backer|
# Start Nginx
after "deploy:cold" do
- run("nginx stop")
- run("killall nginx")
#run("nginx")
end
@@ -55,9 +53,19 @@ namespace :deploy do
run "ln -s -f #{shared_path}/bundle #{current_path}/vendor/bundle"
end
+ task :symlink_config do
+ run "touch #{shared_path}/app_config.yml"
+ run "ln -s -f #{shared_path}/app_config.yml #{current_path}/config/app_config.yml"
+ end
+
task :start do
start_mongo
start_thin
+ start_websocket
+ end
+
+ task :start_websocket do
+ run("cd #{current_path} && bundle exec ruby ./script/websocket_server.rb > /dev/null&")
end
task :start_mongo do
@@ -147,4 +155,4 @@ namespace :db do
end
-after "deploy:symlink", "deploy:symlink_images", "deploy:symlink_bundle"
+after "deploy:symlink", "deploy:symlink_images", "deploy:symlink_bundle", 'deploy:symlink_config'
diff --git a/config/deploy_config.yml b/config/deploy_config.yml
index c653b6565087d15820a3f67f01a2b06f2b3c5052..9bd7a6b963929a0498828740cc83f01d6cb7e9ae 100644
--- a/config/deploy_config.yml
+++ b/config/deploy_config.yml
@@ -7,7 +7,7 @@
cross_server:
deploy_to: '/usr/local/app/diaspora'
user: 'root'
- repo: 'git@github.com:diaspora/diaspora.git'
+ repo: 'git://github.com/diaspora/diaspora.git'
branch: 'master'
default_env: 'development'
servers:
diff --git a/config/environment.rb b/config/environment.rb
index dc11087dd31808e3d7ba965d0241e419d33ff202..385a96651defc4938ac3b6f94ed3bea5094d6bf9 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -7,6 +7,7 @@
# Load the rails application
require File.expand_path('../application', __FILE__)
Haml::Template.options[:format] = :html5
+Haml::Template.options[:escape_html] = true
# Initialize the rails application
Diaspora::Application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 713cba8c8e0704d12befa71f517d3cce5391cea7..44ba8e55efca95cc676bb9cec65bcb3585ee4329 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -21,8 +21,19 @@ Diaspora::Application.configure do
config.action_controller.perform_caching = false
# Don't care if the mailer can't send
- config.action_mailer.raise_delivery_errors = false
+ config.action_mailer.raise_delivery_errors = true
config.active_support.deprecation = :log
config.middleware.use MongoMapper::ClearDevMemory
#config.threadsafe!
+ config.action_mailer.delivery_method = :smtp
+ config.action_mailer.default_url_options = {:host => 'localhost:3000'}
+ config.action_mailer.smtp_settings = {
+ :address => 'smtp.gmail.com',
+ :port => 587,
+ :domain => 'mail.joindiaspora.com',
+ :authentication => 'plain',
+ :user_name => 'diaspora-pivots@joindiaspora.com',
+ :password => "xy289|]G+R*-kA",
+ :enable_starttls_auto => true
+ }
end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 1267a96a3b801975d02270bccc82d18b529a9cac..3207c627d934257211e452da1d27c2e64889c02b 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -15,12 +15,12 @@ Diaspora::Application.configure do
config.action_controller.perform_caching = true
# Specifies the header that your server uses for sending files
- config.action_dispatch.x_sendfile_header = "X-Sendfile"
+ #config.action_dispatch.x_sendfile_header = "X-Sendfile"
config.active_support.deprecation = :notify
# For nginx:
- # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+ config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
# If you have no front-end server that supports something like X-Sendfile,
# just comment this out and Rails will serve the files
@@ -36,7 +36,7 @@ Diaspora::Application.configure do
# Disable Rails's static asset server
# In production, Apache or nginx will already do this
- config.serve_static_assets = true
+ #config.serve_static_assets = true
# Enable serving of images, stylesheets, and javascripts from an asset server
# config.action_controller.asset_host = "http://assets.example.com"
@@ -44,12 +44,20 @@ Diaspora::Application.configure do
# Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false
- # Enable threaded mode
- # config.threadsafe!
-
# Enable locale fallbacks for I18n (makes lookups for any locale fall back to
# the I18n.default_locale when a translation can not be found)
config.i18n.fallbacks = true
config.threadsafe!
+ config.action_mailer.delivery_method = :smtp
+ config.action_mailer.default_url_options = {:host => 'pivots.joindiaspora.com'}
+ config.action_mailer.smtp_settings = {
+ :address => 'smtp.gmail.com',
+ :port => 587,
+ :domain => 'mail.joindiaspora.com',
+ :authentication => 'plain',
+ :user_name => 'diaspora-pivots@joindiaspora.com',
+ :password => "xy289|]G+R*-kA",
+ :enable_starttls_auto => true
+ }
end
diff --git a/config/initializers/_load_app_config.rb b/config/initializers/_load_app_config.rb
new file mode 100644
index 0000000000000000000000000000000000000000..e739941e9990933924bda41ab06598115f4200a2
--- /dev/null
+++ b/config/initializers/_load_app_config.rb
@@ -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.
+
+def load_config_yaml filename
+ YAML.load(File.read(filename))
+end
+
+if File.exist? "#{Rails.root}/config/app_config.yml"
+ all_envs = load_config_yaml "#{Rails.root}/config/app_config.yml"
+ all_envs = load_config_yaml "#{Rails.root}/config/app_config.yml.example" unless all_envs
+else
+ puts "WARNING: No config/app_config.yml found! Look at config/app_config.yml.example for help."
+ all_envs = load_config_yaml "#{Rails.root}/config/app_config.yml.example"
+end
+
+if all_envs[Rails.env.to_s]
+ APP_CONFIG = all_envs['default'].merge(all_envs[Rails.env.to_s]).symbolize_keys
+else
+ APP_CONFIG = all_envs['default'].symbolize_keys
+end
+
+APP_CONFIG[:terse_pod_url] = APP_CONFIG[:pod_url].gsub(/(https?:|www\.)\/\//, '')
+APP_CONFIG[:terse_pod_url].chop! if APP_CONFIG[:terse_pod_url][-1, 1] == '/'
+
+puts "WARNING: Please modify your app_config.yml to have a proper pod_url!" if APP_CONFIG[:terse_pod_url] == "example.org" && Rails.env != :test
diff --git a/config/initializers/_mongo.rb b/config/initializers/_mongo.rb
index 0409d6d71bf3fd87629c8ef117153bf5e72f6fc7..8948a0c5979ffa311a066d37680d0c107e21f0d8 100644
--- a/config/initializers/_mongo.rb
+++ b/config/initializers/_mongo.rb
@@ -5,7 +5,7 @@
if ENV['MONGOHQ_URL']
MongoMapper.config = {RAILS_ENV => {'uri' => ENV['MONGOHQ_URL']}}
else
- MongoMapper.connection = Mongo::Connection.new('localhost', 27017)
+ MongoMapper.connection = Mongo::Connection.new(APP_CONFIG['mongo_host'], APP_CONFIG['mongo_port'])
end
MongoMapper.database = "diaspora-#{Rails.env}"
@@ -16,3 +16,4 @@ if defined?(PhusionPassenger)
end
end
+Magent.connection = Mongo::Connection.new(APP_CONFIG['mongo_host'], APP_CONFIG['mongo_port'])
diff --git a/config/initializers/load_app_config.rb b/config/initializers/git_info.rb
similarity index 54%
rename from config/initializers/load_app_config.rb
rename to config/initializers/git_info.rb
index 1a5094d9bb13360017fd9caa9df4449a799f4709..a6d767aa46bcb11bd7be2e299c14ce7621287aeb 100644
--- a/config/initializers/load_app_config.rb
+++ b/config/initializers/git_info.rb
@@ -3,5 +3,4 @@
# the COPYRIGHT file.
-raw_config = File.read("#{Rails.root}/config/app_config.yml")
-APP_CONFIG = YAML.load(raw_config)[Rails.env].symbolize_keys
+GIT_INFO = `git show`
diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb
new file mode 100644
index 0000000000000000000000000000000000000000..dd607a2737c5678d07a2a08db57f458d3fa70d01
--- /dev/null
+++ b/config/initializers/locale.rb
@@ -0,0 +1,8 @@
+# Copyright (c) 2010, Diaspora Inc. This file is
+# licensed under the Affero General Public License version 3. See
+# the COPYRIGHT file.
+
+
+# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+I18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
+I18n.default_locale = :en
\ No newline at end of file
diff --git a/config/initializers/socket.rb b/config/initializers/socket.rb
deleted file mode 100644
index bbeee1443176b72e812ed998d4798d70234e7afb..0000000000000000000000000000000000000000
--- a/config/initializers/socket.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file.
-
-
-require 'em-websocket'
-require 'eventmachine'
-require File.expand_path("../../../lib/diaspora/websocket", __FILE__)
- EM.next_tick {
- Diaspora::WebSocket.initialize_channels
-
- EventMachine::WebSocket.start(
- :host => "0.0.0.0",
- :port => APP_CONFIG[:socket_port],
- :debug =>APP_CONFIG[:socket_debug]) do |ws|
- ws.onopen {
-
- sid = Diaspora::WebSocket.subscribe(ws.request['Path'].gsub('/',''), ws)
-
- ws.onmessage { |msg| SocketsController.new.incoming(msg) }
-
- ws.onclose { Diaspora::WebSocket.unsubscribe(ws.request['Path'].gsub('/',''), sid) }
- }
- end
- }
-
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
deleted file mode 100644
index 09d3ac62c691644b50b994ba0067b4b4d9612ed5..0000000000000000000000000000000000000000
--- a/config/locales/devise.en.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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: "not found"
- already_confirmed: "was already confirmed"
- not_locked: "was not locked"
-
- devise:
- failure:
- unauthenticated: 'You need to sign in or sign up before continuing.'
- unconfirmed: 'You have to confirm your account before continuing.'
- locked: 'Your account is locked.'
- invalid: 'Invalid email or password.'
- invalid_token: 'Invalid authentication token.'
- timeout: 'Your session expired, please sign in again to continue.'
- inactive: 'Your account was not activated yet.'
- sessions:
- signed_in: 'Signed in successfully.'
- signed_out: 'Signed out successfully.'
- passwords:
- send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
- updated: 'Your password was changed successfully. You are now signed in.'
- confirmations:
- send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
- confirmed: 'Your account was successfully confirmed. You are now signed in.'
- registrations:
- signed_up: 'You have signed up successfully. If enabled, a confirmation was sent to your e-mail.'
- updated: 'You updated your account successfully.'
- destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
- unlocks:
- send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
- unlocked: 'Your account was successfully unlocked. You are now signed in.'
- mailer:
- confirmation_instructions: 'Confirmation instructions'
- reset_password_instructions: 'Reset password instructions'
- unlock_instructions: 'Unlock Instructions'
diff --git a/config/locales/devise/devise.cs.yml b/config/locales/devise/devise.cs.yml
new file mode 100644
index 0000000000000000000000000000000000000000..34d9eb7c1ef51ccb18143325d6e06f2b0dd9a30a
--- /dev/null
+++ b/config/locales/devise/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.
+
+
+cs:
+ 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Ã'
diff --git a/config/locales/devise/devise.cy.yml b/config/locales/devise/devise.cy.yml
new file mode 100644
index 0000000000000000000000000000000000000000..5d6d6049a3e6690ed2dbce6667bddae366a3bf8a
--- /dev/null
+++ b/config/locales/devise/devise.cy.yml
@@ -0,0 +1,42 @@
+# Copyright (c) 2010, Diaspora Inc. This file is
+# licensed under the Affero General Public License version 3. See
+# the COPYRIGHT file.
+
+
+cy:
+ errors:
+ messages:
+ not_found: "ni chanfuwyd"
+ already_confirmed: "cadarnhawyd eisioes"
+ not_locked: "heb ei gloi"
+
+ devise:
+ failure:
+ unauthenticated: "Mae angen i chi arwyddo i mewn neu ymuno cyn parhau."
+ unconfirmed: "Rhaid i chi gadarnhau eich cyfrif cyn parhau."
+ locked: "Mae eich cyfrif wedi'i gloi."
+ invalid: "E-bost neu gyfrinair annilys."
+ invalid_token: "Tocyn dilysu annilys."
+ timeout: "Mae eich sesiwn wedi dod i ben, arwyddwch i mewn eto i barhau."
+ inactive: "Nid yw eich cyfrif wedi'i actifadu."
+ sessions:
+ signed_in: "Arwyddwyd i fewn yn llwyddiannus."
+ signed_out: "Arwyddwyd allan yn llwyddiannus."
+ passwords:
+ send_instructions: "Byddwch yn derbyn e-bost â chyfarwyddiadau ar sut i gadarnhau eich cyfrif mewn ychydig funudau."
+ updated: "Newidiwyd eich cyfrinair yn llwyddiannus. Rydych chi wedi arwyddo i fewn."
+ confirmations:
+ send_instructions: "Byddwch yn derbyn e-bost â chyfarwyddiadau ar sut i gadarnhau eich cyfrif mewn ychydig funudau."
+ confirmed: "Cadarnhawyd eich cyfrif yn llwyddiannus. Rydych chi wedi arwyddo i fewn."
+ registrations:
+ signed_up: "Rydych chi wedi arwyddo i fyny yn llwyddiannus. Anfonwyd cadarnhad at eich e-bost os yw wedi'i alluogi."
+ updated: "Diweddarwyd eich cyfrif yn llwyddiannus."
+ destroyed: "Hwyl fawr! Canslwyd eich cyfrif yn llwyddiannus. Rydym yn gobeithio gweld chi eto yn fuan."
+ unlocks:
+ send_instructions: "Byddwch yn derbyn e-bost gyda cyfarwyddiadau ar sut i agor eich cyfrif mewn ychydig funudau."
+ unlocked: "Datglowyd eich cyfrif yn llwyddiannus. Rydych chi wedi arwyddo i fewn."
+ mailer:
+ confirmation_instructions: "Cyfarwyddiadau cadarnhad."
+ reset_password_instructions: "Ailosod cyfarwyddiadau cyfrinair"
+ unlock_instructions: "Cyfarwyddiadau Datgloi"
+
diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml
new file mode 100644
index 0000000000000000000000000000000000000000..7c0e0e75843c28b95c391367ae306943ce1c5ce8
--- /dev/null
+++ b/config/locales/devise/devise.de.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.
+
+
+de:
+ errors:
+ messages:
+ not_found: "nicht gefunden"
+ already_confirmed: "wurde bereits bestätigt"
+ not_locked: "war nicht gesperrt"
+
+ devise:
+ failure:
+ unauthenticated: 'Du musst dich anmelden oder registrieren um fortzufahren.'
+ unconfirmed: 'Du musst dein Konto bestätigen um fortzufahren.'
+ 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 erneut an um fortzufahren.'
+ inactive: 'Dein Konto wurde noch nicht aktiviert.'
+ sessions:
+ signed_in: 'Erfolgreich angemeldet.'
+ signed_out: 'Erfolgreich abgemeldet.'
+ passwords:
+ send_instructions: 'Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Passwort zurücksetzt.'
+ updated: 'Dein Passwort wurde erfolgreich geändert. Du bist nun angemeldet.'
+ confirmations:
+ send_instructions: 'Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto bestätigst.'
+ confirmed: 'Dein Konto wurde erfolgreich bestätigt. Du bist nun angemeldet.'
+ 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 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.'
+ mailer:
+ confirmation_instructions: 'Instruktionen zur Bestätigung'
+ reset_password_instructions: 'Instruktionen zum Zurücksetzen des Passworts'
+ unlock_instructions: 'Instruktionen zum Entsperren'
diff --git a/config/locales/devise/devise.en.yml b/config/locales/devise/devise.en.yml
new file mode 100644
index 0000000000000000000000000000000000000000..8876bc5bffd6daa247141c995263778fb22f6d04
--- /dev/null
+++ b/config/locales/devise/devise.en.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: "not found"
+ already_confirmed: "was already confirmed"
+ not_locked: "was not locked"
+
+ devise:
+ failure:
+ unauthenticated: "You need to sign in or sign up before continuing."
+ unconfirmed: "You have to confirm your account before continuing."
+ locked: "Your account is locked."
+ invalid: "Invalid email or password."
+ invalid_token: "Invalid authentication token."
+ timeout: "Your session expired, please sign in again to continue."
+ inactive: "Your account was not activated yet."
+ sessions:
+ signed_in: "Signed in successfully."
+ signed_out: "Signed out successfully."
+ passwords:
+ send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes."
+ updated: "Your password was changed successfully. You are now signed in."
+ confirmations:
+ send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
+ confirmed: "Your account was successfully confirmed. You are now signed in."
+ registrations:
+ signed_up: "You have signed up successfully. If enabled, a confirmation was sent to your e-mail."
+ updated: "You updated your account successfully."
+ destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
+ unlocks:
+ send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
+ unlocked: "Your account was successfully unlocked. You are now signed in."
+ mailer:
+ confirmation_instructions: "Confirmation instructions"
+ reset_password_instructions: "Reset password instructions"
+ unlock_instructions: "Unlock Instructions"
diff --git a/config/locales/devise/devise.es.yml b/config/locales/devise/devise.es.yml
new file mode 100644
index 0000000000000000000000000000000000000000..06002aa637717108a0da1e291d359edbb32cd001
--- /dev/null
+++ b/config/locales/devise/devise.es.yml
@@ -0,0 +1,42 @@
+es:
+ errors:
+ messages:
+ not_found: 'no encontrado'
+ already_confirmed: 'ya ha sido confirmada'
+ not_locked: 'no está bloqueada'
+
+ devise:
+ failure:
+ unauthenticated: 'Necesitas acceder a tu cuenta o registrarte antes de continuar.'
+ unconfirmed: 'Necesitas confirmar tu cuenta antes de continuar.'
+ locked: 'Tu cuenta esta bloqueada.'
+ invalid: 'Contraseña o Email incorrecto.'
+ invalid_token: 'Token de autenticación incorrecto.'
+ timeout: 'Tu sesión ha expirado, por favor accede de nuevo para continuar.'
+ inactive: 'Tu cuenta no ha sido activada.'
+ sessions:
+ signed_in: 'Has ingresado correctamente.'
+ signed_out: 'Has salido correctamente.'
+ passwords:
+ send_instructions: 'Recibirás un email con instrucciones para cambiar tu contraseña en pocos minutos.'
+ updated: 'Tu contraseña ha sido modificada. Ya has accedido a tu cuenta.'
+ confirmations:
+ send_instructions: 'Recibirás un email con instrucciones para confirmar tu cuenta en pocos minutos.'
+ confirmed: 'Tu cuenta ha sido confirmada. Ya has accedido a tu cuenta.'
+ registrations:
+ signed_up: 'Te has registrado correctamente. Si está disponible, te habremos enviado un email de confirmación.'
+ updated: 'Has actualizado tu cuenta correctamente.'
+ destroyed: '!Adiós! Tu cuenta ha sido cancelada. Esperamos verte pronto.'
+ unlocks:
+ send_instructions: 'Recibirás un email con instrucciones para desbloquear tu cuenta en pocos minutos.'
+ unlocked: 'Tu cuenta ha sido desbloqueada. Ya has accedido a tu cuenta.'
+ oauth_callbacks:
+ success: 'Has sido autorizado satisfactoriamente de la cuenta %{kind}.'
+ failure: 'No has sido autorizado en la cuenta %{kind} porque "%{reason}".'
+ mailer:
+ confirmation_instructions:
+ subject: 'Instrucciones de confirmación'
+ reset_password_instructions:
+ subject: 'Instrucciones para cambiar tu contraseña'
+ unlock_instructions:
+ subject: 'Instrucciones para desbloquear tu cuenta'
\ No newline at end of file
diff --git a/config/locales/devise/devise.fi.yml b/config/locales/devise/devise.fi.yml
new file mode 100644
index 0000000000000000000000000000000000000000..9109b40a85f5e03db80fabfc78eb7b138a04bca9
--- /dev/null
+++ b/config/locales/devise/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 täytyy 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: 'Uloskirjautuminen onnistui.'
+ passwords:
+ send_instructions: 'Saat hetken päästä sähköpostiisi ohjeet siitä miten määrität 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 uudelleenmäärittämiseksi'
+ unlock_instructions: 'Ohjeet lukituksen poistamiseksi'
diff --git a/config/locales/devise/devise.fr-informal.yml b/config/locales/devise/devise.fr-informal.yml
new file mode 100644
index 0000000000000000000000000000000000000000..9578af9d9a3d1c6156ed3ea0b3f5af38d7c23f6a
--- /dev/null
+++ b/config/locales/devise/devise.fr-informal.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.
+
+
+fr-informal:
+ errors:
+ messages:
+ not_found: "introuvable"
+ already_confirmed: "a déjà été confirmé"
+ not_locked: "n’a pas été verrouillé"
+
+ devise:
+ failure:
+ unauthenticated: 'Tu dois te connecter ou t’inscrire avant de continuer.'
+ unconfirmed: 'Tu dois confirmer ton compte avant de continuer.'
+ locked: 'Ton compte est verrouillé.'
+ invalid: 'Adresse e-mail ou mot de passe invalide.'
+ invalid_token: 'Jeton d’authentification invalide.'
+ timeout: 'Ta session a expiré, merci de te connecter de nouveau afin de continuer.'
+ inactive: 'Ton compte n’a pas encore été activé.'
+ sessions:
+ signed_in: 'Connecté avec succès.'
+ signed_out: 'Déconnecté avec succès.'
+ passwords:
+ send_instructions: 'Tu vas recevoir dans quelques minutes un e-mail contenant des instructions t’expliquant comment réinitialiser ton mot de passe.'
+ updated: 'Ton mot de passe a été modifié avec succès. Tu es à présent connecté.'
+ confirmations:
+ send_instructions: 'Tu vas recevoir dans quelques minutes un e-mail contenant des instructions t’expliquant comment confirmer ton compte.'
+ confirmed: 'Ton compte a été confirmé avec succès. Tu es à présent connecté.'
+ registrations:
+ signed_up: 'Tu t’es inscrit avec succès. Si activée, une confirmation a été envoyée sur ton adresse e-mail.'
+ updated: 'Tu as mis à jour ton compte avec succès.'
+ destroyed: 'Au revoir ! Ton compte a été résilié avec succès. Nous espérons te revoir très bientôt.'
+ unlocks:
+ send_instructions: 'Tu vas recevoir dans quelques minutes un e-mail contenant des instructions t’expliquant comment déverrouiller ton compte.'
+ unlocked: 'Ton compte a été déverrouillé avec succès. Tu es à présent connecté.'
+ mailer:
+ confirmation_instructions: 'Instructions de confirmation'
+ reset_password_instructions: 'Réinitialiser les instructions du mot de passe'
+ unlock_instructions: 'Instructions de déverrouillage'
diff --git a/config/locales/devise/devise.fr.yml b/config/locales/devise/devise.fr.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b8691eb3a3291e7e9279374edec0ea9eb78d622d
--- /dev/null
+++ b/config/locales/devise/devise.fr.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.
+
+
+fr:
+ errors:
+ messages:
+ not_found: "introuvable"
+ already_confirmed: "a déjà été confirmé"
+ not_locked: "n’a pas été verrouillé"
+
+ devise:
+ failure:
+ unauthenticated: 'Vous devez vous connecter ou vous inscrire avant de continuer.'
+ unconfirmed: 'Vous devez confirmer votre compte avant de continuer.'
+ locked: 'Votre compte est verrouillé.'
+ invalid: 'E-mail ou mot de passe invalide.'
+ invalid_token: 'Jeton d’authentification invalide.'
+ timeout: 'Votre session a expiré, veuillez vous connecter de nouveau afin de continuer.'
+ inactive: 'Votre compte n’a pas encore été activé.'
+ sessions:
+ signed_in: 'Connecté avec succès.'
+ signed_out: 'Déconnecté avec succès.'
+ passwords:
+ send_instructions: 'Vous allez recevoir dans quelques minutes un e-mail contenant des instructions vous expliquant comment réinitialiser votre mot de passe.'
+ updated: 'Votre mot de passe a été modifié avec succès. Vous êtes à présent connecté.'
+ confirmations:
+ send_instructions: 'Vous allez recevoir dans quelques minutes un e-mail contenant des instructions vous expliquant comment confirmer votre compte.'
+ confirmed: 'Votre compte a été confirmé avec succès. Vous êtes à présent connecté.'
+ registrations:
+ signed_up: 'Vous vous êtes inscrit avec succès. Si activée, une confirmation a été envoyée sur votre adresse e-mail.'
+ updated: 'Vous avez mis à jour votre compte avec succès.'
+ destroyed: 'Au revoir ! Votre compte a été résilié avec succès. Nous espérons vous revoir très bientôt.'
+ unlocks:
+ send_instructions: 'Vous allez recevoir dans quelques minutes un e-mail contenant des instructions vous expliquant comment déverrouiller votre compte.'
+ unlocked: 'Votre compte a été déverrouillé avec succès. Vous êtes à présent connecté.'
+ mailer:
+ confirmation_instructions: 'Instructions de confirmation'
+ reset_password_instructions: 'Réinitialiser les instructions du mot de passe'
+ unlock_instructions: 'Instructions de déverrouillage'
diff --git a/config/locales/devise/devise.it.yml b/config/locales/devise/devise.it.yml
new file mode 100644
index 0000000000000000000000000000000000000000..76f761e377e5d9ec302a0d86f3ad94b89e8450ad
--- /dev/null
+++ b/config/locales/devise/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 registrarti 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: "Istruzioni su come sbloccare l'account"
diff --git a/config/locales/devise/devise.lt.yml b/config/locales/devise/devise.lt.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d6e33c1cbe84c72a3aaf5ca55cef08fe4a86472e
--- /dev/null
+++ b/config/locales/devise/devise.lt.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.
+
+
+lt:
+ errors:
+ messages:
+ not_found: "nerasta"
+ already_confirmed: "jau patvirtinta"
+ not_locked: "nebuvo užrakinta"
+
+ devise:
+ failure:
+ unauthenticated: 'Norint tęsti, reikia prisijungti arba susikurti paskyrą.'
+ unconfirmed: 'Norint prisijungti, reikia patvirtinti savo paskyrÄ….'
+ locked: 'Jūsų paskyra yra užrakinta.'
+ invalid: 'Neteisingas el. pašto adresas arba slaptažodis.'
+ invalid_token: 'Neteisingas prisijungimo raktas.'
+ timeout: 'Sesija baigėsi. Norint tęsti, reikia prisijungti iš naujo.'
+ inactive: 'Paskyra dar neaktyvuota.'
+ sessions:
+ signed_in: 'SÄ—kmingai prisijungta.'
+ signed_out: 'SÄ—kmingai atsijungta.'
+ passwords:
+ send_instructions: 'Netrukus gausite el. laišką su nurodymais slaptažodžiui atstatyti.'
+ updated: 'Slaptažodis pakeistas sėkmingai. Jūs esate prisijungęs.'
+ confirmations:
+ send_instructions: 'Netrukus gausite el. laišką su nurodymais paskyros patvirtinimui.'
+ confirmed: 'Paskyra patvirtinta. PrisijungÄ—te.'
+ registrations:
+ signed_up: 'Prisijungta sėkmingai. Jei nustatyta, patvirtinimas išsiųstas į jūsų el. paštą.'
+ updated: 'Paskyra atnaujinta sÄ—kmingai.'
+ destroyed: 'Paskyra sėkmingai atšaukta. Iki pasimatymo!'
+ unlocks:
+ send_instructions: 'Netrukus gausite el. laišką su nurodymais paskyros atrakinimui.'
+ unlocked: 'Paskyra atrakinta. PrisijungÄ—te.'
+ mailer:
+ confirmation_instructions: 'Nurodymai patvirtinimui'
+ reset_password_instructions: 'Nurodymai slaptažodžio atstatymui'
+ unlock_instructions: 'Nurodymai paskyros atrakinimui'
diff --git a/config/locales/devise/devise.pl.yml b/config/locales/devise/devise.pl.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a490a1a3980c573a7b8a8479835282b6cb30bacb
--- /dev/null
+++ b/config/locales/devise/devise.pl.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.
+
+
+pl:
+ errors:
+ messages:
+ not_found: "nie znaleziono"
+ already_confirmed: "potwierdzono wcześniej"
+ not_locked: "nie był zablokowany"
+
+ devise:
+ failure:
+ unauthenticated: 'By kontynuować musisz się zalogować lub zarejestrować.'
+ unconfirmed: 'Musisz aktywować swoje konto.'
+ locked: 'Twoje konto jest zablokowane.'
+ invalid: 'Nieprawidłowy adres email lub hasło.'
+ invalid_token: 'Nieprawidłowy kod identyfikacyjny.'
+ timeout: 'Twoja sesja wygasła, zaloguj się ponownie by kontynuować.'
+ inactive: 'Twoje konto nie zostało jeszcze aktywowane.'
+ sessions:
+ signed_in: 'Zalogowano pomyślnie.'
+ signed_out: 'Wylogowano.'
+ passwords:
+ send_instructions: 'W ciągu kilku minut otrzymasz maila zawierającego instrukcjie dotyczące zresetowania hasła.'
+ updated: 'Twoje hasło zostało zmienione, zostałeś zalogowany.'
+ confirmations:
+ send_instructions: 'W ciÄ…gu kilku minut otrzymasz maila zawierajÄ…cego instrukcje dotyczÄ…ce aktywacji konta.'
+ confirmed: 'Twoje konto zostało aktywowane, zostałeś zalogowany.'
+ registrations:
+ signed_up: 'Zostałeś zarejestrowany. Jeśli aktywowano odpowiednią opcję, wyślemy do Ciebie email potwierdzający rejestrację.'
+ updated: 'Pomyślnie zaktualizowano informacje o Twoim koncie.'
+ destroyed: 'Żegnaj! Twoje konto zostało usunięte.'
+ unlocks:
+ send_instructions: 'W ciÄ…gu kilku minut otrzymasz email z instrukcjami odblokowania konta.'
+ unlocked: 'Twoje konto zostało odblokowane, jesteś zalogowany.'
+ mailer:
+ confirmation_instructions: 'Instrukcje aktywacji'
+ reset_password_instructions: 'Instrukcje zmiany hasła'
+ unlock_instructions: 'Instrukcje odblokowania'
diff --git a/config/locales/devise/devise.pt-BR.yml b/config/locales/devise/devise.pt-BR.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ba2b3b5de9b6f0c3adce60714923b43d8487320c
--- /dev/null
+++ b/config/locales/devise/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/devise/devise.pt-PT.yml b/config/locales/devise/devise.pt-PT.yml
new file mode 100644
index 0000000000000000000000000000000000000000..cf16fd20d4e65d8ec8db1a19d1d5068fb5537c14
--- /dev/null
+++ b/config/locales/devise/devise.pt-PT.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-PT:
+ errors:
+ messages:
+ not_found: "não foi encontrado"
+ already_confirmed: "já foi confirmado"
+ not_locked: "não foi bloqueado"
+
+ devise:
+ failure:
+ unauthenticated: 'Faça login ou registre-se antes de continuar.'
+ unconfirmed: 'Confirme a sua conta antes de continuar.'
+ locked: 'A sua conta foi bloqueada.'
+ invalid: 'Endereço de correio ou senha inválida.'
+ invalid_token: 'Token de autenticação inválido.'
+ timeout: 'A sua sessão expirou, por favor faça login novamente para continuar.'
+ inactive: 'A sua conta ainda não foi activada.'
+ sessions:
+ signed_in: 'Login com sucesso.'
+ signed_out: 'Logout com sucesso.'
+ passwords:
+ send_instructions: 'Vai receber um email com instruções sobre como alterar a sua senha dentro de alguns minutos.'
+ updated: 'A sua senha foi alterada com sucesso. Está on-line.'
+ confirmations:
+ send_instructions: 'Vai receber um email com instruções sobre como confirmar a sua conta dentro de alguns minutos.'
+ confirmed: 'A sua conta foi confirmada com sucesso. Está on-line.'
+ registrations:
+ signed_up: 'Registou-se com sucesso. Se ligado, a confirmação foi enviada para o seu email.'
+ updated: 'Actualizou a sua conta com sucesso.'
+ destroyed: 'Adeus! A sua conta foi cancelada com sucesso. Esperamos vê-lo de novo brevemente.'
+ unlocks:
+ send_instructions: 'Vai receber uma mensagem sobre como desbloquear a sua conta dentro de alguns minutos.'
+ unlocked: 'A sua conta foi desbloqueada com sucesso. Está on-line.'
+ mailer:
+ confirmation_instructions: 'Instruções de confirmação'
+ reset_password_instructions: 'Instruções para alterar a sua senha'
+ unlock_instructions: 'Instruções para desbloquear'
diff --git a/config/locales/devise/devise.ro.yml b/config/locales/devise/devise.ro.yml
new file mode 100644
index 0000000000000000000000000000000000000000..63501ea7b6119709b53221a77467f5ce745f0877
--- /dev/null
+++ b/config/locales/devise/devise.ro.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.
+
+
+ro:
+ errors:
+ messages:
+ not_found: "inexistent"
+ already_confirmed: "a fost deja confirmat"
+ not_locked: "nu a fost blocat"
+
+ devise:
+ failure:
+ unauthenticated: 'Pentru a continuna, înregistrați-vă.'
+ unconfirmed: 'Pentru a continua, confirmați contul dvs.'
+ locked: 'Contul dvs. este blocat.'
+ invalid: 'Email sau parolă incorectă.'
+ invalid_token: 'Cheie de autentificare invalidă.'
+ timeout: 'Sesiunea dvs. a expirat, autentificați-vă din nou pentru a continua.'
+ inactive: 'Contul dvs. încă nu a fost activat.'
+ sessions:
+ signed_in: 'Autentificare cu succes.'
+ signed_out: 'Deconectare cu succes.'
+ passwords:
+ send_instructions: 'În scurt timp veți primi un email cu instrucțiuni pentru resetarea parolei.'
+ updated: 'Parolă schimbată cu success. Sunteți acum autentificat(ă).'
+ confirmations:
+ send_instructions: 'În scurt timp veți primi un email cu instrucțiuni pentru confirmarea contului.'
+ confirmed: 'Contul dvs. a fost confirmat cu succes. Sunteți acum autentificat(ă).'
+ registrations:
+ signed_up: 'Sunteți autentificat(ă). Dacă este cazul, un mesaj de confirmare a fost trimis pe email-ul dvs.'
+ updated: 'Cont actualizat cu succes.'
+ destroyed: 'Pa! Contul dvs. a fost dezactivat cu succes. Sperăm să vă revedem în curând.'
+ unlocks:
+ send_instructions: 'În scurt timp veți primi un email cu instrucțiuni pentru deblocarea contului.'
+ unlocked: 'Cont deblocat cu succes. Sunteți acum autentificat(ă).'
+ mailer:
+ confirmation_instructions: 'Instrucțiuni pentru confirmarea contului.'
+ reset_password_instructions: 'Instrucțiuni pentru resetarea parolei.'
+ unlock_instructions: 'Instrucțiuni pentru deblocare contului.'
diff --git a/config/locales/devise/devise.ru.yml b/config/locales/devise/devise.ru.yml
new file mode 100644
index 0000000000000000000000000000000000000000..670d570267257560e5f0fbf5b73cbe3b10fdda32
--- /dev/null
+++ b/config/locales/devise/devise.ru.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.
+
+
+ru:
+ errors:
+ messages:
+ not_found: "не найден(о)"
+ already_confirmed: "уже подтвержден(о)"
+ not_locked: "не заблокирован(о)"
+
+ devise:
+ failure:
+ unauthenticated: 'Вам нужно войти либо зарегиÑтрироватьÑÑ, чтобы продолжить.'
+ unconfirmed: 'Вам нужно подтвердить вашу учётную запиÑÑŒ, чтобы продолжить.'
+ locked: 'Ваша ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ заблокирована.'
+ invalid: 'Ðеверный e-mail или пароль.'
+ invalid_token: 'Ðеверный ключ аутентификации.'
+ timeout: 'Срок вашего ÑеанÑа иÑтёк, пожалуйÑта, войдите в ÑиÑтему Ñнова.'
+ inactive: 'Ваша ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ ещё не активирована.'
+ sessions:
+ signed_in: 'Вход в ÑиÑтему выполнен уÑпешно.'
+ signed_out: 'Выход из ÑиÑтемы выполнен уÑпешно.'
+ passwords:
+ send_instructions: 'Ð’Ñ‹ получите e-mail Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñми по ÑброÑу Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð² течение неÑкольких минут.'
+ updated: 'Ваш пароль был изменён. Ð’Ñ‹ вошли в ÑиÑтему.'
+ confirmations:
+ send_instructions: 'Ð’Ñ‹ получите e-mail Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñми по подтверждению учётной запиÑи в течение неÑкольких минут.'
+ confirmed: 'Ваша ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ была подтверждена. Ð’Ñ‹ вошли в ÑиÑтему.'
+ registrations:
+ signed_up: 'РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð° уÑпешно. Ð’ завиÑимоÑти от наÑтроек, вам может прийти e-mail Ñ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸ÐµÐ¼.'
+ updated: 'Обновление вашей учётной запиÑи выполнено уÑпешно.'
+ destroyed: 'До ÑвиданиÑ! Ваша ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ была удалена. ÐадеемÑÑ, что вÑкоре Ð²Ð°Ñ ÑƒÐ²Ð¸Ð´Ð¸Ð¼ Ñнова.'
+ unlocks:
+ send_instructions: 'Ð’Ñ‹ получите e-mail Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñми по разблокированию учётной запиÑи в течение неÑкольких минут.'
+ unlocked: 'Ваша ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ была разблокирована. Ð’Ñ‹ вошли в ÑиÑтему.'
+ mailer:
+ confirmation_instructions: 'Подтверждение учётной запиÑи'
+ reset_password_instructions: 'Ð¡Ð±Ñ€Ð¾Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ'
+ unlock_instructions: 'Разблокирование учётной запиÑи'
diff --git a/config/locales/devise/devise.sv.yml b/config/locales/devise/devise.sv.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b434666cee8a33c242c97618c6c37d1acea0cb8b
--- /dev/null
+++ b/config/locales/devise/devise.sv.yml
@@ -0,0 +1,40 @@
+# Copyright (c) 2010, Diaspora Inc. This file is
+# licensed under the Affero General Public License version 3. See
+# the COPYRIGHT file.
+
+
+sv:
+ errors:
+ messages:
+ not_found: "kan ej hitta"
+ not_locked: "var ej låst"
+
+ devise:
+ failure:
+ unauthenticated: 'Du måste logga in innan du kan fortsätta.'
+ unconfirmed: 'Du måste verifiera ditt konto innan du kan fortsätta.'
+ locked: 'Ditt konto är låst.'
+ invalid: 'Felaktig användare eller lösenord.'
+ invalid_token: 'Ogiltig identifiering.'
+ timeout: 'Din session är avslutad, var vänlig logga in igen.'
+ inactive: 'Ditt konto är inte aktiverat.'
+ sessions:
+ signed_in: 'Inloggning ok.'
+ signed_out: 'Utloggning ok.'
+ passwords:
+ send_instructions: 'Du kommer att få ett ebrev med instruktioner för att återställa lösenordet inom några minuter.'
+ updated: 'Ditt lösenord har ändrats och du är inloggad.'
+ confirmations:
+ send_instructions: 'Du kommer att få ett ebrev med instruktioner för att verifiera ditt konto inom några minuter.'
+ confirmed: 'Ditt konto har verifierats och du är inloggad.'
+ registrations:
+ signed_up: 'Du har skapat ett konto. Beroende på inställningar kan ett ebrev ha skickats till dig.'
+ updated: 'Ditt konto har uppdateras.'
+ destroyed: 'Ditt konto är avslutat. Välkommen åter!'
+ unlocks:
+ send_instructions: 'Du kommer att få ett ebrev med instruktioner för att låsa upp ditt konto inom några minuter.'
+ unlocked: 'Ditt konto har är nu upplåst och du är inloggad'
+ mailer:
+ confirmation_instructions: 'Instruktioner för att verifiera ditt konto.'
+ reset_password_instructions: 'Instruktioner för att terställa ditt lösenord.'
+ unlock_instructions: 'Instruktioner för att låsa upp ditt konto.'
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
new file mode 100644
index 0000000000000000000000000000000000000000..91c904dc19272fdd90ec7dcecff953cb322287cb
--- /dev/null
+++ b/config/locales/diaspora/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/diaspora/cy.yml b/config/locales/diaspora/cy.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b7d9c9af46fcf4e66474ec7e60d69fd306eb3863
--- /dev/null
+++ b/config/locales/diaspora/cy.yml
@@ -0,0 +1,143 @@
+# 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 English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+cy:
+ hello: "Helo byd"
+ layouts:
+ application:
+ edit_profile: "golygu proffil"
+ logout: "arwyddo allan"
+ shared:
+ aspect_nav:
+ all_aspects: "Pob agwedd"
+ manage: "Rheoli"
+ manage_your_aspects: "Rheoli eich agweddau"
+ sub_header:
+ all_aspects: "Pob agwedd"
+ manage_aspects: "Rheloi agweddau"
+ publisher:
+ share: "Rhannu"
+ aspect_friends:
+ add_friends: "ychwanegu ffrindiau"
+ albums:
+ album:
+ you: "chi"
+ new_album:
+ create: "creu"
+ add_a_new_album: "Ychwanegu albwm newydd"
+ show:
+ edit_album: "Golygu Albwm"
+ albums: "albymau"
+ updated: "diweddarwyd"
+ by: "gan"
+ edit:
+ editing: "Wrthi'n golygu"
+ updated: "diweddarwyd"
+ are_you_sure: "Ydych chi'n sicr?"
+ delete_album: "Dileu Albwm"
+ cancel: "Cancel"
+ index:
+ home: "adref"
+ new_album: "Albwm Newydd"
+ create:
+ success: "Chi wedi creu albwm a'i enwi'n %{name}."
+ update:
+ success: "Mae albwm %{name} wedi'i olygu yn llwyddiannus."
+ failure: "Wedi methu golygu albwm %{name}."
+ destroy:
+ success: "Wedi dileu albwm %{name}."
+ aspects:
+ index:
+ photos: "lluniau"
+ show:
+ photos: "lluniau"
+ manage:
+ add_a_new_aspect: "Ychwanegwch agwedd"
+ add_a_new_friend: "Ychwanegwch ffrind newydd"
+ show: "Dangos"
+ update_aspects: "Diweddaru Agweddau"
+ requests: "Ceisiadau"
+ ignore_remove: "Anwybyddu/Tynnu"
+ new_aspect:
+ add_a_new_aspect: "Ychwanegwch agwedd newydd"
+ create: "Creu"
+ create:
+ success:"Cliciwch ar y plus ar y chwith i ddweud wrth Diaspora pwy all weld eich agwedd newydd."
+ users:
+ edit:
+ cancel: "Cancel"
+ update_profile: "Diweddaru Proffil"
+ home: "Adref"
+ diaspora_username: "FFUGENW DIASPORA"
+ info: "Gwybodaeth"
+ picture: "Llun"
+ editing_profile: "Golygu proffil"
+ albums: "Albymau"
+ you_dont_have_any_photos: "Does gennych chi ddim lluniau! Ewch i'r"
+ page_to_upload_some: "dudalen i uwchlwytho rhai."
+ comments:
+ comment:
+ ago: "yn ol"
+ new_comment:
+ comment: "Sylw"
+ photos:
+ show:
+ prev: "blaenorol"
+ full_size: "maint llawn"
+ next: "neasf"
+ edit_photo: "Golygu Llun"
+ delete_photo: "Dileu Llun"
+ are_you_sure: "Ydych chi'n sicr?"
+ comments: "sylwadau"
+ edit:
+ editing: "Golygu"
+ are_you_sure: "Ydych chi'n sicr?"
+ delete_photo: "Dileu Llun"
+ photo:
+ show_comments: "dangos sylwadau"
+ posted_a_new_photo_to: "postiwyd llun newydd i"
+ new:
+ new_photo: "Llun Newydd"
+ back_to_list: "Nol i'r Rhestr"
+ post_it: "postiwch e!"
+ registrations:
+ new:
+ sign_up: "Cofrestrwch"
+ status_messages:
+ new_status_message:
+ tell_me_something_good: "Dwi eisiau clywed rhwbeth da"
+ oh_yeah: "oh yeah!"
+ status_message:
+ show_comments: "dangos sylwadau"
+ delete: "Dileu"
+ are_you_sure: "Ydych chi'n sicr?"
+ show:
+ status_message: "Neges Statws"
+ comments: "sylwadau"
+ are_you_sure: "Ydych chi'n sicr?"
+ destroy: "Dinistrio"
+ view_all: "Gweld Pob Un"
+ message: "Neges"
+ owner: "Perchennog"
+ people:
+ index:
+ add_friend: "ychwanegu ffrind"
+ real_name: "enw llawn"
+ diaspora_handle: "bachyn diaspora"
+ thats_you: "dyna chi!"
+ friend_request_pending: "cais ffrind dan ystyriaeth"
+ you_have_a_friend_request_from_this_person: "mae'r person yma eisiau bod yn ffrind i chi"
+ new:
+ new_person: "Person Newydd"
+ back_to_list: "Nol i'r Rhestr"
+ show:
+ last_seen: "gwelwyd diwethaf: %{how_long_ago}"
+ friends_since: "yn ffrindiau ers: %{how_long_ago}"
+ save: "arbed"
+ are_you_sure: "Ydych chi'n sicr?"
+ remove_friend: "dileu ffrind"
\ No newline at end of file
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
new file mode 100644
index 0000000000000000000000000000000000000000..1c4dfb4ad6044c07f4576cd92e08909dd9d6f729
--- /dev/null
+++ b/config/locales/diaspora/de.yml
@@ -0,0 +1,197 @@
+# Copyright (c) 2010, Diaspora Inc. This file is
+# licensed under the Affero General Public License version 3. See
+# the COPYRIGHT file.
+
+
+# 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:
+ hello: "Hallo Welt"
+ application:
+ helper:
+ unknown_person: "unbekannte Person"
+ new_requests: "neue Anfrage"
+ dashboards:
+ helper:
+ home: "home"
+ error_messages:
+ helper:
+ invalid_fields: "Ungültige Felder"
+ correct_the_following_errors_and_try_again: "Korrigiere die folgenden Fehler und probier es erneut."
+ people:
+ helper:
+ results_for: " resultados para %{params}"
+ people_on_pod_are_aware_of: " gente en pod estan al tanto de "
+ layouts:
+ application:
+ edit_profile: "Profil bearbeiten"
+ logout: "Abmelden"
+ shared:
+ aspect_nav:
+ all_aspects: "Alle Aspekte"
+ manage: "Verwalten"
+ manage_your_aspects: "Aspekte verwalten"
+ sub_header:
+ all_aspects: "Alle Aspekte"
+ manage_aspects: "Aspekte verwalten"
+ publisher:
+ share: "Teilen"
+ aspect_friends:
+ add_friends: "Freunde hinzufügen"
+ albums:
+ album:
+ you: "dir"
+ new_album:
+ create: "erstellen"
+ add_a_new_album: "Album hinzufügen"
+ show:
+ edit_album: "Album bearbeiten"
+ albums: "Alben"
+ updated: "aktualisiert"
+ by: "von"
+ edit:
+ editing: "Bearbeite"
+ updated: "geändert"
+ are_you_sure: "Bist du sicher?"
+ delete_album: "Album löschen"
+ cancel: "Abbrechen"
+ index:
+ home: "Startseite"
+ new_album: "Neues Album"
+ create:
+ success: "Du hast das Album %{name} erstellt."
+ update:
+ success: "Album %{name} erfolgreich geändert."
+ failure: "%{name} wurde nicht geändert."
+ destroy:
+ success: "Album %{name} gelöscht."
+ helper:
+ friends_albums: "Alben von Freunden"
+ your_albums: "Deine Alben"
+ aspects:
+ index:
+ photos: "Fotos"
+ show:
+ photos: "Fotos"
+ manage:
+ add_a_new_aspect: "Neuen Aspekt erstellen"
+ add_a_new_friend: "Freund hinzufügen"
+ show: "Anzeigen"
+ update_aspects: "Aspekte aktualisieren"
+ requests: "Anfragen"
+ ignore_remove: "Ignorieren/Entfernen"
+ new_aspect:
+ add_a_new_aspect: "Neuen Aspekt erstellen"
+ create: "Erstellen"
+ create:
+ success: "Klicke auf das Plus auf der rechten Seite um Diaspora mitzuteilen wer deinen neuen Aspekt sehen kann."
+ destroy:
+ success: "%{name} wurde erfolgreich gelöscht."
+ update:
+ success: "Dein Aspekt, %{name}, wurde erfolgreich geändert."
+ move_friends:
+ failure: "Aspect editing failed for friend %{real_name}."
+ success: "Aspekt erfolgreich geändert."
+ move_friend:
+ error: "didn't work %{inspect}"
+ notice: "You are now showing your friend a different aspect of yourself."
+ helper:
+ remove: "remove"
+ aspect_not_empty: "Aspekt ist nicht leer"
+ users:
+ edit:
+ cancel: "Abbrechen"
+ update_profile: "Profil aktualisieren"
+ home: "Startseite"
+ diaspora_username: "Diaspora Benutzername"
+ info: "Info"
+ picture: "Bild"
+ editing_profile: "Profil bearbeiten"
+ albums: "Alben"
+ you_dont_have_any_photos: "#TODO"
+ page_to_upload_some: "#TODO"
+ comments:
+ comment:
+ # this won't work in german at all. Needs more thorough I18n
+ ago: "ago"
+ new_comment:
+ comment: "Kommentar"
+ photos:
+ show:
+ prev: "zurück"
+ full_size: "volle Größe"
+ next: "vor"
+ edit_photo: "Foto bearbeiten"
+ delete_photo: "Foto löschen"
+ are_you_sure: "Bist du sicher?"
+ comments: "Kommentare"
+ edit:
+ editing: "Bearbeite"
+ are_you_sure: "Bist du sicher?"
+ delete_photo: "Foto löschen"
+ photo:
+ show_comments: "Kommentare anzeigen"
+ posted_a_new_photo_to: "posted a new photo to"
+ new:
+ new_photo: "Foto erstellen"
+ back_to_list: "Zurück zur Liste"
+ post_it: "Hochladen"
+ create:
+ runtime_error: "Photo upload failed. Are you sure that your seatbelt is fastened?"
+ integrity_error: "Photo upload failed. Are you sure that was an image?"
+ type_error: "Photo upload failed. Are you sure an image was added?"
+ update:
+ notice: "Foto erfolgreich aktualisiert."
+ error: "Failed to edit photo."
+ destroy:
+ notice: "Foto gelöscht."
+ registrations:
+ new:
+ sign_up: "Anmelden"
+ create:
+ success: "Du bist Diaspora beigetreten!"
+ status_messages:
+ new_status_message:
+ tell_me_something_good: "Erzähl' mir was schönes!"
+ oh_yeah: "Hey, super!"
+ status_message:
+ show_comments: "Kommentare anzeigen"
+ delete: "Löschen"
+ are_you_sure: "Bist du sicher?"
+ show:
+ status_message: "Statusmeldung"
+ comments: "Kommentare"
+ are_you_sure: "Bist du sicher?"
+ destroy: "Löschen"
+ view_all: "Alle anzeigen"
+ message: "Nachricht"
+ owner: "Besitzer"
+ helper:
+ no_message_to_display: "No message to display."
+ people:
+ index:
+ add_friend: "Freund hinzufügen"
+ real_name: "real name"
+ diaspora_handle: "diaspora handle"
+ thats_you: "das bist du!"
+ friend_request_pending: "Freundschaftsanfrage ausstehend"
+ you_have_a_friend_request_from_this_person: "du hast eine Freundschaftsanfrage von dieser Person"
+ new:
+ new_person: "Neue Person"
+ back_to_list: "Zurück zur Liste"
+ show:
+ last_seen: "zuletzt gesehen: %{how_long_ago}"
+ friends_since: "Freunde seit: %{how_long_ago}"
+ save: "save"
+ are_you_sure: "Bist du sicher?"
+ remove_friend: "remove friend"
+ destroy:
+ success: "Ihr seid jetzt Freunde."
+ error: "Bitte wähle einen Aspekt aus!"
+ ignore: "Freundschaftsanfrage ignorieren."
+ create:
+ error: "No diaspora seed found with this email!"
+ already_friends: "Du bist bereits mit %{destination_url} befreundet!"
+ success: "Eine Freundschaftsanfrage wurde an %{destination_url} gesendet."
+ horribly_wrong: "Etwas ging tierisch schief."
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
new file mode 100644
index 0000000000000000000000000000000000000000..8e6542639901fc86d5a706432f82b49637e2096a
--- /dev/null
+++ b/config/locales/diaspora/en.yml
@@ -0,0 +1,205 @@
+# 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 English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+ hello: "Hello world"
+ application:
+ helper:
+ unknown_person: "unknown person"
+ new_requests: "new requests"
+ dashboards:
+ helper:
+ home: "home"
+ error_messages:
+ helper:
+ invalid_fields: "Invalid Fields"
+ correct_the_following_errors_and_try_again: "Correct the following errors and try again."
+ people:
+ helper:
+ results_for: " results for %{params}"
+ people_on_pod_are_aware_of: " people on pod are aware of"
+ layouts:
+ application:
+ edit_profile: "edit profile"
+ logout: "logout"
+ shared:
+ aspect_nav:
+ all_aspects: "All Aspects"
+ manage: "Manage"
+ manage_your_aspects: "Manage your Aspects"
+ sub_header:
+ all_aspects: "All Aspects"
+ manage_aspects: "Manage Aspects"
+ publisher:
+ share: "Share"
+ aspect_friends:
+ add_friends: "add friends"
+ albums:
+ album:
+ you: "you"
+ new_album:
+ create: "create"
+ add_a_new_album: "Add a new album"
+ show:
+ edit_album: "Edit Album"
+ albums: "albums"
+ updated: "updated"
+ by: "by"
+ edit:
+ editing: "Editing"
+ updated: "updated"
+ are_you_sure: "Are you sure?"
+ delete_album: "Delete Album"
+ cancel: "Cancel"
+ index:
+ home: "home"
+ new_album: "New Album"
+ create:
+ success: "You've created an album called %{name}."
+ update:
+ success: "Album %{name} successfully edited."
+ failure: "Failed to edit album %{name}."
+ destroy:
+ success: "Album %{name} deleted."
+ helper:
+ friends_albums: "Friends Albums"
+ your_albums: "Your Albums"
+ aspects:
+ index:
+ photos: "photos"
+ show:
+ photos: "photos"
+ manage:
+ add_a_new_aspect: "Add a new aspect"
+ add_a_new_friend: "Add a new friend"
+ show: "Show"
+ update_aspects: "Update Aspects"
+ requests: "Requests"
+ ignore_remove: "Ignore/Remove"
+ new_aspect:
+ add_a_new_aspect: "Add a new aspect"
+ create: "Create"
+ create:
+ success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
+ destroy:
+ success: "%{name} was successfully removed."
+ update:
+ success: "Your aspect, %{name}, has been successfully edited."
+ move_friends:
+ failure: "Aspect editing failed for friend %{real_name}."
+ success: "Aspects edited successfully."
+ move_friend:
+ failure: "didn't work %{inspect}"
+ success: "You are now showing your friend a different aspect of yourself."
+ helper:
+ remove: "remove"
+ aspect_not_empty: "Aspect not empty"
+ users:
+ edit:
+ cancel: "Cancel"
+ update_profile: "Update Profile"
+ home: "Home"
+ diaspora_username: "DIASPORA USERNAME"
+ info: "Info"
+ picture: "Picture"
+ editing_profile: "Editing profile"
+ albums: "Albums"
+ you_dont_have_any_photos: "You don't have any photos! Go to the"
+ page_to_upload_some: "page to upload some."
+ comments:
+ comment:
+ ago: "ago"
+ new_comment:
+ comment: "Comment"
+ photos:
+ show:
+ prev: "prev"
+ full_size: "full size"
+ next: "next"
+ edit_photo: "Edit Photo"
+ delete_photo: "Delete Photo"
+ are_you_sure: "Are you sure?"
+ comments: "comments"
+ edit:
+ editing: "Editing"
+ are_you_sure: "Are you sure?"
+ delete_photo: "Delete Photo"
+ photo:
+ show_comments: "show comments"
+ posted_a_new_photo_to: "posted a new photo to"
+ new:
+ new_photo: "New Photo"
+ back_to_list: "Back to List"
+ post_it: "post it!"
+ create:
+ runtime_error: "Photo upload failed. Are you sure that your seatbelt is fastened?"
+ integrity_error: "Photo upload failed. Are you sure that was an image?"
+ type_error: "Photo upload failed. Are you sure an image was added?"
+ update:
+ notice: "Photo successfully updated."
+ error: "Failed to edit photo."
+ destroy:
+ notice: "Photo deleted."
+ registrations:
+ new:
+ sign_up: "Sign up"
+ create:
+ success: "You've joined Diaspora!"
+ status_messages:
+ new_status_message:
+ tell_me_something_good: "tell me something good"
+ oh_yeah: "oh yeah!"
+ status_message:
+ show_comments: "show comments"
+ delete: "Delete"
+ are_you_sure: "Are you sure?"
+ show:
+ status_message: "Status Message"
+ comments: "comments"
+ are_you_sure: "Are you sure?"
+ destroy: "Destroy"
+ view_all: "View All"
+ message: "Message"
+ owner: "Owner"
+ helper:
+ no_message_to_display: "No message to display."
+ people:
+ person:
+ add_friend: "add friend"
+ pending_request: "pending request"
+ index:
+ add_friend: "add friend"
+ real_name: "real name"
+ diaspora_handle: "diaspora handle"
+ thats_you: "that's you!"
+ friend_request_pending: "friend request pending"
+ you_have_a_friend_request_from_this_person: "you have a friend request from this person"
+ new:
+ new_person: "New Person"
+ back_to_list: "Back to List"
+ show:
+ last_seen: "last seen: %{how_long_ago}"
+ friends_since: "friends since: %{how_long_ago}"
+ save: "save"
+ are_you_sure: "Are you sure?"
+ remove_friend: "remove friend"
+ requests:
+ new_request:
+ add_a_new_friend_to: "Add a new friend to"
+ enter_a_diaspora_username: "Enter a Diaspora username:"
+ your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+ friends_username: "Friend's username"
+ destroy:
+ success: "You are now friends."
+ error: "Please select an aspect!"
+ ignore: "Ignored friend request."
+ create:
+ error: "No diaspora seed found with this email!"
+ already_friends: "You are already friends with %{destination_url}!"
+ success: "A friend request was sent to %{destination_url}."
+ horribly_wrong: "Something went horribly wrong."
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
new file mode 100644
index 0000000000000000000000000000000000000000..5af6c70aacc0f600cfff2dea23b306c61f209da1
--- /dev/null
+++ b/config/locales/diaspora/es.yml
@@ -0,0 +1,202 @@
+# 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 English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+es:
+ hello: "Hola Mundo"
+ application:
+ helper:
+ unknown_person: "persona desconocida"
+ new_requests: "nuevas peticiones"
+ dashboards:
+ helper:
+ home: "home"
+ error_messages:
+ helper:
+ invalid_fields: "Campos Invalidos"
+ correct_the_following_errors_and_try_again: "Corrija los siguentes errores y trate de nuevo."
+ people:
+ helper:
+ results_for: " resultados para %{params}"
+ people_on_pod_are_aware_of: " gente en pod estan al tanto de "
+ layouts:
+ application:
+ edit_profile: "editar perfil"
+ logout: "desloguear"
+ shared:
+ aspect_nav:
+ all_aspects: "Todos los Aspectos"
+ manage: "Manejar"
+ manage_your_aspects: "Maneja tus Aspectos"
+ sub_header:
+ all_aspects: "Todos los Aspectos"
+ manage_aspects: "Manejar Aspectos"
+ publisher:
+ share: "Compartir"
+ aspect_friends:
+ add_friends: "Añade amigos"
+ albums:
+ album:
+ you: "usted"
+ new_album:
+ create: "Crear"
+ add_a_new_album: "Añade un nuevo álbum"
+ show:
+ edit_album: "Editar Ãlbum"
+ albums: "álbumes"
+ updated: "actualizar"
+ by: "por"
+ edit:
+ editing: "Editando"
+ updated: "actualizado"
+ are_you_sure: "Esta seguro?"
+ delete_album: "Eliminar Ãlbum"
+ cancel: "Cancelar"
+ index:
+ home: "home"
+ new_album: "Nuevo Ãlbum"
+ create:
+ success: "Creo el álbum llamado %{name}."
+ update:
+ success: "Ãlbum %{name} fue editado exitosamente."
+ failure: "Fallo el editar el álbum %{name}."
+ destroy:
+ success: "Ãlbum %{name} fue eliminado."
+ helper:
+ friends_albums: "Ãlbumes de amigos"
+ your_albums: "Tus Ãlbumes"
+ aspects:
+ index:
+ photos: "fotos"
+ show:
+ photos: "fotos"
+ manage:
+ add_a_new_aspect: "Añadir nuevo aspecto"
+ add_a_new_friend: "Añadir nuevo amigo"
+ show: "Mostrar"
+ update_aspects: "Actualizar Aspectos"
+ requests: "Requests"
+ ignore_remove: "Ignorar/Remover"
+ new_aspect:
+ add_a_new_aspect: "Añadir nuevo aspecto"
+ create: "Crear"
+ create:
+ success:"Pulsa en el signo de mas a la izquierda para escojer quien puede ver su nuevo aspecto."
+ destroy:
+ success: "%{name} fue removido exitosamente."
+ update:
+ success: "Su aspecto, %{name}, fue editado exitosamente."
+ move_friends:
+ failure: "Fallo el editar aspecto para el amigo %{real_name}."
+ success: "Los aspectos fueron editados exitosamente."
+ move_friend:
+ error: "no funciono %{inspect}"
+ notice: "Ahora estas mostrando a tu amigo un aspecto diferente de ti."
+ helper:
+ remove: "remover"
+ aspect_not_empty: "Aspecto no esta vacio"
+ users:
+ edit:
+ cancel: "Cancelar"
+ update_profile: "Actualizar Perfil"
+ home: "Home"
+ diaspora_username: "USUARIO DE DIASPORA"
+ info: "Info"
+ picture: "Picture"
+ editing_profile: "Editando perfil"
+ albums: "Ãlbums"
+ you_dont_have_any_photos: "No tienes ninguna foto! ve a la pagina"
+ page_to_upload_some: "para subir algunas"
+ comments:
+ comment:
+ ago: "atras"
+ new_comment:
+ comment: "Commentario"
+ photos:
+ show:
+ prev: "prev"
+ full_size: "tamaño actual"
+ next: "prox"
+ edit_photo: "Editar Foto"
+ delete_photo: "Eliminar Foto"
+ are_you_sure: "Esta seguro?"
+ comments: "comentarios"
+ edit:
+ editing: "Editando"
+ are_you_sure: "Esta seguro?"
+ delete_photo: "Eliminar Foto"
+ photo:
+ show_comments: "mostrar comentarios"
+ posted_a_new_photo_to: "a puesto una nueva foto en"
+ new:
+ new_photo: "Nueva Foto"
+ back_to_list: "Devuelta a la lista"
+ post_it: "post it!"
+ create:
+ runtime_error: "Photo upload failed. Are you sure that your seatbelt is fastened?"
+ integrity_error: "Photo upload failed. Are you sure that was an image?"
+ type_error: "Photo upload failed. Are you sure an image was added?"
+ update:
+ notice: "Photo successfully updated."
+ error: "Failed to edit photo."
+ destroy:
+ notice: "Photo deleted."
+ registrations:
+ new:
+ sign_up: "Registrate"
+ create:
+ success: "Esta registrado en Diaspora!"
+ status_messages:
+ new_status_message:
+ tell_me_something_good: "dime algo bueno"
+ oh_yeah: "oh yeah!"
+ status_message:
+ show_comments: "mostrar comentarios"
+ delete: "Eliminar"
+ are_you_sure: "Esta seguro?"
+ show:
+ status_message: "Mensaje de status"
+ comments: "comentarios"
+ are_you_sure: "Esta seguro?"
+ destroy: "Destruir"
+ view_all: "Ver Todos"
+ message: "Mensaje"
+ owner: "Dueño"
+ helper:
+ no_message_to_display: "No hay mensajes que mostrar."
+ people:
+ person:
+ add_friend: "añadir amigo"
+ pending_request: "petición pendiente"
+ index:
+ add_friend: "añadir amigo"
+ real_name: "nombre real"
+ diaspora_handle: "usuario en diaspora"
+ thats_you: "ese eres tu!"
+ friend_request_pending: "friend request pending"
+ you_have_a_friend_request_from_this_person: "you have a friend request from this person"
+ show:
+ last_seen: "ultima vez visto: %{how_long_ago}"
+ friends_since: "amigos desde: %{how_long_ago}"
+ save: "guardar"
+ are_you_sure: "Esta seguro?"
+ remove_friend: "remover amigo"
+ requests:
+ new_request:
+ add_a_new_friend_to: "Añade un nuevo amigo a "
+ enter_a_diaspora_username: "Escribe el usuario de Diaspora:"
+ your_diaspora_username_is: "Tu usuario de Diaspora es: %{diaspora_handle}"
+ friends_username: "Usuario de amigo"
+ destroy:
+ success: "Ahora son amigos."
+ error: "Seleccione un aspecto!"
+ ignore: "Ignorar peticion de amistad"
+ create:
+ error: "No diaspora seed found with this email!"
+ already_friends: "Ya eres amigo de %{destination_url}!"
+ success: "Una peticion de amistad se envio a %{destination_url}."
+ horribly_wrong: "Algo horriblemente mal sucedio"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
new file mode 100644
index 0000000000000000000000000000000000000000..5e1a6da3272737b4773dcef393e31ba0a5e10151
--- /dev/null
+++ b/config/locales/diaspora/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"
diff --git a/config/locales/diaspora/fr-informal.yml b/config/locales/diaspora/fr-informal.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f70812fdfdd2d2af4f232969b398693a232bff2f
--- /dev/null
+++ b/config/locales/diaspora/fr-informal.yml
@@ -0,0 +1,205 @@
+# Copyright (c) 2010, Diaspora Inc. This file is
+# licensed under the Affero General Public License version 3. See
+# the COPYRIGHT file.
+
+
+# Localization file for French (Informal Honorifics). Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+fr-informal:
+ hello: "Bonjour tout le monde"
+ application:
+ helper:
+ unknown_person: "personne inconnue"
+ new_requests: "nouvelles requêtes"
+ dashboards:
+ helper:
+ home: "accueil"
+ error_messages:
+ helper:
+ invalid_fields: "Champs invalides"
+ correct_the_following_errors_and_try_again: "Corrige les erreurs suivantes, puis réessaie."
+ people:
+ helper:
+ results_for: " résultats concernant %{params}"
+ people_on_pod_are_aware_of: " personnes agissant comme des automates sont conscients de"
+ layouts:
+ application:
+ edit_profile: "éditer le profil"
+ logout: "déconnexion"
+ shared:
+ aspect_nav:
+ all_aspects: "Tous les aspects"
+ manage: "Gérer"
+ manage_your_aspects: "Gérer tes aspects"
+ sub_header:
+ all_aspects: "Tous les aspects"
+ manage_aspects: "Gérer les aspects"
+ publisher:
+ share: "Partager"
+ aspect_friends:
+ add_friends: "ajouter des amis"
+ albums:
+ album:
+ you: "toi"
+ new_album:
+ create: "créer"
+ add_a_new_album: "Ajouter un nouvel album"
+ show:
+ edit_album: "Éditer l’album"
+ albums: "albums"
+ updated: "mis à jour"
+ by: "par"
+ edit:
+ editing: "Édition"
+ updated: "mis à jour"
+ are_you_sure: "Es-tu sûr(e)?"
+ delete_album: "Supprimer l’album"
+ cancel: "Annuler"
+ index:
+ home: "accueil"
+ new_album: "Nouvel album"
+ create:
+ success: "Tu as créé un album nommé %{name}."
+ update:
+ success: "L’album %{name} a été édité avec succès."
+ failure: "L’édition de l’album %{name} a échoué."
+ destroy:
+ success: "L’album %{name} a été supprimé."
+ helper:
+ friends_albums: "Albums d’amis"
+ your_albums: "Tes albums"
+ aspects:
+ index:
+ photos: "photos"
+ show:
+ photos: "photos"
+ manage:
+ add_a_new_aspect: "Ajouter un nouvel aspect"
+ add_a_new_friend: "Ajouter un nouvel ami"
+ show: "Afficher"
+ update_aspects: "Mettre à jour les aspects"
+ requests: "Requêtes"
+ ignore_remove: "Ignorer/Supprimer"
+ new_aspect:
+ add_a_new_aspect: "Ajouter un nouvel aspect"
+ create: "Créer"
+ create:
+ success:"Clique sur le symbole plus situé sur le côté gauche afin que Diaspora détermine qui peut voir ton nouvel aspect."
+ destroy:
+ success: "%{name} a été supprimé avec succès."
+ update:
+ success: "Ton aspect, %{name}, a été édité avec succès."
+ move_friends:
+ failure: "L’édition de l’aspect concernant l’ami %{real_name} a échoué."
+ success: "Les aspects ont été édités avec succès."
+ move_friend:
+ error: "ne fonctionne pas %{inspect}"
+ notice: "Tu montres à présent à ton ami un aspect différent au tien."
+ helper:
+ remove: "supprimer"
+ aspect_not_empty: "L’aspect n’est pas vide"
+ users:
+ edit:
+ cancel: "Annuler"
+ update_profile: "Mettre à jour le profil"
+ home: "Accueil"
+ diaspora_username: "NOM D’UTILISATEUR DIASPORA"
+ info: "Information"
+ picture: "Image"
+ editing_profile: "Édition du profil"
+ albums: "Albums"
+ you_dont_have_any_photos: "Tu n’as aucune photo ! Rends-toi sur la page"
+ page_to_upload_some: "afin d’en transférer quelques-unes."
+ comments:
+ comment:
+ ago: "il y a"
+ new_comment:
+ comment: "Commentaire"
+ photos:
+ show:
+ prev: "précédent"
+ full_size: "taille réelle"
+ next: "suivant"
+ edit_photo: "Éditer la photo"
+ delete_photo: "Supprimer la photo"
+ are_you_sure: "Es-tu sûr(e) ?"
+ comments: "commentaires"
+ edit:
+ editing: "Édition"
+ are_you_sure: "Es-tu sûr(e) ?"
+ delete_photo: "Supprimer la photo"
+ photo:
+ show_comments: "afficher les commentaires"
+ posted_a_new_photo_to: "a publié une nouvelle photo sur"
+ new:
+ new_photo: "Nouvelle photo"
+ back_to_list: "Retourner à la liste"
+ post_it: "publie-la !"
+ create:
+ runtime_error: "Le transfert de la photo a échoué. Es-tu sûr(e) que ta ceinture de sécurité est bien attachée ?"
+ integrity_error: "Le transfert de la photo a échoué. Es-tu sûr(e) que c’était bien une image ?"
+ type_error: "Le transfert de la photo a échoué. Es-tu sûr(e) que l’image était bien ajoutée ?"
+ update:
+ notice: "La photo a été mise à jour avec succès."
+ error: "Échec de l’édition de la photo."
+ destroy:
+ notice: "Photo supprimée."
+ registrations:
+ new:
+ sign_up: "Inscription"
+ create:
+ success: "Tu as rejoint Diaspora !"
+ status_messages:
+ new_status_message:
+ tell_me_something_good: "dis-moi quelque chose de bien"
+ oh_yeah: "oh ouais !"
+ status_message:
+ show_comments: "afficher les commentaires"
+ delete: "Supprimer"
+ are_you_sure: "Es-tu sûr(e) ?"
+ show:
+ status_message: "Message d’état"
+ comments: "commentaires"
+ are_you_sure: "Es-tu sûr(e) ?"
+ destroy: "Détruire"
+ view_all: "Tout voir"
+ message: "Message"
+ owner: "Propriétaire"
+ helper:
+ no_message_to_display: "Aucun message à afficher."
+ people:
+ person:
+ add_friend: "ajouter un ami"
+ pending_request: "requête en attente"
+ index:
+ add_friend: "ajouter un ami"
+ real_name: "nom réel"
+ diaspora_handle: "maniement de Diaspora"
+ thats_you: "c’est toi !"
+ friend_request_pending: "Requête d’ami en attente"
+ you_have_a_friend_request_from_this_person: "tu as une requête d’ami de la part de cette personne"
+ new:
+ new_person: "Nouvelle personne"
+ back_to_list: "Retourner à la liste"
+ show:
+ last_seen: "dernière connexion : %{how_long_ago}"
+ friends_since: "amis depuis : %{how_long_ago}"
+ save: "sauvegarder"
+ are_you_sure: "Es-tu sûr(e) ?"
+ remove_friend: "supprimer un ami"
+ requests:
+ new_request:
+ add_a_new_friend_to: "Ajouter un ami à "
+ enter_a_diaspora_username: "Saisi un nom d’utilisateur Diaspora :"
+ your_diaspora_username_is: "Ton nom d’utilisateur Diaspora est : %{diaspora_handle}"
+ friends_username: "Nom d’utilisateur de l’ami"
+ destroy:
+ success: "Vous êtes à présent amis."
+ error: "Merci de sélectionner un aspect !"
+ ignore: "Requête d’ami ignorée."
+ create:
+ error: "Aucun résultat Diaspora n’a été trouvé avec cette adresse e-mail !"
+ already_friends: "Tu es déjà ami avec %{destination_url}!"
+ success: "Une requête d’ami a été envoyée à %{destination_url}."
+ horribly_wrong: "Quelque chose d’horrible s’est produit."
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
new file mode 100644
index 0000000000000000000000000000000000000000..6d77dcf008decb516799d0f4a0e8a592383376dc
--- /dev/null
+++ b/config/locales/diaspora/fr.yml
@@ -0,0 +1,160 @@
+# Copyright (c) 2010, Diaspora Inc. This file is
+# licensed under the Affero General Public License version 3. See
+# the COPYRIGHT file.
+
+# Localization file for French. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+fr:
+ hello: "Bonjour tout le monde"
+ application:
+ helper:
+ unknown_person: "unknown person"
+ new_requests: "new requests"
+ dashboards:
+ helper:
+ home: "home"
+ error_messages:
+ helper:
+ invalid_fields: "Invalid Fields"
+ correct_the_following_errors_and_try_again: "Correct the following errors and try again."
+ people:
+ helper:
+ results_for: " resultados para %{params}"
+ people_on_pod_are_aware_of: " gente en pod estan al tanto de "
+ layouts:
+ application:
+ edit_profile: "Éditez votre profil"
+ logout: "Déconnexion"
+ shared:
+ aspect_nav:
+ all_aspects: "Tous les Aspects"
+ manage: "Gérez"
+ manage_your_aspects: "Gérez vos Aspects"
+ sub_header:
+ all_aspects: "Tous les Aspects"
+ manage_aspects: "Gérez vos Aspects"
+ publisher:
+ share: "Partager"
+ aspect_friends:
+ add_friends: "Ajouter des amis"
+ albums:
+ album:
+ you: "vous"
+ new_album:
+ create: "créer"
+ add_a_new_album: "Ajouter un nouvel album"
+ show:
+ edit_album: "Éditer l’album"
+ albums: "albums"
+ updated: "mis à jour"
+ by: "par"
+ edit:
+ editing: "Édition"
+ updated: "mis à jour"
+ are_you_sure: "Êtes-vous sûr?"
+ delete_album: "Supprimer l'album"
+ cancel: "Annuler"
+ index:
+ home: "accueil"
+ new_album: "Nouvel album"
+ helper:
+ friends_albums: "Friends Albums"
+ your_albums: "Your Albums"
+ create:
+ success: "Tu as créé un album nommé %{name}."
+ update:
+ success: "L’album %{name} a été édité avec succès."
+ failure: "L’édition de l’album %{name} a échoué."
+ destroy:
+ success: "L’album %{name} a été supprimé."
+ aspects:
+ index:
+ photos: "photos"
+ show:
+ photos: "photos"
+ manage:
+ add_a_new_aspect: "Ajouter un nouvel aspect"
+ add_a_new_friend: "Ajouter un nouvel amis"
+ show: "Voir"
+ update_aspects: "Mettre à jour les aspects"
+ requests: "Requêtes"
+ ignore_remove: "Ignorer/Supprimer"
+ new_aspect:
+ add_a_new_aspect: "Ajouter un nouvel aspect"
+ create: "Créer"
+ create:
+ success:"Cliquez sur plus situé sur le côté gauche afin d’en informer Diaspora qui peut voir votre nouvel aspect."
+ users:
+ edit:
+ cancel: "Annuler"
+ update_profile: "Mettre à jour le profil"
+ home: "Accueil"
+ diaspora_username: "NOM D’UTILISATEUR DIASPORA"
+ info: "Information"
+ picture: "Image"
+ editing_profile: "Édition du profil"
+ albums: "Albums"
+ you_dont_have_any_photos: "Vous n’avez aucune photo ! Rendez-vous sur la page"
+ page_to_upload_some: "afin d’en transférer quelques-unes."
+ comments:
+ comment:
+ ago: "il y a"
+ new_comment:
+ comment: "Commentaire"
+ photos:
+ show:
+ prev: "précédent"
+ full_size: "taille réelle"
+ next: "suivant"
+ edit_photo: "Éditer la photo"
+ delete_photo: "Supprimer la photo"
+ are_you_sure: "Êtes-vous sûr ?"
+ comments: "commentaires"
+ edit:
+ editing: "Édition"
+ are_you_sure: "Êtes-vous sûr ?"
+ delete_photo: "Supprimer la photo"
+ photo:
+ show_comments: "afficher les commentaires"
+ posted_a_new_photo_to: "a publié une nouvelle photo sur"
+ new:
+ new_photo: "Nouvelle photo"
+ back_to_list: "Retourner à la liste"
+ post_it: "publiez-la !"
+ registrations:
+ new:
+ sign_up: "Inscription"
+ status_messages:
+ new_status_message:
+ tell_me_something_good: "dites-moi quelque chose de bien"
+ oh_yeah: "oh ouais !"
+ status_message:
+ show_comments: "afficher les commentaires"
+ delete: "Supprimer"
+ are_you_sure: "Êtes-vous sûr ?"
+ show:
+ status_message: "Message d’état"
+ comments: "commentaires"
+ are_you_sure: "Êtes-vous sûr ?"
+ destroy: "Détruire"
+ view_all: "Tout voir"
+ message: "Message"
+ owner: "Propriétaire"
+ people:
+ index:
+ add_friend: "ajouter un ami"
+ real_name: "nom réel"
+ diaspora_handle: "maniement de Diaspora"
+ thats_you: "c’est vous !"
+ friend_request_pending: "Requête d’ami en attente"
+ you_have_a_friend_request_from_this_person: "vous avez une requête d’ami de la part de cette personne"
+ new:
+ new_person: "Nouvelle personne"
+ back_to_list: "Retourner à la liste"
+ show:
+ last_seen: "dernière connexion : %{how_long_ago}"
+ friends_since: "amis depuis : %{how_long_ago}"
+ save: "sauvegarder"
+ are_you_sure: "Êtes-vous sûr ?"
+ remove_friend: "supprimer un ami"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
new file mode 100644
index 0000000000000000000000000000000000000000..4cce93d737ea172ca638eb8ce62115a7e5ed9269
--- /dev/null
+++ b/config/locales/diaspora/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"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
new file mode 100644
index 0000000000000000000000000000000000000000..e1a529431b9192d7fe815e609ac1e22693ea11fa
--- /dev/null
+++ b/config/locales/diaspora/lt.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.
+
+lt:
+ hello: "Sveikas pasauli"
diff --git a/config/locales/en.yml b/config/locales/diaspora/pl.yml
similarity index 91%
rename from config/locales/en.yml
rename to config/locales/diaspora/pl.yml
index 1de275cf94e159fe15045cf40f88538726d7e669..2052779bd14f6703ae992ffaa03a6c164c9e2ccc 100644
--- a/config/locales/en.yml
+++ b/config/locales/diaspora/pl.yml
@@ -6,5 +6,5 @@
# 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.
-en:
- hello: "Hello world"
+pl:
+ hello: "Witaj świecie"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
new file mode 100644
index 0000000000000000000000000000000000000000..10425864bfc23af31a02423b7a4847e26c3dba19
--- /dev/null
+++ b/config/locales/diaspora/pt-BR.yml
@@ -0,0 +1,143 @@
+# 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"
+ layouts:
+ application:
+ edit_profile: "editar perfil"
+ logout: "sair"
+ shared:
+ aspect_nav:
+ all_aspects: "Todos Aspectos"
+ manage: "Gerenciar"
+ manage_your_aspects: "Gerencie seus Aspectos"
+ sub_header:
+ all_aspects: "Todos Aspectos"
+ manage_aspects: "Gerenciar Aspectos"
+ publisher:
+ share: "Compartilhar"
+ aspect_friends:
+ add_friends: "adicionar amigos"
+ albums:
+ album:
+ you: "você"
+ new_album:
+ create: "criar"
+ add_a_new_album: "Adicionar novo álbum"
+ show:
+ edit_album: "Editar Ãlbum"
+ albums: "álbuns"
+ updated: "atualizado"
+ by: "por"
+ edit:
+ editing: "Editando"
+ updated: "atualizado"
+ are_you_sure: "Tem certeza?"
+ delete_album: "Excluir Ãlbum"
+ cancel: "Cancelar"
+ index:
+ home: "home"
+ new_album: "Novo Ãlbum"
+ create:
+ success: "Você criou com sucesso um álbum chamado %{name}."
+ update:
+ success: "O álbum %{name} foi editado com sucesso."
+ failure: "Erro ao editar o álbum %{name}."
+ destroy:
+ success: "O álbum %{name} foi excluÃdo com sucesso."
+ aspects:
+ index:
+ photos: "photos"
+ show:
+ photos: "photos"
+ manage:
+ add_a_new_aspect: "Adicionar um novo aspecto"
+ add_a_new_friend: "Adicionar um novo amigo"
+ show: "Exibir"
+ update_aspects: "Atualizar Aspectos"
+ requests: "Solicitações"
+ ignore_remove: "Ignorar/Excluir"
+ new_aspect:
+ add_a_new_aspect: "Adicionar um novo aspecto"
+ create: "Criar"
+ create:
+ success:"Clique no mais(+) do lado esquerdo para dizer ao Diaspora quem pode ver seu novo aspecto."
+ users:
+ edit:
+ cancel: "Cancelar"
+ update_profile: "Atualizar Perfil"
+ home: "Home"
+ diaspora_username: "USUÃRIO DIASPORA"
+ info: "Informações"
+ picture: "Imagem"
+ editing_profile: "Editando perfil"
+ albums: "Ãlbuns"
+ you_dont_have_any_photos: "Você não possui nenhuma photo! Vá para"
+ page_to_upload_some: "para fazer o upload de alguma."
+ comments:
+ comment:
+ ago: "atrás"
+ new_comment:
+ comment: "Comentário"
+ photos:
+ show:
+ prev: "anterior"
+ full_size: "tamanho máximo"
+ next: "próxima"
+ edit_photo: "Editar Foto"
+ delete_photo: "Excluir Foto"
+ are_you_sure: "Tem certeza?"
+ comments: "comentários"
+ edit:
+ editing: "Editando"
+ are_you_sure: "Tem certeza?"
+ delete_photo: "Excluir Foto"
+ photo:
+ show_comments: "exibir comentários"
+ posted_a_new_photo_to: "enviada um nova foto para"
+ new:
+ new_photo: "Nova Foto"
+ back_to_list: "Voltar para a Lista"
+ post_it: "enviar!"
+ registrations:
+ new:
+ sign_up: "Cadastro"
+ status_messages:
+ new_status_message:
+ tell_me_something_good: "diga-me qualquer coisa legal"
+ oh_yeah: "É isso aÃ!"
+ status_message:
+ show_comments: "exibir comentários"
+ delete: "Excluir"
+ are_you_sure: "Tem certeza?"
+ show:
+ status_message: "Mensagem de Status"
+ comments: "comentários"
+ are_you_sure: "Tem certeza?"
+ destroy: "Excluir"
+ view_all: "Exibir Todas"
+ message: "Mensagem"
+ owner: "Pertence a"
+ people:
+ index:
+ add_friend: "adicionar amigo(a)"
+ real_name: "nome real"
+ diaspora_handle: "diaspora handle"
+ thats_you: "esse é você!"
+ friend_request_pending: "pedido de amizade pendente"
+ you_have_a_friend_request_from_this_person: "você possui um pedido de amizade dessa pessoa"
+ new:
+ new_person: "Nova Pessoa"
+ back_to_list: "Voltar para a Lista"
+ show:
+ last_seen: "visto pela última vez a: %{how_long_ago}"
+ friends_since: "amigos desde: %{how_long_ago}"
+ save: "salvar"
+ are_you_sure: "Tem certeza?"
+ remove_friend: "excluir amigo"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ce3d9abbc458f3fc51172881e1542e0ce1603dc0
--- /dev/null
+++ b/config/locales/diaspora/pt-PT.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 Portugal. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+pt-PT:
+ hello: "Olá mundo"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c99bd2a85ae6ae14a9a381b273910700da0c4499
--- /dev/null
+++ b/config/locales/diaspora/ro.yml
@@ -0,0 +1,139 @@
+# Copyright (c) 2010, Diaspora Inc. This file is
+# licensed under the Affero General Public License version 3. See
+# the COPYRIGHT file.
+
+ro:
+ hello: "Bună, lume!"
+ layouts:
+ application:
+ edit_profile: "editare profil"
+ logout: "deconectare"
+ shared:
+ aspect_nav:
+ all_aspects: "Toate Aspectele"
+ manage: "Administrare"
+ manage_your_aspects: "Administrare Aspecte"
+ sub_header:
+ all_aspects: "Toate Aspectele"
+ manage_aspects: "Administrare Aspecte"
+ publisher:
+ share: "Distribuie"
+ aspect_friends:
+ add_friends: "adăugare prieteni"
+ albums:
+ album:
+ you: "tu"
+ new_album:
+ create: "crează"
+ add_a_new_album: "Album nou"
+ show:
+ edit_album: "Editare Album"
+ albums: "albume"
+ updated: "actualizat"
+ by: "de"
+ edit:
+ editing: "Editare"
+ updated: "actualizat"
+ are_you_sure: "Sunteți sigur(ă)?"
+ delete_album: "Șterge Album"
+ cancel: "Renuță"
+ index:
+ home: "acasă"
+ new_album: "Album Nou"
+ create:
+ success: "Ați creat un album numit %{name}."
+ update:
+ success: "Albumul %{name} a fost modificat cu succes."
+ failure: "Eroare la editarea albumului %{name}."
+ destroy:
+ success: "Albumul %{name} a fost șters."
+ aspects:
+ index:
+ photos: "poze"
+ show:
+ photos: "poze"
+ manage:
+ add_a_new_aspect: "Adaugă aspect"
+ add_a_new_friend: "Adadugă prieten"
+ show: "Arată"
+ update_aspects: "Actualizează Aspecte"
+ requests: "Cereri"
+ ignore_remove: "Ignoră/Șterge"
+ new_aspect:
+ add_a_new_aspect: "Adaugă aspect"
+ create: "Crează"
+ create:
+ success:"Click pe semnul plus în partea stângă pentru a indica cine poate accesa noul aspect."
+ users:
+ edit:
+ cancel: "Renunță"
+ update_profile: "Actualizează Profil"
+ home: "Home"
+ diaspora_username: "DIASPORA USERNAME"
+ info: "Info"
+ picture: "Poză"
+ editing_profile: "Editare profil"
+ albums: "Albume"
+ you_dont_have_any_photos: "Nu ai nici o fotografie! Mergi la"
+ page_to_upload_some: "pentru a încărca câteva."
+ comments:
+ comment:
+ ago: "în urmă"
+ new_comment:
+ comment: "Comentariu"
+ photos:
+ show:
+ prev: "precedent"
+ full_size: "mărime deplină"
+ next: "următor"
+ edit_photo: "Modifică Poză"
+ delete_photo: "Șterge Poză"
+ are_you_sure: "Sunteți sigur(ă)?"
+ comments: "comments"
+ edit:
+ editing: "Modificare"
+ are_you_sure: "Sunteți sigur(ă)?"
+ delete_photo: "Șterge poză"
+ photo:
+ show_comments: "arată comentarii"
+ posted_a_new_photo_to: "a postat o nouă poză în"
+ new:
+ new_photo: "Poză nouă"
+ back_to_list: "Înapoi la Listă"
+ post_it: "postează!"
+ registrations:
+ new:
+ sign_up: "ÃŽnregistrare"
+ status_messages:
+ new_status_message:
+ tell_me_something_good: "spune-mi ceva bun"
+ oh_yeah: "o, da!"
+ status_message:
+ show_comments: "arată comentarii"
+ delete: "Șterge"
+ are_you_sure: "Sunteți sigur(ă)?"
+ show:
+ status_message: "Mesaj Stare"
+ comments: "comentarii"
+ are_you_sure: "Sunteți sigur(ă)?"
+ destroy: "Distruge"
+ view_all: "Vezi Toate"
+ message: "Mesaj"
+ owner: "Proprietar"
+ people:
+ index:
+ add_friend: "adaugă prieten"
+ real_name: "nume real"
+ diaspora_handle: "diaspora id"
+ thats_you: "acesta ești tu!"
+ friend_request_pending: "cerere de prietenie nerezolvată"
+ you_have_a_friend_request_from_this_person: "aveți o cerere de prietenie din partea acestei persoane"
+ new:
+ new_person: "Persoană Nouă"
+ back_to_list: "Înapoi la Listă"
+ show:
+ last_seen: "văzut: %{how_long_ago}"
+ friends_since: "prieteni: %{how_long_ago}"
+ save: "salvează"
+ are_you_sure: "Sunteți sigur(ă)?"
+ remove_friend: "șterge prieten"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d0d9e80396fb11b14d62ee9ef39e8e0941ce90c1
--- /dev/null
+++ b/config/locales/diaspora/ru.yml
@@ -0,0 +1,143 @@
+# 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 Russian. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+ru:
+ hello: "Привет, мир"
+ layouts:
+ application:
+ edit_profile: "редактировать профиль"
+ logout: "выйти"
+ shared:
+ aspect_nav:
+ all_aspects: "Ð’Ñе аÑпекты"
+ manage: "Управление"
+ manage_your_aspects: "Управление вашими аÑпектами"
+ sub_header:
+ all_aspects: "Ð’Ñе аÑпекты"
+ manage_aspects: "Управление аÑпектами"
+ publisher:
+ share: "Опубликовать"
+ aspect_friends:
+ add_friends: "добавить друзей"
+ albums:
+ album:
+ you: "Ð’Ñ‹"
+ new_album:
+ create: "Ñоздать"
+ add_a_new_album: "Добавить новый альбом"
+ show:
+ edit_album: "Редактировать альбом"
+ albums: "альбомы"
+ updated: "обновленные"
+ by: "по"
+ edit:
+ editing: "Редактирование"
+ updated: "обновлено"
+ are_you_sure: "Вы уверены?"
+ delete_album: "Удалить альбом"
+ cancel: "Отмена"
+ index:
+ home: "домой"
+ new_album: "Ðовый альбом"
+ create:
+ success: "Ð’Ñ‹ Ñоздали новый альбом %{name}."
+ update:
+ success: "Ðльбом %{name} уÑпешно редактирован."
+ failure: "Ðевозможно редактировать альбом %{name}."
+ destroy:
+ success: "Ðльбом %{name} удален."
+ aspects:
+ index:
+ photos: "фотографии"
+ show:
+ photos: "фотографии"
+ manage:
+ add_a_new_aspect: "Добавить аÑпект"
+ add_a_new_friend: "Добавить друга"
+ show: "Показать"
+ update_aspects: "Обновить аÑпекты"
+ requests: "ЗапроÑÑ‹"
+ ignore_remove: "Игнорировать/Удалить"
+ new_aspect:
+ add_a_new_aspect: "Добавить аÑпект"
+ create: "Создать"
+ create:
+ success:"Ðажмите на Ð¿Ð»ÑŽÑ Ñлева, Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, что-бы указать Diaspora тех, кто может видеть ваш новый аÑпект."
+ users:
+ edit:
+ cancel: "Отмена"
+ update_profile: "Обновить профиль"
+ home: "Домой"
+ diaspora_username: "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ DIASPORA"
+ info: "ИнформациÑ"
+ picture: "Ðватар"
+ editing_profile: "Редактирование профилÑ"
+ albums: "Ðльбомы"
+ you_dont_have_any_photos: "У Ð²Ð°Ñ Ð½ÐµÑ‚ ни одной фотографии! Перейдите на "
+ page_to_upload_some: "Ñтраницу Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸."
+ comments:
+ comment:
+ ago: "ранее"
+ new_comment:
+ comment: "Комментарий"
+ photos:
+ show:
+ prev: "предыдущаÑ"
+ full_size: "полный размер"
+ next: "ÑледующаÑ"
+ edit_photo: "Редактировать"
+ delete_photo: "Удалить"
+ are_you_sure: "Вы уверены?"
+ comments: "комментарии"
+ edit:
+ editing: "Редактирование"
+ are_you_sure: "Вы уверены?"
+ delete_photo: "Удалить фотографию"
+ photo:
+ show_comments: "показать комментарии"
+ posted_a_new_photo_to: "опубликовано в"
+ new:
+ new_photo: "ÐÐ¾Ð²Ð°Ñ Ñ„Ð¾Ñ‚Ð¾Ð³Ñ€Ð°Ñ„Ð¸Ñ"
+ back_to_list: "ВернутьÑÑ Ðº ÑпиÑку"
+ post_it: "опубликовать!"
+ registrations:
+ new:
+ sign_up: "Выйти"
+ status_messages:
+ new_status_message:
+ tell_me_something_good: "Ñкажи мне что-нибудь хорошее"
+ oh_yeah: "о да!"
+ status_message:
+ show_comments: "показать комментарии"
+ delete: "Удалить"
+ are_you_sure: "Вы уверены?"
+ show:
+ status_message: "Сообщение о ÑтатуÑе"
+ comments: "комментарии"
+ are_you_sure: "Вы уверены?"
+ destroy: "Уничтожить"
+ view_all: "Показать вÑе"
+ message: "Сообщение"
+ owner: "Владелец"
+ people:
+ index:
+ add_friend: "добавить друга"
+ real_name: "наÑтоÑщее имÑ"
+ diaspora_handle: "идентификатор diaspora"
+ thats_you: "Ñто Ð’Ñ‹!"
+ friend_request_pending: "Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° дружбу в ожидании"
+ you_have_a_friend_request_from_this_person: "у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° дружбу от Ñтого человека"
+ new:
+ new_person: "ÐÐ¾Ð²Ð°Ñ Ð¿ÐµÑ€Ñона"
+ back_to_list: "Обратно к ÑпиÑку"
+ show:
+ last_seen: "поÑледний раз был %{how_long_ago}"
+ friends_since: "Ð´Ñ€ÑƒÐ·ÑŒÑ Ñ %{how_long_ago}"
+ save: "Ñохранить"
+ are_you_sure: "Вы уверены?"
+ remove_friend: "удалить друга"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
new file mode 100644
index 0000000000000000000000000000000000000000..1caf878b88f08f66e5bacbb6dffb6b1903ca77a6
--- /dev/null
+++ b/config/locales/diaspora/sv.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.
+
+
+# Swedish localization file.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+sv:
+ hello: "Hej"
diff --git a/config/routes.rb b/config/routes.rb
index b0ce8bbdfa2eb0cd55adfbf060567a68a20a66a7..0ac115b76e67e6b68edaa3de375cf80ce5d7f78b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,17 +6,18 @@
Diaspora::Application.routes.draw do
resources :people, :only => [:index, :show, :destroy]
- resources :users, :except => [:create, :new]
- resources :status_messages, :only => [:create, :destroy, :show]
+ resources :users, :except => [:create, :new, :show]
+ resources :status_messages
resources :comments, :except => [:index]
resources :requests, :except => [:edit, :update]
resources :photos, :except => [:index]
resources :albums
- match 'aspects/manage', :to => 'aspects#manage'
- resources :aspects, :except => [:edit]
match 'aspects/move_friends', :to => 'aspects#move_friends', :as => 'move_friends'
match 'aspects/move_friend', :to => 'aspects#move_friend', :as => 'move_friend'
+ match 'aspects/manage', :to => 'aspects#manage'
+ resources :aspects, :except => [:edit]
+
match 'warzombie', :to => "dev_utilities#warzombie"
match 'zombiefriends', :to => "dev_utilities#zombiefriends"
@@ -31,6 +32,7 @@ Diaspora::Application.routes.draw do
match 'logout', :to => 'devise/sessions#destroy', :as => "destroy_user_session"
match 'signup', :to => 'registrations#new', :as => "new_user_registration"
+ match 'get_to_the_choppa', :to => redirect("/signup")
#public routes
#
match 'webfinger', :to => 'publics#webfinger'
diff --git a/config/sprinkle/conf/nginx.conf b/config/sprinkle/conf/nginx.conf
index 2b3aa8a404a8422eb2b1a4374b0f0bc76a5871c6..eba9fa45b4fed6293c00bab137b76a11a9503a7a 100644
--- a/config/sprinkle/conf/nginx.conf
+++ b/config/sprinkle/conf/nginx.conf
@@ -33,12 +33,14 @@ http {
# gzip_disable "MSIE [1-6]\.(?!.*SV1)";
upstream thin_cluster {
server unix:/tmp/thin.0.sock;
+ server unix:/tmp/thin.1.sock;
+ server unix:/tmp/thin.2.sock;
}
server {
listen 80;
- server_name babycakes.sofaer.net www.babycakes.sofaer.net;
+ server_name pivots.joindiaspora.com www.pivots.joindiaspora.com;
root /usr/local/app/diaspora/current;
location / {
diff --git a/config/sprinkle/deploy_key/id_rsa b/config/sprinkle/deploy_key/id_rsa
deleted file mode 100644
index 133715158075f6df6d2f9d13ce2275c935439c52..0000000000000000000000000000000000000000
--- a/config/sprinkle/deploy_key/id_rsa
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAvCyAkyAMbn+flqwLIEnPL08iY8dWpkel1wtXXjUtaINjuvZ7
-2XwK7ntnVHVRm49t+QFMWh8SpxDHnJDgb3X6uYem2DzB6L8HtuFVFN5lOUi+TeiI
-LJsBmiGHc1tQwGB0jqmCG0J2QBDpDiw//ktOJNlZJfnPGY+4viSXwWpYhhh1v3ij
-Inmp0+lw7z0+TyklNGVEsr6emwkgo5t20ClAQDmwy1BeYBcmtAehF55V3aSPQt1d
-+hCmwl11PR6BLuGYgRirr4Xyc/GmyZVKkz8dLv40X+/Bk2D7owO+N5hf74EB1e3r
-7Vu7LAfUOdtOFQJV5SWr3HTPo5vvU1oqR4VViQIBIwKCAQEApqsSy3QoRJzsb4Jw
-QStuXRo0ZwEDmpc7HY2zyHg+KV5uRoKK89REMlALEEqnXeVwCG7dOeEB5G3yoJ2T
-lewnNpy4WR/e8rfTofrHs2XkoHOhPbCzIDGFE3zIbXzD3ZdCqj5dS1gfl9R2picx
-XZMn9MCCKPMzxi7W1ExL5dM4dsOuPRvie+nYGWvvv/LXvFTLFXDVwGXOhfDkLocv
-r6STaUMj7RzLJneawOg1YS1Ivsj+Db4Q+abB4mRRhOe6igYu9Zd0ve8XAjJAHbx2
-Kzl5XKj8fhOSwXyLBh+enqHv0yLR7GaZn0odjNdUeWdD0kF9DnsL3VMa12wmNXtu
-48bX3wKBgQDzPRDyYmBIKp/eStzAEmkVz98JmQQoX3tF0VrVdLK0j0nLB19jbHl8
-poHaPG8qIgGfFMwdhLOJmJ6CXa4eHffLJ0c32Ow+jQ+Is70Ssn6WSq0962WuuoWA
-ARUwhyO9BaWvzTnMCYDI+dSydM26cvDmTTuvCJDbifmAkArgWGqM4wKBgQDGC9za
-VTqnfBHGBXebLk/PRA8YOD9CvRrIrjylUxeSrbScK9i6v+1WK3dZCl8j7H3yYJ3B
-8CT38FXxrHtGIn+5XU++fAeiLrnmNlYFCsn1nLt2SUqvODYYefxm/Vq1LQaWknHV
-itnZF1CIltLLMI2w2iVCA0xRqots6gX+SMarowKBgQC7pCMEIAEhuntTthgB4lEQ
-047M48Fg+TM13AQ+RBTUboliG6FbU64s9XodYdIZMC0i8slYmZHQi616gsgl3JqV
-Z3F0OaBNgsLXK5HbOT0U2oWky4j0gUJqD3a/CSoyuzasMJpM8WNZNcFWd1zgSgpL
-QuTmHI0BIUtxzjRGqptWvQKBgGAxpckiFSzHO9U12wI7ENJi4sKe+ie678CPJMVU
-PqZUXwoGqxjg4P332uIa+wLR9AgDCsvpq45eyqiVmvYuA4XrfoEXq++wS6pU5/PS
-ClK512VWzID+C6V9FDIGB3ySNmZkYy000DY+hjO2+KvVwSoDjnCFQlONWanuAuk5
-So3hAoGBALfkYFRtSilhvtjOnnil0hdyUbCcRmKeUYl2Yb/cb3JmUfi9xRur7K46
-Okwba+mnOJQT0kefFEUwsP9UPVLgppVh+llyAal1aJ5OnXn1o996TGTfNmy1aThr
-aaGeAU2u8GFBiBrz9tRwzZo8ixUEZZrGFFN/n53bDHpBsbhRvHGX
------END RSA PRIVATE KEY-----
diff --git a/config/sprinkle/deploy_key/id_rsa.pub b/config/sprinkle/deploy_key/id_rsa.pub
deleted file mode 100644
index e0b8e37159a27347f956443f6970e77086d5645b..0000000000000000000000000000000000000000
--- a/config/sprinkle/deploy_key/id_rsa.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvCyAkyAMbn+flqwLIEnPL08iY8dWpkel1wtXXjUtaINjuvZ72XwK7ntnVHVRm49t+QFMWh8SpxDHnJDgb3X6uYem2DzB6L8HtuFVFN5lOUi+TeiILJsBmiGHc1tQwGB0jqmCG0J2QBDpDiw//ktOJNlZJfnPGY+4viSXwWpYhhh1v3ijInmp0+lw7z0+TyklNGVEsr6emwkgo5t20ClAQDmwy1BeYBcmtAehF55V3aSPQt1d+hCmwl11PR6BLuGYgRirr4Xyc/GmyZVKkz8dLv40X+/Bk2D7owO+N5hf74EB1e3r7Vu7LAfUOdtOFQJV5SWr3HTPo5vvU1oqR4VViQ== Diaspora deploy key
diff --git a/config/sprinkle/deploy_key/known_hosts b/config/sprinkle/deploy_key/known_hosts
deleted file mode 100644
index 6b07b19ca908928ad7f627efc0aa673016bc873d..0000000000000000000000000000000000000000
--- a/config/sprinkle/deploy_key/known_hosts
+++ /dev/null
@@ -1,2 +0,0 @@
-|1|1DLdTjtEIabpLiLzhVOp7colQSQ=|/Nw4MuJAYIztcexQDWF3NQoEljs= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
-|1|j1rKwLcrA2MgHhcpdVf04ig02Hs=|Y4Jl+8HpsTyFlhSwoVxSVeRsf3k= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
diff --git a/config/sprinkle/provision.rb b/config/sprinkle/provision.rb
index 9f983399e2933687283b707070e833d5cc274d10..fc81b1ca3ee154adbb3971db1b4a8b50c8fd742e 100644
--- a/config/sprinkle/provision.rb
+++ b/config/sprinkle/provision.rb
@@ -7,13 +7,13 @@
-require "#{File.dirname(__FILE__)}/packages/essential"
-require "#{File.dirname(__FILE__)}/packages/database"
-require "#{File.dirname(__FILE__)}/packages/server"
-require "#{File.dirname(__FILE__)}/packages/scm"
-require "#{File.dirname(__FILE__)}/packages/ruby"
+require '#{File.dirname(__FILE__)}/packages/essential'
+require '#{File.dirname(__FILE__)}/packages/database'
+require '#{File.dirname(__FILE__)}/packages/server'
+require '#{File.dirname(__FILE__)}/packages/scm'
+require '#{File.dirname(__FILE__)}/packages/ruby'
-policy :diaspora, :roles => [:tom,:backer] do
+policy :diaspora, :roles => [:pivots] do
# requires :clean_dreamhost
requires :tools
requires :rubygems
diff --git a/config/thin.yml b/config/thin.yml
index cc071975d81cdf46f581e3050cbf84ae3f186383..ad91436c1a55b7b5ad4d6edc63a878d1a2cd2128 100644
--- a/config/thin.yml
+++ b/config/thin.yml
@@ -13,7 +13,7 @@ max_conns: 1024
require: []
max_persistent_conns: 512
-environment: development
+environment: development
servers: 1
daemonize: true
#chdir: /usr/applications/localhash/current
diff --git a/db/seeds/backer.rb b/db/seeds/backer.rb
index b32b623770b160cba0d4385ecb5f45ee33c828a2..20fe90fdf9f908547f67bfeb0ceab89498fe79cf 100644
--- a/db/seeds/backer.rb
+++ b/db/seeds/backer.rb
@@ -15,25 +15,38 @@
require 'config/environment'
def create
+
+
config = YAML.load_file(File.dirname(__FILE__) + '/../../config/deploy_config.yml')
backer_info = config['servers']['backer']
backer_number = YAML.load_file(Rails.root.join('config','backer_number.yml'))[:seed_number].to_i
- # Create seed user
+
+ #set pod url
username = backer_info[backer_number]['username'].gsub(/ /,'').downcase
+ set_app_config username
+ require 'config/initializers/_load_app_config.rb'
+
+ # Create seed user
user = User.instantiate!(:email => "#{username}@#{username}.joindiaspora.com",
:username => username,
:password => "#{username+backer_info[backer_number]['pin'].to_s}",
:password_confirmation => "#{username+backer_info[backer_number]['pin'].to_s}",
- :url=> "http://#{username}.joindiaspora.com/",
:person => Person.new(
- :diaspora_handle => "#{username}@#{username}.joindiaspora.com",
:profile => Profile.new( :first_name => backer_info[backer_number]['given_name'], :last_name => backer_info[backer_number]['family_name'],
- :image_url => "http://#{username}.joindiaspora.com/images/user/#{username}.jpg"),
- :url=> "http://#{username}.joindiaspora.com/")
- )
+ :image_url => "http://#{username}.joindiaspora.com/images/user/#{username}.jpg")
+ ))
user.person.save!
user.aspect(:name => "Presidents")
end
+def set_app_config username
+ current_config = YAML.load(File.read(Rails.root.join('config', 'app_config.yml.example')))
+ current_config[Rails.env.to_s] ||= {}
+ current_config[Rails.env.to_s]['pod_url'] = "#{username}.joindiaspora.com"
+ current_config['default']['pod_url'] = "#{username}.joindiaspora.com"
+ file = File.new(Rails.root.join('..','..','shared','app_config.yml'),'w')
+ file.write(current_config.to_yaml)
+ file.close
+end
diff --git a/db/seeds/dev.rb b/db/seeds/dev.rb
index 12c728ddfa374af794211097928ef7e0343e8ac6..e2d8a5495df936227bd118bf394dfb0c924ae0cb 100644
--- a/db/seeds/dev.rb
+++ b/db/seeds/dev.rb
@@ -6,31 +6,35 @@
require 'config/environment'
-host = "localhost:3000"
-url = "http://#{host}/"
+def set_app_config username
+ current_config = YAML.load(File.read(Rails.root.join('config', 'app_config.yml.example')))
+ current_config[Rails.env.to_s] ||= {}
+ current_config[Rails.env.to_s]['pod_url'] = "#{username}.joindiaspora.com"
+ current_config['default']['pod_url'] = "#{username}.joindiaspora.com"
+ file = File.new(Rails.root.join('config','app_config.yml'),'w')
+ file.write(current_config.to_yaml)
+ file.close
+end
+
username = "tom"
+set_app_config username
+
# Create seed user
user = User.instantiate!( :email => "tom@tom.joindiaspora.com",
:username => "tom",
:password => "evankorth",
:password_confirmation => "evankorth",
- :url=> "http://#{username}.joindiaspora.com/"
:person => Person.new(
- :diaspora_handle => "tom@tom.joindiaspora.com",
- :url => url,
:profile => Profile.new( :first_name => "Alexander", :last_name => "Hamiltom" ))
)
user.person.save!
user2 = User.instantiate!( :email => "korth@tom.joindiaspora.com",
:username => "korth",
- :url=> "http://#{username}.joindiaspora.com/"
:password => "evankorth",
:password_confirmation => "evankorth",
- :person => Person.new( :diaspora_handle => "korth@tom.joindiaspora.com",
- :url => url,
- :profile => Profile.new( :first_name => "Evan",
- :last_name => "Korth")))
+ :person => Person.new(
+ :profile => Profile.new( :first_name => "Evan", :last_name => "Korth")))
user2.person.save!
diff --git a/db/seeds/tom.rb b/db/seeds/tom.rb
index af6f737a91f4d3426165898465dcf2754352e7e5..cc3000d0bfd415bc5be73fe5e877cf78a8a9c1aa 100644
--- a/db/seeds/tom.rb
+++ b/db/seeds/tom.rb
@@ -6,16 +6,26 @@
require 'config/environment'
-remote_url = "http://tom.joindiaspora.com/"
+def set_app_config username
+ current_config = YAML.load(File.read(Rails.root.join('config', 'app_config.yml.example')))
+ current_config[Rails.env.to_s] ||= {}
+ current_config[Rails.env.to_s]['pod_url'] = "#{username}.joindiaspora.com"
+ current_config['default']['pod_url'] = "#{username}.joindiaspora.com"
+ file = File.new(Rails.root.join('..','..','shared','app_config.yml'),'w')
+ file.write(current_config.to_yaml)
+ file.close
+end
+
+set_app_config "tom"
+require 'config/initializers/_load_app_config.rb'
+
+
# Create seed user
user = User.instantiate!( :email => "tom@tom.joindiaspora.com",
:username => "tom",
:password => "evankorth",
:password_confirmation => "evankorth",
- :url => remote_url,
:person => {
- :diaspora_handle => "tom@tom.joindiaspora.com",
- :url => remote_url,
:profile => { :first_name => "Alexander", :last_name => "Hamiltom",
:image_url => "http://tom.joindiaspora.com/images/user/tom.jpg"}}
)
@@ -25,11 +35,7 @@ user2 = User.instantiate!( :email => "korth@tom.joindiaspora.com",
:password => "evankorth",
:password_confirmation => "evankorth",
:username => "korth",
- :url => remote_url,
- :person => { :diaspora_handle => "korth@tom.joindiaspora.com",
- :url => remote_url,
- :profile => { :first_name => "Evan",
- :last_name => "Korth",
+ :person => {:profile => { :first_name => "Evan", :last_name => "Korth",
:image_url => "http://tom.joindiaspora.com/images/user/korth.jpg"}})
user2.person.save!
@@ -40,3 +46,5 @@ request = user.send_friend_request_to(user2, aspect)
reversed_request = user2.accept_friend_request( request.id, user2.aspect(:name => "presidents").id )
user.receive reversed_request.to_diaspora_xml
user.aspect(:name => "Presidents")
+
+
diff --git a/lib/diaspora/user/friending.rb b/lib/diaspora/user/friending.rb
index cf55a2bf017ae83f4244e79c27bd59ae3ba968d2..f3b30f9b35b13eaf90cbc1f42743084e2c6ab301 100644
--- a/lib/diaspora/user/friending.rb
+++ b/lib/diaspora/user/friending.rb
@@ -8,6 +8,9 @@ module Diaspora
module UserModules
module Friending
def send_friend_request_to(desired_friend, aspect)
+ # should have different exception types for these?
+ raise "You have already sent a friend request to that person!" if self.pending_requests.detect{
+ |x| x.destination_url == desired_friend.receive_url }
raise "You are already friends with that person!" if self.friends.detect{
|x| x.receive_url == desired_friend.receive_url}
request = Request.instantiate(
@@ -62,7 +65,7 @@ module Diaspora
def receive_friend_request(friend_request)
Rails.logger.info("receiving friend request #{friend_request.to_json}")
- if request_from_me?(friend_request)
+ if request_from_me?(friend_request) && self.aspect_by_id(friend_request.aspect_id)
aspect = self.aspect_by_id(friend_request.aspect_id)
activate_friend(friend_request.person, aspect)
@@ -86,7 +89,8 @@ module Diaspora
def remove_friend(bad_friend)
raise "Friend not deleted" unless self.friend_ids.delete( bad_friend.id )
- aspects.each{|g| g.person_ids.delete( bad_friend.id )}
+ aspects.each{|aspect|
+ aspect.person_ids.delete( bad_friend.id )}
self.save
self.raw_visible_posts.find_all_by_person_id( bad_friend.id ).each{|post|
diff --git a/lib/diaspora/user/querying.rb b/lib/diaspora/user/querying.rb
index ad023f2fb96606a591ef186ace362666c91d4c39..bd4174c76e43b507d4c9a3900ebcddebee940755 100644
--- a/lib/diaspora/user/querying.rb
+++ b/lib/diaspora/user/querying.rb
@@ -7,14 +7,9 @@
module Diaspora
module UserModules
module Querying
- def visible_posts_from_others(opts ={})
- if opts[:from].class == Person
- Post.where(:person_id => opts[:from].id, :_id.in => self.visible_post_ids)
- elsif opts[:from].class == Aspect
- Post.where(:_id.in => opts[:from].post_ids) unless opts[:from].user != self
- else
- Post.where(:_id.in => self.visible_post_ids)
- end
+
+ def find_visible_post_by_id( id )
+ self.raw_visible_posts.find id
end
def visible_posts( opts = {} )
@@ -22,6 +17,8 @@ module Diaspora
return raw_visible_posts if opts[:by_members_of] == :all
aspect = self.aspects.find_by_id( opts[:by_members_of].id )
aspect.posts
+ elsif opts[:from]
+ self.raw_visible_posts.find_all_by_person_id(opts[:from].id, :order => 'created_at DESC')
end
end
@@ -38,11 +35,6 @@ module Diaspora
aspects.detect{|x| x.id == id }
end
- def album_by_id( id )
- id = id.to_id
- albums.detect{|x| x.id == id }
- end
-
def aspects_with_post( id )
self.aspects.find_all_by_post_ids( id.to_id )
end
diff --git a/lib/diaspora/user/receiving.rb b/lib/diaspora/user/receiving.rb
new file mode 100644
index 0000000000000000000000000000000000000000..39b1af5d2d8700dff9e85def1fb14c41c29fb441
--- /dev/null
+++ b/lib/diaspora/user/receiving.rb
@@ -0,0 +1,93 @@
+module Diaspora
+ module UserModules
+ module Receiving
+ def receive_salmon ciphertext
+ cleartext = decrypt( ciphertext)
+ salmon = Salmon::SalmonSlap.parse cleartext
+ if salmon.verified_for_key?(salmon.author.public_key)
+ Rails.logger.info("data in salmon: #{salmon.data}")
+ self.receive(salmon.data)
+ end
+ end
+
+ def receive xml
+ object = Diaspora::Parser.from_xml(xml)
+ Rails.logger.debug("Receiving object for #{self.real_name}:\n#{object.inspect}")
+ Rails.logger.debug("From: #{object.person.inspect}") if object.person
+
+ if object.is_a? Retraction
+ receive_retraction object, xml
+ elsif object.is_a? Request
+ receive_request object, xml
+ elsif object.is_a? Profile
+ receive_profile object, xml
+ elsif object.is_a?(Comment)
+ receive_comment object, xml
+ else
+ receive_post object, xml
+ end
+ end
+
+ def receive_retraction retraction, xml
+ if retraction.type == 'Person'
+ Rails.logger.info( "the person id is #{retraction.post_id} the friend found is #{visible_person_by_id(retraction.post_id).inspect}")
+ unfriended_by visible_person_by_id(retraction.post_id)
+ else
+ retraction.perform self.id
+ aspects = self.aspects_with_person(retraction.person)
+ aspects.each{ |aspect| aspect.post_ids.delete(retraction.post_id.to_id)
+ aspect.save
+ }
+ end
+ end
+
+ def receive_request request, xml
+ person = Diaspora::Parser.parse_or_find_person_from_xml( xml )
+ person.serialized_key ||= request.exported_key
+ request.person = person
+ request.person.save
+ old_request = Request.first(:id => request.id)
+ request.aspect_id = old_request.aspect_id if old_request
+ request.save
+ receive_friend_request(request)
+ end
+
+ def receive_profile profile, xml
+ person = Diaspora::Parser.owner_id_from_xml xml
+ person.profile = profile
+ person.save
+ end
+
+ def receive_comment comment, xml
+ comment.person = Diaspora::Parser.parse_or_find_person_from_xml( xml ).save if comment.person.nil?
+ self.visible_people = self.visible_people | [comment.person]
+ self.save
+ Rails.logger.debug("The person parsed from comment xml is #{comment.person.inspect}") unless comment.person.nil?
+ comment.person.save
+ Rails.logger.debug("From: #{comment.person.inspect}") if comment.person
+ raise "In receive for #{self.real_name}, signature was not valid on: #{comment.inspect}" unless comment.post.person == self.person || comment.verify_post_creator_signature
+ comment.save
+ unless owns?(comment)
+ dispatch_comment comment
+ end
+ comment.socket_to_uid(id) if (comment.respond_to?(:socket_to_uid) && !self.owns?(comment))
+ end
+
+ def receive_post post, xml
+ Rails.logger.debug("Saving post: #{post}")
+ post.user_refs += 1
+ post.save
+
+ self.raw_visible_posts << post
+ self.save
+
+ aspects = self.aspects_with_person(post.person)
+ aspects.each{ |aspect|
+ aspect.posts << post
+ aspect.save
+ post.socket_to_uid(id, :aspect_ids => [aspect.id]) if (post.respond_to?(:socket_to_uid) && !self.owns?(post))
+ }
+ end
+ end
+ end
+end
diff --git a/lib/diaspora/websocket.rb b/lib/diaspora/websocket.rb
index fc79559f662905f2d0b5f7c80913838a8627058b..687bd2b7c27074a979ee47809e93dc6a066628ca 100644
--- a/lib/diaspora/websocket.rb
+++ b/lib/diaspora/websocket.rb
@@ -6,6 +6,11 @@
module Diaspora
module WebSocket
+ def self.queue_to_user(uid, data)
+ channel = Magent::GenericChannel.new('websocket')
+ channel.enqueue({:uid => uid, :data => data})
+ end
+
def self.initialize_channels
@channels = {}
end
@@ -44,6 +49,5 @@ module Diaspora
def unsocket_from_uid(id, opts={})
SocketsController.new.outgoing(id, Retraction.for(self), opts)
end
-
end
end
diff --git a/lib/message_handler.rb b/lib/message_handler.rb
index 7149ee65e0e2b49c2f1f1230cd01564df2854bda..0b55ee0f7e50d14f339ce81574241a45d3831899 100644
--- a/lib/message_handler.rb
+++ b/lib/message_handler.rb
@@ -31,7 +31,7 @@ class MessageHandler
http.callback { process; process}
when :get
http = EventMachine::HttpRequest.new(query.destination).get :timeout => TIMEOUT
- http.callback {send_to_seed(query, http.response); process}
+ http.callback {process}
else
raise "message is not a type I know!"
end
@@ -47,10 +47,6 @@ class MessageHandler
} unless @queue.size == 0
end
- def send_to_seed(message, http_response)
- #DO SOMETHING!
- end
-
def size
@queue.size
end
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index e1c0aac31a8fef5918a04ac1b06f4375b6fc7747..c0d289cdabb6715b6499cd21d357ca83832d5d81 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -22,6 +22,7 @@ namespace :db do
require 'db/seeds/backer'
create
end
+
end
desc 'Delete the collections in the current RAILS_ENV database'
@@ -53,4 +54,17 @@ namespace :db do
Rake::Task['db:seed:dev'].invoke
puts "you did it!"
end
+
+ task :fix_diaspora_handle do
+ puts "fixing the people in this seed"
+ require 'config/environment'
+ Person.where(:url => 'example.org').all.each{|person|
+ if person.owner
+ person.url = APP_CONFIG[:pod_url]
+ person.diaspora_handle = person.owner.diaspora_handle
+ person.save
+ end
+ }
+ puts "everything should be peachy"
+ end
end
diff --git a/public/javascripts/aspect-edit.js b/public/javascripts/aspect-edit.js
index e1d9b6c6cc4c101acca379a2a0a00a25f86ad9e6..9f9e5803e88cdba37bbc3b8c8385046945460d30 100644
--- a/public/javascripts/aspect-edit.js
+++ b/public/javascripts/aspect-edit.js
@@ -3,42 +3,34 @@
* the COPYRIGHT file.
*/
-
-$('#move_friends_link').live( 'click', function(){
- $.post('/aspects/move_friends',
- { 'moves' : $('#aspect_list').data() },
- function(){ $('#aspect_title').html("Groups edited successfully!");});
-
- $(".person").css('background-color','none');
- $('#aspect_list').removeData();
- $(".person").attr('from_aspect_id', function(){return $(this).parent().attr('id')})
-
-});
-
-function decrementRequestsCounter(){
- var old_request_count = $(".new_requests").html().match(/\d+/);
+function decrementRequestsCounter() {
+ var $new_requests = $(".new_requests"),
+ request_html = $new_requests.html(),
+ old_request_count = request_html.match(/\d+/);
if( old_request_count == 1 ) {
- $(".new_requests").html(
- $(".new_requests").html().replace(/ \(\d+\)/,''));
-
+ $new_requests.html(
+ request_html.replace(/ \(\d+\)/,'')
+ );
} else {
- $(".new_requests").html(
- $(".new_requests").html().replace(/\d+/,old_request_count-1));
+ $new_requests.html(
+ request_html.replace(/\d+/,old_request_count-1)
+ );
}
-
}
$(function() {
+ // Multiple classes here won't work
$("ul .person").draggable({
revert: true
});
-
+
$("ul .requested_person").draggable({
revert: true
});
$(".aspect ul").droppable({
+ hoverClass: 'active',
drop: function(event, ui) {
if ($(ui.draggable[0]).hasClass('requested_person')){
@@ -51,67 +43,80 @@ $(function() {
}
});
- }else {
- var move = {};
- move[ 'friend_id' ] = ui.draggable[0].id
- move[ 'to' ] = $(this)[0].id;
- move[ 'from' ] = ui.draggable[0].getAttribute('from_aspect_id');
- if (move['to'] == move['from']){
- $('#aspect_list').data( ui.draggable[0].id, []);
- ui.draggable.css('background-color','#eee');
+ };
+ var dropzone = $(this)[0];
+
+ if ($(this)[0].id == ui.draggable[0].getAttribute('from_aspect_id')){
+ ui.draggable.css('background','none');
} else {
- $('#aspect_list').data( ui.draggable[0].id, move);
ui.draggable.css('background-color','orange');
+ $.ajax({
+ url: "/aspects/move_friend/",
+ data: {"friend_id" : ui.draggable[0].id,
+ "from" : ui.draggable[0].getAttribute('from_aspect_id'),
+ "to" : { "to" : dropzone.id }},
+ success: function(data){
+ ui.draggable.attr('from_aspect_id', dropzone.id);
+ ui.draggable.css('background','none');
+ }});
+
}
- }
$(this).closest("ul").append(ui.draggable);
}
});
$(".remove ul").droppable({
+ hoverClass: 'active',
drop: function(event, ui) {
if ($(ui.draggable[0]).hasClass('requested_person')){
$.ajax({
type: "DELETE",
- url: "/requests/" + ui.draggable[0].getAttribute('request_id')
+ url: "/requests/" + ui.draggable.attr('request_id'),
+ success: function () {
+ decrementRequestsCounter();
+ }
});
- decrementRequestsCounter();
- $(ui.draggable[0]).fadeOut('slow')
- }else{
+
+ } else {
$.ajax({
type: "DELETE",
- url: "/people/" + ui.draggable[0].id
+ url: "/people/" + ui.draggable.attr('id'),
+ success: function () {
+ alert("Removed Friend, proably want an undo countdown.")
+ }
});
- alert("Removed Friend, proably want an undo countdown.")
- $(ui.draggable[0]).fadeOut('slow')
-
+
}
+
+ $(ui.draggable[0]).fadeOut('slow'); // ui.draggable.fadeOut('slow')
}
});
-});
-$(".aspect h1").live( 'click', function() {
- var $this = $(this);
- var id = $this.closest("li").children("ul").attr("id");
- var link = "/aspects/"+ id;
+ $(".aspect h1").live( 'focus', function() {
- $this.keypress(function(e) {
- if (e.which == 13) {
- e.preventDefault();
- $this.blur();
+ var $this = $(this),
+ id = $this.closest("li").children("ul").attr("id"),
+ link = "/aspects/"+ id;
- //save changes
- $.ajax({
- type: "PUT",
- url: link,
- data: {"aspect" : {"name" : $this.text() }}
+ $this.keypress(function(e) {
+ if (e.which == 13) {
+ e.preventDefault();
+ $this.blur();
+
+ //save changes
+ $.ajax({
+ type: "PUT",
+ url: link,
+ data: {"aspect" : {"name" : $this.text() }}
+ });
+ }
+ //update all other aspect links
+ $this.keyup(function(e) {
+ $("#aspect_nav a[href='"+link+"']").text($this.text());
});
- }
- //update all other aspect links
- $this.keyup(function(e) {
- $("#aspect_nav a[href='"+link+"']").text($this.text());
});
});
+
});
diff --git a/public/javascripts/fancybox/jquery.fancybox-1.3.1.js b/public/javascripts/fancybox/jquery.fancybox-1.3.1.js
index 688f93aa34a8b739cbaeaf23e3dbfbaac8c098a4..e9b4f404b09880a496f27b6a8e4930f7f7ed30ac 100755
--- a/public/javascripts/fancybox/jquery.fancybox-1.3.1.js
+++ b/public/javascripts/fancybox/jquery.fancybox-1.3.1.js
@@ -262,6 +262,11 @@
close.show();
}
+ $("#fancybox-inner input[type='text'], #fancybox-inner textarea").focus(function() {
+ $(document).unbind('keydown.fb');
+ });
+
+
fancybox_set_navigation();
$(window).bind("resize.fb", $.fancybox.center);
@@ -1074,4 +1079,4 @@
fancybox_init();
});
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/public/javascripts/fancybox/jquery.fancybox-1.3.1.pack.js b/public/javascripts/fancybox/jquery.fancybox-1.3.1.pack.js
index 8421d53a6d1e1770e3995009feea599375909718..8efd14070325bf77d7b55ee0fb3feb6316aacdab 100755
--- a/public/javascripts/fancybox/jquery.fancybox-1.3.1.pack.js
+++ b/public/javascripts/fancybox/jquery.fancybox-1.3.1.pack.js
@@ -14,31 +14,6 @@
* http://www.gnu.org/licenses/gpl.html
*/
-(function(b){var m,u,x,g,D,i,z,A,B,p=0,e={},q=[],n=0,c={},j=[],E=null,s=new Image,G=/\.(jpg|gif|png|bmp|jpeg)(.*)?$/i,S=/[^\.]\.(swf)\s*$/i,H,I=1,k,l,h=false,y=b.extend(b("<div/>")[0],{prop:0}),v=0,O=!b.support.opacity&&!window.XMLHttpRequest,J=function(){u.hide();s.onerror=s.onload=null;E&&E.abort();m.empty()},P=function(){b.fancybox('<p id="fancybox_error">The requested content cannot be loaded.<br />Please try again later.</p>',{scrolling:"no",padding:20,transitionIn:"none",transitionOut:"none"})},
-K=function(){return[b(window).width(),b(window).height(),b(document).scrollLeft(),b(document).scrollTop()]},T=function(){var a=K(),d={},f=c.margin,o=c.autoScale,t=(20+f)*2,w=(20+f)*2,r=c.padding*2;if(c.width.toString().indexOf("%")>-1){d.width=a[0]*parseFloat(c.width)/100-40;o=false}else d.width=c.width+r;if(c.height.toString().indexOf("%")>-1){d.height=a[1]*parseFloat(c.height)/100-40;o=false}else d.height=c.height+r;if(o&&(d.width>a[0]-t||d.height>a[1]-w))if(e.type=="image"||e.type=="swf"){t+=r;
-w+=r;o=Math.min(Math.min(a[0]-t,c.width)/c.width,Math.min(a[1]-w,c.height)/c.height);d.width=Math.round(o*(d.width-r))+r;d.height=Math.round(o*(d.height-r))+r}else{d.width=Math.min(d.width,a[0]-t);d.height=Math.min(d.height,a[1]-w)}d.top=a[3]+(a[1]-(d.height+40))*0.5;d.left=a[2]+(a[0]-(d.width+40))*0.5;if(c.autoScale===false){d.top=Math.max(a[3]+f,d.top);d.left=Math.max(a[2]+f,d.left)}return d},U=function(a){if(a&&a.length)switch(c.titlePosition){case "inside":return a;case "over":return'<span id="fancybox-title-over">'+
-a+"</span>";default:return'<span id="fancybox-title-wrap"><span id="fancybox-title-left"></span><span id="fancybox-title-main">'+a+'</span><span id="fancybox-title-right"></span></span>'}return false},V=function(){var a=c.title,d=l.width-c.padding*2,f="fancybox-title-"+c.titlePosition;b("#fancybox-title").remove();v=0;if(c.titleShow!==false){a=b.isFunction(c.titleFormat)?c.titleFormat(a,j,n,c):U(a);if(!(!a||a==="")){b('<div id="fancybox-title" class="'+f+'" />').css({width:d,paddingLeft:c.padding,
-paddingRight:c.padding}).html(a).appendTo("body");switch(c.titlePosition){case "inside":v=b("#fancybox-title").outerHeight(true)-c.padding;l.height+=v;break;case "over":b("#fancybox-title").css("bottom",c.padding);break;default:b("#fancybox-title").css("bottom",b("#fancybox-title").outerHeight(true)*-1);break}b("#fancybox-title").appendTo(D).hide()}}},W=function(){b(document).unbind("keydown.fb").bind("keydown.fb",function(a){if(a.keyCode==27&&c.enableEscapeButton){a.preventDefault();b.fancybox.close()}else if(a.keyCode==
-37){a.preventDefault();b.fancybox.prev()}else if(a.keyCode==39){a.preventDefault();b.fancybox.next()}});if(b.fn.mousewheel){g.unbind("mousewheel.fb");j.length>1&&g.bind("mousewheel.fb",function(a,d){a.preventDefault();h||d===0||(d>0?b.fancybox.prev():b.fancybox.next())})}if(c.showNavArrows){if(c.cyclic&&j.length>1||n!==0)A.show();if(c.cyclic&&j.length>1||n!=j.length-1)B.show()}},X=function(){var a,d;if(j.length-1>n){a=j[n+1].href;if(typeof a!=="undefined"&&a.match(G)){d=new Image;d.src=a}}if(n>0){a=
-j[n-1].href;if(typeof a!=="undefined"&&a.match(G)){d=new Image;d.src=a}}},L=function(){i.css("overflow",c.scrolling=="auto"?c.type=="image"||c.type=="iframe"||c.type=="swf"?"hidden":"auto":c.scrolling=="yes"?"auto":"visible");if(!b.support.opacity){i.get(0).style.removeAttribute("filter");g.get(0).style.removeAttribute("filter")}b("#fancybox-title").show();c.hideOnContentClick&&i.one("click",b.fancybox.close);c.hideOnOverlayClick&&x.one("click",b.fancybox.close);c.showCloseButton&&z.show();W();b(window).bind("resize.fb",
-b.fancybox.center);c.centerOnScroll?b(window).bind("scroll.fb",b.fancybox.center):b(window).unbind("scroll.fb");b.isFunction(c.onComplete)&&c.onComplete(j,n,c);h=false;X()},M=function(a){var d=Math.round(k.width+(l.width-k.width)*a),f=Math.round(k.height+(l.height-k.height)*a),o=Math.round(k.top+(l.top-k.top)*a),t=Math.round(k.left+(l.left-k.left)*a);g.css({width:d+"px",height:f+"px",top:o+"px",left:t+"px"});d=Math.max(d-c.padding*2,0);f=Math.max(f-(c.padding*2+v*a),0);i.css({width:d+"px",height:f+
-"px"});if(typeof l.opacity!=="undefined")g.css("opacity",a<0.5?0.5:a)},Y=function(a){var d=a.offset();d.top+=parseFloat(a.css("paddingTop"))||0;d.left+=parseFloat(a.css("paddingLeft"))||0;d.top+=parseFloat(a.css("border-top-width"))||0;d.left+=parseFloat(a.css("border-left-width"))||0;d.width=a.width();d.height=a.height();return d},Q=function(){var a=e.orig?b(e.orig):false,d={};if(a&&a.length){a=Y(a);d={width:a.width+c.padding*2,height:a.height+c.padding*2,top:a.top-c.padding-20,left:a.left-c.padding-
-20}}else{a=K();d={width:1,height:1,top:a[3]+a[1]*0.5,left:a[2]+a[0]*0.5}}return d},N=function(){u.hide();if(g.is(":visible")&&b.isFunction(c.onCleanup))if(c.onCleanup(j,n,c)===false){b.event.trigger("fancybox-cancel");h=false;return}j=q;n=p;c=e;i.get(0).scrollTop=0;i.get(0).scrollLeft=0;if(c.overlayShow){O&&b("select:not(#fancybox-tmp select)").filter(function(){return this.style.visibility!=="hidden"}).css({visibility:"hidden"}).one("fancybox-cleanup",function(){this.style.visibility="inherit"});
-x.css({"background-color":c.overlayColor,opacity:c.overlayOpacity}).unbind().show()}l=T();V();if(g.is(":visible")){b(z.add(A).add(B)).hide();var a=g.position(),d;k={top:a.top,left:a.left,width:g.width(),height:g.height()};d=k.width==l.width&&k.height==l.height;i.fadeOut(c.changeFade,function(){var f=function(){i.html(m.contents()).fadeIn(c.changeFade,L)};b.event.trigger("fancybox-change");i.empty().css("overflow","hidden");if(d){i.css({top:c.padding,left:c.padding,width:Math.max(l.width-c.padding*
-2,1),height:Math.max(l.height-c.padding*2-v,1)});f()}else{i.css({top:c.padding,left:c.padding,width:Math.max(k.width-c.padding*2,1),height:Math.max(k.height-c.padding*2,1)});y.prop=0;b(y).animate({prop:1},{duration:c.changeSpeed,easing:c.easingChange,step:M,complete:f})}})}else{g.css("opacity",1);if(c.transitionIn=="elastic"){k=Q();i.css({top:c.padding,left:c.padding,width:Math.max(k.width-c.padding*2,1),height:Math.max(k.height-c.padding*2,1)}).html(m.contents());g.css(k).show();if(c.opacity)l.opacity=
-0;y.prop=0;b(y).animate({prop:1},{duration:c.speedIn,easing:c.easingIn,step:M,complete:L})}else{i.css({top:c.padding,left:c.padding,width:Math.max(l.width-c.padding*2,1),height:Math.max(l.height-c.padding*2-v,1)}).html(m.contents());g.css(l).fadeIn(c.transitionIn=="none"?0:c.speedIn,L)}}},F=function(){m.width(e.width);m.height(e.height);if(e.width=="auto")e.width=m.width();if(e.height=="auto")e.height=m.height();N()},Z=function(){h=true;e.width=s.width;e.height=s.height;b("<img />").attr({id:"fancybox-img",
-src:s.src,alt:e.title}).appendTo(m);N()},C=function(){J();var a=q[p],d,f,o,t,w;e=b.extend({},b.fn.fancybox.defaults,typeof b(a).data("fancybox")=="undefined"?e:b(a).data("fancybox"));o=a.title||b(a).title||e.title||"";if(a.nodeName&&!e.orig)e.orig=b(a).children("img:first").length?b(a).children("img:first"):b(a);if(o===""&&e.orig)o=e.orig.attr("alt");d=a.nodeName&&/^(?:javascript|#)/i.test(a.href)?e.href||null:e.href||a.href||null;if(e.type){f=e.type;if(!d)d=e.content}else if(e.content)f="html";else if(d)if(d.match(G))f=
-"image";else if(d.match(S))f="swf";else if(b(a).hasClass("iframe"))f="iframe";else if(d.match(/#/)){a=d.substr(d.indexOf("#"));f=b(a).length>0?"inline":"ajax"}else f="ajax";else f="inline";e.type=f;e.href=d;e.title=o;if(e.autoDimensions&&e.type!=="iframe"&&e.type!=="swf"){e.width="auto";e.height="auto"}if(e.modal){e.overlayShow=true;e.hideOnOverlayClick=false;e.hideOnContentClick=false;e.enableEscapeButton=false;e.showCloseButton=false}if(b.isFunction(e.onStart))if(e.onStart(q,p,e)===false){h=false;
-return}m.css("padding",20+e.padding+e.margin);b(".fancybox-inline-tmp").unbind("fancybox-cancel").bind("fancybox-change",function(){b(this).replaceWith(i.children())});switch(f){case "html":m.html(e.content);F();break;case "inline":b('<div class="fancybox-inline-tmp" />').hide().insertBefore(b(a)).bind("fancybox-cleanup",function(){b(this).replaceWith(i.children())}).bind("fancybox-cancel",function(){b(this).replaceWith(m.children())});b(a).appendTo(m);F();break;case "image":h=false;b.fancybox.showActivity();
-s=new Image;s.onerror=function(){P()};s.onload=function(){s.onerror=null;s.onload=null;Z()};s.src=d;break;case "swf":t='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="'+e.width+'" height="'+e.height+'"><param name="movie" value="'+d+'"></param>';w="";b.each(e.swf,function(r,R){t+='<param name="'+r+'" value="'+R+'"></param>';w+=" "+r+'="'+R+'"'});t+='<embed src="'+d+'" type="application/x-shockwave-flash" width="'+e.width+'" height="'+e.height+'"'+w+"></embed></object>";m.html(t);
-F();break;case "ajax":a=d.split("#",2);f=e.ajax.data||{};if(a.length>1){d=a[0];if(typeof f=="string")f+="&selector="+a[1];else f.selector=a[1]}h=false;b.fancybox.showActivity();E=b.ajax(b.extend(e.ajax,{url:d,data:f,error:P,success:function(r){if(E.status==200){m.html(r);F()}}}));break;case "iframe":b('<iframe id="fancybox-frame" name="fancybox-frame'+(new Date).getTime()+'" frameborder="0" hspace="0" scrolling="'+e.scrolling+'" src="'+e.href+'"></iframe>').appendTo(m);N();break}},$=function(){if(u.is(":visible")){b("div",
-u).css("top",I*-40+"px");I=(I+1)%12}else clearInterval(H)},aa=function(){if(!b("#fancybox-wrap").length){b("body").append(m=b('<div id="fancybox-tmp"></div>'),u=b('<div id="fancybox-loading"><div></div></div>'),x=b('<div id="fancybox-overlay"></div>'),g=b('<div id="fancybox-wrap"></div>'));if(!b.support.opacity){g.addClass("fancybox-ie");u.addClass("fancybox-ie")}D=b('<div id="fancybox-outer"></div>').append('<div class="fancy-bg" id="fancy-bg-n"></div><div class="fancy-bg" id="fancy-bg-ne"></div><div class="fancy-bg" id="fancy-bg-e"></div><div class="fancy-bg" id="fancy-bg-se"></div><div class="fancy-bg" id="fancy-bg-s"></div><div class="fancy-bg" id="fancy-bg-sw"></div><div class="fancy-bg" id="fancy-bg-w"></div><div class="fancy-bg" id="fancy-bg-nw"></div>').appendTo(g);
-D.append(i=b('<div id="fancybox-inner"></div>'),z=b('<a id="fancybox-close"></a>'),A=b('<a href="javascript:;" id="fancybox-left"><span class="fancy-ico" id="fancybox-left-ico"></span></a>'),B=b('<a href="javascript:;" id="fancybox-right"><span class="fancy-ico" id="fancybox-right-ico"></span></a>'));z.click(b.fancybox.close);u.click(b.fancybox.cancel);A.click(function(a){a.preventDefault();b.fancybox.prev()});B.click(function(a){a.preventDefault();b.fancybox.next()});if(O){x.get(0).style.setExpression("height",
-"document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'");u.get(0).style.setExpression("top","(-20 + (document.documentElement.clientHeight ? document.documentElement.clientHeight/2 : document.body.clientHeight/2 ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop )) + 'px'");D.prepend('<iframe id="fancybox-hide-sel-frame" src="javascript:\'\';" scrolling="no" frameborder="0" ></iframe>')}}};
-b.fn.fancybox=function(a){b(this).data("fancybox",b.extend({},a,b.metadata?b(this).metadata():{})).unbind("click.fb").bind("click.fb",function(d){d.preventDefault();if(!h){h=true;b(this).blur();q=[];p=0;d=b(this).attr("rel")||"";if(!d||d==""||d==="nofollow")q.push(this);else{q=b("a[rel="+d+"], area[rel="+d+"]");p=q.index(this)}C();return false}});return this};b.fancybox=function(a,d){if(!h){h=true;d=typeof d!=="undefined"?d:{};q=[];p=d.index||0;if(b.isArray(a)){for(var f=0,o=a.length;f<o;f++)if(typeof a[f]==
-"object")b(a[f]).data("fancybox",b.extend({},d,a[f]));else a[f]=b({}).data("fancybox",b.extend({content:a[f]},d));q=jQuery.merge(q,a)}else{if(typeof a=="object")b(a).data("fancybox",b.extend({},d,a));else a=b({}).data("fancybox",b.extend({content:a},d));q.push(a)}if(p>q.length||p<0)p=0;C()}};b.fancybox.showActivity=function(){clearInterval(H);u.show();H=setInterval($,66)};b.fancybox.hideActivity=function(){u.hide()};b.fancybox.next=function(){return b.fancybox.pos(n+1)};b.fancybox.prev=function(){return b.fancybox.pos(n-
-1)};b.fancybox.pos=function(a){if(!h){a=parseInt(a,10);if(a>-1&&j.length>a){p=a;C()}if(c.cyclic&&j.length>1&&a<0){p=j.length-1;C()}if(c.cyclic&&j.length>1&&a>=j.length){p=0;C()}}};b.fancybox.cancel=function(){if(!h){h=true;b.event.trigger("fancybox-cancel");J();e&&b.isFunction(e.onCancel)&&e.onCancel(q,p,e);h=false}};b.fancybox.close=function(){function a(){x.fadeOut("fast");g.hide();b.event.trigger("fancybox-cleanup");i.empty();b.isFunction(c.onClosed)&&c.onClosed(j,n,c);j=e=[];n=p=0;c=e={};h=false}
-if(!(h||g.is(":hidden"))){h=true;if(c&&b.isFunction(c.onCleanup))if(c.onCleanup(j,n,c)===false){h=false;return}J();b(z.add(A).add(B)).hide();b("#fancybox-title").remove();g.add(i).add(x).unbind();b(window).unbind("resize.fb scroll.fb");b(document).unbind("keydown.fb");i.css("overflow","hidden");if(c.transitionOut=="elastic"){k=Q();var d=g.position();l={top:d.top,left:d.left,width:g.width(),height:g.height()};if(c.opacity)l.opacity=1;y.prop=1;b(y).animate({prop:0},{duration:c.speedOut,easing:c.easingOut,
-step:M,complete:a})}else g.fadeOut(c.transitionOut=="none"?0:c.speedOut,a)}};b.fancybox.resize=function(){var a,d;if(!(h||g.is(":hidden"))){h=true;a=i.wrapInner("<div style='overflow:auto'></div>").children();d=a.height();g.css({height:d+c.padding*2+v});i.css({height:d});a.replaceWith(a.children());b.fancybox.center()}};b.fancybox.center=function(){h=true;var a=K(),d=c.margin,f={};f.top=a[3]+(a[1]-(g.height()-v+40))*0.5;f.left=a[2]+(a[0]-(g.width()+40))*0.5;f.top=Math.max(a[3]+d,f.top);f.left=Math.max(a[2]+
-d,f.left);g.css(f);h=false};b.fn.fancybox.defaults={padding:10,margin:20,opacity:false,modal:false,cyclic:false,scrolling:"auto",width:560,height:340,autoScale:true,autoDimensions:true,centerOnScroll:false,ajax:{},swf:{wmode:"transparent"},hideOnOverlayClick:true,hideOnContentClick:false,overlayShow:true,overlayOpacity:0.3,overlayColor:"#666",titleShow:true,titlePosition:"outside",titleFormat:null,transitionIn:"fade",transitionOut:"fade",speedIn:300,speedOut:300,changeSpeed:300,changeFade:"fast",
-easingIn:"swing",easingOut:"swing",showCloseButton:true,showNavArrows:true,enableEscapeButton:true,onStart:null,onCancel:null,onComplete:null,onCleanup:null,onClosed:null};b(document).ready(function(){aa()})})(jQuery);
\ No newline at end of file
+(function($){var tmp,loading,overlay,wrap,outer,inner,close,nav_left,nav_right,selectedIndex=0,selectedOpts={},selectedArray=[],currentIndex=0,currentOpts={},currentArray=[],ajaxLoader=null,imgPreloader=new Image(),imgRegExp=/\.(jpg|gif|png|bmp|jpeg)(.*)?$/i,swfRegExp=/[^\.]\.(swf)\s*$/i,loadingTimer,loadingFrame=1,start_pos,final_pos,busy=false,shadow=20,fx=$.extend($('<div/>')[0],{prop:0}),titleh=0,isIE6=!$.support.opacity&&!window.XMLHttpRequest,fancybox_abort=function(){loading.hide();imgPreloader.onerror=imgPreloader.onload=null;if(ajaxLoader){ajaxLoader.abort()}tmp.empty()},fancybox_error=function(){$.fancybox('<p id="fancybox_error">The requested content cannot be loaded.<br />Please try again later.</p>',{'scrolling':'no','padding':20,'transitionIn':'none','transitionOut':'none'})},fancybox_get_viewport=function(){return[$(window).width(),$(window).height(),$(document).scrollLeft(),$(document).scrollTop()]},fancybox_get_zoom_to=function(){var view=fancybox_get_viewport(),to={},margin=currentOpts.margin,resize=currentOpts.autoScale,horizontal_space=(shadow+margin)*2,vertical_space=(shadow+margin)*2,double_padding=(currentOpts.padding*2),ratio;if(currentOpts.width.toString().indexOf('%')>-1){to.width=((view[0]*parseFloat(currentOpts.width))/100)-(shadow*2);resize=false}else{to.width=currentOpts.width+double_padding}if(currentOpts.height.toString().indexOf('%')>-1){to.height=((view[1]*parseFloat(currentOpts.height))/100)-(shadow*2);resize=false}else{to.height=currentOpts.height+double_padding}if(resize&&(to.width>(view[0]-horizontal_space)||to.height>(view[1]-vertical_space))){if(selectedOpts.type=='image'||selectedOpts.type=='swf'){horizontal_space+=double_padding;vertical_space+=double_padding;ratio=Math.min(Math.min(view[0]-horizontal_space,currentOpts.width)/currentOpts.width,Math.min(view[1]-vertical_space,currentOpts.height)/currentOpts.height);to.width=Math.round(ratio*(to.width-double_padding))+double_padding;to.height=Math.round(ratio*(to.height-double_padding))+double_padding}else{to.width=Math.min(to.width,(view[0]-horizontal_space));to.height=Math.min(to.height,(view[1]-vertical_space))}}to.top=view[3]+((view[1]-(to.height+(shadow*2)))*0.5);to.left=view[2]+((view[0]-(to.width+(shadow*2)))*0.5);if(currentOpts.autoScale===false){to.top=Math.max(view[3]+margin,to.top);to.left=Math.max(view[2]+margin,to.left)}return to},fancybox_format_title=function(title){if(title&&title.length){switch(currentOpts.titlePosition){case'inside':return title;case'over':return'<span id="fancybox-title-over">'+title+'</span>';default:return'<span id="fancybox-title-wrap"><span id="fancybox-title-left"></span><span id="fancybox-title-main">'+title+'</span><span id="fancybox-title-right"></span></span>'}}return false},fancybox_process_title=function(){var title=currentOpts.title,width=final_pos.width-(currentOpts.padding*2),titlec='fancybox-title-'+currentOpts.titlePosition;$('#fancybox-title').remove();titleh=0;if(currentOpts.titleShow===false){return}title=$.isFunction(currentOpts.titleFormat)?currentOpts.titleFormat(title,currentArray,currentIndex,currentOpts):fancybox_format_title(title);if(!title||title===''){return}$('<div id="fancybox-title" class="'+titlec+'" />').css({'width':width,'paddingLeft':currentOpts.padding,'paddingRight':currentOpts.padding}).html(title).appendTo('body');switch(currentOpts.titlePosition){case'inside':titleh=$("#fancybox-title").outerHeight(true)-currentOpts.padding;final_pos.height+=titleh;break;case'over':$('#fancybox-title').css('bottom',currentOpts.padding);break;default:$('#fancybox-title').css('bottom',$("#fancybox-title").outerHeight(true)*-1);break}$('#fancybox-title').appendTo(outer).hide()},fancybox_set_navigation=function(){$(document).unbind('keydown.fb').bind('keydown.fb',function(e){if(e.keyCode==27&¤tOpts.enableEscapeButton){e.preventDefault();$.fancybox.close()}else if(e.keyCode==37){e.preventDefault();$.fancybox.prev()}else if(e.keyCode==39){e.preventDefault();$.fancybox.next()}});if($.fn.mousewheel){wrap.unbind('mousewheel.fb');if(currentArray.length>1){wrap.bind('mousewheel.fb',function(e,delta){e.preventDefault();if(busy||delta===0){return}if(delta>0){$.fancybox.prev()}else{$.fancybox.next()}})}}if(!currentOpts.showNavArrows){return}if((currentOpts.cyclic&¤tArray.length>1)||currentIndex!==0){nav_left.show()}if((currentOpts.cyclic&¤tArray.length>1)||currentIndex!=(currentArray.length-1)){nav_right.show()}},fancybox_preload_images=function(){var href,objNext;if((currentArray.length-1)>currentIndex){href=currentArray[currentIndex+1].href;if(typeof href!=='undefined'&&href.match(imgRegExp)){objNext=new Image();objNext.src=href}}if(currentIndex>0){href=currentArray[currentIndex-1].href;if(typeof href!=='undefined'&&href.match(imgRegExp)){objNext=new Image();objNext.src=href}}},_finish=function(){inner.css('overflow',(currentOpts.scrolling=='auto'?(currentOpts.type=='image'||currentOpts.type=='iframe'||currentOpts.type=='swf'?'hidden':'auto'):(currentOpts.scrolling=='yes'?'auto':'visible')));if(!$.support.opacity){inner.get(0).style.removeAttribute('filter');wrap.get(0).style.removeAttribute('filter')}$('#fancybox-title').show();if(currentOpts.hideOnContentClick){inner.one('click',$.fancybox.close)}if(currentOpts.hideOnOverlayClick){overlay.one('click',$.fancybox.close)}if(currentOpts.showCloseButton){close.show()}$("#fancybox-inner input[type='text'], #fancybox-inner textarea").focus(function(){$(document).unbind('keydown.fb')});fancybox_set_navigation();$(window).bind("resize.fb",$.fancybox.center);if(currentOpts.centerOnScroll){$(window).bind("scroll.fb",$.fancybox.center)}else{$(window).unbind("scroll.fb")}if($.isFunction(currentOpts.onComplete)){currentOpts.onComplete(currentArray,currentIndex,currentOpts)}busy=false;fancybox_preload_images()},fancybox_draw=function(pos){var width=Math.round(start_pos.width+(final_pos.width-start_pos.width)*pos),height=Math.round(start_pos.height+(final_pos.height-start_pos.height)*pos),top=Math.round(start_pos.top+(final_pos.top-start_pos.top)*pos),left=Math.round(start_pos.left+(final_pos.left-start_pos.left)*pos);wrap.css({'width':width+'px','height':height+'px','top':top+'px','left':left+'px'});width=Math.max(width-currentOpts.padding*2,0);height=Math.max(height-(currentOpts.padding*2+(titleh*pos)),0);inner.css({'width':width+'px','height':height+'px'});if(typeof final_pos.opacity!=='undefined'){wrap.css('opacity',(pos<0.5?0.5:pos))}},fancybox_get_obj_pos=function(obj){var pos=obj.offset();pos.top+=parseFloat(obj.css('paddingTop'))||0;pos.left+=parseFloat(obj.css('paddingLeft'))||0;pos.top+=parseFloat(obj.css('border-top-width'))||0;pos.left+=parseFloat(obj.css('border-left-width'))||0;pos.width=obj.width();pos.height=obj.height();return pos},fancybox_get_zoom_from=function(){var orig=selectedOpts.orig?$(selectedOpts.orig):false,from={},pos,view;if(orig&&orig.length){pos=fancybox_get_obj_pos(orig);from={width:(pos.width+(currentOpts.padding*2)),height:(pos.height+(currentOpts.padding*2)),top:(pos.top-currentOpts.padding-shadow),left:(pos.left-currentOpts.padding-shadow)}}else{view=fancybox_get_viewport();from={width:1,height:1,top:view[3]+view[1]*0.5,left:view[2]+view[0]*0.5}}return from},fancybox_show=function(){loading.hide();if(wrap.is(":visible")&&$.isFunction(currentOpts.onCleanup)){if(currentOpts.onCleanup(currentArray,currentIndex,currentOpts)===false){$.event.trigger('fancybox-cancel');busy=false;return}}currentArray=selectedArray;currentIndex=selectedIndex;currentOpts=selectedOpts;inner.get(0).scrollTop=0;inner.get(0).scrollLeft=0;if(currentOpts.overlayShow){if(isIE6){$('select:not(#fancybox-tmp select)').filter(function(){return this.style.visibility!=='hidden'}).css({'visibility':'hidden'}).one('fancybox-cleanup',function(){this.style.visibility='inherit'})}overlay.css({'background-color':currentOpts.overlayColor,'opacity':currentOpts.overlayOpacity}).unbind().show()}final_pos=fancybox_get_zoom_to();fancybox_process_title();if(wrap.is(":visible")){$(close.add(nav_left).add(nav_right)).hide();var pos=wrap.position(),equal;start_pos={top:pos.top,left:pos.left,width:wrap.width(),height:wrap.height()};equal=(start_pos.width==final_pos.width&&start_pos.height==final_pos.height);inner.fadeOut(currentOpts.changeFade,function(){var finish_resizing=function(){inner.html(tmp.contents()).fadeIn(currentOpts.changeFade,_finish)};$.event.trigger('fancybox-change');inner.empty().css('overflow','hidden');if(equal){inner.css({top:currentOpts.padding,left:currentOpts.padding,width:Math.max(final_pos.width-(currentOpts.padding*2),1),height:Math.max(final_pos.height-(currentOpts.padding*2)-titleh,1)});finish_resizing()}else{inner.css({top:currentOpts.padding,left:currentOpts.padding,width:Math.max(start_pos.width-(currentOpts.padding*2),1),height:Math.max(start_pos.height-(currentOpts.padding*2),1)});fx.prop=0;$(fx).animate({prop:1},{duration:currentOpts.changeSpeed,easing:currentOpts.easingChange,step:fancybox_draw,complete:finish_resizing})}});return}wrap.css('opacity',1);if(currentOpts.transitionIn=='elastic'){start_pos=fancybox_get_zoom_from();inner.css({top:currentOpts.padding,left:currentOpts.padding,width:Math.max(start_pos.width-(currentOpts.padding*2),1),height:Math.max(start_pos.height-(currentOpts.padding*2),1)}).html(tmp.contents());wrap.css(start_pos).show();if(currentOpts.opacity){final_pos.opacity=0}fx.prop=0;$(fx).animate({prop:1},{duration:currentOpts.speedIn,easing:currentOpts.easingIn,step:fancybox_draw,complete:_finish})}else{inner.css({top:currentOpts.padding,left:currentOpts.padding,width:Math.max(final_pos.width-(currentOpts.padding*2),1),height:Math.max(final_pos.height-(currentOpts.padding*2)-titleh,1)}).html(tmp.contents());wrap.css(final_pos).fadeIn(currentOpts.transitionIn=='none'?0:currentOpts.speedIn,_finish)}},fancybox_process_inline=function(){tmp.width(selectedOpts.width);tmp.height(selectedOpts.height);if(selectedOpts.width=='auto'){selectedOpts.width=tmp.width()}if(selectedOpts.height=='auto'){selectedOpts.height=tmp.height()}fancybox_show()},fancybox_process_image=function(){busy=true;selectedOpts.width=imgPreloader.width;selectedOpts.height=imgPreloader.height;$("<img />").attr({'id':'fancybox-img','src':imgPreloader.src,'alt':selectedOpts.title}).appendTo(tmp);fancybox_show()},fancybox_start=function(){fancybox_abort();var obj=selectedArray[selectedIndex],href,type,title,str,emb,selector,data;selectedOpts=$.extend({},$.fn.fancybox.defaults,(typeof $(obj).data('fancybox')=='undefined'?selectedOpts:$(obj).data('fancybox')));title=obj.title||$(obj).title||selectedOpts.title||'';if(obj.nodeName&&!selectedOpts.orig){selectedOpts.orig=$(obj).children("img:first").length?$(obj).children("img:first"):$(obj)}if(title===''&&selectedOpts.orig){title=selectedOpts.orig.attr('alt')}if(obj.nodeName&&(/^(?:javascript|#)/i).test(obj.href)){href=selectedOpts.href||null}else{href=selectedOpts.href||obj.href||null}if(selectedOpts.type){type=selectedOpts.type;if(!href){href=selectedOpts.content}}else if(selectedOpts.content){type='html'}else if(href){if(href.match(imgRegExp)){type='image'}else if(href.match(swfRegExp)){type='swf'}else if($(obj).hasClass("iframe")){type='iframe'}else if(href.match(/#/)){obj=href.substr(href.indexOf("#"));type=$(obj).length>0?'inline':'ajax'}else{type='ajax'}}else{type='inline'}selectedOpts.type=type;selectedOpts.href=href;selectedOpts.title=title;if(selectedOpts.autoDimensions&&selectedOpts.type!=='iframe'&&selectedOpts.type!=='swf'){selectedOpts.width='auto';selectedOpts.height='auto'}if(selectedOpts.modal){selectedOpts.overlayShow=true;selectedOpts.hideOnOverlayClick=false;selectedOpts.hideOnContentClick=false;selectedOpts.enableEscapeButton=false;selectedOpts.showCloseButton=false}if($.isFunction(selectedOpts.onStart)){if(selectedOpts.onStart(selectedArray,selectedIndex,selectedOpts)===false){busy=false;return}}tmp.css('padding',(shadow+selectedOpts.padding+selectedOpts.margin));$('.fancybox-inline-tmp').unbind('fancybox-cancel').bind('fancybox-change',function(){$(this).replaceWith(inner.children())});switch(type){case'html':tmp.html(selectedOpts.content);fancybox_process_inline();break;case'inline':$('<div class="fancybox-inline-tmp" />').hide().insertBefore($(obj)).bind('fancybox-cleanup',function(){$(this).replaceWith(inner.children())}).bind('fancybox-cancel',function(){$(this).replaceWith(tmp.children())});$(obj).appendTo(tmp);fancybox_process_inline();break;case'image':busy=false;$.fancybox.showActivity();imgPreloader=new Image();imgPreloader.onerror=function(){fancybox_error()};imgPreloader.onload=function(){imgPreloader.onerror=null;imgPreloader.onload=null;fancybox_process_image()};imgPreloader.src=href;break;case'swf':str='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="'+selectedOpts.width+'" height="'+selectedOpts.height+'"><param name="movie" value="'+href+'"></param>';emb='';$.each(selectedOpts.swf,function(name,val){str+='<param name="'+name+'" value="'+val+'"></param>';emb+=' '+name+'="'+val+'"'});str+='<embed src="'+href+'" type="application/x-shockwave-flash" width="'+selectedOpts.width+'" height="'+selectedOpts.height+'"'+emb+'></embed></object>';tmp.html(str);fancybox_process_inline();break;case'ajax':selector=href.split('#',2);data=selectedOpts.ajax.data||{};if(selector.length>1){href=selector[0];if(typeof data=="string"){data+='&selector='+selector[1]}else{data.selector=selector[1]}}busy=false;$.fancybox.showActivity();ajaxLoader=$.ajax($.extend(selectedOpts.ajax,{url:href,data:data,error:fancybox_error,success:function(data,textStatus,XMLHttpRequest){if(ajaxLoader.status==200){tmp.html(data);fancybox_process_inline()}}}));break;case'iframe':$('<iframe id="fancybox-frame" name="fancybox-frame'+new Date().getTime()+'" frameborder="0" hspace="0" scrolling="'+selectedOpts.scrolling+'" src="'+selectedOpts.href+'"></iframe>').appendTo(tmp);fancybox_show();break}},fancybox_animate_loading=function(){if(!loading.is(':visible')){clearInterval(loadingTimer);return}$('div',loading).css('top',(loadingFrame*-40)+'px');loadingFrame=(loadingFrame+1)%12},fancybox_init=function(){if($("#fancybox-wrap").length){return}$('body').append(tmp=$('<div id="fancybox-tmp"></div>'),loading=$('<div id="fancybox-loading"><div></div></div>'),overlay=$('<div id="fancybox-overlay"></div>'),wrap=$('<div id="fancybox-wrap"></div>'));if(!$.support.opacity){wrap.addClass('fancybox-ie');loading.addClass('fancybox-ie')}outer=$('<div id="fancybox-outer"></div>').append('<div class="fancy-bg" id="fancy-bg-n"></div><div class="fancy-bg" id="fancy-bg-ne"></div><div class="fancy-bg" id="fancy-bg-e"></div><div class="fancy-bg" id="fancy-bg-se"></div><div class="fancy-bg" id="fancy-bg-s"></div><div class="fancy-bg" id="fancy-bg-sw"></div><div class="fancy-bg" id="fancy-bg-w"></div><div class="fancy-bg" id="fancy-bg-nw"></div>').appendTo(wrap);outer.append(inner=$('<div id="fancybox-inner"></div>'),close=$('<a id="fancybox-close"></a>'),nav_left=$('<a href="javascript:;" id="fancybox-left"><span class="fancy-ico" id="fancybox-left-ico"></span></a>'),nav_right=$('<a href="javascript:;" id="fancybox-right"><span class="fancy-ico" id="fancybox-right-ico"></span></a>'));close.click($.fancybox.close);loading.click($.fancybox.cancel);nav_left.click(function(e){e.preventDefault();$.fancybox.prev()});nav_right.click(function(e){e.preventDefault();$.fancybox.next()});if(isIE6){overlay.get(0).style.setExpression('height',"document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'");loading.get(0).style.setExpression('top',"(-20 + (document.documentElement.clientHeight ? document.documentElement.clientHeight/2 : document.body.clientHeight/2 ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop )) + 'px'");outer.prepend('<iframe id="fancybox-hide-sel-frame" src="javascript:\'\';" scrolling="no" frameborder="0" ></iframe>')}};$.fn.fancybox=function(options){$(this).data('fancybox',$.extend({},options,($.metadata?$(this).metadata():{}))).unbind('click.fb').bind('click.fb',function(e){e.preventDefault();if(busy){return}busy=true;$(this).blur();selectedArray=[];selectedIndex=0;var rel=$(this).attr('rel')||'';if(!rel||rel==''||rel==='nofollow'){selectedArray.push(this)}else{selectedArray=$("a[rel="+rel+"], area[rel="+rel+"]");selectedIndex=selectedArray.index(this)}fancybox_start();return false});return this};$.fancybox=function(obj){if(busy){return}busy=true;var opts=typeof arguments[1]!=='undefined'?arguments[1]:{};selectedArray=[];selectedIndex=opts.index||0;if($.isArray(obj)){for(var i=0,j=obj.length;i<j;i++){if(typeof obj[i]=='object'){$(obj[i]).data('fancybox',$.extend({},opts,obj[i]))}else{obj[i]=$({}).data('fancybox',$.extend({content:obj[i]},opts))}}selectedArray=jQuery.merge(selectedArray,obj)}else{if(typeof obj=='object'){$(obj).data('fancybox',$.extend({},opts,obj))}else{obj=$({}).data('fancybox',$.extend({content:obj},opts))}selectedArray.push(obj)}if(selectedIndex>selectedArray.length||selectedIndex<0){selectedIndex=0}fancybox_start()};$.fancybox.showActivity=function(){clearInterval(loadingTimer);loading.show();loadingTimer=setInterval(fancybox_animate_loading,66)};$.fancybox.hideActivity=function(){loading.hide()};$.fancybox.next=function(){return $.fancybox.pos(currentIndex+1)};$.fancybox.prev=function(){return $.fancybox.pos(currentIndex-1)};$.fancybox.pos=function(pos){if(busy){return}pos=parseInt(pos,10);if(pos>-1&¤tArray.length>pos){selectedIndex=pos;fancybox_start()}if(currentOpts.cyclic&¤tArray.length>1&&pos<0){selectedIndex=currentArray.length-1;fancybox_start()}if(currentOpts.cyclic&¤tArray.length>1&&pos>=currentArray.length){selectedIndex=0;fancybox_start()}return};$.fancybox.cancel=function(){if(busy){return}busy=true;$.event.trigger('fancybox-cancel');fancybox_abort();if(selectedOpts&&$.isFunction(selectedOpts.onCancel)){selectedOpts.onCancel(selectedArray,selectedIndex,selectedOpts)}busy=false};$.fancybox.close=function(){if(busy||wrap.is(':hidden')){return}busy=true;if(currentOpts&&$.isFunction(currentOpts.onCleanup)){if(currentOpts.onCleanup(currentArray,currentIndex,currentOpts)===false){busy=false;return}}fancybox_abort();$(close.add(nav_left).add(nav_right)).hide();$('#fancybox-title').remove();wrap.add(inner).add(overlay).unbind();$(window).unbind("resize.fb scroll.fb");$(document).unbind('keydown.fb');function _cleanup(){overlay.fadeOut('fast');wrap.hide();$.event.trigger('fancybox-cleanup');inner.empty();if($.isFunction(currentOpts.onClosed)){currentOpts.onClosed(currentArray,currentIndex,currentOpts)}currentArray=selectedOpts=[];currentIndex=selectedIndex=0;currentOpts=selectedOpts={};busy=false}inner.css('overflow','hidden');if(currentOpts.transitionOut=='elastic'){start_pos=fancybox_get_zoom_from();var pos=wrap.position();final_pos={top:pos.top,left:pos.left,width:wrap.width(),height:wrap.height()};if(currentOpts.opacity){final_pos.opacity=1}fx.prop=1;$(fx).animate({prop:0},{duration:currentOpts.speedOut,easing:currentOpts.easingOut,step:fancybox_draw,complete:_cleanup})}else{wrap.fadeOut(currentOpts.transitionOut=='none'?0:currentOpts.speedOut,_cleanup)}};$.fancybox.resize=function(){var c,h;if(busy||wrap.is(':hidden')){return}busy=true;c=inner.wrapInner("<div style='overflow:auto'></div>").children();h=c.height();wrap.css({height:h+(currentOpts.padding*2)+titleh});inner.css({height:h});c.replaceWith(c.children());$.fancybox.center()};$.fancybox.center=function(){busy=true;var view=fancybox_get_viewport(),margin=currentOpts.margin,to={};to.top=view[3]+((view[1]-((wrap.height()-titleh)+(shadow*2)))*0.5);to.left=view[2]+((view[0]-(wrap.width()+(shadow*2)))*0.5);to.top=Math.max(view[3]+margin,to.top);to.left=Math.max(view[2]+margin,to.left);wrap.css(to);busy=false};$.fn.fancybox.defaults={padding:10,margin:20,opacity:false,modal:false,cyclic:false,scrolling:'auto',width:560,height:340,autoScale:true,autoDimensions:true,centerOnScroll:false,ajax:{},swf:{wmode:'transparent'},hideOnOverlayClick:true,hideOnContentClick:false,overlayShow:true,overlayOpacity:0.3,overlayColor:'#666',titleShow:true,titlePosition:'outside',titleFormat:null,transitionIn:'fade',transitionOut:'fade',speedIn:300,speedOut:300,changeSpeed:300,changeFade:'fast',easingIn:'swing',easingOut:'swing',showCloseButton:true,showNavArrows:true,enableEscapeButton:true,onStart:null,onCancel:null,onComplete:null,onCleanup:null,onClosed:null};$(document).ready(function(){fancybox_init()})})(jQuery);
+// removed arrow functionality from vanilla pack
+
diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js
index cf085675414a8100342239886186db396042946d..e8db10abd4c6ec077b2fad9ee81d83b4ebea99a0 100644
--- a/public/javascripts/stream.js
+++ b/public/javascripts/stream.js
@@ -14,14 +14,6 @@ $(document).ready(function(){
});
});//end document ready
-$("#stream li").live('mouseover',function() {
- $(this).children(".destroy_link").fadeIn(0);
-});
-
-$("#stream li").live('mouseout',function() {
- $(this).children(".destroy_link").fadeOut(0);
-});
-
$(".show_post_comments").live('click', function(event) {
event.preventDefault();
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index 4713c71645038b0b6022a07d0bfee38f9073993e..092d69f16733e36441672ea17763ee193591c4ef 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -41,6 +41,12 @@ $(document).ready(function(){
}
);
+ $("#publisher textarea").keydown( function(e) {
+ if (e.shiftKey && e.keyCode == 13) {
+ $("#publisher form").submit();
+ }
+ });
+
});//end document ready
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index fdef9e4b98f910e078a1e84f1c7da0d950032abe..1ef65078a33776b49967ecc9a1facf0d2d22683b 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -118,7 +118,6 @@ header {
header #session_action ul li:last-child {
margin-right: 0; }
header #aspect_header {
- z-index: 5;
background-color: #eeeeee;
border-top: 1px solid white;
padding: 20px 0; }
@@ -129,7 +128,7 @@ header {
color: #111111; }
header #aspect_header a:hover {
background: none;
- color: #333333; }
+ color: #999999; }
header #aspect_header .page_title {
text-transform: uppercase;
text-shadow: 0 2px 0 white;
@@ -143,8 +142,12 @@ ul#stream {
list-style: none;
padding: 12px 0;
border-bottom: 1px solid #eeeeee; }
- ul#stream > li:first-child {
- padding-top: 0; }
+ ul#stream > li:hover {
+ background-color: #fafafa; }
+ ul#stream > li:hover .destroy_link {
+ display: inline; }
+ ul#stream .right {
+ top: 0; }
li.message {
position: relative;
@@ -165,6 +168,43 @@ li.message {
li.message .content div.info {
color: #bababa;
font-size: 70%; }
+ li.message .content div.info .time a {
+ color: #666666; }
+
+.reshare_pane {
+ margin-left: 5px;
+ margin-right: 5px;
+ display: inline;
+ position: relative; }
+ .reshare_pane ul.reshare_box {
+ width: 150px;
+ display: none;
+ z-index: 10;
+ position: absolute;
+ margin-top: 5px;
+ padding: 0;
+ background-color: #fafafa;
+ list-style: none;
+ border: 5px solid #666666;
+ -webkit-box-shadow: 0 0 5px #666666;
+ -moz-box-shadow: 0 0 5px #666666;
+ text-shadow: 0 2px white;
+ color: black; }
+ .reshare_pane ul.reshare_box > li {
+ font-weight: bold;
+ padding: 8px;
+ padding-right: 15px;
+ border-top: 1px solid white;
+ border-bottom: 1px solid #cccccc; }
+ .reshare_pane ul.reshare_box > li:first-child {
+ border-top: none; }
+ .reshare_pane ul.reshare_box > li:last-child {
+ border-bottom: none; }
+ .reshare_pane ul.reshare_box > li a {
+ display: block;
+ height: 100%; }
+ .reshare_pane ul.reshare_box > li a:hover {
+ background-color: #eeeeee; }
form {
position: relative;
@@ -260,11 +300,14 @@ ul.comment_set {
.destroy_link, .request_button {
position: absolute;
- right: 0;
+ right: 2em;
bottom: 15px; }
.destroy_link a, .request_button a {
color: #999999;
font-weight: normal; }
+ .destroy_link a:hover, .request_button a:hover {
+ text-decoration: underline;
+ background: none; }
.destroy_link {
display: none;
@@ -299,7 +342,7 @@ ul.comment_set {
color: #cccccc; }
input[type='text'], textarea {
- font-family: "lucida grande", "sans-serif";
+ font-family: "lucida grande", "lucida sans", "sans-serif";
font-size: 14px;
padding: 0.3em;
display: block;
@@ -341,12 +384,18 @@ label {
margin-top: 26px; }
#publisher textarea {
width: 600px;
- height: 40px;
+ height: 42px;
margin-top: 0;
margin-bottom: 0;
- -webkit-box-shadow: 0 1px 0 white; }
+ box-shadow: 0 1px white;
+ -moz-box-shadow: 0 1px white;
+ -webkit-box-shadow: 0 1px white; }
#publisher .button {
margin-left: 100px; }
+ #publisher img {
+ -webkit-box-shadow: 0 1px 0 white;
+ border: 1px solid #bbbbbb;
+ border-top: 1px solid #666666; }
#image_picker .small_photo {
height: 100px;
@@ -456,8 +505,11 @@ h1.big_text {
#aspect_nav ul > li {
padding: 0;
display: inline;
- margin-right: 0.5em; }
+ margin-right: 2px; }
#aspect_nav ul > li a {
+ text-shadow: 0 2px 0 #444444;
+ -webkit-border-radius: 3px 3px 0 0;
+ -moz-border-radius: 3px 3px 0 0;
line-height: 22px;
background-color: #444444;
border: 1px solid #555555;
@@ -468,12 +520,16 @@ h1.big_text {
background-color: #4e4e4e;
color: #cccccc; }
#aspect_nav ul > li.selected a {
+ -webkit-box-shadow: 0px -4px 6px -2px #777777;
+ -moz-box-shadow: 0px -4px 6px -2px #777777;
text-shadow: 0 2px 0 white;
padding-top: 4px;
padding-bottom: 5px;
line-height: 18px;
font-weight: bold;
background-color: #eeeeee;
+ background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(white), to(#eeeeee));
+ background: -moz-linear-gradient(19% 75% 90deg, #eeeeee, white);
border: 1px solid white;
border-bottom: 1px solid #eeeeee;
color: black; }
@@ -509,24 +565,48 @@ h1.big_text {
.requests h1,
.remove h1 {
display: inline-block; }
+ .aspect .tip,
+ .requests .tip,
+ .remove .tip {
+ display: none;
+ color: #999999;
+ margin-left: 0.5em; }
+ .aspect .edit_name_field:hover .tip,
+ .requests .edit_name_field:hover .tip,
+ .remove .edit_name_field:hover .tip {
+ display: inline; }
.aspect .aspect_name,
.requests .aspect_name,
.remove .aspect_name {
position: relative; }
- .aspect .aspect_name .tools,
- .requests .aspect_name .tools,
- .remove .aspect_name .tools {
+ .aspect .aspect_name ul.tools,
+ .requests .aspect_name ul.tools,
+ .remove .aspect_name ul.tools {
position: absolute;
top: 10px;
right: 0;
- display: inline; }
- .aspect .aspect_name:hover .tools,
- .requests .aspect_name:hover .tools,
- .remove .aspect_name:hover .tools {
- display: inline; }
- .aspect ul,
- .requests ul,
- .remove ul {
+ display: inline;
+ padding: 0;
+ margin: 0;
+ list-style: none; }
+ .aspect .aspect_name ul.tools li,
+ .requests .aspect_name ul.tools li,
+ .remove .aspect_name ul.tools li {
+ display: inline;
+ margin-right: 1em; }
+ .aspect .aspect_name ul.tools li:last-child,
+ .requests .aspect_name ul.tools li:last-child,
+ .remove .aspect_name ul.tools li:last-child {
+ margin-right: 0; }
+ .aspect .grey,
+ .requests .grey,
+ .remove .grey {
+ color: #999999;
+ cursor: default;
+ text-shadow: 0 2px white; }
+ .aspect ul.dropzone,
+ .requests ul.dropzone,
+ .remove ul.dropzone {
min-height: 20px;
margin: 0;
margin-bottom: 25px;
@@ -534,6 +614,10 @@ h1.big_text {
border: 1px solid #cccccc;
list-style: none;
padding: 15px; }
+ .aspect ul.dropzone.active,
+ .requests ul.dropzone.active,
+ .remove ul.dropzone.active {
+ background-color: #fafafa; }
.aspect .person,
.aspect .requested_person,
.requests .person,
@@ -574,14 +658,6 @@ h1.big_text {
-webkit-box-shadow: 0 1px 3px #333333;
-moz-box-shadow: 0 2px 4px #333333;
opacity: 0.9; }
- .aspect .person .grey,
- .aspect .requested_person .grey,
- .requests .person .grey,
- .requests .requested_person .grey,
- .remove .person .grey,
- .remove .requested_person .grey {
- font-style: italic;
- color: #666666; }
#notification_badge {
position: fixed;
@@ -592,3 +668,6 @@ h1.big_text {
border: 1px solid #cccccc;
border-bottom: none;
padding: 3px 10px; }
+
+#fancybox-close:hover {
+ background-color: transparent; }
diff --git a/public/stylesheets/fileuploader.css b/public/stylesheets/fileuploader.css
index 0e3f111a9186f42a8b7c08cb3dcd2ca9030d426a..823c1b34613b77a635feae8f44ced7838735ecbc 100755
--- a/public/stylesheets/fileuploader.css
+++ b/public/stylesheets/fileuploader.css
@@ -3,14 +3,14 @@
.qq-upload-button {
display:block; /* or inline-block */
width: 105px; padding: 7px 0; text-align:center;
- background:#880000; border-bottom:1px solid #ddd;color:#fff;
+ background:#333; border-bottom:1px solid #999;color:#fff;
}
-.qq-upload-button-hover {background:#cc0000;}
+.qq-upload-button-hover {background:#666;}
.qq-upload-button-focus {outline:1px dotted black;}
.qq-upload-drop-area {
position:absolute; top:0; left:0; width:100%; height:100%; min-height: 70px; z-index:2;
- background:#FF9797; text-align:center;
+ background:#ccc; text-align:center;
}
.qq-upload-drop-area span {
display:block; position:absolute; top: 50%; width:100%; margin-top:-8px; font-size:16px;
@@ -28,4 +28,4 @@
.qq-upload-size,.qq-upload-cancel {font-size:11px;}
.qq-upload-failed-text {display:none;}
-.qq-upload-fail .qq-upload-failed-text {display:inline;}
\ No newline at end of file
+.qq-upload-fail .qq-upload-failed-text {display:inline;}
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 3912e16482a48a9cf87a597c9f13179a8377f62b..1291313de311d79fa96455af1b3ee56ab60928b5 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -146,7 +146,6 @@ header
:right 0
#aspect_header
- :z-index 5
:background
:color #eee
:border
@@ -162,7 +161,7 @@ header
:color #111
&:hover
:background none
- :color #333
+ :color #999
.page_title
:text
@@ -182,9 +181,15 @@ ul#stream
:border
:bottom 1px solid #eee
- > li:first-child
- :padding
- :top 0
+ &:hover
+ :background
+ :color #fafafa
+
+ .destroy_link
+ :display inline
+
+ .right
+ :top 0
li.message
:position relative
@@ -216,6 +221,63 @@ li.message
:color #bababa
:font-size 70%
+ .time
+ a
+ :color #666
+
+.reshare_pane
+ :margin
+ :left 5px
+ :right 5px
+ :display inline
+ :position relative
+
+ ul.reshare_box
+ :width 150px
+ :display none
+ :z-index 10
+ :position absolute
+ :margin
+ :top 5px
+ :padding 0
+
+ :background
+ :color #fafafa
+
+ :list
+ :style none
+
+ :border 5px solid #666
+ :-webkit-box-shadow 0 0 5px #666
+ :-moz-box-shadow 0 0 5px #666
+
+ :text-shadow 0 2px #fff
+ :color #000
+
+ > li
+ :font
+ :weight bold
+
+ :padding 8px
+ :right 15px
+ :border
+ :top 1px solid #fff
+ :bottom 1px solid #ccc
+
+ &:first-child
+ :border
+ :top none
+ &:last-child
+ :border
+ :bottom none
+ a
+ :display block
+ :height 100%
+
+ &:hover
+ :background
+ :color #eee
+
form
:position relative
@@ -345,12 +407,16 @@ ul.comment_set
.destroy_link, .request_button
:position absolute
- :right 0
+ :right 2em
:bottom 15px
a
:color #999
:font
:weight normal
+ &:hover
+ :text
+ :decoration underline
+ :background none
.destroy_link
:display none
@@ -392,7 +458,7 @@ ul.comment_set
input[type='text'], textarea
:font
- :family 'lucida grande', 'sans-serif'
+ :family 'lucida grande', 'lucida sans', 'sans-serif'
:size 14px
:padding 0.3em
:display block
@@ -444,16 +510,24 @@ label
textarea
:width 600px
- :height 40px
+ :height 42px
:margin
:top 0
:bottom 0
- :-webkit-box-shadow 0 1px 0 #fff
+ :box-shadow 0 1px #fff
+ :-moz-box-shadow 0 1px #fff
+ :-webkit-box-shadow 0 1px #fff
.button
:margin-left 100px
+ img
+ :-webkit-box-shadow 0 1px 0 #fff
+ :border 1px solid #bbb
+ :top 1px solid #666
+
+
#image_picker
.small_photo
@@ -601,13 +675,17 @@ h1.big_text
:padding 0
:display inline
:margin
- :right 0.5em
+ :right 2px
a
+ :text-shadow 0 2px 0 #444
+ :-webkit-border-radius 3px 3px 0 0
+ :-moz-border-radius 3px 3px 0 0
:line
:height 22px
:background
:color #444
+
:border 1px solid #555
:padding 3px 8px
@@ -620,6 +698,9 @@ h1.big_text
:color #ccc
&.selected a
+ :-webkit-box-shadow 0px -4px 6px -2px #777
+ :-moz-box-shadow 0px -4px 6px -2px #777
+
:text-shadow 0 2px 0 #fff
:padding
:top 4px
@@ -630,6 +711,10 @@ h1.big_text
:weight bold
:background
:color #eee
+
+ :background -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fff), to(#eee))
+ :background -moz-linear-gradient(19% 75% 90deg, #eee, #fff)
+
:border 1px solid #fff
:bottom 1px solid #eee
:color #000
@@ -675,20 +760,44 @@ h1.big_text
h1
:display inline-block
+ .tip
+ :display none
+ :color #999
+ :margin
+ :left 0.5em
+
+ .edit_name_field:hover
+ .tip
+ :display inline
+
+
.aspect_name
:position relative
- .tools
+ ul.tools
:position absolute
:top 10px
:right 0
:display inline
-
- &:hover
- .tools
+ :padding 0
+ :margin 0
+ :list
+ :style none
+ li
:display inline
+ :margin
+ :right 1em
- ul
+ &:last-child
+ :margin
+ :right 0
+
+ .grey
+ :color #999
+ :cursor default
+ :text-shadow 0 2px #fff
+
+ ul.dropzone
:min-height 20px
:margin 0
:bottom 25px
@@ -699,6 +808,10 @@ h1.big_text
:style none
:padding 15px
+ &.active
+ :background
+ :color #fafafa
+
.person,
.requested_person
:display inline-block
@@ -726,12 +839,6 @@ h1.big_text
:-moz-box-shadow 0 2px 4px #333
:opacity 0.9
-
- .grey
- :font
- :style italic
- :color #666
-
#notification_badge
:position fixed
:bottom 0
@@ -746,3 +853,7 @@ h1.big_text
:bottom none
:padding 3px 10px
+
+#fancybox-close:hover
+ :background
+ :color transparent
diff --git a/public/stylesheets/sessions.css b/public/stylesheets/sessions.css
index 3a59e54af3bac5f5b39a3747a39677cbeb9fbefe..2b5199d25fd367db87c930badadaa41cfaeb3dd2 100644
--- a/public/stylesheets/sessions.css
+++ b/public/stylesheets/sessions.css
@@ -11,8 +11,11 @@
#flash_alert {
z-index: 100;
top: 32px;
+ position: absolute;
color: black;
width: 400px;
+ margin: 0 0 0 -200px;
+ left: 50%;
text-align: center;
font-size: 14px;
padding: 3px 0; }
diff --git a/script/server b/script/server
new file mode 100755
index 0000000000000000000000000000000000000000..3804ccad981047ff73319ff5edd34cf49003ef8b
--- /dev/null
+++ b/script/server
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Check if Mongo is running
+
+if ! ps ax | grep -v grep | grep mongod >/dev/null
+then
+ echo "Mongod not started"
+else
+ mkdir -p -v log/thin/
+ bundle exec ruby ./script/websocket_server.rb&
+ bundle exec thin start $@
+fi
+
diff --git a/script/websocket_server.rb b/script/websocket_server.rb
new file mode 100644
index 0000000000000000000000000000000000000000..dae054f157faf79c1fc07375b45620fd80179df5
--- /dev/null
+++ b/script/websocket_server.rb
@@ -0,0 +1,48 @@
+# Copyright (c) 2010, Diaspora Inc. This file is
+# licensed under the Affero General Public License version 3. See
+# the COPYRIGHT file.
+
+require File.dirname(__FILE__) + '/../config/environment'
+require File.dirname(__FILE__) + '/../lib/diaspora/websocket'
+
+CHANNEL = Magent::GenericChannel.new('websocket')
+def process_message
+ if CHANNEL.queue_count > 0
+ message = CHANNEL.dequeue
+ if message
+ Diaspora::WebSocket.push_to_user(message['uid'], message['data'])
+ end
+ EM.next_tick{ process_message}
+ else
+ EM::Timer.new(1){process_message}
+ end
+
+end
+
+begin
+ EM.run {
+ Diaspora::WebSocket.initialize_channels
+
+ EventMachine::WebSocket.start(
+ :host => APP_CONFIG[:socket_host],
+ :port => APP_CONFIG[:socket_port],
+ :debug =>APP_CONFIG[:socket_debug]) do |ws|
+ ws.onopen {
+
+ sid = Diaspora::WebSocket.subscribe(ws.request['Path'].gsub('/',''), ws)
+
+ ws.onmessage { |msg| SocketsController.new.incoming(msg) }
+
+ ws.onclose { Diaspora::WebSocket.unsubscribe(ws.request['Path'].gsub('/',''), sid) }
+ }
+ end
+
+ puts "Websocket server started."
+ process_message
+ }
+rescue RuntimeError => e
+ raise e unless e.message.include?("no acceptor")
+ puts "Are you sure the websocket server isn't already running?"
+ puts "Just start thin with bundle exec thin start."
+ Process.exit
+end
diff --git a/spec/controllers/albums_controller_spec.rb b/spec/controllers/albums_controller_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..67b7d9a78298fcd35fb0d1bfc3099a7eccd91f76
--- /dev/null
+++ b/spec/controllers/albums_controller_spec.rb
@@ -0,0 +1,23 @@
+# Copyright (c) 2010, Diaspora Inc. This file is
+# licensed under the Affero General Public License version 3. See
+# the COPYRIGHT file.
+
+
+require File.dirname(__FILE__) + '/../spec_helper'
+include ApplicationHelper
+describe AlbumsController do
+ render_views
+ before do
+ @user = Factory.create(:user)
+ @aspect = @user.aspect(:name => "lame-os")
+ @album = @user.post :album, :to => @aspect.id, :name => 'things on fire'
+ sign_in :user, @user
+ end
+
+ it "should update the name of an album" do
+ sign_in :user, @user
+ put :update, :id => @album.id, :album => { :name => "new_name"}
+ @album.reload.name.should eql("new_name")
+ end
+
+end
diff --git a/spec/controllers/publics_controller_spec.rb b/spec/controllers/publics_controller_spec.rb
index 91f0e037130dc18b53f3f728ec2c942ad392e70f..bea772e20c425771f2b61e1493b5ca1ced199c07 100644
--- a/spec/controllers/publics_controller_spec.rb
+++ b/spec/controllers/publics_controller_spec.rb
@@ -35,6 +35,12 @@ describe PublicsController do
end
end
+ describe 'webfinger' do
+ it 'should not try to webfinger out on a request to webfinger' do
+ Redfinger.should_not_receive :finger
+ post :webfinger, :q => 'remote@example.com'
+ end
+ end
describe 'friend requests' do
before do
diff --git a/spec/controllers/sockets_controller_spec.rb b/spec/controllers/sockets_controller_spec.rb
index 4104d0d518d1688b6338b56cf03e3331a31a44cb..799d37500ff6f216ec3be1b3c192187a25189a12 100644
--- a/spec/controllers/sockets_controller_spec.rb
+++ b/spec/controllers/sockets_controller_spec.rb
@@ -6,11 +6,11 @@
require File.dirname(__FILE__) + '/../spec_helper'
-class SocketsController
+SocketsController.class_eval <<-EOT
def url_options
{:host => ""}
end
-end
+EOT
describe SocketsController do
render_views
diff --git a/spec/factories.rb b/spec/factories.rb
index 918a210f2219346aee585d4e4e600131955d560a..21a7ad1103b8414f5fc294582bee0ba91701ca2c 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -22,6 +22,11 @@ Factory.define :person do |p|
p.serialized_key OpenSSL::PKey::RSA.generate(1024).public_key.export
end
+Factory.define :album do |p|
+ p.name "my first album"
+ p.person { |a| Factory.create(:person) }
+end
+
Factory.define :person_with_private_key, :parent => :person do |p|
p.serialized_key OpenSSL::PKey::RSA.generate(1024).export
end
@@ -31,10 +36,13 @@ end
Factory.define :user do |u|
u.sequence(:username) {|n| "bob#{n}"}
- u.sequence(:email) {|n| "bob#{n}@aol.com"}
+ u.sequence(:email) {|n| "bob#{n}@pivotallabs.com"}
u.password "bluepin7"
u.password_confirmation "bluepin7"
- u.person { |a| Factory.create(:person_with_user, :owner_id => a._id)}
+ u.person { |a| Factory.create(:person_with_user,
+ :owner_id => a._id,
+ :diaspora_handle => "#{a.username}@#{APP_CONFIG[:pod_url].gsub(/(https?:|www\.)\/\//, '').chop!}")
+ }
end
Factory.define :status_message do |m|
diff --git a/spec/lib/message_handler_spec.rb b/spec/lib/message_handler_spec.rb
index 00db2a1b8af6d565e8219726657b0d3b3a689c90..e6cd668e27675021d95231293a35c091165b5d56 100644
--- a/spec/lib/message_handler_spec.rb
+++ b/spec/lib/message_handler_spec.rb
@@ -123,7 +123,6 @@ describe MessageHandler do
request = FakeHttpRequest.new(:success)
request.should_receive(:get).exactly(1).times.and_return(request)
request.should_receive(:post).exactly(1).times.and_return(request)
- @handler.should_receive(:send_to_seed).once
EventMachine::HttpRequest.stub!(:new).and_return(request)
diff --git a/spec/lib/websocket_spec.rb b/spec/lib/websocket_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..edac7051ad4998e0ec13cbe759ca602972372a68
--- /dev/null
+++ b/spec/lib/websocket_spec.rb
@@ -0,0 +1,37 @@
+# Copyright (c) 2010, Diaspora Inc. This file is
+# licensed under the Affero General Public License version 3. See
+# the COPYRIGHT file.
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Diaspora::WebSocket do
+ before do
+ @user = Factory.create(:user)
+ @aspect = @user.aspect(:name => "losers")
+ @post = @user.build_post(:status_message, :message => "hey", :to => @aspect.id)
+ unstub_sockets
+ end
+
+ it 'should queue a job' do
+ Diaspora::WebSocket.should_receive(:queue_to_user)
+ @post.socket_to_uid(@user.id, :aspect_ids => @aspect.id)
+ end
+
+ describe 'queuing and dequeuing ' do
+ before do
+ @channel = Magent::GenericChannel.new('websocket')
+ @messages = @channel.message_count
+ @post.socket_to_uid(@user.id, :aspect_ids => @aspect.id)
+ end
+
+ it 'should send the queued job to Magent' do
+ @channel.message_count.should == @messages + 1
+ end
+
+ it 'should dequeue the job successfully' do
+ @channel.dequeue
+ @channel.message_count.should == @messages
+ end
+ end
+
+end
diff --git a/spec/models/album_spec.rb b/spec/models/album_spec.rb
index 189361622a8021bb0e663d05b34a57be9325f3f8..ed13ba102851eee8730e138b6c43b9263e7cc3cc 100644
--- a/spec/models/album_spec.rb
+++ b/spec/models/album_spec.rb
@@ -2,87 +2,81 @@
# licensed under the Affero General Public License version 3. See
# the COPYRIGHT file.
-
-
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
describe Album do
- before do
- @fixture_name = File.dirname(__FILE__) + '/../fixtures/button.png'
- @user = Factory.create(:user)
- @user.person.save
- @aspect = @user.aspect(:name => "Foo")
- @album = @user.post(:album, :name => "test collection", :to => @aspect.id)
- end
+ let(:user) { Factory.create(:user) }
+ let(:person) { user.person }
+ let(:aspect) { user.aspect(:name => "Foo") }
+ let(:album) { user.post(:album, :name => "test collection", :to => aspect.id) }
- it 'should require a name' do
- @album.name = "test collection"
- @album.valid?.should be true
-
- @album.name = nil
- @album.valid?.should be false
+ it 'is valid' do
+ album.should be_valid
end
- it 'should contain photos' do
- photo = Factory.build(:photo, :person => @user.person)
-
- @album.photos << photo
- @album.photos.count.should == 1
+ it 'validates presence of a name' do
+ album.name = nil
+ album.should_not be_valid
end
- it 'should remove all photos on album delete' do
- photos = []
- 1.upto 3 do
- photo = Photo.new(:person => @user.person, :album => @album, :created_at => Time.now)
- photo.image.store! File.open @fixture_name
- photos << photo
- end
- @album.photos += photos
-
- Photo.all.count.should == 3
- @album.destroy
- Photo.all.count.should == 0
+ it 'has many photos' do
+ album.associations[:photos].type == :many
end
- describe 'traversing' do
+ context 'when an album has two attached images' do
before do
- @photos = []
- 1.upto 3 do |n|
- photo = Photo.new(:person => @user.person, :album => @album, :created_at => Time.now + n)
- photo.image.store! File.open @fixture_name
- @photos << photo
+ 2.times do
+ photo = Factory.build(:photo, :person => person, :album => album)
+ album.photos << photo
end
- @album.photos += @photos
end
- it 'should traverse the album correctly' do
- #should retrieve the next photo relative to a given photo
- @album.next_photo(@photos[1]).id.should == @photos[2].id
+ context 'when the album is deleted' do
+ it 'removes all child photos' do
+ expect{ album.destroy }.to change(Photo, :count).from(2).to(0)
+ end
+ end
+ end
- #should retrieve the previous photo relative to a given photo
- @album.prev_photo(@photos[1]).id.should == @photos[0].id
+ context 'traversing photos' do
+ let(:attrs) { {:person => person, :album => album} }
+ let!(:photo_1) { Factory(:photo, attrs.merge(:created_at => 2.days.ago)) }
+ let!(:photo_2) { Factory(:photo, attrs.merge(:created_at => 1.day.ago)) }
+ let!(:photo_3) { Factory(:photo, attrs.merge(:created_at => Time.now)) }
- #wrapping
- #does next photo of last to first
- @album.next_photo(@photos[2]).id.should == @photos[0].id
+ describe '#next_photo' do
+ it 'returns the next photo' do
+ album.next_photo(photo_1).id.should == photo_2.id
+ end
- #does previous photo of first to last
- @album.prev_photo(@photos[0]).id.should == @photos[2].id
+ it 'returns the first photo when given the last photo in the album' do
+ album.next_photo(photo_3).id.should == photo_1.id
+ end
end
- end
- describe 'serialization' do
- before do
- @xml = @album.to_xml.to_s
+ describe '#prev_photo' do
+ it 'returns the previous photo' do
+ album.prev_photo(photo_2).id.should == photo_1.id
+ end
+
+ it 'returns the last photo when given the first photo in the album' do
+ album.prev_photo(photo_1).id.should == photo_3.id
+ end
end
- it 'should have a person' do
- @xml.include?(@album.person.id.to_s).should be true
+ end
+
+ describe '#to_xml' do
+ let(:doc) { album.to_xml }
+ it 'has a name' do
+ doc.at_xpath('./name').text.should == album.name
end
- it 'should have a name' do
- @xml.include?(@album.name).should be true
+
+ it 'has an id' do
+ doc.at_xpath('./_id').text.should == album.id.to_s
end
- it 'should have an id' do
- @xml.include?(@album.id.to_s).should be true
+
+ it 'includes the person' do
+ doc.at_xpath('./person/_id').text.should == album.person.id.to_s
end
end
end
diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb
index bffe37f85bdb981af7e617c4c1e262bcb35adc17..721310409c5400070181718d338ca4bcb590ebab 100644
--- a/spec/models/person_spec.rb
+++ b/spec/models/person_spec.rb
@@ -15,6 +15,20 @@ describe Person do
@aspect2 = @user2.aspect(:name => "Abscence of Babes")
end
+ describe '#diaspora_handle' do
+ context 'local people' do
+ it 'uses the pod config url to set the diaspora_handle' do
+ @user.person.diaspora_handle.should == @user.username + "@example.org"
+ end
+ end
+
+ context 'remote people' do
+ it 'stores the diaspora_handle in the database' do
+ @person.diaspora_handle.include?(APP_CONFIG[:terse_pod_url]).should be false
+ end
+ end
+ end
+
it 'should not allow two people with the same diaspora_handle' do
person_two = Factory.build(:person, :url => @person.diaspora_handle)
person_two.valid?.should == false
@@ -134,13 +148,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
@@ -148,13 +162,11 @@ describe Person do
end
it 'should search by diaspora_handle exactly' do
-
stub_success("tom@tom.joindiaspora.com")
Person.by_webfinger(@friend_one.diaspora_handle).should == @friend_one
end
it 'should create a stub for a remote user' do
-
stub_success("tom@tom.joindiaspora.com")
tom = Person.by_webfinger('tom@tom.joindiaspora.com')
tom.real_name.include?("Hamiltom").should be true
diff --git a/spec/models/request_spec.rb b/spec/models/request_spec.rb
index 72a3b8dc1d3093082ae29666f91050516c8197bc..5899cb7fb03d140e49d3b3ad13c369253e686650 100644
--- a/spec/models/request_spec.rb
+++ b/spec/models/request_spec.rb
@@ -19,8 +19,7 @@ describe Request do
person_request.valid?.should be true
end
- it 'should generate xml for the User as a Person' do
-
+ it 'should generate xml for the User as a Person' do
request = @user.send_friend_request_to Factory.create(:person), @aspect
xml = request.to_xml.to_s
diff --git a/spec/models/user/posting_spec.rb b/spec/models/user/posting_spec.rb
index b1f6f71a86b80b338c59de277be92502a5c383e8..d307e7a43686af2d1c26315a69522a5e5fab3a5b 100644
--- a/spec/models/user/posting_spec.rb
+++ b/spec/models/user/posting_spec.rb
@@ -7,61 +7,95 @@
require File.dirname(__FILE__) + '/../../spec_helper'
describe User do
- before do
- @user = Factory.create :user
- @aspect = @user.aspect(:name => 'heroes')
- @aspect1 = @user.aspect(:name => 'heroes')
- @user2 = Factory.create(:user)
- @aspect2 = @user2.aspect(:name => 'losers')
-
- @user3 = Factory.create(:user)
- @aspect3 = @user3.aspect(:name => 'heroes')
-
- @user4 = Factory.create(:user)
- @aspect4 = @user4.aspect(:name => 'heroes')
-
- friend_users(@user, @aspect, @user2, @aspect2)
- friend_users(@user, @aspect, @user3, @aspect3)
- friend_users(@user, @aspect1, @user4, @aspect4)
- end
-
- it 'should not be able to post without a aspect' do
- proc {@user.post(:status_message, :message => "heyheyhey")}.should raise_error /You must post to someone/
+ let(:user) { Factory(:user) }
+ let(:user2) { Factory(:user) }
+ let(:user3) { Factory(:user) }
+ let(:user4) { Factory(:user) }
+
+ let(:aspect) {user.aspect(:name => 'heroes')}
+ let!(:aspect1) {user.aspect(:name => 'heroes')}
+ let!(:aspect2) {user2.aspect(:name => 'losers')}
+ let!(:aspect3) {user3.aspect(:name => 'heroes')}
+ let!(:aspect4) {user4.aspect(:name => 'heroes')}
+
+ before do
+ friend_users(user, aspect, user2, aspect2)
+ friend_users(user, aspect, user3, aspect3)
+ friend_users(user, aspect1, user4, aspect4)
end
- it 'should put the post in the aspect post array' do
- post = @user.post(:status_message, :message => "hey", :to => @aspect.id)
- @aspect.reload
- @aspect.post_ids.include?(post.id).should be true
- end
+ context 'posting' do
- it 'should put an album in the aspect post array' do
- album = @user.post :album, :name => "Georges", :to => @aspect.id
- @aspect.reload
- @aspect.post_ids.include?(album.id).should be true
- @aspect.posts.include?(album).should be true
- end
+ describe '#validate_aspect_permissions' do
+ it 'should not be able to post without a aspect' do
+ proc {
+ user.validate_aspect_permissions([])
+ }.should raise_error /You must post to someone/
+ end
- describe 'dispatching' do
- before do
- @post = @user.build_post :status_message, :message => "hey"
+ it 'should not be able to post to someone elses aspect' do
+ proc {
+ user.validate_aspect_permissions(aspect2.id)
+ }.should raise_error /Cannot post to an aspect you do not own./
+ end
end
- it 'should push a post to a aspect' do
- @user.should_receive(:salmon).twice
- @user.push_to_aspects(@post, @aspect.id)
+
+ describe '#post' do
+ it 'should put the post in the aspect post array' do
+ post = user.post(:status_message, :message => "hey", :to => aspect.id)
+ aspect.reload
+ aspect.posts.should include post
+ end
+
+ it 'should put an album in the aspect post array' do
+ album = user.post :album, :name => "Georges", :to => aspect.id
+ aspect.reload
+ aspect.posts.should include album
+ end
end
- it 'should push a post to all aspects' do
- @user.should_receive(:salmon).exactly(3).times
- @user.push_to_aspects(@post, :all)
+ describe '#repost' do
+ let!(:status_message) { user.post(:status_message, :message => "hello", :to => aspect.id) }
+
+ it 'should make the post visible in another aspect' do
+ user.repost( status_message, :to => aspect1.id )
+ aspect1.reload
+ aspect1.posts.count.should be 1
+ end
end
- it 'should push to people' do
- @user.should_receive(:salmon).twice
- @user.push_to_people(@post, [@user2.person, @user3.person])
+ describe '#update_post' do
+ let!(:album) { user.post(:album, :name => "Profile Photos", :to => aspect.id) }
+
+ it 'should update fields' do
+ update_hash = { :name => "Other Photos" }
+ user.update_post( album, update_hash )
+ album.name.should == "Other Photos"
+ end
end
+ end
+
+ context 'dispatching' do
+ let!(:post) { user.build_post :status_message, :message => "hey" }
+ describe '#push_to_aspects' do
+ it 'should push a post to a aspect' do
+ user.should_receive(:salmon).twice
+ user.push_to_aspects(post, aspect.id)
+ end
+ it 'should push a post to all aspects' do
+ user.should_receive(:salmon).exactly(3).times
+ user.push_to_aspects(post, :all)
+ end
+ end
+
+ describe '#push_to_people' do
+ it 'should push to people' do
+ user.should_receive(:salmon).twice
+ user.push_to_people(post, [user2.person, user3.person])
+ end
+ end
end
end
diff --git a/spec/models/user/user_friending_spec.rb b/spec/models/user/user_friending_spec.rb
index bef8fa416444f203984effe946626c97d19db74e..67ed9f7991272707df656e4d2741ab4636233e4d 100644
--- a/spec/models/user/user_friending_spec.rb
+++ b/spec/models/user/user_friending_spec.rb
@@ -189,16 +189,14 @@ describe User do
@user2 = Factory.create :user
@aspect2 = @user2.aspect(:name => "Gross people")
- request = @user.send_friend_request_to( @user2, @aspect)
- request.reverse_for @user2
- @user2.activate_friend(@user.person, @aspect2)
- @user.receive request.to_diaspora_xml
- end
-
- it 'should unfriend the other user on the same seed' do
+ friend_users(@user, @aspect, @user2, @aspect2)
@user.reload
@user2.reload
+ @aspect.reload
+ @aspect2.reload
+ end
+ it 'should unfriend the other user on the same seed' do
@user.friends.count.should == 1
@user2.friends.count.should == 1
@@ -212,6 +210,25 @@ describe User do
@aspect.people.count.should == 0
@aspect2.people.count.should == 0
end
+ context 'with a post' do
+ before do
+ @message = @user.post(:status_message, :message => "hi", :to => @aspect.id)
+ @user2.receive @message.to_diaspora_xml.to_s
+ @user2.unfriend @user.person
+ @user.unfriended_by @user2.person
+ @aspect.reload
+ @aspect2.reload
+ @user.reload
+ @user2.reload
+ end
+ it "deletes the unfriended user's posts from visible_posts" do
+ @user.raw_visible_posts.include?(@message.id).should be_false
+ end
+ it "deletes the unfriended user's posts from the aspect's posts" do
+ pending "We need to implement this"
+ @aspect2.posts.include?(@message).should be_false
+ end
+ end
end
diff --git a/spec/models/user/visible_posts_spec.rb b/spec/models/user/visible_posts_spec.rb
index ffb22053192d7a36f742336a7269c79ac47242dd..bcab473bcce0060021fdbcc6f1bb541856dc712e 100644
--- a/spec/models/user/visible_posts_spec.rb
+++ b/spec/models/user/visible_posts_spec.rb
@@ -7,70 +7,80 @@
require File.dirname(__FILE__) + '/../../spec_helper'
describe User do
- before do
- @user = Factory.create(:user)
- @aspect = @user.aspect(:name => 'heroes')
- @aspect2 = @user.aspect(:name => 'losers')
-
- @user2 = Factory.create :user
- @user2_aspect = @user2.aspect(:name => 'dudes')
-
- friend_users(@user, @aspect, @user2, @user2_aspect)
-
- @user3 = Factory.create :user
- @user3_aspect = @user3.aspect(:name => 'dudes')
- friend_users(@user, @aspect2, @user3, @user3_aspect)
-
- @user4 = Factory.create :user
- @user4_aspect = @user4.aspect(:name => 'dudes')
- friend_users(@user, @aspect2, @user4, @user4_aspect)
- end
-
- it 'should generate a valid stream for a aspect of people' do
- status_message1 = @user2.post :status_message, :message => "hi", :to => @user2_aspect.id
- status_message2 = @user3.post :status_message, :message => "heyyyy", :to => @user3_aspect.id
- status_message3 = @user4.post :status_message, :message => "yooo", :to => @user4_aspect.id
-
- @user.receive status_message1.to_diaspora_xml
- @user.receive status_message2.to_diaspora_xml
- @user.receive status_message3.to_diaspora_xml
- @user.reload
-
- @user.visible_posts(:by_members_of => @aspect).include?(status_message1).should be true
- @user.visible_posts(:by_members_of => @aspect).include?(status_message2).should be false
- @user.visible_posts(:by_members_of => @aspect).include?(status_message3).should be false
-
- @user.visible_posts(:by_members_of => @aspect2).include?(status_message1).should be false
- @user.visible_posts(:by_members_of => @aspect2).include?(status_message2).should be true
- @user.visible_posts(:by_members_of => @aspect2).include?(status_message3).should be true
+ let(:user) { Factory(:user) }
+
+ let(:user2) { Factory(:user) }
+ let(:user3) { Factory(:user) }
+ let(:user4) { Factory(:user) }
+
+ let!(:aspect) { user.aspect(:name => 'heroes') }
+ let!(:aspect2) { user.aspect(:name => 'losers') }
+
+ let!(:user2_aspect) { user2.aspect(:name => 'dudes') }
+ let!(:user3_aspect) { user3.aspect(:name => 'dudes') }
+ let!(:user4_aspect) { user4.aspect(:name => 'dudes') }
+
+ let(:status_message1) { user2.post :status_message, :message => "hi", :to => user2_aspect.id }
+ let(:status_message2) { user3.post :status_message, :message => "heyyyy", :to => user3_aspect.id }
+ let(:status_message3) { user4.post :status_message, :message => "yooo", :to => user4_aspect.id }
+
+ before do
+ friend_users(user, aspect, user2, user2_aspect)
+ friend_users(user, aspect2, user3, user3_aspect)
+ friend_users(user, aspect2, user4, user4_aspect)
+ end
+
+ it 'should generate a valid stream for a aspect of people' do
+ (1..3).each{ |n|
+ eval("user.receive status_message#{n}.to_diaspora_xml")
+ }
+
+ user.visible_posts(:by_members_of => aspect).should include status_message1
+ user.visible_posts(:by_members_of => aspect).should_not include status_message2
+ user.visible_posts(:by_members_of => aspect).should_not include status_message3
+
+ user.visible_posts(:by_members_of => aspect2).should_not include status_message1
+ user.visible_posts(:by_members_of => aspect2).should include status_message2
+ user.visible_posts(:by_members_of => aspect2).should include status_message3
+ end
+
+ context 'querying' do
+ describe '#find_visible_post_by_id' do
+ it 'should query' do
+ user2.find_visible_post_by_id(status_message1.id).should == status_message1
+ user.find_visible_post_by_id(status_message1.id).should == nil
+ end
end
+ end
- describe 'albums' do
- before do
- @album = @user.post :album, :name => "Georges", :to => @aspect.id
- @aspect.reload
- @aspect2.reload
- @user.reload
-
- @album2 = @user.post :album, :name => "Borges", :to => @aspect.id
- @aspect.reload
- @aspect2.reload
- @user.reload
-
- @user.post :album, :name => "Luises", :to => @aspect2.id
- @aspect.reload
- @aspect2.reload
- @user.reload
- end
+ context 'albums' do
- it 'should find all albums if passed :all' do
- @user.albums_by_aspect(:all).size.should == 3
- end
- it 'should return the right number of albums' do
- @user.albums_by_aspect(@aspect).size.should == 2
- @user.albums_by_aspect(@aspect2).size.should == 1
- end
+ before do
+ @album = user.post :album, :name => "Georges", :to => aspect.id
+ aspect.reload
+ aspect2.reload
+ user.reload
+
+ @album2 = user.post :album, :name => "Borges", :to => aspect.id
+ aspect.reload
+ aspect2.reload
+ user.reload
+
+ user.post :album, :name => "Luises", :to => aspect2.id
+ aspect.reload
+ aspect2.reload
+ user.reload
+ end
+
+ it 'should find all albums if passed :all' do
+ user.albums_by_aspect(:all).should have(3).albums
+ end
+
+ it 'should return the right number of albums' do
+ user.albums_by_aspect(aspect).should have(2).albums
+ user.albums_by_aspect(aspect2).should have(1).album
end
+ end
end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index a02f5271af1679637ed17387280c4953cf0db102..1608bbe581778b19cbcce74010ed23a1b07dac68 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -7,19 +7,42 @@
require File.dirname(__FILE__) + '/../spec_helper'
describe User do
- before do
- @user = Factory.create(:user)
- @aspect = @user.aspect(:name => 'heroes')
- end
+ let(:user) { Factory(:user) }
+ let(:aspect) { user.aspect(:name => 'heroes') }
- describe 'profiles' do
+ describe '#diaspora_handle' do
+ it 'uses the pod config url to set the diaspora_handle' do
+ user.diaspora_handle.should == user.username + "@example.org"
+ end
+ end
+
+ context 'profiles' do
it 'should be able to update their profile and send it to their friends' do
- Factory.create(:person)
+ updated_profile = { :profile => {
+ :first_name => 'bob',
+ :last_name => 'billytown',
+ :image_url => "http://clown.com"} }
- updated_profile = {:profile => {:first_name => 'bob', :last_name => 'billytown', :image_url => "http://clown.com"}}
+ user.update_profile(updated_profile).should be true
+ user.profile.image_url.should == "http://clown.com"
+ end
+ end
- @user.update_profile(updated_profile).should == true
- @user.profile.image_url.should == "http://clown.com"
+ context 'aspects' do
+ let(:user2) { Factory(:user) }
+ let(:aspect2) { user2.aspect(:name => 'stuff') }
+
+ it 'should delete an empty aspect' do
+ user.drop_aspect(aspect)
+ user.aspects.include?(aspect).should == false
+ end
+
+ it 'should not delete an aspect with friends' do
+ friend_users(user, Aspect.find_by_id(aspect.id), user2, Aspect.find_by_id(aspect2.id))
+ aspect.reload
+ proc{user.drop_aspect(aspect)}.should raise_error /Aspect not empty/
+ user.aspects.include?(aspect).should == true
end
end
+
end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9d6317d30f54360a4ebf8a0e03452ae17fa4c801..3fdac98106467a68adf02d5102bad679f5e5719a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -38,6 +38,7 @@ RSpec.configure do |config|
config.before(:each) do
DatabaseCleaner.start
stub_sockets
+ User.stub!(:allowed_email?).and_return(:true)
end
config.after(:each) do
@@ -45,11 +46,17 @@ RSpec.configure do |config|
end
end
def stub_sockets
- Diaspora::WebSocket.stub!(:push_to_user).and_return(true)
+ Diaspora::WebSocket.stub!(:queue_to_user).and_return(true)
Diaspora::WebSocket.stub!(:subscribe).and_return(true)
Diaspora::WebSocket.stub!(:unsubscribe).and_return(true)
end
+ def unstub_sockets
+ Diaspora::WebSocket.unstub!(:queue_to_user)
+ Diaspora::WebSocket.unstub!(:subscribe)
+ Diaspora::WebSocket.unstub!(:unsubscribe)
+ end
+
def stub_signature_verification
(get_models.map{|model| model.camelize.constantize} - [User]).each do |model|
model.any_instance.stubs(:verify_signature).returns(true)
diff --git a/ubuntu-setup.bash b/ubuntu-setup.bash
new file mode 100644
index 0000000000000000000000000000000000000000..67b602abee2b9c083a00d4c97441f601d70cdb52
--- /dev/null
+++ b/ubuntu-setup.bash
@@ -0,0 +1,96 @@
+#!/bin/bash
+# Author : hemanth.hm@gmail.com
+# Site : www.h3manth.com
+# This script helps to setup diaspora.
+#
+
+# Set extented globbing
+shopt -s extglob
+
+# Check if the user has sudo privileges.
+[[ $( id -u) ]] && echo "$(whoami) has no sudo permissions on this machine" && exit 1
+
+# Install build tools
+echo "Installing build tools.."
+sudo apt-get -y --no-install-recommends install build-essential libxslt1.1 libxslt1-dev libxml2
+echo "..Done installing build tools"
+
+# Install Ruby 1.8.7
+echo "Installing ruby-full Ruby 1.8.7.."
+sudo apt-get -y --no-install-recommends install ruby-full
+echo "..Done installing Ruby"
+
+# Install Rake
+echo "Installing rake.."
+sudo apt-get -y --no-install-recommends install rake
+echo "..Done installing rake"
+
+# Get the current release and install mongodb
+lsb=$(lsb_release -rs)
+ver=${lsb//.+(0)/.}
+repo="deb http://downloads.mongodb.org/distros/ubuntu ${ver} 10gen"
+echo "Setting up MongoDB.."
+echo "."
+echo ${repo} | sudo tee -a /etc/apt/sources.list
+echo "."
+echo "Fetching keys.."
+sudo apt-key adv --keyserver keyserver.ubuntu.com --recv 7F0CEB10
+echo "."
+sudo apt-get update
+echo "."
+sudo apt-get -y --no-install-recommends install mongodb-stable
+echo "Done installing monngodb-stable.."
+
+# Install imagemagick
+echo "Installing imagemagick.."
+sudo apt-get -y --no-install-recommends install imagemagick libmagick9-dev
+echo "Installed imagemagick.."
+
+# Install git-core
+echo "Installing git-core.."
+sudo apt-get -y --no-install-recommends install git-core
+echo "Installed git-core.."
+
+# Setting up ruby gems
+echo "Fetching and installing ruby gems.."
+(
+ echo "."
+ cd /tmp
+ wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz
+ echo "."
+ tar -xf rubygems-1.3.7.tgz
+ echo "."
+ cd rubygems-1.3.7
+ echo "."
+ sudo ruby setup.rb
+ echo "."
+ sudo ln -s /usr/bin/gem1.8 /usr/bin/gem
+ echo "."
+)
+echo "Done installing the gems.."
+
+# Install blunder
+echo "Installing blunder.."
+sudo gem install bundler
+echo "Installed blunder.."
+
+# Take a clone of Diaspora
+(
+echo "Clone diaspora source.."
+git clone http://github.com/diaspora/diaspora.git
+echo "Cloned the source.."
+# Install extra gems
+cd diaspora
+echo "Installing more gems.."
+sudo bundle install
+echo "Installed."
+
+# Install DB setup
+echo "Seting up DB.."
+rake db:seed:tom
+echo "DB ready. Login -> tom and password -> evankorth. More details ./diaspora/db/seeds/tom.rb."
+
+# Run appserver
+echo "Starting server"
+bundle exec thin start
+)