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

app/models/user.rb

@@ -48,10 +48,13 @@ class User
 
   before_validation_on_create :setup_person
   before_validation :do_bad_things 
+  before_save :downcase_username
   
    def self.find_for_authentication(conditions={})
     if conditions[:username] =~ /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i # email regex
       conditions[:email] = conditions.delete(:username)
+    else
+      conditions[:username].downcase!
     end
     super
   end 
@@ -322,6 +325,9 @@ class User
     self.person.save!
   end
 
+  def downcase_username
+    username.downcase!
+  end
 
 
   def as_json(opts={})

app/views/users/edit.html.haml

@@ -35,11 +35,11 @@
       = p.hidden_field :image_url, :value => @profile.image_url, :id => 'image_url_field'
       - for photo in @photos
         - if photo.url(:thumb_medium) == @profile.image_url
-          %div.small_photo{:id => photo.url(:thumb_medium), :class=>'selected'}
+          %div.small_photo{:id => request.host + photo.url(:thumb_medium), :class=>'selected'}
             = check_box_tag 'checked_photo', true, true
             = link_to image_tag(photo.url(:thumb_medium)), "#"
         - else
-          %div.small_photo{:id => photo.url(:thumb_medium)}
+          %div.small_photo{:id => request.host + photo.url(:thumb_medium)}
             = check_box_tag 'checked_photo'
             = link_to image_tag(photo.url(:thumb_medium)), "#"
     =will_paginate @photos