Merge branch 'master' into new-gui

Conflicts:
	Gemfile.lock

app/models/message_gateway.rb

@@ -1,6 +1,4 @@
 class MessageGateway < ActionMailer::Base
-  include ActionView::Helpers::SanitizeHelper
-  extend ActionView::Helpers::SanitizeHelper::ClassMethods
   
   def receive(email)
     user = get_receiving_user_from_email_address(email)
@@ -85,11 +83,11 @@ class MessageGateway < ActionMailer::Base
   end
 
   def get_text_or_nil(text)
-    return text ? sanitize(text.strip) : nil
+    return text ? text.strip : nil
   end
 
   def get_decoded_text_or_nil(text)
-    return text ? sanitize(text.decoded.strip) : nil
+    return text ? text.decoded.strip : nil
   end
   
   def get_first_text_plain_part(email)
@@ -99,7 +97,7 @@ class MessageGateway < ActionMailer::Base
     # remove all parts that are not text/plain
     parts.reject{|part| !part.content_type.start_with?("text/plain") }
     
-    return parts.count > 0 ? sanitize(parts[0].decoded.strip) : ""
+    return parts.count > 0 ? parts[0].decoded.strip : ""
   end
   
   def get_all_parts(parts)

app/models/project.rb

@@ -12,6 +12,7 @@ class Project < ActiveRecord::Base
   scope :uncompleted, -> { where("NOT(state = ?)", 'completed') }
 
   scope :with_name_or_description, lambda { |body| where("name LIKE ? OR description LIKE ?", body, body) }
+  scope :with_namepart, lambda { |body| where("name LIKE ?", body + '%') }
 
   validates_presence_of :name
   validates_length_of :name, :maximum => 255
@@ -88,7 +89,7 @@ class Project < ActiveRecord::Base
   # as a result of acts_as_state_machine calling state=() to update the attribute
   def transition_to(candidate_state)
     case candidate_state.to_sym
-      when aasm_current_state
+      when aasm.current_state
         return
       when :hidden
         hide!

app/models/todo.rb

@@ -66,7 +66,7 @@ class Todo < ActiveRecord::Base
 
   # state machine
   include AASM
-  aasm_initial_state Proc.new { |t| (t.show_from && t.user && (t.show_from > t.user.date)) ? :deferred : :active}
+  aasm_initial_state = Proc.new { |t| (t.show_from && t.user && (t.show_from > t.user.date)) ? :deferred : :active}
 
   aasm :column => :state do