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

Conflicts:
	public/javascripts/keycodes.js

Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 
 GIT
   remote: git://github.com/MikeSofaer/sod.git
-  revision: f1084f181c9ae469f03e9217d8ed1c7800ccb971
+  revision: 08e990601bfa6ffd3224a2e4c792df9eae712693
   specs:
     sod (0.0.1)
       net-scp

db/migrate/20110421120744_downcase_usernames.rb

@@ -0,0 +1,13 @@
+class DowncaseUsernames < ActiveRecord::Migration
+  def self.up
+    execute <<SQL
+      UPDATE users
+      SET users.username = LOWER(users.username)
+      WHERE users.username != LOWER(users.username)
+SQL
+  end
+
+  def self.down
+    raise ActiveRecord::IrreversibleMigration.new
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110406203720) do
+ActiveRecord::Schema.define(:version => 20110421120744) do
 
   create_table "aspect_memberships", :force => true do |t|
     t.integer  "aspect_id",  :null => false

features/embedder.feature

@@ -0,0 +1,19 @@
+@javascript
+Feature: embedding
+    Get sure that embedding stuff actually works
+
+    Background:
+      Given a user with username "bob"
+      When I sign in as "bob@bob.bob"
+      And I have no open aspects saved
+      And I am on the home page
+
+    Scenario: Youtube is fully embedded
+      Given I expand the publisher
+      When I fill in "status_message_fake_text" with "Look at this awesome video: https://www.youtube.com/watch?v=53tq9g35kwk"
+        And I press "Share"
+        And I follow "All Aspects"
+      Then I should see "Look at this awesome video: Youtube: Leekspin" within ".stream_element"
+      When I follow "Youtube: Leekspin"
+      And I wait for the ajax to finish
+      Then I should see "Watch this video on YouTube" within ".video-container"

public/javascripts/diaspora.js

@@ -32,7 +32,8 @@
     this.initialized = true;
 
     for(var widgetId in this.collection) {
-      if(this.collection[widgetId].hasOwnProperty("start")) {
+      if(this.collection[widgetId].hasOwnProperty("start") 
+          || this.collection[widgetId].__proto__.hasOwnProperty("start")) {
         this.collection[widgetId].start();
       }
     }
@@ -52,5 +53,5 @@
 })();
 
 
-$(document).ready(Diaspora.widgets.init);
+$(document).ready(function() { Diaspora.widgets.init(); });