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

.gitignore

@@ -5,7 +5,7 @@
 *~
 .bundle
 db/*.sqlite3
-log/*.log
+log/*
 tmp/**/*
 Gemfile.lock
 gpg/diaspora-development/*.gpg

app/models/comment.rb

@@ -57,6 +57,11 @@ class Comment
     verify_signature(post_creator_signature, post.person)
   end
   
+  def signature_valid?
+    Rails.logger.warn "Received comment has person #{person.inspect}"
+    Rails.logger.warn "Received comment has person key #{person.serialized_key}" if person
+    verify_signature(creator_signature, person) && verify_signature(post_creator_signator, post.person)
+  end
   
   protected
    def sign_if_my_post

app/views/albums/index.html.haml

+- content_for :head do
+  :javascript
+    $(document).ready(function(){
+      $("#add_album_button").fancybox();
+    });
+
 .back= link_to "⇧ home", root_path
 %h1.big_text
   Albums

app/views/albums/show.html.haml

 - content_for :head do
-  :javascript
-    $(document).ready(function(){
-      reset_photo_fancybox();
-    });
+  = javascript_include_tag 'photos', 'jquery.html5_upload'
 
 .album_id{:id => @album.id, :style => "display:hidden;"}
 .back= link_to '⇧ albums', albums_path

app/views/groups/edit.html.haml

@@ -8,18 +8,17 @@
     = link_to "⇧ #{@group.name}", @group
   = "Editing Groups"
 
-
+%ul
 - for group in @groups
   %li.group
     = group.name
     %ul
+      stuff
       -for person in group.people
         %li.person
           = person.real_name
 
 
-
-
 #content_bottom
   .back
     = link_to "⇧ #{@group.name}", @group

app/views/layouts/application.html.haml

@@ -23,8 +23,6 @@
     = csrf_meta_tag
     = yield(:head)
 
-    = javascript_include_tag 'jquery.html5_upload'
-
   %body
     - flash.each do |name, msg|
       = content_tag :div, msg, :id => "flash_#{name}"

public/javascripts/group-edit.js

 $(function() {
 		$("li .person").draggable({
-				helper: 'clone',
-				cursor: 'move'
-		});
-		$("li .group").droppable({
+		  revert: true
+    });
+		$(".group ul").droppable({
+
 			drop: function(event, ui) {
-        //alert('dropped!');
-				$("<li class='person'></li>").text(ui.draggable.text()).appendTo(this);
+        $(this).closest("ul").append(ui.draggable)
+				//$("<li class='person ui-draggable'></li>").text(ui.draggable.text()).appendTo(this).draggable();
 			}
 		});
 

public/javascripts/photos.js

+$(document).ready(function(){
+  reset_photo_fancybox();
+
+  $("#add_photo_button").fancybox({
+    'onClosed'   :   function(){
+      if($("#add_photo_button").hasClass("uploading_complete")){
+        $("#add_photo_button").removeClass("uploading_complete");
+        reset_photo_fancybox();
+      }
+    }
+  });
+
+  $(".image_thumb img").load( function() {
+    $(this).fadeIn("slow");
+  });
+
+});//end document ready
+
+function reset_photo_fancybox(){
+        album_id = $(".album_id")[0].id;
+        ajax = $.get("/photos/new?album_id=" + album_id, function(){
+          $("#new_photo_pane").html(ajax.responseText)
+        });
+}

public/javascripts/view.js

@@ -20,25 +20,16 @@ $(document).ready(function(){
   //buttons//////
   
 
-  $("#add_album_button").fancybox();
   $("#add_group_button").fancybox();
   $("#add_request_button").fancybox({ 'titleShow': false });
-  $("#add_photo_button").fancybox({
-    'onClosed'   :   function(){
-      if($("#add_photo_button").hasClass("uploading_complete")){
-        $("#add_photo_button").removeClass("uploading_complete");
-        reset_photo_fancybox();
-      }
-    }
-  });
 
+
+ 
   //pane_toggler_button("photo");
 
   $("input[type='submit']").addClass("button");
 
-  $(".image_thumb img").load( function() {
-    $(this).fadeIn("slow");
-  });
+
 
   $(".image_cycle img").load( function() {
     $(this).fadeIn("slow");
@@ -48,12 +39,7 @@ $(document).ready(function(){
 
 });//end document ready
 
-function reset_photo_fancybox(){
-        album_id = $(".album_id")[0].id;
-        ajax = $.get("/photos/new?album_id=" + album_id, function(){
-          $("#new_photo_pane").html(ajax.responseText)
-        });
-}
+
 
 function pane_toggler_button( name ) {
   

spec/models/user/receive_spec.rb

@@ -8,6 +8,10 @@ describe User do
 
     @user2 = Factory.create(:user)
     @group2 = @user2.group(:name => 'losers') 
+
+    @user3 = Factory.create(:user)
+    @group3 = @user3.group(:name => 'heroes')
+
     friend_users(@user, @group, @user2, @group2)
   end
 
@@ -36,11 +40,17 @@ describe User do
 
     @user.groups.size.should == num_groups
   end
+  describe 'comments' do
+    it 'should receive comments from unknown users' do
+      friend_users(@user, @group, @user2, @group2)
+      
+      status_message = @user.post, :status_message, :message => 'message', :to => @group.id
 
+    end
+  end
   describe 'post refs' do
     before do
-      @user3 = Factory.create(:user)
-      @group3 = @user3.group(:name => 'heroes')
+
     end
     
     it "should add the post to that user's posts when a user posts it" do