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

COPYRIGHT

@@ -1 +1 @@
-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, 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.

README.md

@@ -206,6 +206,8 @@ Ongoing discussion:
 
 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).
 
+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).
+
 
 ## License
 Copyright 2010 Diaspora Inc.

app/controllers/albums_controller.rb

@@ -9,7 +9,8 @@ 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
 

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
 

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
+    = auto_link sanitize post.text
   %div.time
     = "#{time_ago_in_words(post.updated_at)} ago"

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) {

app/views/people/index.html.haml

@@ -48,3 +48,4 @@
               = f.select(:aspect_id, @aspects_dropdown_array)
               = f.hidden_field :destination_url, :value => person.diaspora_handle
               = f.submit "add friend"
+  = will_paginate @people

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; }