Merge branch 'develop' of github.com:martini/zammad into develop

app/assets/javascripts/app/controllers/agent_ticket_create.coffee

@@ -142,7 +142,10 @@ class App.TicketCreate extends App.Controller
           @latestTitle = title
           App.TaskManager.touch(@task_key)
 
-    @interval(update, 3000, @id)
+    @el.on('change.local blur.local keyup.local paste.local input.local', 'form, .js-textarea', (e) =>
+      @delay(update, 250, 'ticket-create-form-update')
+    )
+    @delay(update, 800, 'ticket-create-form-update')
 
   # get data / in case also ticket data for split
   buildScreen: (params) =>

app/assets/javascripts/app/controllers/ticket_zoom.coffee

@@ -100,7 +100,7 @@ class App.TicketZoom extends App.Controller
     @activeState = true
 
     # start autosave
-    @delay(@autosaveStart, 800, "ticket-zoom-auto-save-#{@ticket_id}")
+    @autosaveStart()
 
     # if ticket is shown the first time
     if !@shown
@@ -428,6 +428,7 @@ class App.TicketZoom extends App.Controller
     @el.on('change.local blur.local keyup.local paste.local input.local', 'form, .js-textarea', (e) =>
       @delay(update, 250, 'ticket-zoom-form-update')
     )
+    @delay(update, 800, 'ticket-zoom-form-update')
 
   currentStore: =>
     return if !@ticket

app/models/channel/email_parser.rb

@@ -23,6 +23,7 @@ class Channel::EmailParser
     cc:                'Somebody <somebody@example.com>',
     subject:           'some message subject',
     body:              'some message body',
+    date:              Time.zone.now,
     attachments:       [
       {
         data:        'binary of attachment',

lib/core_ext/string.rb

@@ -102,6 +102,7 @@ class String
 
     # remove style tags with content
     string.gsub!(%r{<style(|\s.+?)>(.+?)</style>}im, '')
+
     # remove empty lines
     string.gsub!(/^\s*/m, '')