diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 99741dc47..d742f2338 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,6 +127,17 @@ test:integration:email_deliver: - ruby -I test/ test/integration/email_deliver_test.rb - rake db:drop +test:integration:email_keep_on_server: + stage: test + tags: + - core + script: + - export RAILS_ENV=test + - rake db:create + - rake db:migrate + - ruby -I test/ test/integration/email_keep_on_server_test.rb + - rake db:drop + test:integration:twitter: stage: test tags: @@ -332,7 +343,7 @@ test:integration:otrs_5_mysql: - mysql script: - export RAILS_ENV=test - - export IMPORT_OTRS_ENDPOINT="http://vz599.demo.znuny.com/otrs/public.pl?Action=ZammadMigrator" + - export IMPORT_OTRS_ENDPOINT="http://vz1109.demo.znuny.com/otrs/public.pl?Action=ZammadMigrator" - rake db:create - rake db:migrate - ruby -I test/ test/integration/otrs_import_test.rb @@ -345,7 +356,7 @@ test:integration:otrs_5_postgresql: - postgresql script: - export RAILS_ENV=test - - export IMPORT_OTRS_ENDPOINT="http://vz599.demo.znuny.com/otrs/public.pl?Action=ZammadMigrator" + - export IMPORT_OTRS_ENDPOINT="http://vz1109.demo.znuny.com/otrs/public.pl?Action=ZammadMigrator" - rake db:create - rake db:migrate - ruby -I test/ test/integration/otrs_import_test.rb diff --git a/.pkgr.yml b/.pkgr.yml index 85265c521..652c94518 100644 --- a/.pkgr.yml +++ b/.pkgr.yml @@ -5,19 +5,23 @@ notifications: false targets: centos-7: dependencies: + - elasticsearch - nginx - postgresql-server - which debian-8: dependencies: + - elasticsearch - nginx|apache2 - postgresql|mysql-server|mariadb-server|sqlite ubuntu-16.04: dependencies: + - elasticsearch - nginx|apache2 - postgresql|mysql-server|mariadb-server|sqlite sles-12: dependencies: + - elasticsearch - nginx - postgresql-server before: diff --git a/.ruby-version b/.ruby-version index 2bf1c1ccf..005119baa 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.1 +2.4.1 diff --git a/.travis.yml b/.travis.yml index 510217e74..e3cfaaa1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ notifications: env: - DB=mysql - DB=postgresql - - BUNDLE_JOBS=8 addons: postgresql: "9.4" apt: @@ -20,7 +19,7 @@ services: - mysql language: ruby rvm: - - 2.3.1 + - 2.4.1 before_install: - sudo apt-get -qq update - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev postfix @@ -56,3 +55,4 @@ script: - ruby -I test/ test/integration/user_device_controller_test.rb - ruby -I test/ test/integration/sipgate_controller_test.rb - rake db:drop +after_success: contrib/travis-ci.org/trigger-docker-compose-build.sh diff --git a/Gemfile b/Gemfile index 2695e13bb..4d43388a0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ source 'https://rubygems.org' -ruby '2.3.1' +ruby '2.4.1' -gem 'rails', '4.2.8' +gem 'rails', '4.2.9' gem 'rails-observers' gem 'activerecord-session_store' @@ -40,6 +40,7 @@ gem 'omniauth-gitlab' gem 'omniauth-google-oauth2' gem 'omniauth-linkedin-oauth2' gem 'omniauth-twitter' +gem 'omniauth-microsoft-office365' gem 'twitter' gem 'telegramAPI' @@ -73,12 +74,16 @@ gem 'argon2' gem 'writeexcel' gem 'icalendar' +gem 'icalendar-recurrence' gem 'browser' # integrations gem 'slack-notifier' gem 'clearbit' gem 'zendesk_api' +gem 'viewpoint' +gem 'rubyntlm', git: 'https://github.com/wimm/rubyntlm.git' +gem 'autodiscover', git: 'https://github.com/thorsteneckel/autodiscover.git' # event machine gem 'eventmachine' diff --git a/Gemfile.lock b/Gemfile.lock index 5b161264b..96e3ada43 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,44 +1,60 @@ +GIT + remote: https://github.com/thorsteneckel/autodiscover.git + revision: 29d713ee0c8c25fcf74c4292ff13fe1fa4d0d827 + specs: + autodiscover (1.0.2) + httpclient + logging + nokogiri + nori + +GIT + remote: https://github.com/wimm/rubyntlm.git + revision: 53969639b87b9e5d5fef560f19cf0d977259591c + specs: + rubyntlm (0.1.2) + GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.8) - actionpack (= 4.2.8) - actionview (= 4.2.8) - activejob (= 4.2.8) + actionmailer (4.2.9) + actionpack (= 4.2.9) + actionview (= 4.2.9) + activejob (= 4.2.9) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.8) - actionview (= 4.2.8) - activesupport (= 4.2.8) + actionpack (4.2.9) + actionview (= 4.2.9) + activesupport (= 4.2.9) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.8) - activesupport (= 4.2.8) + actionview (4.2.9) + activesupport (= 4.2.9) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.8) - activesupport (= 4.2.8) + activejob (4.2.9) + activesupport (= 4.2.9) globalid (>= 0.3.0) - activemodel (4.2.8) - activesupport (= 4.2.8) + activemodel (4.2.9) + activesupport (= 4.2.9) builder (~> 3.1) - activerecord (4.2.8) - activemodel (= 4.2.8) - activesupport (= 4.2.8) + activerecord (4.2.9) + activemodel (= 4.2.9) + activesupport (= 4.2.9) arel (~> 6.0) - activerecord-nulldb-adapter (0.3.6) + activerecord-nulldb-adapter (0.3.7) activerecord (>= 2.0.0) - activerecord-session_store (1.0.0) - actionpack (>= 4.0, < 5.1) - activerecord (>= 4.0, < 5.1) + activerecord-session_store (1.1.0) + actionpack (>= 4.0, < 5.2) + activerecord (>= 4.0, < 5.2) multi_json (~> 1.11, >= 1.11.2) rack (>= 1.5.2, < 3) - railties (>= 4.0, < 5.1) - activesupport (4.2.8) + railties (>= 4.0, < 5.2) + activesupport (4.2.9) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -49,9 +65,9 @@ GEM ffi (~> 1.9) ffi-compiler (~> 0.1) ast (2.3.0) - autoprefixer-rails (6.4.1.1) + autoprefixer-rails (7.1.2.4) execjs - biz (1.6.0) + biz (1.7.0) clavius (~> 1.0) tzinfo browser (2.2.0) @@ -60,7 +76,7 @@ GEM childprocess (0.5.9) ffi (~> 1.0, >= 1.0.11) clavius (1.0.2) - clearbit (0.2.5) + clearbit (0.2.7) nestful (~> 1.1.0) coderay (1.1.1) coffee-rails (4.2.1) @@ -69,27 +85,27 @@ GEM coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) + coffee-script-source (1.12.2) coffeelint (1.14.0) coffee-script execjs json - composite_primary_keys (8.1.5) + composite_primary_keys (8.1.6) activerecord (~> 4.2.0) concurrent-ruby (1.0.5) - coveralls (0.8.16) + coveralls (0.8.21) json (>= 1.8, < 3) - simplecov (~> 0.12.0) - term-ansicolor (~> 1.3.0) - thor (~> 0.19.1) - tins (>= 1.6.0, < 2) + simplecov (~> 0.14.1) + term-ansicolor (~> 1.3) + thor (~> 0.19.4) + tins (~> 1.6) crack (0.4.3) safe_yaml (~> 1.0.0) daemons (1.2.4) - delayed_job (4.1.2) - activesupport (>= 3.0, < 5.1) - delayed_job_active_record (4.1.1) - activerecord (>= 3.0, < 5.1) + delayed_job (4.1.3) + activesupport (>= 3.0, < 5.2) + delayed_job_active_record (4.1.2) + activerecord (>= 3.0, < 5.2) delayed_job (>= 3.0, < 5) diff-lcs (1.2.5) diffy (3.1.0) @@ -151,10 +167,11 @@ GEM guard (~> 2.8) guard-compat (~> 1.0) multi_json (~> 1.8) - guard-symlink (0.1.0) + guard-symlink (0.1.1) + guard guard-compat (~> 1.1) - hashdiff (0.3.2) - hashie (3.4.4) + hashdiff (0.3.5) + hashie (3.5.6) htmlentities (4.3.4) http (1.0.4) addressable (~> 2.3) @@ -165,21 +182,30 @@ GEM domain_name (~> 0.5) http-form_data (1.0.3) http_parser.rb (0.6.0) - i18n (0.8.4) + httpclient (2.8.3) + i18n (0.8.6) icalendar (2.4.1) + icalendar-recurrence (1.1.2) + icalendar (~> 2.0) + ice_cube (~> 0.13) + ice_cube (0.16.2) inflection (1.0.0) json (1.8.6) - jwt (1.5.4) + jwt (1.5.6) kgio (2.11.0) koala (2.4.0) addressable faraday multi_json (>= 1.3.0) - libv8 (3.16.14.15) + libv8 (3.16.14.19) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) + little-plugger (1.1.4) + logging (2.2.2) + little-plugger (~> 1.1) + multi_json (~> 1.10) loofah (2.0.3) nokogiri (>= 1.5.9) lumberjack (1.0.10) @@ -192,9 +218,9 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_portile2 (2.2.0) - minitest (5.10.2) + minitest (5.10.3) multi_json (1.12.1) - multi_xml (0.5.5) + multi_xml (0.6.0) multipart-post (2.0.0) mysql2 (0.4.6) naught (1.1.0) @@ -204,37 +230,41 @@ GEM netrc (0.11.0) nokogiri (1.8.0) mini_portile2 (~> 2.2.0) + nori (2.6.0) notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) oauth (0.5.1) - oauth2 (1.2.0) - faraday (>= 0.8, < 0.10) + oauth2 (1.4.0) + faraday (>= 0.8, < 0.13) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) octokit (4.4.1) sawyer (~> 0.7.0, >= 0.5.3) - omniauth (1.3.1) - hashie (>= 1.2, < 4) - rack (>= 1.0, < 3) + omniauth (1.6.1) + hashie (>= 3.4.6, < 3.6.0) + rack (>= 1.6.2, < 3) omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) - omniauth-github (1.1.2) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) + omniauth-github (1.3.0) + omniauth (~> 1.5) + omniauth-oauth2 (>= 1.4.0, < 2.0) omniauth-gitlab (1.0.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) - omniauth-google-oauth2 (0.4.1) - jwt (~> 1.5.2) + omniauth-google-oauth2 (0.5.0) + jwt (~> 1.5) multi_json (~> 1.3) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.3.1) omniauth-linkedin-oauth2 (0.1.5) omniauth (~> 1.0) omniauth-oauth2 + omniauth-microsoft-office365 (0.0.7) + omniauth + omniauth-oauth2 omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) @@ -246,32 +276,32 @@ GEM omniauth-oauth (~> 1.1) parser (2.3.1.2) ast (~> 2.2) - pg (0.18.4) - pluginator (1.3.0) + pg (0.20.0) + pluginator (1.5.0) power_assert (0.3.1) powerpack (0.1.1) - pre-commit (0.28.0) - pluginator (~> 1.1) + pre-commit (0.35.0) + pluginator (~> 1.5) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - puma (3.6.0) + puma (3.9.1) rack (1.6.8) rack-livereload (0.3.16) rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.8) - actionmailer (= 4.2.8) - actionpack (= 4.2.8) - actionview (= 4.2.8) - activejob (= 4.2.8) - activemodel (= 4.2.8) - activerecord (= 4.2.8) - activesupport (= 4.2.8) + rails (4.2.9) + actionmailer (= 4.2.9) + actionpack (= 4.2.9) + actionview (= 4.2.9) + activejob (= 4.2.9) + activemodel (= 4.2.9) + activerecord (= 4.2.9) + activesupport (= 4.2.9) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.8) + railties (= 4.2.9) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -281,15 +311,16 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - rails-observers (0.1.2) - activemodel (~> 4.0) - railties (4.2.8) - actionpack (= 4.2.8) - activesupport (= 4.2.8) + rails-observers (0.1.5) + activemodel (>= 4.0) + railties (4.2.9) + actionpack (= 4.2.9) + activesupport (= 4.2.9) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.1.0) - raindrops (0.17.0) + rainbow (2.2.2) + rake + raindrops (0.19.0) rake (12.0.0) rb-fsevent (0.9.7) rb-inotify (0.9.7) @@ -337,7 +368,6 @@ GEM sawyer (0.7.0) addressable (>= 2.3.5, < 2.5) faraday (~> 0.8, < 0.10) - scrub_rb (1.0.1) selenium-webdriver (2.53.4) childprocess (~> 0.5) rubyzip (~> 1.0) @@ -345,16 +375,17 @@ GEM shellany (0.0.1) simple-rss (1.3.1) simple_oauth (0.3.1) - simplecov (0.12.0) + simplecov (0.14.1) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) + simplecov-html (0.10.1) simplecov-rcov (0.2.3) simplecov (>= 0.4.1) slack-notifier (1.5.1) slop (3.6.0) - spring (1.7.2) + spring (2.0.2) + activesupport (>= 4.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) sprockets (3.7.1) @@ -367,17 +398,17 @@ GEM sqlite3 (1.3.11) telegramAPI (1.2.2) rest-client (~> 2.0, >= 1.7.3) - term-ansicolor (1.3.2) + term-ansicolor (1.6.0) tins (~> 1.0) test-unit (3.2.1) power_assert - therubyracer (0.12.2) - libv8 (~> 3.16.14.0) + therubyracer (0.12.3) + libv8 (~> 3.16.14.15) ref thor (0.19.4) thread_safe (0.3.6) tilt (2.0.5) - tins (1.13.0) + tins (1.15.0) twitter (5.17.0) addressable (~> 2.3) buftok (~> 0.2.0) @@ -397,25 +428,29 @@ GEM unf_ext unf_ext (0.0.7.4) unicode-display_width (1.1.1) - unicorn (5.2.0) + unicorn (5.3.0) kgio (~> 2.6) raindrops (~> 0.7) - valid_email2 (1.2.17) + valid_email2 (2.0.0) activemodel (>= 3.2) mail (~> 2.5) - webmock (2.3.2) + viewpoint (1.1.0) + httpclient + logging + nokogiri + rubyntlm + webmock (3.0.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff websocket (1.2.3) writeexcel (1.0.5) - zendesk_api (1.14.0) + zendesk_api (1.14.4) faraday (~> 0.9) - hashie (>= 1.2, < 4.0, != 3.3.0) + hashie (>= 3.5.2, < 4.0.0) inflection mime-types multipart-post (~> 2.0) - scrub_rb (~> 1.0.1) PLATFORMS ruby @@ -424,6 +459,7 @@ DEPENDENCIES activerecord-nulldb-adapter activerecord-session_store argon2 + autodiscover! autoprefixer-rails biz browser @@ -449,6 +485,7 @@ DEPENDENCIES guard-symlink htmlentities icalendar + icalendar-recurrence json koala libv8 @@ -463,17 +500,19 @@ DEPENDENCIES omniauth-gitlab omniauth-google-oauth2 omniauth-linkedin-oauth2 + omniauth-microsoft-office365 omniauth-oauth2 omniauth-twitter pg pre-commit puma rack-livereload - rails (= 4.2.8) + rails (= 4.2.9) rails-observers rb-fsevent rspec-rails rubocop + rubyntlm! sass-rails selenium-webdriver simple-rss @@ -491,12 +530,13 @@ DEPENDENCIES uglifier unicorn valid_email2 + viewpoint webmock writeexcel zendesk_api RUBY VERSION - ruby 2.3.1p112 + ruby 2.4.1p111 BUNDLED WITH - 1.13.7 + 1.15.3 diff --git a/app/assets/javascripts/app/controllers/_application_controller.coffee b/app/assets/javascripts/app/controllers/_application_controller.coffee index 5952bb0bc..c6fc9fa3f 100644 --- a/app/assets/javascripts/app/controllers/_application_controller.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller.coffee @@ -61,13 +61,13 @@ class App.Controller extends Spine.Controller clearDelay: (delay_id) => App.Delay.clear(delay_id, @controllerId) - delay: (callback, timeout, delay_id, queue = true) => + delay: (callback, timeout, delay_id, queue = false) => App.Delay.set(callback, timeout, delay_id, @controllerId, queue) clearInterval: (interval_id) => App.Interval.clear(interval_id, @controllerId) - interval: (callback, interval, interval_id, queue = true) => + interval: (callback, interval, interval_id, queue = false) => App.Interval.set(callback, interval, interval_id, @controllerId, queue) releaseController: => @@ -185,6 +185,17 @@ class App.Controller extends Spine.Controller formValidate: (data) -> App.ControllerForm.validate(data) + # get all query params of the url + queryParam: -> + return if !@query + pairs = @query.split(';') + params = {} + for pair in pairs + result = pair.match('(.+?)=(.*)') + if result && result[1] + params[result[1]] = result[2] + params + # redirectToLogin: (data) -> # @@ -344,7 +355,10 @@ class App.Controller extends Spine.Controller title: -> userId = $(@).data('id') user = App.User.find(userId) - App.Utils.htmlEscape(user.displayName()) + headline = App.Utils.htmlEscape(user.displayName()) + if user.isOutOfOffice() + headline += " (#{App.Utils.htmlEscape(user.outOfOfficeText())})" + headline content: -> userId = $(@).data('id') user = App.User.fullLocal(userId) diff --git a/app/assets/javascripts/app/controllers/_application_controller_generic.coffee b/app/assets/javascripts/app/controllers/_application_controller_generic.coffee index 6c8dfa547..f764e5c57 100644 --- a/app/assets/javascripts/app/controllers/_application_controller_generic.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller_generic.coffee @@ -309,6 +309,23 @@ class App.ControllerConfirm extends App.ControllerModal if @callback @callback() +class App.ControllerErrorModal extends App.ControllerModal + buttonClose: true + buttonCancel: false + buttonSubmit: 'Close' + #buttonClass: 'btn--danger' + head: 'Error' + #small: true + #shown: true + + content: -> + @message + + onSubmit: => + @close() + if @callback + @callback() + class App.ControllerDrox extends App.Controller constructor: (params) -> super @@ -659,8 +676,9 @@ class App.Sidebar extends App.Controller render: => localEl = $(App.view('generic/sidebar_tabs')( - items: @items + items: @items scrollbarWidth: App.Utils.getScrollBarWidth() + dir: App.i18n.dir() )) # init content callback diff --git a/app/assets/javascripts/app/controllers/_channel/chat.coffee b/app/assets/javascripts/app/controllers/_channel/chat.coffee index a33ee73d7..a1cb273cb 100644 --- a/app/assets/javascripts/app/controllers/_channel/chat.coffee +++ b/app/assets/javascripts/app/controllers/_channel/chat.coffee @@ -21,7 +21,6 @@ class App.ChannelChat extends App.ControllerSubContent '.js-chat-welcome': 'chatWelcome' '.js-testurl-input': 'urlInput' '.js-backgroundColor': 'chatBackground' - '.js-paramsBlock': 'paramsBlock' '.js-code': 'code' '.js-palette': 'palette' '.js-color': 'colorField' @@ -361,7 +360,7 @@ class App.ChannelChat extends App.ControllerSubContent @$('.js-modal-params').html(paramString) # highlight - @paramsBlock.each (i, block) -> + @code.each (i, block) -> hljs.highlightBlock block App.Config.set('Chat', { prio: 4000, name: 'Chat', parent: '#channels', target: '#channels/chat', controller: App.ChannelChat, permission: ['admin.chat'] }, 'NavBarAdmin') diff --git a/app/assets/javascripts/app/controllers/_channel/email.coffee b/app/assets/javascripts/app/controllers/_channel/email.coffee index 99a71620e..5c92bc279 100644 --- a/app/assets/javascripts/app/controllers/_channel/email.coffee +++ b/app/assets/javascripts/app/controllers/_channel/email.coffee @@ -108,7 +108,7 @@ class App.ChannelEmailFilterEdit extends App.ControllerModal # show errors in form if errors @log 'error', errors - @formValidate( form: e.target, errors: errors ) + @formValidate(form: e.target, errors: errors) return false # disable form @@ -118,8 +118,10 @@ class App.ChannelEmailFilterEdit extends App.ControllerModal object.save( done: => @close() - fail: => - @close() + fail: (settings, details) => + @log 'errors', details + @formEnable(e) + @form.showAlert(details.error_human || details.error || 'Unable to create object!') ) class App.ChannelEmailSignature extends App.Controller @@ -201,7 +203,7 @@ class App.ChannelEmailSignatureEdit extends App.ControllerModal # show errors in form if errors @log 'error', errors - @formValidate( form: e.target, errors: errors ) + @formValidate(form: e.target, errors: errors) return false # disable form @@ -211,8 +213,10 @@ class App.ChannelEmailSignatureEdit extends App.ControllerModal object.save( done: => @close() - fail: => + fail: (settings, details) => + @log 'errors', details @formEnable(e) + @form.showAlert(details.error_human || details.error || 'Unable to create object!') ) class App.ChannelEmailAccountOverview extends App.Controller @@ -560,21 +564,24 @@ class App.ChannelEmailAccountWizard extends App.WizardModal # inbound configureAttributesInbound = [ - { name: 'adapter', display: 'Type', tag: 'select', multiple: false, null: false, options: @channelDriver.email.inbound }, - { name: 'options::host', display: 'Host', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false }, - { name: 'options::user', display: 'User', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false, autocomplete: 'off', }, - { name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: false, autocapitalize: false, autocomplete: 'new-password', single: true }, - { name: 'options::ssl', display: 'SSL', tag: 'boolean', null: true, options: { true: 'yes', false: 'no' }, default: true, translate: true, item_class: 'formGroup--halfSize' }, - { name: 'options::port', display: 'Port', tag: 'input', type: 'text', limit: 6, null: true, autocapitalize: false, default: '993', item_class: 'formGroup--halfSize' }, - { name: 'options::folder', display: 'Folder', tag: 'input', type: 'text', limit: 120, null: true, autocapitalize: false }, + { name: 'adapter', display: 'Type', tag: 'select', multiple: false, null: false, options: @channelDriver.email.inbound }, + { name: 'options::host', display: 'Host', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false }, + { name: 'options::user', display: 'User', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false, autocomplete: 'off' }, + { name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: false, autocapitalize: false, autocomplete: 'new-password', single: true }, + { name: 'options::ssl', display: 'SSL', tag: 'boolean', null: true, options: { true: 'yes', false: 'no' }, default: true, translate: true, item_class: 'formGroup--halfSize' }, + { name: 'options::port', display: 'Port', tag: 'input', type: 'text', limit: 6, null: true, autocapitalize: false, default: '993', item_class: 'formGroup--halfSize' }, + { name: 'options::folder', display: 'Folder', tag: 'input', type: 'text', limit: 120, null: true, autocapitalize: false, item_class: 'formGroup--halfSize' }, + { name: 'options::keep_on_server', display: 'Keep messages on server', tag: 'boolean', null: true, options: { true: 'yes', false: 'no' }, translate: true, default: false, item_class: 'formGroup--halfSize' }, ] showHideFolder = (params, attribute, attributes, classname, form, ui) -> return if !params if params.adapter is 'imap' ui.show('options::folder') + ui.show('options::keep_on_server') return ui.hide('options::folder') + ui.hide('options::keep_on_server') handlePort = (params, attribute, attributes, classname, form, ui) -> return if !params @@ -606,9 +613,10 @@ class App.ChannelEmailAccountWizard extends App.WizardModal # fill user / password based on intro info channel_used = { options: {} } if @account['meta'] - channel_used['options']['user'] = @account['meta']['email'] - channel_used['options']['password'] = @account['meta']['password'] - channel_used['options']['folder'] = @account['meta']['folder'] + channel_used['options']['user'] = @account['meta']['email'] + channel_used['options']['password'] = @account['meta']['password'] + channel_used['options']['folder'] = @account['meta']['folder'] + channel_used['options']['keep_on_server'] = @account['meta']['keep_on_server'] # show used backend @$('.base-outbound-settings').html('') @@ -670,7 +678,7 @@ class App.ChannelEmailAccountWizard extends App.WizardModal for key, value of data.setting @account[key] = value - if data.content_messages && data.content_messages > 0 + if data.content_messages && data.content_messages > 0 && (!@account['inbound']['options'] || @account['inbound']['options']['keep_on_server'] isnt true) message = App.i18n.translateContent('We have already found %s email(s) in your mailbox. Zammad will move it all from your mailbox into Zammad.', data.content_messages) @$('.js-inbound-acknowledge .js-message').html(message) @$('.js-inbound-acknowledge .js-back').attr('data-slide', 'js-intro') @@ -724,7 +732,7 @@ class App.ChannelEmailAccountWizard extends App.WizardModal # remember account settings @account.inbound = params - if data.content_messages && data.content_messages > 0 + if data.content_messages && data.content_messages > 0 && (!@account['inbound']['options'] || @account['inbound']['options']['keep_on_server'] isnt true) message = App.i18n.translateContent('We have already found %s email(s) in your mailbox. Zammad will move it all from your mailbox into Zammad.', data.content_messages) @$('.js-inbound-acknowledge .js-message').html(message) @$('.js-inbound-acknowledge .js-back').attr('data-slide', 'js-inbound') diff --git a/app/assets/javascripts/app/controllers/_channel/form.coffee b/app/assets/javascripts/app/controllers/_channel/form.coffee index 6955b3b60..7efd8168b 100644 --- a/app/assets/javascripts/app/controllers/_channel/form.coffee +++ b/app/assets/javascripts/app/controllers/_channel/form.coffee @@ -9,7 +9,7 @@ class App.ChannelForm extends App.ControllerSubContent 'change .js-paramsSetting select': 'updateGroup' elements: - '.js-paramsBlock': 'paramsBlock' + '.js-code': 'code' '.js-paramsSetting': 'paramsSetting' '.js-formSetting input': 'formSetting' @@ -43,7 +43,7 @@ class App.ChannelForm extends App.ControllerSubContent @html element - @paramsBlock.each (i, block) -> + @code.each (i, block) -> hljs.highlightBlock block @updateParamsDesigner() diff --git a/app/assets/javascripts/app/controllers/_integration/check_mk.coffee b/app/assets/javascripts/app/controllers/_integration/check_mk.coffee new file mode 100644 index 000000000..33c58ecf4 --- /dev/null +++ b/app/assets/javascripts/app/controllers/_integration/check_mk.coffee @@ -0,0 +1,46 @@ +class Index extends App.ControllerIntegrationBase + featureIntegration: 'check_mk_integration' + featureName: 'Check_MK' + featureConfig: 'check_mk_config' + description: [ + ['This service receives http requests from %s and creates tickets with host and service.', 'Check_MK'] + ['If the host and service is recovered again, the ticket will be closed automatically.'] + ] + + render: => + super + new App.SettingsForm( + area: 'Integration::CheckMK' + el: @$('.js-form') + ) + + new App.ScriptSnipped( + el: @$('.js-scriptSnipped') + facility: 'check_mk' + style: 'bash' + content: "#!/bin/bash\n\ncurl -X POST -F 'event_id=123' -F 'host=host1' -F 'service=http' -F 'state=down' #{App.Config.get('http_type')}://#{App.Config.get('fqdn')}/api/v1/integration/check_mk/#{App.Setting.get('check_mk_token')}" + description: [ + ['To enable %s for sending http requests to %s, you need create "%s" in the admin interface if %s.', 'Check_MK', 'Zammad', 'Event Actions', 'Check_MK'] + ] + ) + + new App.HttpLog( + el: @$('.js-log') + facility: 'check_mk' + ) + +class State + @current: -> + App.Setting.get('check_mk_integration') + +App.Config.set( + 'IntegrationCheckMk' + { + name: 'Check_MK' + target: '#system/integration/check_mk' + description: 'An open source monitoring tool.' + controller: Index + state: State + } + 'NavBarIntegrations' +) diff --git a/app/assets/javascripts/app/controllers/_integration/exchange.coffee b/app/assets/javascripts/app/controllers/_integration/exchange.coffee new file mode 100644 index 000000000..5e6cd1843 --- /dev/null +++ b/app/assets/javascripts/app/controllers/_integration/exchange.coffee @@ -0,0 +1,528 @@ +class Index extends App.ControllerIntegrationBase + featureIntegration: 'exchange_integration' + featureName: 'Exchange' + featureConfig: 'exchange_config' + description: [ + ['This service enables Zammad to connect with your Exchange server.'] + ] + events: + 'change .js-switch input': 'switch' + + render: => + super + new Form( + el: @$('.js-form') + ) + + #new App.ImportJob( + # el: @$('.js-importJob') + # facility: 'exchange' + #) + + new App.HttpLog( + el: @$('.js-log') + facility: 'exchange' + ) + + switch: => + super + active = @$('.js-switch input').prop('checked') + if active + job_start = => + @ajax( + id: 'jobs_config' + type: 'POST' + url: "#{@apiPath}/integration/exchange/job_start" + processData: true + success: (data, status, xhr) => + @render(true) + ) + + App.Delay.set( + job_start, + 600, + 'job_start', + ) + +class Form extends App.Controller + elements: + '.js-lastImport': 'lastImport' + '.js-wizard': 'wizardButton' + events: + 'click .js-wizard': 'startWizard' + 'click .js-start-sync': 'startSync' + + constructor: -> + super + @render() + @lastResult() + @activeDryRun() + + currentConfig: -> + App.Setting.get('exchange_config') || {} + + setConfig: (value) => + App.Setting.set('exchange_config', value, {notify: true}) + @startSync() + + render: (top = false) => + @config = @currentConfig() + + folders = [] + if !_.isEmpty(@config.folders) + for folder_id in @config.folders + folders.push @config.wizardData.backend_folders[folder_id] + + @html App.view('integration/exchange')( + config: @config, + folders: folders + ) + if _.isEmpty(@config) + @$('.js-notConfigured').removeClass('hide') + @$('.js-summary').addClass('hide') + else + @$('.js-notConfigured').addClass('hide') + @$('.js-summary').removeClass('hide') + + if top + a = => + @scrollToIfNeeded($('.content.active .page-header')) + @delay(a, 500) + + startSync: => + @ajax( + id: 'jobs_config' + type: 'POST' + url: "#{@apiPath}/integration/exchange/job_start" + processData: true + success: (data, status, xhr) => + @render(true) + @lastResult() + ) + + startWizard: (e) => + e.preventDefault() + new ConnectionWizard( + container: @el.closest('.content') + config: @config + callback: (config) => + @setConfig(config) + ) + + lastResult: => + @ajax( + id: 'jobs_start_index' + type: 'GET' + url: "#{@apiPath}/integration/exchange/job_start" + processData: true + success: (job, status, xhr) => + if !_.isEmpty(job) + if !@lastResultShowJob || @lastResultShowJob.updated_at != job.updated_at + @lastResultShowJob = job + @lastResultShow(job) + if job.finished_at + @wizardButton.attr('disabled', false) + else + @wizardButton.attr('disabled', true) + @delay(@lastResult, 5000) + ) + + lastResultShow: (job) => + if _.isEmpty(job) + @lastImport.html('') + return + countDone = job.result.created + job.result.updated + job.result.unchanged + job.result.skipped + job.result.failed + if !job.result.roles + job.result.roles = {} + for role_id, statistic of job.result.role_ids + role = App.Role.find(role_id) + job.result.roles[role.displayName()] = statistic + el = $(App.view('integration/exchange_last_import')(job: job, countDone: countDone)) + @lastImport.html(el) + + activeDryRun: => + @ajax( + id: 'jobs_try_index' + type: 'GET' + url: "#{@apiPath}/integration/exchange/job_try" + data: + finished: false + processData: true + success: (job, status, xhr) => + return if _.isEmpty(job) + + # show analyzing + new ConnectionWizard( + container: @el.closest('.content') + config: job.payload + start: 'tryLoop' + callback: (config) => + @wizardButton.attr('disabled', false) + @setConfig(config) + ) + @wizardButton.attr('disabled', true) + ) + +class State + @current: -> + App.Setting.get('exchange_integration') + +class ConnectionWizard extends App.WizardModal + wizardConfig: {} + slideMethod: + 'js-folders': 'foldersShow' + 'js-mapping': 'mappingShow' + + events: + 'submit form.js-discover': 'discover' + 'submit form.js-bind': 'folders' + 'submit form.js-folders': 'mapping' + 'click .js-mapping .js-submitTry': 'mappingChange' + 'click .js-try .js-submitSave': 'save' + 'click .js-close': 'hide' + 'click .js-remove': 'removeRow' + 'click .js-userMappingForm .js-add': 'addUserMapping' + 'click .js-goToSlide': 'goToSlide' + + elements: + '.modal-body': 'body' + '.js-foldersSelect': 'foldersSelect' + '.js-folders .js-submitTry': 'foldersSelectSubmit' + '.js-userMappingForm': 'userMappingForm' + '.js-expertForm': 'expertForm' + + constructor: -> + super + + if !_.isEmpty(@config) + @wizardConfig = @config + + if @container + @el.addClass('modal--local') + + @render() + + @el.modal + keyboard: true + show: true + backdrop: true + container: @container + .on + 'show.bs.modal': @onShow + 'shown.bs.modal': @onShown + 'hidden.bs.modal': => + @el.remove() + + if @slide + @showSlide(@slide) + else + @showDiscoverDetails() + + if @start + @[@start]() + + render: => + @html App.view('integration/exchange_wizard')() + + save: (e) => + e.preventDefault() + @callback(@wizardConfig) + @hide(e) + + showSlide: (slide) => + method = @slideMethod[slide] + if method && @[method] + @[method](true) + super + + showDiscoverDetails: => + @$('.js-discover input[name="user"]').val(@wizardConfig.user) + @$('.js-discover input[name="password"]').val(@wizardConfig.password) + + showBindDetails: => + @$('.js-bind input[name="endpoint"]').val(@wizardConfig.endpoint) + @$('.js-bind input[name="user"]').val(@wizardConfig.user) + @$('.js-bind input[name="password"]').val(@wizardConfig.password) + + discover: (e) => + e.preventDefault() + @showSlide('js-connect') + params = @formParam(e.target) + @ajax( + id: 'exchange_discover' + type: 'POST' + url: "#{@apiPath}/integration/exchange/autodiscover" + data: JSON.stringify(params) + processData: true + success: (data, status, xhr) => + if data.result isnt 'ok' + @showSlide('js-discover') + @showAlert('js-discover', data.message) + return + + @wizardConfig.endpoint = data.endpoint + @wizardConfig.user = params.user + @wizardConfig.password = params.password + + @showSlide('js-bind') + @showBindDetails() + + error: (xhr, statusText, error) => + detailsRaw = xhr.responseText + details = {} + if !_.isEmpty(detailsRaw) + details = JSON.parse(detailsRaw) + @showSlide('js-discover') + @showAlert('js-discover', details.error || 'Unable to perform backend.') + ) + + folders: (e) => + e.preventDefault() + @showSlide('js-analyze') + params = @formParam(e.target) + @ajax( + id: 'exchange_folders' + type: 'POST' + url: "#{@apiPath}/integration/exchange/folders" + data: JSON.stringify(params) + processData: true + success: (data, status, xhr) => + if data.result isnt 'ok' + @showSlide('js-bind') + @showAlert('js-bind', data.message) + return + + @wizardConfig.endpoint = params.endpoint + @wizardConfig.user = params.user + @wizardConfig.password = params.password + + # update wizard data + @wizardConfig.wizardData = {} + @wizardConfig.wizardData.backend_folders = data.folders + + @foldersShow() + + error: (xhr, statusText, error) => + detailsRaw = xhr.responseText + details = {} + if !_.isEmpty(detailsRaw) + details = JSON.parse(detailsRaw) + @showSlide('js-bind') + @showAlert('js-bind', details.error || 'Unable to perform backend.') + ) + + foldersShow: (alreadyShown) => + @showSlide('js-folders') if !alreadyShown + @foldersSelect.html(@createColumnSelection('folders', @wizardConfig.wizardData.backend_folders, @wizardConfig.folders)) + + createColumnSelection: (name, options, selected) -> + return App.UiElement.column_select.render( + name: name + null: false + nulloption: false + options: options + value: selected + onChange: (val) => + if val && val.length > 0 + @foldersSelectSubmit.removeClass('is-disabled') + else + @foldersSelectSubmit.addClass('is-disabled') + ) + + mapping: (e) => + e.preventDefault() + @showSlide('js-analyze') + params = @formParam(e.target) + + # folders might be a single selection so we + # have to ensure that is an Array so the + # backend and frontend can handle it properly + if typeof params.folders is 'string' + params.folders = [ params.folders ] + + # add login params + params.endpoint = @wizardConfig.endpoint + params.user = @wizardConfig.user + params.password = @wizardConfig.password + + @ajax( + id: 'exchange_mapping' + type: 'POST' + url: "#{@apiPath}/integration/exchange/mapping" + data: JSON.stringify(params) + processData: true + success: (data, status, xhr) => + if data.result isnt 'ok' + @showSlide('js-folders') + @showAlert('js-folders', data.message) + return + + attributes = {} + for key, value of App.User.attributesGet() + continue if key == 'login' + if (value.tag is 'input' || value.tag is 'richtext' || value.tag is 'textarea') && value.type isnt 'password' + attributes[key] = value.display || key + + @wizardConfig.wizardData.attributes = attributes + @wizardConfig.folders = params.folders + @wizardConfig.wizardData.backend_attributes = data.attributes + + @mappingShow() + + error: (xhr, statusText, error) => + detailsRaw = xhr.responseText + details = {} + if !_.isEmpty(detailsRaw) + details = JSON.parse(detailsRaw) + @showSlide('js-folders') + @showAlert('js-folders', details.error || 'Unable to perform backend.') + ) + + mappingShow: (alreadyShown) => + @showSlide('js-mapping') if !alreadyShown + user_attribute_map = @wizardConfig.attributes + + if _.isEmpty(user_attribute_map) + user_attribute_map = + given_name: 'firstname' + surname: 'lastname' + 'email_addresses.emailaddress1': 'email' + 'phone_numbers.businessphone': 'phone' + + @userMappingForm.find('tbody tr.js-entry').remove() + @userMappingForm.find('tbody tr').before(@buildRowsUserMap(user_attribute_map)) + + mappingChange: (e) => + e.preventDefault() + + # user map + attributes = @formParam(@userMappingForm) + for key in ['source', 'dest'] + if !_.isArray(attributes[key]) + attributes[key] = [attributes[key]] + attributes_local = + item_id: 'login' + length = attributes.source.length-1 + for count in [0..length] + if attributes.source[count] && attributes.dest[count] + attributes_local[attributes.source[count]] = attributes.dest[count] + @wizardConfig.attributes = attributes_local + + @tryShow() + + buildRowsUserMap: (user_attribute_map) => + + # show static login row + userUidDisplayValue = @wizardConfig.wizardData.backend_attributes['item_id'] + el = [ + $(App.view('integration/ldap_user_attribute_row_read_only')( + key: userUidDisplayValue, + value: 'Login' + )) + ] + + for source, dest of user_attribute_map + continue if source == 'item_id' + continue if !(source of @wizardConfig.wizardData.backend_attributes) + el.push @buildRowUserAttribute(source, dest) + el + + buildRowUserAttribute: (source, dest) => + el = $(App.view('integration/exchange_user_attribute_row')()) + el.find('.js-exchangeAttribute').html(@createSelection('source', @wizardConfig.wizardData.backend_attributes, source)) + el.find('.js-userAttribute').html(@createSelection('dest', @wizardConfig.wizardData.attributes, dest)) + el + + createSelection: (name, options, selected, unknown) -> + return App.UiElement.searchable_select.render( + name: name + multiple: false + limit: 100 + null: false + nulloption: false + options: options + value: selected + unknown: unknown + class: 'form-control--small' + ) + + removeRow: (e) -> + e.preventDefault() + $(e.target).closest('tr').remove() + + addUserMapping: (e) => + e.preventDefault() + @userMappingForm.find('tbody tr').last().before(@buildRowUserAttribute()) + + tryShow: (e) => + if e + e.preventDefault() + @showSlide('js-analyze') + + # create import job + @ajax( + id: 'exchange_try' + type: 'POST' + url: "#{@apiPath}/integration/exchange/job_try" + data: JSON.stringify(@wizardConfig) + processData: true + success: (data, status, xhr) => + @tryLoop() + ) + + tryLoop: => + @showSlide('js-dry') + @ajax( + id: 'jobs_try_index' + type: 'GET' + url: "#{@apiPath}/integration/exchange/job_try" + data: + finished: true + processData: true + success: (job, status, xhr) => + if job.result && (job.result.error || job.result.info) + @showSlide('js-error') + @showAlert('js-error', (job.result.error || job.result.info)) + return + + total = 0 + if job.result && _.keys(job.result).length > 0 + @$('.js-preprogress').addClass('hide') + @$('.js-analyzing').removeClass('hide') + + analized = 0 + total = job.result.sum + for action, sum of job.result + continue if action == 'folders' + continue if action == 'sum' + analized += sum + + @$('.js-progress progress').attr('value', analized) + @$('.js-progress progress').attr('max', total) + + if job.finished_at + # reset initial state in case the back button is used + @$('.js-preprogress').removeClass('hide') + @$('.js-analyzing').addClass('hide') + + @tryResult(job, total) + else + @delay(@tryLoop, 4000) + ) + + tryResult: (job, total) => + @showSlide('js-try') + el = $(App.view('integration/exchange_summary')(job: job, countDone: total)) + @el.find('.js-summary').html(el) + +App.Config.set( + 'IntegrationExchange' + { + name: 'Exchange' + target: '#system/integration/exchange' + description: 'Exchange integration for contacts management.' + controller: Index + state: State + } + 'NavBarIntegrations' +) diff --git a/app/assets/javascripts/app/controllers/_integration/idoit.coffee b/app/assets/javascripts/app/controllers/_integration/idoit.coffee new file mode 100644 index 000000000..724207069 --- /dev/null +++ b/app/assets/javascripts/app/controllers/_integration/idoit.coffee @@ -0,0 +1,94 @@ +class Index extends App.ControllerIntegrationBase + featureIntegration: 'idoit_integration' + featureName: 'i-doit' + featureConfig: 'idoit_config' + description: [ + ['This service allows you to connect i-doit objects with Zammad.'] + ] + events: + 'change .js-switch input': 'switch' + + render: => + super + new Form( + el: @$('.js-form') + ) + + new App.HttpLog( + el: @$('.js-log') + facility: 'idoit' + ) + +class Form extends App.Controller + events: + 'submit form': 'update' + + constructor: -> + super + @render() + + currentConfig: -> + App.Setting.get('idoit_config') + + setConfig: (value) -> + App.Setting.set('idoit_config', value, {notify: true}) + + render: => + @config = @currentConfig() + + @html App.view('integration/idoit')( + config: @config + ) + + update: (e) => + e.preventDefault() + @config = @formParam(e.target) + @validateAndSave() + + validateAndSave: => + @ajax( + id: 'idoit' + type: 'POST' + url: "#{@apiPath}/integration/idoit/verify" + data: JSON.stringify( + method: 'cmdb.object_types' + api_token: @config.api_token + endpoint: @config.endpoint + client_id: @config.client_id + ) + success: (data, status, xhr) => + if data.result is 'failed' + new App.ControllerErrorModal( + message: data.message + container: @el.closest('.content') + ) + return + @setConfig(@config) + + error: (data, status) => + + # do not close window if request is aborted + return if status is 'abort' + + details = data.responseJSON || {} + @notify( + type: 'error' + msg: App.i18n.translateContent(details.error_human || details.error || 'Unable to save!') + ) + ) + +class State + @current: -> + App.Setting.get('idoit_integration') + +App.Config.set( + 'IntegrationIdoit' + { + name: 'i-doit' + target: '#system/integration/idoit' + description: 'CMDB to document complex relations of your network components.' + controller: Index + state: State + } + 'NavBarIntegrations' +) diff --git a/app/assets/javascripts/app/controllers/_integration/ldap.coffee b/app/assets/javascripts/app/controllers/_integration/ldap.coffee index dc0bbbdef..83a61dc98 100644 --- a/app/assets/javascripts/app/controllers/_integration/ldap.coffee +++ b/app/assets/javascripts/app/controllers/_integration/ldap.coffee @@ -28,13 +28,20 @@ class Index extends App.ControllerIntegrationBase super active = @$('.js-switch input').prop('checked') if active - @ajax( - id: 'jobs_config' - type: 'POST' - url: "#{@apiPath}/integration/ldap/job_start" - processData: true - success: (data, status, xhr) => - @render(true) + job_start = => + @ajax( + id: 'jobs_config' + type: 'POST' + url: "#{@apiPath}/integration/ldap/job_start" + processData: true + success: (data, status, xhr) => + @render(true) + ) + + App.Delay.set( + job_start, + 600, + 'job_start', ) class Form extends App.Controller @@ -91,6 +98,7 @@ class Form extends App.Controller processData: true success: (data, status, xhr) => @render(true) + @lastResult() ) startWizard: (e) => diff --git a/app/assets/javascripts/app/controllers/_profile/linked_accounts.coffee b/app/assets/javascripts/app/controllers/_profile/linked_accounts.coffee index 671da7abc..5f731803b 100644 --- a/app/assets/javascripts/app/controllers/_profile/linked_accounts.coffee +++ b/app/assets/javascripts/app/controllers/_profile/linked_accounts.coffee @@ -9,43 +9,7 @@ class Index extends App.ControllerSubContent @render() render: => - auth_provider_all = { - facebook: { - url: '/auth/facebook' - name: 'Facebook' - config: 'auth_facebook' - }, - twitter: { - url: '/auth/twitter' - name: 'Twitter' - config: 'auth_twitter' - }, - linkedin: { - url: '/auth/linkedin' - name: 'LinkedIn' - config: 'auth_linkedin' - }, - github: { - url: '/auth/github' - name: 'GitHub' - config: 'auth_github' - }, - gitlab: { - url: '/auth/gitlab' - name: 'GitLab' - config: 'auth_gitlab' - }, - google_oauth2: { - url: '/auth/google_oauth2' - name: 'Google' - config: 'auth_google_oauth2' - }, - oauth2: { - url: '/auth/oauth2' - name: 'OAuth2' - config: 'auth_oauth2' - }, - } + auth_provider_all = App.Config.get('auth_provider_all') auth_providers = {} for key, provider of auth_provider_all if @Config.get(provider.config) is true || @Config.get(provider.config) is 'true' @@ -90,3 +54,45 @@ class Index extends App.ControllerSubContent ) App.Config.set('LinkedAccounts', { prio: 4000, name: 'Linked Accounts', parent: '#profile', target: '#profile/linked', controller: Index, permission: ['user_preferences.linked_accounts'] }, 'NavBarProfile') +App.Config.set('auth_provider_all', { + facebook: + url: '/auth/facebook' + name: 'Facebook' + config: 'auth_facebook' + class: 'facebook' + twitter: + url: '/auth/twitter' + name: 'Twitter' + config: 'auth_twitter' + class: 'twitter' + linkedin: + url: '/auth/linkedin' + name: 'LinkedIn' + config: 'auth_linkedin' + class: 'linkedin' + github: + url: '/auth/github' + name: 'GitHub' + config: 'auth_github' + class: 'github' + gitlab: + url: '/auth/gitlab' + name: 'GitLab' + config: 'auth_gitlab' + class: 'gitlab' + microsoft_office365: + url: '/auth/microsoft_office365' + name: 'Office 365' + config: 'auth_microsoft_office365' + class: 'office365' + google_oauth2: + url: '/auth/google_oauth2' + name: 'Google' + config: 'auth_google_oauth2' + class: 'google' + oauth2: + url: '/auth/oauth2' + name: 'OAuth2' + config: 'auth_oauth2' + class: 'oauth2' +}) diff --git a/app/assets/javascripts/app/controllers/_profile/out_of_office.coffee b/app/assets/javascripts/app/controllers/_profile/out_of_office.coffee new file mode 100644 index 000000000..8f796f715 --- /dev/null +++ b/app/assets/javascripts/app/controllers/_profile/out_of_office.coffee @@ -0,0 +1,164 @@ +class Index extends App.ControllerSubContent + requiredPermission: 'user_preferences.out_of_office+ticket.agent' + header: 'Out of Office' + events: + 'submit form': 'submit' + 'click .js-disabled': 'disable' + 'click .js-enable': 'enable' + + constructor: -> + super + @render() + + render: => + user = @Session.get() + if !@localData + @localData = + out_of_office: user.out_of_office + out_of_office_start_at: user.out_of_office_start_at + out_of_office_end_at: user.out_of_office_end_at + out_of_office_replacement_id: user.out_of_office_replacement_id + out_of_office_replacement_id_completion: user.preferences.out_of_office_replacement_id_completion + out_of_office_text: user.preferences.out_of_office_text + form = $(App.view('profile/out_of_office')( + user: user + localData: @localData + placeholder: App.User.outOfOfficeTextPlaceholder() + )) + + dateStart = new App.ControllerForm( + model: + configure_attributes: + [ + name: 'out_of_office_start_at' + display: '' + tag: 'date' + past: false + future: true + null: false + ] + noFieldset: true + params: @localData + ) + form.find('.js-startDate').html(dateStart.form) + + dateEnd = new App.ControllerForm( + model: + configure_attributes: + [ + name: 'out_of_office_end_at' + display: '' + tag: 'date' + past: false + future: true + null: false + ] + noFieldset: true + params: @localData + ) + form.find('.js-endDate').html(dateEnd.form) + + agentList = new App.ControllerForm( + model: + configure_attributes: + [ + name: 'out_of_office_replacement_id' + display: '' + relation: 'User' + tag: 'user_autocompletion' + autocapitalize: false + multiple: false + limit: 30 + minLengt: 2 + placeholder: 'Enter Person or Organization/Company' + null: false + translate: false + disableCreateObject: true + value: @localData + ] + noFieldset: true + params: @localData + ) + form.find('.js-recipientDropdown').html(agentList.form) + if @localData.out_of_office is true + form.find('.js-disabled').removeClass('is-disabled') + #form.find('.js-enable').addClass('is-disabled') + else + form.find('.js-disabled').addClass('is-disabled') + #form.find('.js-enable').removeClass('is-disabled') + @html(form) + + enable: (e) => + e.preventDefault() + params = @formParam(e.target) + params.out_of_office = true + @store(e, params) + + disable: (e) => + e.preventDefault() + params = @formParam(e.target) + params.out_of_office = false + @store(e, params) + + submit: (e, params) => + e.preventDefault() + params = @formParam(e.target) + @store(e, params) + + store: (e, params) => + @formDisable(e) + for key, value of params + @localData[key] = value + App.Ajax.request( + id: 'user_out_of_office' + type: 'PUT' + url: "#{@apiPath}/users/out_of_office" + data: JSON.stringify(params) + processData: true + success: @success + error: @error + ) + + success: (data) => + if data.message is 'ok' + @render() + @notify( + type: 'success' + msg: App.i18n.translateContent('Successfully!') + timeout: 1000 + ) + else + if data.notice + @notify + type: 'error' + msg: App.i18n.translateContent(data.notice[0], data.notice[1]) + removeAll: true + else + @notify + type: 'error' + msg: 'Please contact your administrator.' + removeAll: true + @formEnable( @$('form') ) + + error: (xhr, status, error) => + @formEnable( @$('form') ) + + # do not close window if request is aborted + return if status is 'abort' + data = JSON.parse(xhr.responseText) + + # show error message + if xhr.status is 401 || error is 'Unauthorized' + message = '» ' + App.i18n.translateInline('Unauthorized') + ' «' + else if xhr.status is 404 || error is 'Not Found' + message = '» ' + App.i18n.translateInline('Not Found') + ' «' + else if data.error + message = App.i18n.translateInline(data.error) + else + message = '» ' + App.i18n.translateInline('Error') + ' «' + @notify + type: 'error' + msg: App.i18n.translateContent(message) + removeAll: true + +App.Config.set('OutOfOffice', { prio: 2800, name: 'Out of Office', parent: '#profile', target: '#profile/out_of_office', permission: ['user_preferences.out_of_office+ticket.agent'], controller: Index }, 'NavBarProfile') diff --git a/app/assets/javascripts/app/controllers/_settings/area_proxy.coffee b/app/assets/javascripts/app/controllers/_settings/area_proxy.coffee index 841e23ffc..8d093a776 100644 --- a/app/assets/javascripts/app/controllers/_settings/area_proxy.coffee +++ b/app/assets/javascripts/app/controllers/_settings/area_proxy.coffee @@ -2,7 +2,7 @@ class App.SettingsAreaProxy extends App.Controller events: 'submit form': 'update' 'click .js-submit': 'update' - 'click .js-test': 'test2' + 'click .js-test': 'testConnection' constructor: -> super @@ -14,20 +14,21 @@ class App.SettingsAreaProxy extends App.Controller proxy: App.Setting.get('proxy') proxy_username: App.Setting.get('proxy_username') proxy_password: App.Setting.get('proxy_password') + proxy_no: App.Setting.get('proxy_no') ) update: (e) => e.preventDefault() @formDisable(e) params = @formParam(e) - console.log('params', params) App.Setting.set('proxy', params.proxy) App.Setting.set('proxy_username', params.proxy_username) App.Setting.set('proxy_password', params.proxy_password) + App.Setting.set('proxy_no', params.proxy_no) @formEnable(e) @render() - test2: (e) => + testConnection: (e) => e.preventDefault() params = @formParam(e) @ajax( diff --git a/app/assets/javascripts/app/controllers/_ui_element/object_manager_attribute.coffee b/app/assets/javascripts/app/controllers/_ui_element/object_manager_attribute.coffee index 0ac160b3c..80d61840b 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/object_manager_attribute.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/object_manager_attribute.coffee @@ -82,7 +82,7 @@ class App.UiElement.object_manager_attribute extends App.UiElement.ApplicationUi view: shown: true invite_customer: - show: false + shown: false required: false 'admin.user': create: @@ -94,10 +94,10 @@ class App.UiElement.object_manager_attribute extends App.UiElement.ApplicationUi view: shown: true invite_agent: - show: false + shown: false required: false invite_customer: - show: false + shown: false required: false Organization: 'ticket.customer': diff --git a/app/assets/javascripts/app/controllers/_ui_element/postmaster_set.coffee b/app/assets/javascripts/app/controllers/_ui_element/postmaster_set.coffee index 176030f3f..049bc2735 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/postmaster_set.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/postmaster_set.coffee @@ -20,7 +20,7 @@ class App.UiElement.postmaster_set name: 'Customer' relation: 'User' tag: 'user_autocompletion' - disableCreateUser: true + disableCreateObject: true } { value: 'group_id' @@ -32,7 +32,7 @@ class App.UiElement.postmaster_set name: 'Owner' relation: 'User' tag: 'user_autocompletion' - disableCreateUser: true + disableCreateObject: true } ] article: diff --git a/app/assets/javascripts/app/controllers/_ui_element/ticket_perform_action.coffee b/app/assets/javascripts/app/controllers/_ui_element/ticket_perform_action.coffee index e64d6edf4..c5718de48 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/ticket_perform_action.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/ticket_perform_action.coffee @@ -33,14 +33,15 @@ class App.UiElement.ticket_perform_action elements["#{groupKey}.#{config.name}"] = config # add ticket deletion action - elements['ticket.action'] = - name: 'action' - display: 'Action' - tag: 'select' - null: false - translate: true - options: - delete: 'delete' + if attribute.ticket_delete + elements['ticket.action'] = + name: 'action' + display: 'Action' + tag: 'select' + null: false + translate: true + options: + delete: 'Delete' [defaults, groups, elements] diff --git a/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.coffee b/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.coffee index 72ff6e1b8..91b5ad0b3 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.coffee @@ -156,7 +156,7 @@ class App.UiElement.ticket_selector elementRow = $(e.target).closest('.js-filterElement') groupAndAttribute = elementRow.find('.js-attributeSelector option:selected').attr('value') return if !groupAndAttribute - @buildOperator(item, elementRow, groupAndAttribute, elements, {}, attribute, false) + @buildOperator(item, elementRow, groupAndAttribute, elements, {}, attribute) ) # bind for preview @@ -244,9 +244,9 @@ class App.UiElement.ticket_selector if groupAndAttribute elementRow.find('.js-attributeSelector select').val(groupAndAttribute) - @buildOperator(elementFull, elementRow, groupAndAttribute, elements, meta, attribute, true) + @buildOperator(elementFull, elementRow, groupAndAttribute, elements, meta, attribute) - @buildOperator: (elementFull, elementRow, groupAndAttribute, elements, meta, attribute, buildValue) -> + @buildOperator: (elementFull, elementRow, groupAndAttribute, elements, meta, attribute) -> currentOperator = elementRow.find('.js-operator option:selected').attr('value') name = "#{attribute.name}::#{groupAndAttribute}::operator" @@ -284,9 +284,9 @@ class App.UiElement.ticket_selector elementRow.find('.js-operator select').replaceWith(selection) - @buildPreCondition(elementFull, elementRow, groupAndAttribute, elements, meta, attribute, buildValue) + @buildPreCondition(elementFull, elementRow, groupAndAttribute, elements, meta, attribute) - @buildPreCondition: (elementFull, elementRow, groupAndAttribute, elements, meta, attributeConfig, buildValue = true) -> + @buildPreCondition: (elementFull, elementRow, groupAndAttribute, elements, meta, attributeConfig) -> currentOperator = elementRow.find('.js-operator option:selected').attr('value') currentPreCondition = elementRow.find('.js-preCondition option:selected').attr('value') @@ -318,7 +318,6 @@ class App.UiElement.ticket_selector if !preCondition elementRow.find('.js-preCondition select').html('') elementRow.find('.js-preCondition').addClass('hide') - return if !buildValue toggleValue() @buildValue(elementFull, elementRow, groupAndAttribute, elements, meta, attribute) return @@ -351,7 +350,6 @@ class App.UiElement.ticket_selector toggleValue() ) - return if !buildValue @buildValue(elementFull, elementRow, groupAndAttribute, elements, meta, attribute) toggleValue() diff --git a/app/assets/javascripts/app/controllers/_ui_element/user_autocompletion_search.coffee b/app/assets/javascripts/app/controllers/_ui_element/user_autocompletion_search.coffee index b8d47b42f..f6dfae836 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/user_autocompletion_search.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/user_autocompletion_search.coffee @@ -2,5 +2,5 @@ class App.UiElement.user_autocompletion_search @render: (attributeOrig, params = {}) -> attribute = _.clone(attributeOrig) - attribute.disableCreateUser = true + attribute.disableCreateObject = true new App.UserOrganizationAutocompletion(attribute: attribute, params: params).element() diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create.coffee index 38b2228ca..617c83f0c 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_create.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_create.coffee @@ -9,6 +9,7 @@ class App.TicketCreate extends App.Controller constructor: (params) -> super + @sidebarState = {} # define default type @default_type = 'phone-in' @@ -91,6 +92,8 @@ class App.TicketCreate extends App.Controller else @$('[name="cc"]').closest('.form-group').addClass('hide') + App.TaskManager.touch(@task_key) + meta: => text = '' if @articleAttributes @@ -99,10 +102,10 @@ class App.TicketCreate extends App.Controller if title text = "#{text}: #{title}" meta = - url: @url() - head: text - title: text - id: @id + url: @url() + head: text + title: text + id: @id iconClass: 'pen' url: => @@ -228,7 +231,7 @@ class App.TicketCreate extends App.Controller type = @$('[name="formSenderType"]').val() if signature isnt undefined && signature.body && type is 'email-out' - signatureFinished = App.Utils.replaceTags(signature.body, { user: App.Session.get() }) + signatureFinished = App.Utils.replaceTags(signature.body, { user: App.Session.get(), config: App.Config.all() }) body = @$('[data-name=body]') if App.Utils.signatureCheck(body.html() || '', signatureFinished) @@ -330,27 +333,47 @@ class App.TicketCreate extends App.Controller # show text module UI @textModule = new App.WidgetTextModule( el: @$('[data-name="body"]').parent() - ) - - new Sidebar( - el: @sidebar - params: @formDefault - textModule: @textModule + data: + config: App.Config.all() + user: App.Session.get() ) $('#tags').tokenfield() + @sidebarWidget = new App.TicketCreateSidebar( + el: @sidebar + params: @formDefault + sidebarState: @sidebarState + task_key: @task_key + query: @query + ) + + if @formDefault.customer_id + callback = (customer) => + @localUserInfoCallback(@formDefault, customer) + App.User.full(@formDefault.customer_id, callback) + # update taskbar with new meta data App.TaskManager.touch(@task_key) localUserInfo: (e) => - + return if !@sidebarWidget params = App.ControllerForm.params($(e.target).closest('form')) - new Sidebar( - el: @sidebar - params: params - textModule: @textModule + if params.customer_id + callback = (customer) => + @localUserInfoCallback(params, customer) + App.User.full(params.customer_id, callback) + return + @localUserInfoCallback(params) + + localUserInfoCallback: (params, customer = {}) => + @sidebarWidget.render(params) + @textModule.reload( + config: App.Config.all() + user: App.Session.get() + ticket: + customer: customer ) cancel: (e) -> @@ -475,6 +498,10 @@ class App.TicketCreate extends App.Controller # scroll to top ui.scrollTo() + # add sidebar params + if ui.sidebarWidget + ui.sidebarWidget.commit(ticket_id: @id) + # access to group for group_id, access of App.Session.get('group_ids') if @group_id.toString() is group_id.toString() @@ -495,114 +522,6 @@ class App.TicketCreate extends App.Controller ) ) -class Sidebar extends App.Controller - constructor: -> - super - - # load user - if @params['customer_id'] - App.User.full(@params['customer_id'], @render) - return - - # render ui - @render() - - render: (user) => - - items = [] - if user - - showCustomer = (el) => - # update text module UI - if @textModule - @textModule.reload( - ticket: - customer: user - user: App.Session.get() - ) - - new App.WidgetUser( - el: el - user_id: user.id - ) - - editCustomer = (e, el) => - new App.ControllerGenericEdit( - id: @params.customer_id - genericObject: 'User' - screen: 'edit' - pageData: - title: 'Users' - object: 'User' - objects: 'Users' - container: @el.closest('.content') - ) - items.push { - head: 'Customer' - name: 'customer' - icon: 'person' - actions: [ - { - title: 'Edit Customer' - name: 'Edit Customer' - class: 'glyphicon glyphicon-edit' - callback: editCustomer - }, - ] - callback: showCustomer - } - - if user.organization_id - editOrganization = (e, el) => - new App.ControllerGenericEdit( - id: user.organization_id - genericObject: 'Organization' - pageData: - title: 'Organizations' - object: 'Organization' - objects: 'Organizations' - container: @el.closest('.content') - ) - showOrganization = (el) -> - new App.WidgetOrganization( - el: el - organization_id: user.organization_id - ) - items.push { - head: 'Organization' - name: 'organization' - icon: 'group' - actions: [ - { - title: 'Edit Organization' - name: 'Edit Organization' - class: 'glyphicon glyphicon-edit' - callback: editOrganization - }, - ] - callback: showOrganization - } - - showTemplates = (el) -> - - # show template UI - new App.WidgetTemplate( - el: el - #template_id: template['id'] - ) - - items.push { - head: 'Templates' - name: 'template' - icon: 'templates' - callback: showTemplates - } - - new App.Sidebar( - el: @el - items: items - ) - class Router extends App.ControllerPermanent requiredPermission: 'ticket.agent' constructor: (params) -> @@ -618,6 +537,9 @@ class Router extends App.ControllerPermanent if params.customer_id split = "/customer/#{params.customer_id}" + if params.query + split = "/query/#{params.query}" + id = Math.floor( Math.random() * 99999 ) @navigate "#ticket/create/id/#{id}#{split}" return @@ -628,6 +550,7 @@ class Router extends App.ControllerPermanent article_id: params.article_id type: params.type customer_id: params.customer_id + query: params.query id: params.id App.TaskManager.execute( @@ -643,6 +566,7 @@ App.Config.set('ticket/create/', Router, 'Routes') App.Config.set('ticket/create/id/:id', Router, 'Routes') App.Config.set('ticket/create/customer/:customer_id', Router, 'Routes') App.Config.set('ticket/create/id/:id/customer/:customer_id', Router, 'Routes') +App.Config.set('ticket/create/id/:id/query/:query', Router, 'Routes') # split ticket App.Config.set('ticket/create/:ticket_id/:article_id', Router, 'Routes') diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar.coffee new file mode 100644 index 000000000..88b151449 --- /dev/null +++ b/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar.coffee @@ -0,0 +1,43 @@ +class App.TicketCreateSidebar extends App.Controller + constructor: -> + super + @render() + + reload: (args) => + for key, backend of @sidebarBackends + if backend && backend.reload + backend.reload(args) + + commit: (args) => + for key, backend of @sidebarBackends + if backend && backend.commit + backend.commit(args) + + render: (params) => + if params + @params = params + @sidebarBackends ||= {} + @sidebarItems = [] + sidebarBackends = App.Config.get('TicketCreateSidebar') + keys = _.keys(sidebarBackends).sort() + for key in keys + if !@sidebarBackends[key] || !@sidebarBackends[key].reload + @sidebarBackends[key] = new sidebarBackends[key]( + params: @params + query: @query + taskGet: @taskGet + ) + else + @sidebarBackends[key].reload( + params: @params + query: @query + ) + item = @sidebarBackends[key].sidebarItem() + if item + @sidebarItems.push item + + new App.Sidebar( + el: @el + sidebarState: @sidebarState + items: @sidebarItems + ) diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar_customer.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar_customer.coffee new file mode 100644 index 000000000..cbfd4e7e9 --- /dev/null +++ b/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar_customer.coffee @@ -0,0 +1,38 @@ +class SidebarCustomer extends App.Controller + sidebarItem: => + return if !@permissionCheck('ticket.agent') + return if !@params.customer_id + { + head: 'Customer' + name: 'customer' + icon: 'person' + actions: [ + { + title: 'Edit Customer' + name: 'customer-edit' + callback: @editCustomer + }, + ] + callback: @showCustomer + } + + showCustomer: (el) => + @el = el + new App.WidgetUser( + el: @el + user_id: @params.customer_id + ) + + editCustomer: => + new App.ControllerGenericEdit( + id: @params.customer_id + genericObject: 'User' + screen: 'edit' + pageData: + title: 'Users' + object: 'User' + objects: 'Users' + container: @el.closest('.content') + ) + +App.Config.set('200-Customer', SidebarCustomer, 'TicketCreateSidebar') diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar_organization.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar_organization.coffee new file mode 100644 index 000000000..db2a9239d --- /dev/null +++ b/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar_organization.coffee @@ -0,0 +1,41 @@ +class SidebarOrganization extends App.Controller + sidebarItem: => + return if !@permissionCheck('ticket.agent') + return if !@params.customer_id + return if !App.User.exists(@params.customer_id) + customer = App.User.find(@params.customer_id) + @organization_id = customer.organization_id + return if !@organization_id + { + head: 'Organization' + name: 'organization' + icon: 'group' + actions: [ + { + title: 'Edit Organization' + name: 'organization-edit' + callback: @editOrganization + }, + ] + callback: @showOrganization + } + + showOrganization: (el) => + @el = el + new App.WidgetOrganization( + el: @el + organization_id: @organization_id + ) + + editOrganization: => + new App.ControllerGenericEdit( + id: @organization_id, + genericObject: 'Organization' + pageData: + title: 'Organizations' + object: 'Organization' + objects: 'Organizations' + container: @el.closest('.content') + ) + +App.Config.set('300-Organization', SidebarOrganization, 'TicketCreateSidebar') diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar_template.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar_template.coffee new file mode 100644 index 000000000..bb724bc83 --- /dev/null +++ b/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar_template.coffee @@ -0,0 +1,21 @@ +class SidebarTemplate extends App.Controller + sidebarItem: => + return if !@permissionCheck('ticket.agent') + { + head: 'Templates' + name: 'template' + icon: 'templates' + actions: [] + callback: @showTemplates + } + + showTemplates: (el) => + @el = el + + # show template UI + new App.WidgetTemplate( + el: el + #template_id: template['id'] + ) + +App.Config.set('100-Template', SidebarTemplate, 'TicketCreateSidebar') diff --git a/app/assets/javascripts/app/controllers/agent_ticket_merge.coffee b/app/assets/javascripts/app/controllers/agent_ticket_merge.coffee index aad33ceb4..d71087198 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_merge.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_merge.coffee @@ -98,9 +98,13 @@ class App.TicketMerge extends App.ControllerModal type: 'error' msg: App.i18n.translateContent(data['message']) timeout: 6000 - @formEnable(e) - error: => + error: (data) => + details = data.responseJSON || {} + @notify + type: 'error' + msg: App.i18n.translateContent(details.error_human || details.error || 'Unable to merge!') + timeout: 6000 @formEnable(e) ) diff --git a/app/assets/javascripts/app/controllers/chat.coffee b/app/assets/javascripts/app/controllers/chat.coffee index f8e969e86..6023b6a8a 100644 --- a/app/assets/javascripts/app/controllers/chat.coffee +++ b/app/assets/javascripts/app/controllers/chat.coffee @@ -462,6 +462,14 @@ class ChatWindow extends App.Controller ) ) + # show text module UI + new App.WidgetTextModule( + el: @input + data: + user: App.Session.get() + config: App.Config.all() + ) + focus: => @input.focus() @@ -473,7 +481,7 @@ class ChatWindow extends App.Controller if event.data and event.data.callback event.data.callback() - @$('.js-customerChatInput').ce({ + @input.ce({ mode: 'richtext' multiline: true maxlength: 40000 @@ -522,7 +530,7 @@ class ChatWindow extends App.Controller switch event.keyCode when TABKEY - allChatInputs = $('.js-customerChatInput').not('[disabled="disabled"]') + allChatInputs = @input.not('[disabled="disabled"]') chatCount = allChatInputs.size() index = allChatInputs.index(@input) @@ -542,7 +550,7 @@ class ChatWindow extends App.Controller allChatInputs.eq(chatCount-1).focus() when ENTERKEY - if !event.shiftKey + if !event.shiftKey && !event.altKey && !event.ctrlKey && !event.metaKey event.preventDefault() @sendMessage() @@ -587,7 +595,7 @@ class ChatWindow extends App.Controller @sounds.message.play() @notifyDesktop( title: @name - body: message + body: App.Utils.html2text(message) url: '#customer_chat' callback: => App.Event.trigger('chat_focus', { session_id: @session.session_id }) diff --git a/app/assets/javascripts/app/controllers/getting_started.coffee b/app/assets/javascripts/app/controllers/getting_started.coffee index c7d236267..8c2fbb71d 100644 --- a/app/assets/javascripts/app/controllers/getting_started.coffee +++ b/app/assets/javascripts/app/controllers/getting_started.coffee @@ -450,8 +450,8 @@ class EmailNotification extends App.WizardFullScreen if adapter is 'smtp' configureAttributesOutbound = [ { name: 'options::host', display: 'Host', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false, autofocus: true }, - { name: 'options::user', display: 'User', tag: 'input', type: 'text', limit: 120, null: true, autocapitalize: false, autocomplete: 'new-password' }, - { name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: true, autocapitalize: false, autocomplete: 'new-password', single: true }, + { name: 'options::user', display: 'User', tag: 'input', type: 'text', limit: 120, null: true, autocapitalize: false, autocomplete: 'off' }, + { name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: true, autocapitalize: false, autocomplete: 'off', single: true }, { name: 'options::port', display: 'Port', tag: 'input', type: 'text', limit: 6, null: true, autocapitalize: false }, ] @form = new App.ControllerForm( @@ -671,20 +671,24 @@ class ChannelEmail extends App.WizardFullScreen # inbound configureAttributesInbound = [ - { name: 'adapter', display: 'Type', tag: 'select', multiple: false, null: false, options: @channelDriver.email.inbound }, - { name: 'options::host', display: 'Host', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false }, - { name: 'options::user', display: 'User', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false, autocomplete: 'new-password', }, - { name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: false, autocapitalize: false, autocomplete: 'new-password', single: true }, - { name: 'options::ssl', display: 'SSL', tag: 'boolean', null: true, options: { true: 'yes', false: 'no' }, default: true, translate: true, item_class: 'formGroup--halfSize' }, - { name: 'options::port', display: 'Port', tag: 'input', type: 'text', limit: 6, null: true, autocapitalize: false, default: '993', item_class: 'formGroup--halfSize' }, + { name: 'adapter', display: 'Type', tag: 'select', multiple: false, null: false, options: @channelDriver.email.inbound }, + { name: 'options::host', display: 'Host', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false }, + { name: 'options::user', display: 'User', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false, autocomplete: 'off', }, + { name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: false, autocapitalize: false, autocomplete: 'off', single: true }, + { name: 'options::ssl', display: 'SSL', tag: 'boolean', null: true, options: { true: 'yes', false: 'no' }, default: true, translate: true, item_class: 'formGroup--halfSize' }, + { name: 'options::port', display: 'Port', tag: 'input', type: 'text', limit: 6, null: true, autocapitalize: false, default: '993', item_class: 'formGroup--halfSize' }, + { name: 'options::folder', display: 'Folder', tag: 'input', type: 'text', limit: 120, null: true, autocapitalize: false, item_class: 'formGroup--halfSize' }, + { name: 'options::keep_on_server', display: 'Keep messages on server', tag: 'boolean', null: true, options: { true: 'yes', false: 'no' }, translate: true, default: false, item_class: 'formGroup--halfSize' }, ] showHideFolder = (params, attribute, attributes, classname, form, ui) -> return if !params if params.adapter is 'imap' ui.show('options::folder') + ui.show('options::keep_on_server') return ui.hide('options::folder') + ui.hide('options::keep_on_server') handlePort = (params, attribute, attributes, classname, form, ui) -> return if !params @@ -700,7 +704,7 @@ class ChannelEmail extends App.WizardFullScreen return new App.ControllerForm( - el: @$('.base-inbound-settings'), + el: @$('.base-inbound-settings') model: configure_attributes: configureAttributesInbound className: '' @@ -716,8 +720,10 @@ class ChannelEmail extends App.WizardFullScreen # fill user / password based on intro info channel_used = { options: {} } if @account['meta'] - channel_used['options']['user'] = @account['meta']['email'] - channel_used['options']['password'] = @account['meta']['password'] + channel_used['options']['user'] = @account['meta']['email'] + channel_used['options']['password'] = @account['meta']['password'] + channel_used['options']['folder'] = @account['meta']['folder'] + channel_used['options']['keep_on_server'] = @account['meta']['keep_on_server'] # show used backend @$('.base-outbound-settings').html('') @@ -725,8 +731,8 @@ class ChannelEmail extends App.WizardFullScreen if adapter is 'smtp' configureAttributesOutbound = [ { name: 'options::host', display: 'Host', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false, autofocus: true }, - { name: 'options::user', display: 'User', tag: 'input', type: 'text', limit: 120, null: true, autocapitalize: false, autocomplete: 'new-password', }, - { name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: true, autocapitalize: false, autocomplete: 'new-password', single: true }, + { name: 'options::user', display: 'User', tag: 'input', type: 'text', limit: 120, null: true, autocapitalize: false, autocomplete: 'off', }, + { name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: true, autocapitalize: false, autocomplete: 'off', single: true }, { name: 'options::port', display: 'Port', tag: 'input', type: 'text', limit: 6, null: true, autocapitalize: false }, ] @form = new App.ControllerForm( @@ -745,7 +751,7 @@ class ChannelEmail extends App.WizardFullScreen @account.meta = params @disable(e) - @$('.js-probe .js-email').text( params.email ) + @$('.js-probe .js-email').text(params.email) @showSlide('js-probe') @ajax( @@ -760,7 +766,7 @@ class ChannelEmail extends App.WizardFullScreen for key, value of data.setting @account[key] = value - if data.content_messages && data.content_messages > 0 + if data.content_messages && data.content_messages > 0 && (!@account['inbound']['options'] || @account['inbound']['options']['keep_on_server'] isnt true) message = App.i18n.translateContent('We have already found %s email(s) in your mailbox. Zammad will move it all from your mailbox into Zammad.', data.content_messages) @$('.js-inbound-acknowledge .js-message').html(message) @$('.js-inbound-acknowledge .js-back').attr('data-slide', 'js-intro') @@ -809,7 +815,7 @@ class ChannelEmail extends App.WizardFullScreen # remember account settings @account.inbound = params - if data.content_messages && data.content_messages > 0 + if data.content_messages && data.content_messages > 0 && (!@account['inbound']['options'] || @account['inbound']['options']['keep_on_server'] isnt true) message = App.i18n.translateContent('We have already found %s emails in your mailbox. Zammad will move it all from your mailbox into Zammad.', data.content_messages) @$('.js-inbound-acknowledge .js-message').html(message) @$('.js-inbound-acknowledge .js-back').attr('data-slide', 'js-inbound') diff --git a/app/assets/javascripts/app/controllers/idoit_object_selector.coffee b/app/assets/javascripts/app/controllers/idoit_object_selector.coffee new file mode 100644 index 000000000..d2b7f2065 --- /dev/null +++ b/app/assets/javascripts/app/controllers/idoit_object_selector.coffee @@ -0,0 +1,100 @@ +class App.IdoitObjectSelector extends App.ControllerModal + buttonClose: true + buttonCancel: true + buttonSubmit: true + head: 'i-doit' + + content: -> + @ajax( + id: 'idoit-object-selector' + type: 'POST' + url: "#{@apiPath}/integration/idoit" + data: JSON.stringify(method: 'cmdb.object_types') + success: (data, status, xhr) => + if data.result is 'failed' + @contentInline = data.message + @render() + return + + result = _.sortBy(data.response.result, 'title') + @contentInline = $(App.view('integration/idoit_object_selector')()) + + @contentInline.find('.js-typeSelect').html(@renderTypeSelector(result)) + + @contentInline.filter('.js-search').on('change', 'select, input', (e) => + params = @formParam(e.target) + @search(params) + ) + @contentInline.filter('.js-search').on('keyup', 'input', (e) => + params = @formParam(e.target) + @search(params) + ) + @render() + @$('.js-input').focus() + + error: (xhr, status, error) => + + # do not close window if request is aborted + return if status is 'abort' + + # show error message + @contentInline = 'Unable to load content' + @render() + ) + '' + + search: (filter) => + if _.isEmpty(filter.title) + delete filter.title + else + filter.title = "%#{filter.title}%" + @ajax( + id: 'idoit-object-selector' + type: 'POST' + url: "#{@apiPath}/integration/idoit" + data: JSON.stringify(method: 'cmdb.objects', filter: filter) + success: (data, status, xhr) => + @renderResult(data.response.result) + + error: (xhr, status, error) => + + # do not close window if request is aborted + return if status is 'abort' + + # show error message + @contentInline = 'Unable to load content' + @render() + ) + + renderResult: (items) => + table = App.view('integration/idoit_object_result')( + items: items + ) + @el.find('.js-result').html(table) + + renderTypeSelector: (result) -> + options = {} + for item in result + options[item.id] = item.title + return App.UiElement.searchable_select.render( + name: 'type' + multiple: false + limit: 100 + null: false + nulloption: false + options: options + ) + + onSubmit: (e) => + form = @el.find('.js-result') + params = @formParam(form) + return if _.isEmpty(params.object_id) + + if _.isArray(params.object_id) + object_ids = params.object_id + else + object_ids = [params.object_id] + + @formDisable(form) + @callback(object_ids, @) + diff --git a/app/assets/javascripts/app/controllers/import_zendesk.coffee b/app/assets/javascripts/app/controllers/import_zendesk.coffee index 04ffeee3b..1858adde1 100644 --- a/app/assets/javascripts/app/controllers/import_zendesk.coffee +++ b/app/assets/javascripts/app/controllers/import_zendesk.coffee @@ -10,6 +10,7 @@ class Index extends App.ControllerContent '.zendesk-api-token-error': 'apiTokenErrorMessage' '#zendesk-email': 'zendeskEmail' '#zendesk-api-token': 'zendeskApiToken' + '.js-ticket-count-info': 'ticketCountInfo' updateMigrationDisplayLoop: 0 events: @@ -116,7 +117,8 @@ class Index extends App.ControllerContent showCredentials: (e) => e.preventDefault() @urlStatus.attr('data-state', '') - @zendeskUrlApiToken.attr('href', @zendeskUrl.val() + 'agent/admin/api') + url = @zendeskUrl.val() + '/agent/admin/api' + @zendeskUrlApiToken.attr('href', url.replace(/([^:])\/\/+/g, '$1/')) @zendeskUrlApiToken.val('HERE') @$('[data-slide=zendesk-url]').toggleClass('hide') @$('[data-slide=zendesk-credentials]').toggleClass('hide') @@ -171,6 +173,10 @@ class Index extends App.ControllerContent for key, item of data.data if item.done > item.total item.done = item.total + + if key == 'Ticket' && item.total >= 1000 + @ticketCountInfo.removeClass('hide') + element = @$('.js-' + key.toLowerCase() ) element.find('.js-done').text(item.done) element.find('.js-total').text(item.total) diff --git a/app/assets/javascripts/app/controllers/layout_ref.coffee b/app/assets/javascripts/app/controllers/layout_ref.coffee index 1ae661cfb..f4dc268e7 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.coffee @@ -1499,7 +1499,7 @@ class InputsRef extends App.ControllerContent null: false relation: 'User' autocapitalize: false - disableCreateUser: true + disableCreateObject: true multiple: true @$('.userOrganizationAutocompletePlaceholder').replaceWith( userOrganizationAutocomplete.element() ) diff --git a/app/assets/javascripts/app/controllers/login.coffee b/app/assets/javascripts/app/controllers/login.coffee index 322a518c7..6e7f608d3 100644 --- a/app/assets/javascripts/app/controllers/login.coffee +++ b/app/assets/javascripts/app/controllers/login.coffee @@ -38,50 +38,7 @@ class Index extends App.ControllerContent ) render: (data = {}) -> - auth_provider_all = { - facebook: { - url: '/auth/facebook', - name: 'Facebook', - config: 'auth_facebook', - class: 'facebook' - }, - twitter: { - url: '/auth/twitter' - name: 'Twitter' - config: 'auth_twitter' - class: 'twitter' - }, - linkedin: { - url: '/auth/linkedin' - name: 'LinkedIn' - config: 'auth_linkedin' - class: 'linkedin' - }, - github: { - url: '/auth/github' - name: 'GitHub' - config: 'auth_github' - class: 'github' - }, - gitlab: { - url: '/auth/gitlab' - name: 'GitLab' - config: 'auth_gitlab' - class: 'gitlab' - }, - google_oauth2: { - url: '/auth/google_oauth2' - name: 'Google' - config: 'auth_google_oauth2' - class: 'google' - }, - oauth2: { - url: '/auth/oauth2' - name: 'OAuth2' - config: 'auth_oauth2' - class: 'oauth2' - }, - } + auth_provider_all = App.Config.get('auth_provider_all') auth_providers = [] for key, provider of auth_provider_all if @Config.get(provider.config) is true || @Config.get(provider.config) is 'true' diff --git a/app/assets/javascripts/app/controllers/ticket_customer.coffee b/app/assets/javascripts/app/controllers/ticket_customer.coffee index e23ea954c..edb5df0c0 100644 --- a/app/assets/javascripts/app/controllers/ticket_customer.coffee +++ b/app/assets/javascripts/app/controllers/ticket_customer.coffee @@ -6,7 +6,7 @@ class App.TicketCustomer extends App.ControllerModal content: -> configure_attributes = [ - { name: 'customer_id', display: 'Customer', tag: 'user_autocompletion', null: false, placeholder: 'Enter Person or Organization/Company', minLengt: 2, disableCreateUser: true }, + { name: 'customer_id', display: 'Customer', tag: 'user_autocompletion', null: false, placeholder: 'Enter Person or Organization/Company', minLengt: 2, disableCreateObject: true }, ] controller = new App.ControllerForm( model: diff --git a/app/assets/javascripts/app/controllers/ticket_overview.coffee b/app/assets/javascripts/app/controllers/ticket_overview.coffee index 66c5ec1ca..39f1c4e9a 100644 --- a/app/assets/javascripts/app/controllers/ticket_overview.coffee +++ b/app/assets/javascripts/app/controllers/ticket_overview.coffee @@ -221,7 +221,7 @@ class App.TicketOverview extends App.Controller if @batchCountIndex == @batchCount App.Event.trigger('overview:fetch') ) - return + return if action is 'group_assign' @batchCount = items.length diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.coffee index d523501f2..094a15f30 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.coffee @@ -401,10 +401,11 @@ class App.TicketZoom extends App.Controller nav: @nav isCustomer: @permissionCheck('ticket.customer') scrollbarWidth: App.Utils.getScrollBarWidth() + dir: App.i18n.dir() ) new App.TicketZoomOverviewNavigator( - el: elLocal.find('.overview-navigator') + el: elLocal.find('.js-overviewNavigatorContainer') ticket_id: @ticket_id overview_id: @overview_id ) @@ -412,13 +413,13 @@ class App.TicketZoom extends App.Controller new App.TicketZoomTitle( object_id: @ticket_id overview_id: @overview_id - el: elLocal.find('.ticket-title') + el: elLocal.find('.js-ticketTitleContainer') task_key: @task_key ) new App.TicketZoomMeta( object_id: @ticket_id - el: elLocal.find('.ticket-meta') + el: elLocal.find('.js-ticketMetaContainer') ) @attributeBar = new App.TicketZoomAttributeBar( @@ -445,7 +446,12 @@ class App.TicketZoom extends App.Controller ) @highligher = new App.TicketZoomHighlighter( - el: elLocal.find('.highlighter') + el: elLocal.find('.js-highlighterContainer') + ticket_id: @ticket_id + ) + + new App.TicketZoomSetting( + el: elLocal.find('.js-settingContainer') ticket_id: @ticket_id ) @@ -467,6 +473,7 @@ class App.TicketZoom extends App.Controller sidebarState: @sidebarState object_id: @ticket_id model: 'Ticket' + query: @query taskGet: @taskGet task_key: @task_key formMeta: @formMeta @@ -557,14 +564,16 @@ class App.TicketZoom extends App.Controller return if !@ticket currentStoreTicket = @ticket.attributes() delete currentStoreTicket.article + internal = @Config.get('ui_ticket_zoom_article_note_new_internal') currentStore = ticket: currentStoreTicket article: to: '' cc: '' + subject: '' type: 'note' body: '' - internal: 'true' + internal: internal in_reply_to: '' if @permissionCheck('ticket.customer') @@ -575,7 +584,7 @@ class App.TicketZoom extends App.Controller formCurrent: => currentParams = ticket: @formParam(@el.find('.edit')) - article: @formParam(@el.find('.article-add')) + article: @articleNew.params() # add attachments if exist attachmentCount = @$('.article-add .textBubble .attachments .attachment').length @@ -684,7 +693,7 @@ class App.TicketZoom extends App.Controller tagAdd: (tag) => return if !@sidebar return if !@sidebar.reload - @sidebar.reload(tagAdd: tag) + @sidebar.reload(tagAdd: tag, source: 'macro') tagRemove: (tag) => return if !@sidebar return if !@sidebar.reload @@ -789,6 +798,9 @@ class App.TicketZoom extends App.Controller # reset form after save @reset() + if @sidebar + @sidebar.commit() + if taskAction is 'closeNextInOverview' if @overview_id current_position = 0 diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee index 6b60eb01e..cfa5a0ce4 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee @@ -391,6 +391,7 @@ class App.TicketZoomArticleActions extends App.Controller body = @el.closest('.ticketZoom').find('.article-add [data-name="body"]').html() || '' # check if quote need to be added + signaturePosition = 'bottom' selected = App.ClipBoard.getSelected('html') if selected selected = App.Utils.htmlCleanup(selected).html() @@ -399,6 +400,16 @@ class App.TicketZoomArticleActions extends App.Controller if selected selected = App.Utils.textCleanup(selected) selected = App.Utils.text2html(selected) + + # full quote, if needed + if !selected && article && App.Config.get('ui_ticket_zoom_article_email_full_quote') + signaturePosition = 'top' + if article.content_type.match('html') + selected = App.Utils.textCleanup(article.body) + if article.content_type.match('plain') + selected = App.Utils.textCleanup(article.body) + selected = App.Utils.text2html(selected) + if selected selected = "


#{selected}

" @@ -409,7 +420,12 @@ class App.TicketZoomArticleActions extends App.Controller type = App.TicketArticleType.findByAttribute(name:'email') - App.Event.trigger('ui::ticket::setArticleType', { ticket: @ticket, type: type, article: articleNew } ) + App.Event.trigger('ui::ticket::setArticleType', { + ticket: @ticket + type: type + article: articleNew + signaturePosition: signaturePosition + }) telegramPersonalMessageReply: (e) => e.preventDefault() diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee index c42c5ba7a..edb39480d 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee @@ -28,7 +28,62 @@ class App.TicketZoomArticleNew extends App.Controller constructor: -> super - # set possble article types + @internalSelector = true + @type = @defaults['type'] || 'note' + @setPossibleArticleTypes() + + if @permissionCheck('ticket.customer') + @internalSelector = false + + @textareaHeight = + open: 148 + closed: 20 + + @dragEventCounter = 0 + @attachments = [] + + @render() + + if @defaults.body or @isIE10() + @openTextarea(null, true) + + # set article type and expand text area + @bind('ui::ticket::setArticleType', (data) => + return if data.ticket.id.toString() isnt @ticket_id.toString() + + @openTextarea(null, true) + for key, value of data.article + if key is 'body' + @$('[data-name="' + key + '"]').html(value) + else + @$('[name="' + key + '"]').val(value).trigger('change') + + # preselect article type + @setArticleType(data.type.name, data.signaturePosition) + + # set focus at end of field + if data.position is 'end' + @placeCaretAtEnd(@textarea.get(0)) + return + + # set focus into field + @textarea.focus() + ) + + # reset new article screen + @bind('ui::ticket::taskReset', (data) => + return if data.ticket_id.toString() isnt @ticket_id.toString() + @type = 'note' + @defaults = {} + @render() + ) + + # rerender, e. g. on language change + @bind('ui:rerender', => + @render() + ) + + setPossibleArticleTypes: => possibleArticleType = note: true phone: true @@ -50,12 +105,9 @@ class App.TicketZoomArticleNew extends App.Controller possibleArticleType['email'] = true # gets referenced in @setArticleType - @internalSelector = true - @type = @defaults['type'] || 'note' @articleTypes = [] if possibleArticleType.note - internal = @Config.get('ui_ticket_zoom_article_new_internal') - + internal = @Config.get('ui_ticket_zoom_article_note_new_internal') @articleTypes.push { name: 'note' icon: 'note' @@ -64,10 +116,13 @@ class App.TicketZoomArticleNew extends App.Controller features: ['attachment'] } if possibleArticleType.email + attributes = ['to', 'cc', 'subject'] + if !@Config.get('ui_ticket_zoom_article_email_subject') + attributes = ['to', 'cc'] @articleTypes.push { name: 'email' icon: 'email' - attributes: ['to', 'cc'] + attributes: attributes internal: false, features: ['attachment'] } @@ -80,6 +135,9 @@ class App.TicketZoomArticleNew extends App.Controller features: [] } if possibleArticleType['twitter status'] + attributes = ['body:limit', 'body:initials'] + if !@Config.get('ui_ticket_zoom_article_twitter_initials') + attributes = ['body:limit'] @articleTypes.push { name: 'twitter status' icon: 'twitter' @@ -90,6 +148,9 @@ class App.TicketZoomArticleNew extends App.Controller warningTextLength: 30 } if possibleArticleType['twitter direct-message'] + attributes = ['body:limit', 'body:initials'] + if !@Config.get('ui_ticket_zoom_article_twitter_initials') + attributes = ['body:limit'] @articleTypes.push { name: 'twitter direct-message' icon: 'twitter' @@ -130,57 +191,6 @@ class App.TicketZoomArticleNew extends App.Controller }, ] - if @permissionCheck('ticket.customer') - @internalSelector = false - - @textareaHeight = - open: 148 - closed: 20 - - @dragEventCounter = 0 - @attachments = [] - - @render() - - if @defaults.body or @isIE10() - @openTextarea(null, true) - - # set article type and expand text area - @bind('ui::ticket::setArticleType', (data) => - return if data.ticket.id.toString() isnt @ticket_id.toString() - - @openTextarea(null, true) - for key, value of data.article - if key is 'body' - @$('[data-name="' + key + '"]').html(value) - else - @$('[name="' + key + '"]').val(value).trigger('change') - - # preselect article type - @setArticleType(data.type.name) - - # set focus at end of field - if data.position is 'end' - @placeCaretAtEnd(@textarea.get(0)) - return - - # set focus into field - @textarea.focus() - ) - - # reset new article screen - @bind('ui::ticket::taskReset', (data) => - return if data.ticket_id.toString() isnt @ticket_id.toString() - @type = 'note' - @defaults = {} - @render() - ) - - # rerender, e. g. on language change - @bind('ui:rerender', => - @render() - ) - placeCaretAtEnd: (el) -> el.focus() if typeof window.getSelection isnt 'undefined' && typeof document.createRange isnt 'undefined' @@ -300,6 +310,7 @@ class App.TicketZoomArticleNew extends App.Controller data: ticket: ticket user: App.Session.get() + config: App.Config.all() ) callback = (ticket) -> textModule.reload( @@ -318,9 +329,6 @@ class App.TicketZoomArticleNew extends App.Controller params.form_id = @form_id params.content_type = 'text/html' - if !params['internal'] - params['internal'] = false - if @permissionCheck('ticket.customer') sender = App.TicketArticleSender.findByAttribute('name', 'Customer') type = App.TicketArticleType.findByAttribute('name', 'web') @@ -332,6 +340,11 @@ class App.TicketZoomArticleNew extends App.Controller params.sender_id = sender.id params.type_id = type.id + if params.internal + params.internal = true + else + params.internal = false + if params.type is 'twitter status' App.Utils.htmlRemoveRichtext(@$('[data-name=body]'), false) params.content_type = 'text/plain' @@ -471,13 +484,15 @@ class App.TicketZoomArticleNew extends App.Controller @$('[name=internal]').val('') - setArticleType: (type) => + setArticleType: (type, signaturePosition = 'bottom') => wasScrolledToBottom = @isScrolledToBottom() @type = type @$('[name=type]').val(type).trigger('change') @articleNewEdit.attr('data-type', type) @$('.js-selectableTypes').addClass('hide').filter("[data-type='#{type}']").removeClass('hide') + @setPossibleArticleTypes() + # get config config = {} for articleTypeConfig in @articleTypes @@ -510,7 +525,7 @@ class App.TicketZoomArticleNew extends App.Controller @$('[data-name=body] [data-signature="true"]').remove() # apply new signature - signatureFinished = App.Utils.replaceTags(signature.body, { user: App.Session.get(), ticket: ticketCurrent }) + signatureFinished = App.Utils.replaceTags(signature.body, { user: App.Session.get(), ticket: ticketCurrent, config: App.Config.all() }) body = @$('[data-name=body]') if App.Utils.signatureCheck(body.html() || '', signatureFinished) @@ -518,7 +533,10 @@ class App.TicketZoomArticleNew extends App.Controller body.append('

') signature = $("
#{signatureFinished}
") App.Utils.htmlStrip(signature) - body.append(signature) + if signaturePosition is 'top' + body.prepend(signature) + else + body.append(signature) @$('[data-name=body]').replaceWith(body) # remove old signature @@ -552,6 +570,20 @@ class App.TicketZoomArticleNew extends App.Controller @delay(@updateLetterCount, 600) @$('.js-textSizeLimit').removeClass('hide') + # convert remote src images to data uri + @$('[data-name=body] img').each( (i,image) -> + $image = $(image) + src = $image.attr('src') + if !_.isEmpty(src) && !src.match(/^data:image/i) + canvas = document.createElement('canvas') + canvas.width = image.width + canvas.height = image.height + ctx = canvas.getContext('2d') + ctx.drawImage(image, 0, 0) + dataURL = canvas.toDataURL() + $image.attr('src', dataURL) + ) + @scrollToBottom() if wasScrolledToBottom isScrolledToBottom: -> diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/higlighter.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/highlighter.coffee similarity index 100% rename from app/assets/javascripts/app/controllers/ticket_zoom/higlighter.coffee rename to app/assets/javascripts/app/controllers/ticket_zoom/highlighter.coffee diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/setting.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/setting.coffee new file mode 100644 index 000000000..1103f9e3c --- /dev/null +++ b/app/assets/javascripts/app/controllers/ticket_zoom/setting.coffee @@ -0,0 +1,35 @@ +class App.TicketZoomSetting extends App.Controller + events: + 'click .js-setting': 'show' + + constructor: -> + super + return if !@permissionCheck('admin') + @render() + + render: -> + @html(App.view('ticket_zoom/setting')()) + + show: -> + new Modal() + +class Modal extends App.ControllerModal + buttonClose: true + buttonCancel: true + buttonSubmit: false + head: 'Settings' + + constructor: -> + super + + render: => + super + + post: => + new App.SettingsArea( + area: 'UI::TicketZoom' + el: @el.find('.modal-body') + ) + + content: -> + App.view('generic/page_loading')() diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar.coffee index 874922998..1eb4d68ea 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar.coffee @@ -9,18 +9,32 @@ class App.TicketZoomSidebar extends App.ObserverController if backend && backend.reload backend.reload(args) + commit: (args) => + for key, backend of @sidebarBackends + if backend && backend.commit + backend.commit(args) + render: (ticket) => - @sidebarBackends = {} + @sidebarBackends ||= {} @sidebarItems = [] sidebarBackends = App.Config.get('TicketZoomSidebar') keys = _.keys(sidebarBackends).sort() for key in keys - @sidebarBackends[key] = new sidebarBackends[key]( - ticket: ticket - taskGet: @taskGet - formMeta: @formMeta - markForm: @markForm - ) + if !@sidebarBackends[key] || !@sidebarBackends[key].reload + @sidebarBackends[key] = new sidebarBackends[key]( + ticket: ticket + query: @query + taskGet: @taskGet + formMeta: @formMeta + markForm: @markForm + ) + else + @sidebarBackends[key].reload( + params: @params + query: @query + formMeta: @formMeta + markForm: @markForm + ) item = @sidebarBackends[key].sidebarItem() if item @sidebarItems.push item diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_customer.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_customer.coffee index 701a151b6..92bfd8c65 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_customer.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_customer.coffee @@ -1,7 +1,7 @@ class SidebarCustomer extends App.Controller sidebarItem: => return if !@permissionCheck('ticket.agent') - { + items = { head: 'Customer' name: 'customer' icon: 'person' @@ -11,14 +11,16 @@ class SidebarCustomer extends App.Controller name: 'customer-change' callback: @changeCustomer }, - { - title: 'Edit Customer' - name: 'customer-edit' - callback: @editCustomer - }, ] callback: @showCustomer } + return items if @ticket && @ticket.customer_id == 1 + items.actions.push { + title: 'Edit Customer' + name: 'customer-edit' + callback: @editCustomer + } + items showCustomer: (el) => @el = el diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_idoit.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_idoit.coffee new file mode 100644 index 000000000..5ebce7924 --- /dev/null +++ b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_idoit.coffee @@ -0,0 +1,132 @@ +class SidebarIdoit extends App.Controller + sidebarItem: => + return if !@Config.get('idoit_integration') + { + head: 'i-doit' + name: 'idoit' + icon: 'printer' + actions: [ + { + title: 'Change Objects' + name: 'objects-change' + callback: @changeObjects + }, + ] + callback: @showObjects + } + + changeObjects: => + new App.IdoitObjectSelector( + task_key: @task_key + container: @el.closest('.content') + callback: (objectIds, objectSelectorUi) => + if @ticket && @ticket.id + @updateTicket(@ticket.id, objectIds, => + objectSelectorUi.close() + @showObjectsContent(objectIds) + ) + return + objectSelectorUi.close() + @showObjectsContent(objectIds) + ) + + showObjects: (el) => + @el = el + + # show placeholder + @objectIds ||= [] + if @ticket && @ticket.preferences && @ticket.preferences.idoit && @ticket.preferences.idoit.object_ids + @objectIds = @ticket.preferences.idoit.object_ids + queryParams = @queryParam() + if queryParams && queryParams.idoit_object_ids + @objectIds.push queryParams.idoit_object_ids + @showObjectsContent() + + showObjectsContent: (objectIds) => + if objectIds + @objectIds = @objectIds.concat(objectIds) + + # show placeholder + if _.isEmpty(@objectIds) + @html("
#{App.i18n.translateInline('none')}
") + return + + # ajax call to show items + @ajax( + id: "idoit-#{@task_key}" + type: 'POST' + url: "#{@apiPath}/integration/idoit" + data: JSON.stringify(method: 'cmdb.objects', filter: ids: @objectIds) + success: (data, status, xhr) => + if data.response + @showList(data.response.result) + return + @showError('Unable to load data...') + + error: (xhr, status, error) => + + # do not close window if request is aborted + return if status is 'abort' + + # show error message + @showError('Unable to load data...') + ) + + showList: (objects) => + list = $(App.view('ticket_zoom/sidebar_idoit')( + objects: objects + )) + list.delegate('.js-delete', 'click', (e) => + e.preventDefault() + objectId = $(e.currentTarget).attr 'data-object-id' + @delete(objectId) + ) + @html(list) + + showError: (message) => + @html App.i18n.translateInline(message) + + delete: (objectId) => + localObjects = [] + for localObjectId in @objectIds + if objectId.toString() isnt localObjectId.toString() + localObjects.push localObjectId + @objectIds = localObjects + if @ticket && @ticket.id + @updateTicket(@ticket.id, @objectIds) + @showObjectsContent() + + commit: (args) => + return if @ticket && @ticket.id + return if !@objectIds + return if _.isEmpty(@objectIds) + return if !args + return if !args.ticket_id + @updateTicket(args.ticket_id, @objectIds) + + updateTicket: (ticket_id, objectIds, callback) => + App.Ajax.request( + id: "idoit-update-#{ticket_id}" + type: 'POST' + url: "#{@apiPath}/integration/idoit_ticket_update" + data: JSON.stringify(ticket_id: ticket_id, object_ids: objectIds) + success: (data, status, xhr) -> + if callback + callback(objectIds) + + error: (xhr, status, details) => + + # do not close window if request is aborted + return if status is 'abort' + + # show error message + @log 'errors', details + @notify( + type: 'error' + msg: App.i18n.translateContent(details.error_human || details.error || 'Unable to update object!') + timeout: 6000 + ) + ) + +App.Config.set('500-Idoit', SidebarIdoit, 'TicketCreateSidebar') +App.Config.set('500-Idoit', SidebarIdoit, 'TicketZoomSidebar') diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_organization.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_organization.coffee index ad612da6b..6fc2ef5cb 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_organization.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_organization.coffee @@ -1,5 +1,6 @@ class SidebarOrganization extends App.Controller sidebarItem: => + return if !@permissionCheck('ticket.agent') return if !@ticket.organization_id { head: 'Organization' diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_ticket.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_ticket.coffee index 52ea11299..cb656f976 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_ticket.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_ticket.coffee @@ -69,7 +69,7 @@ class SidebarTicket extends App.Controller if args.tags @tagWidget.reload(args.tags) if args.tagAdd - @tagWidget.add(args.tagAdd) + @tagWidget.add(args.tagAdd, args.source) if args.tagRemove @tagWidget.remove(args.tagRemove) diff --git a/app/assets/javascripts/app/controllers/widget/avatar.coffee b/app/assets/javascripts/app/controllers/widget/avatar.coffee index c2ce3e055..e6bc84d35 100644 --- a/app/assets/javascripts/app/controllers/widget/avatar.coffee +++ b/app/assets/javascripts/app/controllers/widget/avatar.coffee @@ -7,6 +7,12 @@ class App.WidgetAvatar extends App.ObserverController email: true image: true vip: true + out_of_office: true, + out_of_office_start_at: true, + out_of_office_end_at: true, + out_of_office_replacement_id: true, + active: true + globalRerender: false render: (user) => diff --git a/app/assets/javascripts/app/controllers/widget/dev_banner.coffee b/app/assets/javascripts/app/controllers/widget/dev_banner.coffee index a8f7f5c9e..28d534391 100644 --- a/app/assets/javascripts/app/controllers/widget/dev_banner.coffee +++ b/app/assets/javascripts/app/controllers/widget/dev_banner.coffee @@ -5,10 +5,10 @@ class Widget banner = """ | | Welcome Zammad Developer! -| You can enable debugging by the following examples (value is a regex): +| You can enable debugging with the following examples (value is a regex): | | App.Log.config('module', '(websocket|delay|interval)') // enable debugging for websocket, delay and interval class -| App.Log.config('content', 'send') // enable debugging for messages which contains the string 'send' +| App.Log.config('content', 'send') // enable debugging for messages which contain the string 'send' | App.Log.config('banner', false) // disable this banner | | App.Log.config() // current settings diff --git a/app/assets/javascripts/app/controllers/widget/hello_banner.coffee b/app/assets/javascripts/app/controllers/widget/hello_banner.coffee index 966d81055..9c0d9e8fa 100644 --- a/app/assets/javascripts/app/controllers/widget/hello_banner.coffee +++ b/app/assets/javascripts/app/controllers/widget/hello_banner.coffee @@ -10,9 +10,9 @@ class Widget | | Hi there, nice to meet you! | -| Visit %chttps://zammad.org/participate%c and let's make Zammad better. +| Visit %chttp://zammad.com/jobs%c to learn about our current job openings. | -| The Zammad Team. +| Your Zammad Team | """ console.log(banner, 'text-decoration: underline;', 'text-decoration: none;') diff --git a/app/assets/javascripts/app/controllers/widget/http_log.coffee b/app/assets/javascripts/app/controllers/widget/http_log.coffee index 4a625b3bd..43ab07baf 100644 --- a/app/assets/javascripts/app/controllers/widget/http_log.coffee +++ b/app/assets/javascripts/app/controllers/widget/http_log.coffee @@ -25,6 +25,7 @@ class App.HttpLog extends App.Controller render: => @html App.view('widget/http_log')( records: @records + description: @description ) show: (e) => diff --git a/app/assets/javascripts/app/controllers/widget/script_snipped.coffee b/app/assets/javascripts/app/controllers/widget/script_snipped.coffee new file mode 100644 index 000000000..ec2fb1d6e --- /dev/null +++ b/app/assets/javascripts/app/controllers/widget/script_snipped.coffee @@ -0,0 +1,24 @@ +class App.ScriptSnipped extends App.Controller + #events: + # 'click .js-record': 'show' + + elements: + '.js-code': 'code' + + + constructor: -> + super + #@fetch() + @records = [] + @render() + + render: => + @html App.view('widget/script_snipped')( + records: @records + description: @description + style: @style + content: @content + ) + + @code.each (i, block) -> + hljs.highlightBlock block \ No newline at end of file diff --git a/app/assets/javascripts/app/controllers/widget/tag.coffee b/app/assets/javascripts/app/controllers/widget/tag.coffee index f148746fa..ee0f4b455 100644 --- a/app/assets/javascripts/app/controllers/widget/tag.coffee +++ b/app/assets/javascripts/app/controllers/widget/tag.coffee @@ -86,16 +86,16 @@ class App.WidgetTag extends App.Controller return @add(item) - add: (items) => + add: (items, source = '') => for item in items.split(',') item = item.trim() - @addItem(item) + @addItem(item, source) - addItem: (item) => + addItem: (item, source = '') => if _.contains(@localTags, item) @render() return - return if App.Config.get('tag_new') is false && !@possibleTags[item] + return if source != 'macro' && App.Config.get('tag_new') is false && !@possibleTags[item] @localTags.push item @render() App[@object_type].tagAdd(@object.id, item) diff --git a/app/assets/javascripts/app/controllers/widget/text_module.coffee b/app/assets/javascripts/app/controllers/widget/text_module.coffee index b4027bfeb..09dc5468c 100644 --- a/app/assets/javascripts/app/controllers/widget/text_module.coffee +++ b/app/assets/javascripts/app/controllers/widget/text_module.coffee @@ -8,7 +8,7 @@ class App.WidgetTextModule extends App.Controller # remember instances @bindElements = [] if @selector - @bindElements = @$( @selector ).textmodule() + @bindElements = @$(@selector).textmodule() else if @el.attr('contenteditable') @bindElements = @el.textmodule() diff --git a/app/assets/javascripts/app/lib/app_init/queue_manager.coffee b/app/assets/javascripts/app/lib/app_init/queue_manager.coffee new file mode 100644 index 000000000..e560550f0 --- /dev/null +++ b/app/assets/javascripts/app/lib/app_init/queue_manager.coffee @@ -0,0 +1,57 @@ +class App.QueueManager + _instance = undefined + + @init: -> + _instance ?= new _queueSingleton + + @add: (key, data) -> + if _instance == undefined + _instance ?= new _queueSingleton + _instance.add(key, data) + + @pull: (key) -> + if _instance == undefined + _instance ?= new _queueSingleton + _instance.pull(key) + + @all: (key) -> + if _instance == undefined + _instance ?= new _queueSingleton + _instance.all(key) + + @run: (key, callback) -> + if _instance == undefined + _instance ?= new _queueSingleton + _instance.run(key, callback) + +class _queueSingleton + constructor: -> + @queues = {} + @queueRunning = {} + + add: (key, data) -> + if !@queues[key] + @queues[key] = [] + @queues[key].push data + true + + pull: (key) -> + return if !@queues[key] + @queues[key].shift() + + all: (key) -> + @queues[key] + + run: (key, callback) -> + return if !@queues[key] + return if @queueRunning[key] + localQueue = @queues[key] + return if _.isEmpty(localQueue) + @queueRunning[key] = true + loop + callback = localQueue.shift() + callback() + if !localQueue[0] + @queueRunning[key] = false + break + true diff --git a/app/assets/javascripts/app/lib/app_post/_collection_base.coffee b/app/assets/javascripts/app/lib/app_post/_collection_base.coffee index 4fa13b67d..d031dfa11 100644 --- a/app/assets/javascripts/app/lib/app_post/_collection_base.coffee +++ b/app/assets/javascripts/app/lib/app_post/_collection_base.coffee @@ -5,9 +5,9 @@ class App._CollectionSingletonBase constructor: -> @callbacks = {} @counter = 0 - + @key = "collection-#{@event}" # read from cache - cache = App.SessionStorage.get("collection-#{@event}") + cache = App.SessionStorage.get(@key) if cache @set(cache) @@ -73,6 +73,9 @@ class App._CollectionSingletonBase callback: (data) => for counter, attr of @callbacks - attr.callback(data) - if attr.one - delete @callbacks[counter] + callback = -> + attr.callback(data) + if attr.one + delete @callbacks[counter] + App.QueueManager.add(@key, callback) + App.QueueManager.run(@key) diff --git a/app/assets/javascripts/app/lib/app_post/column_select.coffee b/app/assets/javascripts/app/lib/app_post/column_select.coffee index d58354f5d..728c2d499 100644 --- a/app/assets/javascripts/app/lib/app_post/column_select.coffee +++ b/app/assets/javascripts/app/lib/app_post/column_select.coffee @@ -33,6 +33,11 @@ class App.ColumnSelect extends Spine.Controller @select @pickedValue , 300, {trailing: false} + if @attribute.onChange + @shadow.on('change', => + @attribute.onChange(@shadow.val()) + ) + render: -> @values = [] _.each @options.attribute.options, (option) => diff --git a/app/assets/javascripts/app/lib/app_post/delay.coffee b/app/assets/javascripts/app/lib/app_post/delay.coffee index c68fdd3b9..284848852 100644 --- a/app/assets/javascripts/app/lib/app_post/delay.coffee +++ b/app/assets/javascripts/app/lib/app_post/delay.coffee @@ -1,10 +1,10 @@ class App.Delay _instance = undefined - @set: (callback, timeout, key, level) -> + @set: (callback, timeout, key, level, queue) -> if _instance == undefined _instance ?= new _delaySingleton - _instance.set(callback, timeout, key, level) + _instance.set(callback, timeout, key, level, queue) @clear: (key, level) -> if _instance == undefined @@ -21,6 +21,11 @@ class App.Delay _instance ?= new _delaySingleton _instance.reset() + @count: -> + if _instance == undefined + _instance ?= new _intervalSingleton + _instance.count() + @_all: -> if _instance == undefined _instance ?= new _delaySingleton @@ -32,7 +37,7 @@ class _delaySingleton extends Spine.Module constructor: -> @levelStack = {} - set: (callback, timeout, key, level) => + set: (callback, timeout, key, level, queue) => if !level level = '_all' @@ -44,11 +49,15 @@ class _delaySingleton extends Spine.Module key = Math.floor(Math.random() * 99999) # setTimeout - @log 'debug', 'set', key, timeout, level, callback - call = => + @log 'debug', 'set', key, timeout, level, callback, queue + localCallback = => @clear(key, level) - callback() - delay_id = setTimeout(call, timeout) + if queue + App.QueueManager.add('delay', callback) + App.QueueManager.run('delay') + else + callback() + delay_id = setTimeout(localCallback, timeout) # remember all delays if !@levelStack[level] @@ -93,6 +102,13 @@ class _delaySingleton extends Spine.Module @levelStack[level] = {} true + count: => + return 0 if !@levelStack + count = 0 + for levelName, levelValue of @levelStack + count += Object.keys(levelValue).length + count + _all: => @levelStack diff --git a/app/assets/javascripts/app/lib/app_post/i18n.coffee b/app/assets/javascripts/app/lib/app_post/i18n.coffee index 3dd198b70..560562269 100644 --- a/app/assets/javascripts/app/lib/app_post/i18n.coffee +++ b/app/assets/javascripts/app/lib/app_post/i18n.coffee @@ -30,6 +30,11 @@ class App.i18n _instance ?= new _i18nSingleton() _instance.date(args, offset) + @dir: -> + if _instance == undefined + _instance ?= new _i18nSingleton() + _instance.dir() + @get: -> if _instance == undefined _instance ?= new _i18nSingleton() @@ -88,6 +93,10 @@ class _i18nSingleton extends Spine.Module @_notTranslated = {} @dateFormat = 'yyyy-mm-dd' @timestampFormat = 'yyyy-mm-dd HH:MM' + @dirToSet = 'ltr' + + dir: -> + @dirToSet get: -> @locale @@ -96,7 +105,7 @@ class _i18nSingleton extends Spine.Module # prepare locale localeToSet = localeToSet.toLowerCase() - dirToSet = 'ltr' + @dirToSet = 'ltr' # check if locale exists localeFound = false @@ -104,7 +113,7 @@ class _i18nSingleton extends Spine.Module for locale in locales if locale.locale is localeToSet localeToSet = locale.locale - dirToSet = locale.dir + @dirToSet = locale.dir localeFound = true # try aliases @@ -112,7 +121,7 @@ class _i18nSingleton extends Spine.Module for locale in locales if locale.alias is localeToSet localeToSet = locale.locale - dirToSet = locale.dir + @dirToSet = locale.dir localeFound = true # if no locale and no alias was found, try to find correct one @@ -123,7 +132,7 @@ class _i18nSingleton extends Spine.Module for locale in locales if locale.alias is localeToSet localeToSet = locale.locale - dirToSet = locale.dir + @dirToSet = locale.dir localeFound = true # check if locale need to be changed @@ -137,7 +146,7 @@ class _i18nSingleton extends Spine.Module # set lang and dir attribute of html tag $('html').prop('lang', localeToSet.substr(0, 2)) - $('html').prop('dir', dirToSet) + $('html').prop('dir', @dirToSet) @mapString = {} App.Ajax.request( diff --git a/app/assets/javascripts/app/lib/app_post/interval.coffee b/app/assets/javascripts/app/lib/app_post/interval.coffee index cc341ec41..74c021f80 100644 --- a/app/assets/javascripts/app/lib/app_post/interval.coffee +++ b/app/assets/javascripts/app/lib/app_post/interval.coffee @@ -1,10 +1,10 @@ class App.Interval _instance = undefined - @set: (callback, timeout, key, level) -> + @set: (callback, timeout, key, level, queue) -> if _instance == undefined _instance ?= new _intervalSingleton - _instance.set(callback, timeout, key, level) + _instance.set(callback, timeout, key, level, queue) @clear: (key, level) -> if _instance == undefined @@ -21,6 +21,11 @@ class App.Interval _instance ?= new _intervalSingleton _instance.reset() + @count: -> + if _instance == undefined + _instance ?= new _intervalSingleton + _instance.count() + @_all: -> if _instance == undefined _instance ?= new _intervalSingleton @@ -32,7 +37,7 @@ class _intervalSingleton extends Spine.Module constructor: -> @levelStack = {} - set: (callback, timeout, key, level) => + set: (callback, timeout, key, level, queue) => if !level level = '_all' @@ -44,9 +49,15 @@ class _intervalSingleton extends Spine.Module key = Math.floor(Math.random() * 99999) # setTimeout - @log 'debug', 'set', key, timeout, level, callback - callback() - interval_id = setInterval(callback, timeout) + @log 'debug', 'set', key, timeout, level, callback, queue + localCallback = -> + if queue + App.QueueManager.add('interval', callback) + App.QueueManager.run('interval') + else + callback() + localCallback() + interval_id = setInterval(localCallback, timeout) # remember all interval if !@levelStack[level] @@ -91,5 +102,12 @@ class _intervalSingleton extends Spine.Module @levelStack[level] = {} true + count: => + return 0 if !@levelStack + count = 0 + for levelName, levelValue of @levelStack + count += Object.keys(levelValue).length + count + _all: => @levelStack diff --git a/app/assets/javascripts/app/lib/app_post/overview_list_collection.coffee b/app/assets/javascripts/app/lib/app_post/overview_list_collection.coffee index 2831aacbc..b605f5503 100644 --- a/app/assets/javascripts/app/lib/app_post/overview_list_collection.coffee +++ b/app/assets/javascripts/app/lib/app_post/overview_list_collection.coffee @@ -71,7 +71,10 @@ class _Singleton callback: (view, data) => for counter, meta of @callbacks if meta.view is view - meta.callback(data) + callback = -> + meta.callback(data) + App.QueueManager.add('ticket_overviews', callback) + App.QueueManager.run('ticket_overviews') class App.OverviewListCollection _instance = new _Singleton diff --git a/app/assets/javascripts/app/lib/app_post/pretty_date.coffee b/app/assets/javascripts/app/lib/app_post/pretty_date.coffee index 9c607eee0..13c6157a2 100644 --- a/app/assets/javascripts/app/lib/app_post/pretty_date.coffee +++ b/app/assets/javascripts/app/lib/app_post/pretty_date.coffee @@ -38,11 +38,16 @@ class App.PrettyDate months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'] month = months[created.getMonth()] - # for less than 7 days - if diff < (60 * 60 * 24 * 7) + # for less than 6 days + # weekday HH::MM + if diff < (60 * 60 * 24 * 6) string = "#{App.i18n.translateInline(weekday)} #{created.getHours()}:#{@s(created.getMinutes(), 2)}" - else if diff < (60 * 60 * 24 * 7) * 365 + # if it was this year + # weekday DD. MM HH::MM + else if created.getYear() is current.getYear() string = "#{App.i18n.translateInline(weekday)} #{created.getDate()}. #{App.i18n.translateInline(month)} #{created.getHours()}:#{@s(created.getMinutes(), 2)}" + # if it was the year before + # weekday YYYY-MM-DD HH::MM else string = "#{App.i18n.translateInline(weekday)} #{App.i18n.translateTimestamp(time)}" if escalation diff --git a/app/assets/javascripts/app/lib/app_post/utils.coffee b/app/assets/javascripts/app/lib/app_post/utils.coffee index 5b71dd5a2..2c70db01e 100644 --- a/app/assets/javascripts/app/lib/app_post/utils.coffee +++ b/app/assets/javascripts/app/lib/app_post/utils.coffee @@ -124,10 +124,12 @@ class App.Utils @linkify: (string) -> window.linkify(string) - # htmlEscapedAndLinkified = App.Utils.linkify(rawText) + # htmlEscapedAndPhoneified = App.Utils.phoneify(rawText) @phoneify: (string) -> - string = string.replace(/\s+/g, '') - "tel://#{encodeURIComponent(string)}" + return string if _.isEmpty(string) + string = string.replace(/[^0-9,\+,#,\*]+/g, '') + .replace(/(.)\+/, '$1') + "tel:#{string}" # wrappedText = App.Utils.wrap(rawText, maxLineLength) @wrap: (ascii, max = 82) -> @@ -649,6 +651,7 @@ class App.Utils # textReplaced = App.Utils.replaceTags( template, { user: { firstname: 'Bob', lastname: 'Smith' } } ) @replaceTags: (template, objects) -> template = template.replace( /#\{\s{0,2}(.+?)\s{0,2}\}/g, (index, key) -> + key = key.replace(/<.+?>/g, '') levels = key.split(/\./) dataRef = objects for level in levels diff --git a/app/assets/javascripts/app/lib/base/highlight.pack.js b/app/assets/javascripts/app/lib/base/highlight.pack.js index 302535e3d..fc4c31799 100644 --- a/app/assets/javascripts/app/lib/base/highlight.pack.js +++ b/app/assets/javascripts/app/lib/base/highlight.pack.js @@ -1 +1,2 @@ -!function(e){"undefined"!=typeof exports?e(exports):(window.hljs=e({}),"function"==typeof define&&define.amd&&define("hljs",[],function(){return window.hljs}))}(function(e){function n(e){return e.replace(/&/gm,"&").replace(//gm,">")}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0==t.index}function a(e){return/^(no-?highlight|plain|text)$/i.test(e)}function i(e){var n,t,r,i=e.className+" ";if(i+=e.parentNode?e.parentNode.className:"",t=/\blang(?:uage)?-([\w-]+)\b/i.exec(i))return w(t[1])?t[1]:"no-highlight";for(i=i.split(/\s+/),n=0,r=i.length;r>n;n++)if(w(i[n])||a(i[n]))return i[n]}function o(e,n){var t,r={};for(t in e)r[t]=e[t];if(n)for(t in n)r[t]=n[t];return r}function u(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3==i.nodeType?a+=i.nodeValue.length:1==i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function c(e,r,a){function i(){return e.length&&r.length?e[0].offset!=r[0].offset?e[0].offset"}function u(e){l+=""}function c(e){("start"==e.event?o:u)(e.node)}for(var s=0,l="",f=[];e.length||r.length;){var g=i();if(l+=n(a.substr(s,g[0].offset-s)),s=g[0].offset,g==e){f.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g==e&&g.length&&g[0].offset==s);f.reverse().forEach(o)}else"start"==g[0].event?f.push(g[0].node):f.pop(),c(g.splice(0,1)[0])}return l+n(a.substr(s))}function s(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var u={},c=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");u[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?c("keyword",a.k):Object.keys(a.k).forEach(function(e){c(e,a.k[e])}),a.k=u}a.lR=t(a.l||/\b\w+\b/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),void 0===a.r&&(a.r=1),a.c||(a.c=[]);var s=[];a.c.forEach(function(e){e.v?e.v.forEach(function(n){s.push(o(e,n))}):s.push("self"==e?a:e)}),a.c=s,a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var l=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=l.length?t(l.join("|"),!0):{exec:function(){return null}}}}r(e)}function l(e,t,a,i){function o(e,n){for(var t=0;t";return i+=e+'">',i+n+o}function p(){if(!L.k)return n(M);var e="",t=0;L.lR.lastIndex=0;for(var r=L.lR.exec(M);r;){e+=n(M.substr(t,r.index-t));var a=g(L,r);a?(B+=a[1],e+=h(a[0],n(r[0]))):e+=n(r[0]),t=L.lR.lastIndex,r=L.lR.exec(M)}return e+n(M.substr(t))}function d(){var e="string"==typeof L.sL;if(e&&!x[L.sL])return n(M);var t=e?l(L.sL,M,!0,y[L.sL]):f(M,L.sL.length?L.sL:void 0);return L.r>0&&(B+=t.r),e&&(y[L.sL]=t.top),h(t.language,t.value,!1,!0)}function b(){return void 0!==L.sL?d():p()}function v(e,t){var r=e.cN?h(e.cN,"",!0):"";e.rB?(k+=r,M=""):e.eB?(k+=n(t)+r,M=""):(k+=r,M=t),L=Object.create(e,{parent:{value:L}})}function m(e,t){if(M+=e,void 0===t)return k+=b(),0;var r=o(t,L);if(r)return k+=b(),v(r,t),r.rB?0:t.length;var a=u(L,t);if(a){var i=L;i.rE||i.eE||(M+=t),k+=b();do L.cN&&(k+=""),B+=L.r,L=L.parent;while(L!=a.parent);return i.eE&&(k+=n(t)),M="",a.starts&&v(a.starts,""),i.rE?0:t.length}if(c(t,L))throw new Error('Illegal lexeme "'+t+'" for mode "'+(L.cN||"")+'"');return M+=t,t.length||1}var N=w(e);if(!N)throw new Error('Unknown language: "'+e+'"');s(N);var R,L=i||N,y={},k="";for(R=L;R!=N;R=R.parent)R.cN&&(k=h(R.cN,"",!0)+k);var M="",B=0;try{for(var C,j,I=0;;){if(L.t.lastIndex=I,C=L.t.exec(t),!C)break;j=m(t.substr(I,C.index-I),C[0]),I=C.index+j}for(m(t.substr(I)),R=L;R.parent;R=R.parent)R.cN&&(k+="");return{r:B,value:k,language:e,top:L}}catch(O){if(-1!=O.message.indexOf("Illegal"))return{r:0,value:n(t)};throw O}}function f(e,t){t=t||E.languages||Object.keys(x);var r={r:0,value:n(e)},a=r;return t.forEach(function(n){if(w(n)){var t=l(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}}),a.language&&(r.second_best=a),r}function g(e){return E.tabReplace&&(e=e.replace(/^((<[^>]+>|\t)+)/gm,function(e,n){return n.replace(/\t/g,E.tabReplace)})),E.useBR&&(e=e.replace(/\n/g,"
")),e}function h(e,n,t){var r=n?R[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function p(e){var n=i(e);if(!a(n)){var t;E.useBR?(t=document.createElementNS("http://www.w3.org/1999/xhtml","div"),t.innerHTML=e.innerHTML.replace(/\n/g,"").replace(//g,"\n")):t=e;var r=t.textContent,o=n?l(n,r,!0):f(r),s=u(t);if(s.length){var p=document.createElementNS("http://www.w3.org/1999/xhtml","div");p.innerHTML=o.value,o.value=c(s,u(p),r)}o.value=g(o.value),e.innerHTML=o.value,e.className=h(e.className,n,o.language),e.result={language:o.language,re:o.r},o.second_best&&(e.second_best={language:o.second_best.language,re:o.second_best.r})}}function d(e){E=o(E,e)}function b(){if(!b.called){b.called=!0;var e=document.querySelectorAll("pre code");Array.prototype.forEach.call(e,p)}}function v(){addEventListener("DOMContentLoaded",b,!1),addEventListener("load",b,!1)}function m(n,t){var r=x[n]=t(e);r.aliases&&r.aliases.forEach(function(e){R[e]=n})}function N(){return Object.keys(x)}function w(e){return e=(e||"").toLowerCase(),x[e]||x[R[e]]}var E={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0},x={},R={};return e.highlight=l,e.highlightAuto=f,e.fixMarkup=g,e.highlightBlock=p,e.configure=d,e.initHighlighting=b,e.initHighlightingOnLoad=v,e.registerLanguage=m,e.listLanguages=N,e.getLanguage=w,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|like)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e});hljs.registerLanguage("css",function(e){var c="[a-zA-Z-][a-zA-Z0-9_-]*",a={cN:"function",b:c+"\\(",rB:!0,eE:!0,e:"\\("},r={cN:"rule",b:/[A-Z\_\.\-]+\s*:/,rB:!0,e:";",eW:!0,c:[{cN:"attribute",b:/\S/,e:":",eE:!0,starts:{cN:"value",eW:!0,eE:!0,c:[a,e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"hexcolor",b:"#[0-9A-Fa-f]+"},{cN:"important",b:"!important"}]}}]};return{cI:!0,i:/[=\/|'\$]/,c:[e.CBCM,{cN:"id",b:/\#[A-Za-z0-9_-]+/},{cN:"class",b:/\.[A-Za-z0-9_-]+/},{cN:"attr_selector",b:/\[/,e:/\]/,i:"$"},{cN:"pseudo",b:/:(:)?[a-zA-Z0-9\_\-\+\(\)"']+/},{cN:"at_rule",b:"@(font-face|page)",l:"[a-z-]+",k:"font-face page"},{cN:"at_rule",b:"@",e:"[{;]",c:[{cN:"keyword",b:/\S+/},{b:/\s/,eW:!0,eE:!0,r:0,c:[a,e.ASM,e.QSM,e.CSSNM]}]},{cN:"tag",b:c,r:0},{cN:"rules",b:"{",e:"}",i:/\S/,c:[e.CBCM,r]}]}});hljs.registerLanguage("scss",function(e){var t="[a-zA-Z-][a-zA-Z0-9_-]*",i={cN:"variable",b:"(\\$"+t+")\\b"},r={cN:"function",b:t+"\\(",rB:!0,eE:!0,e:"\\("},o={cN:"hexcolor",b:"#[0-9A-Fa-f]+"};({cN:"attribute",b:"[A-Z\\_\\.\\-]+",e:":",eE:!0,i:"[^\\s]",starts:{cN:"value",eW:!0,eE:!0,c:[r,o,e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"important",b:"!important"}]}});return{cI:!0,i:"[=/|']",c:[e.CLCM,e.CBCM,r,{cN:"id",b:"\\#[A-Za-z0-9_-]+",r:0},{cN:"class",b:"\\.[A-Za-z0-9_-]+",r:0},{cN:"attr_selector",b:"\\[",e:"\\]",i:"$"},{cN:"tag",b:"\\b(a|abbr|acronym|address|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|div|dl|dt|em|embed|fieldset|figcaption|figure|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|keygen|label|legend|li|link|map|mark|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|samp|script|section|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video)\\b",r:0},{cN:"pseudo",b:":(visited|valid|root|right|required|read-write|read-only|out-range|optional|only-of-type|only-child|nth-of-type|nth-last-of-type|nth-last-child|nth-child|not|link|left|last-of-type|last-child|lang|invalid|indeterminate|in-range|hover|focus|first-of-type|first-line|first-letter|first-child|first|enabled|empty|disabled|default|checked|before|after|active)"},{cN:"pseudo",b:"::(after|before|choices|first-letter|first-line|repeat-index|repeat-item|selection|value)"},i,{cN:"attribute",b:"\\b(z-index|word-wrap|word-spacing|word-break|width|widows|white-space|visibility|vertical-align|unicode-bidi|transition-timing-function|transition-property|transition-duration|transition-delay|transition|transform-style|transform-origin|transform|top|text-underline-position|text-transform|text-shadow|text-rendering|text-overflow|text-indent|text-decoration-style|text-decoration-line|text-decoration-color|text-decoration|text-align-last|text-align|tab-size|table-layout|right|resize|quotes|position|pointer-events|perspective-origin|perspective|page-break-inside|page-break-before|page-break-after|padding-top|padding-right|padding-left|padding-bottom|padding|overflow-y|overflow-x|overflow-wrap|overflow|outline-width|outline-style|outline-offset|outline-color|outline|orphans|order|opacity|object-position|object-fit|normal|none|nav-up|nav-right|nav-left|nav-index|nav-down|min-width|min-height|max-width|max-height|mask|marks|margin-top|margin-right|margin-left|margin-bottom|margin|list-style-type|list-style-position|list-style-image|list-style|line-height|letter-spacing|left|justify-content|initial|inherit|ime-mode|image-orientation|image-resolution|image-rendering|icon|hyphens|height|font-weight|font-variant-ligatures|font-variant|font-style|font-stretch|font-size-adjust|font-size|font-language-override|font-kerning|font-feature-settings|font-family|font|float|flex-wrap|flex-shrink|flex-grow|flex-flow|flex-direction|flex-basis|flex|filter|empty-cells|display|direction|cursor|counter-reset|counter-increment|content|column-width|column-span|column-rule-width|column-rule-style|column-rule-color|column-rule|column-gap|column-fill|column-count|columns|color|clip-path|clip|clear|caption-side|break-inside|break-before|break-after|box-sizing|box-shadow|box-decoration-break|bottom|border-width|border-top-width|border-top-style|border-top-right-radius|border-top-left-radius|border-top-color|border-top|border-style|border-spacing|border-right-width|border-right-style|border-right-color|border-right|border-radius|border-left-width|border-left-style|border-left-color|border-left|border-image-width|border-image-source|border-image-slice|border-image-repeat|border-image-outset|border-image|border-color|border-collapse|border-bottom-width|border-bottom-style|border-bottom-right-radius|border-bottom-left-radius|border-bottom-color|border-bottom|border|background-size|background-repeat|background-position|background-origin|background-image|background-color|background-clip|background-attachment|background-blend-mode|background|backface-visibility|auto|animation-timing-function|animation-play-state|animation-name|animation-iteration-count|animation-fill-mode|animation-duration|animation-direction|animation-delay|animation|align-self|align-items|align-content)\\b",i:"[^\\s]"},{cN:"value",b:"\\b(whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|underline|transparent|top|thin|thick|text|text-top|text-bottom|tb-rl|table-header-group|table-footer-group|sw-resize|super|strict|static|square|solid|small-caps|separate|se-resize|scroll|s-resize|rtl|row-resize|ridge|right|repeat|repeat-y|repeat-x|relative|progress|pointer|overline|outside|outset|oblique|nowrap|not-allowed|normal|none|nw-resize|no-repeat|no-drop|newspaper|ne-resize|n-resize|move|middle|medium|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|list-item|line|line-through|line-edge|lighter|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline|inline-block|inherit|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|horizontal|hidden|help|hand|groove|fixed|ellipsis|e-resize|double|dotted|distribute|distribute-space|distribute-letter|distribute-all-lines|disc|disabled|default|decimal|dashed|crosshair|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|bolder|bold|block|bidi-override|below|baseline|auto|always|all-scroll|absolute|table|table-cell)\\b"},{cN:"value",b:":",e:";",c:[r,i,o,e.CSSNM,e.QSM,e.ASM,{cN:"important",b:"!important"}]},{cN:"at_rule",b:"@",e:"[{;]",k:"mixin include extend for if else each while charset import debug media page content font-face namespace warn",c:[r,i,e.QSM,e.ASM,o,e.CSSNM,{cN:"preprocessor",b:"\\s[A-Za-z0-9_.-]+",r:0}]}]}});hljs.registerLanguage("xml",function(t){var s="[A-Za-z0-9\\._:-]+",c={b:/<\?(php)?(?!\w)/,e:/\?>/,sL:"php"},e={eW:!0,i:/]+/}]}]}]};return{aliases:["html","xhtml","rss","atom","xsl","plist"],cI:!0,c:[{cN:"doctype",b:"",r:10,c:[{b:"\\[",e:"\\]"}]},t.C("",{r:10}),{cN:"cdata",b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{cN:"tag",b:"|$)",e:">",k:{title:"style"},c:[e],starts:{e:"",rE:!0,sL:"css"}},{cN:"tag",b:"|$)",e:">",k:{title:"script"},c:[e],starts:{e:"",rE:!0,sL:["actionscript","javascript","handlebars"]}},c,{cN:"pi",b:/<\?\w+/,e:/\?>/,r:10},{cN:"tag",b:"",c:[{cN:"title",b:/[^ \/><\n\t]+/,r:0},e]}]}});hljs.registerLanguage("ruby",function(e){var c="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",r="and false then defined module in return redo if BEGIN retry end for true self when next until do begin unless END rescue nil else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",b={cN:"doctag",b:"@[A-Za-z]+"},a={cN:"value",b:"#<",e:">"},n=[e.C("#","$",{c:[b]}),e.C("^\\=begin","^\\=end",{c:[b],r:10}),e.C("^__END__","\\n$")],s={cN:"subst",b:"#\\{",e:"}",k:r},t={cN:"string",c:[e.BE,s],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/`/,e:/`/},{b:"%[qQwWx]?\\(",e:"\\)"},{b:"%[qQwWx]?\\[",e:"\\]"},{b:"%[qQwWx]?{",e:"}"},{b:"%[qQwWx]?<",e:">"},{b:"%[qQwWx]?/",e:"/"},{b:"%[qQwWx]?%",e:"%"},{b:"%[qQwWx]?-",e:"-"},{b:"%[qQwWx]?\\|",e:"\\|"},{b:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/}]},i={cN:"params",b:"\\(",e:"\\)",k:r},d=[t,a,{cN:"class",bK:"class module",e:"$|;",i:/=/,c:[e.inherit(e.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{cN:"inheritance",b:"<\\s*",c:[{cN:"parent",b:"("+e.IR+"::)?"+e.IR}]}].concat(n)},{cN:"function",bK:"def",e:"$|;",c:[e.inherit(e.TM,{b:c}),i].concat(n)},{cN:"constant",b:"(::)?(\\b[A-Z]\\w*(::)?)+",r:0},{cN:"symbol",b:e.UIR+"(\\!|\\?)?:",r:0},{cN:"symbol",b:":",c:[t,{b:c}],r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{b:"("+e.RSR+")\\s*",c:[a,{cN:"regexp",c:[e.BE,s],i:/\n/,v:[{b:"/",e:"/[a-z]*"},{b:"%r{",e:"}[a-z]*"},{b:"%r\\(",e:"\\)[a-z]*"},{b:"%r!",e:"![a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}].concat(n),r:0}].concat(n);s.c=d,i.c=d;var o="[>?]>",l="[\\w#]+\\(\\w+\\):\\d+:\\d+>",u="(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>",N=[{b:/^\s*=>/,cN:"status",starts:{e:"$",c:d}},{cN:"prompt",b:"^("+o+"|"+l+"|"+u+")",starts:{e:"$",c:d}}];return{aliases:["rb","gemspec","podspec","thor","irb"],k:r,i:/\/\*/,c:n.concat(N).concat(d)}});hljs.registerLanguage("coffeescript",function(e){var c={keyword:"in if for while finally new do return else break catch instanceof throw try this switch continue typeof delete debugger super then unless until loop of by when and or is isnt not",literal:"true false null undefined yes no on off",built_in:"npm require console print module global window document"},n="[A-Za-z$_][0-9A-Za-z$_]*",r={cN:"subst",b:/#\{/,e:/}/,k:c},t=[e.BNM,e.inherit(e.CNM,{starts:{e:"(\\s*/)?",r:0}}),{cN:"string",v:[{b:/'''/,e:/'''/,c:[e.BE]},{b:/'/,e:/'/,c:[e.BE]},{b:/"""/,e:/"""/,c:[e.BE,r]},{b:/"/,e:/"/,c:[e.BE,r]}]},{cN:"regexp",v:[{b:"///",e:"///",c:[r,e.HCM]},{b:"//[gim]*",r:0},{b:/\/(?![ *])(\\\/|.)*?\/[gim]*(?=\W|$)/}]},{cN:"property",b:"@"+n},{b:"`",e:"`",eB:!0,eE:!0,sL:"javascript"}];r.c=t;var s=e.inherit(e.TM,{b:n}),i="(\\(.*\\))?\\s*\\B[-=]>",o={cN:"params",b:"\\([^\\(]",rB:!0,c:[{b:/\(/,e:/\)/,k:c,c:["self"].concat(t)}]};return{aliases:["coffee","cson","iced"],k:c,i:/\/\*/,c:t.concat([e.C("###","###"),e.HCM,{cN:"function",b:"^\\s*"+n+"\\s*=\\s*"+i,e:"[-=]>",rB:!0,c:[s,o]},{b:/[:\(,=]\s*/,r:0,c:[{cN:"function",b:i,e:"[-=]>",rB:!0,c:[o]}]},{cN:"class",bK:"class",e:"$",i:/[:="\[\]]/,c:[{bK:"extends",eW:!0,i:/[:="\[\]]/,c:[s]},s]},{cN:"attribute",b:n+":",e:":",rB:!0,rE:!0,r:0}])}});hljs.registerLanguage("javascript",function(e){return{aliases:["js"],k:{keyword:"in of if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as async await",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Promise"},c:[{cN:"pi",r:10,b:/^\s*['"]use (strict|asm)['"]/},e.ASM,e.QSM,{cN:"string",b:"`",e:"`",c:[e.BE,{cN:"subst",b:"\\$\\{",e:"\\}"}]},e.CLCM,e.CBCM,{cN:"number",v:[{b:"\\b(0[bB][01]+)"},{b:"\\b(0[oO][0-7]+)"},{b:e.CNR}],r:0},{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{b:/\s*[);\]]/,r:0,sL:"xml"}],r:0},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,c:[e.CLCM,e.CBCM]}],i:/\[|%/},{b:/\$[(.]/},{b:"\\."+e.IR,r:0},{bK:"import",e:"[;$]",k:"import from as",c:[e.ASM,e.QSM]},{cN:"class",bK:"class",e:/[{;=]/,eE:!0,i:/[:"\[\]]/,c:[{bK:"extends"},e.UTM]}],i:/#/}}); \ No newline at end of file +/*! highlight.js v9.12.0 | BSD3 License | git.io/hljslicense */ +!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs}))}(function(e){function n(e){return e.replace(/&/g,"&").replace(//g,">")}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0===t.index}function a(e){return k.test(e)}function i(e){var n,t,r,i,o=e.className+" ";if(o+=e.parentNode?e.parentNode.className:"",t=B.exec(o))return w(t[1])?t[1]:"no-highlight";for(o=o.split(/\s+/),n=0,r=o.length;r>n;n++)if(i=o[n],a(i)||w(i))return i}function o(e){var n,t={},r=Array.prototype.slice.call(arguments,1);for(n in e)t[n]=e[n];return r.forEach(function(e){for(n in e)t[n]=e[n]}),t}function u(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3===i.nodeType?a+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function c(e,r,a){function i(){return e.length&&r.length?e[0].offset!==r[0].offset?e[0].offset"}function u(e){s+=""}function c(e){("start"===e.event?o:u)(e.node)}for(var l=0,s="",f=[];e.length||r.length;){var g=i();if(s+=n(a.substring(l,g[0].offset)),l=g[0].offset,g===e){f.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g===e&&g.length&&g[0].offset===l);f.reverse().forEach(o)}else"start"===g[0].event?f.push(g[0].node):f.pop(),c(g.splice(0,1)[0])}return s+n(a.substr(l))}function l(e){return e.v&&!e.cached_variants&&(e.cached_variants=e.v.map(function(n){return o(e,{v:null},n)})),e.cached_variants||e.eW&&[o(e)]||[e]}function s(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var o={},u=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");o[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?u("keyword",a.k):x(a.k).forEach(function(e){u(e,a.k[e])}),a.k=o}a.lR=t(a.l||/\w+/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),null==a.r&&(a.r=1),a.c||(a.c=[]),a.c=Array.prototype.concat.apply([],a.c.map(function(e){return l("self"===e?a:e)})),a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var c=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=c.length?t(c.join("|"),!0):{exec:function(){return null}}}}r(e)}function f(e,t,a,i){function o(e,n){var t,a;for(t=0,a=n.c.length;a>t;t++)if(r(n.c[t].bR,e))return n.c[t]}function u(e,n){if(r(e.eR,n)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?u(e.parent,n):void 0}function c(e,n){return!a&&r(n.iR,e)}function l(e,n){var t=N.cI?n[0].toLowerCase():n[0];return e.k.hasOwnProperty(t)&&e.k[t]}function p(e,n,t,r){var a=r?"":I.classPrefix,i='',i+n+o}function h(){var e,t,r,a;if(!E.k)return n(k);for(a="",t=0,E.lR.lastIndex=0,r=E.lR.exec(k);r;)a+=n(k.substring(t,r.index)),e=l(E,r),e?(B+=e[1],a+=p(e[0],n(r[0]))):a+=n(r[0]),t=E.lR.lastIndex,r=E.lR.exec(k);return a+n(k.substr(t))}function d(){var e="string"==typeof E.sL;if(e&&!y[E.sL])return n(k);var t=e?f(E.sL,k,!0,x[E.sL]):g(k,E.sL.length?E.sL:void 0);return E.r>0&&(B+=t.r),e&&(x[E.sL]=t.top),p(t.language,t.value,!1,!0)}function b(){L+=null!=E.sL?d():h(),k=""}function v(e){L+=e.cN?p(e.cN,"",!0):"",E=Object.create(e,{parent:{value:E}})}function m(e,n){if(k+=e,null==n)return b(),0;var t=o(n,E);if(t)return t.skip?k+=n:(t.eB&&(k+=n),b(),t.rB||t.eB||(k=n)),v(t,n),t.rB?0:n.length;var r=u(E,n);if(r){var a=E;a.skip?k+=n:(a.rE||a.eE||(k+=n),b(),a.eE&&(k=n));do E.cN&&(L+=C),E.skip||(B+=E.r),E=E.parent;while(E!==r.parent);return r.starts&&v(r.starts,""),a.rE?0:n.length}if(c(n,E))throw new Error('Illegal lexeme "'+n+'" for mode "'+(E.cN||"")+'"');return k+=n,n.length||1}var N=w(e);if(!N)throw new Error('Unknown language: "'+e+'"');s(N);var R,E=i||N,x={},L="";for(R=E;R!==N;R=R.parent)R.cN&&(L=p(R.cN,"",!0)+L);var k="",B=0;try{for(var M,j,O=0;;){if(E.t.lastIndex=O,M=E.t.exec(t),!M)break;j=m(t.substring(O,M.index),M[0]),O=M.index+j}for(m(t.substr(O)),R=E;R.parent;R=R.parent)R.cN&&(L+=C);return{r:B,value:L,language:e,top:E}}catch(T){if(T.message&&-1!==T.message.indexOf("Illegal"))return{r:0,value:n(t)};throw T}}function g(e,t){t=t||I.languages||x(y);var r={r:0,value:n(e)},a=r;return t.filter(w).forEach(function(n){var t=f(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}),a.language&&(r.second_best=a),r}function p(e){return I.tabReplace||I.useBR?e.replace(M,function(e,n){return I.useBR&&"\n"===e?"
":I.tabReplace?n.replace(/\t/g,I.tabReplace):""}):e}function h(e,n,t){var r=n?L[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function d(e){var n,t,r,o,l,s=i(e);a(s)||(I.useBR?(n=document.createElementNS("http://www.w3.org/1999/xhtml","div"),n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(//g,"\n")):n=e,l=n.textContent,r=s?f(s,l,!0):g(l),t=u(n),t.length&&(o=document.createElementNS("http://www.w3.org/1999/xhtml","div"),o.innerHTML=r.value,r.value=c(t,u(o),l)),r.value=p(r.value),e.innerHTML=r.value,e.className=h(e.className,s,r.language),e.result={language:r.language,re:r.r},r.second_best&&(e.second_best={language:r.second_best.language,re:r.second_best.r}))}function b(e){I=o(I,e)}function v(){if(!v.called){v.called=!0;var e=document.querySelectorAll("pre code");E.forEach.call(e,d)}}function m(){addEventListener("DOMContentLoaded",v,!1),addEventListener("load",v,!1)}function N(n,t){var r=y[n]=t(e);r.aliases&&r.aliases.forEach(function(e){L[e]=n})}function R(){return x(y)}function w(e){return e=(e||"").toLowerCase(),y[e]||y[L[e]]}var E=[],x=Object.keys,y={},L={},k=/^(no-?highlight|plain|text)$/i,B=/\blang(?:uage)?-([\w-]+)\b/i,M=/((^(<[^>]+>|\t|)+|(?:\n)))/gm,C="",I={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0};return e.highlight=f,e.highlightAuto=g,e.fixMarkup=p,e.highlightBlock=d,e.configure=b,e.initHighlighting=v,e.initHighlightingOnLoad=m,e.registerLanguage=N,e.listLanguages=R,e.getLanguage=w,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e.METHOD_GUARD={b:"\\.\\s*"+e.UIR,r:0},e});hljs.registerLanguage("ruby",function(e){var b="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",r={keyword:"and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",literal:"true false nil"},c={cN:"doctag",b:"@[A-Za-z]+"},a={b:"#<",e:">"},s=[e.C("#","$",{c:[c]}),e.C("^\\=begin","^\\=end",{c:[c],r:10}),e.C("^__END__","\\n$")],n={cN:"subst",b:"#\\{",e:"}",k:r},t={cN:"string",c:[e.BE,n],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/`/,e:/`/},{b:"%[qQwWx]?\\(",e:"\\)"},{b:"%[qQwWx]?\\[",e:"\\]"},{b:"%[qQwWx]?{",e:"}"},{b:"%[qQwWx]?<",e:">"},{b:"%[qQwWx]?/",e:"/"},{b:"%[qQwWx]?%",e:"%"},{b:"%[qQwWx]?-",e:"-"},{b:"%[qQwWx]?\\|",e:"\\|"},{b:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/},{b:/<<(-?)\w+$/,e:/^\s*\w+$/}]},i={cN:"params",b:"\\(",e:"\\)",endsParent:!0,k:r},d=[t,a,{cN:"class",bK:"class module",e:"$|;",i:/=/,c:[e.inherit(e.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{b:"<\\s*",c:[{b:"("+e.IR+"::)?"+e.IR}]}].concat(s)},{cN:"function",bK:"def",e:"$|;",c:[e.inherit(e.TM,{b:b}),i].concat(s)},{b:e.IR+"::"},{cN:"symbol",b:e.UIR+"(\\!|\\?)?:",r:0},{cN:"symbol",b:":(?!\\s)",c:[t,{b:b}],r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{cN:"params",b:/\|/,e:/\|/,k:r},{b:"("+e.RSR+"|unless)\\s*",k:"unless",c:[a,{cN:"regexp",c:[e.BE,n],i:/\n/,v:[{b:"/",e:"/[a-z]*"},{b:"%r{",e:"}[a-z]*"},{b:"%r\\(",e:"\\)[a-z]*"},{b:"%r!",e:"![a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}].concat(s),r:0}].concat(s);n.c=d,i.c=d;var l="[>?]>",o="[\\w#]+\\(\\w+\\):\\d+:\\d+>",u="(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>",w=[{b:/^\s*=>/,starts:{e:"$",c:d}},{cN:"meta",b:"^("+l+"|"+o+"|"+u+")",starts:{e:"$",c:d}}];return{aliases:["rb","gemspec","podspec","thor","irb"],k:r,i:/\/\*/,c:s.concat(w).concat(d)}});hljs.registerLanguage("bash",function(e){var t={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},s={cN:"string",b:/"/,e:/"/,c:[e.BE,t,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},a={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/\b-?[a-z\._]+\b/,k:{keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"meta",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:!0,c:[e.inherit(e.TM,{b:/\w[\w\d_]*/})],r:0},e.HCM,s,a,t]}});hljs.registerLanguage("javascript",function(e){var r="[A-Za-z$_][0-9A-Za-z$_]*",t={keyword:"in of if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as async await static import from as",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Promise"},a={cN:"number",v:[{b:"\\b(0[bB][01]+)"},{b:"\\b(0[oO][0-7]+)"},{b:e.CNR}],r:0},n={cN:"subst",b:"\\$\\{",e:"\\}",k:t,c:[]},c={cN:"string",b:"`",e:"`",c:[e.BE,n]};n.c=[e.ASM,e.QSM,c,a,e.RM];var s=n.c.concat([e.CBCM,e.CLCM]);return{aliases:["js","jsx"],k:t,c:[{cN:"meta",r:10,b:/^\s*['"]use (strict|asm)['"]/},{cN:"meta",b:/^#!/,e:/$/},e.ASM,e.QSM,c,e.CLCM,e.CBCM,a,{b:/[{,]\s*/,r:0,c:[{b:r+"\\s*:",rB:!0,r:0,c:[{cN:"attr",b:r,r:0}]}]},{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{cN:"function",b:"(\\(.*?\\)|"+r+")\\s*=>",rB:!0,e:"\\s*=>",c:[{cN:"params",v:[{b:r},{b:/\(\s*\)/},{b:/\(/,e:/\)/,eB:!0,eE:!0,k:t,c:s}]}]},{b://,sL:"xml",c:[{b:/<\w+\s*\/>/,skip:!0},{b:/<\w+/,e:/(\/\w+|\w+\/)>/,skip:!0,c:[{b:/<\w+\s*\/>/,skip:!0},"self"]}]}],r:0},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:r}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,c:s}],i:/\[|%/},{b:/\$[(.]/},e.METHOD_GUARD,{cN:"class",bK:"class",e:/[{;=]/,eE:!0,i:/[:"\[\]]/,c:[{bK:"extends"},e.UTM]},{bK:"constructor",e:/\{/,eE:!0}],i:/#(?!!)/}});hljs.registerLanguage("css",function(e){var c="[a-zA-Z-][a-zA-Z0-9_-]*",t={b:/[A-Z\_\.\-]+\s*:/,rB:!0,e:";",eW:!0,c:[{cN:"attribute",b:/\S/,e:":",eE:!0,starts:{eW:!0,eE:!0,c:[{b:/[\w-]+\(/,rB:!0,c:[{cN:"built_in",b:/[\w-]+/},{b:/\(/,e:/\)/,c:[e.ASM,e.QSM]}]},e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"number",b:"#[0-9A-Fa-f]+"},{cN:"meta",b:"!important"}]}}]};return{cI:!0,i:/[=\/|'\$]/,c:[e.CBCM,{cN:"selector-id",b:/#[A-Za-z0-9_-]+/},{cN:"selector-class",b:/\.[A-Za-z0-9_-]+/},{cN:"selector-attr",b:/\[/,e:/\]/,i:"$"},{cN:"selector-pseudo",b:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{b:"@(font-face|page)",l:"[a-z-]+",k:"font-face page"},{b:"@",e:"[{;]",i:/:/,c:[{cN:"keyword",b:/\w+/},{b:/\s/,eW:!0,eE:!0,r:0,c:[e.ASM,e.QSM,e.CSSNM]}]},{cN:"selector-tag",b:c,r:0},{b:"{",e:"}",i:/\S/,c:[e.CBCM,t]}]}});hljs.registerLanguage("xml",function(s){var e="[A-Za-z0-9\\._:-]+",t={eW:!0,i:/`]+/}]}]}]};return{aliases:["html","xhtml","rss","atom","xjb","xsd","xsl","plist"],cI:!0,c:[{cN:"meta",b:"",r:10,c:[{b:"\\[",e:"\\]"}]},s.C("",{r:10}),{b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{b:/<\?(php)?/,e:/\?>/,sL:"php",c:[{b:"/\\*",e:"\\*/",skip:!0}]},{cN:"tag",b:"|$)",e:">",k:{name:"style"},c:[t],starts:{e:"",rE:!0,sL:["css","xml"]}},{cN:"tag",b:"|$)",e:">",k:{name:"script"},c:[t],starts:{e:"",rE:!0,sL:["actionscript","javascript","handlebars","xml"]}},{cN:"meta",v:[{b:/<\?xml/,e:/\?>/,r:10},{b:/<\?\w+/,e:/\?>/}]},{cN:"tag",b:"",c:[{cN:"name",b:/[^\/><\s]+/,r:0},t]}]}}); \ No newline at end of file diff --git a/app/assets/javascripts/app/lib/base/jquery.contenteditable.js b/app/assets/javascripts/app/lib/base/jquery.contenteditable.js index 2a1994828..a82a036dc 100644 --- a/app/assets/javascripts/app/lib/base/jquery.contenteditable.js +++ b/app/assets/javascripts/app/lib/base/jquery.contenteditable.js @@ -88,7 +88,7 @@ // handle enter this.$element.on('keydown', function (e) { _this.log('keydown', e.keyCode) - if ( _this.preventInput ) { + if (_this.preventInput) { this.log('preventInput', _this.preventInput) return } @@ -97,18 +97,29 @@ if (e.keyCode === 13) { // disbale multi line - if ( !_this.options.multiline ) { + if (!_this.options.multiline) { e.preventDefault() return } // break
after enter on empty line sel = window.getSelection() - node = $(sel.anchorNode) - if (node.parent().is('blockquote')) { + if (sel) { + node = $(sel.anchorNode) + if (node && node.parent() && node.parent().is('blockquote')) { + e.preventDefault() + document.execCommand('Insertparagraph') + document.execCommand('Outdent') + return + } + } + + // behavior to enter new line on alt+enter + // on alt + enter not realy newline is fired, to make + // it compat. to other systems, do it here + if (!e.shiftKey && e.altKey && !e.ctrlKey && !e.metaKey) { e.preventDefault() - document.execCommand('Insertparagraph') - document.execCommand('Outdent') + _this.paste('

') return } } @@ -237,7 +248,7 @@ // limit check if ( !_this.allowKey(e) ) { - if ( !_this.maxLengthOk( 1 ) ) { + if ( !_this.maxLengthOk(1) ) { e.preventDefault() return } @@ -295,7 +306,7 @@ else { img = "" } - document.execCommand('insertHTML', false, img) + _this.paste(img) } // resize if to big @@ -367,13 +378,7 @@ text = App.Utils.removeEmptyLines(text) _this.log('insert', text) - // as fallback, insert html via pasteHtmlAtCaret (for IE 11 and lower) - if (docType == 'text3') { - _this.pasteHtmlAtCaret(text) - } - else { - document.execCommand('insertHTML', false, text) - } + _this.paste(text) return true }) @@ -533,37 +538,6 @@ return this.$element.html().trim() } - // taken from https://stackoverflow.com/questions/6690752/insert-html-at-caret-in-a-contenteditable-div/6691294#6691294 - Plugin.prototype.pasteHtmlAtCaret = function(html) { - var sel, range; - if (window.getSelection) { - sel = window.getSelection() - if (sel.getRangeAt && sel.rangeCount) { - range = sel.getRangeAt(0) - range.deleteContents() - - var el = document.createElement('div') - el.innerHTML = html; - var frag = document.createDocumentFragment(), node, lastNode - while ( (node = el.firstChild) ) { - lastNode = frag.appendChild(node) - } - range.insertNode(frag) - - if (lastNode) { - range = range.cloneRange() - range.setStartAfter(lastNode) - range.collapse(true) - sel.removeAllRanges() - sel.addRange(range) - } - } - } - else if (document.selection && document.selection.type != 'Control') { - document.selection.createRange().pasteHTML(html) - } - } - // log method Plugin.prototype.log = function() { if (App && App.Log) { @@ -574,7 +548,30 @@ } } - $.fn[pluginName] = function ( options ) { + // paste some content + Plugin.prototype.paste = function(string) { + var isIE11 = !!window.MSInputMethodContext && !!document.documentMode; + + // IE <= 10 + if (document.selection && document.selection.createRange) { + var range = document.selection.createRange() + if (range.pasteHTML) { + range.pasteHTML(string) + } + } + // IE == 11 + else if (isIE11 && document.getSelection) { + var range = document.getSelection().getRangeAt(0) + var nnode = document.createElement('div') + range.surroundContents(nnode) + nnode.innerHTML = string + } + else { + document.execCommand('insertHTML', false, string) + } + } + + $.fn[pluginName] = function (options) { return this.each(function () { if (!$.data(this, 'plugin_' + pluginName)) { $.data(this, 'plugin_' + pluginName, @@ -586,6 +583,9 @@ // get correct val if textbox $.fn.ceg = function() { var plugin = $.data(this[0], 'plugin_' + pluginName) + if (!plugin) { + return + } return plugin.value() } diff --git a/app/assets/javascripts/app/lib/base/jquery.textmodule.js b/app/assets/javascripts/app/lib/base/jquery.textmodule.js index 492229a00..738d87249 100644 --- a/app/assets/javascripts/app/lib/base/jquery.textmodule.js +++ b/app/assets/javascripts/app/lib/base/jquery.textmodule.js @@ -43,17 +43,21 @@ this.$element.on('keydown', function (e) { - // esc - if (e.keyCode === 27) { - _this.close() - } - // navigate through item if (_this.isActive()) { + // esc + if (e.keyCode === 27) { + e.preventDefault() + e.stopPropagation() + _this.close() + return + } + // enter if (e.keyCode === 13) { e.preventDefault() + e.stopPropagation() var id = _this.$widget.find('.dropdown-menu li.is-active').data('id') // as fallback use hovered element @@ -72,12 +76,14 @@ // arrow keys left/right if (e.keyCode === 37 || e.keyCode === 39) { e.preventDefault() + e.stopPropagation() return } // up or down if (e.keyCode === 38 || e.keyCode === 40) { e.preventDefault() + e.stopPropagation() var active = _this.$widget.find('.dropdown-menu li.is-active') active.removeClass('is-active') @@ -92,6 +98,9 @@ var menu = _this.$widget.find('.dropdown-menu') + if (!active.get(0)) { + return + } if (active.position().top < 0) { // scroll up menu.scrollTop( menu.scrollTop() + active.position().top ) @@ -102,7 +111,11 @@ menu.scrollTop( menu.scrollTop() + invisibleHeight ) } } + } + // esc + if (e.keyCode === 27) { + _this.close() } }) @@ -180,14 +193,14 @@ Plugin.prototype.renderBase = function() { this.$element.after('
    ') this.$widget = this.$element.next() - this.$widget.on('click', 'li', $.proxy(this.onEntryClick, this)) + this.$widget.on('mousedown', 'li', $.proxy(this.onEntryClick, this)) this.$widget.on('mouseenter', 'li', $.proxy(this.onMouseEnter, this)) } // set height of widget Plugin.prototype.movePosition = function() { if (!this._position) return - var height = this.$element.height() + 2 + var height = this.$element.outerHeight() + 2 var widgetHeight = this.$widget.find('ul').height() //+ 60 // + height var top = -( widgetHeight + height ) + this._position.top var left = this._position.left - 6 @@ -250,9 +263,21 @@ // paste some content Plugin.prototype.paste = function(string) { - if (document.selection) { // IE + var isIE11 = !!window.MSInputMethodContext && !!document.documentMode; + + // IE <= 10 + if (document.selection && document.selection.createRange) { var range = document.selection.createRange() - range.pasteHTML(string) + if (range.pasteHTML) { + range.pasteHTML(string) + } + } + // IE == 11 + else if (isIE11 && document.getSelection) { + var range = document.getSelection().getRangeAt(0) + var nnode = document.createElement('div') + range.surroundContents(nnode) + nnode.innerHTML = string } else { document.execCommand('insertHTML', false, string) @@ -295,14 +320,7 @@ // for chrome, insert space again if (start) { if (spacerChar === ' ') { - string = " " - if (document.selection) { // IE - var range = document.selection.createRange() - range.pasteHTML(string) - } - else { - document.execCommand('insertHTML', false, string) - } + this.paste(' ') } } } @@ -313,6 +331,7 @@ } Plugin.prototype.onEntryClick = function(event) { + event.preventDefault() var id = $(event.target).data('id') this.take(id) } @@ -325,7 +344,7 @@ } for (var i = 0; i < this.collection.length; i++) { var item = this.collection[i] - if ( item.id == id ) { + if (item.id == id) { var content = item.content this.cutInput() this.paste(content) diff --git a/app/assets/javascripts/app/lib/bootstrap/modal.js b/app/assets/javascripts/app/lib/bootstrap/modal.js index c9ddc93dc..4e202316c 100644 --- a/app/assets/javascripts/app/lib/bootstrap/modal.js +++ b/app/assets/javascripts/app/lib/bootstrap/modal.js @@ -10,6 +10,8 @@ modified by Felix Jan-2014 - add this.$body = $(options.container || document.body) - adjustBackdrop: also adopt left, top and width from $body + modified by Felix Jul-2017 + - add rtl support */ @@ -244,6 +246,10 @@ .css('height', 0) .css('height', this.$element[0].scrollHeight) + if(App.i18n.dir() == 'rtl'){ + this.$backdrop.css('right', 'auto') + } + if(this.scrollbarWidth){ this.$backdrop.css('width', this.$body.width() - this.scrollbarWidth) } @@ -251,14 +257,22 @@ Modal.prototype.adjustDialog = function () { var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight - - this.$element.css({ + var css = { left: this.$body.offset().left, top: this.$body.offset().top, width: this.$body.width(), paddingLeft: !this.bodyIsOverflowing && modalIsOverflowing ? this.scrollbarWidth : '', paddingRight: this.bodyIsOverflowing && !modalIsOverflowing ? this.scrollbarWidth : '' - }) + } + + if(App.i18n.dir() == 'rtl'){ + css.right = 'auto' + var paddingLeft = css.paddingLeft + css.paddingLeft = css.paddingRight + css.paddingRight = paddingLeft + } + + this.$element.css(css) } Modal.prototype.resetAdjustments = function () { diff --git a/app/assets/javascripts/app/models/_application_model.coffee b/app/assets/javascripts/app/models/_application_model.coffee index f7c708b78..49ad8aac9 100644 --- a/app/assets/javascripts/app/models/_application_model.coffee +++ b/app/assets/javascripts/app/models/_application_model.coffee @@ -32,6 +32,10 @@ class App.Model extends Spine.Model return @title if @subject return @subject + if @phone + return @phone + if @login + return @login return '???' displayNameLong: -> @@ -57,6 +61,12 @@ class App.Model extends Spine.Model return @email if @title return @title + if @subject + return @subject + if @phone + return @phone + if @login + return @login return '???' icon: (user) -> @@ -165,6 +175,31 @@ class App.Model extends Spine.Model ### +set new attributes of model (remove already available attributes) + + App.Model.attributesSet(attributes) + + ### + + @attributesSet: (attributes) -> + + configure_attributes = App[ @.className ].configure_attributes + attributesNew = [] + for localAttribute in configure_attributes + found = false + for attribute in attributes + if attribute.name is localAttribute.name + found = true + break + if !found + attributesNew.push localAttribute + for attribute in attributes + App[@.className].attributes.push attribute.name + attributesNew.push attribute + App[ @.className ].configure_attributes = attributesNew + + ### + attributes = App.Model.attributesGet(optionalScreen, optionalAttributesList) returns diff --git a/app/assets/javascripts/app/models/job.coffee b/app/assets/javascripts/app/models/job.coffee index 996e3dfc7..d061c2db0 100644 --- a/app/assets/javascripts/app/models/job.coffee +++ b/app/assets/javascripts/app/models/job.coffee @@ -6,7 +6,7 @@ class App.Job extends App.Model { name: 'name', display: 'Name', tag: 'input', type: 'text', limit: 100, null: false }, { name: 'timeplan', display: 'When should the job run?', tag: 'timer', null: true }, { name: 'condition', display: 'Conditions for effected objects', tag: 'ticket_selector', null: true }, - { name: 'perform', display: 'Execute changes on objects', tag: 'ticket_perform_action', null: true, notification: true }, + { name: 'perform', display: 'Execute changes on objects', tag: 'ticket_perform_action', null: true, notification: true, ticket_delete: true }, { name: 'disable_notification', display: 'Disable Notifications', tag: 'boolean', default: true }, { name: 'note', display: 'Note', tag: 'textarea', note: 'Notes are visible to agents only, never to customers.', limit: 250, null: true }, { name: 'active', display: 'Active', tag: 'active', default: true }, diff --git a/app/assets/javascripts/app/models/overview.coffee b/app/assets/javascripts/app/models/overview.coffee index 144f228f0..dd8c0b2e9 100644 --- a/app/assets/javascripts/app/models/overview.coffee +++ b/app/assets/javascripts/app/models/overview.coffee @@ -8,6 +8,7 @@ class App.Overview extends App.Model { name: 'role_ids', display: 'Available for Role', tag: 'column_select', multiple: true, null: false, relation: 'Role', translate: true }, { name: 'user_ids', display: 'Available for User', tag: 'column_select', multiple: true, null: true, relation: 'User', sortBy: 'firstname' }, { name: 'organization_shared', display: 'Only available for Users with shared Organization', tag: 'select', options: { true: 'yes', false: 'no' }, default: false, null: true }, + { name: 'out_of_office', display: 'Only available for Users which are replacements for other users.', tag: 'select', options: { true: 'yes', false: 'no' }, default: false, null: true }, { name: 'condition', display: 'Conditions for shown Tickets', tag: 'ticket_selector', null: false }, { name: 'prio', display: 'Prio', readonly: 1 }, { @@ -72,4 +73,4 @@ Sie können auch individuelle Übersichten für einzelne Agenten oder agenten Gr ''' uiUrl: -> - '#ticket/view/' + @link + "#ticket/view/#{@link}" diff --git a/app/assets/javascripts/app/models/postmaster_filter.coffee b/app/assets/javascripts/app/models/postmaster_filter.coffee index 30c2fa5b3..2ebddcc10 100644 --- a/app/assets/javascripts/app/models/postmaster_filter.coffee +++ b/app/assets/javascripts/app/models/postmaster_filter.coffee @@ -6,7 +6,7 @@ class App.PostmasterFilter extends App.Model @configure_attributes = [ { name: 'name', display: 'Name', tag: 'input', type: 'text', limit: 250, 'null': false }, { name: 'channel', display: 'Channel', type: 'input', readonly: 1 }, - { name: 'match', display: 'Match all of the following', tag: 'postmaster_match' }, + { name: 'match', display: 'Match all of the following', tag: 'postmaster_match', note: 'You can use regular expression by using "regex:your_reg_exp".' }, { name: 'perform', display: 'Perform action of the following', tag: 'postmaster_set' }, { name: 'note', display: 'Note', tag: 'textarea', limit: 250, null: true }, { name: 'updated_at', display: 'Updated', tag: 'datetime', readonly: 1 }, diff --git a/app/assets/javascripts/app/models/user.coffee b/app/assets/javascripts/app/models/user.coffee index ae3641619..7d357369c 100644 --- a/app/assets/javascripts/app/models/user.coffee +++ b/app/assets/javascripts/app/models/user.coffee @@ -53,8 +53,14 @@ class App.User extends App.Model cssClass += ' ' if cssClass cssClass += "size-#{ size }" + if @active is false + cssClass += ' avatar--inactive' + + if @isOutOfOffice() + cssClass += ' avatar--vacation' + if placement - placement = " data-placement='#{ placement }'" + placement = " data-placement='#{placement}'" if !avatar if type is 'personal' @@ -104,6 +110,19 @@ class App.User extends App.Model vip: vip url: @imageUrl() + isOutOfOffice: -> + return false if @out_of_office isnt true + start_time = @out_of_office_start_at + return false if !start_time + end_time = @out_of_office_end_at + return false if !end_time + start_time = new Date(Date.parse(start_time)) + end_time = new Date(Date.parse(end_time)) + now = new Date((new Date).toDateString()) + if start_time <= now && end_time >= now + return true + false + imageUrl: -> return if !@image # set image url @@ -237,3 +256,16 @@ class App.User extends App.Model break return access if access false + + @outOfOfficeTextPlaceholder: -> + today = new Date() + outOfOfficeText = 'Christmas holiday' + if today.getMonth() < 3 + outOfOfficeText = 'Easter holiday' + else if today.getMonth() < 9 + outOfOfficeText = 'Summer holiday' + outOfOfficeText + + outOfOfficeText: -> + return @preferences.out_of_office_text if !_.isEmpty(@preferences.out_of_office_text) + App.User.outOfOfficeTextPlaceholder() diff --git a/app/assets/javascripts/app/views/channel/chat.jst.eco b/app/assets/javascripts/app/views/channel/chat.jst.eco index cfdd447af..310183074 100644 --- a/app/assets/javascripts/app/views/channel/chat.jst.eco +++ b/app/assets/javascripts/app/views/channel/chat.jst.eco @@ -142,7 +142,7 @@

    <%- @T('Automatically show chat') %> (<%- @T('default') %>)

    <%- @T('The chat will show up once the connection to the server got established and if there is someone online to chat with.') %>

    - 
    <script src="<%= @baseurl %>/assets/chat/chat.min.js"></script>
+  
    <script src="<%= @baseurl %>/assets/chat/chat.min.js"></script>
 <script>
 $(function() {
   new ZammadChat({
@@ -153,7 +153,7 @@ $(function() {
 
   
    <%- @T('Manually open chat') %>
    
   
    <%- @T('If you want to open the chat by the press of a button set the option §show§ to §false§ and add the class §open-zammad-chat§ to the button.') %>
    
-  
    <button class="open-zammad-chat">Chat with us</button>
+  
    <button class="open-zammad-chat">Chat with us</button>
 
 <script src="<%= @baseurl %>/assets/chat/chat.min.js"></script>
 <script>
diff --git a/app/assets/javascripts/app/views/channel/form.jst.eco b/app/assets/javascripts/app/views/channel/form.jst.eco
index f0e412a8f..011c10a8c 100644
--- a/app/assets/javascripts/app/views/channel/form.jst.eco
+++ b/app/assets/javascripts/app/views/channel/form.jst.eco
@@ -126,6 +126,9 @@
       
     
   
+  
    <%- @T('Requirements') %>
    
+  
    <%- @T("Zammad Forms requires jQuery. If you don't already use it on your website include it like this:") %>
    
+  
    <script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
    
 
   
    <%- @T('You need to add the following Javascript code snippet to your web page') %>:
    
 
diff --git a/app/assets/javascripts/app/views/customer_chat/chat_window.jst.eco b/app/assets/javascripts/app/views/customer_chat/chat_window.jst.eco
index 8e6710ef7..1fef2ed9b 100644
--- a/app/assets/javascripts/app/views/customer_chat/chat_window.jst.eco
+++ b/app/assets/javascripts/app/views/customer_chat/chat_window.jst.eco
@@ -26,6 +26,8 @@
   
    
 
 
    
-  
    
+  
    
+    
    
+  
    
   
    <%- @T('Send') %>
    
 
    
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/generic/checkbox.jst.eco b/app/assets/javascripts/app/views/generic/checkbox.jst.eco
index 4576fab6f..8d0412aad 100644
--- a/app/assets/javascripts/app/views/generic/checkbox.jst.eco
+++ b/app/assets/javascripts/app/views/generic/checkbox.jst.eco
@@ -4,7 +4,7 @@
     />
     <%- @Icon('checkbox', 'icon-unchecked') %>
     <%- @Icon('checkbox-checked', 'icon-checked') %>
-    <%= row.name %> <% if row.note: %>- <%= row.note %><% end %>
+    <%= row.name %> <% if row.note: %>- <%- @T(row.note) %><% end %>
   
 <% end %>
 
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/generic/radio.jst.eco b/app/assets/javascripts/app/views/generic/radio.jst.eco
index ea7282ac2..d6576004a 100644
--- a/app/assets/javascripts/app/views/generic/radio.jst.eco
+++ b/app/assets/javascripts/app/views/generic/radio.jst.eco
@@ -1,7 +1,7 @@
 
    
 <% for row in @attribute.options: %>
     
diff --git a/app/assets/javascripts/app/views/generic/sidebar_tabs.jst.eco b/app/assets/javascripts/app/views/generic/sidebar_tabs.jst.eco
index 30a3ada73..d1bd32527 100644
--- a/app/assets/javascripts/app/views/generic/sidebar_tabs.jst.eco
+++ b/app/assets/javascripts/app/views/generic/sidebar_tabs.jst.eco
@@ -11,7 +11,7 @@
   
    
 
    
 <% end %>
-
    
+
    
 <% for item in @items: %>
   
    
     <%- @Icon(item.icon) %>
diff --git a/app/assets/javascripts/app/views/generic/user_permission.jst.eco b/app/assets/javascripts/app/views/generic/user_permission.jst.eco
index b8dd7fd64..64569a55d 100644
--- a/app/assets/javascripts/app/views/generic/user_permission.jst.eco
+++ b/app/assets/javascripts/app/views/generic/user_permission.jst.eco
@@ -18,7 +18,7 @@
     checked<% end %>/>
     <%- @Icon('checkbox', 'icon-unchecked') %>
     <%- @Icon('checkbox-checked', 'icon-checked') %>
-    <%= role.displayName() %> <% if role.note: %>- <%= role.note %><% end %>
+    <%- @T(role.displayName()) %> <% if role.note: %>- <%- @T(role.note) %><% end %>
   
   <% if role.permissions: %>
   <%   for permission in role.permissions: %>
diff --git a/app/assets/javascripts/app/views/getting_started/email.jst.eco b/app/assets/javascripts/app/views/getting_started/email.jst.eco
index e3ef082f8..1d2d0cb50 100644
--- a/app/assets/javascripts/app/views/getting_started/email.jst.eco
+++ b/app/assets/javascripts/app/views/getting_started/email.jst.eco
@@ -63,7 +63,7 @@
   
 
   
    
-    
    
+    
    
       
    <%- @T('Email Inbound') %>
    
       
    
         
diff --git a/app/assets/javascripts/app/views/import/zendesk.jst.eco b/app/assets/javascripts/app/views/import/zendesk.jst.eco
index 72d538d19..eeb7f95c9 100644
--- a/app/assets/javascripts/app/views/import/zendesk.jst.eco
+++ b/app/assets/javascripts/app/views/import/zendesk.jst.eco
@@ -61,6 +61,7 @@
     
    
       
    <%- @T('%s Migration', 'Zendesk') %>
    
       
+      
       
    
         
diff --git a/app/assets/javascripts/app/views/integration/base.jst.eco b/app/assets/javascripts/app/views/integration/base.jst.eco
index 272620104..28b3996bb 100644
--- a/app/assets/javascripts/app/views/integration/base.jst.eco
+++ b/app/assets/javascripts/app/views/integration/base.jst.eco
@@ -10,9 +10,10 @@
 
    
   <% if @description: %>
     <% for item in @description: %>
-      
    <%- @T(item[0], item[1], item[2]) %>
    
+      
    <%- @T(item...) %>
    
     <% end %>
   <% end %>
   
    
+  
    
   
    
 
    
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/integration/exchange.jst.eco b/app/assets/javascripts/app/views/integration/exchange.jst.eco
new file mode 100644
index 000000000..69385e1cf
--- /dev/null
+++ b/app/assets/javascripts/app/views/integration/exchange.jst.eco
@@ -0,0 +1,71 @@
+
    
+
    
+  
    <%- @T('No %s configured.', 'Exchange') %>
    
+  
+
    
+
    
+  
    <%- @T('Settings') %>
    
+  
    
           
    
+    
+      
+        
+    
+      
+        
+        
+          
+          
+  
    <%- @T('Name') %>
+        <%- @T('Value') %>
+    
    <%- @T('Endpoint') %>
+        <%= @config.endpoint %>
+      
    <%- @T('User') %>
+          <%= @config.user %>
+        
    <%- @T('Password') %>
+          <%= @M(@config.password) %>
+    
    
+
+  
    <%- @T('Mapping') %>
    
+
+  
    <%- @T('Folders') %>
    
+  <% if _.isEmpty(@folders): %>
+    
+      
    <%- @T('No Entries') %>
+    
    
+  <% else: %>
+    
+      
+        
+          
+            
+      
+    
    <%- @T('Folder') %>
+        <% for folder_name in @folders: %>
+          
    <%= folder_name %>
+        <% end %>
+      
    
+  <% end %>
+
+  
    <%- @T('User') %>
    
+  <% if _.isEmpty(@config.attributes): %>
+    
+      
    <%- @T('No Entries') %>
+    
    
+  <% else: %>
+    
+      
+        
+          
+            
+      
+    
    <%- @T('Exchange') %>
+          <%- @T('Zammad') %>
+        <% for key, value of @config.attributes: %>
+          
    <%= key %>
+            <%= value %>
+        <% end %>
+      
    
+  <% end %>
+
+  
+
    
diff --git a/app/assets/javascripts/app/views/integration/exchange_last_import.jst.eco b/app/assets/javascripts/app/views/integration/exchange_last_import.jst.eco
new file mode 100644
index 000000000..8323972ad
--- /dev/null
+++ b/app/assets/javascripts/app/views/integration/exchange_last_import.jst.eco
@@ -0,0 +1,54 @@
+
    
+  
    <%- @T('Last sync') %>
    
+  <% if _.isEmpty(@job.started_at): %>
+    <% if @job.result && @job.result.error: %>
+        
+    <% else if @job.result && @job.result.info: %>
+        
+    <% else: %>
+      
    <%- @T('Job is waiting to get started...') %>
    
+    <% end %>
+  <% else: %>
+    <% if @job.finished_at: %>
+      
    <%- @Ttimestamp(@job.started_at) %> - <%- @Ttimestamp(@job.finished_at) %>
    
+      <% if @job.result && @job.result.error: %>
+        
+      <% else if @job.result && @job.result.info: %>
+        
+      <% end %>
+    <% else: %>
+      <% if @job.result && @job.result.error: %>
+        
    <%- @Ttimestamp(@job.started_at) %>
    
+        
+      <% else if !@countDone: %>
+        
    <%- @Ttimestamp(@job.started_at) %> - <%- @T('Counting entries. This may take a while.') %>
    
+      <% else: %>
+        
    <%- @Ttimestamp(@job.started_at) %> - <%- @T('Running...') %>
    
+        
    
+          
+        
    
+      <% end %>
+    <% end %>
+    <% if !_.isEmpty(@job.result) && @countDone: %>
+      
      
+        
    • <%- @T('%s user to %s user', 'Exchange', 'Zammad') %> (<%= @countDone %>/<%= @job.result.sum %>):
+          
        
+            
      • <%- @T('Users') %>: <%= @job.result.created %> <%- @T('created') %>, <%= @job.result.updated %> <%- @T('updated') %>, <%= @job.result.unchanged %> <%- @T('untouched') %>, <%= @job.result.skipped %> <%- @T('skipped') %>, <%= @job.result.failed %> <%- @T('failed') %>
+          
      
+          
      • 
+          <% if !_.isEmpty(@job.result.folders): %>
+            
    • <%- @T('%s folders', 'Exchange') %>:
+              
        
+                <% for folder, result of @job.result.folders: %>
+                  
      • <%- folder %>: <%= result.created %> <%- @T('created') %>, <%= result.updated %> <%- @T('updated') %>, <%= result.unchanged %> <%- @T('untouched') %>, <%= result.failed %> <%- @T('failed') %>
+                <% end %>
+              
      
+            
      • 
+          <% end %>
+      
    
+    <% end %>
+    <% if @job.finished_at: %>
+      
+    <% end %>
+  <% end %>
+
    
diff --git a/app/assets/javascripts/app/views/integration/exchange_summary.jst.eco b/app/assets/javascripts/app/views/integration/exchange_summary.jst.eco
new file mode 100644
index 000000000..0abf47bdf
--- /dev/null
+++ b/app/assets/javascripts/app/views/integration/exchange_summary.jst.eco
@@ -0,0 +1,16 @@
+
      
+  
    • <%- @T('%s user to %s user', 'Exchange', 'Zammad') %> (<%= @countDone %>):
+    
        
+      
      • <%- @T('Users') %>: <%= @job.result.created %> <%- @T('created') %>, <%= @job.result.updated %> <%- @T('updated') %>, <%= @job.result.unchanged %> <%- @T('untouched') %>, <%= @job.result.skipped %> <%- @T('skipped') %>, <%= @job.result.failed %> <%- @T('failed') %>
+    
      
+  
      • 
+  <% if !_.isEmpty(@job.result.folders): %>
+    
    • <%- @T('%s folders', 'Exchange') %>:
+      
        
+        <% for folder, result of @job.result.folders: %>
+          
      • <%- folder %>: <%= result.created %> <%- @T('created') %>, <%= result.updated %> <%- @T('updated') %>, <%= result.unchanged %> <%- @T('untouched') %>, <%= result.failed %> <%- @T('failed') %>
+        <% end %>
+      
      
+    
      • 
+  <% end %>
+
    
diff --git a/app/assets/javascripts/app/views/integration/exchange_user_attribute_row.jst.eco b/app/assets/javascripts/app/views/integration/exchange_user_attribute_row.jst.eco
new file mode 100644
index 000000000..1d9dd1826
--- /dev/null
+++ b/app/assets/javascripts/app/views/integration/exchange_user_attribute_row.jst.eco
@@ -0,0 +1,7 @@
+
+  
+  
+  
+    
    
+      <%- @Icon('trash') %> <%- @T('Remove') %>
+    
    
diff --git a/app/assets/javascripts/app/views/integration/exchange_wizard.jst.eco b/app/assets/javascripts/app/views/integration/exchange_wizard.jst.eco
new file mode 100644
index 000000000..d1b5dc25f
--- /dev/null
+++ b/app/assets/javascripts/app/views/integration/exchange_wizard.jst.eco
@@ -0,0 +1,258 @@
+
    
+
+  
+    
    
+      
    
+        <%- @Icon('diagonal-cross') %>
+      
    
+      
    <%- @T('Exchange') %> <%- @T('Configuration') %>
    
+    
    
+    
    
+      
    
+        
+        
+          
+            
+              
+          
+            
+              
+              
+        
    <%- @T('Name') %>
+              <%- @T('Value') %>
+          
    <%- @T('User') %>
+              
+            
    <%- @T('Password') %>
+              
+          
    
+      
    
+    
    
+    
    
+      
    
+        
+      
    
+    
    
+  
+
+  
    
+    
    
+      
    
+        <%- @Icon('diagonal-cross') %>
+      
    
+      
    <%- @T('Exchange') %> <%- @T('Configuration') %>
    
+    
    
+    
    
+      
    
+        
    
+           <%- @T('Connecting ...') %>
+        
    
+      
    
+    
    
+    
    
+  
    
+
+  
    
+    
    
+      
    
+        <%- @Icon('diagonal-cross') %>
+      
    
+      
    <%- @T('Exchange') %> <%- @T('Configuration') %>
    
+    
    
+    
    
+      
    
+        
+        
+          
+            
+              
+          
+            
+              
+              
+              
+        
    <%- @T('Name') %>
+              <%- @T('Value') %>
+          
    <%- @T('Endpoint') %>
+              
+
+            
    <%- @T('User') %>
+              
+            
    <%- @T('Password') %>
+              
+          
    
+      
    
+    
    
+    
    
+      
    
+        
+      
    
+    
    
+  
    
+
+  
    
+    
    
+      
    
+        <%- @Icon('diagonal-cross') %>
+      
    
+      
    <%- @T('Exchange') %> <%- @T('Folders') %>
    
+    
    
+    
    
+      
    
+        
+
+        
    
+            
    
+                
+            
    
+            
    
+            
    
+        
    
+
+      
    
+    
    
+    
    
+      
    
+        <%- @T('Go Back') %>
+      
    
+      
    
+        
+      
    
+    
    
+  
    
+
+  
    
+    
    
+      
    
+        <%- @Icon('diagonal-cross') %>
+      
    
+      
    <%- @T('Exchange') %> <%- @T('Configuration') %>
    
+    
    
+    
    
+      
    
+        
    
+           <%- @T('Analyzing structure...') %>
+        
    
+      
    
+    
    
+    
    
+  
    
+
+  
    
+    
    
+      
    
+        <%- @Icon('diagonal-cross') %>
+      
    
+      
    <%- @T('Exchange') %> <%- @T('Mapping') %>
    
+    
    
+    
    
+      
    
+        
+
+        
    <%- @T('User') %>
    
+        
    
+          
+            +              +              +              +            
+            
+              
+                
+            
+              
+                
+          
    




    <%- @T('%s Attribute', 'Exchange') %>
+                <%- @T('%s Attribute', 'Zammad') %>
+                <%- @T('Action') %>
+            
    
+                  
    
+                    <%- @Icon('plus-small') %> <%- @T('Add') %>
+                  
    
+            
    
+        
    
+
+      
    
+    
    
+    
    
+      
    
+        <%- @T('Go Back') %>
+      
    
+      
    
+        
+      
    
+    
    
+  
    
+
+  
    
+    
    
+      
    
+        <%- @Icon('diagonal-cross') %>
+      
    
+      
    <%- @T('Exchange') %> <%- @T('Configuration') %>
    
+    
    
+    
    
+      
    
+        
    
+          
    
+            
+            <%- @T('Counting entries. This may take a while.') %>
+          
    
+        
    
+        
    
+          
    
+            <%- @T('Analyzing entries with given configuration...') %>
+          
    
+          
    
+            
+          
    
+        
    
+      
    
+    
    
+    
    
+  
    
+
+  
    
+    
    
+      
    
+        <%- @Icon('diagonal-cross') %>
+      
    
+      
    <%- @T('Exchange') %> <%- @T('Configuration') %>
    
+    
    
+    
    
+      
    
+        
+        
    <%- @T('With your current configuration the following will happen') %>:
    
+        
    
+      
    
+    
    
+    
    
+      
    
+        <%- @T('Go Back') %>
+      
    
+      
    
+        
+      
    
+    
    
+  
    
+
+  
    
+    
    
+      
    
+        <%- @Icon('diagonal-cross') %>
+      
    
+      
    <%- @T('Exchange') %>
    
+    
    
+    
    
+      
    
+        
+      
    
+    
    
+    
    
+      
    
+        
+      
    
+    
    
+  
    
+
+
    
diff --git a/app/assets/javascripts/app/views/integration/idoit.jst.eco b/app/assets/javascripts/app/views/integration/idoit.jst.eco
new file mode 100644
index 000000000..deec7f27f
--- /dev/null
+++ b/app/assets/javascripts/app/views/integration/idoit.jst.eco
@@ -0,0 +1,25 @@
+
    
+  
    <%- @T('Settings') %>
    
+  
    
+    
+      
+        
+          
+      
+        
+          
+          
+          
+    
    <%- @T('Name') %>
+          <%- @T('Value') %>
+      
    <%- @T('API token') %> *
+          
+        
    <%- @T('Endpoint') %> *
+          
+        
    <%- @T('Client ID') %>
+          
+      
    
+  
    
+
+  
+
    
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/integration/idoit_object_result.jst.eco b/app/assets/javascripts/app/views/integration/idoit_object_result.jst.eco
new file mode 100644
index 000000000..e2d4dbe76
--- /dev/null
+++ b/app/assets/javascripts/app/views/integration/idoit_object_result.jst.eco
@@ -0,0 +1,25 @@
+
    
+<% if _.isEmpty(@items): %>
+  <%- @T('none') %>
+<% else: %>
+
+  
+    
+    
+    
+    
+    
+  
+  
+  <% for item in @items: %>
+    
+      
+      
+      
+      
+      
+    
+  <% end %>
+  
+
    <%- @T('ID') %><%- @T('Name') %><%- @T('Status') %><%- @T('Link') %>
    <%= item.id %><%= item.title %><%= item.cmdb_status_title %>i-doit
    
+<% end %>
diff --git a/app/assets/javascripts/app/views/integration/idoit_object_selector.jst.eco b/app/assets/javascripts/app/views/integration/idoit_object_selector.jst.eco
new file mode 100644
index 000000000..fa63a3604
--- /dev/null
+++ b/app/assets/javascripts/app/views/integration/idoit_object_selector.jst.eco
@@ -0,0 +1,5 @@
+
    
+  
    
+  
+
    
+
    
diff --git a/app/assets/javascripts/app/views/layout_ref/inputs.jst.eco b/app/assets/javascripts/app/views/layout_ref/inputs.jst.eco
index 7fc1e34c6..50ff41cc4 100644
--- a/app/assets/javascripts/app/views/layout_ref/inputs.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/inputs.jst.eco
@@ -51,6 +51,10 @@
       
       
     
    
+    
    
+      
+      
+    
    
     
    
       
       
diff --git a/app/assets/javascripts/app/views/layout_ref/user_list.jst.eco b/app/assets/javascripts/app/views/layout_ref/user_list.jst.eco
index 93f91446e..07f1630aa 100644
--- a/app/assets/javascripts/app/views/layout_ref/user_list.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/user_list.jst.eco
@@ -116,8 +116,8 @@
   
    
 
   
    
-    <%- @Icon('magnifier') %>
     
+    <%- @Icon('magnifier') %>
   
    
 
   
    
diff --git a/app/assets/javascripts/app/views/login.jst.eco b/app/assets/javascripts/app/views/login.jst.eco
index 00b086f48..135c1c859 100644
--- a/app/assets/javascripts/app/views/login.jst.eco
+++ b/app/assets/javascripts/app/views/login.jst.eco
@@ -24,7 +24,7 @@
             
    
               
             
    
-            
+            
           
    
 
           
    
diff --git a/app/assets/javascripts/app/views/profile/out_of_office.jst.eco b/app/assets/javascripts/app/views/profile/out_of_office.jst.eco
new file mode 100644
index 000000000..e2ca357d2
--- /dev/null
+++ b/app/assets/javascripts/app/views/profile/out_of_office.jst.eco
@@ -0,0 +1,34 @@
+
    
+  
    <%- @T('Out of Office') %>
    
+
    
+
+
    
+  
    
+    
    
+      
    
+        
    
+            <% if @localData.out_of_office is true: %>
+              <%- @Icon('status', 'ok inline') %>
+            <% else: %>
+              <%- @Icon('status', 'error inline') %>
+            <% end %> 
    
+      
    
+    
    
+    
    
+      
    <%- @T('From') %>
    
+      
    
+    
    
+    
    
+      
    <%- @T('Till') %>
    
+      
    
+    
    
+    
    
+      
+      
    
+    
    
+    
    
+      
    <%- @Ti('Disable') %>
    
+      
    <%- @Ti('Enable') %>
    
+    
    
+  
    
+
    
diff --git a/app/assets/javascripts/app/views/search/index.jst.eco b/app/assets/javascripts/app/views/search/index.jst.eco
index 504e997f3..55637065d 100644
--- a/app/assets/javascripts/app/views/search/index.jst.eco
+++ b/app/assets/javascripts/app/views/search/index.jst.eco
@@ -3,8 +3,8 @@
   
    
     
    
       
    
-        <%- @Icon('magnifier') %>
         " value="<%= @query %>" type="search" autocomplete="off">
+        <%- @Icon('magnifier') %>
         
    
           <%- @Icon('diagonal-cross') %>
         
    
diff --git a/app/assets/javascripts/app/views/settings/proxy.jst.eco b/app/assets/javascripts/app/views/settings/proxy.jst.eco
index 2886185b5..b8af3fc27 100644
--- a/app/assets/javascripts/app/views/settings/proxy.jst.eco
+++ b/app/assets/javascripts/app/views/settings/proxy.jst.eco
@@ -18,6 +18,12 @@
       
     
    
   
    
+  
    <%- @T('No proxy for the following hosts.') %>
    
+  
    
+    
    
+      
+    
    
+  
    
   
    
     
     
diff --git a/app/assets/javascripts/app/views/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/ticket_zoom.jst.eco
index 36ef86765..f45d5984b 100644
--- a/app/assets/javascripts/app/views/ticket_zoom.jst.eco
+++ b/app/assets/javascripts/app/views/ticket_zoom.jst.eco
@@ -1,21 +1,23 @@
 
    
-  
    
+  
    
     <%- @C('ticket_hook') %> <%- @ticket.number %>
-    
    
-    
    
-    
    
+    
    
+    
    
+    
    
   
    
   
    
     
    
       
    
-        
    
-        
    
+        
    
+        
    
+        
    
+        
    
       
    
       
    
         
    
           
    
-          
    
-          
    
+          
    
+          
    
         
    
       
    
       
    
diff --git a/app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco
index 4f160381a..7f7142818 100644
--- a/app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco
+++ b/app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco
@@ -41,13 +41,19 @@
         
    
           
         
    
-        
    
+        
    
       
    
       
    
         
    
           
         
    
-        
    
+        
    
+      
    
+      
    
+        
    
+          
+        
    
+        
    
       
    
 
       
    
diff --git a/app/assets/javascripts/app/views/ticket_zoom/setting.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/setting.jst.eco
new file mode 100644
index 000000000..7997f7e8f
--- /dev/null
+++ b/app/assets/javascripts/app/views/ticket_zoom/setting.jst.eco
@@ -0,0 +1,3 @@
+
    
+  <%- @Icon('cog', 'dropdown-icon') %>
+
    
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/ticket_zoom/sidebar_idoit.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/sidebar_idoit.jst.eco
new file mode 100644
index 000000000..3b4dbbb22
--- /dev/null
+++ b/app/assets/javascripts/app/views/ticket_zoom/sidebar_idoit.jst.eco
@@ -0,0 +1,13 @@
+<% for object in @objects: %>
+  
    
+    
+    <%- @T('ID') %>: <%= object.id %>
    
+    <%- @T('Status') %>: <%= object.cmdb_status_title %>
    
+    <%- @T('Type') %>: <%= object.type_title %>
    
+  
    
+<% end %>
diff --git a/app/assets/javascripts/app/views/time_accounting/by_ticket.jst.eco b/app/assets/javascripts/app/views/time_accounting/by_ticket.jst.eco
index 143de9e84..0f395dbf9 100644
--- a/app/assets/javascripts/app/views/time_accounting/by_ticket.jst.eco
+++ b/app/assets/javascripts/app/views/time_accounting/by_ticket.jst.eco
@@ -13,6 +13,8 @@
     <%- @T('Agent') %>
     <%- @T('Time Units') %>
     <%- @T('Time Units Total') %>
+    <%- @T('Created at') %>
+    <%- @T('Closed at') %>
   
   
   <% for row in @rows: %>
@@ -24,6 +26,8 @@
     <%= row.agent %>
     <%= row.time_unit %>
     <%= row.ticket.time_unit %>
+    <%- @humanTime(row.ticket.created_at) %>
+    <%- @humanTime(row.ticket.close_at) %>
   <% end %>
   
 
diff --git a/app/assets/javascripts/app/views/user.jst.eco b/app/assets/javascripts/app/views/user.jst.eco
index 749c7c019..5ba6cb12a 100644
--- a/app/assets/javascripts/app/views/user.jst.eco
+++ b/app/assets/javascripts/app/views/user.jst.eco
@@ -12,8 +12,8 @@
 
    
 
    
   
    
-    <%- @Icon('magnifier') %>
     
+    <%- @Icon('magnifier') %>
   
    
 
   
    
diff --git a/app/assets/javascripts/app/views/widget/http_log.jst.eco b/app/assets/javascripts/app/views/widget/http_log.jst.eco
index a94ff96ee..5682e9f4c 100644
--- a/app/assets/javascripts/app/views/widget/http_log.jst.eco
+++ b/app/assets/javascripts/app/views/widget/http_log.jst.eco
@@ -1,27 +1,31 @@
 
    
-
-  
    <%- @T('Recent logs') %>
    
-  
    
+
    <%- @T('Recent logs') %>
    
+<% if @description: %>
+  <% for item in @description: %>
+    
    <%- @T(item...) %>
    
+  <% end %>
+<% end %>
+
    
 <% if !@records.length: %>
-  
-    
    <%- @T('No Entries') %>
-  
    
+
+  
    <%- @T('No Entries') %>
+
    
 <% else: %>
-    
-      
-        
-          
-      
+  
    <%- @T('Direction') %>
-          <%- @T('Request') %>
-          <%- @T('Created at') %>
-      
    
+    
+      
+        
+    
 <% for record in @records: %>
-        
-          
+        
-    
    <%- @T('Direction') %>
+        <%- @T('Request') %>
+        <%- @T('Created at') %>
+    
    <%- @T(record.direction) %>
-          <%= record.status %> <%= record.method %> <%= record.url %>
-          <%- @humanTime(record.created_at) %>
+      
    <%- @T(record.direction) %>
+        <%= record.status %> <%= record.method %> <%= record.url %>
+        <%- @humanTime(record.created_at) %>
 <% end %>
-      
    
+    
+  
 <% end %>
-  
    
+
    
diff --git a/app/assets/javascripts/app/views/widget/script_snipped.jst.eco b/app/assets/javascripts/app/views/widget/script_snipped.jst.eco
new file mode 100644
index 000000000..8325fc920
--- /dev/null
+++ b/app/assets/javascripts/app/views/widget/script_snipped.jst.eco
@@ -0,0 +1,8 @@
+
    
+
    <%- @T('Usage') %>
    
+<% if @description: %>
+  <% for item in @description: %>
+    
    <%- @T(item...) %>
    
+  <% end %>
+<% end %>
+
    <%- @content %>
    
diff --git a/app/assets/javascripts/app/views/widget/template.jst.eco b/app/assets/javascripts/app/views/widget/template.jst.eco
index e2cbc561a..85fef91e7 100644
--- a/app/assets/javascripts/app/views/widget/template.jst.eco
+++ b/app/assets/javascripts/app/views/widget/template.jst.eco
@@ -4,8 +4,10 @@
       
       
    
     
    
-    
-    
+    
    
+      
+      
+    
    
   
   
    
   
    
@@ -13,8 +15,10 @@
       
       
     
    
-    
-
+    
    
+      
+    
    
+  
 
    
 
 
    
diff --git a/app/assets/stylesheets/bootstrap.css b/app/assets/stylesheets/bootstrap.css
index b497e60ba..794beac23 100644
--- a/app/assets/stylesheets/bootstrap.css
+++ b/app/assets/stylesheets/bootstrap.css
@@ -3078,7 +3078,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
 }
 .pagination {
   display: inline-block;
-  padding-left: 0;
+  padding: 0;
   margin: 20px 0;
   border-radius: 4px;
 }
diff --git a/app/assets/stylesheets/svg-dimensions.css b/app/assets/stylesheets/svg-dimensions.css
index 755a6dbed..d86c8b006 100644
--- a/app/assets/stylesheets/svg-dimensions.css
+++ b/app/assets/stylesheets/svg-dimensions.css
@@ -55,6 +55,7 @@
 .icon-mute { width: 16px; height: 16px; }
 .icon-note { width: 16px; height: 16px; }
 .icon-oauth2-button { width: 29px; height: 24px; }
+.icon-office365-button { width: 29px; height: 24px; }
 .icon-one-ticket { width: 48px; height: 10px; }
 .icon-organization { width: 16px; height: 16px; }
 .icon-outbound-calls { width: 17px; height: 17px; }
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index ac39a1c4b..2a55670c1 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -39,6 +39,30 @@ $highlight-color: hsl(205,90%,60%);
   }
 }
 
+/* sets LTR and RTL within the same style call */
+@mixin bidi-style($prop, $value, $inverse-prop, $default-value) {
+  #{$prop}: $value;
+
+  html[dir=rtl] & {
+    #{$inverse-prop}: $value;
+    #{$prop}: $default-value;
+  }
+}
+
+/* adds a property only in RTL */
+@mixin rtl($prop, $value) {
+  html[dir=rtl] & {
+    #{$prop}: $value;
+  }
+}
+
+/* adds a property only in LTR */
+@mixin ltr($prop, $value) {
+  html[dir=ltr] & {
+    #{$prop}: $value;
+  }
+}
+
 html {
   height: 100%;
 }
@@ -130,7 +154,7 @@ blockquote {
 }
 
 ol, ul {
-  padding-left: 20px;
+  padding-inline-start: 20px;
 }
 
 #app {
@@ -362,7 +386,7 @@ pre code.hljs {
   }
 
   &.btn--icon--last .icon {
-    margin-left: 5px; // so far only used in ticket_zoom secondaryAction dropup
+    @include bidi-style(margin-left, 5px, margin-right, 0); // so far only used in ticket_zoom secondaryAction dropup
   }
 
   &:focus {
@@ -393,12 +417,13 @@ pre code.hljs {
 
     .icon {
       vertical-align: middle;
-      margin-right: 5px;
+      @include bidi-style(margin-right, 5px, margin-left, 0);
     }
   }
 
   &.is-disabled,
-  &[disabled] {
+  &[disabled],
+  &:disabled {
     pointer-events: none;
     cursor: not-allowed;
     opacity: .33;
@@ -415,7 +440,7 @@ pre code.hljs {
     font-size: 12px;
     letter-spacing: 0.05em;
     height: 31px;
-    padding: 2px 11px 0 !important;
+    padding: 0 11px !important;
     display: inline-flex;
     align-items: center;
 
@@ -526,7 +551,7 @@ pre code.hljs {
     border: none;
     background: none;
     vertical-align: baseline;
-    text-align: left;
+    text-align: start;
 
     .icon {
       fill: currentColor;
@@ -575,11 +600,11 @@ pre code.hljs {
     }
 
     &.space-left {
-      margin-left: 0;
+      @include bidi-style(margin-left, 0, margin-right, -10px);
     }
 
     &.space-right {
-      margin-right: 0;
+      @include bidi-style(margin-right, 0, margin-left, -10px);
     }
   }
 
@@ -597,16 +622,17 @@ pre code.hljs {
   }
 
   &.btn--split--first {
-    border-radius: 3px 0 0 3px;
+    @include bidi-style(border-radius, 3px 0 0 3px, border-radius, 0 3px 3px 0);
   }
   &.btn--split,
   &.btn--split--last {
     border-radius: 0;
-    border-left: none;
-    margin-left: 0 !important;
+    @include bidi-style(border-left-width, 0, border-right-width, 1px);
+    @include ltr(margin-left, 0 !important);
+    @include rtl(margin-right, 0 !important);
   }
   &.btn--split--last {
-    border-radius: 0 3px 3px 0;
+    @include bidi-style(border-radius, 0 3px 3px 0, border-radius, 3px 0 0 3px);
   }
 
   &.btn--dropdown {
@@ -627,32 +653,34 @@ pre code.hljs {
 .btn + .btn,
 .btn + .buttonDropdown,
 .buttonDropdown + .buttonDropdown {
-  margin-left: 10px;
+  @include bidi-style(margin-left, 10px, margin-right, 0);
 }
 
 .btn + .btn.align-right {
-  margin-left: auto;
+  @include bidi-style(margin-left, auto, margin-right, 0);
 }
 
 .btn.align-right ~ .btn {
-  margin-left: 15px;
+  @include bidi-style(margin-left, 15px, margin-right, 0);
 }
 
 .vertical > .btn:not(.hidden) + .btn {
-  margin-left: 0;
+  @include bidi-style(margin-left, 0, margin-right, 0);
   margin-top: 10px;
 }
 
 .btn--download .icon-download {
   margin-right: 6px;
+  @include rtl(margin-right, -10px);
   margin-top: 4px;
   margin-left: -10px;
+  @include rtl(margin-left, 6px);
   vertical-align: top;
   fill: white;
 }
 
 .btn-label {
-  margin-left: 7px;
+  @include bidi-style(margin-left, 7px, margin-right, 0);
 }
 
 .visibility-change {
@@ -705,7 +733,7 @@ pre code.hljs {
   }
 
   .btn + .btn {
-    margin-left: 0;
+    @include bidi-style(margin-left, 0, margin-right, 10px);
   }
 
   .btn--text, .btn--textLarge {
@@ -766,15 +794,17 @@ pre code.hljs {
   }
 
   &:not(:last-child):not(:only-child) {
-    border-right: none;
+    @include bidi-style(border-right-width, 0, border-left-width, 1px);
   }
 
   &:first-child {
     border-radius: 5px 0 0 5px;
+    @include rtl(border-radius, 0 5px 5px 0);
   }
 
   &:last-child {
     border-radius: 0 5px 5px 0;
+    @include rtl(border-radius, 5px 0 0 5px);
   }
 
   &:only-child {
@@ -782,7 +812,7 @@ pre code.hljs {
   }
 
   .badge {
-    margin: 0 5px 0 10px;
+    @include bidi-style(margin, 0 5px 0 10px, margin, 0 10px 0 5px);
     background: hsla(210,50%,10%,.24);
   }
 
@@ -840,7 +870,7 @@ pre code.hljs {
   vertical-align: top;
   border-radius: 9px;
   background: hsl(198,18%,86%);
-  margin-right: 3px;
+  @include bidi-style(margin-right, 3px, margin-left, 0);
   flex-shrink: 0;
 
   &:empty {
@@ -858,6 +888,7 @@ pre code.hljs {
     min-width: 0;
     padding: 0;
     margin-right: 0;
+    @include bidi-style(margin-right, 0, margin-left, 0);
     font-size: inherit;
     font-weight: inherit;
     text-align: inherit;
@@ -871,7 +902,7 @@ pre code.hljs {
 
 .key-value {
   td:first-child {
-    padding-right: 10px;
+    @include bidi-style(padding-right, 10px, padding-left, 0);
     color: #999;
   }
 }
@@ -934,15 +965,15 @@ table {
 }
 
 .table-column-sortIcon {
-  margin-left: auto;
+  @include bidi-style(margin-left, auto, margin-right, 0);
 }
 
 th.align-right {
   .table-column-title {
-    margin-left: auto;
+    @include bidi-style(margin-left, auto, margin-right, 0);
   }
   .table-column-sortIcon {
-    margin-left: 0;
+    @include bidi-style(margin-left, 0, margin-right, 0);
   }
 }
 
@@ -962,12 +993,12 @@ th.align-right {
 
 .table-col-resize {
   position: absolute;
-  right: 0;
+  @include bidi-style(right, 0, left, auto);
   top: 0;
   height: 100%;
   cursor: col-resize;
   padding: 10px;
-  margin-right: -10px;
+  @include bidi-style(margin-right, -10px, margin-left, 0);
   z-index: 1;
 
   &:after {
@@ -1018,7 +1049,7 @@ th.align-right {
   fill: hsl(206,7%,33%);
   width: 8px;
   height: 8px;
-  margin-left: 3px;
+  @include bidi-style(margin-left, 3px, margin-right, 0);
   margin-top: -2px;
   vertical-align: middle;
 }
@@ -1044,7 +1075,7 @@ th.align-right {
   align-items: center;
   justify-content: center;
   position: relative;
-  
+
   .icon-checked {
     color: black;
   }
@@ -1074,7 +1105,7 @@ th.align-right {
   &.checkbox-replacement--inline,
   &.radio-replacement--inline {
     display: inline-flex;
-    margin-right: 3px;
+    @include bidi-style(margin-right, 3px, margin-left, 0);
   }
 
   input {
@@ -1101,7 +1132,7 @@ th.align-right {
   }
 
   + .label-text {
-    margin-left: 0;
+    @include bidi-style(margin-left, 0, margin-right, 3px);
   }
 }
 
@@ -1204,7 +1235,7 @@ th.align-right {
 }
 
 #task [data-type="close"] {
-  margin-left: 5px;
+  @include bidi-style(margin-left, 5px, margin-right, 0);
   font-size: 13px;
   top: 1px;
 }
@@ -1213,7 +1244,7 @@ th.align-right {
 }
 
 #task .taskbar-new {
-  text-align: right;
+  text-align: end;
   padding-right: 12px;
 }
 
@@ -1279,7 +1310,7 @@ label,
   font-weight: normal;
   letter-spacing: 0.05em;
   margin-bottom: 4px;
-  text-align: left;
+  text-align: start;
   padding: 0;
   /* user-select: none; disabled because of chrome51 https://github.com/martini/zammad/issues/183 */
 }
@@ -1297,13 +1328,23 @@ label,
   margin: 0;
   text-transform: none;
   display: inline;
-  white-space: nowrap; /* for labels in tables that might get crushed view: calendar_subscriptions */
 }
+
+table {
+  .inline-label,
+  .label-success,
+  .label-warning,
+  .label-danger {
+    white-space: nowrap; /* for labels in tables that might get crushed view: calendar_subscriptions */
+  }
+}
+
 .inline-label {
   color: hsl(206,7%,28%);
 }
+
 .label-text {
-  margin-left: 3px;
+  @include bidi-style(margin-left, 3px, margin-right, 0);
   user-select: none;
   cursor: pointer;
 }
@@ -1527,7 +1568,7 @@ fieldset > .form-group {
   opacity: 0.2;
   top: -2px;
   position: relative;
-  margin-left: auto;
+  @include bidi-style(margin-left, auto, margin-right, 0);
 
   .icon-help {
     display: block;
@@ -1623,6 +1664,24 @@ textarea,
     border-color: hsl(200,71%,59%);
     box-shadow: 0 0 0 3px hsl(201,62%,90%);
   }
+
+  &.is-disabled, // .is-disabled should not be used - legacy support
+  &[disabled],
+  &[readonly] {
+    background: hsl(210,17%,93%);
+    border-color: hsl(210,10%,85%);
+
+    &:focus,
+    &.focus {
+      border-color: hsl(200,71%,59%);
+    }
+  }
+
+  &.is-disabled, // .is-disabled should not be used
+  &[disabled] {
+    cursor: not-allowed;
+    opacity: 1;
+  }
 }
 
 input[type=url] {
@@ -1692,7 +1751,7 @@ textarea.form-control {
 }
 
 select.form-control:not([multiple]) {
-  padding-right: 34px;
+  @include bidi-style(padding-right, 34px, padding-left, 12px);
   word-wrap: normal;
 }
 
@@ -1700,13 +1759,6 @@ select.form-control:not([multiple]) {
   display: none;
 }
 
-.form-control[disabled], .form-control.is-disabled {
-  cursor: not-allowed;
-  background-color: #fff;
-  color: #d5d5d5;
-  opacity: 1;
-}
-
 .form-control.form-control--borderless {
   border: none;
   padding: 0;
@@ -1728,7 +1780,7 @@ select.form-control:not([multiple]) {
 .form-control + .icon-arrow-down,
 .dropdown-arrow {
   position: absolute;
-  right: 12px;
+  @include bidi-style(right, 12px, left, auto);
   top: 50%;
   margin-top: -3px;
   fill: black;
@@ -1795,9 +1847,9 @@ input.has-error {
   input,
   .form-control {
     flex: 1;
-    border-right: none;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
+    @include bidi-style(border-right-width, 0, border-left-width, 1px);
+    @include bidi-style(border-top-right-radius, 0, border-top-left-radius, 3px);
+    @include bidi-style(border-bottom-right-radius, 0, border-bottom-left-radius, 3px);
 
     &:focus + .controls-button {
       .controls-button-inner {
@@ -1813,11 +1865,13 @@ input.has-error {
         content: "";
         position: absolute;
         left: 0;
+        @include rtl(left, -3px);
         top: -3px;
         right: -3px;
+        @include rtl(right, 0);
         bottom: -3px;
         background: hsl(201,62%,90%);
-        border-radius: 0 7px 7px 0;
+        @include bidi-style(border-radius, 0 7px 7px 0, border-radius, 7px 0 0 7px);
       }
     }
   }
@@ -1840,7 +1894,7 @@ input.has-error {
   background: white;
   position: relative;
   border: 1px solid hsl(0, 0%, 90%);
-  border-radius: 0 3px 3px 0;
+  @include bidi-style(border-radius, 0 3px 3px 0, border-radius, 3px 0 0 3px);
 }
 
 .searchfield {
@@ -1848,7 +1902,7 @@ input.has-error {
   margin-bottom: 20px;
 
   .icon {
-    left: 15px;
+    @include bidi-style(left, 15px, right, auto);
     top: 12px;
     width: 17px;
     height: 17px;
@@ -1860,6 +1914,8 @@ input.has-error {
     appearance: textfield;
     border-radius: 19px;
     padding: 0 17px 0 42px;
+    @include rtl(padding, 0 42px 0 17px);
+    will-change: transform;
 
     &.is-empty + .empty-search {
       visibility: hidden;
@@ -1904,7 +1960,7 @@ input.has-error {
 
   svg,
   .icon {
-    margin-right: 14px;
+    @include bidi-style(margin-right, 14px, margin-left, 0);
   }
 
   h2 {
@@ -2025,6 +2081,7 @@ kbd {
 
 .pagination {
   margin: 0 0 0 19px;
+  @includ rtl(margin, 0 19px 0 0);
   display: flex;
 }
 
@@ -2034,6 +2091,18 @@ kbd {
   width: 31px;
   height: 31px;
   border-color: #e5e5e5;
+  @include bidi-style(margin-left, -1px, margin-right, 0);
+}
+
+.pagination > li:first-child > a,
+.pagination > li:first-child > span {
+  @include bidi-style(border-top-left-radius, 4px, border-top-right-radius, 0);
+  @include bidi-style(border-bottom-left-radius, 4px, border-bottom-right-radius, 0);
+}
+.pagination > li:last-child > a,
+.pagination > li:last-child > span {
+  @include bidi-style(border-top-right-radius, 4px, border-top-left-radius, 0);
+  @include bidi-style(border-bottom-right-radius, 4px, border-bottom-left-radius, 0);
 }
 
 .pagination > .active > a,
@@ -2048,6 +2117,7 @@ kbd {
 
 .pagination-counter {
   margin: 0 0 0 19px;
+  @include rtl(margin, 0 19px 0 0);
   line-height: 33px;
   color: #9c9c9b;
 }
@@ -2073,7 +2143,7 @@ kbd {
   align-items: center;
 
   .zammad-switch {
-    margin-right: 9px;
+    @include bidi-style(margin-right, 9px, margin-left, 0);
   }
 
   h1,
@@ -2085,18 +2155,18 @@ kbd {
 
 .page-header-center {
   justify-self: center;
-  padding-left: 9px;
+  @include bidi-style(padding-left, 9px, padding-right, 0);
   margin: 0 auto;
 
   & + .page-header-meta {
-    margin-left: 0;
+    @include bidi-style(margin-left, 0, margin-right, auto);
     flex: none;
   }
 }
 
 .page-header-meta {
-  margin-left: auto;
-  padding-left: 20px;
+  @include bidi-style(margin-left, auto, margin-right, 0);
+  @include bidi-style(padding-left, 20px, padding-right, 0);
   display: flex;
   justify-content: flex-end;
   flex: 1;
@@ -2109,7 +2179,7 @@ kbd {
   }
 
   .btn + .btn {
-    margin-left: 9px;
+    @include bidi-style(margin-left, 9px, margin-right, 0);
   }
 }
 
@@ -2133,9 +2203,9 @@ kbd {
 }
 
 .page-aside {
-  padding-right: 20px;
-  border-right: 1px solid hsl(0,0%,90%);
-  margin-right: 20px;
+  @include bidi-style(padding-right, 20px, padding-left, 0);
+  @include bidi-style(border-right, 1px solid hsl(0,0%,90%), border-left, none);
+  @include bidi-style(margin-right, 20px, margin-left, 0);
   width: 240px;
   flex-shrink: 0;
   flex-grow: 0;
@@ -2153,13 +2223,13 @@ kbd {
 }
 
 .page-loading-label {
-  margin-left: 10px;
+  @include bidi-style(margin-left, 10px, margin-right, 0);
   margin-top: 1px;
 }
 
 .dropdown-menu .count {
   padding-top: 1px;
-  margin-left: 10px;
+  @include bidi-style(margin-left, 10px, margin-right, 0);
 }
 
 .help-block {
@@ -2292,6 +2362,7 @@ kbd {
   justify-content: center;
   color: hsl(233,7%,26%);
   margin: auto 0 34px -16px;
+  @include rtl(margin, auto -16px 34px 0);
   cursor: default;
   position: absolute;
   bottom: 0;
@@ -2299,12 +2370,12 @@ kbd {
   right: 0;
 
   .icon-logo {
-    margin-right: 8px;
+    @include bidi-style(margin-right, 8px, margin-left, 0);
     margin-top: -11px;
   }
 
   .logotype {
-    margin-left: 7px;
+    @include bidi-style(margin-left, 7px, margin-left, 0);
     margin-top: -3px;
     fill: hsl(225,9%,27%);
   }
@@ -2329,7 +2400,7 @@ kbd {
 }
 
 .fullscreen-body {
-  text-align: left;
+  text-align: start;
   display: inline-block;
 }
 
@@ -2388,7 +2459,7 @@ ol.tabs li {
     justify-content: center;
 
     .arrow {
-      margin-left: 10px;
+      @include bidi-style(margin-left, 10px, margin-right, 0);
       opacity: 0.75;
     }
 
@@ -2408,20 +2479,23 @@ ol.tabs li {
 
   .tab:first-child {
     border-radius: 3px 0 0 3px;
+    @include rtl(border-radius, 0 3px 3px 0);
+    @include bidi-style(border-right-width, 1px, border-right-width, 0);
   }
 
   .tab:last-child:not(:only-child) {
     border-radius: 0 3px 3px 0;
-    border-right: none;
+    @include bidi-style(border-right-width, 0, border-right-width, 1px);
+    @include rtl(border-radius, 3px 0 0 3px);
   }
 
   .tab:only-child {
     border-radius: 3px;
-    border-right: none;
+    @include bidi-style(border-right-width, 0, border-right-width, 1px);
   }
 
   .tab-badge {
-    margin-left: 3px;
+    @include bidi-style(margin-left, 3px, margin-right, 0);
     font-size: 0.95em;
   }
 
@@ -2446,10 +2520,12 @@ ol.tabs li {
 
       &:first-child {
         border-radius: 8px 0 0 8px;
+        @include rtl(border-radius, 0 8px 8px 0);
       }
 
       &:last-child {
         border-radius: 0 8px 8px 0;
+        @include rtl(border-radius, 8px 0 0 8px);
       }
 
       &:only-child {
@@ -2460,6 +2536,8 @@ ol.tabs li {
     .tab-dropdown {
       padding-left: 18px;
       padding-right: 15px;
+      @include rtl(padding-left, 15px);
+      @include rtl(padding-right, 18px);
     }
   }
 
@@ -2550,6 +2628,10 @@ ol.tabs li {
     background: hsl(0,0%,15%);
   }
 
+  &.auth-provider--office365 {
+    background: hsl(15,100%,47%);
+  }
+
   .provider-name {
     flex: 1;
   }
@@ -2557,8 +2639,7 @@ ol.tabs li {
   .provider-icon {
     width: 29px;
     height: 24px;
-    margin-right: 10px;
-    margin-top: 1px;
+    @include bidi-style(margin-right, 10px, margin-left, 0);
   }
 }
 
@@ -2631,7 +2712,7 @@ ol.tabs li {
 
 .color-swatch {
   padding: 2px;
-  margin: -2px 0;
+  margin: -2px 0 -4px;
   cursor: pointer;
 
   /* :after technique for bigger click area */
@@ -2707,7 +2788,7 @@ form {
   margin-top: 10px;
 
   .btn + .btn:not(.align-right) {
-    margin-left: 20px;
+    @include bidi-style(margin-left, 20px, margin-right, 10px);
   }
 }
 
@@ -2717,7 +2798,7 @@ form a.standalone {
 }
 
   form a.standalone.align-right {
-    margin-left: auto;
+    @include bidi-style(margin-left, auto, margin-right, 0);
   }
 
 footer {
@@ -2725,6 +2806,8 @@ footer {
   padding-top: 10px;
   padding-left: 10px;
   padding-right: 22px;
+  @include rtl(padding-left, 22px);
+  @include rtl(padding-right, 10px);
 }
 
 .can-move {
@@ -2752,7 +2835,7 @@ footer {
   right: 20px;
 }
 .customer_info textarea {
-  padding-left: 10px;
+  @include bidi-style(padding-left, 10px, padding-right, 0);
   width: 100%;
   border-color: #eee;
 }
@@ -2778,7 +2861,7 @@ footer {
 
   .tabsHolder {
     flex: 1;
-    margin-right: 20px;
+    @include bidi-style(margin-right, 20px, margin-left, 0);
     min-width: 0; /* Firefox bug fix */
   }
 
@@ -2839,12 +2922,12 @@ footer {
   }
 
   .bulkAction .btn--text {
-    margin-right: 0;
+    @include bidi-style(margin-right, 0, margin-left, 16px);
   }
 
   .bulkAction-controls {
     margin-top: 10px;
-    margin-left: auto;
+    @include bidi-style(margin-left, auto, margin-right, 0);
   }
 
 .panel {
@@ -2927,7 +3010,7 @@ footer {
   width: 60px;
 }
 .sub_attribute .controls {
-  margin-left: 80px;
+  @include bidi-style(margin-left, 80px, margin-right, 0);
 }
 
 .splash {
@@ -2944,7 +3027,7 @@ footer {
   color: hsl(0,0%,45%);
 
   .icon {
-    margin-right: 10px;
+    @include bidi-style(margin-right, 10px, margin-left, 0);
     filter: grayscale(90%);
   }
 }
@@ -2969,7 +3052,7 @@ footer {
   .menu .badge {
     background: $ok-color;
     color: hsl(233,10%,16%);
-    margin-right: 8px;
+    @include bidi-style(margin-right, 8px, margin-left, 0);
   }
 
   .menu .zammad-switch {
@@ -3030,7 +3113,7 @@ footer {
   }
 
   .menu-item-icon {
-    margin-right: 15px;
+    @include bidi-style(margin-right, 15px, margin-left, 0);
     width: 24px;
     height: 24px;
     fill: hsl(206,7%,37%);
@@ -3075,11 +3158,11 @@ footer {
     }
 
     .tasks--standalone .icon-task-state {
-      margin-right: 4px;
+      @include bidi-style(margin-right, 4px, margin-left, 0);
     }
 
   .nav-tab {
-    padding: 10px 15px 9px 0;
+    @include bidi-style(padding, 10px 15px 9px 0, padding, 10px 0 9px 15px);
     position: relative;
     color: #808080;
     display: flex;
@@ -3097,7 +3180,7 @@ footer {
     }
 
     .navigation .nav-tab-name {
-      text-align: left;
+      text-align: start;
     }
 
     .tasks-navigation .nav-tab-icon .error {
@@ -3164,10 +3247,10 @@ footer {
 
   .nav-tab-close {
     position: absolute;
-    right: 0;
+    @include bidi-style(right, 0, left, auto);
     top: 0;
     height: 100%;
-    padding: 0 16px 0 0;
+    @include bidi-style(padding-right, 16px, padding-left, 0);
     visibility: hidden;
     @extend .u-clickable;
     display: flex;
@@ -3204,8 +3287,8 @@ footer {
     }
 
 .icon-task-state {
-  vertical-align: middle;
-  margin-top: -2px;
+  margin-top: 1px;
+  display: block;
 }
 
 .nav-tab-icon .icon-task-state {
@@ -3256,12 +3339,13 @@ footer {
 
 .search {
   padding: 11px 5px 4px 10px;
+  @include rtl(padding, 11px 10px 4px 0px);
   border-bottom: 1px solid rgba(240,250,255,.05);
   flex-shrink: 0;
   display: flex;
   background-color: inherit;
 }
-  
+
   .search-holder {
     flex: 1;
     border-radius: 15px;
@@ -3316,13 +3400,14 @@ footer {
     position: absolute;
     top: 8px;
     left: 10px;
+    @include bidi-style(left, 10px, right, auto);
     z-index: 2;
     opacity: 0.5;
     fill: white;
   }
 
   .search.focused .search-holder {
-    margin-right: -46px;
+    @include bidi-style(margin-right, -46px, margin-left, 0);
   }
 
   .search.focused .logo {
@@ -3388,12 +3473,12 @@ footer {
     padding: 9px 15px 8px 0;
     margin-bottom: 7px;
     height: auto !important;
-    
+
     .nav-tab-icon {
       width: 18px;
       margin-left: 10px;
       margin-right: 10px;
-      
+
       .icon {
         width: 18px;
         height: 14px;
@@ -3438,7 +3523,7 @@ footer {
       align-items: center;
       justify-content: center;
     }
-    
+
     .user-menu .list-button *:not(.dropdown-nose):not(.icon-crown) {
       position: relative;
     }
@@ -3554,12 +3639,12 @@ footer {
   vertical-align: bottom;
   position: relative;
   flex-shrink: 0;
-  
+
   &.size-30 {
     width: 30px;
     height: 30px;
   }
-  
+
   .icon-crown {
     position: absolute;
     width: 28px;
@@ -3610,6 +3695,16 @@ footer {
     opacity: 0.5;
   }
 
+  &--inactive {
+    filter: grayscale(100%);
+    opacity: 0.2;
+  }
+
+  &--vacation {
+    filter: grayscale(70%);
+    opacity: 1;
+  }
+
   &--unique {
     background-image: image_url("/assets/images/avatar-bg.png");
     background-size: 300px 226px;
@@ -3645,7 +3740,7 @@ footer {
     display: flex;
     align-items: center;
     justify-content: center;
-    
+
     .icon-organization {
       fill: currentColor;
     }
@@ -3660,7 +3755,7 @@ footer {
 
   &--group {
     overflow: hidden;
-    
+
     .icon {
       fill: white;
       position: absolute;
@@ -3713,9 +3808,9 @@ footer {
   padding: 20px;
   color: hsl(60,1%,34%);
   background: white;
-  border-right: 1px solid #e6e6e6;
+  @include bidi-style(border-right, 1px solid #e6e6e6, border-left, none);
   overflow: auto;
-  
+
   @include small-desktop {
     &.optional {
       display: none;
@@ -3816,8 +3911,10 @@ footer {
 
   .nav-pills > li > a > .badge {
     margin-left: auto;
-    padding-left: 10px;
     margin-right: 5px;
+    @include bidi-style(padding-left, 10px, padding-right, 0);
+    @include rtl(margin-left, 5px);
+    @include rtl(margin-right, auto);
   }
 
   a.list-group-item.active > .badge,
@@ -3855,6 +3952,7 @@ footer {
   border: none;
   color: hsl(206,7%,28%);
   box-shadow: 0 1px 14px rgba(0,8,14,.25);
+  @include rtl(text-align, right);
 }
 
   .popover-body {
@@ -3872,25 +3970,35 @@ footer {
     margin-bottom: 21px;
   }
 
-  .popover.right { margin-left: 4px; }
+  .popover.right {
+    margin-left: 4px;
+  }
   .popover.right > .arrow {
     border-right: none;
     left: -9px;
   }
 
-  .popover.top { margin-bottom: 9px; }
+  .popover.top {
+    margin-bottom: 9px;
+  }
   .popover.top > .arrow {
     border-top: none;
     bottom: -9px;
   }
 
-  .popover.left { margin-right: 9px; }
+  .popover.left {
+    margin-right: 9px;
+    margin-left: 0;
+  }
+
   .popover.left > .arrow {
     border-left: none;
     right: -9px;
   }
 
-  .popover.bottom { margin-top: 9px; }
+  .popover.bottom {
+    margin-top: 9px;
+  }
   .popover.bottom > .arrow {
     border-bottom: none;
     top: -9px;
@@ -3950,13 +4058,13 @@ footer {
   .popover--notifications {
     padding: 0;
     left: $navigationWidth;
+    @include rtl(right, $navigationWidth);
     margin: 8px 2px;
     max-height: calc(100% - 16px);
     width: auto;
     max-width: 400px;
     min-width: 350px;
     flex-direction: column;
-    @extend .zIndex-2;
 
     &.is-visible {
       display: flex;
@@ -3969,6 +4077,8 @@ footer {
     .arrow {
       top: 23px !important;
       left: -11px;
+      @include rtl(left, 408px);
+      @include rtl(transform, rotate(180deg));
     }
 
     .popover-content {
@@ -4013,7 +4123,7 @@ footer {
 
   .popover-notificationsCounter {
     color: #e25253;
-    padding-left: 3px;
+    @include bidi-style(padding-left, 3px, padding-right, 0);
   }
 
 .user-popover,
@@ -4054,7 +4164,7 @@ footer {
 .total-tickets {
   height: 83px;
   width: 48px;
-  margin-right: 4px;
+  @include bidi-style(margin-right, 4px, margin-left, 0);
   margin-bottom: -9px;
 }
 
@@ -4191,20 +4301,20 @@ footer {
 
   .stat-legend {
     margin-top: 30px;
-    margin-left: auto;
+    @include bidi-style(margin-left, auto, margin-right, 0);
     display: flex;
   }
 
   .stat-legendEntry {
     font-size: 11px;
     line-height: 1;
-    margin-left: 20px;
+    @include bidi-style(margin-left, 20px, margin-right, 0);
     background: none !important;
   }
 
   .stat-circle {
     margin-bottom: -1px;
-    margin-right: 3px;
+    @include bidi-style(margin-right, 3px, margin-left, 0);
     width: 10px;
     height: 10px;
     border-radius: 100%;
@@ -4240,6 +4350,8 @@ footer {
     margin-left: 19px;
     margin-bottom: 15px;
     margin-right: 26px;
+    @include rtl(margin-right, 19px);
+    @include rtl(margin-left, 26px);
   }
 
   .activity-entries {
@@ -4264,7 +4376,7 @@ footer {
     }
 
     &.activity-entry--removeable {
-      padding-right: 0;
+      @include bidi-style(padding-right, 0, margin-left, 17px);
     }
 
     &:not(:hover) .activity-remove {
@@ -4282,17 +4394,19 @@ footer {
 
     &.activity-entry--removeable:not(:last-child) .activity-body:after {
       right: 17px;
+      @include bidi-style(right, 17px, left, 0);
     }
   }
 
   .activity-avatar {
     padding: 16px 2px 0;
-    margin-right: 10px;
+    @include bidi-style(margin-right, 10px, margin-left, 0);
     flex-shrink: 0;
   }
 
   .activity-body {
     padding: 16px 0 16px 2px;
+    @include rtl(padding, 16px 2px 16px 0);
     position: relative;
     display: flex;
     flex: 1;
@@ -4322,6 +4436,8 @@ footer {
     cursor: pointer;
     padding-left: 10px;
     padding-right: 27px;
+    @include rtl(padding-left, 27px);
+    @include rtl(padding-right, 10px);
 
     .activity-remove-icon-holder {
       width: 19px;
@@ -4487,7 +4603,7 @@ footer {
   justify-content: flex-end;
   align-items: center;
   padding: 28px 0 0 0;
-  margin-right: -40px;
+  @include bidi-style(margin-right, -40px, margin-left, 0);
 }
 
 .icon-marker {
@@ -4507,7 +4623,7 @@ footer {
 
 .ticketZoom > .overview-navigator {
   margin-top: 32px;
-  padding-left: 20px;
+  @include bidi-style(padding-left, 20px, padding-right, 0);
 }
 
 .ticket-article,
@@ -4529,7 +4645,7 @@ footer {
     margin-bottom: 8px;
     padding: 0 7px;
     text-align: center;
-    
+
     .ticketZoom-header & {
       &:hover,
       &:focus {
@@ -4606,13 +4722,14 @@ footer {
     }
 
     .article-meta-value {
-      margin-left: 8px;
+      @include bidi-style(margin-left, 8px, margin-right, 0);
     }
 
     .article-meta-icon {
       fill: white;
       vertical-align: top;
       margin: 2px 3px 0 0;
+      @include rtl(margin, 2px 0 0 3px);
     }
 
     .article-meta .text-muted {
@@ -4802,7 +4919,7 @@ footer {
     }
 
     .article-action-icon {
-      margin-right: 5px;
+      @include bidi-style(margin-right, 5px, margin-left, 0);
       vertical-align: top;
       width: 17px;
       height: 17px;
@@ -4923,11 +5040,11 @@ footer {
   }
 
   .pop-selectable:first-child {
-    border-radius: 4px 0 0 4px;
+    @include bidi-style(border-radius, 4px 0 0 4px, border-radius, 0 4px 4px 0);
   }
 
   .pop-selectable:last-child {
-    border-radius: 0 4px 4px 0;
+    @include bidi-style(border-radius, 0 4px 4px 0, border-radius, 4px 0 0 4px);
   }
 
   .pop-selectable:only-child {
@@ -4966,7 +5083,7 @@ footer {
     }
 
     .recipient-count {
-      margin-left: 3px;
+      @include bidi-style(margin-left, 3px, margin-right, 0);
       margin-top: 1px;
       line-height: 1;
     }
@@ -5012,7 +5129,7 @@ footer {
     }
 
     .list-entry-name {
-      margin-left: 18px;
+      @include bidi-style(margin-left, 18px, margin-right, 0);
     }
 
     .list-entry-type {
@@ -5038,11 +5155,13 @@ footer {
 
     .list-entry-type div:first-child {
       border-radius: 3px 0 0 3px;
+      @include rtl(border-radius, 0 3px 3px 0);
     }
 
     .list-entry-type div:last-child {
       border-left: none;
       border-radius: 0 3px 3px 0;
+      @include rtl(border-radius, 3px 0 0 3px);
     }
 
     .recipient-list input {
@@ -5114,6 +5233,7 @@ footer {
     .attachment {
       font-size: 13px;
       padding: 1px 10px 1px 7px;
+      @include rtl(padding, 1px 7px 1px 10px);
       cursor: default;
       position: relative;
       display: flex;
@@ -5124,7 +5244,7 @@ footer {
     }
 
       .attachment-name {
-        margin-right: 5px;
+        @include bidi-style(margin-right, 5px, margin-left, 0);
         min-width: 0;
         @extend .u-highlight;
       }
@@ -5132,7 +5252,7 @@ footer {
       .attachment-size {
         white-space: nowrap;
         float: right;
-        margin-right: 10px;
+        @include bidi-style(margin-right, 10px, margin-left, 0);
       }
 
       .attachment-delete {
@@ -5140,7 +5260,7 @@ footer {
         text-decoration: underline;
         display: none;
         white-space: nowrap;
-        margin-left: auto;
+        @include bidi-style(margin-left, auto, margin-right, 0);
         cursor: pointer;
         user-select: none;
       }
@@ -5158,7 +5278,7 @@ footer {
           fill: hsl(198,18%,72%);
           width: 9px;
           height: 9px;
-          margin-right: 5px;
+          @include bidi-style(margin-right, 5px, margin-left, 0);
         }
 
     .attachmentPlaceholder-inputHolder {
@@ -5176,7 +5296,7 @@ footer {
 
     .attachmentUpload-cancel {
       @extend .u-clickable;
-      margin-left: auto;
+      @include bidi-style(margin-left, auto, margin-right, 0);
       text-decoration: underline;
     }
 
@@ -5184,7 +5304,7 @@ footer {
       fill: hsl(198,18%,72%);
       width: 9px;
       height: 9px;
-      margin-right: 5px;
+      @include bidi-style(margin-right, 5px, margin-left, 0);
     }
 
     .attachmentUpload-progressBar {
@@ -5196,16 +5316,18 @@ footer {
     }
 
 .tabsSidebar-tabsSpacer {
-  padding-right: 62px !important;
+  @include bidi-style(padding-right, 62px !important, padding-left, 0);
 }
 
 .tabsSidebar-sidebarSpacer {
-  margin-right: $sidebarWidth;
+  @include bidi-style(margin-right, $sidebarWidth, margin-left, 0);
   transition: margin-right 500ms;
+  @include rtl(transition, margin-left 500ms);
 }
 
 .tabsSidebar-sidebarSpacer.is-closed {
   margin-right: 0;
+  @include rtl(margin-left, 0);
 }
 
 .tabsSidebar-holder {
@@ -5238,16 +5360,17 @@ footer {
   }
 
   .sidebar-header-headline {
-    padding: 33px 0 17px 25px;
+    padding: 33px 8px 17px 25px;
+    @include rtl(padding, 33px 25px 17px 8px);
     margin: 0 0 0 -20px;
+    @include rtl(margin, 0 -20px 0 0);
     line-height: 1;
-    padding-right: 8px;
     @extend .u-clickable, .u-textTruncate;
   }
 
   .sidebar-header-actions {
     flex: 1;
-    margin-right: 5px;
+    @include bidi-style(margin-right, 5px, margin-left, 0);
     display: flex;
     align-items: center;
 
@@ -5289,7 +5412,7 @@ footer {
 
   .tabsSidebar {
     position: absolute;
-    right: 0;
+    @include bidi-style(right, 0, left, auto);
     top: 0;
     bottom: 0;
     transition: 500ms;
@@ -5301,6 +5424,7 @@ footer {
 
   .tabsSidebar.is-closed {
     transform: translateX($sidebarWidth);
+    @include rtl(transform, translateX(-$sidebarWidth));
   }
 
   .tabsSidebar-tabs {
@@ -5308,7 +5432,7 @@ footer {
     flex-direction: column;
     justify-content: center;
     position: absolute;
-    left: -55px;
+    @include bidi-style(left, -55px, right, auto);
     top: 0;
     bottom: 0;
     pointer-events: none;
@@ -5346,12 +5470,12 @@ footer {
   }
 
   .tabsSidebar-tab:first-child {
-    border-top-left-radius: 8px;
+    @include bidi-style(border-top-left-radius, 8px, border-top-right-radius, 0);
     border-top: none;
   }
 
   .tabsSidebar-tab:last-child {
-    border-bottom-left-radius: 8px;
+    @include bidi-style(border-bottom-left-radius, 8px, border-bottom-right-radius, 0);
   }
 
   .tabsSidebar-tab .icon {
@@ -5435,7 +5559,7 @@ footer {
 
   .list-item-delete {
     padding: 0 10px;
-    margin-right: -3px;
+    @include bidi-style(margin-right, -3px, margin-left, 0);
     display: flex;
     align-items: center;
     justify-content: center;
@@ -5459,7 +5583,7 @@ footer {
   font-size: 11px;
   border-radius: 7px;
   padding: 0 5px;
-  margin-right: 2px;
+  @include bidi-style(margin-right, 2px, margin-left, 0);
 }
 
 .attributeBar {
@@ -5483,8 +5607,13 @@ footer {
   .newTicket .sidebar {
     width: 290px;
   }
-  .newTicket .form-control:not(:focus):not(.focus) {
+  .newTicket .form-control {
     border-color: hsl(0,0%,90%);
+
+    &:focus,
+    &.focus {
+      border-color: hsl(200,71%,59%);
+    }
   }
   .newTicket .article-form-top {
     margin-top: 15px;
@@ -5517,7 +5646,7 @@ footer {
     top: 34px;
     height: 100%;
     position: absolute;
-    margin-left: -34px;
+    @include bidi-style(margin-left, -34px, margin-right, 0);
     z-index: 1;
   }
 }
@@ -5607,7 +5736,7 @@ footer {
 
   .box-progress-body {
     flex: 1;
-    margin-left: 24px;
+    @include bidi-style(margin-left, 24px, margin-right, 0);
     display: flex;
     align-items: center;
     justify-content: center;
@@ -5646,7 +5775,7 @@ footer {
   height: 16px;
   fill: #ccc;
   vertical-align: top;
-  margin-right: 9px;
+  @include bidi-style(margin-right, 9px, margin-left, 0);
   margin-top: 11px;
   transform: scale(1.2);
 }
@@ -5760,6 +5889,10 @@ footer {
   padding-bottom: 14px;
 }
 
+.templates-manage fieldset {
+  margin: 0;
+}
+
 .template-attributes {
   margin: 17px 0 19px;
 }
@@ -5767,7 +5900,7 @@ footer {
   .template-attribute {
     height: 24px;
     line-height: 25px;
-    padding-left: 10px;
+    @include bidi-style(padding-left, 10px, padding-right, 0);
     margin-bottom: 2px;
     font-size: 13px;
     color: hsl(198,11%,59%);
@@ -5778,11 +5911,11 @@ footer {
 
     .template-attribute .key {
       text-transform: uppercase;
-      margin-right: 3px;
+      @include bidi-style(margin-right, 3px, margin-left, 0);
     }
 
     .template-attribute .value {
-      margin-left: 3px;
+      @include bidi-style(margin-left, 3px, margin-right, 0);
     }
 
     .template-attribute .delete {
@@ -5843,12 +5976,12 @@ footer {
   height: 18px;
 }
   .switchBackToUser-text {
-    margin-left: 10px;
+    @include bidi-style(margin-left, 10px, margin-right, 0);
   }
   .switchBackToUser-close {
     width: 40px;
     height: 40px;
-    margin-right: -10px;
+    @include bidi-style(margin-right, -10px, margin-left, 0);
     display: flex;
     align-items: center;
     justify-content: center;
@@ -5868,6 +6001,10 @@ footer {
   max-width: 660px;
   margin-top: 35px;
   margin-bottom: 35px;
+  
+  &.wizard {
+    margin: 35px auto;
+  }
 }
 .modal--large .modal-dialog {
   max-width: 740px;
@@ -5903,6 +6040,8 @@ footer {
     padding: 23px;
     position: absolute;
     right: 0;
+    @include rtl(right, auto);
+    @include rtl(left, 0);
     top: 0;
     @extend .u-clickable;
   }
@@ -5932,6 +6071,7 @@ footer {
     padding: 23px 23px 20px;
     border: none;
     display: flex;
+    @include rtl(text-align, left);
   }
 
   .modal-leftFooter,
@@ -5944,7 +6084,7 @@ footer {
 
 .modal.modal--local {
   display: block;
-  padding-left: 40px;
+  @include bidi-style(padding-left, 40px, padding-right, 0);
 
   .modal-backdrop {
     background: hsla(210,17%,93%,.55);
@@ -5964,6 +6104,8 @@ footer {
 }
 
 .dropdown-menu {
+  @extend .zIndex-5; // has to be behind modal windows and beneath notifications (popover)
+  position: absolute;
   margin: 0;
   padding: 0;
   min-width: 100%;
@@ -5975,13 +6117,14 @@ footer {
   border: none;
   box-shadow: none;
   overflow: hidden;
+  @include rtl(text-align, right);
 }
 
   .dropdown-menu kbd {
     background: none;
     color: inherit;
     padding: 2px 5px;
-    margin-left: 7px;
+    @include bidi-style(margin-left, 7px, margin-right, 0);
     line-height: 1;
     vertical-align: baseline;
     opacity: 0.5;
@@ -6073,7 +6216,7 @@ footer {
   }
 
   .dropdown-menu .badge {
-    padding-left: 10px;
+    @include bidi-style(padding-left, 10px, padding-right, 0);
   }
 
   .dropdown.dropdown--actions {
@@ -6098,7 +6241,7 @@ footer {
 
     .dropdown-selectedSpacer {
       width: 34px;
-      margin-left: auto;
+      @include bidi-style(margin-left, auto, margin-right, 0);
       justify-content: flex-end;
       opacity: 0;
 
@@ -6134,7 +6277,7 @@ footer {
   .dropdown-menu--has-submenu {
     overflow: hidden;
     background: none;
-    
+
     ul {
       background: hsl(234,10%,19%);
     }
@@ -6150,14 +6293,14 @@ footer {
   .dropdown.dropdown--actions .dropdown-controls {
     @extend .u-clickable;
     display: flex;
-    
+
     &:not(:hover):not(.is-active) {
       background: hsl(206,7%,28%);
     }
 
     .icon {
       fill: white;
-      margin-right: 10px;
+      @include bidi-style(margin-right, 10px, margin-left, 0);
       flex-shrink: 0;
     }
   }
@@ -6187,7 +6330,7 @@ footer {
 
   .recipientList-entry .recipientList-iconSpacer {
     width: 20px;
-    margin-left: -5px;
+    @include bidi-style(margin-left, -5px, margin-right, 0);
     display: flex;
     align-items: center;
     justify-content: center;
@@ -6211,7 +6354,7 @@ footer {
 
   .recipientList-name {
     color: white;
-    margin-left: 10px;
+    @include bidi-style(margin-left, 10px, margin-right, 0);
     flex: 1;
     @extend .u-textTruncate;
   }
@@ -6230,7 +6373,7 @@ footer {
   }
 
   .recipientList-icon.plus {
-    margin-left: 13px;
+    @include bidi-style(margin-left, 13px, margin-right, 0);
   }
 
   .recipientList--new {
@@ -6261,12 +6404,13 @@ footer {
 
 .userInfo-avatar {
   float: right;
+  @include rtl(float, left);
   position: relative;
 }
 
 .organizationInfo-avatar {
   @extend .userInfo-avatar;
-  padding: 18px 0 0 18px;
+  @include bidi-style(padding, 18px 0 0 18px, padding, 18px 18px 0 0);
 }
 
 .userList {
@@ -6285,7 +6429,7 @@ footer {
 
   .userList-name {
     @extend .u-textTruncate;
-    margin-left: 7px;
+    @include bidi-style(margin-left, 7px, margin-right, 0);
   }
 }
 
@@ -6303,19 +6447,23 @@ footer {
   cursor: default;
 }
 
-.checkbox.form-group .controls label {
-  padding: 2px 0;
-  font: inherit;
-  font-size: 13px;
-  margin-bottom: 0;
-  color: inherit;
-  text-transform: inherit;
-  letter-spacing: 0;
-  @extend .u-clickable;
+.checkbox,
+.radio {
+  &.form-group .controls label {
+    padding: 2px 0;
+    font: inherit;
+    font-size: 13px;
+    margin-bottom: 0;
+    color: inherit;
+    text-transform: inherit;
+    letter-spacing: 0;
+    @extend .u-clickable;
+  }
 }
 
 .userSearch-label {
-  margin: 11px 10px 0 0;
+  margin-top: 11px;
+  @include bidi-style(margin-right, 10px, margin-left, 0);
 }
 
 .userSearch .tab:not(.active) {
@@ -6344,6 +6492,7 @@ footer {
   display: flex;
   margin: 10px -20px 20px;
   padding: 0 20px 0 21px; /* margin-left: -1px */
+  @include rtl(padding, 0 21px 0 20px);
   position: relative;
 }
 
@@ -6357,10 +6506,12 @@ footer {
 
   &:first-child {
     border-radius: 7px 0 0 7px;
+    @include rtl(border-radius, 0 7px 7px 0);
   }
 
   &:last-child {
     border-radius: 0 7px 7px 0;
+    @include rtl(border-radius, 7px 0 0 7px);
   }
 
   &:only-child {
@@ -6405,7 +6556,7 @@ footer {
 }
 
 .form-item + .btn {
-  margin-left: 23px;
+  @include bidi-style(margin-left, 23px, margin-right, 0);
 }
 
 .scrollPageHeader {
@@ -6440,10 +6591,13 @@ footer {
     @extend .u-textTruncate;
   }
 
+.wizard {
+  margin: auto; // makes sure that the wizard is scrollable
+}
 
 .wizard-logo {
   fill: white;
-  margin-left: -25px;
+  @include bidi-style(margin-left, -25px, margin-right, 0);
   margin-bottom: 5px;
 }
 
@@ -6454,6 +6608,10 @@ footer {
   width: 400px;
   padding-bottom: 18px;
   margin-bottom: 20px;
+
+  &.wizard-slide--large {
+    width: 460px;
+  }
 }
 
 .wizard h2 {
@@ -6499,7 +6657,7 @@ label + .wizard-buttonList {
 
 .wizard-loadingText .loading {
   vertical-align: middle;
-  margin-right: 10px;
+  @include bidi-style(margin-right, 10px, margin-left, 0);
 }
 
 .wizard-aside {
@@ -6577,7 +6735,7 @@ label + .wizard-buttonList {
 
 .input-feedback {
   position: absolute;
-  padding-left: 10px;
+  @include bidi-style(padding-left, 10px, padding-right, 0);
   right: 1px;
   top: 1px;
   bottom: 1px;
@@ -6612,7 +6770,7 @@ label + .wizard-buttonList {
 }
 
 .progressTable td:first-child {
-  text-align: right;
+  text-align: end;
 }
 
 .progressTable progress {
@@ -6622,7 +6780,7 @@ label + .wizard-buttonList {
 }
 
 .progressTable .icon-checkmark {
-  margin-left: 10px;
+  @include bidi-style(margin-left, 10px, margin-right, 0);
   opacity: 0;
 }
 
@@ -6863,11 +7021,11 @@ label + .wizard-buttonList {
 }
 
 .profile-action {
-  margin-right: -20px;
+  @include bidi-style(margin-right, -20px, margin-left, 0);
 
   .dropdown-toggle {
     margin-top: -20px;
-    margin-right: -30px;
+    @include bidi-style(margin-right, -30px, margin-left, 0);
     margin-bottom: 8px;
     padding: 26px 40px 2px;
   }
@@ -6885,7 +7043,7 @@ label + .wizard-buttonList {
 }
 
 .profile-details {
-  margin-left: -50px;
+  @include bidi-style(margin-left, -50px, margin-right, 0);
 }
 
 .profile-ticketsPlaceholder {
@@ -6900,7 +7058,7 @@ label + .wizard-buttonList {
 
 .profile-detailsEntry {
   margin: 8px 0;
-  padding-left: 50px;
+  @include bidi-style(padding-left, 50px, padding-right, 0);
   width: 50%;
 }
 
@@ -6916,7 +7074,7 @@ label + .wizard-buttonList {
   align-items: center;
 
   .avatar {
-    margin-right: 10px;
+    @include bidi-style(margin-right, 10px, margin-left, 0);
   }
 }
 
@@ -7005,11 +7163,12 @@ label + .wizard-buttonList {
 }
 
 .overview-navigator {
-  @extend .horizontal;
+  display: flex;
 }
 
 .overview-navigator .pagination {
   margin: 0 0 0 10px;
+  @include rtl(margin, 0 10px 0 0);
 }
 
 .empty-space {
@@ -7040,10 +7199,12 @@ label + .wizard-buttonList {
 
   &:first-child {
     border-radius: 4px 4px 0 0;
+    @include rtl(border-radius, 0 0 4px 4px);
   }
 
   &:last-child {
     border-radius: 0 0 4px 4px;
+    @include rtl(border-radius, 4px 4px 0 0);
   }
 
   &:only-child {
@@ -7062,12 +7223,14 @@ label + .wizard-buttonList {
 
   .controls,
   input {
-    margin-right: 5px;
+    @include bidi-style(margin-right, 5px, margin-left, 0);
   }
 
   .controls-label {
     margin-left: 0;
     margin-right: 5px;
+    @include rtl(margin-left, 5px);
+    @include rtl(margin-right, 0);
   }
 
   select,
@@ -7172,12 +7335,19 @@ output {
       0 0 0 1px rgba(0,0,0,.05),
       0 1px 3px rgba(0,0,0,.2);
     background: white;
+    @include rtl(transform, translateX(70%));
   }
 }
 
 .zammad-switch input {
   display: none;
 
+  &[disabled] + label {
+    cursor: not-allowed;
+    background: hsl(210,17%,93%);
+    border-color: hsl(210,10%,85%);
+  }
+
   &:focus + label {
     transition: none;
     background: hsl(200,71%,59%);
@@ -7190,6 +7360,7 @@ output {
 
   &:checked + label:after {
     transform: translateX(70%);
+    @include rtl(transform, none);
   }
 }
 
@@ -7198,7 +7369,7 @@ output {
 }
 
 .horizontal-filter-text {
-  margin-right: 5px;
+  @include bidi-style(margin-right, 5px, margin-left, 0);
 }
 
 .filter-controls {
@@ -7231,7 +7402,7 @@ output {
   }
 
   &:not(:last-child) {
-    margin-right: 7px;
+    @include bidi-style(margin-right, 7px, margin-left, 0);
   }
 
   .icon {
@@ -7342,7 +7513,7 @@ output {
   }
 
   .settings-list-separator {
-    border-left-width: 3px;
+    @include bidi-style(border-left-width, 3px, border-right-width, 1px);
   }
 
   .text-muted {
@@ -7363,7 +7534,7 @@ output {
 
   th:not(:last-child),
   td:not(:last-child) {
-    border-right: none;
+    @include bidi-style(border-right-width, 0, border-left-width, 1px);
   }
 
   tr:not(:last-child) td,
@@ -7377,21 +7548,21 @@ output {
   }
 
   & > thead > tr > th:first-child {
-    border-top-left-radius: 4px;
+    @include bidi-style(border-top-left-radius, 4px, border-top-right-radius, 0);
   }
 
   & > thead > tr > th:last-child {
-    border-top-right-radius: 4px;
+    @include bidi-style(border-top-right-radius, 4px, border-top-left-radius, 0);
   }
 
   & > tbody:last-child > tr:last-child > td:first-child,
   & > tfoot:last-child > tr:last-child > td:first-child {
-    border-bottom-left-radius: 4px;
+    @include bidi-style(border-bottom-left-radius, 4px, border-bottom-right-radius, 0);
   }
 
   & > tbody:last-child > tr:last-child > td:last-child,
   & > tfoot:last-child > tr:last-child > td:last-child {
-    border-bottom-right-radius: 4px;
+    @include bidi-style(border-bottom-right-radius, 4px, border-bottom-left-radius, 0);
   }
 
   p {
@@ -7456,7 +7627,7 @@ output {
   margin: 0 14px;
   background: white;
   color: hsl(60,1%,34%);
-  border-right: 1px solid hsl(198,18%,86%);
+  @include bidi-style(border-right, 1px solid hsl(198,18%,86%), border-left, none);
   border-bottom: 1px solid hsl(198,18%,86%);
   border-radius: 3px 3px 0 0;
 
@@ -7482,7 +7653,7 @@ output {
     flex-basis: 100%;
     white-space: nowrap;
     background: hsl(197, 20%, 93%);
-    border-left: 1px solid hsl(198,18%,86%);
+    @include bidi-style(border-left, 1px solid hsl(198,18%,86%), border-right, none);
     border-top: 1px solid hsl(198,18%,86%);
     border-radius: 3px 3px 0 0;
   }
@@ -7506,11 +7677,11 @@ output {
   }
 
   &:first-child {
-    margin-left: 0;
+    @include bidi-style(margin-left, 0, margin-left, 14px);
   }
 
   &:last-child {
-    margin-right: 0;
+    @include bidi-style(margin-right, 0, margin-left, 14px);
   }
 }
 
@@ -7519,10 +7690,12 @@ output {
 
   .form-control {
     padding-right: 37px;
+    @include bidi-style(padding-right, 37px, padding-left, 12px);
   }
 
   .searchableSelect-main {
     position: relative;
+    line-height: 19px;
 
     &.form-control--small ~ .searchableSelect-autocomplete {
       top: 7px;
@@ -7545,14 +7718,14 @@ output {
     overflow: hidden;
     white-space: nowrap;
     display: block;
-    
+
     & + .icon {
-      margin-left: 10px;
+      @include bidi-style(margin-left, 10px, margin-right, 0);
     }
   }
 
   &.dropdown li {
-    
+
     &:hover:not(.is-active) {
       background: none;
     }
@@ -7576,6 +7749,7 @@ output {
     display: flex;
     pointer-events: none;
     white-space: pre;
+    line-height: 19px;
   }
 
   .searchableSelect-autocomplete-invisible {
@@ -7652,6 +7826,10 @@ output {
 
   h2 {
     margin-bottom: 0;
+    
+    .action-form-status .icon {
+      margin-top: 0;
+    }
   }
 
   .action-block,
@@ -7681,14 +7859,12 @@ output {
   }
 
   .action-label {
-    margin-left: auto;
     background: hsl(197,20%,93%);
     border: 1px solid hsl(197,20%,88%);
     align-self: flex-start;
     padding: 5px 10px;
-    margin-right: -25px;
-    margin-top: -4px;
-    margin-bottom: -5px;
+    margin: -4px -25px -5px auto;
+    @include rtl(margin, -4px auto -5px -25px);
     color: hsl(197,16%,65%);
     cursor: default;
   }
@@ -7704,7 +7880,7 @@ output {
 
   .action-controls {
     display: flex;
-    margin-left: auto;
+    @include bidi-style(margin-left, auto, margin-right, 0);
     align-self: flex-end;
 
     .btn {
@@ -7853,7 +8029,7 @@ output {
     .icon {
       vertical-align: middle;
       margin-top: -3px;
-      margin-right: 5px;
+      @include bidi-style(margin-right, 5px, margin-left, 0);
     }
 
     a {
@@ -7906,7 +8082,7 @@ output {
   height: 133px;
 
   .loading-text {
-    margin-left: 10px;
+    @include bidi-style(margin-left, 10px, margin-right, 0);
   }
 }
 
@@ -7971,14 +8147,14 @@ output {
   white-space: nowrap;
 
   .status-badge {
-    margin-left: 2px;
+    @include bidi-style(margin-left, 2px, margin-right, 0);
     vertical-align: middle;
     height: 100%;
   }
 }
 
 .chat-status {
-  margin-left: 10px;
+  @include bidi-style(margin-left, 10px, margin-right, 0);
 
   &[data-status='online'] .icon {
     fill: $supergood-color;
@@ -8041,7 +8217,7 @@ output {
 
   .icon {
     fill: hsl(210,5%,78%);
-    margin-right: 8px;
+    @include bidi-style(margin-right, 8px, margin-left, 0);
   }
 }
 
@@ -8051,7 +8227,7 @@ output {
   font-size: 13px;
   line-height: 18px;
   overflow: auto;
-  border-right: 1px solid hsl(0,0%,91%);
+  @include bidi-style(border-right, 1px solid hsl(0,0%,91%), border-left, none);
   border-left: 1px solid hsl(0,0%,91%);
   position: relative;
 }
@@ -8097,7 +8273,7 @@ output {
 }
 
 .chat-message--agent {
-  margin-left: auto;
+  @include bidi-style(margin-left, auto, margin-right, 0);
   background: hsl(199,44%,93%);
   align-self: flex-end;
 }
@@ -8116,13 +8292,13 @@ output {
 }
 
 .chat-loader {
-  margin-right: -4px;
+  @include bidi-style(margin-right, -4px, margin-left, 0);
 
   .icon {
     width: 12px;
     height: 12px;
     fill: hsl(0,0%,90%);
-    margin-left: -4px;
+    @include bidi-style(margin-left, -4px, margin-right, 0);
     vertical-align: middle;
     animation: ease-in-out load-fade 600ms infinite alternate;
   }
@@ -8160,9 +8336,14 @@ output {
 }
 
 .chat-input {
-  margin-right: 10px;
-  max-height: 50vh;
-  overflow: auto;
+  @include bidi-style(margin-right, 10px, margin-left, 0);
+  flex-grow: 1;
+  position: relative;
+
+  .form-control {
+    overflow: auto;
+    max-height: 50vh;
+  }
 }
 
 .browser {
@@ -8204,11 +8385,11 @@ output {
   .browser-input {
     position: relative;
     flex: 1;
-    margin-right: 10px;
+    @include bidi-style(margin-right, 10px, margin-left, 0);
 
     input {
       min-width: 0;
-      padding-right: 40px;
+      @include bidi-style(padding-right, 40px, padding-left, 12px);
 
       &.is-loading + .loading.icon {
         display: block;
@@ -8217,7 +8398,7 @@ output {
 
     .loading.icon {
       position: absolute;
-      right: 11px;
+      @include bidi-style(right, 11px, left, auto);
       top: 10px;
       display: none;
     }
@@ -8536,18 +8717,18 @@ output {
   cursor: grabbing;
   overflow: hidden;
   user-select: none;
-  
+
   &.is-visible {
     display: block;
   }
-  
+
   &-backdrop {
     @extend .fit;
     background: hsla(231,20%,8%,.8);
     opacity: 0;
     will-change: opacity;
   }
-  
+
   &-circle {
     margin: 35px auto;
     background: hsl(207,7%,29%);
@@ -8565,11 +8746,11 @@ output {
     right: 0;
     will-change: transform, opacity;
     visibility: hidden;
-    
+
     &--top {
       top: 0;
     }
-    
+
     &--bottom {
       bottom: 0;
     }
@@ -8578,7 +8759,7 @@ output {
       fill: currentColor;
       opacity: 1;
     }
-    
+
     &-label {
       width: 50%;
       margin: 10px 0;
@@ -8609,7 +8790,7 @@ output {
     position: absolute;
     visibility: hidden;
     will-change: opacity, transition;
-    
+
     &-inner {
       margin: 37px 25px;
       display: flex;
@@ -8622,10 +8803,10 @@ output {
   &-assign {
     padding-bottom: 50px;
     bottom: -50px; // extra space for bounce animation
-    
+
     .batch-overlay-box-inner {
       max-height: 310px;
-    
+
       @media screen and (min-height: 1000px) {
         max-height: 465px;
       }
@@ -8633,7 +8814,7 @@ output {
 
     &-group {
       box-shadow: 0 0 35px hsla(0,0%,0%,.5);
-      
+
       .batch-overlay-box-inner {
         margin-top: 42px;
         margin-bottom: 10px;
@@ -8655,7 +8836,7 @@ output {
       padding: 13px;
       width: 116px;
       height: 155px;
-       
+
       &.is-hovered {
         .avatar {
           border-color: $highlight-color;
@@ -8695,12 +8876,12 @@ output {
     .batch-overlay-box-inner {
       max-height: 146px;
       margin: 24px 12px;
-    
+
       @media screen and (min-height: 800px) {
         max-height: 292px;
       }
     }
-    
+
     &-entry {
       margin: 13px;
       border: 4px solid hsl(231,5%,30%);
@@ -8713,7 +8894,7 @@ output {
       align-items: center;
       justify-content: center;
       font-size: 0.9em;
-      
+
       &.is-hovered {
         border-color: $highlight-color;
         transform: scale(1.05);
@@ -8730,7 +8911,7 @@ output {
   width: 250px;
   height: 40px;
   will-change: transform;
-  
+
   &-item {
     position: absolute;
     left: 0;
@@ -8742,11 +8923,11 @@ output {
     padding: 11px 0 9px 11px;
     box-shadow: 0 0 10px hsla(0,0%,0%,.28);
     will-change: transform;
-    
+
     a {
       color: inherit;
     }
-    
+
     td {
       display: block;
       padding: 0 12px;
@@ -8754,11 +8935,11 @@ output {
       text-overflow: ellipsis;
       overflow: hidden;
       flex-shrink: 0;
-      
+
       &:nth-child(3) {
         flex-shrink: 1;
       }
-      
+
       &:nth-child(n+4) {
         display: none;
       }
@@ -8780,7 +8961,7 @@ output {
     justify-content: center;
     box-shadow: 0 0 10px hsla(0,0%,0%,.28);
     will-change: transform;
-    
+
     &:empty {
       display: none;
     }
@@ -8956,19 +9137,19 @@ body.fit {
 }
 
 .align-left {
-  margin-right: auto;
+  @include bidi-style(margin-right, auto, margin-left, 0);
 }
 
 .align-right {
-  margin-left: auto;
+  @include bidi-style(margin-left, auto, margin-right, 0);
 }
 
 .space-left {
-  margin-left: 10px;
+  @include bidi-style(margin-left, 10px, margin-right, 0);
 }
 
 .space-right {
-  margin-right: 10px;
+  @include bidi-style(margin-right, 10px, margin-left, 0);
 }
 
 .align-center {
diff --git a/app/controllers/application_controller/handles_errors.rb b/app/controllers/application_controller/handles_errors.rb
index 10a5b5141..5ada95335 100644
--- a/app/controllers/application_controller/handles_errors.rb
+++ b/app/controllers/application_controller/handles_errors.rb
@@ -15,22 +15,26 @@ module ApplicationController::HandlesErrors
   def not_found(e)
     logger.error e
     respond_to_exception(e, :not_found)
+    http_log
   end
 
   def unprocessable_entity(e)
     logger.error e
     respond_to_exception(e, :unprocessable_entity)
+    http_log
   end
 
   def internal_server_error(e)
     logger.error e
     respond_to_exception(e, :internal_server_error)
+    http_log
   end
 
   def unauthorized(e)
     error = humanize_error(e.message)
     response.headers['X-Failure'] = error.fetch(:error_human, error[:error])
     respond_to_exception(e, :unauthorized)
+    http_log
   end
 
   private
diff --git a/app/controllers/concerns/integration/import_job_base.rb b/app/controllers/concerns/integration/import_job_base.rb
new file mode 100644
index 000000000..493351ec7
--- /dev/null
+++ b/app/controllers/concerns/integration/import_job_base.rb
@@ -0,0 +1,89 @@
+module Integration::ImportJobBase
+  extend ActiveSupport::Concern
+
+  def job_try_index
+    job_index(
+      dry_run:       true,
+      take_finished: params[:finished] == 'true'
+    )
+  end
+
+  def job_try_create
+    ImportJob.dry_run(name: import_backend_namespace, payload: payload_dry_run)
+    render json: {
+      result: 'ok',
+    }
+  end
+
+  def job_start_index
+    job_index(dry_run: false)
+  end
+
+  def job_start_create
+    if !ImportJob.exists?(name: import_backend_namespace, finished_at: nil)
+      job = ImportJob.create(name: import_backend_namespace, payload: payload_import)
+      job.delay.start
+    end
+    render json: {
+      result: 'ok',
+    }
+  end
+
+  def payload_dry_run
+    params
+  end
+
+  def payload_import
+    import_setting
+  end
+
+  private
+
+  def answer_with
+    result = yield
+    render json: result.merge(result: 'ok')
+  rescue => e
+    logger.error(e)
+    render json: {
+      result:  'failed',
+      message: e.message,
+    }
+  end
+
+  def import_setting
+    Setting.get(import_setting_name)
+  end
+
+  def import_setting_name
+    "#{import_backend_name.downcase}_config"
+  end
+
+  def import_backend_namespace
+    "Import::#{import_backend_name}"
+  end
+
+  def import_backend_name
+    self.class.name.split('::').last.sub('Controller', '')
+  end
+
+  def job_index(dry_run:, take_finished: true)
+    job = ImportJob.find_by(
+      name:        import_backend_namespace,
+      dry_run:     dry_run,
+      finished_at: nil
+    )
+    if !job && take_finished
+      job = ImportJob.where(
+        name:    import_backend_namespace,
+        dry_run: dry_run
+      ).order(created_at: :desc).limit(1).first
+    end
+
+    if job
+      model_show_render_item(job)
+    else
+      render json: {}
+    end
+  end
+
+end
diff --git a/app/controllers/form_controller.rb b/app/controllers/form_controller.rb
index cb3b68a9d..9e1328748 100644
--- a/app/controllers/form_controller.rb
+++ b/app/controllers/form_controller.rb
@@ -5,7 +5,7 @@ class FormController < ApplicationController
   before_action :cors_preflight_check_execute
   after_action :set_access_control_headers_execute
 
-  def config
+  def configuration
     return if !enabled?
     return if !fingerprint_exists?
     return if limit_reached?
@@ -16,17 +16,17 @@ class FormController < ApplicationController
 
     endpoint = "#{http_type}://#{fqdn}#{api_path}/form_submit"
 
-    config = {
+    result = {
       enabled:  Setting.get('form_ticket_create'),
       endpoint: endpoint,
       token:    token_gen(params[:fingerprint])
     }
 
     if params[:test] && current_user && current_user.permissions?('admin.channel_formular')
-      config[:enabled] = true
+      result[:enabled] = true
     end
 
-    render json: config, status: :ok
+    render json: result, status: :ok
   end
 
   def submit
@@ -127,11 +127,12 @@ class FormController < ApplicationController
     )
 
     if params[:file]
+
       params[:file].each { |file|
         Store.add(
           object: 'Ticket::Article',
           o_id: article.id,
-          data: File.read(file.tempfile),
+          data: file.read,
           filename: file.original_filename,
           preferences: {
             'Mime-Type' => file.content_type,
@@ -154,7 +155,7 @@ class FormController < ApplicationController
   private
 
   def token_gen(fingerprint)
-    crypt = ActiveSupport::MessageEncryptor.new(Setting.get('application_secret'))
+    crypt = ActiveSupport::MessageEncryptor.new(Setting.get('application_secret')[0, 32])
     fingerprint = "#{Base64.strict_encode64(Setting.get('fqdn'))}:#{Time.zone.now.to_i}:#{Base64.strict_encode64(fingerprint)}"
     Base64.strict_encode64(crypt.encrypt_and_sign(fingerprint))
   end
@@ -166,7 +167,7 @@ class FormController < ApplicationController
       return false
     end
     begin
-      crypt = ActiveSupport::MessageEncryptor.new(Setting.get('application_secret'))
+      crypt = ActiveSupport::MessageEncryptor.new(Setting.get('application_secret')[0, 32])
       result = crypt.decrypt_and_verify(Base64.decode64(token))
     rescue
       Rails.logger.info 'Invalid token for form!'
diff --git a/app/controllers/import_zendesk_controller.rb b/app/controllers/import_zendesk_controller.rb
index e0ab2c006..62d56093e 100644
--- a/app/controllers/import_zendesk_controller.rb
+++ b/app/controllers/import_zendesk_controller.rb
@@ -7,7 +7,7 @@ class ImportZendeskController < ApplicationController
     return if setup_done_response
 
     # validate
-    if !params[:url] || params[:url] !~ %r{^(http|https)://.+?$}
+    if params[:url].blank? || params[:url] !~ %r{^(http|https)://.+?$}
       render json: {
         result: 'invalid',
         message: 'Invalid URL!',
@@ -40,8 +40,8 @@ class ImportZendeskController < ApplicationController
       return
     end
 
-    # since 2016-10-15 a redirect to a signup page has been implemented
-    if response.body =~ /(Take it for a risk-free|Take it for a risk-free)/i
+    # since 2016-10-15 a redirect to a marketing page has been implemented
+    if response.body !~ /#{params[:url]}/
       render json: {
         result: 'invalid',
         message_human: 'Hostname not found!',
@@ -49,7 +49,9 @@ class ImportZendeskController < ApplicationController
       return
     end
 
-    Setting.set('import_zendesk_endpoint', "#{params[:url]}api/v2")
+    endpoint = "#{params[:url]}/api/v2"
+    endpoint.gsub!(%r{([^:])//+}, '\\1/')
+    Setting.set('import_zendesk_endpoint', endpoint)
 
     render json: {
       result: 'ok',
@@ -92,6 +94,7 @@ class ImportZendeskController < ApplicationController
   def import_start
     return if setup_done_response
     Setting.set('import_mode', true)
+    Setting.set('import_backend', 'zendesk')
 
     # start migration
     Import::Zendesk.delay.start_bg
diff --git a/app/controllers/integration/check_mk_controller.rb b/app/controllers/integration/check_mk_controller.rb
new file mode 100644
index 000000000..3d9fb6373
--- /dev/null
+++ b/app/controllers/integration/check_mk_controller.rb
@@ -0,0 +1,138 @@
+# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
+
+class Integration::CheckMkController < ApplicationController
+  skip_before_action :verify_csrf_token
+  before_action :check_configured
+
+  def update
+
+    # check params
+    raise Exceptions::UnprocessableEntity, 'event_id is missing!' if params[:event_id].blank?
+    raise Exceptions::UnprocessableEntity, 'state is missing!' if params[:state].blank?
+    raise Exceptions::UnprocessableEntity, 'host is missing!' if params[:host].blank?
+
+    # search for open ticket
+    auto_close = Setting.get('check_mk_auto_close')
+    auto_close_state_id = Setting.get('check_mk_auto_close_state_id')
+    group_id = Setting.get('check_mk_group_id')
+    state_recovery_match = '(OK|UP)'
+
+    # check if ticket with host is open
+    customer = User.lookup(id: 1)
+
+    # follow up detection by meta data
+    integration = 'check_mk'
+    open_states = Ticket::State.by_category(:open)
+    ticket_ids = Ticket.where(state: open_states).order(created_at: :desc).limit(5000).pluck(:id)
+    ticket_ids_found = []
+    ticket_ids.each { |ticket_id|
+      ticket = Ticket.find_by(id: ticket_id)
+      next if !ticket
+      next if !ticket.preferences
+      next if !ticket.preferences[integration]
+      next if !ticket.preferences[integration]['host']
+      next if ticket.preferences[integration]['host'] != params[:host]
+      next if ticket.preferences[integration]['service'] != params[:service]
+
+      # found open ticket for service+host
+      ticket_ids_found.push ticket.id
+    }
+
+    # new ticket, set meta data
+    title = "#{params[:host]} is #{params[:state]}"
+    body = "EventID: #{params[:event_id]}
+Host: #{params[:host]}
+Service: #{params[:service]}
+State: #{params[:state]}
+Text: #{params[:text]}
+RemoteIP: #{request.remote_ip}
+UserAgent: #{request.env['HTTP_USER_AGENT']}
+"
+
+    # add article
+    if params[:state].present? && ticket_ids_found.present?
+      ticket_ids_found.each { |ticket_id|
+        ticket = Ticket.find_by(id: ticket_id)
+        next if !ticket
+        article = Ticket::Article.create!(
+          ticket_id: ticket_id,
+          type_id: Ticket::Article::Type.find_by(name: 'web').id,
+          sender_id: Ticket::Article::Sender.find_by(name: 'Customer').id,
+          body: body,
+          subject: title,
+          internal: false,
+        )
+      }
+      if (!auto_close && params[:state].match(/#{state_recovery_match}/i)) || !params[:state].match(/#{state_recovery_match}/i)
+        render json: {
+          result: 'ticket already open, added note',
+          ticket_ids: ticket_ids_found,
+        }
+        return
+      end
+    end
+
+    # check if service is recovered
+    if auto_close && params[:state].present? && params[:state].match(/#{state_recovery_match}/i)
+      if ticket_ids_found.blank?
+        render json: {
+          result: 'no open tickets found, ignore action',
+        }
+        return
+      end
+      state = Ticket::State.lookup(id: auto_close_state_id)
+      ticket_ids_found.each { |ticket_id|
+        ticket = Ticket.find_by(id: ticket_id)
+        next if !ticket
+        ticket.state_id = auto_close_state_id
+        ticket.save!
+      }
+      render json: {
+        result: "closed tickets with ids #{ticket_ids_found.join(',')}",
+        ticket_ids: ticket_ids_found,
+      }
+      return
+    end
+
+    ticket = Ticket.create!(
+      group_id: group_id,
+      customer_id: customer.id,
+      title: title,
+      preferences: {
+        check_mk: {
+          host: params[:host],
+          service: params[:service],
+        },
+      }
+    )
+    article = Ticket::Article.create!(
+      ticket_id: ticket.id,
+      type_id: Ticket::Article::Type.find_by(name: 'web').id,
+      sender_id: Ticket::Article::Sender.find_by(name: 'Customer').id,
+      body: body,
+      subject: title,
+      internal: false,
+    )
+
+    render json: {
+      result: "new ticket created (ticket id: #{ticket.id})",
+      ticket_id: ticket.id,
+      ticket_number: ticket.number,
+    }
+  end
+
+  private
+
+  def check_configured
+    http_log_config facility: 'check_mk'
+
+    if !Setting.get('check_mk_integration')
+      raise Exceptions::UnprocessableEntity, 'Feature is disable, please contact your admin to enable it!'
+    end
+
+    if Setting.get('check_mk_token') != params[:token]
+      raise Exceptions::UnprocessableEntity, 'Invalid token!'
+    end
+  end
+
+end
diff --git a/app/controllers/integration/exchange_controller.rb b/app/controllers/integration/exchange_controller.rb
new file mode 100644
index 000000000..74d7f178c
--- /dev/null
+++ b/app/controllers/integration/exchange_controller.rb
@@ -0,0 +1,71 @@
+# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
+
+class Integration::ExchangeController < ApplicationController
+  include Integration::ImportJobBase
+
+  prepend_before_action { authentication_check(permission: 'admin.integration.exchange') }
+
+  def autodiscover
+    answer_with do
+      client = Autodiscover::Client.new(
+        email:    params[:user],
+        password: params[:password],
+      )
+
+      {
+        endpoint: client.autodiscover.ews_url,
+      }
+    end
+  end
+
+  def folders
+    answer_with do
+      Sequencer.process('Import::Exchange::AvailableFolders',
+                        parameters: {
+                          ews_config: {
+                            endpoint: params[:endpoint],
+                            user:     params[:user],
+                            password: params[:password],
+                          }
+                        })
+    end
+  end
+
+  def mapping
+    answer_with do
+      raise 'Please select at least one folder.' if params[:folders].blank?
+
+      examples = Sequencer.process('Import::Exchange::AttributesExamples',
+                                   parameters: {
+                                     ews_folder_ids: params[:folders],
+                                     ews_config:     {
+                                       endpoint: params[:endpoint],
+                                       user:     params[:user],
+                                       password: params[:password],
+                                     }
+                                   })
+      examples.tap do |result|
+        raise 'No entries found in selected folder(s).' if result[:attributes].blank?
+      end
+    end
+  end
+
+  private
+
+  # currently a workaround till LDAP is migrated to Sequencer
+  def payload_dry_run
+    {
+      ews_attributes: params[:attributes],
+      ews_folder_ids: params[:folders],
+      ews_config:     {
+        endpoint: params[:endpoint],
+        user:     params[:user],
+        password: params[:password],
+      }
+    }
+  end
+
+  def payload_import
+    nil
+  end
+end
diff --git a/app/controllers/integration/idoit_controller.rb b/app/controllers/integration/idoit_controller.rb
new file mode 100644
index 000000000..ee4960c5e
--- /dev/null
+++ b/app/controllers/integration/idoit_controller.rb
@@ -0,0 +1,51 @@
+# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
+
+class Integration::IdoitController < ApplicationController
+  prepend_before_action -> { authentication_check(permission: ['agent.integration.idoit', 'admin.integration.idoit']) }, except: [:verify]
+  prepend_before_action -> { authentication_check(permission: ['admin.integration.idoit']) }, only: [:verify]
+
+  def verify
+    response = ::Idoit.verify(params[:api_token], params[:endpoint], params[:client_id])
+    render json: {
+      result: 'ok',
+      response: response,
+    }
+  rescue => e
+    logger.error e
+
+    render json: {
+      result:  'failed',
+      message: e.message,
+    }
+  end
+
+  def query
+    response = ::Idoit.query(params[:method], params[:filter])
+    render json: {
+      result: 'ok',
+      response: response,
+    }
+  rescue => e
+    logger.error e
+
+    render json: {
+      result:  'failed',
+      message: e.message,
+    }
+  end
+
+  def update
+    params[:object_ids] ||= []
+    ticket = Ticket.find(params[:ticket_id])
+    access!(ticket, 'read')
+    ticket.preferences[:idoit] ||= {}
+    ticket.preferences[:idoit][:object_ids] ||= []
+    ticket.preferences[:idoit][:object_ids].concat(params[:object_ids])
+    ticket.save!
+
+    render json: {
+      result: 'ok',
+    }
+  end
+
+end
diff --git a/app/controllers/integration/ldap_controller.rb b/app/controllers/integration/ldap_controller.rb
index 16d2393fb..cbf30654c 100644
--- a/app/controllers/integration/ldap_controller.rb
+++ b/app/controllers/integration/ldap_controller.rb
@@ -4,6 +4,8 @@ require 'ldap/user'
 require 'ldap/group'
 
 class Integration::LdapController < ApplicationController
+  include Integration::ImportJobBase
+
   prepend_before_action { authentication_check(permission: 'admin.integration.ldap') }
 
   def discover
@@ -60,48 +62,4 @@ class Integration::LdapController < ApplicationController
       message: e.message,
     }
   end
-
-  def job_try_index
-    job_index(
-      dry_run:       true,
-      take_finished: params[:finished] == 'true'
-    )
-  end
-
-  def job_try_create
-    ImportJob.dry_run(name: 'Import::Ldap', payload: params)
-    render json: {
-      result: 'ok',
-    }
-  end
-
-  def job_start_index
-    job_index(dry_run: false)
-  end
-
-  def job_start_create
-    backend = 'Import::Ldap'
-    if !ImportJob.exists?(name: backend, finished_at: nil)
-      job = ImportJob.create(name: backend, payload: Setting.get('ldap_config'))
-      job.delay.start
-    end
-    render json: {
-      result: 'ok',
-    }
-  end
-
-  private
-
-  def job_index(dry_run:, take_finished: true)
-    job = ImportJob.find_by(name: 'Import::Ldap', dry_run: dry_run, finished_at: nil)
-    if !job && take_finished
-      job = ImportJob.where(name: 'Import::Ldap', dry_run: dry_run).order(created_at: :desc).limit(1).first
-    end
-
-    if job
-      model_show_render_item(job)
-    else
-      render json: {}
-    end
-  end
 end
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index affee2e97..e0db600da 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -62,6 +62,7 @@ class SearchController < ApplicationController
         items.each { |item|
           require item[:type].to_filename
           record = Kernel.const_get(item[:type]).lookup(id: item[:id])
+          next if !record
           assets = record.assets(assets)
           result.push item
         }
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 81b1244c1..7f5e1acf6 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -282,12 +282,12 @@ class SessionsController < ApplicationController
     assets = {}
     sessions_clean = []
     SessionHelper.list.each { |session|
-      next if !session.data['user_id']
+      next if session.data['user_id'].blank?
       sessions_clean.push session
-      if session.data['user_id']
-        user = User.lookup(id: session.data['user_id'])
-        assets = user.assets(assets)
-      end
+      next if session.data['user_id']
+      user = User.lookup(id: session.data['user_id'])
+      next if !user
+      assets = user.assets(assets)
     }
     render json: {
       sessions: sessions_clean,
diff --git a/app/controllers/taskbar_controller.rb b/app/controllers/taskbar_controller.rb
index dd4cd7b61..ade959ade 100644
--- a/app/controllers/taskbar_controller.rb
+++ b/app/controllers/taskbar_controller.rb
@@ -21,14 +21,18 @@ class TaskbarController < ApplicationController
   def update
     taskbar = Taskbar.find(params[:id])
     access(taskbar)
-    taskbar.update_attributes!(Taskbar.param_cleanup(params))
+    taskbar.with_lock do
+      taskbar.update_attributes!(Taskbar.param_cleanup(params))
+    end
     model_update_render_item(taskbar)
   end
 
   def destroy
     taskbar = Taskbar.find(params[:id])
     access(taskbar)
-    taskbar.destroy
+    taskbar.with_lock do
+      taskbar.destroy
+    end
     model_destroy_render_item()
   end
 
diff --git a/app/controllers/tickets_controller.rb b/app/controllers/tickets_controller.rb
index 69aa617ac..b6c7a6f07 100644
--- a/app/controllers/tickets_controller.rb
+++ b/app/controllers/tickets_controller.rb
@@ -332,15 +332,6 @@ class TicketsController < ApplicationController
     end
     access!(ticket_slave, 'full')
 
-    # check different ticket ids
-    if ticket_slave.id == ticket_master.id
-      render json: {
-        result: 'failed',
-        message: 'Can\'t merge ticket with it self!',
-      }
-      return
-    end
-
     # merge ticket
     ticket_slave.merge_to(
       ticket_id: ticket_master.id,
diff --git a/app/controllers/time_accountings_controller.rb b/app/controllers/time_accountings_controller.rb
index f2acb1a09..e393b1c51 100644
--- a/app/controllers/time_accountings_controller.rb
+++ b/app/controllers/time_accountings_controller.rb
@@ -8,7 +8,7 @@ class TimeAccountingsController < ApplicationController
     year = params[:year] || Time.zone.now.year
     month = params[:month] || Time.zone.now.month
 
-    start_periode = Date.parse("#{year}-#{month}-01")
+    start_periode = Time.zone.parse("#{year}-#{month}-01")
     end_periode = start_periode.end_of_month
 
     time_unit = {}
@@ -93,9 +93,84 @@ class TimeAccountingsController < ApplicationController
           name: 'Time Units Total',
           width: 10,
         },
+        {
+          name: 'Created at',
+          width: 10,
+        },
+        {
+          name: 'Closed at',
+          width: 10,
+        },
+        {
+          name: 'Close Escalation At',
+          width: 10,
+        },
+        {
+          name: 'Close In Min',
+          width: 10,
+        },
+        {
+          name: 'Close Diff In Min',
+          width: 10,
+        },
+        {
+          name: 'First Response At',
+          width: 10,
+        },
+        {
+          name: 'First Response Escalation At',
+          width: 10,
+        },
+        {
+          name: 'First Response In Min',
+          width: 10,
+        },
+        {
+          name: 'First Response Diff In Min',
+          width: 10,
+        },
+        {
+          name: 'Update Escalation At',
+          width: 10,
+        },
+        {
+          name: 'Update In Min',
+          width: 10,
+        },
+        {
+          name: 'Update Diff In Min',
+          width: 10,
+        },
+        {
+          name: 'Last Contact At',
+          width: 10,
+        },
+        {
+          name: 'Last Contact Agent At',
+          width: 10,
+        },
+        {
+          name: 'Last Contact Customer At',
+          width: 10,
+        },
+        {
+          name: 'Article Count',
+          width: 10,
+        },
+        {
+          name: 'Escalation At',
+          width: 10,
+        },
       ]
       result = []
       results.each { |row|
+        row[:ticket].keys.each { |field|
+          next if row[:ticket][field].blank?
+          next if !row[:ticket][field].is_a?(ActiveSupport::TimeWithZone)
+
+          row[:ticket][field] = row[:ticket][field].iso8601
+        }
+
         result_row = [
           row[:ticket]['number'],
           row[:ticket]['title'],
@@ -104,6 +179,23 @@ class TimeAccountingsController < ApplicationController
           row[:agent],
           row[:time_unit],
           row[:ticket]['time_unit'],
+          row[:ticket]['created_at'],
+          row[:ticket]['close_at'],
+          row[:ticket]['close_escalation_at'],
+          row[:ticket]['close_in_min'],
+          row[:ticket]['close_diff_in_min'],
+          row[:ticket]['first_response_at'],
+          row[:ticket]['first_response_escalation_at'],
+          row[:ticket]['first_response_in_min'],
+          row[:ticket]['first_response_diff_in_min'],
+          row[:ticket]['update_escalation_at'],
+          row[:ticket]['update_in_min'],
+          row[:ticket]['update_diff_in_min'],
+          row[:ticket]['last_contact_at'],
+          row[:ticket]['last_contact_agent_at'],
+          row[:ticket]['last_contact_customer_at'],
+          row[:ticket]['article_count'],
+          row[:ticket]['escalation_at'],
         ]
         result.push result_row
       }
@@ -125,7 +217,7 @@ class TimeAccountingsController < ApplicationController
     year = params[:year] || Time.zone.now.year
     month = params[:month] || Time.zone.now.month
 
-    start_periode = Date.parse("#{year}-#{month}-01")
+    start_periode = Time.zone.parse("#{year}-#{month}-01")
     end_periode = start_periode.end_of_month
 
     time_unit = {}
@@ -205,7 +297,7 @@ class TimeAccountingsController < ApplicationController
     year = params[:year] || Time.zone.now.year
     month = params[:month] || Time.zone.now.month
 
-    start_periode = Date.parse("#{year}-#{month}-01")
+    start_periode = Time.zone.parse("#{year}-#{month}-01")
     end_periode = start_periode.end_of_month
 
     time_unit = {}
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 8376b1c68..1ff08c32c 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -126,6 +126,16 @@ class UsersController < ApplicationController
       if admin_account_exists && !params[:signup]
         raise Exceptions::UnprocessableEntity, 'Only signup with not authenticate user possible!'
       end
+
+      # check if user already exists
+      if clean_params[:email].blank?
+        raise Exceptions::UnprocessableEntity, 'Attribute \'email\' required!'
+      end
+
+      # check if user already exists
+      exists = User.find_by(email: clean_params[:email].downcase.strip)
+      raise Exceptions::UnprocessableEntity, 'Email address is already used for other user.' if exists
+
       user = User.new(clean_params)
       user.associations_from_param(params)
       user.updated_by_id = 1
@@ -165,11 +175,6 @@ class UsersController < ApplicationController
       user.associations_from_param(params)
     end
 
-    # check if user already exists
-    if !user.email.empty?
-      exists = User.where(email: user.email.downcase).first
-      raise Exceptions::UnprocessableEntity, 'User already exists!' if exists
-    end
     user.save!
 
     # if first user was added, set system init done
@@ -177,7 +182,7 @@ class UsersController < ApplicationController
       Setting.set('system_init_done', true)
 
       # fetch org logo
-      if !user.email.empty?
+      if user.email.present?
         Service::Image.organization_suggest(user.email)
       end
 
@@ -252,17 +257,17 @@ class UsersController < ApplicationController
 
       # only allow Admin's
       if current_user.permissions?('admin.user') && (params[:role_ids] || params[:roles])
-        user.associations_from_param({ role_ids: params[:role_ids], roles: params[:roles] })
+        user.associations_from_param(role_ids: params[:role_ids], roles: params[:roles])
       end
 
       # only allow Admin's
       if current_user.permissions?('admin.user') && (params[:group_ids] || params[:groups])
-        user.associations_from_param({ group_ids: params[:group_ids], groups: params[:groups] })
+        user.associations_from_param(group_ids: params[:group_ids], groups: params[:groups])
       end
 
       # only allow Admin's and Agent's
       if current_user.permissions?(['admin.user', 'ticket.agent']) && (params[:organization_ids] || params[:organizations])
-        user.associations_from_param({ organization_ids: params[:organization_ids], organizations: params[:organizations] })
+        user.associations_from_param(organization_ids: params[:organization_ids], organizations: params[:organizations])
       end
 
       if params[:expand]
@@ -363,7 +368,7 @@ class UsersController < ApplicationController
       limit: params[:limit],
       current_user: current_user,
     }
-    if params[:role_ids] && !params[:role_ids].empty?
+    if params[:role_ids].present?
       query_params[:role_ids] = params[:role_ids]
     end
 
@@ -449,10 +454,10 @@ class UsersController < ApplicationController
     end
 
     # do query
-    user_all = if params[:role_ids] && !params[:role_ids].empty?
-                 User.joins(:roles).where( 'roles.id' => params[:role_ids] ).where('users.id != 1').order('users.created_at DESC').limit( params[:limit] || 20 )
+    user_all = if params[:role_ids].present?
+                 User.joins(:roles).where('roles.id' => params[:role_ids]).where('users.id != 1').order('users.created_at DESC').limit(params[:limit] || 20)
                else
-                 User.where('id != 1').order('created_at DESC').limit( params[:limit] || 20 )
+                 User.where('id != 1').order('created_at DESC').limit(params[:limit] || 20)
                end
 
     # build result list
@@ -533,7 +538,7 @@ Response:
 }
 
 Test:
-curl http://localhost/api/v1/users/email_verify.json -v -u #{login}:#{password} -H "Content-Type: application/json" -X POST -d '{"token": "SoMeToKeN"}'
+curl http://localhost/api/v1/users/email_verify -v -u #{login}:#{password} -H "Content-Type: application/json" -X POST -d '{"token": "SoMeToKeN"}'
 
 =end
 
@@ -562,7 +567,7 @@ Response:
 }
 
 Test:
-curl http://localhost/api/v1/users/email_verify_send.json -v -u #{login}:#{password} -H "Content-Type: application/json" -X POST -d '{"email": "some_email@example.com"}'
+curl http://localhost/api/v1/users/email_verify_send -v -u #{login}:#{password} -H "Content-Type: application/json" -X POST -d '{"email": "some_email@example.com"}'
 
 =end
 
@@ -621,7 +626,7 @@ Response:
 }
 
 Test:
-curl http://localhost/api/v1/users/password_reset.json -v -u #{login}:#{password} -H "Content-Type: application/json" -X POST -d '{"username": "some_username"}'
+curl http://localhost/api/v1/users/password_reset -v -u #{login}:#{password} -H "Content-Type: application/json" -X POST -d '{"username": "some_username"}'
 
 =end
 
@@ -673,7 +678,7 @@ Response:
 }
 
 Test:
-curl http://localhost/api/v1/users/password_reset_verify.json -v -u #{login}:#{password} -H "Content-Type: application/json" -X POST -d '{"token": "SoMeToKeN", "password" "new_password"}'
+curl http://localhost/api/v1/users/password_reset_verify -v -u #{login}:#{password} -H "Content-Type: application/json" -X POST -d '{"token": "SoMeToKeN", "password" "new_password"}'
 
 =end
 
@@ -729,7 +734,7 @@ Response:
 }
 
 Test:
-curl http://localhost/api/v1/users/password_change.json -v -u #{login}:#{password} -H "Content-Type: application/json" -X POST -d '{"password_old": "password_old", "password_new": "password_new"}'
+curl http://localhost/api/v1/users/password_change -v -u #{login}:#{password} -H "Content-Type: application/json" -X POST -d '{"password_old": "password_old", "password_new": "password_new"}'
 
 =end
 
@@ -776,7 +781,7 @@ curl http://localhost/api/v1/users/password_change.json -v -u #{login}:#{passwor
 =begin
 
 Resource:
-PUT /api/v1/users/preferences.json
+PUT /api/v1/users/preferences
 
 Payload:
 {
@@ -790,7 +795,7 @@ Response:
 }
 
 Test:
-curl http://localhost/api/v1/users/preferences.json -v -u #{login}:#{password} -H "Content-Type: application/json" -X PUT -d '{"language": "de", "notifications": true}'
+curl http://localhost/api/v1/users/preferences -v -u #{login}:#{password} -H "Content-Type: application/json" -X PUT -d '{"language": "de", "notifications": true}'
 
 =end
 
@@ -803,7 +808,7 @@ curl http://localhost/api/v1/users/preferences.json -v -u #{login}:#{password} -
         params[:user].each { |key, value|
           user.preferences[key.to_sym] = value
         }
-        user.save
+        user.save!
       end
     end
     render json: { message: 'ok' }, status: :ok
@@ -812,7 +817,47 @@ curl http://localhost/api/v1/users/preferences.json -v -u #{login}:#{password} -
 =begin
 
 Resource:
-DELETE /api/v1/users/account.json
+PUT /api/v1/users/out_of_office
+
+Payload:
+{
+  "out_of_office": true,
+  "out_of_office_start_at": true,
+  "out_of_office_end_at": true,
+  "out_of_office_replacement_id": 123,
+  "out_of_office_text": 'honeymoon'
+}
+
+Response:
+{
+  :message => 'ok'
+}
+
+Test:
+curl http://localhost/api/v1/users/out_of_office -v -u #{login}:#{password} -H "Content-Type: application/json" -X PUT -d '{"out_of_office": true, "out_of_office_replacement_id": 123}'
+
+=end
+
+  def out_of_office
+    raise Exceptions::UnprocessableEntity, 'No current user!' if !current_user
+    user = User.find(current_user.id)
+    user.with_lock do
+      user.assign_attributes(
+        out_of_office:                params[:out_of_office],
+        out_of_office_start_at:       params[:out_of_office_start_at],
+        out_of_office_end_at:         params[:out_of_office_end_at],
+        out_of_office_replacement_id: params[:out_of_office_replacement_id],
+      )
+      user.preferences[:out_of_office_text] = params[:out_of_office_text]
+      user.save!
+    end
+    render json: { message: 'ok' }, status: :ok
+  end
+
+=begin
+
+Resource:
+DELETE /api/v1/users/account
 
 Payload:
 {
@@ -826,7 +871,7 @@ Response:
 }
 
 Test:
-curl http://localhost/api/v1/users/account.json -v -u #{login}:#{password} -H "Content-Type: application/json" -X PUT -d '{"provider": "twitter", "uid": 581482342942}'
+curl http://localhost/api/v1/users/account -v -u #{login}:#{password} -H "Content-Type: application/json" -X PUT -d '{"provider": "twitter", "uid": 581482342942}'
 
 =end
 
diff --git a/app/models/application_model.rb b/app/models/application_model.rb
index 551fe482b..c3d267e5f 100644
--- a/app/models/application_model.rb
+++ b/app/models/application_model.rb
@@ -5,7 +5,7 @@ class ApplicationModel < ActiveRecord::Base
   include ApplicationModel::HasCache
   include ApplicationModel::CanLookup
   include ApplicationModel::CanLookupSearchIndexAttributes
-  include ApplicationModel::ChecksAttributeLength
+  include ApplicationModel::ChecksAttributeValuesAndLength
   include ApplicationModel::CanCleanupParam
   include ApplicationModel::HasRecentViews
   include ApplicationModel::ChecksUserColumnsFillup
diff --git a/app/models/application_model/checks_attribute_length.rb b/app/models/application_model/checks_attribute_length.rb
deleted file mode 100644
index 5254b035c..000000000
--- a/app/models/application_model/checks_attribute_length.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
-module ApplicationModel::ChecksAttributeLength
-  extend ActiveSupport::Concern
-
-  included do
-    before_create :check_attribute_length
-    before_update :check_attribute_length
-  end
-
-=begin
-
-check string/varchar size and cut them if needed
-
-=end
-
-  def check_attribute_length
-    attributes.each { |attribute|
-      next if !self[ attribute[0] ]
-      next if !self[ attribute[0] ].instance_of?(String)
-      next if self[ attribute[0] ].empty?
-      column = self.class.columns_hash[ attribute[0] ]
-      next if !column
-      limit = column.limit
-      if column && limit
-        current_length = attribute[1].to_s.length
-        if limit < current_length
-          logger.warn "WARNING: cut string because of database length #{self.class}.#{attribute[0]}(#{limit} but is #{current_length}:#{attribute[1]})"
-          self[ attribute[0] ] = attribute[1][ 0, limit ]
-        end
-      end
-
-      # strip 4 bytes utf8 chars if needed
-      if column && self[ attribute[0] ]
-        self[attribute[0]] = self[ attribute[0] ].utf8_to_3bytesutf8
-      end
-    }
-    true
-  end
-end
diff --git a/app/models/application_model/checks_attribute_values_and_length.rb b/app/models/application_model/checks_attribute_values_and_length.rb
new file mode 100644
index 000000000..bedd15cca
--- /dev/null
+++ b/app/models/application_model/checks_attribute_values_and_length.rb
@@ -0,0 +1,58 @@
+# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
+module ApplicationModel::ChecksAttributeValuesAndLength
+  extend ActiveSupport::Concern
+
+  included do
+    before_create :check_attribute_values_and_length
+    before_update :check_attribute_values_and_length
+  end
+
+=begin
+
+1) check string/varchar size and cut them if needed
+
+2) check string for null byte \u0000 and remove it
+
+=end
+
+  def check_attribute_values_and_length
+    columns = self.class.columns_hash
+    attributes.each { |name, value|
+      next if value.blank?
+      next if !value.instance_of?(String)
+      column = columns[name]
+      next if !column
+
+      if column.type == :binary
+        self[name].force_encoding('BINARY')
+      end
+
+      # strip null byte chars (postgresql will complain about it)
+      if column.type == :text
+        if Rails.application.config.db_null_byte == false
+          self[name].delete!("\u0000")
+        end
+      end
+
+      # for varchar check length and replace null bytes
+      limit = column.limit
+      if limit
+        current_length = value.length
+        if limit < current_length
+          logger.warn "WARNING: cut string because of database length #{self.class}.#{name}(#{limit} but is #{current_length}:#{value})"
+          self[name] = value[0, limit]
+        end
+
+        # strip null byte chars (postgresql will complain about it)
+        if Rails.application.config.db_null_byte == false
+          self[name].delete!("\u0000")
+        end
+      end
+
+      # strip 4 bytes utf8 chars if needed (mysql/mariadb will complain it)
+      next if self[name].blank?
+      self[name] = self[name].utf8_to_3bytesutf8
+    }
+    true
+  end
+end
diff --git a/app/models/calendar.rb b/app/models/calendar.rb
index 56fee6a93..1ac32dc09 100644
--- a/app/models/calendar.rb
+++ b/app/models/calendar.rb
@@ -150,14 +150,16 @@ returns
     return if !ical_url
 
     # only sync every 5 days
-    cache_key = "CalendarIcal::#{id}"
-    cache = Cache.get(cache_key)
-    return if !last_log && cache && cache[:ical_url] == ical_url
+    if id
+      cache_key = "CalendarIcal::#{id}"
+      cache = Cache.get(cache_key)
+      return if !last_log && cache && cache[:ical_url] == ical_url
+    end
 
     begin
       events = {}
-      if ical_url && !ical_url.empty?
-        events = Calendar.parse(ical_url)
+      if ical_url.present?
+        events = Calendar.fetch_parse(ical_url)
       end
 
       # sync with public_holidays
@@ -189,11 +191,13 @@ returns
         }
       }
       self.last_log = nil
-      cache = Cache.write(
-        cache_key,
-        { public_holidays: public_holidays, ical_url: ical_url },
-        { expires_in: 5.days },
-      )
+      if id
+        Cache.write(
+          cache_key,
+          { public_holidays: public_holidays, ical_url: ical_url },
+          { expires_in: 1.day },
+        )
+      end
     rescue => e
       self.last_log = e.inspect
     end
@@ -205,7 +209,7 @@ returns
     true
   end
 
-  def self.parse(location)
+  def self.fetch_parse(location)
     if location =~ /^http/i
       result = UserAgent.get(location)
       if !result.success?
@@ -220,22 +224,43 @@ returns
     cal = cals.first
     events = {}
     cal.events.each { |event|
+      if event.rrule
+
+        # loop till days
+        interval_frame_start = Date.parse("#{Time.zone.now - 1.year}-01-01")
+        interval_frame_end   = Date.parse("#{Time.zone.now + 3.years}-12-31")
+        occurrences          = event.occurrences_between(interval_frame_start, interval_frame_end)
+        if occurrences.present?
+          occurrences.each { |occurrence|
+            result = Calendar.day_and_comment_by_event(event, occurrence.start_time)
+            next if !result
+            events[result[0]] = result[1]
+          }
+        end
+      end
       next if event.dtstart < Time.zone.now - 1.year
       next if event.dtstart > Time.zone.now + 3.years
-      day = "#{event.dtstart.year}-#{format('%02d', event.dtstart.month)}-#{format('%02d', event.dtstart.day)}"
-      comment = event.summary || event.description
-      comment = Encode.conv( 'utf8', comment.to_s.force_encoding('utf-8') )
-      if !comment.valid_encoding?
-        comment = comment.encode('utf-8', 'binary', invalid: :replace, undef: :replace, replace: '?')
-      end
-
-      # ignore daylight saving time entries
-      next if comment =~ /(daylight saving|sommerzeit|summertime)/i
-      events[day] = comment
+      result = Calendar.day_and_comment_by_event(event, event.dtstart)
+      next if !result
+      events[result[0]] = result[1]
     }
     events.sort.to_h
   end
 
+  # get day and comment by event
+  def self.day_and_comment_by_event(event, start_time)
+    day = "#{start_time.year}-#{format('%02d', start_time.month)}-#{format('%02d', start_time.day)}"
+    comment = event.summary || event.description
+    comment = Encode.conv( 'utf8', comment.to_s.force_encoding('utf-8') )
+    if !comment.valid_encoding?
+      comment = comment.encode('utf-8', 'binary', invalid: :replace, undef: :replace, replace: '?')
+    end
+
+    # ignore daylight saving time entries
+    return if comment =~ /(daylight saving|sommerzeit|summertime)/i
+    [day, comment]
+  end
+
   private
 
   # if changed calendar is default, set all others default to false
@@ -254,6 +279,7 @@ returns
   def min_one_check
     if !Calendar.find_by(default: true)
       first = Calendar.order(:created_at, :id).limit(1).first
+      return true if !first
       first.default = true
       first.save
     end
diff --git a/app/models/channel.rb b/app/models/channel.rb
index 2decd642e..3a13312a6 100644
--- a/app/models/channel.rb
+++ b/app/models/channel.rb
@@ -223,12 +223,6 @@ send via account
 
   def deliver(mail_params, notification = false)
 
-    # ignore notifications in developer mode
-    if notification == true && Setting.get('developer_mode') == true
-      logger.info "Do not send notification #{mail_params.inspect} because of enabled developer_mode"
-      return
-    end
-
     adapter         = options[:adapter]
     adapter_options = options
     if options[:outbound] && options[:outbound][:adapter]
diff --git a/app/models/channel/driver/imap.rb b/app/models/channel/driver/imap.rb
index d2e0043bc..344b971b9 100644
--- a/app/models/channel/driver/imap.rb
+++ b/app/models/channel/driver/imap.rb
@@ -52,6 +52,7 @@ example
     host: 'outlook.office365.com',
     user: 'xxx@znuny.onmicrosoft.com',
     password: 'xxx',
+    keep_on_server: true,
   }
   channel = Channel.last
   instance = Channel::Driver::Imap.new
@@ -60,13 +61,18 @@ example
 =end
 
   def fetch (options, channel, check_type = '', verify_string = '')
-    ssl  = true
-    port = 993
+    ssl            = true
+    port           = 993
+    keep_on_server = false
+    folder         = 'INBOX'
+    if options[:keep_on_server] == true || options[:keep_on_server] == 'true'
+      keep_on_server = true
+    end
     if options.key?(:ssl) && options[:ssl] == false
       ssl  = false
       port = 143
     end
-    if options.key?(:port) && !options[:port].empty?
+    if options.key?(:port) && options[:port].present?
       port = options[:port]
 
       # disable ssl for non ssl ports
@@ -74,8 +80,11 @@ example
         ssl = false
       end
     end
+    if options[:folder].present?
+      folder = options[:folder]
+    end
 
-    Rails.logger.info "fetching imap (#{options[:host]}/#{options[:user]} port=#{port},ssl=#{ssl},folder=#{options[:folder]})"
+    Rails.logger.info "fetching imap (#{options[:host]}/#{options[:user]} port=#{port},ssl=#{ssl},folder=#{folder},keep_on_server=#{keep_on_server})"
 
     # on check, reduce open_timeout to have faster probing
     timeout = 45
@@ -90,17 +99,17 @@ example
     @imap.login(options[:user], options[:password])
 
     # select folder
-    if !options[:folder] || options[:folder].empty?
-      @imap.select('INBOX')
-    else
-      @imap.select(options[:folder])
-    end
+    @imap.select(folder)
 
     # sort messages by date on server (if not supported), if not fetch messages via search (first in, first out)
+    filter = ['ALL']
+    if keep_on_server && check_type != 'check' && check_type != 'verify'
+      filter = %w(NOT SEEN)
+    end
     begin
-      message_ids = @imap.sort(['DATE'], ['ALL'], 'US-ASCII')
+      message_ids = @imap.sort(['DATE'], filter, 'US-ASCII')
     rescue
-      message_ids = @imap.search(['ALL'])
+      message_ids = @imap.search(filter)
     end
 
     # check mode only
@@ -168,9 +177,8 @@ example
     message_ids.each do |message_id|
       count += 1
       Rails.logger.info " - message #{count}/#{count_all}"
-      #Rails.logger.info msg.to_s
 
-      message_meta = @imap.fetch(message_id, ['RFC822.SIZE', 'FLAGS', 'INTERNALDATE'])[0]
+      message_meta = @imap.fetch(message_id, ['RFC822.SIZE', 'ENVELOPE', 'FLAGS', 'INTERNALDATE'])[0]
 
       # ignore to big messages
       info = too_big?(message_meta, count, count_all)
@@ -182,14 +190,23 @@ example
       # ignore deleted messages
       next if deleted?(message_meta, count, count_all)
 
+      # ignore already imported
+      next if already_imported?(message_id, message_meta, count, count_all, keep_on_server)
+
       # delete email from server after article was created
       msg = @imap.fetch(message_id, 'RFC822')[0].attr['RFC822']
       next if !msg
       process(channel, msg, false)
-      @imap.store(message_id, '+FLAGS', [:Deleted])
+      if !keep_on_server
+        @imap.store(message_id, '+FLAGS', [:Deleted])
+      else
+        @imap.store(message_id, '+FLAGS', [:Seen])
+      end
       count_fetched += 1
     end
-    @imap.expunge()
+    if !keep_on_server
+      @imap.expunge()
+    end
     disconnect
     if count.zero?
       Rails.logger.info ' - no message'
@@ -209,6 +226,20 @@ example
 
   private
 
+  def already_imported?(message_id, message_meta, count, count_all, keep_on_server)
+    return false if !keep_on_server
+    return false if !message_meta.attr
+    return false if !message_meta.attr['ENVELOPE']
+    local_message_id = message_meta.attr['ENVELOPE'].message_id
+    return false if local_message_id.blank?
+    local_message_id_md5 = Digest::MD5.hexdigest(local_message_id)
+    article = Ticket::Article.where(message_id_md5: local_message_id_md5).order('created_at DESC, id DESC').limit(1).first
+    return false if !article
+    @imap.store(message_id, '+FLAGS', [:Seen])
+    Rails.logger.info "  - ignore message #{count}/#{count_all} - because message message id already imported"
+    true
+  end
+
   def deleted?(message_meta, count, count_all)
     return false if !message_meta.attr['FLAGS'].include?(:Deleted)
     Rails.logger.info "  - ignore message #{count}/#{count_all} - because message has already delete flag"
diff --git a/app/models/channel/email_build.rb b/app/models/channel/email_build.rb
index 3629bfe3a..b0692648f 100644
--- a/app/models/channel/email_build.rb
+++ b/app/models/channel/email_build.rb
@@ -156,7 +156,9 @@ Check if string is a complete html document. If not, add head and css styles.
 
     return html if html =~ //i
 
-    Rails.configuration.html_email_body.sub('###html###', html)
+    # use block form because variable html could contain backslashes and e. g. '\1' that
+    # must not be handled as back-references for regular expressions
+    Rails.configuration.html_email_body.sub('###html###') { html }
   end
 
 =begin
diff --git a/app/models/channel/email_parser.rb b/app/models/channel/email_parser.rb
index 4ec022d3f..98d3edddd 100644
--- a/app/models/channel/email_parser.rb
+++ b/app/models/channel/email_parser.rb
@@ -98,14 +98,24 @@ class Channel::EmailParser
       data[field.to_sym] = ''
     }
 
-    # get sender
+    # get sender with @ / email address
     from = nil
     ['from', 'reply-to', 'return-path'].each { |item|
       next if data[item.to_sym].blank?
+      next if data[item.to_sym] !~ /@/
       from = data[item.to_sym]
       break if from
     }
 
+    # in case of no sender with email address - get sender
+    if !from
+      ['from', 'reply-to', 'return-path'].each { |item|
+        next if data[item.to_sym].blank?
+        from = data[item.to_sym]
+        break if from
+      }
+    end
+
     # set x-any-recipient
     data['x-any-recipient'.to_sym] = ''
     ['to', 'cc', 'delivered-to', 'x-original-to', 'envelope-to'].each { |item|
diff --git a/app/models/channel/filter/database.rb b/app/models/channel/filter/database.rb
index 822638950..06077abe7 100644
--- a/app/models/channel/filter/database.rb
+++ b/app/models/channel/filter/database.rb
@@ -14,26 +14,27 @@ module Channel::Filter::Database
       filter[:match].each { |key, meta|
         begin
           next if meta.blank? || meta['value'].blank?
+          value = mail[ key.downcase.to_sym ]
+          match_rule = meta['value']
           min_one_rule_exists = true
-          has_matched = false
-          if mail[ key.downcase.to_sym ].present? && mail[ key.downcase.to_sym ] =~ /#{meta['value']}/i
-            has_matched = true
-          end
-          if has_matched
-            if meta[:operator] == 'contains not'
+          if meta[:operator] == 'contains not'
+            if value.present? && match(value, match_rule, false)
               all_matches_ok = false
+              Rails.logger.info "  matching #{key.downcase}:'#{value}' on #{match_rule}, but shoud not"
+            end
+          elsif meta[:operator] == 'contains'
+            if value.blank? || !match(value, match_rule, true)
+              all_matches_ok = false
+              Rails.logger.info "  not matching #{key.downcase}:'#{value}' on #{match_rule}, but should"
             end
-            Rails.logger.info "  matching #{key.downcase}:'#{mail[ key.downcase.to_sym ]}' on #{meta['value']}"
           else
-            if meta[:operator] == 'contains'
-              all_matches_ok = false
-            end
-            Rails.logger.info "  not matching #{key.downcase}:'#{mail[ key.downcase.to_sym ]}' on #{meta['value']}"
+            all_matches_ok = false
+            Rails.logger.info "  Invalid operator in match #{meta.inspect}"
           end
           break if !all_matches_ok
         rescue => e
           all_matches_ok = false
-          Rails.logger.error "can't use match rule #{meta['value']} on #{mail[ key.to_sym ]}"
+          Rails.logger.error "can't use match rule #{match_rule} on #{value}"
           Rails.logger.error e.inspect
         end
       }
@@ -49,4 +50,31 @@ module Channel::Filter::Database
     }
 
   end
+
+  def self.match(value, match_rule, _should_match, check_mode = false)
+
+    regexp = false
+    if match_rule =~ /^(regex:)(.+?)$/
+      regexp = true
+      match_rule = $2
+    end
+
+    if regexp == false
+      match_rule_quoted = Regexp.quote(match_rule).gsub(/\\\*/, '.*')
+      return true if value =~ /#{match_rule_quoted}/i
+      return false
+    end
+
+    begin
+      return true if value =~ /#{match_rule}/i
+      return false
+    rescue => e
+      message = "Can't use regex '#{match_rule}' on '#{value}': #{e.message}"
+      Rails.logger.error message
+      raise message if check_mode == true
+    end
+
+    false
+  end
+
 end
diff --git a/app/models/channel/filter/identify_sender.rb b/app/models/channel/filter/identify_sender.rb
index e8594c3cc..e408ab10e 100644
--- a/app/models/channel/filter/identify_sender.rb
+++ b/app/models/channel/filter/identify_sender.rb
@@ -35,7 +35,7 @@ module Channel::Filter::IdentifySender
             items.each { |item|
 
               # skip if recipient is system email
-              next if EmailAddress.find_by(email: item.address)
+              next if EmailAddress.find_by(email: item.address.downcase)
 
               customer_user = user_create(
                 login: item.address,
@@ -103,13 +103,14 @@ module Channel::Filter::IdentifySender
       rescue => e
         # parse not parseable fields by mail gem like
         #  - Max Kohl | [example.com] 
+        #  - Max Kohl 
         Rails.logger.error 'ERROR: ' + e.inspect
-        Rails.logger.error 'ERROR: try it by my self'
+        Rails.logger.error "ERROR: try it by my self (#{item}): #{mail[item.to_sym]}"
         recipients = mail[item.to_sym].to_s.split(',')
         recipients.each { |recipient|
           address = nil
           display_name = nil
-          if recipient =~ /<(.+?)>/
+          if recipient =~ /.*<(.+?)>/
             address = $1
           end
           if recipient =~ /^(.+?)<(.+?)>/
diff --git a/app/models/channel/filter/monitoring_base.rb b/app/models/channel/filter/monitoring_base.rb
index 08eecf563..c1370d02b 100644
--- a/app/models/channel/filter/monitoring_base.rb
+++ b/app/models/channel/filter/monitoring_base.rb
@@ -20,17 +20,17 @@ class Channel::Filter::MonitoringBase
     auto_close_state_id = Setting.get("#{integration}_auto_close_state_id")
     state_recovery_match = '(OK|UP)'
 
-    return if !mail[:from]
-    return if !mail[:body]
+    return if mail[:from].blank?
+    return if mail[:body].blank?
     session_user_id = mail[ 'x-zammad-session-user-id'.to_sym ]
     return if !session_user_id
 
     # check if sender is monitoring
-    return if !mail[:from].match(/#{sender}/i)
+    return if !mail[:from].match(/#{Regexp.quote(sender)}/i)
 
     # get mail attibutes like host and state
     result = {}
-    mail[:body].gsub(%r{(Service|Host|State|Address|Date/Time|Additional\sInfo):(.+?)\n}i) { |_match|
+    mail[:body].gsub(%r{(Service|Host|State|Address|Date/Time|Additional\sInfo|Info):(.+?)\n}i) { |_match|
       key = $1
       if key
         key = key.downcase
@@ -42,15 +42,26 @@ class Channel::Filter::MonitoringBase
       result[key] = value
     }
 
+    # check min. params
+    return if result['host'].blank?
+
+    # get state from body
+    if result['state'].blank?
+      if mail[:body] =~ /==>.*\sis\s(.+?)\!\s+?<==/
+        result['state'] = $1
+      end
+    end
+
     # check if ticket with host is open
     customer = User.lookup(id: session_user_id)
 
     # follow up detection by meta data
     open_states = Ticket::State.by_category(:open)
-    Ticket.where(state: open_states).each { |ticket|
+    ticket_ids = Ticket.where(state: open_states).order(created_at: :desc).limit(5000).pluck(:id)
+    ticket_ids.each { |ticket_id|
+      ticket = Ticket.find_by(id: ticket_id)
+      next if !ticket
       next if !ticket.preferences
-      next if !ticket.preferences['integration']
-      next if ticket.preferences['integration'] != integration
       next if !ticket.preferences[integration]
       next if !ticket.preferences[integration]['host']
       next if ticket.preferences[integration]['host'] != result['host']
@@ -60,7 +71,7 @@ class Channel::Filter::MonitoringBase
       mail[ 'x-zammad-ticket-id'.to_sym ] = ticket.id
 
       # check if service is recovered
-      if auto_close && result['state'].match(/#{state_recovery_match}/i)
+      if auto_close && result['state'].present? && result['state'].match(/#{state_recovery_match}/i)
         state = Ticket::State.lookup(id: auto_close_state_id)
         if state
           mail[ 'x-zammad-ticket-followup-state'.to_sym ] = state.name
@@ -75,7 +86,6 @@ class Channel::Filter::MonitoringBase
         mail[ 'x-zammad-ticket-preferences'.to_sym ] = {}
       end
       preferences = {}
-      preferences['integration'] = integration
       preferences[integration] = result
       preferences.each { |key, value|
         mail[ 'x-zammad-ticket-preferences'.to_sym ][key] = value
diff --git a/app/models/channel/filter/sender_is_system_address.rb b/app/models/channel/filter/sender_is_system_address.rb
index 1321edd3f..8e58fe51a 100644
--- a/app/models/channel/filter/sender_is_system_address.rb
+++ b/app/models/channel/filter/sender_is_system_address.rb
@@ -5,13 +5,13 @@ module Channel::Filter::SenderIsSystemAddress
   def self.run(_channel, mail)
 
     # if attributes already set by header
-    return if mail[ 'x-zammad-ticket-create-article-sender'.to_sym ]
-    return if mail[ 'x-zammad-article-sender'.to_sym ]
+    return if mail['x-zammad-ticket-create-article-sender'.to_sym]
+    return if mail['x-zammad-article-sender'.to_sym]
 
     # check if sender address is system
     form = 'raw-from'.to_sym
-    return if !mail[form]
-    return if !mail[:to]
+    return if mail[form].blank?
+    return if mail[:to].blank?
 
     # in case, set sender
     begin
@@ -19,8 +19,8 @@ module Channel::Filter::SenderIsSystemAddress
       items = mail[form].addrs
       items.each { |item|
         next if !EmailAddress.find_by(email: item.address.downcase)
-        mail[ 'x-zammad-ticket-create-article-sender'.to_sym ] = 'Agent'
-        mail[ 'x-zammad-article-sender'.to_sym ] = 'Agent'
+        mail['x-zammad-ticket-create-article-sender'.to_sym] = 'Agent'
+        mail['x-zammad-article-sender'.to_sym] = 'Agent'
         return true
       }
     rescue => e
@@ -28,13 +28,13 @@ module Channel::Filter::SenderIsSystemAddress
     end
 
     # check if sender is agent
-    return if mail[:from_email].empty?
+    return if mail[:from_email].blank?
     begin
-      user = User.find_by(email: mail[:from_email])
+      user = User.find_by(email: mail[:from_email].downcase)
       return if !user
       return if !user.permissions?('ticket.agent')
-      mail[ 'x-zammad-ticket-create-article-sender'.to_sym ] = 'Agent'
-      mail[ 'x-zammad-article-sender'.to_sym ] = 'Agent'
+      mail['x-zammad-ticket-create-article-sender'.to_sym] = 'Agent'
+      mail['x-zammad-article-sender'.to_sym] = 'Agent'
       return true
     rescue => e
       Rails.logger.error 'ERROR: SenderIsSystemAddress: ' + e.inspect
diff --git a/app/models/concerns/has_search_index_backend.rb b/app/models/concerns/has_search_index_backend.rb
index 8ab494ce2..c7a656493 100644
--- a/app/models/concerns/has_search_index_backend.rb
+++ b/app/models/concerns/has_search_index_backend.rb
@@ -133,9 +133,9 @@ reload search index with full data
         begin
           item.search_index_update_backend
         rescue => e
-          logger.error "Unable to send #{item.class}.find(#{item.id}) backend: #{e.inspect}"
+          logger.error "Unable to send #{item.class}.find(#{item.id}).search_index_update_backend backend: #{e.inspect}"
           tolerance_count += 1
-          raise "Unable to send #{item.class}.find(#{item.id}) backend: #{e.inspect}" if tolerance_count == tolerance
+          raise "Unable to send #{item.class}.find(#{item.id}).search_index_update_backend backend: #{e.inspect}" if tolerance_count == tolerance
         end
       }
     end
diff --git a/app/models/cti/caller_id.rb b/app/models/cti/caller_id.rb
index a34a2d8e3..bbfaa26a2 100644
--- a/app/models/cti/caller_id.rb
+++ b/app/models/cti/caller_id.rb
@@ -54,8 +54,10 @@ returns
           search_params[:level] = level
         end
 
-        result = Cti::CallerId.where(search_params).group(:user_id, :id).order(id: 'DESC').limit(20)
-
+        caller_ids = Cti::CallerId.select('MAX(id) as caller_id').where(search_params).group(:user_id).order('caller_id DESC').limit(20).map(&:caller_id)
+        Cti::CallerId.where(id: caller_ids).order(id: :desc).each { |record|
+          result.push record
+        }
         break if result.present?
       }
       result
diff --git a/app/models/cti/log.rb b/app/models/cti/log.rb
index c5cdc7519..0d23718d7 100644
--- a/app/models/cti/log.rb
+++ b/app/models/cti/log.rb
@@ -266,7 +266,22 @@ returns
       }
     end
 
-    # processes a incoming event
+=begin
+
+processes a incoming event
+
+Cti::Log.process(
+  'cause' => '',
+  'event' => 'newCall',
+  'user' => 'user 1',
+  'from' => '4912347114711',
+  'to' => '4930600000000',
+  'callId' => '4991155921769858278-1',
+  'direction' => 'in',
+)
+
+=end
+
     def self.process(params)
       comment = params['cause']
       event   = params['event']
@@ -358,5 +373,23 @@ returns
         )
       }
     end
+
+=begin
+
+cleanup caller logs
+
+  Cti::Log.cleanup
+
+optional you can put the max oldest chat entries as argument
+
+  Cti::Log.cleanup(12.months)
+
+=end
+
+    def self.cleanup(diff = 12.months)
+      Cti::Log.where('created_at < ?', Time.zone.now - diff).delete_all
+      true
+    end
+
   end
 end
diff --git a/app/models/email_address.rb b/app/models/email_address.rb
index 6c36238e9..3c9985d30 100644
--- a/app/models/email_address.rb
+++ b/app/models/email_address.rb
@@ -8,6 +8,7 @@ class EmailAddress < ApplicationModel
   validates       :realname, presence: true
   validates       :email,    presence: true
 
+  before_validation :check_email
   before_create   :check_if_channel_exists_set_inactive
   before_update   :check_if_channel_exists_set_inactive
   after_create    :update_email_address_id
@@ -41,6 +42,15 @@ check and if channel not exists reset configured channels for email addresses
 
   private
 
+  def check_email
+    return true if Setting.get('import_mode')
+    return true if email.blank?
+    self.email = email.downcase.strip
+    raise Exceptions::UnprocessableEntity, 'Invalid email' if email !~ /@/
+    raise Exceptions::UnprocessableEntity, 'Invalid email' if email =~ /\s/
+    true
+  end
+
   # set email address to inactive/active if channel exists or not
   def check_if_channel_exists_set_inactive
 
diff --git a/app/models/object_manager/attribute.rb b/app/models/object_manager/attribute.rb
index abf53ae95..3985f9f7e 100644
--- a/app/models/object_manager/attribute.rb
+++ b/app/models/object_manager/attribute.rb
@@ -720,6 +720,9 @@ to send no browser reload event, pass false
   def self.reset_database_info(model)
     model.connection.schema_cache.clear!
     model.reset_column_information
+    # rebuild columns cache to reduce the risk of
+    # race conditions in re-setting it with outdated data
+    model.columns
   end
 
   def check_name
diff --git a/app/models/observer/organization/ref_object_touch.rb b/app/models/observer/organization/ref_object_touch.rb
index 043113b28..beec37fd4 100644
--- a/app/models/observer/organization/ref_object_touch.rb
+++ b/app/models/observer/organization/ref_object_touch.rb
@@ -24,11 +24,19 @@ class Observer::Organization::RefObjectTouch < ActiveRecord::Observer
     return if User.where(organization_id: record.id).count > 100
 
     # touch organizations tickets
-    Ticket.select('id').where(organization_id: record.id).each(&:touch)
+    Ticket.select('id').where(organization_id: record.id).pluck(:id).each { |ticket_id|
+      ticket = Ticket.find(ticket_id)
+      ticket.with_lock do
+        ticket.touch
+      end
+    }
 
     # touch current members
     record.member_ids.uniq.each { |user_id|
-      User.find(user_id).touch
+      user = User.find(user_id)
+      user.with_lock do
+        user.touch
+      end
     }
   end
 end
diff --git a/app/models/observer/ticket/article/communicate_email/background_job.rb b/app/models/observer/ticket/article/communicate_email/background_job.rb
index 7a3b3ce88..6e3c51454 100644
--- a/app/models/observer/ticket/article/communicate_email/background_job.rb
+++ b/app/models/observer/ticket/article/communicate_email/background_job.rb
@@ -124,7 +124,7 @@ class Observer::Ticket::Article::CommunicateEmail::BackgroundJob
     local_record.preferences['delivery_status'] = 'fail'
     local_record.preferences['delivery_status_message'] = message
     local_record.preferences['delivery_status_date'] = Time.zone.now
-    local_record.save
+    local_record.save!
     Rails.logger.error message
 
     if local_record.preferences['delivery_retry'] > 3
@@ -141,7 +141,10 @@ class Observer::Ticket::Article::CommunicateEmail::BackgroundJob
         recipient_list += local_record[key]
       }
 
-      Ticket::Article.create(
+      # reopen ticket and notify agent
+      Observer::Transaction.reset
+      UserInfo.current_user_id = 1
+      Ticket::Article.create!(
         ticket_id: local_record.ticket_id,
         content_type: 'text/plain',
         body: "Unable to send email to '#{recipient_list}': #{message}",
@@ -151,10 +154,14 @@ class Observer::Ticket::Article::CommunicateEmail::BackgroundJob
         preferences: {
           delivery_article_id_related: local_record.id,
           delivery_message: true,
+          notification: true,
         },
-        updated_by_id: 1,
-        created_by_id: 1,
       )
+      ticket       = Ticket.find(local_record.ticket_id)
+      ticket.state = Ticket::State.find_by(default_follow_up: true)
+      ticket.save!
+      Observer::Transaction.commit
+      UserInfo.current_user_id = nil
     end
 
     raise message
@@ -166,7 +173,7 @@ class Observer::Ticket::Article::CommunicateEmail::BackgroundJob
 
   def reschedule_at(current_time, attempts)
     if Rails.env.production?
-      return current_time + attempts * 20.seconds
+      return current_time + attempts * 25.seconds
     end
     current_time + 5.seconds
   end
diff --git a/app/models/observer/ticket/article_changes.rb b/app/models/observer/ticket/article_changes.rb
index 2ae9294db..85e721803 100644
--- a/app/models/observer/ticket/article_changes.rb
+++ b/app/models/observer/ticket/article_changes.rb
@@ -41,7 +41,7 @@ class Observer::Ticket::ArticleChanges < ActiveRecord::Observer
       record.ticket.touch
       return
     end
-    record.ticket.save
+    record.ticket.save!
   end
 
   # get article count
diff --git a/app/models/observer/ticket/last_owner_update.rb b/app/models/observer/ticket/last_owner_update.rb
new file mode 100644
index 000000000..ab100ba50
--- /dev/null
+++ b/app/models/observer/ticket/last_owner_update.rb
@@ -0,0 +1,34 @@
+# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
+
+class Observer::Ticket::LastOwnerUpdate < ActiveRecord::Observer
+  observe 'ticket'
+
+  def before_create(record)
+    _check('create', record)
+  end
+
+  def before_update(record)
+    _check('update', record)
+  end
+
+  private
+
+  def _check(type, record)
+
+    # return if we run import mode
+    return true if Setting.get('import_mode')
+
+    # check if owner has changed
+    if type == 'update'
+      return true if record.changes['owner_id'].blank?
+    end
+
+    # check if owner is nobody
+    if record.owner_id.blank? || record.owner_id == 1
+      record.last_owner_update_at = nil
+      return true
+    end
+
+    record.last_owner_update_at = Time.zone.now
+  end
+end
diff --git a/app/models/observer/ticket/online_notification_seen.rb b/app/models/observer/ticket/online_notification_seen.rb
index ec8883d02..dee1774ef 100644
--- a/app/models/observer/ticket/online_notification_seen.rb
+++ b/app/models/observer/ticket/online_notification_seen.rb
@@ -16,12 +16,11 @@ class Observer::Ticket::OnlineNotificationSeen < ActiveRecord::Observer
   def _check(record)
 
     # return if we run import mode
-    return if Setting.get('import_mode')
+    return false if Setting.get('import_mode')
 
     # set seen only if state has changes
-    return if !record.changes
-    return if record.changes.empty?
-    return if !record.changes['state_id']
+    return false if record.changes.blank?
+    return false if record.changes['state_id'].blank?
 
     # check if existing online notifications for this ticket should be set to seen
     return true if !record.online_notification_seen_state
diff --git a/app/models/observer/ticket/online_notification_seen/background_job.rb b/app/models/observer/ticket/online_notification_seen/background_job.rb
index 90e931ff4..237c3adf9 100644
--- a/app/models/observer/ticket/online_notification_seen/background_job.rb
+++ b/app/models/observer/ticket/online_notification_seen/background_job.rb
@@ -16,7 +16,7 @@ class Observer::Ticket::OnlineNotificationSeen::BackgroundJob
         next if seen == notification.seen
         notification.seen = true
         notification.updated_by_id = @user_id
-        notification.save
+        notification.save!
       }
     end
   end
diff --git a/app/models/observer/ticket/user_ticket_counter/background_job.rb b/app/models/observer/ticket/user_ticket_counter/background_job.rb
index 0dc6521e0..a09904d06 100644
--- a/app/models/observer/ticket/user_ticket_counter/background_job.rb
+++ b/app/models/observer/ticket/user_ticket_counter/background_job.rb
@@ -7,18 +7,22 @@ class Observer::Ticket::UserTicketCounter::BackgroundJob
   def perform
 
     # open ticket count
-    state_open = Ticket::State.by_category(:open)
-    tickets_open = Ticket.where(
-      customer_id: @customer_id,
-      state_id: state_open,
-    ).count()
+    tickets_open = 0
+    tickets_closed = 0
+    if @customer_id != 1
+      state_open = Ticket::State.by_category(:open)
+      tickets_open = Ticket.where(
+        customer_id: @customer_id,
+        state_id: state_open,
+      ).count()
 
-    # closed ticket count
-    state_closed = Ticket::State.by_category(:closed)
-    tickets_closed = Ticket.where(
-      customer_id: @customer_id,
-      state_id: state_closed,
-    ).count()
+      # closed ticket count
+      state_closed = Ticket::State.by_category(:closed)
+      tickets_closed = Ticket.where(
+        customer_id: @customer_id,
+        state_id: state_closed,
+      ).count()
+    end
 
     # check if update is needed
     customer = User.lookup(id: @customer_id)
diff --git a/app/models/observer/transaction.rb b/app/models/observer/transaction.rb
index e20e5965d..97651de8f 100644
--- a/app/models/observer/transaction.rb
+++ b/app/models/observer/transaction.rb
@@ -3,6 +3,10 @@
 class Observer::Transaction < ActiveRecord::Observer
   observe :ticket, 'ticket::_article', :user, :organization, :tag
 
+  def self.reset
+    EventBuffer.reset('transaction')
+  end
+
   def self.commit(params = {})
 
     # add attribute of interface handle (e. g. to send (no) notifications if a agent
diff --git a/app/models/overview.rb b/app/models/overview.rb
index 1abc9f2be..57a3490f9 100644
--- a/app/models/overview.rb
+++ b/app/models/overview.rb
@@ -28,24 +28,37 @@ class Overview < ApplicationModel
   end
 
   def fill_link_on_create
-    return true if !link.empty?
+    return true if link.present?
     self.link = link_name(name)
     true
   end
 
   def fill_link_on_update
-    return true if link.empty?
     return true if !changes['name']
+    return true if changes['link']
     self.link = link_name(name)
     true
   end
 
   def link_name(name)
-    link = name.downcase
-    link.gsub!(/\s/, '_')
-    link.gsub!(/[^0-9a-z]/i, '_')
-    link.gsub!(/_+/, '_')
-    link
+    local_link = name.downcase
+    local_link = local_link.parameterize('_')
+    local_link.gsub!(/\s/, '_')
+    local_link.gsub!(/_+/, '_')
+    local_link = URI.escape(local_link)
+    if local_link.blank?
+      local_link = id || rand(999)
+    end
+    check = true
+    while check
+      exists = Overview.find_by(link: local_link)
+      if exists && exists.id != id
+        local_link = "#{local_link}_#{rand(999)}"
+      else
+        check = false
+      end
+    end
+    local_link
   end
 
 end
diff --git a/app/models/postmaster_filter.rb b/app/models/postmaster_filter.rb
index f56bf98ea..51ffff1df 100644
--- a/app/models/postmaster_filter.rb
+++ b/app/models/postmaster_filter.rb
@@ -4,4 +4,26 @@ class PostmasterFilter < ApplicationModel
   store     :perform
   store     :match
   validates :name, presence: true
+
+  before_create :validate_condition
+  before_update :validate_condition
+
+  def validate_condition
+    raise Exceptions::UnprocessableEntity, 'Min. one match rule needed!' if match.blank?
+    match.each { |_key, meta|
+      raise Exceptions::UnprocessableEntity, 'operator invalid, ony "contains" and "contains not" is supported' if meta['operator'].blank? || meta['operator'] !~ /^(contains|contains not)$/
+      raise Exceptions::UnprocessableEntity, 'value invalid/empty' if meta['value'].blank?
+      begin
+        if meta['operator'] == 'contains not'
+          Channel::Filter::Database.match('test content', meta['value'], false, true)
+        else
+          Channel::Filter::Database.match('test content', meta['value'], true, true)
+        end
+      rescue => e
+        raise Exceptions::UnprocessableEntity, e.message
+      end
+    }
+    true
+  end
+
 end
diff --git a/app/models/signature.rb b/app/models/signature.rb
index 0435e0fff..04053bad0 100644
--- a/app/models/signature.rb
+++ b/app/models/signature.rb
@@ -2,7 +2,11 @@
 
 class Signature < ApplicationModel
   include ChecksLatestChangeObserved
+  include ChecksHtmlSanitized
 
   has_many  :groups,  after_add: :cache_update, after_remove: :cache_update
   validates :name,    presence: true
+
+  sanitized_html :body
+
 end
diff --git a/app/models/taskbar.rb b/app/models/taskbar.rb
index f4614a15c..63c64d860 100644
--- a/app/models/taskbar.rb
+++ b/app/models/taskbar.rb
@@ -88,9 +88,11 @@ class Taskbar < ApplicationModel
     # update other taskbars
     Taskbar.where(key: key).order(:created_at, :id).each { |taskbar|
       next if taskbar.id == id
-      taskbar.preferences = preferences
-      taskbar.local_update = true
-      taskbar.save!
+      taskbar.with_lock do
+        taskbar.preferences = preferences
+        taskbar.local_update = true
+        taskbar.save!
+      end
     }
 
     return true if destroyed?
diff --git a/app/models/text_module.rb b/app/models/text_module.rb
index 357f0c78b..7fcb7da83 100644
--- a/app/models/text_module.rb
+++ b/app/models/text_module.rb
@@ -2,10 +2,13 @@
 
 class TextModule < ApplicationModel
   include ChecksClientNotification
+  include ChecksHtmlSanitized
 
   validates :name,    presence: true
   validates :content, presence: true
 
+  sanitized_html :content
+
 =begin
 
 load text modules from online
diff --git a/app/models/ticket.rb b/app/models/ticket.rb
index 6c5537b74..ac7933b4f 100644
--- a/app/models/ticket.rb
+++ b/app/models/ticket.rb
@@ -48,6 +48,7 @@ class Ticket < ApplicationModel
                                      :last_contact_at,
                                      :last_contact_agent_at,
                                      :last_contact_customer_at,
+                                     :last_owner_update_at,
                                      :preferences
 
   history_attributes_ignored :create_article_type_id,
@@ -113,7 +114,7 @@ returns
     pending_action = Ticket::StateType.find_by(name: 'pending action')
     ticket_states_pending_action = Ticket::State.where(state_type_id: pending_action)
                                                 .where.not(next_state_id: nil)
-    if !ticket_states_pending_action.empty?
+    if ticket_states_pending_action.present?
       next_state_map = {}
       ticket_states_pending_action.each { |state|
         next_state_map[state.id] = state.next_state_id
@@ -137,7 +138,7 @@ returns
     pending_reminder = Ticket::StateType.find_by(name: 'pending reminder')
     ticket_states_pending_reminder = Ticket::State.where(state_type_id: pending_reminder)
 
-    if !ticket_states_pending_reminder.empty?
+    if ticket_states_pending_reminder.present?
       reminder_state_map = {}
       ticket_states_pending_reminder.each { |state|
         reminder_state_map[state.id] = state.next_state_id
@@ -228,6 +229,47 @@ returns
 
 =begin
 
+processes tickets which auto unassign time has reached
+
+  processed_tickets = Ticket.process_auto_unassign
+
+returns
+
+  processed_tickets = [, ...]
+
+=end
+
+  def self.process_auto_unassign
+
+    # process pending action tickets
+    state_ids = Ticket::State.by_category(:work_on).pluck(:id)
+    return [] if state_ids.blank?
+    result = []
+    groups = Group.where(active: true).where('assignment_timeout IS NOT NULL AND groups.assignment_timeout != 0')
+    return [] if groups.blank?
+    groups.each { |group|
+      next if group.assignment_timeout.blank?
+      ticket_ids = Ticket.where('state_id IN (?) AND owner_id != 1 AND group_id = ?', state_ids, group.id).limit(600).pluck(:id)
+      ticket_ids.each { |ticket_id|
+        ticket = Ticket.find_by(id: ticket_id)
+        next if !ticket
+        minutes_since_last_assignment = Time.zone.now - ticket.last_owner_update_at
+        next if (minutes_since_last_assignment / 60) <= group.assignment_timeout
+        Transaction.execute do
+          ticket.owner_id      = 1
+          ticket.updated_at    = Time.zone.now
+          ticket.updated_by_id = 1
+          ticket.save!
+        end
+        result.push ticket
+      }
+    }
+
+    result
+  end
+
+=begin
+
 merge tickets
 
   ticket = Ticket.find(123)
@@ -244,6 +286,14 @@ returns
 
   def merge_to(data)
 
+    # prevent cross merging tickets
+    target_ticket = Ticket.find_by(id: data[:ticket_id])
+    raise 'no target ticket given' if !target_ticket
+    raise Exceptions::UnprocessableEntity, 'ticket already merged, no merge into merged ticket possible' if target_ticket.state.state_type.name == 'merged'
+
+    # check different ticket ids
+    raise Exceptions::UnprocessableEntity, 'Can\'t merge ticket with it self!' if id == target_ticket.id
+
     # update articles
     Transaction.execute do
 
@@ -296,7 +346,7 @@ returns
       save!
 
       # touch new ticket (to broadcast change)
-      Ticket.find(data[:ticket_id]).touch
+      target_ticket.touch
     end
     true
   end
@@ -327,7 +377,7 @@ returns
     state      = Ticket::State.lookup(id: state_id)
     state_type = Ticket::StateType.lookup(id: state.state_type_id)
 
-    # always to set unseen for ticket owner
+    # always to set unseen for ticket owner and users which did not the update
     if state_type.name != 'merged'
       if user_id_check
         return false if user_id_check == owner_id && user_id_check != updated_by_id
@@ -369,17 +419,26 @@ get count of tickets and tickets which match on selector
     query, bind_params, tables = selector2sql(selectors, current_user)
     return [] if !query
 
-    if !current_user
-      ticket_count = Ticket.where(query, *bind_params).joins(tables).count
-      tickets = Ticket.where(query, *bind_params).joins(tables).limit(limit)
-      return [ticket_count, tickets]
+    ActiveRecord::Base.transaction(requires_new: true) do
+      begin
+        if !current_user
+          ticket_count = Ticket.where(query, *bind_params).joins(tables).count
+          tickets = Ticket.where(query, *bind_params).joins(tables).limit(limit)
+          return [ticket_count, tickets]
+        end
+
+        access_condition = Ticket.access_condition(current_user, access)
+        ticket_count = Ticket.where(access_condition).where(query, *bind_params).joins(tables).count
+        tickets = Ticket.where(access_condition).where(query, *bind_params).joins(tables).limit(limit)
+
+        return [ticket_count, tickets]
+      rescue ActiveRecord::StatementInvalid => e
+        Rails.logger.error e.inspect
+        Rails.logger.error e.backtrace
+        raise ActiveRecord::Rollback
+      end
     end
-
-    access_condition = Ticket.access_condition(current_user, access)
-    ticket_count = Ticket.where(access_condition).where(query, *bind_params).joins(tables).count
-    tickets = Ticket.where(access_condition).where(query, *bind_params).joins(tables).limit(limit)
-
-    [ticket_count, tickets]
+    []
   end
 
 =begin
@@ -504,7 +563,7 @@ condition example
             query += "#{attribute} IN (?)"
             bind_params.push 1
           else
-            query += "#{attribute} IS NOT NULL"
+            query += "#{attribute} IS NULL"
           end
         elsif selector['pre_condition'] == 'current_user.id'
           raise "Use current_user.id in selector, but no current_user is set #{selector.inspect}" if !current_user_id
@@ -518,7 +577,7 @@ condition example
         else
           # rubocop:disable Style/IfInsideElse
           if selector['value'].nil?
-            query += "#{attribute} IS NOT NULL"
+            query += "#{attribute} IS NULL"
           else
             query += "#{attribute} IN (?)"
             bind_params.push selector['value']
@@ -531,7 +590,7 @@ condition example
             query += "#{attribute} NOT IN (?)"
             bind_params.push 1
           else
-            query += "#{attribute} IS NULL"
+            query += "#{attribute} IS NOT NULL"
           end
         elsif selector['pre_condition'] == 'current_user.id'
           query += "#{attribute} NOT IN (?)"
@@ -1077,6 +1136,10 @@ result
     # ignore if no state has changed
     return true if !changes['state_id']
 
+    # ignore if new state is blank and
+    # let handle ActiveRecord the error
+    return if state_id.blank?
+
     # check if new state isn't pending*
     current_state      = Ticket::State.lookup(id: state_id)
     current_state_type = Ticket::StateType.lookup(id: current_state.state_type_id)
diff --git a/app/models/ticket/escalation.rb b/app/models/ticket/escalation.rb
index 68b645469..4f2f22585 100644
--- a/app/models/ticket/escalation.rb
+++ b/app/models/ticket/escalation.rb
@@ -322,23 +322,23 @@ returns
 =end
 
   def destination_time(start_time, move_minutes, biz, history_data)
-    destination_time = biz.time(move_minutes, :minutes).after(start_time)
+    local_destination_time = biz.time(move_minutes, :minutes).after(start_time)
 
     # go step by step to end of move_minutes until move_minutes is 0
     200.times.each { |_count|
 
       # check if we have pending time in the range to the destination time
-      working_minutes = period_working_minutes(start_time, destination_time, biz, history_data, true)
+      working_minutes = period_working_minutes(start_time, local_destination_time, biz, history_data, true)
       move_minutes -= working_minutes
 
       # skip if no pending time is given
       break if move_minutes <= 0
 
       # set pending destination to start time and add pending time to destination time
-      start_time       = destination_time
-      destination_time = biz.time(move_minutes, :minutes).after(start_time)
+      start_time             = local_destination_time
+      local_destination_time = biz.time(move_minutes, :minutes).after(start_time)
     }
-    destination_time
+    local_destination_time
   end
 
   # get period working minutes time in minutes
diff --git a/app/models/ticket/overviews.rb b/app/models/ticket/overviews.rb
index bea92fced..51e894643 100644
--- a/app/models/ticket/overviews.rb
+++ b/app/models/ticket/overviews.rb
@@ -5,9 +5,7 @@ module Ticket::Overviews
 
 all overviews by user
 
-  result = Ticket::Overviews.all(
-    current_user: User.find(123),
-  )
+  result = Ticket::Overviews.all(current_user: User.find(123))
 
 returns
 
@@ -21,11 +19,11 @@ returns
     # get customer overviews
     role_ids = User.joins(:roles).where(users: { id: current_user.id, active: true }, roles: { active: true }).pluck('roles.id')
     if current_user.permissions?('ticket.customer')
-      overviews = if current_user.organization_id && current_user.organization.shared
-                    Overview.joins(:roles).where(overviews_roles: { role_id: role_ids }, overviews: { active: true }).distinct('overview.id').order(:prio)
-                  else
-                    Overview.joins(:roles).where(overviews_roles: { role_id: role_ids }, overviews: { active: true, organization_shared: false }).distinct('overview.id').order(:prio)
-                  end
+      overview_filter = { active: true, organization_shared: false }
+      if current_user.organization_id && current_user.organization.shared
+        overview_filter.delete(:organization_shared)
+      end
+      overviews = Overview.joins(:roles).where(overviews_roles: { role_id: role_ids }, overviews: overview_filter).distinct('overview.id').order(:prio)
       overviews_list = []
       overviews.each { |overview|
         user_ids = overview.user_ids
@@ -37,7 +35,12 @@ returns
 
     # get agent overviews
     return [] if !current_user.permissions?('ticket.agent')
-    overviews = Overview.joins(:roles).where(overviews_roles: { role_id: role_ids }, overviews: { active: true }).distinct('overview.id').order(:prio)
+    overview_filter = { active: true }
+    overview_filter_not = { out_of_office: true }
+    if User.where('out_of_office = ? AND out_of_office_start_at <= ? AND out_of_office_end_at >= ? AND out_of_office_replacement_id = ? AND active = ?', true, Time.zone.today, Time.zone.today, current_user.id, true).count.positive?
+      overview_filter_not = {}
+    end
+    overviews = Overview.joins(:roles).where(overviews_roles: { role_id: role_ids }, overviews: overview_filter).where.not(overview_filter_not).distinct('overview.id').order(:prio)
     overviews_list = []
     overviews.each { |overview|
       user_ids = overview.user_ids
diff --git a/app/models/ticket/subject.rb b/app/models/ticket/subject.rb
index 53fc18349..3fa3fdd71 100644
--- a/app/models/ticket/subject.rb
+++ b/app/models/ticket/subject.rb
@@ -22,22 +22,28 @@ returns
     ticket_hook         = Setting.get('ticket_hook')
     ticket_hook_divider = Setting.get('ticket_hook_divider')
     ticket_subject_re   = Setting.get('ticket_subject_re')
-    if is_reply && !ticket_subject_re.empty?
-      subject = "#{ticket_subject_re}: #{subject}"
-    end
 
     # none position
     if Setting.get('ticket_hook_position') == 'none'
+      if is_reply && ticket_subject_re.present?
+        subject = "#{ticket_subject_re}: #{subject}"
+      end
       return subject
     end
 
     # right position
     if Setting.get('ticket_hook_position') == 'right'
-      return subject + " [#{ticket_hook}#{ticket_hook_divider}#{number}]"
+      if is_reply && ticket_subject_re.present?
+        subject = "#{ticket_subject_re}: #{subject}"
+      end
+      return "#{subject} [#{ticket_hook}#{ticket_hook_divider}#{number}]"
     end
 
     # left position
-    "[#{ticket_hook}#{ticket_hook_divider}#{number}] " + subject
+    if is_reply && ticket_subject_re.present?
+      return "#{ticket_subject_re}: [#{ticket_hook}#{ticket_hook_divider}#{number}] #{subject}"
+    end
+    "[#{ticket_hook}#{ticket_hook_divider}#{number}] #{subject}"
   end
 
 =begin
diff --git a/app/models/transaction/karma.rb b/app/models/transaction/karma.rb
index c90d8be8c..ef32bdf2b 100644
--- a/app/models/transaction/karma.rb
+++ b/app/models/transaction/karma.rb
@@ -54,7 +54,7 @@ class Transaction::Karma
 
     if @item[:type] == 'reminder_reached'
       return if ticket.owner_id == 1
-      return if ticket.pending_time > Time.zone.now - 2.days
+      return if ticket.pending_time && ticket.pending_time > Time.zone.now - 2.days
       Karma::ActivityLog.add('ticket reminder overdue (+2 days)', ticket.owner, 'Ticket', ticket.id)
       return
     end
diff --git a/app/models/transaction/notification.rb b/app/models/transaction/notification.rb
index ba0267b9c..1893a28b6 100644
--- a/app/models/transaction/notification.rb
+++ b/app/models/transaction/notification.rb
@@ -26,39 +26,61 @@ class Transaction::Notification
 
     # return if we run import mode
     return if Setting.get('import_mode')
-
     return if @item[:object] != 'Ticket'
-
     return if @params[:disable_notification]
 
-    ticket = Ticket.find(@item[:object_id])
+    ticket = Ticket.find_by(id: @item[:object_id])
+    return if !ticket
     if @item[:article_id]
       article = Ticket::Article.find(@item[:article_id])
 
       # ignore notifications
       sender = Ticket::Article::Sender.lookup(id: article.sender_id)
       if sender && sender.name == 'System'
-        return if @item[:changes].empty?
-        article = nil
+        return if @item[:changes].blank? && article.preferences[:notification] != true
+        if article.preferences[:notification] != true
+          article = nil
+        end
       end
     end
 
     # find recipients
     recipients_and_channels = []
+    recipients_reason = {}
 
     # loop through all users
     possible_recipients = User.group_access(ticket.group_id, 'full').sort_by(&:login)
-    if ticket.owner_id == 1
+
+    # apply owner
+    if ticket.owner_id != 1
       possible_recipients.push ticket.owner
+      recipients_reason[ticket.owner_id] = 'are assigned'
+    end
+
+    # apply out of office agents
+    possible_recipients_additions = Set.new
+    possible_recipients.each { |user|
+      recursive_ooo_replacements(
+        user:         user,
+        replacements: possible_recipients_additions,
+        reasons:      recipients_reason,
+      )
+    }
+
+    if possible_recipients_additions.present?
+      # join unique entries
+      possible_recipients = possible_recipients | possible_recipients_additions.to_a
     end
 
     already_checked_recipient_ids = {}
     possible_recipients.each { |user|
       result = NotificationFactory::Mailer.notification_settings(user, ticket, @item[:type])
       next if !result
-      next if already_checked_recipient_ids[result[:user].id]
-      already_checked_recipient_ids[result[:user].id] = true
+      next if already_checked_recipient_ids[user.id]
+      already_checked_recipient_ids[user.id] = true
       recipients_and_channels.push result
+      next if recipients_reason[user.id]
+      recipients_reason[user.id] = 'are in group'
     }
 
     # send notifications
@@ -74,11 +96,11 @@ class Transaction::Notification
       end
 
       # ignore inactive users
-      next if !user.active
+      next if !user.active?
 
       # ignore if no changes has been done
       changes = human_changes(user, ticket)
-      next if @item[:type] == 'update' && !article && (!changes || changes.empty?)
+      next if @item[:type] == 'update' && !article && changes.blank?
 
       # check if today already notified
       if @item[:type] == 'reminder_reached' || @item[:type] == 'escalation' || @item[:type] == 'escalation_warning'
@@ -117,7 +139,7 @@ class Transaction::Notification
           OnlineNotification.remove_by_type('Ticket', ticket.id, 'escalation_warning', user)
 
         # on updates without state changes create unseen messages
-        elsif @item[:type] != 'create' && (!@item[:changes] || @item[:changes].empty? || !@item[:changes]['state_id'])
+        elsif @item[:type] != 'create' && (@item[:changes].blank? || @item[:changes]['state_id'].blank?)
           seen = false
         else
           seen = ticket.online_notification_seen_state(user.id)
@@ -178,6 +200,7 @@ class Transaction::Notification
           recipient: user,
           current_user: current_user,
           changes: changes,
+          reason: recipients_reason[user.id],
         },
         message_id: "",
         references: ticket.get_references,
@@ -294,4 +317,27 @@ class Transaction::Notification
     changes
   end
 
+  private
+
+  def recursive_ooo_replacements(user:, replacements:, reasons:, level: 0)
+    if level == 10
+      Rails.logger.warn("Found more than 10 replacement levels for agent #{user}.")
+      return
+    end
+
+    replacement = user.out_of_office_agent
+    return if !replacement
+    # return for already found, added and checked users
+    # to prevent re-doing complete lookup paths
+    return if !replacements.add?(replacement)
+    reasons[replacement.id] = 'are the out-of-office replacement of the owner'
+
+    recursive_ooo_replacements(
+      user:         replacement,
+      replacements: replacements,
+      reasons:      reasons,
+      level:        level + 1
+    )
+  end
+
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 53355583d..90528a231 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -38,12 +38,12 @@ class User < ApplicationModel
   load 'user/search_index.rb'
   include User::SearchIndex
 
-  before_validation :check_name, :check_email, :check_login, :ensure_password
-  before_create   :check_preferences_default, :validate_roles, :domain_based_assignment, :set_locale
-  before_update   :check_preferences_default, :validate_roles, :reset_login_failed
+  before_validation :check_name, :check_email, :check_login, :ensure_uniq_email, :ensure_password, :ensure_roles, :ensure_identifier
+  before_create   :check_preferences_default, :validate_roles, :validate_ooo, :domain_based_assignment, :set_locale
+  before_update   :check_preferences_default, :validate_roles, :validate_ooo, :reset_login_failed
   after_create    :avatar_for_email_check
   after_update    :avatar_for_email_check
-  after_destroy   :avatar_destroy
+  after_destroy   :avatar_destroy, :user_device_destroy
 
   has_and_belongs_to_many :roles,           after_add: [:cache_update, :check_notifications], after_remove: :cache_update, before_add: :validate_agent_limit, before_remove: :last_admin_check, class_name: 'Role'
   has_and_belongs_to_many :organizations,   after_add: :cache_update, after_remove: :cache_update, class_name: 'Organization'
@@ -160,6 +160,45 @@ returns
 
 =begin
 
+check if user is in role
+
+  user = User.find(123)
+  result = user.out_of_office?
+
+returns
+
+  result = true|false
+
+=end
+
+  def out_of_office?
+    return false if out_of_office != true
+    return false if out_of_office_start_at.blank?
+    return false if out_of_office_end_at.blank?
+    Time.zone.today.between?(out_of_office_start_at, out_of_office_end_at)
+  end
+
+=begin
+
+check if user is in role
+
+  user = User.find(123)
+  result = user.out_of_office_agent
+
+returns
+
+  result = user_model
+
+=end
+
+  def out_of_office_agent
+    return if !out_of_office?
+    return if out_of_office_replacement_id.blank?
+    User.find_by(id: out_of_office_replacement_id)
+  end
+
+=begin
+
 get users activity stream
 
   user = User.find(123)
@@ -845,7 +884,7 @@ returns
 
   def check_email
     return true if Setting.get('import_mode')
-    return true if email.empty?
+    return true if email.blank?
     self.email = email.downcase.strip
     return true if id == 1
     raise Exceptions::UnprocessableEntity, 'Invalid email' if email !~ /@/
@@ -867,9 +906,9 @@ returns
       end
     end
 
-    # if no email, complain about missing login
-    if id != 1 && login.blank?
-      raise Exceptions::UnprocessableEntity, 'Attribute \'login\' required!'
+    # generate auto login
+    if login.blank?
+      self.login = "auto-#{Time.zone.now.to_i}-#{rand(999_999)}"
     end
 
     # check if login already exists
@@ -878,7 +917,7 @@ returns
     while check
       exists = User.find_by(login: login)
       if exists && exists.id != id
-        self.login = login + rand(999).to_s
+        self.login = "#{login}#{rand(999)}"
       else
         check = false
       end
@@ -886,6 +925,27 @@ returns
     true
   end
 
+  def ensure_roles
+    return true if role_ids.present?
+    self.role_ids = Role.signup_role_ids
+  end
+
+  def ensure_identifier
+    return true if email.present? || firstname.present? || lastname.present? || phone.present?
+    return true if login.present? && !login.start_with?('auto-')
+    raise Exceptions::UnprocessableEntity, 'Minimum one identifier (login, firstname, lastname, phone or email) for user is required.'
+  end
+
+  def ensure_uniq_email
+    return true if Setting.get('user_email_multiple_use')
+    return true if Setting.get('import_mode')
+    return true if email.blank?
+    return true if !changes
+    return true if !changes['email']
+    return true if !User.find_by(email: email.downcase.strip)
+    raise Exceptions::UnprocessableEntity, 'Email address is already used for other user.'
+  end
+
   def validate_roles
     return true if !role_ids
     role_ids.each { |role_id|
@@ -901,6 +961,15 @@ returns
     true
   end
 
+  def validate_ooo
+    return true if out_of_office != true
+    raise Exceptions::UnprocessableEntity, 'out of office start is required' if out_of_office_start_at.blank?
+    raise Exceptions::UnprocessableEntity, 'out of office end is required' if out_of_office_end_at.blank?
+    raise Exceptions::UnprocessableEntity, 'out of office end is before start' if out_of_office_start_at > out_of_office_end_at
+    raise Exceptions::UnprocessableEntity, 'out of office replacement user is required' if out_of_office_replacement_id.blank?
+    raise Exceptions::UnprocessableEntity, 'out of office no such replacement user' if !User.find_by(id: out_of_office_replacement_id)
+    true
+  end
 =begin
 
 checks if the current user is the last one
@@ -993,6 +1062,10 @@ raise 'Minimum one user need to have admin permissions'
     Avatar.remove('User', id)
   end
 
+  def user_device_destroy
+    UserDevice.remove(id)
+  end
+
   def ensure_password
     return true if password_empty?
     return true if PasswordHash.crypted?(password)
diff --git a/app/models/user_device.rb b/app/models/user_device.rb
index 444703d15..3085fe24b 100644
--- a/app/models/user_device.rb
+++ b/app/models/user_device.rb
@@ -210,4 +210,15 @@ send user notification about new device or new location for device
     )
   end
 
+=begin
+
+delete device devices of user
+
+  user_devices = UserDevice.remove(user.id)
+
+=end
+
+  def self.remove(user_id)
+    UserDevice.where(user_id: user_id).destroy_all
+  end
 end
diff --git a/app/views/mailer/application.html.erb b/app/views/mailer/application.html.erb
index 913224ad3..858bdd5d3 100644
--- a/app/views/mailer/application.html.erb
+++ b/app/views/mailer/application.html.erb
@@ -16,6 +16,7 @@
     font-size: 16px;
   }
   .footer {
+    font-size: 10px;
     color: #aaaaaa;
     border-top-style:solid;
     border-top-width:1px;
@@ -40,6 +41,13 @@
 
 <% if @objects[:standalone] != true %>
 
    
-  <%= t 'Manage your notifications settings' %> <% if !c('organization').empty? %>| <%= c 'organization' %><% end %>
+  <% if @objects[:reason] %>
+    <% reason = t('You are receiving this because you "%s".') %>
+    <% reason_item = t (@objects[:reason]) %>
+    <% reason.gsub!('%s', reason_item) %>
+    <%= reason %> |
+  <% end %>
+  <%= t 'Manage your notifications settings' %>
+  <% if c('organization').present? %>| <%= c 'organization' %><% end %>
 
    
 <% end %>
diff --git a/config/application.rb b/config/application.rb
index 28aaa09c4..3721b5df5 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -23,6 +23,7 @@ module Zammad
     config.active_record.observers =
       'observer::_session',
       'observer::_ticket::_close_time',
+      'observer::_ticket::_last_owner_update',
       'observer::_ticket::_user_ticket_counter',
       'observer::_ticket::_article_changes',
       'observer::_ticket::_article::_fillup_from_general',
diff --git a/config/initializers/db_preferences_mysql.rb b/config/initializers/db_preferences_mysql.rb
index 121608f10..9de0ac255 100644
--- a/config/initializers/db_preferences_mysql.rb
+++ b/config/initializers/db_preferences_mysql.rb
@@ -1,6 +1,7 @@
 # mysql
 if ActiveRecord::Base.connection_config[:adapter] == 'mysql2'
   Rails.application.config.db_4bytes_utf8 = false
+  Rails.application.config.db_null_byte = true
 
   # mysql version check
   #  mysql example: "5.7.3"
diff --git a/config/initializers/db_preferences_postgresql.rb b/config/initializers/db_preferences_postgresql.rb
index 8f72504c4..b62f7082c 100644
--- a/config/initializers/db_preferences_postgresql.rb
+++ b/config/initializers/db_preferences_postgresql.rb
@@ -2,6 +2,7 @@
 if ActiveRecord::Base.connection_config[:adapter] == 'postgresql'
   Rails.application.config.db_case_sensitive = true
   Rails.application.config.db_like = 'ILIKE'
+  Rails.application.config.db_null_byte = false
 
   # postgresql version check
   #  example output: "9.5.0"
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index 6436d6aad..ea2793497 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -32,9 +32,11 @@ Rails.application.config.middleware.use OmniAuth::Builder do
       authorize_url: '/oauth/authorize',
       token_url: '/oauth/token'
     },
-    scope: 'read_user',
   }
 
+  # microsoft_office365 database connect
+  provider :microsoft_office365_database, 'not_change_will_be_set_by_database', 'not_change_will_be_set_by_database'
+
   # oauth2 database connect
   provider :oauth2_database, 'not_change_will_be_set_by_database', 'not_change_will_be_set_by_database', {
     client_options: {
diff --git a/config/routes/form.rb b/config/routes/form.rb
index b9c6974eb..fbe08b640 100644
--- a/config/routes/form.rb
+++ b/config/routes/form.rb
@@ -2,7 +2,7 @@ Zammad::Application.routes.draw do
   api_path = Rails.configuration.api_path
 
   # forms
-  match api_path + '/form_submit',      to: 'form#submit',    via: :post
-  match api_path + '/form_config',      to: 'form#config',    via: :post
+  match api_path + '/form_submit',      to: 'form#submit',        via: :post
+  match api_path + '/form_config',      to: 'form#configuration', via: :post
 
 end
diff --git a/config/routes/integration_check_mk.rb b/config/routes/integration_check_mk.rb
new file mode 100644
index 000000000..323201145
--- /dev/null
+++ b/config/routes/integration_check_mk.rb
@@ -0,0 +1,5 @@
+Zammad::Application.routes.draw do
+  api_path = Rails.configuration.api_path
+
+  match api_path + '/integration/check_mk/:token',   to: 'integration/check_mk#update',   via: :post, defaults: { format: 'json' }
+end
diff --git a/config/routes/integration_exchange.rb b/config/routes/integration_exchange.rb
new file mode 100644
index 000000000..0c84a90f8
--- /dev/null
+++ b/config/routes/integration_exchange.rb
@@ -0,0 +1,11 @@
+Zammad::Application.routes.draw do
+  api_path = Rails.configuration.api_path
+
+  match api_path + '/integration/exchange/autodiscover', to: 'integration/exchange#autodiscover',      via: :post
+  match api_path + '/integration/exchange/folders',      to: 'integration/exchange#folders',           via: :post
+  match api_path + '/integration/exchange/mapping',      to: 'integration/exchange#mapping',           via: :post
+  match api_path + '/integration/exchange/job_try',      to: 'integration/exchange#job_try_index',     via: :get
+  match api_path + '/integration/exchange/job_try',      to: 'integration/exchange#job_try_create',    via: :post
+  match api_path + '/integration/exchange/job_start',    to: 'integration/exchange#job_start_index',   via: :get
+  match api_path + '/integration/exchange/job_start',    to: 'integration/exchange#job_start_create',  via: :post
+end
diff --git a/config/routes/integration_idoit.rb b/config/routes/integration_idoit.rb
new file mode 100644
index 000000000..455599307
--- /dev/null
+++ b/config/routes/integration_idoit.rb
@@ -0,0 +1,9 @@
+Zammad::Application.routes.draw do
+  api_path = Rails.configuration.api_path
+
+  match api_path + '/integration/idoit',                to: 'integration/idoit#query',   via: :post
+  match api_path + '/integration/idoit',                to: 'integration/idoit#query',   via: :get
+  match api_path + '/integration/idoit/verify',         to: 'integration/idoit#verify',  via: :post
+  match api_path + '/integration/idoit_ticket_update',  to: 'integration/idoit#update',  via: :post
+
+end
diff --git a/config/routes/user.rb b/config/routes/user.rb
index 54f8dba73..0f66db41c 100644
--- a/config/routes/user.rb
+++ b/config/routes/user.rb
@@ -8,6 +8,7 @@ Zammad::Application.routes.draw do
   match api_path + '/users/password_reset_verify', to: 'users#password_reset_verify', via: :post
   match api_path + '/users/password_change',       to: 'users#password_change',       via: :post
   match api_path + '/users/preferences',           to: 'users#preferences',           via: :put
+  match api_path + '/users/out_of_office',         to: 'users#out_of_office',         via: :put
   match api_path + '/users/account',               to: 'users#account_remove',        via: :delete
 
   match api_path + '/users/avatar',                to: 'users#avatar_new',            via: :post
diff --git a/contrib/cleanup.sh b/contrib/cleanup.sh
index c057c0dbb..10efac1e9 100755
--- a/contrib/cleanup.sh
+++ b/contrib/cleanup.sh
@@ -7,3 +7,5 @@ rm -rf app/assets/javascripts/app/views/layout_ref/
 rm app/assets/javascripts/app/controllers/karma.coffee
 rm app/assets/javascripts/app/controllers/report.coffee
 rm app/assets/javascripts/app/controllers/report_profile.coffee
+rm app/assets/javascripts/app/controllers/_integration/check_mk.coffee
+rm app/assets/javascripts/app/controllers/_integration/idoit.coffee
diff --git a/contrib/icon-sprite.sketch b/contrib/icon-sprite.sketch
index 6ec311680..2a6135cec 100644
Binary files a/contrib/icon-sprite.sketch and b/contrib/icon-sprite.sketch differ
diff --git a/contrib/nginx/zammad.conf b/contrib/nginx/zammad.conf
index 7bb4fcc25..279d35f51 100644
--- a/contrib/nginx/zammad.conf
+++ b/contrib/nginx/zammad.conf
@@ -33,6 +33,7 @@ server {
         proxy_set_header Connection "Upgrade";
         proxy_set_header CLIENT_IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
         proxy_read_timeout 86400;
         proxy_pass http://zammad-websocket;
     }
@@ -41,6 +42,7 @@ server {
         proxy_set_header Host $http_host;
         proxy_set_header CLIENT_IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
         proxy_read_timeout 180;
         proxy_pass http://zammad;
 
diff --git a/contrib/nginx/zammad_ssl.conf b/contrib/nginx/zammad_ssl.conf
index 248790af3..de55f36ed 100644
--- a/contrib/nginx/zammad_ssl.conf
+++ b/contrib/nginx/zammad_ssl.conf
@@ -124,6 +124,7 @@ server {
         proxy_set_header Connection "Upgrade";
         proxy_set_header CLIENT_IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
         proxy_read_timeout 86400;
         proxy_pass http://zammad-websocket;
     }
@@ -132,6 +133,7 @@ server {
         proxy_set_header Host $http_host;
         proxy_set_header CLIENT_IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
         proxy_read_timeout 180;
         proxy_pass http://zammad;
 
diff --git a/contrib/travis-ci.org/trigger-docker-compose-build.sh b/contrib/travis-ci.org/trigger-docker-compose-build.sh
new file mode 100755
index 000000000..cc7288b49
--- /dev/null
+++ b/contrib/travis-ci.org/trigger-docker-compose-build.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+#
+# trigger build of https://github.com/zammad/zammad-docker-compose on https://travis-ci.org/zammad/zammad-docker-compose and upload it to https://hub.docker.com/r/zammad/zammad-docker-compose/
+#
+
+REPO_USER="zammad"
+REPO="zammad-docker-compose"
+BRANCH="master"
+
+if [ ${TRAVIS_BRANCH} == 'stable' ]; then
+  curl -X POST \
+    -H "Content-Type: application/json" \
+    -H "Travis-API-Version: 3" \
+    -H "Accept: application/json" \
+    -H "Authorization: token ${TRAVIS_API_TOKEN}" \
+    -d '{"request": {"branch":"'${BRANCH}'"}}' \
+    "https://api.travis-ci.org/repo/${REPO_USER}%2F${REPO}/requests"
+fi
diff --git a/db/migrate/20120101000001_create_base.rb b/db/migrate/20120101000001_create_base.rb
index 6e4e773c1..71547ebb9 100644
--- a/db/migrate/20120101000001_create_base.rb
+++ b/db/migrate/20120101000001_create_base.rb
@@ -40,6 +40,10 @@ class CreateBase < ActiveRecord::Migration
       t.timestamp :last_login,        limit: 3,   null: true
       t.string :source,               limit: 200, null: true
       t.integer :login_failed,                    null: false, default: 0
+      t.boolean :out_of_office,                   null: false, default: false
+      t.date :out_of_office_start_at,             null: true
+      t.date :out_of_office_end_at,               null: true
+      t.integer :out_of_office_replacement_id,    null: true
       t.string :preferences,          limit: 8000, null: true
       t.integer :updated_by_id,                   null: false
       t.integer :created_by_id,                   null: false
@@ -54,10 +58,13 @@ class CreateBase < ActiveRecord::Migration
     add_index :users, [:phone]
     add_index :users, [:fax]
     add_index :users, [:mobile]
+    add_index :users, [:out_of_office, :out_of_office_start_at, :out_of_office_end_at], name: 'index_out_of_office'
+    add_index :users, [:out_of_office_replacement_id]
     add_index :users, [:source]
     add_index :users, [:created_by_id]
     add_foreign_key :users, :users, column: :created_by_id
     add_foreign_key :users, :users, column: :updated_by_id
+    add_foreign_key :users, :users, column: :out_of_office_replacement_id
 
     create_table :signatures do |t|
       t.string :name,                 limit: 100,  null: false
diff --git a/db/migrate/20120101000010_create_ticket.rb b/db/migrate/20120101000010_create_ticket.rb
index 586b5cca7..ab36bcfce 100644
--- a/db/migrate/20120101000010_create_ticket.rb
+++ b/db/migrate/20120101000010_create_ticket.rb
@@ -69,6 +69,7 @@ class CreateTicket < ActiveRecord::Migration
       t.column :last_contact_at,                  :timestamp, limit: 3,   null: true
       t.column :last_contact_agent_at,            :timestamp, limit: 3,   null: true
       t.column :last_contact_customer_at,         :timestamp, limit: 3,   null: true
+      t.column :last_owner_update_at,             :timestamp, limit: 3,   null: true
       t.column :create_article_type_id,           :integer,               null: true
       t.column :create_article_sender_id,         :integer,               null: true
       t.column :article_count,                    :integer,               null: true
@@ -103,6 +104,7 @@ class CreateTicket < ActiveRecord::Migration
     add_index :tickets, [:last_contact_at]
     add_index :tickets, [:last_contact_agent_at]
     add_index :tickets, [:last_contact_customer_at]
+    add_index :tickets, [:last_owner_update_at]
     add_index :tickets, [:create_article_type_id]
     add_index :tickets, [:create_article_sender_id]
     add_index :tickets, [:created_by_id]
@@ -236,6 +238,7 @@ class CreateTicket < ActiveRecord::Migration
       t.column :order,                :string,  limit: 2500,   null: false
       t.column :group_by,             :string,  limit: 250,    null: true
       t.column :organization_shared,  :boolean,                null: false, default: false
+      t.column :out_of_office,        :boolean,                null: false, default: false
       t.column :view,                 :string,  limit: 1000,   null: false
       t.column :active,               :boolean,                null: false, default: true
       t.column :updated_by_id,        :integer,                null: false
diff --git a/db/migrate/20170516000001_trigger_recipient_update.rb b/db/migrate/20170516000001_trigger_recipient_update.rb
index 2b359d0ae..a2ed60e87 100644
--- a/db/migrate/20170516000001_trigger_recipient_update.rb
+++ b/db/migrate/20170516000001_trigger_recipient_update.rb
@@ -5,14 +5,18 @@ class TriggerRecipientUpdate < ActiveRecord::Migration
     return if !Setting.find_by(name: 'system_init_done')
 
     ['auto reply (on new tickets)', 'auto reply (on follow up of tickets)'].each { |name|
-      trigger = Trigger.find_by(name: name)
-      next if !trigger
-      next if !trigger.perform
-      next if !trigger.perform['notification.email']
-      next if !trigger.perform['notification.email']['recipient']
-      next if trigger.perform['notification.email']['recipient'] != 'ticket_customer'
-      trigger.perform['notification.email']['recipient'] = 'article_last_sender'
-      trigger.save
+      begin
+        trigger = Trigger.find_by(name: name)
+        next if trigger.blank?
+        next if trigger.perform.blank?
+        next if trigger.perform['notification.email'].blank?
+        next if trigger.perform['notification.email']['recipient'].blank?
+        next if trigger.perform['notification.email']['recipient'] != 'ticket_customer'
+        trigger.perform['notification.email']['recipient'] = 'article_last_sender'
+        trigger.save!
+      rescue => e
+        Rails.logger.error "Unable to update Trigger.find(#{trigger.id}) '#{trigger.inspect}': #{e.message}"
+      end
     }
 
   end
diff --git a/db/migrate/20170531144425_foreign_keys.rb b/db/migrate/20170531144425_foreign_keys.rb
index b38e3ab71..64bcedab0 100644
--- a/db/migrate/20170531144425_foreign_keys.rb
+++ b/db/migrate/20170531144425_foreign_keys.rb
@@ -1,4 +1,6 @@
 class ForeignKeys < ActiveRecord::Migration
+  disable_ddl_transaction!
+
   def change
 
     # return if it's a new setup
@@ -217,10 +219,12 @@ class ForeignKeys < ActiveRecord::Migration
     ]
 
     foreign_keys.each do |foreign_key|
-      begin
-        ActiveRecord::Migration.add_foreign_key(*foreign_key)
-      rescue => e
-        Rails.logger.error "Inconsistent data status detected while adding foreign key '#{foreign_key.inspect}': #{e.message}"
+      ActiveRecord::Base.transaction do
+        begin
+          add_foreign_key(*foreign_key)
+        rescue => e
+          Rails.logger.error "Inconsistent data status detected while adding foreign key '#{foreign_key.inspect}': #{e.message}"
+        end
       end
     end
   end
diff --git a/db/migrate/20170629000001_exchange_integration.rb b/db/migrate/20170629000001_exchange_integration.rb
new file mode 100644
index 000000000..88447f2c6
--- /dev/null
+++ b/db/migrate/20170629000001_exchange_integration.rb
@@ -0,0 +1,51 @@
+class ExchangeIntegration < ActiveRecord::Migration
+  def up
+
+    # return if it's a new setup
+    return if !Setting.find_by(name: 'system_init_done')
+
+    Setting.set('import_backends', ['Import::Ldap', 'Import::Exchange'])
+
+    Setting.create_if_not_exists(
+      title: 'Exchange config',
+      name: 'exchange_config',
+      area: 'Integration::Exchange',
+      description: 'Defines the Exchange config.',
+      options: {},
+      state: {},
+      preferences: {
+        prio: 2,
+        permission: ['admin.integration'],
+      },
+      frontend: false,
+    )
+    Setting.create_if_not_exists(
+      title: 'Exchange integration',
+      name: 'exchange_integration',
+      area: 'Integration::Switch',
+      description: 'Defines if Exchange is enabled or not.',
+      options: {
+        form: [
+          {
+            display: '',
+            null: true,
+            name: 'exchange_integration',
+            tag: 'boolean',
+            options: {
+              true  => 'yes',
+              false => 'no',
+            },
+          },
+        ],
+      },
+      state: false,
+      preferences: {
+        prio: 1,
+        authentication: true,
+        permission: ['admin.integration'],
+      },
+      frontend: true
+    )
+  end
+
+end
diff --git a/db/migrate/20170713000001_omniauth_office365_setting.rb b/db/migrate/20170713000001_omniauth_office365_setting.rb
new file mode 100644
index 000000000..147dbd508
--- /dev/null
+++ b/db/migrate/20170713000001_omniauth_office365_setting.rb
@@ -0,0 +1,63 @@
+class OmniauthOffice365Setting < ActiveRecord::Migration
+  def up
+
+    # return if it's a new setup
+    return if !Setting.find_by(name: 'system_init_done')
+    Setting.create_if_not_exists(
+      title: 'Authentication via %s',
+      name: 'auth_microsoft_office365',
+      area: 'Security::ThirdPartyAuthentication',
+      description: 'Enables user authentication via %s. Register your app first at [%s](%s).',
+      options: {
+        form: [
+          {
+            display: '',
+            null: true,
+            name: 'auth_microsoft_office365',
+            tag: 'boolean',
+            options: {
+              true  => 'yes',
+              false => 'no',
+            },
+          },
+        ],
+      },
+      preferences: {
+        controller: 'SettingsAreaSwitch',
+        sub: ['auth_microsoft_office365_credentials'],
+        title_i18n: ['Office 365'],
+        description_i18n: ['Office 365', 'Microsoft Application Registration Portal', 'https://apps.dev.microsoft.com'],
+        permission: ['admin.security'],
+      },
+      state: false,
+      frontend: true
+    )
+    Setting.create_if_not_exists(
+      title: 'Office 365 App Credentials',
+      name: 'auth_microsoft_office365_credentials',
+      area: 'Security::ThirdPartyAuthentication::Office365',
+      description: 'Enables user authentication via Office 365.',
+      options: {
+        form: [
+          {
+            display: 'App ID',
+            null: true,
+            name: 'app_id',
+            tag: 'input',
+          },
+          {
+            display: 'App Secret',
+            null: true,
+            name: 'app_secret',
+            tag: 'input',
+          },
+        ],
+      },
+      state: {},
+      preferences: {
+        permission: ['admin.security'],
+      },
+      frontend: false
+    )
+  end
+end
diff --git a/db/migrate/20170713000002_ticket_zoom_setting2.rb b/db/migrate/20170713000002_ticket_zoom_setting2.rb
new file mode 100644
index 000000000..8147edc1f
--- /dev/null
+++ b/db/migrate/20170713000002_ticket_zoom_setting2.rb
@@ -0,0 +1,126 @@
+class TicketZoomSetting2 < ActiveRecord::Migration
+  def up
+
+    # return if it's a new setup
+    return if !Setting.find_by(name: 'system_init_done')
+
+    setting = Setting.find_by(name: 'ui_ticket_zoom_article_new_internal')
+    if setting
+      setting.title = 'Note - default visibility'
+      setting.name = 'ui_ticket_zoom_article_note_new_internal'
+      setting.description = 'Default visibility for new articles.'
+      setting.preferences[:prio] = 100
+      setting.options[:form][0][:name] = 'ui_ticket_zoom_article_note_new_internal'
+      setting.save!
+    end
+    Setting.create_if_not_exists(
+      title: 'Note - default visibility',
+      name: 'ui_ticket_zoom_article_note_new_internal',
+      area: 'UI::TicketZoom',
+      description: 'Default visibility for new articles.',
+      options: {
+        form: [
+          {
+            display: '',
+            null: true,
+            name: 'ui_ticket_zoom_article_note_new_internal',
+            tag: 'boolean',
+            translate: true,
+            options: {
+              true  => 'internal',
+              false => 'public',
+            },
+          },
+        ],
+      },
+      state: true,
+      preferences: {
+        prio: 100,
+        permission: ['admin.ui'],
+      },
+      frontend: true
+    )
+    Setting.create_if_not_exists(
+      title: 'Email - subject field',
+      name: 'ui_ticket_zoom_article_email_subject',
+      area: 'UI::TicketZoom',
+      description: 'Use subject field for emails. If disabled, the ticket title will be used as subject.',
+      options: {
+        form: [
+          {
+            display: '',
+            null: true,
+            name: 'ui_ticket_zoom_article_email_subject',
+            tag: 'boolean',
+            translate: true,
+            options: {
+              true  => 'yes',
+              false => 'no',
+            },
+          },
+        ],
+      },
+      state: false,
+      preferences: {
+        prio: 200,
+        permission: ['admin.ui'],
+      },
+      frontend: true
+    )
+    Setting.create_if_not_exists(
+      title: 'Email - full quote',
+      name: 'ui_ticket_zoom_article_email_full_quote',
+      area: 'UI::TicketZoom',
+      description: 'Enable if you want to quote the full email in your answer. The quoted email will be put at the end of your answer. If you just want to quote a certain phrase, just mark the text and press reply (this feature is always available).',
+      options: {
+        form: [
+          {
+            display: '',
+            null: true,
+            name: 'ui_ticket_zoom_article_email_full_quote',
+            tag: 'boolean',
+            translate: true,
+            options: {
+              true  => 'yes',
+              false => 'no',
+            },
+          },
+        ],
+      },
+      state: false,
+      preferences: {
+        prio: 220,
+        permission: ['admin.ui'],
+      },
+      frontend: true
+    )
+    Setting.create_if_not_exists(
+      title: 'Twitter - tweet initials',
+      name: 'ui_ticket_zoom_article_twitter_initials',
+      area: 'UI::TicketZoom',
+      description: 'Add sender initials to end of a tweet.',
+      options: {
+        form: [
+          {
+            display: '',
+            null: true,
+            name: 'ui_ticket_zoom_article_twitter_initials',
+            tag: 'boolean',
+            translate: true,
+            options: {
+              true  => 'yes',
+              false => 'no',
+            },
+          },
+        ],
+      },
+      state: true,
+      preferences: {
+        prio: 300,
+        permission: ['admin.ui'],
+      },
+      frontend: true
+    )
+  end
+
+end
diff --git a/db/migrate/20170714000001_object_manager_user_email_optional.rb b/db/migrate/20170714000001_object_manager_user_email_optional.rb
new file mode 100644
index 000000000..4536130b6
--- /dev/null
+++ b/db/migrate/20170714000001_object_manager_user_email_optional.rb
@@ -0,0 +1,54 @@
+class ObjectManagerUserEmailOptional < ActiveRecord::Migration
+  def up
+
+    # return if it's a new setup
+    return if !Setting.find_by(name: 'system_init_done')
+
+    ObjectManager::Attribute.add(
+      force: true,
+      object: 'User',
+      name: 'email',
+      display: 'Email',
+      data_type: 'input',
+      data_option: {
+        type: 'email',
+        maxlength: 150,
+        null: true,
+        item_class: 'formGroup--halfSize',
+      },
+      editable: false,
+      active: true,
+      screens: {
+        signup: {
+          '-all-' => {
+            null: false,
+          },
+        },
+        invite_agent: {
+          '-all-' => {
+            null: false,
+          },
+        },
+        invite_customer: {
+          '-all-' => {
+            null: false,
+          },
+        },
+        edit: {
+          '-all-' => {
+            null: true,
+          },
+        },
+        view: {
+          '-all-' => {
+            shown: true,
+          },
+        },
+      },
+      to_create: false,
+      to_migrate: false,
+      to_delete: false,
+      position: 400,
+    )
+  end
+end
diff --git a/db/migrate/20170714000002_user_email_multiple_use.rb b/db/migrate/20170714000002_user_email_multiple_use.rb
new file mode 100644
index 000000000..5d89d8d59
--- /dev/null
+++ b/db/migrate/20170714000002_user_email_multiple_use.rb
@@ -0,0 +1,34 @@
+class UserEmailMultipleUse < ActiveRecord::Migration
+  def up
+
+    # return if it's a new setup
+    return if !Setting.find_by(name: 'system_init_done')
+
+    Setting.create_if_not_exists(
+      title: 'User email for muliple users',
+      name: 'user_email_multiple_use',
+      area: 'Model::User',
+      description: 'Allow to use email address for muliple users.',
+      options: {
+        form: [
+          {
+            display: '',
+            null: true,
+            name: 'user_email_multiple_use',
+            tag: 'boolean',
+            options: {
+              true  => 'yes',
+              false => 'no',
+            },
+          },
+        ],
+      },
+      state: false,
+      preferences: {
+        permission: ['admin'],
+      },
+      frontend: false
+    )
+  end
+
+end
diff --git a/db/migrate/20170714000003_cleanup_cti_log.rb b/db/migrate/20170714000003_cleanup_cti_log.rb
new file mode 100644
index 000000000..4b9e59cbe
--- /dev/null
+++ b/db/migrate/20170714000003_cleanup_cti_log.rb
@@ -0,0 +1,18 @@
+class CleanupCtiLog < ActiveRecord::Migration
+  def up
+
+    # return if it's a new setup
+    return if !Setting.find_by(name: 'system_init_done')
+
+    Scheduler.create_if_not_exists(
+      name: 'Cleanup Cti::Log',
+      method: 'Cti::Log.cleanup',
+      period: 1.month,
+      prio: 2,
+      active: true,
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+  end
+
+end
diff --git a/db/migrate/20170525000002_fixed_twitter_ticket_article_preferences.rb b/db/migrate/20170725000001_fixed_twitter_ticket_article_preferences3.rb
similarity index 71%
rename from db/migrate/20170525000002_fixed_twitter_ticket_article_preferences.rb
rename to db/migrate/20170725000001_fixed_twitter_ticket_article_preferences3.rb
index 40e9e15ee..23e21acdb 100644
--- a/db/migrate/20170525000002_fixed_twitter_ticket_article_preferences.rb
+++ b/db/migrate/20170725000001_fixed_twitter_ticket_article_preferences3.rb
@@ -1,4 +1,4 @@
-class FixedTwitterTicketArticlePreferences < ActiveRecord::Migration
+class FixedTwitterTicketArticlePreferences3 < ActiveRecord::Migration
   def up
 
     # return if it's a new setup
@@ -6,12 +6,18 @@ class FixedTwitterTicketArticlePreferences < ActiveRecord::Migration
 
     # find article preferences with Twitter::NullObject and replace it with nill to prevent elasticsearch index issue
     article_type = Ticket::Article::Type.find_by(name: 'twitter status')
-    Ticket::Article.where(type_id: article_type.id).each { |article|
+    article_ids = Ticket::Article.where(type_id: article_type.id).pluck(:id)
+    article_ids.each { |article_id|
+      article = Ticket::Article.find(article_id)
       next if !article.preferences
       changed = false
       article.preferences.each { |_key, value|
         next if value.class != ActiveSupport::HashWithIndifferentAccess
         value.each { |sub_key, sub_level|
+          if sub_level.class == NilClass
+            value[sub_key] = nil
+            next
+          end
           if sub_level.class == Twitter::Place
             value[sub_key] = sub_level.attrs
             changed = true
diff --git a/db/migrate/20170115000001_add_proxy_settings_439.rb b/db/migrate/20170727000001_setting_proxy.rb
similarity index 62%
rename from db/migrate/20170115000001_add_proxy_settings_439.rb
rename to db/migrate/20170727000001_setting_proxy.rb
index a6c0467f4..2634c3beb 100644
--- a/db/migrate/20170115000001_add_proxy_settings_439.rb
+++ b/db/migrate/20170727000001_setting_proxy.rb
@@ -1,4 +1,4 @@
-class AddProxySettings439 < ActiveRecord::Migration
+class SettingProxy < ActiveRecord::Migration
   def up
 
     # return if it's a new setup
@@ -53,30 +53,61 @@ class AddProxySettings439 < ActiveRecord::Migration
       },
       frontend: false
     )
+    # fix typo
+    setting = Setting.find_by(name: 'proxy_password')
+    if setting
+      setting.options[:form][0][:name] = 'proxy_password'
+      setting.save!
+    else
+      Setting.create_if_not_exists(
+        title: 'Proxy Password',
+        name: 'proxy_password',
+        area: 'System::Network',
+        description: 'Password for proxy connection.',
+        options: {
+          form: [
+            {
+              display: '',
+              null: false,
+              name: 'proxy_password',
+              tag: 'input',
+            },
+          ],
+        },
+        state: '',
+        preferences: {
+          disabled: true,
+          online_service_disable: true,
+          prio: 3,
+          permission: ['admin.system'],
+        },
+        frontend: false
+      )
+    end
     Setting.create_if_not_exists(
-      title: 'Proxy Password',
-      name: 'proxy_password',
+      title: 'No Proxy',
+      name: 'proxy_no',
       area: 'System::Network',
-      description: 'Password for proxy connection.',
+      description: 'No proxy for the following hosts.',
       options: {
         form: [
           {
             display: '',
             null: false,
-            name: 'proxy_passowrd',
+            name: 'proxy_no',
             tag: 'input',
           },
         ],
       },
-      state: '',
+      state: 'localhost,127.0.0.0,::1',
       preferences: {
         disabled: true,
         online_service_disable: true,
-        prio: 3,
+        prio: 4,
         permission: ['admin.system'],
       },
       frontend: false
     )
-
   end
+
 end
diff --git a/db/migrate/20170816000001_idoit_support.rb b/db/migrate/20170816000001_idoit_support.rb
new file mode 100644
index 000000000..8a8185b3e
--- /dev/null
+++ b/db/migrate/20170816000001_idoit_support.rb
@@ -0,0 +1,49 @@
+class IdoitSupport < ActiveRecord::Migration
+  def up
+
+    # return if it's a new setup
+    return if !Setting.find_by(name: 'system_init_done')
+
+    Setting.create_if_not_exists(
+      title: 'i-doit integration',
+      name: 'idoit_integration',
+      area: 'Integration::Switch',
+      description: 'Defines if i-doit (http://www.i-doit) is enabled or not.',
+      options: {
+        form: [
+          {
+            display: '',
+            null: true,
+            name: 'idoit_integration',
+            tag: 'boolean',
+            options: {
+              true  => 'yes',
+              false => 'no',
+            },
+          },
+        ],
+      },
+      state: false,
+      preferences: {
+        prio: 1,
+        authentication: true,
+        permission: ['admin.integration'],
+      },
+      frontend: true
+    )
+    Setting.create_if_not_exists(
+      title: 'i-doit config',
+      name: 'idoit_config',
+      area: 'Integration::Idoit',
+      description: 'Defines the i-doit config.',
+      options: {},
+      state: {},
+      preferences: {
+        prio: 2,
+        permission: ['admin.integration'],
+      },
+      frontend: false,
+    )
+  end
+
+end
diff --git a/db/migrate/20170820000001_check_mk_integration.rb b/db/migrate/20170820000001_check_mk_integration.rb
new file mode 100644
index 000000000..8952108b6
--- /dev/null
+++ b/db/migrate/20170820000001_check_mk_integration.rb
@@ -0,0 +1,119 @@
+class CheckMkIntegration < ActiveRecord::Migration
+  def up
+
+    # return if it's a new setup
+    return if !Setting.find_by(name: 'system_init_done')
+
+    Setting.create_if_not_exists(
+      title: 'Check_MK integration',
+      name: 'check_mk_integration',
+      area: 'Integration::Switch',
+      description: 'Defines if Check_MK (http://mathias-kettner.com/check_mk.html) is enabled or not.',
+      options: {
+        form: [
+          {
+            display: '',
+            null: true,
+            name: 'check_mk_integration',
+            tag: 'boolean',
+            options: {
+              true  => 'yes',
+              false => 'no',
+            },
+          },
+        ],
+      },
+      state: false,
+      preferences: {
+        prio: 1,
+        permission: ['admin.integration'],
+      },
+      frontend: false
+    )
+    Setting.create_if_not_exists(
+      title: 'Group',
+      name: 'check_mk_group_id',
+      area: 'Integration::CheckMK',
+      description: 'Defines the group of created tickets.',
+      options: {
+        form: [
+          {
+            display: '',
+            null: false,
+            name: 'check_mk_group_id',
+            tag: 'select',
+            relation: 'Group',
+          },
+        ],
+      },
+      state: 1,
+      preferences: {
+        prio: 2,
+        permission: ['admin.integration'],
+      },
+      frontend: false
+    )
+    Setting.create_if_not_exists(
+      title: 'Auto close',
+      name: 'check_mk_auto_close',
+      area: 'Integration::CheckMK',
+      description: 'Defines if tickets should be closed if service is recovered.',
+      options: {
+        form: [
+          {
+            display: '',
+            null: true,
+            name: 'check_mk_auto_close',
+            tag: 'boolean',
+            options: {
+              true  => 'yes',
+              false => 'no',
+            },
+          },
+        ],
+      },
+      state: true,
+      preferences: {
+        prio: 3,
+        permission: ['admin.integration'],
+      },
+      frontend: false
+    )
+    Setting.create_if_not_exists(
+      title: 'Auto close state',
+      name: 'check_mk_auto_close_state_id',
+      area: 'Integration::CheckMK',
+      description: 'Defines the state of auto closed tickets.',
+      options: {
+        form: [
+          {
+            display: '',
+            null: false,
+            name: 'check_mk_auto_close_state_id',
+            tag: 'select',
+            relation: 'TicketState',
+          },
+        ],
+      },
+      state: 4,
+      preferences: {
+        prio: 4,
+        permission: ['admin.integration'],
+      },
+      frontend: false
+    )
+    Setting.create_if_not_exists(
+      title: 'Check_MK tolen',
+      name: 'check_mk_token',
+      area: 'Core',
+      description: 'Defines the Check_MK token for allowing updates.',
+      options: {},
+      state: SecureRandom.hex(16),
+      preferences: {
+        permission: ['admin.integration'],
+      },
+      frontend: false
+    )
+  end
+
+end
diff --git a/db/migrate/20170822000001_agend_based_sender_issue_1351.rb b/db/migrate/20170822000001_agend_based_sender_issue_1351.rb
new file mode 100644
index 000000000..8095b238e
--- /dev/null
+++ b/db/migrate/20170822000001_agend_based_sender_issue_1351.rb
@@ -0,0 +1,14 @@
+class AgendBasedSenderIssue1351 < ActiveRecord::Migration
+  def up
+
+    # return if it's a new setup
+    return if !Setting.find_by(name: 'system_init_done')
+    EmailAddress.all.each { |email_address|
+      begin
+        email_address.save!
+      rescue => e
+        Rails.logger.error "Unable to update EmailAddress.find(#{email_address.id}) '#{email_address.inspect}': #{e.message}"
+      end
+    }
+  end
+end
diff --git a/db/migrate/20170826000001_out_of_office.rb b/db/migrate/20170826000001_out_of_office.rb
new file mode 100644
index 000000000..133771c67
--- /dev/null
+++ b/db/migrate/20170826000001_out_of_office.rb
@@ -0,0 +1,53 @@
+class OutOfOffice < ActiveRecord::Migration
+  def up
+
+    # return if it's a new setup
+    return if !Setting.find_by(name: 'system_init_done')
+
+    add_column :overviews, :out_of_office, :boolean, null: false, default: false
+    Overview.reset_column_information
+
+    role_ids = Role.with_permissions(['ticket.agent']).map(&:id)
+    overview_role = Role.find_by(name: 'Agent')
+    Overview.create_if_not_exists(
+      name: 'My replacement Tickets',
+      link: 'my_replacement_tickets',
+      prio: 1080,
+      role_ids: role_ids,
+      out_of_office: true,
+      condition: {
+        'ticket.state_id' => {
+          operator: 'is',
+          value: Ticket::State.by_category(:open).pluck(:id),
+        },
+        #'ticket.out_of_office_replacement_id' => {
+        #  operator: 'is',
+        #  pre_condition: 'current_user.organization_id',
+        #},
+      },
+      order: {
+        by: 'created_at',
+        direction: 'DESC',
+      },
+      view: {
+        d: %w(title customer group owner escalation_at),
+        s: %w(title customer group owner escalation_at),
+        m: %w(number title customer group owner escalation_at),
+        view_mode_default: 's',
+      },
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+
+    add_column :users, :out_of_office, :boolean, null: false, default: false
+    add_column :users, :out_of_office_start_at, :date, null: true
+    add_column :users, :out_of_office_end_at, :date, null: true
+    add_column :users, :out_of_office_replacement_id, :integer, null: true
+
+    add_index :users, [:out_of_office, :out_of_office_start_at, :out_of_office_end_at], name: 'index_out_of_office'
+    add_index :users, [:out_of_office_replacement_id]
+    add_foreign_key :users, :users, column: :out_of_office_replacement_id
+
+    Cache.clear
+  end
+end
diff --git a/db/migrate/20170830000001_last_owner_update.rb b/db/migrate/20170830000001_last_owner_update.rb
new file mode 100644
index 000000000..004e12daf
--- /dev/null
+++ b/db/migrate/20170830000001_last_owner_update.rb
@@ -0,0 +1,57 @@
+class LastOwnerUpdate < ActiveRecord::Migration
+  def up
+
+    # return if it's a new setup
+    return if !Setting.find_by(name: 'system_init_done')
+
+    # reset assignment_timeout to prevent unwanted things happen
+    Group.all.each { |group|
+      group.assignment_timeout = nil
+      group.save!
+    }
+
+    add_column :tickets, :last_owner_update_at, :timestamp, limit: 3, null: true
+    add_index :tickets, [:last_owner_update_at]
+    Ticket.reset_column_information
+
+    Scheduler.create_if_not_exists(
+      name: 'Process auto unassign tickets',
+      method: 'Ticket.process_auto_unassign',
+      period: 10.minutes,
+      prio: 1,
+      active: true,
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+
+    state_ids = Ticket::State.by_category(:work_on).pluck(:id)
+    if state_ids.present?
+      ticket_ids = Ticket.where('tickets.state_id IN (?) AND tickets.owner_id != 1', state_ids).order(created_at: :desc).limit(1000).pluck(:id)
+      ticket_ids.each { |ticket_id|
+        ticket = Ticket.find_by(id: ticket_id)
+        next if !ticket
+        ticket.last_owner_update_at = last_owner_update_at(ticket)
+        ticket.save!
+      }
+    end
+  end
+
+  def last_owner_update_at(ticket)
+    type = History::Type.lookup(name: 'updated')
+    if type
+      object = History::Object.lookup(name: 'Ticket')
+      if object
+        attribute = History::Attribute.lookup(name: 'owner')
+        if attribute
+          history = History.where(o_id: ticket.id, history_type_id: type.id, history_object_id: object.id, history_attribute_id: attribute.id).where.not(id_to: 1).order(created_at: :desc).limit(1)
+          if history.present?
+            return history.first.created_at
+          end
+        end
+      end
+    end
+    return nil if ticket.owner_id == 1
+    ticket.created_at
+  end
+
+end
diff --git a/db/seeds/object_manager_attributes.rb b/db/seeds/object_manager_attributes.rb
index 420d4f3ee..e622a82e8 100644
--- a/db/seeds/object_manager_attributes.rb
+++ b/db/seeds/object_manager_attributes.rb
@@ -604,7 +604,7 @@ ObjectManager::Attribute.add(
   data_option: {
     type: 'email',
     maxlength: 150,
-    null: false,
+    null: true,
     item_class: 'formGroup--halfSize',
   },
   editable: false,
@@ -627,7 +627,7 @@ ObjectManager::Attribute.add(
     },
     edit: {
       '-all-' => {
-        null: false,
+        null: true,
       },
     },
     view: {
diff --git a/db/seeds/overviews.rb b/db/seeds/overviews.rb
index 80d66a00b..ce1f052f6 100644
--- a/db/seeds/overviews.rb
+++ b/db/seeds/overviews.rb
@@ -160,6 +160,34 @@ Overview.create_if_not_exists(
   },
 )
 
+Overview.create_if_not_exists(
+  name: 'My replacement Tickets',
+  link: 'my_replacement_tickets',
+  prio: 1080,
+  role_ids: [overview_role.id],
+  out_of_office: true,
+  condition: {
+    'ticket.state_id' => {
+      operator: 'is',
+      value: Ticket::State.by_category(:open).pluck(:id),
+    },
+    #'ticket.out_of_office_replacement_id' => {
+    #  operator: 'is',
+    #  pre_condition: 'current_user.organization_id',
+    #},
+  },
+  order: {
+    by: 'created_at',
+    direction: 'DESC',
+  },
+  view: {
+    d: %w(title customer group owner escalation_at),
+    s: %w(title customer group owner escalation_at),
+    m: %w(number title customer group owner escalation_at),
+    view_mode_default: 's',
+  },
+)
+
 overview_role = Role.find_by(name: 'Customer')
 Overview.create_if_not_exists(
   name: 'My Tickets',
diff --git a/db/seeds/permissions.rb b/db/seeds/permissions.rb
index fbd8e60fa..699e28f29 100644
--- a/db/seeds/permissions.rb
+++ b/db/seeds/permissions.rb
@@ -306,7 +306,7 @@ Permission.create_if_not_exists(
 )
 Permission.create_if_not_exists(
   name: 'ticket.customer',
-  note: 'Access to Customer Tickets based on current_user.id and current_user.organization_id',
+  note: 'Access to Customer Tickets based on current_user and organization',
   preferences: {
     not: ['ticket.agent'],
   },
diff --git a/db/seeds/schedulers.rb b/db/seeds/schedulers.rb
index 94fbe49f6..05bf45568 100644
--- a/db/seeds/schedulers.rb
+++ b/db/seeds/schedulers.rb
@@ -12,6 +12,13 @@ Scheduler.create_if_not_exists(
   prio: 1,
   active: true,
 )
+Scheduler.create_if_not_exists(
+  name: 'Process auto unassign tickets',
+  method: 'Ticket.process_auto_unassign',
+  period: 10.minutes,
+  prio: 1,
+  active: true,
+)
 Scheduler.create_if_not_exists(
   name: 'Import OTRS diff load',
   method: 'Import::OTRS.diff_worker',
@@ -156,6 +163,15 @@ Scheduler.create_if_not_exists(
   updated_by_id: 1,
   created_by_id: 1,
 )
+Scheduler.create_if_not_exists(
+  name: 'Cleanup Cti::Log',
+  method: 'Cti::Log.cleanup',
+  period: 1.month,
+  prio: 2,
+  active: true,
+  updated_by_id: 1,
+  created_by_id: 1,
+)
 Scheduler.create_if_not_exists(
   name:          'Import Jobs',
   method:        'ImportJob.start_registered',
diff --git a/db/seeds/settings.rb b/db/seeds/settings.rb
index 9734aa262..20e84d629 100644
--- a/db/seeds/settings.rb
+++ b/db/seeds/settings.rb
@@ -479,7 +479,7 @@ Setting.create_if_not_exists(
       {
         display: '',
         null: false,
-        name: 'proxy_passowrd',
+        name: 'proxy_password',
         tag: 'input',
       },
     ],
@@ -493,6 +493,30 @@ Setting.create_if_not_exists(
   },
   frontend: false
 )
+Setting.create_if_not_exists(
+  title: 'No Proxy',
+  name: 'proxy_no',
+  area: 'System::Network',
+  description: 'No proxy for the following hosts.',
+  options: {
+    form: [
+      {
+        display: '',
+        null: false,
+        name: 'proxy_no',
+        tag: 'input',
+      },
+    ],
+  },
+  state: 'localhost,127.0.0.0,::1',
+  preferences: {
+    disabled: true,
+    online_service_disable: true,
+    prio: 4,
+    permission: ['admin.system'],
+  },
+  frontend: false
+)
 
 Setting.create_if_not_exists(
   title: 'Send client stats',
@@ -546,18 +570,17 @@ Setting.create_if_not_exists(
   },
   frontend: true
 )
-
 Setting.create_if_not_exists(
-  title: 'Define default visibility of new a new article',
-  name: 'ui_ticket_zoom_article_new_internal',
+  title: 'Note - default visibility',
+  name: 'ui_ticket_zoom_article_note_new_internal',
   area: 'UI::TicketZoom',
-  description: 'Set default visibility of new a new article.',
+  description: 'Default visibility for new note.',
   options: {
     form: [
       {
         display: '',
         null: true,
-        name: 'ui_ticket_zoom_article_new_internal',
+        name: 'ui_ticket_zoom_article_note_new_internal',
         tag: 'boolean',
         translate: true,
         options: {
@@ -569,7 +592,88 @@ Setting.create_if_not_exists(
   },
   state: true,
   preferences: {
-    prio: 1,
+    prio: 100,
+    permission: ['admin.ui'],
+  },
+  frontend: true
+)
+Setting.create_if_not_exists(
+  title: 'Email - subject field',
+  name: 'ui_ticket_zoom_article_email_subject',
+  area: 'UI::TicketZoom',
+  description: 'Use subject field for emails. If disabled, the ticket title will be used as subject.',
+  options: {
+    form: [
+      {
+        display: '',
+        null: true,
+        name: 'ui_ticket_zoom_article_email_subject',
+        tag: 'boolean',
+        translate: true,
+        options: {
+          true  => 'yes',
+          false => 'no',
+        },
+      },
+    ],
+  },
+  state: false,
+  preferences: {
+    prio: 200,
+    permission: ['admin.ui'],
+  },
+  frontend: true
+)
+Setting.create_if_not_exists(
+  title: 'Email - full quote',
+  name: 'ui_ticket_zoom_article_email_full_quote',
+  area: 'UI::TicketZoom',
+  description: 'Enable if you want to quote the full email in your answer. The quoted email will be put at the end of your answer. If you just want to quote a certain phrase, just mark the text and press reply (this feature is always available).',
+  options: {
+    form: [
+      {
+        display: '',
+        null: true,
+        name: 'ui_ticket_zoom_article_email_full_quote',
+        tag: 'boolean',
+        translate: true,
+        options: {
+          true  => 'yes',
+          false => 'no',
+        },
+      },
+    ],
+  },
+  state: false,
+  preferences: {
+    prio: 220,
+    permission: ['admin.ui'],
+  },
+  frontend: true
+)
+Setting.create_if_not_exists(
+  title: 'Twitter - tweet initials',
+  name: 'ui_ticket_zoom_article_twitter_initials',
+  area: 'UI::TicketZoom',
+  description: 'Add sender initials to end of a tweet.',
+  options: {
+    form: [
+      {
+        display: '',
+        null: true,
+        name: 'ui_ticket_zoom_article_twitter_initials',
+        tag: 'boolean',
+        translate: true,
+        options: {
+          true  => 'yes',
+          false => 'no',
+        },
+      },
+    ],
+  },
+  state: true,
+  preferences: {
+    prio: 300,
     permission: ['admin.ui'],
   },
   frontend: true
@@ -625,6 +729,31 @@ Setting.create_if_not_exists(
   },
   frontend: true
 )
+Setting.create_if_not_exists(
+  title: 'User email for muliple users',
+  name: 'user_email_multiple_use',
+  area: 'Model::User',
+  description: 'Allow to use email address for muliple users.',
+  options: {
+    form: [
+      {
+        display: '',
+        null: true,
+        name: 'user_email_multiple_use',
+        tag: 'boolean',
+        options: {
+          true  => 'yes',
+          false => 'no',
+        },
+      },
+    ],
+  },
+  state: false,
+  preferences: {
+    permission: ['admin'],
+  },
+  frontend: false
+)
 Setting.create_if_not_exists(
   title: 'Authentication via %s',
   name: 'auth_ldap',
@@ -1004,6 +1133,63 @@ Setting.create_if_not_exists(
   frontend: false
 )
 
+Setting.create_if_not_exists(
+  title: 'Authentication via %s',
+  name: 'auth_microsoft_office365',
+  area: 'Security::ThirdPartyAuthentication',
+  description: 'Enables user authentication via %s. Register your app first at [%s](%s).',
+  options: {
+    form: [
+      {
+        display: '',
+        null: true,
+        name: 'auth_microsoft_office365',
+        tag: 'boolean',
+        options: {
+          true  => 'yes',
+          false => 'no',
+        },
+      },
+    ],
+  },
+  preferences: {
+    controller: 'SettingsAreaSwitch',
+    sub: ['auth_microsoft_office365_credentials'],
+    title_i18n: ['Office 365'],
+    description_i18n: ['Office 365', 'Microsoft Application Registration Portal', 'https://apps.dev.microsoft.com'],
+    permission: ['admin.security'],
+  },
+  state: false,
+  frontend: true
+)
+Setting.create_if_not_exists(
+  title: 'Office 365 App Credentials',
+  name: 'auth_microsoft_office365_credentials',
+  area: 'Security::ThirdPartyAuthentication::Office365',
+  description: 'Enables user authentication via Office 365.',
+  options: {
+    form: [
+      {
+        display: 'App ID',
+        null: true,
+        name: 'app_id',
+        tag: 'input',
+      },
+      {
+        display: 'App Secret',
+        null: true,
+        name: 'app_secret',
+        tag: 'input',
+      },
+    ],
+  },
+  state: {},
+  preferences: {
+    permission: ['admin.security'],
+  },
+  frontend: false
+)
+
 Setting.create_if_not_exists(
   title: 'Authentication via %s',
   name: 'auth_oauth2',
@@ -1063,7 +1249,7 @@ Setting.create_if_not_exists(
         null: true,
         name: 'site',
         tag: 'input',
-        placeholder: 'https://gitlab.YOURDOMAIN.com',
+        placeholder: 'https://oauth.YOURDOMAIN.com',
       },
       {
         display: 'authorize_url',
@@ -2215,7 +2401,7 @@ Setting.create_if_not_exists(
   area:        'Import',
   description: 'A list of active import backends that get scheduled automatically.',
   options:     {},
-  state:       ['Import::Ldap'],
+  state:       ['Import::Ldap', 'Import::Exchange'],
   preferences: {
     permission: ['admin'],
   },
@@ -2661,6 +2847,117 @@ Setting.create_if_not_exists(
   },
   frontend: false
 )
+Setting.create_if_not_exists(
+  title: 'Check_MK integration',
+  name: 'check_mk_integration',
+  area: 'Integration::Switch',
+  description: 'Defines if Check_MK (http://mathias-kettner.com/check_mk.html) is enabled or not.',
+  options: {
+    form: [
+      {
+        display: '',
+        null: true,
+        name: 'check_mk_integration',
+        tag: 'boolean',
+        options: {
+          true  => 'yes',
+          false => 'no',
+        },
+      },
+    ],
+  },
+  state: false,
+  preferences: {
+    prio: 1,
+    permission: ['admin.integration'],
+  },
+  frontend: false
+)
+Setting.create_if_not_exists(
+  title: 'Group',
+  name: 'check_mk_group_id',
+  area: 'Integration::CheckMK',
+  description: 'Defines the group of created tickets.',
+  options: {
+    form: [
+      {
+        display: '',
+        null: false,
+        name: 'check_mk_group_id',
+        tag: 'select',
+        relation: 'Group',
+      },
+    ],
+  },
+  state: 1,
+  preferences: {
+    prio: 2,
+    permission: ['admin.integration'],
+  },
+  frontend: false
+)
+Setting.create_if_not_exists(
+  title: 'Auto close',
+  name: 'check_mk_auto_close',
+  area: 'Integration::CheckMK',
+  description: 'Defines if tickets should be closed if service is recovered.',
+  options: {
+    form: [
+      {
+        display: '',
+        null: true,
+        name: 'check_mk_auto_close',
+        tag: 'boolean',
+        options: {
+          true  => 'yes',
+          false => 'no',
+        },
+      },
+    ],
+  },
+  state: true,
+  preferences: {
+    prio: 3,
+    permission: ['admin.integration'],
+  },
+  frontend: false
+)
+Setting.create_if_not_exists(
+  title: 'Auto close state',
+  name: 'check_mk_auto_close_state_id',
+  area: 'Integration::CheckMK',
+  description: 'Defines the state of auto closed tickets.',
+  options: {
+    form: [
+      {
+        display: '',
+        null: false,
+        name: 'check_mk_auto_close_state_id',
+        tag: 'select',
+        relation: 'TicketState',
+      },
+    ],
+  },
+  state: 4,
+  preferences: {
+    prio: 4,
+    permission: ['admin.integration'],
+  },
+  frontend: false
+)
+Setting.create_if_not_exists(
+  title: 'Check_MK tolen',
+  name: 'check_mk_token',
+  area: 'Core',
+  description: 'Defines the Check_MK token for allowing updates.',
+  options: {},
+  state: SecureRandom.hex(16),
+  preferences: {
+    permission: ['admin.integration'],
+  },
+  frontend: false
+)
+
 Setting.create_if_not_exists(
   title: 'LDAP integration',
   name: 'ldap_integration',
@@ -2688,6 +2985,46 @@ Setting.create_if_not_exists(
   },
   frontend: true
 )
+Setting.create_if_not_exists(
+  title: 'Exchange config',
+  name: 'exchange_config',
+  area: 'Integration::Exchange',
+  description: 'Defines the Exchange config.',
+  options: {},
+  state: {},
+  preferences: {
+    prio: 2,
+    permission: ['admin.integration'],
+  },
+  frontend: false,
+)
+Setting.create_if_not_exists(
+  title: 'Exchange integration',
+  name: 'exchange_integration',
+  area: 'Integration::Switch',
+  description: 'Defines if Exchange is enabled or not.',
+  options: {
+    form: [
+      {
+        display: '',
+        null: true,
+        name: 'exchange_integration',
+        tag: 'boolean',
+        options: {
+          true  => 'yes',
+          false => 'no',
+        },
+      },
+    ],
+  },
+  state: false,
+  preferences: {
+    prio: 1,
+    authentication: true,
+    permission: ['admin.integration'],
+  },
+  frontend: true
+)
 Setting.create_if_not_exists(
   title: 'LDAP config',
   name: 'ldap_config',
@@ -2701,6 +3038,46 @@ Setting.create_if_not_exists(
   },
   frontend: false,
 )
+Setting.create_if_not_exists(
+  title: 'i-doit integration',
+  name: 'idoit_integration',
+  area: 'Integration::Switch',
+  description: 'Defines if i-doit (http://www.i-doit) is enabled or not.',
+  options: {
+    form: [
+      {
+        display: '',
+        null: true,
+        name: 'idoit_integration',
+        tag: 'boolean',
+        options: {
+          true  => 'yes',
+          false => 'no',
+        },
+      },
+    ],
+  },
+  state: false,
+  preferences: {
+    prio: 1,
+    authentication: true,
+    permission: ['admin.integration'],
+  },
+  frontend: true
+)
+Setting.create_if_not_exists(
+  title: 'i-doit config',
+  name: 'idoit_config',
+  area: 'Integration::Idoit',
+  description: 'Defines the i-doit config.',
+  options: {},
+  state: {},
+  preferences: {
+    prio: 2,
+    permission: ['admin.integration'],
+  },
+  frontend: false,
+)
 Setting.create_if_not_exists(
   title: 'Defines sync transaction backend.',
   name: '0100_trigger',
diff --git a/lib/core_ext/fixnum.rb b/lib/core_ext/integer.rb
similarity index 86%
rename from lib/core_ext/fixnum.rb
rename to lib/core_ext/integer.rb
index 71e6456c8..b3363b5f4 100644
--- a/lib/core_ext/fixnum.rb
+++ b/lib/core_ext/integer.rb
@@ -1,4 +1,4 @@
-class Fixnum
+class Integer
 
 =begin
 
diff --git a/lib/core_ext/open-uri.rb b/lib/core_ext/open-uri.rb
new file mode 100644
index 000000000..703b20594
--- /dev/null
+++ b/lib/core_ext/open-uri.rb
@@ -0,0 +1,20 @@
+# rubocop:disable Style/FileName
+if Kernel.respond_to?(:open_uri_original_open)
+  module Kernel
+    private
+
+    # see: https://github.com/ruby/ruby/pull/1675
+    def open(name, *rest, &block) # :doc:
+      if name.respond_to?(:open) && !name.method(:open).parameters.empty?
+        name.open(*rest, &block)
+      elsif name.respond_to?(:to_str) &&
+            %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} =~ name &&
+            (uri = URI.parse(name)).respond_to?(:open)
+        uri.open(*rest, &block)
+      else
+        open_uri_original_open(name, *rest, &block)
+      end
+    end
+    module_function :open
+  end
+end
diff --git a/lib/core_ext/string.rb b/lib/core_ext/string.rb
index 6552f3e99..3db6fe1fb 100644
--- a/lib/core_ext/string.rb
+++ b/lib/core_ext/string.rb
@@ -81,7 +81,7 @@ class String
   def html2text(string_only = false, strict = false)
     string = "#{self}" # rubocop:disable Style/UnneededInterpolation
 
-    # in case of invalid encodeing, strip invalid chars
+    # in case of invalid encoding, strip invalid chars
     # see also test/fixtures/mail21.box
     # note: string.encode!('UTF-8', 'UTF-8', :invalid => :replace, :replace => '?') was not detecting invalid chars
     if !string.valid_encoding?
@@ -306,7 +306,7 @@ class String
     string.gsub!(%r\
    [[:space:]]*(([[:space:]]*)){2,}\im, '

    \3')
     string.gsub!(%r\[[:space:]]*(
    [[:space:]]*){3,}[[:space:]]*
    \im, '

    ')
     string.gsub!(%r\
    [[:space:]]*(
    [[:space:]]*){1,}[[:space:]]*
    \im, '
     
    ')
-    string.gsub!(%r\
    [[:space:]]*(
    [[:space:]]*{1,}
    [[:space:]]*){2,}
    \im, '
     
    ')
+    string.gsub!(%r\
    [[:space:]]*(
    [[:space:]]*
    [[:space:]]*){2,}
    \im, '
     
    ')
     string.gsub!(%r\
    [[:space:]]*
    ([[:space:]]*){2,}[[:space:]]*\im, '
     

    ')
     string.gsub!(%r{
    [[:space:]]*
    ([[:space:]]*)+
    [[:space:]]*
    }im, '
     
     
    ')
     string.gsub!(%r\(
    [[:space:]]*
    [[:space:]]*){2,}\im, '
     
    ')
diff --git a/lib/idoit.rb b/lib/idoit.rb
new file mode 100644
index 000000000..f1fe7f379
--- /dev/null
+++ b/lib/idoit.rb
@@ -0,0 +1,149 @@
+# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
+
+class Idoit
+
+=begin
+
+get list ob types
+
+  result = Idoit.verify(api_token, endpoint, client_id)
+
+returns
+
+  array with cmdb.object_types or an exeption if no data was able to retrive
+
+=end
+
+  def self.verify(api_token, endpoint, _client_id = nil)
+    raise 'api_token required' if api_token.blank?
+    raise 'endpoint required' if endpoint.blank?
+
+    params = {
+      apikey: api_token,
+    }
+
+    _query('cmdb.object_types', params, _url_cleanup(endpoint))
+  end
+
+=begin
+
+get list ob types
+
+  result = Idoit.query(method, filter)
+
+  result = Idoit.query(method, { type: '59' })
+
+returns
+
+  result = [
+    {
+      "id": "1",
+      "title": "System service",
+      "container": "0",
+      "const": "C__OBJTYPE__SERVICE",
+      "color": "987384",
+      "image": "https://demo.panic.at/i-doit/images/objecttypes/service.jpg",
+      "icon": "images/icons/silk/application_osx_terminal.png",
+      "cats": "4",
+      "tree_group": "1",
+      "status": "2",
+      "type_group": "1",
+      "type_group_title": "Software"
+    },
+    {
+      "id": "2",
+      "title": "Application",
+      "container": "0",
+      "const": "C__OBJTYPE__APPLICATION",
+      "color": "E4B9D7",
+      "image": "https://demo.panic.at/i-doit/images/objecttypes/application.jpg",
+      "icon": "images/icons/silk/application_xp.png",
+      "cats": "20",
+      "tree_group": "1",
+      "status": "2",
+      "type_group": "1",
+      "type_group_title": "Software"
+    },
+  ]
+
+or with filter:
+
+  "result": [
+    {
+      "id": "26",
+      "title": "demo.panic.at",
+      "sysid": "SYSID_1485512390",
+      "type": "59",
+      "created": "2017-01-27 11:19:24",
+      "updated": "2017-01-27 11:19:49",
+      "type_title": "Virtual server",
+      "type_group_title": "Infrastructure",
+      "status": "2",
+      "cmdb_status": "6",
+      "cmdb_status_title": "in operation",
+      "image": "https://demo.panic.at/i-doit/images/objecttypes/empty.png"
+    },
+  ],
+
+=end
+
+  def self.query(method, filter = {})
+    setting = Setting.get('idoit_config')
+    raise 'Unable for find api_token in config' if setting[:api_token].blank?
+    raise 'Unable for find endpoint in config' if setting[:endpoint].blank?
+
+    #translator_key = Setting.get('translator_key')
+    params = {
+      apikey: setting[:api_token],
+    }
+    if filter.present?
+      params[:filter] = filter
+    end
+    _query(method, params, _url_cleanup(setting[:endpoint]))
+  end
+
+  def self._query(method, params, url)
+    result = UserAgent.post(
+      url,
+      {
+        method: method,
+        params: params,
+        version: '2.0',
+      },
+      {
+        json: true,
+        open_timeout: 6,
+        read_timeout: 16,
+        log: {
+          facility: 'idoit',
+        },
+      },
+    )
+
+    raise "Can't fetch objects from #{url}: Unable to parse response from server. Invalid JSON response." if !result.success? && result.error =~ /JSON::ParserError:.+?\s+unexpected\s+token\s+at\s+'<\!DOCTYPE\s+html/i
+    raise "Can't fetch objects from #{url}: #{result.error}" if !result.success?
+
+    # add link to idoit
+    if result.data['result'].class == Array
+      result.data['result'].each { |item|
+        next if !item['id']
+        item['link'] = "#{_url_cleanup_baseurl(url)}/?objID=#{item['id']}"
+        item['link'].gsub!(%r{([^:])//+}, '\\1/')
+      }
+    end
+    result.data
+  end
+
+  def self._url_cleanup(url)
+    raise "Invalid endpoint '#{url}', need to start with http:// or https://" if url !~ %r{^http(s|)://}i
+    url = _url_cleanup_baseurl(url)
+    url = "#{url}/src/jsonrpc.php"
+    url.gsub(%r{([^:])//+}, '\\1/')
+  end
+
+  def self._url_cleanup_baseurl(url)
+    raise "Invalid endpoint '#{url}', need to start with http:// or https://" if url !~ %r{^http(s|)://}i
+    url.gsub!(%r{src/jsonrpc.php}, '')
+    url.gsub(%r{([^:])//+}, '\\1/')
+  end
+end
diff --git a/lib/import/exchange.rb b/lib/import/exchange.rb
new file mode 100644
index 000000000..cd8d307cb
--- /dev/null
+++ b/lib/import/exchange.rb
@@ -0,0 +1,13 @@
+# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
+
+module Import
+  class Exchange < Import::IntegrationBase
+    include Import::Mixin::Sequence
+
+    private
+
+    def sequence_name
+      'Import::Exchange::FolderContacts'
+    end
+  end
+end
diff --git a/lib/import/exchange/folder.rb b/lib/import/exchange/folder.rb
new file mode 100644
index 000000000..7a4559f0a
--- /dev/null
+++ b/lib/import/exchange/folder.rb
@@ -0,0 +1,76 @@
+require 'mixin/rails_logger'
+
+module Import
+  class Exchange
+    class Folder
+      include ::Mixin::RailsLogger
+
+      def initialize(connection)
+        @connection = connection
+        @lookup_map = {}
+      end
+
+      def id_folder_map
+        @id_folder_map ||= all.collect do |folder|
+          [folder.id, folder]
+        end.to_h
+
+        # duplicate object to avoid errors where keys get
+        # added via #get_folder while iterating over
+        # the result of this method
+        @lookup_map = @id_folder_map.dup
+        @id_folder_map
+      end
+
+      def find(id)
+        @lookup_map[id] ||= @connection.get_folder(id)
+      end
+
+      def all
+        # request folders only if neccessary and store the result
+        @all ||= children(%i(root msgfolderroot publicfoldersroot))
+      end
+
+      def children(parent_identifiers)
+        parent_identifiers.each_with_object([]) do |parent_identifier, result|
+
+          child_folders = request_children(parent_identifier)
+
+          next if child_folders.blank?
+
+          child_folder_ids = child_folders.collect(&:id)
+          child_folders   += children(child_folder_ids)
+
+          result.concat(child_folders)
+        end
+      end
+
+      def display_path(folder)
+        display_name = folder.display_name
+        return display_name if !folder.parent_folder_id
+
+        parent_folder = find(folder.parent_folder_id)
+        return display_name if !parent_folder
+
+        parent_folder = id_folder_map[folder.parent_folder_id]
+        return display_name if !parent_folder
+
+        # recursive
+        parent_folder_path = display_path(parent_folder)
+
+        "#{parent_folder_path} -> #{display_name}"
+      rescue Viewpoint::EWS::EwsError
+        folder.display_name
+      end
+
+      private
+
+      def request_children(parent_identifier)
+        @connection.folders(root: parent_identifier)
+      rescue Viewpoint::EWS::EwsFolderNotFound => e
+        logger.warn(e)
+        nil
+      end
+    end
+  end
+end
diff --git a/lib/import/exchange/item_attributes.rb b/lib/import/exchange/item_attributes.rb
new file mode 100644
index 000000000..bc0d19ec0
--- /dev/null
+++ b/lib/import/exchange/item_attributes.rb
@@ -0,0 +1,111 @@
+module Import
+  class Exchange
+    class ItemAttributes
+
+      def self.extract(resource)
+        new(resource).extract
+      end
+
+      def initialize(resource)
+        @resource = resource
+      end
+
+      def extract
+        @attributes ||= begin
+          properties  = @resource.get_all_properties!
+          result      = normalize(properties)
+          flattened   = flatten(result)
+          booleanized = booleanize_values(flattened)
+        end
+      end
+
+      private
+
+      def booleanize_values(properties)
+        properties.each do |key, value|
+          if value.is_a?(String)
+            next if !%w(true false).include?(value)
+            properties[key] = value == 'true'
+          elsif value.is_a?(Hash)
+            properties[key] = booleanize_values(value)
+          end
+        end
+      end
+
+      def normalize(properties)
+        result = {}
+        properties.each do |key, value|
+
+          next if key == :body
+
+          if value[:text]
+            result[key] = value[:text]
+          elsif value[:attribs]
+            result[key] = value[:attribs]
+          elsif value[:elems]
+            result[key] = sub_elems(value[:elems])
+          end
+        end
+
+        result
+      end
+
+      def sub_elems(elems)
+        result = {}
+        elems.each do |elem|
+          if elem[:entry]
+            result.merge!( sub_elem_entry( elem[:entry] ) )
+          else
+            result.merge!( normalize(elem) )
+          end
+        end
+        result
+      end
+
+      def sub_elem_entry(entry)
+        entry_value = {}
+        if entry[:elems]
+          entry_value = sub_elems(entry[:elems])
+        end
+
+        if entry[:text]
+          entry_value[:text] = entry[:text]
+        end
+
+        if entry[:attribs].present?
+          entry_value.merge!(entry[:attribs])
+        end
+
+        entry_key = entry_value.delete(:key)
+        {
+          entry_key => entry_value
+        }
+      end
+
+      def flatten(properties, prefix: nil)
+
+        result = {}
+        properties.each do |key, value|
+
+          result_key = key
+          if prefix
+            result_key = if %i(text id).include?(key) && ( !result[result_key] || result[result_key] == value )
+                           prefix
+                         else
+                           "#{prefix}.#{key}".to_sym
+                         end
+          end
+          result_key = result_key.to_s.downcase
+
+          if value.is_a?(Hash)
+            sub_result = flatten(value, prefix: result_key)
+            result.merge!(sub_result)
+          else
+            result[result_key] = value.to_s
+          end
+        end
+        result
+      end
+    end
+  end
+end
diff --git a/lib/import/helper/attributes_examples.rb b/lib/import/helper/attributes_examples.rb
new file mode 100644
index 000000000..1ae3c00a9
--- /dev/null
+++ b/lib/import/helper/attributes_examples.rb
@@ -0,0 +1,70 @@
+module Import
+  module Helper
+    class AttributesExamples
+      attr_reader :examples, :enough, :max_unkown
+
+      def initialize(&block)
+        @max_unkown     = 50
+        @no_new_counter = 1
+        @examples       = {}
+        @known          = []
+
+        # Support both builder styles:
+        #
+        #   Import::Helper::AttributesExamples.new do
+        #     extract(attributes)
+        #   end
+        #
+        # and
+        #
+        #   Import::Helper::AttributesExamples.new do |extractor|
+        #     extractor.extract(attributes)
+        #   end
+        return if !block_given?
+        if block.arity.zero?
+          instance_eval(&block)
+        else
+          yield self
+        end
+      end
+
+      def extract(attributes)
+        unknown = attributes.keys - @known
+
+        return if !unknown?(unknown)
+
+        store(attributes, unknown)
+
+        @known.concat(unknown)
+        @no_new_counter = 0
+      end
+
+      private
+
+      def unknown?(unknown)
+        return true if unknown.present?
+
+        @no_new_counter += 1
+
+        # check max 50 entries with no or no new attributes in a row
+        @enough_examples = @no_new_counter != 50
+
+        false
+      end
+
+      def store(attributes, unknown)
+        unknown.each do |attribute|
+          value = attributes[attribute]
+
+          next if value.nil?
+
+          example = value.to_s.force_encoding('UTF-8').encode('utf-8', 'binary', invalid: :replace, undef: :replace, replace: '?')
+          example.gsub!(/^(.{20,}?).*$/m, '\1...')
+
+          @examples[attribute] = "#{attribute} (e. g. #{example})"
+        end
+      end
+
+    end
+  end
+end
diff --git a/lib/import/integration_base.rb b/lib/import/integration_base.rb
new file mode 100644
index 000000000..ac995f9dd
--- /dev/null
+++ b/lib/import/integration_base.rb
@@ -0,0 +1,143 @@
+# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
+
+module Import
+
+  # This base class handles regular integrations.
+  # It provides generic interfaces for settings and active state.
+  # It ensures that all requirements for a regular integration are met before a import can start.
+  # It handles the case of an Scheduler interruption.
+  #
+  # It's required to implement the +start_import+ method which only has to start the import.
+  class IntegrationBase < Import::Base
+
+    def self.inherited(subclass)
+      subclass.extend(Forwardable)
+
+      # delegate instance methods to the generic class implementations
+      subclass.delegate [:identifier, :active?, :config, :display_name] => subclass
+    end
+
+    # Defines the integration identifier used for
+    # automatic config lookup and error message generation.
+    #
+    # @example
+    #  Import::Ldap.identifier
+    #  #=> "Ldap"
+    #
+    # return [String]
+    def self.identifier
+      name.split('::').last
+    end
+
+    # Provides the name that is used in texts visible to the user.
+    #
+    # @example
+    #  Import::Exchange.display_name
+    #  #=> "Exchange"
+    #
+    # return [String]
+    def self.display_name
+      identifier
+    end
+
+    # Checks if the integration is active.
+    #
+    # @example
+    #  Import::Ldap.active?
+    #  #=> true
+    #
+    # return [Boolean]
+    def self.active?
+      Setting.get("#{identifier.downcase}_integration") || false
+    end
+
+    # Provides the integration configuration.
+    #
+    # @example
+    #  Import::Ldap.config
+    #  #=> {"ssl_verify"=>true, "host_url"=>"ldaps://192...", ...}
+    #
+    # return [Hash] the configuration
+    def self.config
+      Setting.get("#{identifier.downcase}_config") || {}
+    end
+
+    # Stores the integration configuration.
+    #
+    # @example
+    #  Import::Ldap.config = {"ssl_verify"=>true, "host_url"=>"ldaps://192...", ...}
+    #
+    # return [nil]
+    def self.config=(value)
+      Setting.set("#{identifier.downcase}_config", value)
+    end
+
+    # Checks if the integration is activated and configured.
+    # Otherwise it won't get queued since it will display
+    # an error which is confusing and wrong.
+    #
+    # @example
+    #  Import::Ldap.queueable?
+    #  #=> true
+    #
+    # return [Boolean]
+    def self.queueable?
+      active? && config.present?
+    end
+
+    # Starts a live or dry run import.
+    #
+    # @example
+    #  instance = Import::Ldap.new(import_job)
+    #
+    # @raise [RuntimeError] Raised if an import should start but the integration is disabled
+    #
+    # return [nil]
+    def start
+      return if !requirements_completed?
+      start_import
+    end
+
+    # Gets called when the Scheduler gets (re-)started and an ImportJob was still
+    # in the queue. The job will always get restarted to avoid the gap till the next
+    # run triggered by the Scheduler. The result will get updated to inform the user
+    # in the agent interface result view.
+    #
+    # @example
+    #  instance = Import::Ldap.new(import_job)
+    #  instance.reschedule?(delayed_job)
+    #  #=> true
+    #
+    # return [true]
+    def reschedule?(_delayed_job)
+      inform('Restarting due to scheduler restart.')
+      true
+    end
+
+    private
+
+    def start_import
+      raise "Missing implementation of method '#{__method__}' for #{self.class.name}"
+    end
+
+    def requirements_completed?
+      return true if @import_job.dry_run
+
+      if !active?
+        message = "Sync cancelled. #{display_name} integration deactivated. Activate via the switch."
+      elsif config.blank? && @import_job.payload.blank?
+        message = "Sync cancelled. #{display_name} configration or ImportJob payload missing."
+      end
+
+      return true if !message
+      inform(message)
+      false
+    end
+
+    def inform(message)
+      @import_job.update_attribute(:result, {
+                                     info: message
+                                   })
+    end
+  end
+end
diff --git a/lib/import/ldap.rb b/lib/import/ldap.rb
index 5b82e60a4..882981bb6 100644
--- a/lib/import/ldap.rb
+++ b/lib/import/ldap.rb
@@ -4,50 +4,17 @@ require 'ldap'
 require 'ldap/group'
 
 module Import
-  class Ldap < Import::Base
+  class Ldap < Import::IntegrationBase
 
-    # Checks if the integration is activated and configured.
-    # Otherwise it won't get queued since it will display
-    # an error which is confusing and wrong.
+    # Provides the name that is used in texts visible to the user.
     #
     # @example
-    #  Import::LDAP.queueable?
-    #  #=> true
+    #  Import::Ldap.display_name
+    #  #=> "LDAP"
     #
-    # return [Boolean]
-    def self.queueable?
-      Setting.get('ldap_integration') && Setting.get('ldap_config').present?
-    end
-
-    # Starts a live or dry run LDAP import.
-    #
-    # @example
-    #  instance = Import::LDAP.new(import_job)
-    #
-    # @raise [RuntimeError] Raised if an import should start but the ldap integration is disabled
-    #
-    # return [nil]
-    def start
-      return if !requirements_completed?
-      start_import
-    end
-
-    # Gets called when the Scheduler gets (re-)started and a LDAP ImportJob was still
-    # in the queue. The job will always get restarted to avoid the gap till the next
-    # run triggered by the Scheduler. The result will get updated to inform the user
-    # in the agent interface result view.
-    #
-    # @example
-    #  instance = Import::LDAP.new(import_job)
-    #  instance.reschedule?(delayed_job)
-    #  #=> true
-    #
-    # return [true]
-    def reschedule?(_delayed_job)
-      @import_job.update_attribute(:result, {
-                                     info: 'Restarting due to scheduler restart.'
-                                   })
-      true
+    # return [String]
+    def self.display_name
+      identifier.upcase
     end
 
     private
@@ -63,23 +30,5 @@ module Import
 
       @import_job.result = Import::Ldap::UserFactory.statistics
     end
-
-    def requirements_completed?
-      return true if @import_job.dry_run
-
-      if !Setting.get('ldap_integration')
-        message = 'Sync cancelled. LDAP integration deactivated. Activate via the switch.'
-      elsif Setting.get('ldap_config').blank? && @import_job.payload.blank?
-        message = 'Sync cancelled. LDAP configration or ImportJob payload missing.'
-      end
-
-      return true if !message
-
-      @import_job.update_attribute(:result, {
-                                     info: message
-                                   })
-
-      false
-    end
   end
 end
diff --git a/lib/import/mixin/sequence.rb b/lib/import/mixin/sequence.rb
new file mode 100644
index 000000000..262933e44
--- /dev/null
+++ b/lib/import/mixin/sequence.rb
@@ -0,0 +1,19 @@
+module Import
+  module Mixin
+    module Sequence
+      private
+
+      def sequence_name
+        raise "Missing implementation of '#{__method__}' method for '#{self.class.name}'"
+      end
+
+      def process
+        Sequencer.process(sequence_name,
+                          parameters: {
+                            import_job: @import_job
+                          })
+      end
+      alias start_import process
+    end
+  end
+end
diff --git a/lib/import/otrs/article/attachment_factory.rb b/lib/import/otrs/article/attachment_factory.rb
index ad44e663d..c68956b4c 100644
--- a/lib/import/otrs/article/attachment_factory.rb
+++ b/lib/import/otrs/article/attachment_factory.rb
@@ -38,7 +38,7 @@ module Import
               Store.add(
                 object:      'Ticket::Article',
                 o_id:        local_article.id,
-                filename:    decoded_filename,
+                filename:    decoded_filename.force_encoding('utf-8'),
                 data:        decoded_content,
                 preferences: {
                   'Mime-Type'           => attachment['ContentType'],
@@ -54,6 +54,9 @@ module Import
             sleep rand 3
             retry if !(retries -= 1).zero?
             raise
+          rescue => e
+            log "Ticket #{local_article.ticket_id} - #{sha} - #{e}: #{attachment.inspect}"
+            raise
           ensure
             queue_cleanup(sha)
           end
diff --git a/lib/import/otrs/dynamic_field/checkbox.rb b/lib/import/otrs/dynamic_field/checkbox.rb
index 8666986ac..33044c8c6 100644
--- a/lib/import/otrs/dynamic_field/checkbox.rb
+++ b/lib/import/otrs/dynamic_field/checkbox.rb
@@ -11,7 +11,7 @@ module Import
                 true  => 'Yes',
                 false => 'No',
               },
-              null:      false,
+              null:      true,
               translate: true,
             }
           )
diff --git a/lib/import/otrs/dynamic_field/date.rb b/lib/import/otrs/dynamic_field/date.rb
index 6be4508bd..7d8d71133 100644
--- a/lib/import/otrs/dynamic_field/date.rb
+++ b/lib/import/otrs/dynamic_field/date.rb
@@ -14,7 +14,7 @@ module Import
               future: dynamic_field['Config']['YearsInFuture'] != '0',
               past:   dynamic_field['Config']['YearsInPast'] != '0',
               diff:   dynamic_field['Config']['DefaultValue'].to_i / 60 / 60 / 24,
-              null:   false,
+              null:   true,
             }
           )
         end
diff --git a/lib/import/otrs/dynamic_field/date_time.rb b/lib/import/otrs/dynamic_field/date_time.rb
index 997a4ac49..d9a7761b1 100644
--- a/lib/import/otrs/dynamic_field/date_time.rb
+++ b/lib/import/otrs/dynamic_field/date_time.rb
@@ -14,7 +14,7 @@ module Import
               future: dynamic_field['Config']['YearsInFuture'] != '0',
               past:   dynamic_field['Config']['YearsInPast'] != '0',
               diff:   dynamic_field['Config']['DefaultValue'].to_i / 60 / 60,
-              null:   false,
+              null:   true,
             }
           )
         end
diff --git a/lib/import/otrs/dynamic_field/dropdown.rb b/lib/import/otrs/dynamic_field/dropdown.rb
index a6d0d8c5a..6af21498b 100644
--- a/lib/import/otrs/dynamic_field/dropdown.rb
+++ b/lib/import/otrs/dynamic_field/dropdown.rb
@@ -6,11 +6,12 @@ module Import
           @attribute_config.merge!(
             data_type:   'select',
             data_option: {
-              default:   '',
-              multiple:  false,
-              options:   dynamic_field['Config']['PossibleValues'],
-              null:      dynamic_field['Config']['PossibleNone'] == '1',
-              translate: dynamic_field['Config']['TranslatableValues'] == '1',
+              default:    '',
+              multiple:   false,
+              options:    dynamic_field['Config']['PossibleValues'],
+              nulloption: dynamic_field['Config']['PossibleNone'] == '1',
+              null:       true,
+              translate:  dynamic_field['Config']['TranslatableValues'] == '1',
             }
           )
         end
diff --git a/lib/import/otrs/dynamic_field/multiselect.rb b/lib/import/otrs/dynamic_field/multiselect.rb
index 3710fc7d0..f1c13ef06 100644
--- a/lib/import/otrs/dynamic_field/multiselect.rb
+++ b/lib/import/otrs/dynamic_field/multiselect.rb
@@ -6,11 +6,12 @@ module Import
           @attribute_config.merge!(
             data_type:   'select',
             data_option: {
-              default:   '',
-              multiple:  true,
-              options:   dynamic_field['Config']['PossibleValues'],
-              null:      dynamic_field['Config']['PossibleNone'] == '1',
-              translate: dynamic_field['Config']['TranslatableValues'] == '1',
+              default:    '',
+              multiple:   true,
+              options:    dynamic_field['Config']['PossibleValues'],
+              nulloption: dynamic_field['Config']['PossibleNone'] == '1',
+              null:       true,
+              translate:  dynamic_field['Config']['TranslatableValues'] == '1',
             }
           )
         end
diff --git a/lib/import/otrs/dynamic_field/text.rb b/lib/import/otrs/dynamic_field/text.rb
index cafcb7f41..a5067ba02 100644
--- a/lib/import/otrs/dynamic_field/text.rb
+++ b/lib/import/otrs/dynamic_field/text.rb
@@ -9,7 +9,7 @@ module Import
               default:   dynamic_field['Config']['DefaultValue'],
               type:      'text',
               maxlength: 255,
-              null:      false,
+              null:      true,
             }
           )
         end
diff --git a/lib/import/otrs/dynamic_field/text_area.rb b/lib/import/otrs/dynamic_field/text_area.rb
index e4b71ce72..b25d54ce2 100644
--- a/lib/import/otrs/dynamic_field/text_area.rb
+++ b/lib/import/otrs/dynamic_field/text_area.rb
@@ -8,7 +8,7 @@ module Import
             data_option: {
               default: dynamic_field['Config']['DefaultValue'],
               rows:    dynamic_field['Config']['Rows'],
-              null:    false,
+              null:    true,
             }
           )
         end
diff --git a/lib/import/zendesk/object_field.rb b/lib/import/zendesk/object_field.rb
index 7457cf1c2..814a8e913 100644
--- a/lib/import/zendesk/object_field.rb
+++ b/lib/import/zendesk/object_field.rb
@@ -15,7 +15,7 @@ module Import
       private
 
       def local_name(object_field)
-        @local_name ||= remote_name(object_field).gsub(%r{[\s\/]}, '_').underscore.gsub(/_{2,}/, '_')
+        @local_name ||= remote_name(object_field).gsub(%r{[\s\/]}, '_').underscore.gsub(/_{2,}/, '_').gsub(/_id(s?)$/, '_no\1')
       end
 
       def remote_name(object_field)
diff --git a/lib/import/zendesk/state.rb b/lib/import/zendesk/state.rb
index 25fabd497..30dfd4895 100644
--- a/lib/import/zendesk/state.rb
+++ b/lib/import/zendesk/state.rb
@@ -5,6 +5,7 @@ module Import
       MAPPING = {
         'pending' => 'pending reminder',
         'solved'  => 'closed',
+        'deleted' => 'removed',
       }.freeze
 
       class << self
diff --git a/lib/import/zendesk/ticket.rb b/lib/import/zendesk/ticket.rb
index 5e36420ef..615e32ffe 100644
--- a/lib/import/zendesk/ticket.rb
+++ b/lib/import/zendesk/ticket.rb
@@ -39,7 +39,7 @@ module Import
 
         {
           id:                       ticket.id,
-          title:                    ticket.subject,
+          title:                    ticket.subject || ticket.description || '-',
           owner_id:                 Import::Zendesk::UserFactory.local_id( ticket.assignee ) || 1,
           note:                     ticket.description,
           group_id:                 Import::Zendesk::GroupFactory.local_id( ticket.group_id ) || 1,
diff --git a/lib/import/zendesk/ticket/comment/attachment.rb b/lib/import/zendesk/ticket/comment/attachment.rb
index 9c1ec687a..15728baf4 100644
--- a/lib/import/zendesk/ticket/comment/attachment.rb
+++ b/lib/import/zendesk/ticket/comment/attachment.rb
@@ -3,7 +3,7 @@ module Import
     class Ticket
       class Comment
         class Attachment
-          extend Import::Helper
+          include Import::Helper
 
           def initialize(attachment, local_article)
 
@@ -20,6 +20,8 @@ module Import
               },
               created_by_id: 1
             )
+          rescue => e
+            log e.message
           end
 
           private
@@ -35,6 +37,7 @@ module Import
             )
             return response if response.success?
             log response.error
+            nil
           end
         end
       end
diff --git a/lib/import/zendesk/ticket_factory.rb b/lib/import/zendesk/ticket_factory.rb
index 0362f1f41..fbba1fb22 100644
--- a/lib/import/zendesk/ticket_factory.rb
+++ b/lib/import/zendesk/ticket_factory.rb
@@ -2,6 +2,45 @@ module Import
   module Zendesk
     module TicketFactory
       extend Import::Zendesk::BaseFactory
+
+      # rubocop:disable Style/ModuleFunction
+      extend self
+
+      private
+
+      def import_loop(records, *args)
+
+        count_update_hook = proc { |record|
+          yield(record)
+          update_ticket_count(records)
+        }
+
+        super(records, *args, &count_update_hook)
+      end
+
+      def update_ticket_count(collection)
+
+        cache_key      = 'import_zendesk_stats'
+        count_variable = :@count
+        page_variable  = :@next_page
+
+        next_page    = collection.instance_variable_get(page_variable)
+        @last_page ||= next_page
+
+        return if @last_page == next_page
+        return if !collection.instance_variable_get(count_variable)
+
+        @last_page = next_page
+
+        # check cache
+        cache = Cache.get(cache_key)
+        return if !cache
+
+        cache['Tickets'] ||= 0
+        cache['Tickets']  += collection.instance_variable_get(count_variable)
+
+        Cache.write(cache_key, cache)
+      end
     end
   end
 end
diff --git a/lib/import/zendesk/user/role.rb b/lib/import/zendesk/user/role.rb
index e5b389b47..fdc960c37 100644
--- a/lib/import/zendesk/user/role.rb
+++ b/lib/import/zendesk/user/role.rb
@@ -43,19 +43,21 @@ module Import
         end
 
         def role_admin
-          return @role_admin if @role_admin
-          @role_admin = ::Role.lookup(name: 'Admin')
+          @role_admin ||= lookup('Admin')
         end
 
         def role_agent
-          return @role_agent if @role_agent
-          @role_agent = ::Role.lookup(name: 'Agent')
+          @role_agent ||= lookup('Agent')
         end
 
         def role_customer
-          return @role_customer if @role_customer
-          @role_customer = ::Role.lookup(name: 'Customer')
+          @role_customer ||= lookup('Customer')
         end
+
+        def lookup(role_name)
+          ::Role.lookup(name: role_name)
+        end
+
       end
     end
   end
diff --git a/lib/ldap/group.rb b/lib/ldap/group.rb
index ba60b8297..87bd051ea 100644
--- a/lib/ldap/group.rb
+++ b/lib/ldap/group.rb
@@ -112,7 +112,7 @@ class Ldap
     #
     # @return [String, nil] The active or found filter or nil if none could be found.
     def filter
-      @filter ||= lookup_filter(['(objectClass=group)', '(objectClass=posixgroup)'])
+      @filter ||= lookup_filter(['(objectClass=group)', '(objectClass=posixgroup)', '(objectClass=organization)'])
     end
 
     # The active uid attribute of the instance. If none give on initialization an automatic lookup is performed.
diff --git a/lib/mixin/instance_wrapper.rb b/lib/mixin/instance_wrapper.rb
new file mode 100644
index 000000000..96e8ff8e3
--- /dev/null
+++ b/lib/mixin/instance_wrapper.rb
@@ -0,0 +1,43 @@
+module Mixin
+  # This modules enables to redirect all calls to methods that are
+  # not defined to the declared instance variable. This comes handy
+  # when you wan't extend a Ruby core class like Hash.
+  # To inherit directly from such classes is a bad idea and should be avoided.
+  # This way allows it indirectly.
+  module InstanceWrapper
+    module ClassMethods
+      # Creates the class macro `wrap` that activates
+      # the wrapping for the given instance variable name.
+      #
+      # @param [Symbol] variable the name of the instance variable to wrap around
+      #
+      # @example
+      #  wrap :@some_hash
+      #
+      # @return [nil]
+      def wrap(variable)
+        define_method(:instance) {
+          instance_variable_get(variable)
+        }
+      end
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    private
+
+    def method_missing(method, *args, &block)
+      if instance.respond_to?(method)
+        instance.send(method, *args, &block)
+      else
+        super
+      end
+    end
+
+    def respond_to_missing?(method_sym, include_all)
+      instance.respond_to?(method_sym, include_all)
+    end
+  end
+end
diff --git a/lib/mixin/rails_logger.rb b/lib/mixin/rails_logger.rb
new file mode 100644
index 000000000..e014f1d08
--- /dev/null
+++ b/lib/mixin/rails_logger.rb
@@ -0,0 +1,9 @@
+module Mixin
+  module RailsLogger
+    extend Forwardable
+    extend SingleForwardable
+
+    instance_delegate [:logger] => self
+    single_delegate   [:logger] => :Rails
+  end
+end
diff --git a/lib/mixin/required_sub_paths.rb b/lib/mixin/required_sub_paths.rb
new file mode 100644
index 000000000..fa436749e
--- /dev/null
+++ b/lib/mixin/required_sub_paths.rb
@@ -0,0 +1,44 @@
+module Mixin
+  module RequiredSubPaths
+
+    def self.included(_base)
+      path     = caller_locations.first.path
+      sub_path = File.join(File.dirname(path), File.basename(path, '.rb'))
+      eager_load_recursive(sub_path)
+    end
+
+    # Loads a directory recursivly.
+    # The specialty of this method is that it will first load all
+    # files in a directory and then start with the sub directories.
+    # This is needed since otherwise some parent namespaces might not
+    # be initialized yet.
+    #
+    # The cause of this is that Rails autoload doesn't work properly
+    # for same named classes or modules in different namespaces.
+    # Here is a good description how autoload works:
+    # http://urbanautomaton.com/blog/2013/08/27/rails-autoloading-hell/
+    #
+    # This avoids a) Rails autoloading issues and b) require '...' workarounds
+    def self.eager_load_recursive(path)
+
+      excluded  = ['.', '..']
+      sub_paths = []
+      Dir.entries(path).each do |entry|
+        next if excluded.include?(entry)
+
+        sub_path = File.join(path, entry)
+
+        if File.directory?(sub_path)
+          sub_paths.push(sub_path)
+        elsif sub_path =~ /\A(.*)\.rb\z/
+          require_path = $1
+          require(require_path)
+        end
+      end
+
+      sub_paths.each do |sub_path|
+        eager_load_recursive(sub_path)
+      end
+    end
+  end
+end
diff --git a/lib/mixin/start_finish_logger.rb b/lib/mixin/start_finish_logger.rb
new file mode 100644
index 000000000..7bee862ac
--- /dev/null
+++ b/lib/mixin/start_finish_logger.rb
@@ -0,0 +1,11 @@
+module Mixin
+  module StartFinishLogger
+    include ::Mixin::RailsLogger
+
+    def log_start_finish(level, prefix)
+      logger.public_send(level, "#{prefix} started.")
+      yield
+      logger.public_send(level, "#{prefix} finished.")
+    end
+  end
+end
diff --git a/lib/models.rb b/lib/models.rb
index ce4dcffca..a7a1140fa 100644
--- a/lib/models.rb
+++ b/lib/models.rb
@@ -242,7 +242,7 @@ returns
       # update items
       ActiveRecord::Base.transaction do
         items_to_update.each { |_id, item|
-          item.save
+          item.save!
         }
       end
     }
diff --git a/lib/notification_factory/mailer.rb b/lib/notification_factory/mailer.rb
index a55127afe..12f810e12 100644
--- a/lib/notification_factory/mailer.rb
+++ b/lib/notification_factory/mailer.rb
@@ -35,27 +35,47 @@ returns
     matrix = user.preferences['notification_config']['matrix']
     return if !matrix
 
-    # check if group is in selecd groups
-    if ticket.owner_id != user.id
+    owned_by_nobody = false
+    owned_by_me = false
+    if ticket.owner_id == 1
+      owned_by_nobody = true
+    elsif ticket.owner_id == user.id
+      owned_by_me = true
+    else
+      # check the replacement chain of max 10
+      # if the current user is in it
+      check_for = ticket.owner
+      10.times do
+        replacement = check_for.out_of_office_agent
+        break if !replacement
+
+        check_for = replacement
+        next if replacement.id != user.id
+
+        owned_by_me = true
+        break
+      end
+    end
+
+    # check if group is in selected groups
+    if !owned_by_me
       selected_group_ids = user.preferences['notification_config']['group_ids']
-      if selected_group_ids
-        if selected_group_ids.class == Array
-          hit = nil
-          if selected_group_ids.empty?
-            hit = true
-          elsif selected_group_ids[0] == '-' && selected_group_ids.count == 1
-            hit = true
-          else
-            hit = false
-            selected_group_ids.each { |selected_group_id|
-              if selected_group_id.to_s == ticket.group_id.to_s
-                hit = true
-                break
-              end
-            }
-          end
-          return if !hit
+      if selected_group_ids.is_a?(Array)
+        hit = nil
+        if selected_group_ids.empty?
+          hit = true
+        elsif selected_group_ids[0] == '-' && selected_group_ids.count == 1
+          hit = true
+        else
+          hit = false
+          selected_group_ids.each { |selected_group_id|
+            if selected_group_id.to_s == ticket.group_id.to_s
+              hit = true
+              break
+            end
+          }
         end
+        return if !hit # no group access
       end
     end
     return if !matrix[type]
@@ -64,13 +84,13 @@ returns
     return if !data['criteria']
     channels = data['channel']
     return if !channels
-    if data['criteria']['owned_by_me'] && ticket.owner_id == user.id
+    if data['criteria']['owned_by_me'] && owned_by_me
       return {
         user: user,
         channels: channels
       }
     end
-    if data['criteria']['owned_by_nobody'] && ticket.owner_id == 1
+    if data['criteria']['owned_by_nobody'] && owned_by_nobody
       return {
         user: user,
         channels: channels
diff --git a/lib/notification_factory/renderer.rb b/lib/notification_factory/renderer.rb
index f15179d96..e0c9f1229 100644
--- a/lib/notification_factory/renderer.rb
+++ b/lib/notification_factory/renderer.rb
@@ -72,7 +72,7 @@ examples how to use
     return "\#{#{object_name} / no such object}" if !object_refs
 
     # if content of method is a complex datatype, just return
-    if object_methods.empty? && object_refs.class != String && object_refs.class != Float && object_refs.class != Fixnum
+    if object_methods.empty? && object_refs.class != String && object_refs.class != Float && object_refs.class != Integer
       return "\#{#{key} / no such method}"
     end
     object_methods_s = ''
diff --git a/lib/search_index_backend.rb b/lib/search_index_backend.rb
index 116b752e8..065724f79 100644
--- a/lib/search_index_backend.rb
+++ b/lib/search_index_backend.rb
@@ -198,9 +198,12 @@ return search result
       data['query']['bool']['must'] = []
     end
 
-    # add * on simple query search
-    if query && query =~ /^\w+$/
-      query += '*'
+    # add * on simple query like "somephrase23" or "attribute: somephrase23"
+    if query.present?
+      query.strip!
+      if query =~ /^([[:alpha:],0-9]+|[[:alpha:],0-9]+\:\s+[[:alpha:],0-9]+)$/
+        query += '*'
+      end
     end
 
     # real search condition
diff --git a/lib/sequencer.rb b/lib/sequencer.rb
new file mode 100644
index 000000000..7a606eed1
--- /dev/null
+++ b/lib/sequencer.rb
@@ -0,0 +1,83 @@
+require 'mixin/rails_logger'
+require 'mixin/start_finish_logger'
+
+class Sequencer
+  include ::Mixin::RailsLogger
+  include ::Mixin::StartFinishLogger
+
+  attr_reader :sequence
+
+  # Convenience wrapper for instant processing with the given attributes.
+  #
+  # @example
+  #  Sequencer.process('Example::Sequence')
+  #
+  # @example
+  #  Sequencer.process('Example::Sequence',
+  #    parameters: {
+  #      some: 'value',
+  #    },
+  #    expecting: [:result, :answer]
+  #  )
+  #
+  # @return [Hash{Symbol => Object}] the final result state attributes and values
+  def self.process(sequence, *args)
+    new(sequence, *args).process
+  end
+
+  # Initializes a new Sequencer instance for the given Sequence with parameters and expecting result.
+  #
+  # @example
+  #  Sequencer.new('Example::Sequence')
+  #
+  # @example
+  #  Sequencer.new('Example::Sequence',
+  #    parameters: {
+  #      some: 'value',
+  #    },
+  #    expecting: [:result, :answer]
+  #  )
+  def initialize(sequence, parameters: {}, expecting: nil)
+    @sequence   = Sequencer::Sequence.constantize(sequence)
+    @parameters = parameters
+    @expecting  = expecting
+
+    # fall back to sequence default expecting if no explicit
+    # expecting was given for this sequence
+    return if !@expecting.nil?
+    @expecting = @sequence.expecting
+  end
+
+  # Processes the Sequence the instance was initialized with.
+  #
+  # @example
+  #  sequence.process
+  #
+  # @return [Hash{Symbol => Object}] the final result state attributes and values
+  def process
+    log_start_finish(:info, "Sequence '#{@sequence.name}'") do
+
+      sequence.units.each_with_index do |unit, index|
+
+        state.process do
+
+          log_start_finish(:info, "Sequence '#{sequence.name}' Unit '#{unit.name}' (index: #{index})") do
+            unit.process(state)
+          end
+        end
+      end
+    end
+
+    state.to_h.tap do |result|
+      logger.debug("Returning Sequence '#{@sequence.name}' result: #{result.inspect}")
+    end
+  end
+
+  private
+
+  def state
+    @state ||= Sequencer::State.new(sequence,
+                                    parameters: @parameters,
+                                    expecting:  @expecting)
+  end
+end
diff --git a/lib/sequencer/mixin/exchange/folder.rb b/lib/sequencer/mixin/exchange/folder.rb
new file mode 100644
index 000000000..0740da383
--- /dev/null
+++ b/lib/sequencer/mixin/exchange/folder.rb
@@ -0,0 +1,18 @@
+class Sequencer
+  module Mixin
+    module Exchange
+      module Folder
+
+        def self.included(base)
+          base.uses :ews_connection
+        end
+
+        private
+
+        def ews_folder
+          @ews_folder ||= ::Import::Exchange::Folder.new(ews_connection)
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/mixin/import_job/resource_loop.rb b/lib/sequencer/mixin/import_job/resource_loop.rb
new file mode 100644
index 000000000..a27e7e670
--- /dev/null
+++ b/lib/sequencer/mixin/import_job/resource_loop.rb
@@ -0,0 +1,37 @@
+require 'sequencer/mixin/sub_sequence'
+
+class Sequencer
+  module Mixin
+    module ImportJob
+      module ResourceLoop
+        include ::Sequencer::Mixin::SubSequence
+
+        private
+
+        def resource_sequence(sequence_name, items)
+          default_params = {
+            dry_run:    import_job.dry_run,
+            import_job: import_job,
+          }
+
+          items.each do |item|
+            resource_params = {}
+            if block_given?
+              resource_params = yield item
+            else
+              resource_params[:resource] = item
+            end
+
+            resource_params[:resource] = resource_params[:resource].with_indifferent_access
+
+            sub_sequence(sequence_name,
+                         parameters: default_params.merge(resource_params))
+          end
+
+          # store possible unsaved values in result e.g. statistics
+          import_job.save!
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/mixin/prefixed_constantize.rb b/lib/sequencer/mixin/prefixed_constantize.rb
new file mode 100644
index 000000000..243bee274
--- /dev/null
+++ b/lib/sequencer/mixin/prefixed_constantize.rb
@@ -0,0 +1,43 @@
+class Sequencer
+  module Mixin
+    # Classes that extend this module need a PREFIX constant.
+    module PrefixedConstantize
+      # Returns the class for a given name String independend of the prefix.
+      #
+      # @param [String] sequence the name String for the requested class
+      #
+      # @example
+      #  Sequencer::Sequence.constantize('ExampleSequence')
+      #  #=> Sequencer::Sequence::ExampleSequence
+      #
+      # @example
+      #  Sequencer::Unit.constantize('Sequencer::Unit::Example::Unit')
+      #  #=> Sequencer::Unit::Example::Unit
+      #
+      # @return [Object] the class for the given String
+      def constantize(name_string)
+        namespace(name_string).constantize
+      end
+
+      # Returns the complete class namespace for a given name String
+      # independend of the prefix.
+      #
+      # @param [String] sequence the name String for the requested class namespace
+      #
+      # @example
+      #  Sequencer::Sequence.namespace('ExampleSequence')
+      #  #=> 'Sequencer::Sequence::ExampleSequence'
+      #
+      # @example
+      #  Sequencer::Unit.namespace('Sequencer::Unit::Example::Unit')
+      #  #=> 'Sequencer::Unit::Example::Unit'
+      #
+      # @return [String] the class namespace for the given String
+      def namespace(name_string)
+        prefix = const_get(:PREFIX)
+        return name_string if name_string.start_with?(prefix)
+        "#{prefix}#{name_string}"
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/mixin/sub_sequence.rb b/lib/sequencer/mixin/sub_sequence.rb
new file mode 100644
index 000000000..75348641c
--- /dev/null
+++ b/lib/sequencer/mixin/sub_sequence.rb
@@ -0,0 +1,9 @@
+class Sequencer
+  module Mixin
+    module SubSequence
+      def sub_sequence(sequence, args = {})
+        Sequencer.process(sequence, args)
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/sequence.rb b/lib/sequencer/sequence.rb
new file mode 100644
index 000000000..906ee2ba3
--- /dev/null
+++ b/lib/sequencer/sequence.rb
@@ -0,0 +1,16 @@
+require 'sequencer/mixin/prefixed_constantize'
+
+class Sequencer
+  class Sequence
+    extend ::Sequencer::Mixin::PrefixedConstantize
+
+    PREFIX = 'Sequencer::Sequence::'.freeze
+
+    attr_reader :units, :expecting
+
+    def initialize(units:, expecting: [])
+      @units     = units
+      @expecting = expecting
+    end
+  end
+end
diff --git a/lib/sequencer/sequence/base.rb b/lib/sequencer/sequence/base.rb
new file mode 100644
index 000000000..382d47baa
--- /dev/null
+++ b/lib/sequencer/sequence/base.rb
@@ -0,0 +1,48 @@
+class Sequencer
+  class Sequence
+    class Base
+
+      # Defines the default attributes that will get returned for the sequence.
+      # These can be overwritten by giving the :expecting key to a sequence process call.
+      #
+      # @example
+      #  Sequencer::Sequence::Example.expecting
+      #  # => [:result, :list]
+      #
+      # @return [Array] the list of expected result keys.
+      def self.expecting
+        []
+      end
+
+      # Defines the list of Units that form the sequence. The units will get
+      # processed in the order they are defined in. The namespaces can be
+      # absolute or without the `Sequencer::Unit` prefix.
+      #
+      # @example
+      #  Sequencer::Sequence::Example.sequence
+      #  # => ['Import::Example::Resource', 'Sequencer::Unit::Import::Model::Create', ...]
+      #
+      # @return [Array] the list of units forming the sequence.
+      def self.sequence
+        raise "Missing implementation of '#{__method__}' method for '#{name}'"
+      end
+
+      # This is an internally used method that converts the defined sequence to a
+      # Sequencer::Units instance which has special methods.
+      #
+      # @example
+      #  Sequencer::Sequence::Example.units
+      #  # => 
+      #
+      # @return [Object]
+      def self.units
+        Sequencer::Units.new(*sequence)
+      end
+
+      # @see .units
+      def units
+        self.class.units
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/sequence/exchange/folder/attributes.rb b/lib/sequencer/sequence/exchange/folder/attributes.rb
new file mode 100644
index 000000000..547d86e4f
--- /dev/null
+++ b/lib/sequencer/sequence/exchange/folder/attributes.rb
@@ -0,0 +1,17 @@
+class Sequencer
+  class Sequence
+    module Exchange
+      module Folder
+        class Attributes < Sequencer::Sequence::Base
+
+          def self.sequence
+            [
+              'Exchange::Connection',
+              'Exchange::Folder::Attributes',
+            ]
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/sequence/import/exchange/attributes_examples.rb b/lib/sequencer/sequence/import/exchange/attributes_examples.rb
new file mode 100644
index 000000000..6c5cdab2b
--- /dev/null
+++ b/lib/sequencer/sequence/import/exchange/attributes_examples.rb
@@ -0,0 +1,23 @@
+class Sequencer
+  class Sequence
+    module Import
+      module Exchange
+        class AttributesExamples < Sequencer::Sequence::Base
+
+          def self.expecting
+            [:attributes]
+          end
+
+          def self.sequence
+            [
+              'Exchange::Connection',
+              'Exchange::Folders::ByIds',
+              'Import::Exchange::AttributeExamples',
+              'Import::Exchange::AttributeMapper::AttributeExamples',
+            ]
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/sequence/import/exchange/available_folders.rb b/lib/sequencer/sequence/import/exchange/available_folders.rb
new file mode 100644
index 000000000..63c37b927
--- /dev/null
+++ b/lib/sequencer/sequence/import/exchange/available_folders.rb
@@ -0,0 +1,22 @@
+class Sequencer
+  class Sequence
+    module Import
+      module Exchange
+        class AvailableFolders < Sequencer::Sequence::Base
+
+          def self.expecting
+            [:folders]
+          end
+
+          def self.sequence
+            [
+              'Exchange::Connection',
+              'Exchange::Folders::IdPathMap',
+              'Import::Exchange::AttributeMapper::AvailableFolders',
+            ]
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/sequence/import/exchange/folder_contact.rb b/lib/sequencer/sequence/import/exchange/folder_contact.rb
new file mode 100644
index 000000000..d475920ca
--- /dev/null
+++ b/lib/sequencer/sequence/import/exchange/folder_contact.rb
@@ -0,0 +1,33 @@
+class Sequencer
+  class Sequence
+    module Import
+      module Exchange
+        class FolderContact < Sequencer::Sequence::Base
+
+          def self.sequence
+            [
+              'Import::Exchange::FolderContact::RemoteId',
+              'Import::Exchange::FolderContact::Mapping',
+              'Import::Common::Model::Skip::Blank::Mapped',
+              'Import::Exchange::FolderContact::StaticAttributes',
+              'Import::Common::Model::ExternalSync::Lookup',
+              'Import::Common::Model::Associations::Extract',
+              'Import::Common::User::Attributes::Downcase',
+              'Import::Common::User::Email::CheckValidity',
+              'Import::Common::Model::Attributes::AddByIds',
+              'Import::Common::Model::Update',
+              'Import::Common::Model::Create',
+              'Import::Common::Model::Associations::Assign',
+              'Import::Common::Model::Save',
+              'Import::Common::Model::ExternalSync::Create',
+              'Import::Exchange::FolderContact::HttpLog',
+              'Import::Exchange::FolderContact::Statistics::Diff',
+              'Import::Common::ImportJob::Statistics::Update',
+              'Import::Common::ImportJob::Statistics::Store',
+            ]
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/sequence/import/exchange/folder_contacts.rb b/lib/sequencer/sequence/import/exchange/folder_contacts.rb
new file mode 100644
index 000000000..9d07f75cd
--- /dev/null
+++ b/lib/sequencer/sequence/import/exchange/folder_contacts.rb
@@ -0,0 +1,22 @@
+class Sequencer
+  class Sequence
+    module Import
+      module Exchange
+        class FolderContacts < Sequencer::Sequence::Base
+
+          def self.sequence
+            [
+              'Import::Exchange::FolderContacts::DryRunPayload',
+              'Exchange::Connection',
+              'Import::Exchange::FolderContacts::FolderIds',
+              'Import::Exchange::FolderContacts::Sum',
+              'Import::Common::ImportJob::Statistics::Update',
+              'Import::Common::ImportJob::Statistics::Store',
+              'Import::Exchange::FolderContacts::SubSequence',
+            ]
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/state.rb b/lib/sequencer/state.rb
new file mode 100644
index 000000000..39a7107a6
--- /dev/null
+++ b/lib/sequencer/state.rb
@@ -0,0 +1,272 @@
+require 'mixin/rails_logger'
+require 'mixin/start_finish_logger'
+
+class Sequencer
+  class State
+    include ::Mixin::RailsLogger
+    include ::Mixin::StartFinishLogger
+
+    def initialize(sequence, parameters: {}, expecting: nil)
+      @index        = -1
+      @units        = sequence.units
+      @result_index = @units.count
+      @values       = {}
+
+      initialize_attributes(sequence.units)
+      initialize_parameters(parameters.with_indifferent_access)
+      initialize_expectations(expecting || sequence.expecting)
+    end
+
+    # Stores a value for the given attribute. Value can be a regular object
+    # or the result of a given code block.
+    # The attribute gets validated against the .provides list of attributes.
+    # In the case than an attribute gets provided that is not declared to
+    # be provided an exception will be raised.
+    #
+    # @param [Symbol] attribute the attribute for which the value gets provided.
+    # @param [Object] value the value that should get stored for the given attribute.
+    # @yield [] executes the given block and takes the result as the value.
+    # @yieldreturn [Object] the value for the given attribute.
+    #
+    # @example
+    #  state.provide(:sum, 3)
+    #
+    # @example
+    #  state.provide(:sum) do
+    #    some_value = rand(100)
+    #    some_value * 3
+    #  end
+    #
+    # @raise [RuntimeError] if the attribute is not provideable from the calling Unit
+    #
+    # @return [nil]
+    def provide(attribute, value = nil)
+      if provideable?(attribute)
+        value = yield if block_given?
+        set(attribute, value)
+      else
+        value = "UNEXECUTED BLOCK: #{caller(1..1).first}" if block_given?
+        unprovideable_setter(attribute, value)
+      end
+    end
+
+    # Returns the value of the given attribute.
+    # The attribute gets validated against the .uses list of attributes. In the
+    # case than an attribute gets used that is not declared to be used
+    # an exception will be raised.
+    #
+    # @param [Symbol] attribute the attribute for which the value is requested.
+    #
+    # @example
+    #  state.use(:answer)
+    #  #=> 42
+    #
+    # @raise [RuntimeError] if the attribute is not useable from the calling Unit
+    #
+    # @return [nil]
+    def use(attribute)
+      if useable?(attribute)
+        get(attribute)
+      else
+        unaccessable_getter(attribute)
+      end
+    end
+
+    # Returns the value of the given attribute.
+    # The attribute DOES NOT get validated against the .uses list of attributes.
+    #
+    # @param [Symbol] attribute the attribute for which the value is requested.
+    #
+    # @example
+    #  state.optional(:answer)
+    #  #=> 42
+    #
+    # @example
+    #  state.optional(:unknown)
+    #  #=> nil
+    #
+    # @return [Object, nil]
+    def optional(attribute)
+      return get(attribute) if @attributes.known?(attribute)
+      logger.debug("Access to unknown optional attribute '#{attribute}'.")
+      nil
+    end
+
+    # Checks if a value for the given attribute is provided.
+    # The attribute DOES NOT get validated against the .uses list of attributes.
+    #
+    # @param [Symbol] attribute the attribute which should get checked.
+    #
+    # @example
+    #  state.provided?(:answer)
+    #  #=> true
+    #
+    # @example
+    #  state.provided?(:unknown)
+    #  #=> false
+    #
+    # @return [Boolean]
+    def provided?(attribute)
+      optional(attribute) != nil
+    end
+
+    # Unsets the value for the given attribute.
+    # The attribute gets validated against the .uses list of attributes.
+    # In the case than an attribute gets unset that is not declared
+    # to be used an exception will be raised.
+    #
+    # @param [Symbol] attribute the attribute for which the value gets unset.
+    #
+    # @example
+    #  state.unset(:answer)
+    #
+    # @raise [RuntimeError] if the attribute is not useable from the calling Unit
+    #
+    # @return [nil]
+    def unset(attribute)
+      value = nil
+      if useable?(attribute)
+        set(attribute, value)
+      else
+        unprovideable_setter(attribute, value)
+      end
+    end
+
+    # Handles state processing of the next Unit in the Sequence while executing
+    # the given block. After the Unit is processed the state will get cleaned up
+    # and no longer needed attribute values will get discarded.
+    #
+    # @yield [] executes the given block and handles the state changes before and afterwards.
+    #
+    # @example
+    #  state.process do
+    #   unit.process
+    #  end
+    #
+    # @return [nil]
+    def process
+      @index += 1
+      yield
+      cleanup
+    end
+
+    # Handles state processing of the next Unit in the Sequence while executing
+    # the given block. After the Unit is processed the state will get cleaned up
+    # and no longer needed attribute values will get discarded.
+    #
+    # @example
+    #  state.to_h
+    #  #=> {"ssl_verify"=>true, "host_url"=>"ldaps://192...", ...}
+    #
+    # @return [Hash{Symbol => Object}]
+    def to_h
+      available.map { |identifier| [identifier, @values[identifier]] }.to_h
+    end
+
+    private
+
+    def available
+      @attributes.select do |_identifier, attribute|
+        @index.between?(attribute.from, attribute.to)
+      end.keys
+    end
+
+    def unit(index = nil)
+      @units[index || @index]
+    end
+
+    def provideable?(attribute)
+      unit.provides.include?(attribute)
+    end
+
+    def useable?(attribute)
+      unit.uses.include?(attribute)
+    end
+
+    def set(attribute, value)
+      logger.debug("Setting '#{attribute}' value (#{value.class.name}): #{value.inspect}")
+      @values[attribute] = value
+    end
+
+    def get(attribute)
+      value = @values[attribute]
+      logger.debug("Getting '#{attribute}' value (#{value.class.name}): #{value.inspect}")
+      value
+    end
+
+    def unprovideable_setter(attribute, value)
+      message = "Unprovideable attribute '#{attribute}' set with value (#{value.class.name}): '#{value}'"
+      logger.error(message)
+      raise message
+    end
+
+    def unaccessable_getter(attribute)
+      message = "Unaccessable getter used for attribute '#{attribute}'"
+      logger.error(message)
+      raise message
+    end
+
+    def initialize_attributes(units)
+      log_start_finish(:debug, 'Attributes lifespan initialization') do
+        @attributes = Sequencer::Units::Attributes.new(units.declarations)
+        logger.debug("Attributes lifespan: #{@attributes.inspect}")
+      end
+    end
+
+    def initialize_parameters(parameters)
+      logger.debug("Initializing Sequencer::State with initial parameters: #{parameters.inspect}")
+
+      log_start_finish(:debug, 'Attribute value provisioning check and initialization') do
+
+        @attributes.each do |identifier, attribute|
+
+          if !attribute.will_be_used?
+            logger.debug("Attribute '#{identifier}' is provided by Unit(s) but never used.")
+            next
+          end
+
+          init_param    = parameters.key?(identifier)
+          provided_attr = attribute.will_be_provided?
+
+          if !init_param && !provided_attr
+            message = "Attribute '#{identifier}' is used in Unit '#{unit(attribute.to).name}' (index: #{attribute.to}) but is not provided or given via initial parameters."
+            logger.error(message)
+            raise message
+          end
+
+          # skip if attribute is provided by an Unit but not
+          # an initial parameter
+          next if !init_param
+
+          # update 'from' lifespan information for attribute
+          # since it's provided via the initial parameter
+          attribute.from = @index
+
+          # set initial value
+          set(identifier, parameters[identifier])
+        end
+      end
+    end
+
+    def initialize_expectations(expected_attributes)
+      expected_attributes.each do |identifier|
+        logger.debug("Adding attribute '#{identifier}' to the list of expected result attributes.")
+        @attributes[identifier].to = @result_index
+      end
+    end
+
+    def cleanup
+      log_start_finish(:info, "State cleanup of Unit #{unit.name} (index: #{@index})") do
+
+        @attributes.delete_if do |identifier, attribute|
+          remove = !attribute.will_be_used?
+          remove ||= attribute.to <= @index
+          if remove && attribute.will_be_used?
+            logger.debug("Removing unneeded attribute '#{identifier}': #{@values[identifier]}")
+          end
+          remove
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit.rb b/lib/sequencer/unit.rb
new file mode 100644
index 000000000..723ef4a2e
--- /dev/null
+++ b/lib/sequencer/unit.rb
@@ -0,0 +1,71 @@
+require 'sequencer/mixin/prefixed_constantize'
+
+class Sequencer
+  class Unit
+    include ::Mixin::RequiredSubPaths
+    extend ::Sequencer::Mixin::PrefixedConstantize
+
+    PREFIX = 'Sequencer::Unit::'.freeze
+
+    # Convenience wrapper for processing a single Unit.
+    #
+    # ATTENTION: This should only be used for development, testing or debugging purposes.
+    # There might be a check in the future to prevent using this method in other scopes.
+    #
+    # @see #initialize
+    # @see #process
+    def self.process(unit, parameters, &block)
+      new(unit).process(parameters, &block)
+    end
+
+    # Initializes a new Sequencer::Unit for processing it.
+    #
+    # ATTENTION: This should only be used for development, testing or debugging purposes.
+    # There might be a check in the future to prevent using this method in other scopes.
+    #
+    # @param [String] unit the name String for the Unit that should get processed
+    def initialize(unit)
+      @unit = self.class.constantize(unit)
+    end
+
+    # Processes the Sequencer::Unit that the instance was initialized with.
+    #
+    # ATTENTION: This should only be used for development, testing or debugging purposes.
+    # There might be a check in the future to prevent using this method in other scopes.
+    #
+    # @param [Hash{Symbol => Object}] parameters the parameters for initializing the Sequencer::State
+    # @yield [instance] optional block to access the Unit instance
+    # @yieldparam instance [Object] the Unit instance for e.g. adding expectations
+    def process(parameters)
+      @parameters = parameters
+      instance    = @unit.new(state)
+
+      # yield instance to apply expectations
+      yield instance if block_given?
+
+      state.process do
+        instance.process
+      end
+
+      state.to_h
+    end
+
+    private
+
+    def state
+      @state ||= begin
+        units = Sequencer::Units.new(
+          @unit.name
+        )
+
+        sequence = Sequencer::Sequence.new(
+          units:     units,
+          expecting: @unit.provides,
+        )
+
+        Sequencer::State.new(sequence,
+                             parameters: @parameters)
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/base.rb b/lib/sequencer/unit/base.rb
new file mode 100644
index 000000000..cd97afe82
--- /dev/null
+++ b/lib/sequencer/unit/base.rb
@@ -0,0 +1,212 @@
+require 'mixin/rails_logger'
+
+class Sequencer
+  class Unit
+    class Base
+      include ::Mixin::RailsLogger
+
+      attr_reader :state
+
+      # Creates the class macro `uses` that allows a Unit to
+      # declare the attributes it will use via parameter or block.
+      # On the other hand it returns the declared attributes if
+      # called without parameters.
+      #
+      # This method can be called multiple times and will add the
+      # given attributes to the list. It takes care of handling
+      # duplicates so no uniq check is required. It's safe to use
+      # for inheritance structures and modules.
+      #
+      # It additionally creates a getter instance method for each declared
+      # attribute like e.g. attr_reader does. This allows direct access
+      # to an attribute via `attribute_name`. See examples.
+      #
+      # @param [Array] attributes an optional list of attributes that the Unit uses
+      #
+      # @yield [] A block returning a list of attributes
+      #
+      # @example Via regular Array parameter
+      #  uses :instance, :action, :connection
+      #
+      # @example Via block
+      #  uses do
+      #    additional = method(parameter)
+      #    [:some, additional]
+      #  end
+      #
+      # @example Listing declared attributes
+      #  Unit::Name.uses
+      #  # => [:instance, :action, :connection, :some, :suprise]
+      #
+      # @example Using declared attribute in the Unit via state object
+      #  state.use(:instance).id
+      #
+      # @example Using declared attribute in the Unit via getter
+      #  instance.id
+      #
+      # @return [Array] the list of all declared uses of a Unit.
+      def self.uses(*attributes, &block)
+        declaration_accessor(
+          key:        __method__,
+          attributes: attributes(*attributes, &block)
+        ) do |attribute|
+          use_getter(attribute)
+        end
+      end
+
+      # Creates the class macro `provides` that allows a Unit to
+      # declare the attributes it will provided via parameter or block.
+      # On the other hand it returns the declared attributes if
+      # called without parameters.
+      #
+      # This method can be called multiple times and will add the
+      # given attributes to the list. It takes care of handling
+      # duplicates so no uniq check is required. It's safe to use
+      # for inheritance structures and modules.
+      #
+      # It additionally creates a setter instance method for each declared
+      # attribute like e.g. attr_writer does. This allows direct access
+      # to an attribute via `self.attribute_name = `. See examples.
+      #
+      # A Unit should usually not provide more than one or two attributes.
+      # If your Unit provides it's doing to much and should be splitted
+      # into multiple Units.
+      #
+      # @param [Array] attributes an optional list of attributes that the Unit provides
+      #
+      # @yield [] A block returning a list of attributes
+      #
+      # @example Via regular Array parameter
+      #  provides :instance, :action, :connection
+      #
+      # @example Via block
+      #  provides do
+      #    additional = method(parameter)
+      #    [:some, additional]
+      #  end
+      #
+      # @example Listing declared attributes
+      #  Unit::Name.provides
+      #  # => [:instance, :action, :connection, :some, :suprise]
+      #
+      # @example Providing declared attribute in the Unit via state object parameter
+      #  state.provide(:action, :created)
+      #
+      # @example Providing declared attribute in the Unit via state object block
+      #  state.provide(:instance) do
+      #    # ...
+      #    instance
+      #  end
+      #
+      # @example Providing declared attribute in the Unit via setter
+      #  self.action = :created
+      #
+      # @return [Array] the list of all declared provides of a Unit.
+      def self.provides(*attributes, &block)
+        declaration_accessor(
+          key:        __method__,
+          attributes: attributes(*attributes, &block)
+        ) do |attribute|
+          provide_setter(attribute)
+        end
+      end
+
+      def self.attributes(*attributes)
+        # exectute block if given and add
+        # the result to the (possibly empty)
+        # list of given attributes
+        attributes.concat(yield) if block_given?
+        attributes
+      end
+
+      # This method is the heart of the #uses and #provides method.
+      # It takes the declaration key and decides based on the given
+      # parameters if the given attributes should get stored or
+      # the stored values returned.
+      def self.declaration_accessor(key:, attributes:)
+
+        # if no attributes were given (storing)
+        # return the already stored list of attributes
+        return declarations(key).to_a if attributes.blank?
+
+        # loop over all given attributes and
+        # add them to the list of already stored
+        # attributes for the given declaration key
+        attributes.each do |attribute|
+          next if !declarations(key).add?(attribute)
+
+          # yield callback if given to create
+          # getter or setter or whatever
+          yield(attribute) if block_given?
+        end
+      end
+
+      # This method creates the convenience method
+      # getter for the given attribute.
+      def self.use_getter(attribute)
+        define_method(attribute) do
+          instance_variable_cached(attribute) do
+            state.use(attribute)
+          end
+        end
+      end
+
+      # This method creates the convenience method
+      # setter for the given attribute.
+      def self.provide_setter(attribute)
+        define_method("#{attribute}=") do |value|
+          state.provide(attribute, value)
+        end
+      end
+
+      # This method is the attribute store for the given declaration key.
+      def self.declarations(key)
+        instance_variable_cached("#{key}_declarations") do
+          declarations_initial(key)
+        end
+      end
+
+      # This method initializes the attribute store for the given declaration key.
+      # It checks if a parent class already has an existing store and duplicates it
+      # for independent usage. Otherwise it creates a new one.
+      def self.declarations_initial(key)
+        return Set.new([]) if !superclass.respond_to?(:declarations)
+        superclass.send(:declarations, key).dup
+      end
+
+      # This method creates an accessor to a cached instance variable for the given scope.
+      # It will create a new variable with the result of the given block as an initial value.
+      # On later calls it will return the already initialized, cached variable state.
+      # The variable will be created by default as a class variable. If a instance scope is
+      # passed it will create an instance variable instead.
+      def self.instance_variable_cached(key, scope: self)
+        cache = "@#{key}"
+        value = scope.instance_variable_get(cache)
+        return value if value
+        value = yield
+        scope.instance_variable_set(cache, value)
+      end
+
+      # This method is an instance wrapper around the class method .instance_variable_cached.
+      # It will behave the same but passed the instance scope to create an
+      # cached instance variable.
+      def instance_variable_cached(key, &block)
+        self.class.instance_variable_cached(key, scope: self, &block)
+      end
+
+      # This method is an convenience wrapper to create an instance
+      # and then directly processing it.
+      def self.process(*args)
+        new(*args).process
+      end
+
+      def initialize(state)
+        @state = state
+      end
+
+      def process
+        raise "Missing implementation of '#{__method__}' method for '#{self.class.name}'"
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/common/attribute_mapper.rb b/lib/sequencer/unit/common/attribute_mapper.rb
new file mode 100644
index 000000000..8922dd190
--- /dev/null
+++ b/lib/sequencer/unit/common/attribute_mapper.rb
@@ -0,0 +1,28 @@
+class Sequencer
+  class Unit
+    module Common
+      class AttributeMapper < Sequencer::Unit::Base
+
+        def self.map
+          raise "Missing implementation of '#{__method__}' method for '#{name}'"
+        end
+
+        def self.uses
+          map.keys
+        end
+
+        def self.provides
+          map.values
+        end
+
+        def process
+          self.class.map.each do |original, renamed|
+            state.provide(renamed) do
+              state.use(original)
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/exchange/connection.rb b/lib/sequencer/unit/exchange/connection.rb
new file mode 100644
index 000000000..fddcba8c0
--- /dev/null
+++ b/lib/sequencer/unit/exchange/connection.rb
@@ -0,0 +1,23 @@
+class Sequencer
+  class Unit
+    module Exchange
+      class Connection < Sequencer::Unit::Base
+
+        uses :ews_config
+        provides :ews_connection
+
+        def process
+          # check if EWS connection is already given (sub sequence)
+          return if state.provided?(:ews_connection)
+
+          state.provide(:ews_connection) do
+            config   = ews_config
+            config ||= ::Import::Exchange.config
+
+            Viewpoint::EWSClient.new(config[:endpoint], config[:user], config[:password])
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/exchange/folders/by_ids.rb b/lib/sequencer/unit/exchange/folders/by_ids.rb
new file mode 100644
index 000000000..8a08d530f
--- /dev/null
+++ b/lib/sequencer/unit/exchange/folders/by_ids.rb
@@ -0,0 +1,24 @@
+require 'sequencer/mixin/exchange/folder'
+
+class Sequencer
+  class Unit
+    module Exchange
+      module Folders
+        class ByIds < Sequencer::Unit::Base
+          include ::Sequencer::Mixin::Exchange::Folder
+
+          uses :ews_folder_ids
+          provides :ews_folders
+
+          def process
+            state.provide(:ews_folders) do
+              ews_folder_ids.collect do |folder_id|
+                ews_folder.find(folder_id)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/exchange/folders/id_path_map.rb b/lib/sequencer/unit/exchange/folders/id_path_map.rb
new file mode 100644
index 000000000..9b6d48847
--- /dev/null
+++ b/lib/sequencer/unit/exchange/folders/id_path_map.rb
@@ -0,0 +1,31 @@
+require 'sequencer/mixin/exchange/folder'
+
+class Sequencer
+  class Unit
+    module Exchange
+      module Folders
+        class IdPathMap < Sequencer::Unit::Base
+          include ::Sequencer::Mixin::Exchange::Folder
+
+          provides :ews_folder_id_path_map
+
+          def process
+            state.provide(:ews_folder_id_path_map) do
+
+              ids   = state.optional(:ews_folder_ids)
+              ids ||= []
+
+              ews_folder.id_folder_map.collect do |id, folder|
+                next if ids.present? && ids.exclude?(id)
+                next if folder.total_count.blank?
+                next if folder.total_count.zero?
+
+                [id, ews_folder.display_path(folder)]
+              end.compact.to_h
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/import_job/payload/to_state.rb b/lib/sequencer/unit/import/common/import_job/payload/to_state.rb
new file mode 100644
index 000000000..0c0d17324
--- /dev/null
+++ b/lib/sequencer/unit/import/common/import_job/payload/to_state.rb
@@ -0,0 +1,25 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module ImportJob
+          module Payload
+            class ToState < Sequencer::Unit::Base
+
+              uses :import_job
+
+              def process
+                provides = self.class.provides
+                raise "Can't find any provides for #{self.class.name}" if provides.blank?
+
+                provides.each do |attribute|
+                  state.provide(attribute, import_job.payload[attribute])
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/import_job/statistics/store.rb b/lib/sequencer/unit/import/common/import_job/statistics/store.rb
new file mode 100644
index 000000000..33aa8a9e8
--- /dev/null
+++ b/lib/sequencer/unit/import/common/import_job/statistics/store.rb
@@ -0,0 +1,35 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module ImportJob
+          module Statistics
+            class Store < Sequencer::Unit::Base
+
+              uses :import_job, :statistics
+
+              def process
+                # update the attribute temporarily so we can update it when:
+                # - the last update is more than 10 seconds in the past
+                # - all instances are processed but the last statistics entry is not written here.
+                #    This will be done in the calling Unit of the executed sub sequence
+                import_job.result = statistics
+
+                return if !store?
+                import_job.save!
+              end
+
+              private
+
+              def store?
+                return true if import_job.updated_at.blank?
+                # update every 10 seconds to reduce DB load
+                import_job.updated_at > Time.zone.now + 10.seconds
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/import_job/statistics/update.rb b/lib/sequencer/unit/import/common/import_job/statistics/update.rb
new file mode 100644
index 000000000..57af16340
--- /dev/null
+++ b/lib/sequencer/unit/import/common/import_job/statistics/update.rb
@@ -0,0 +1,50 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module ImportJob
+          module Statistics
+            class Update < Sequencer::Unit::Base
+
+              uses :statistics_diff
+              provides :statistics
+
+              def process
+                state.provide(:statistics) do
+                  sum_deeply(
+                    existing:  statistics,
+                    additions: statistics_diff
+                  )
+                end
+
+                # reset diff to avoid situations where old diff gets added multiple times
+                state.unset(:statistics_diff)
+              end
+
+              private
+
+              def statistics
+                import_job = state.optional(:import_job)
+                return {} if import_job.nil?
+                import_job.result
+              end
+
+              def sum_deeply(existing:, additions:)
+                existing.merge(additions) do |_key, oldval, newval|
+                  if oldval.is_a?(Hash) || newval.is_a?(Hash)
+                    sum_deeply(
+                      existing:  oldval,
+                      additions: newval
+                    )
+                  else
+                    oldval + newval
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/import_job/sub_sequence/general.rb b/lib/sequencer/unit/import/common/import_job/sub_sequence/general.rb
new file mode 100644
index 000000000..e581e1782
--- /dev/null
+++ b/lib/sequencer/unit/import/common/import_job/sub_sequence/general.rb
@@ -0,0 +1,66 @@
+require 'sequencer/mixin/sub_sequence'
+
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module ImportJob
+          module SubSequence
+            class General < Sequencer::Unit::Base
+              include ::Sequencer::Mixin::SubSequence
+
+              uses :import_job
+
+              def process
+                resource_sequence
+              end
+
+              private
+
+              # INFO: Cache results via `@sequence ||= ...`, if needed
+              def sequence
+                raise "Missing implementation of '#{__method__}' method for '#{self.class.name}'"
+              end
+
+              # INFO: Cache results via `@resources ||= ...`, if needed
+              def resources
+                raise "Missing implementation of '#{__method__}' method for '#{self.class.name}'"
+              end
+
+              def default_parameters
+                {
+                  dry_run:    import_job.dry_run,
+                  import_job: import_job,
+                }
+              end
+
+              def resource_sequence
+                return if resources.blank?
+
+                defaults = default_parameters
+
+                resources.each do |resource|
+
+                  arguments = {
+                    parameters: defaults.merge(resource: resource)
+                  }
+
+                  yield resource, arguments if block_given?
+
+                  arguments[:parameters][:resource] = arguments[:parameters][:resource].with_indifferent_access
+
+                  result = sub_sequence(sequence, arguments)
+
+                  processed(result)
+                end
+              end
+
+              def processed(_result)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/import_job/sub_sequence/resource.rb b/lib/sequencer/unit/import/common/import_job/sub_sequence/resource.rb
new file mode 100644
index 000000000..7037d6e07
--- /dev/null
+++ b/lib/sequencer/unit/import/common/import_job/sub_sequence/resource.rb
@@ -0,0 +1,15 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module ImportJob
+          module SubSequence
+            class Resource < Sequencer::Unit::Import::Common::ImportJob::SubSequence::General
+              uses :resource
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/mapping/flat_keys.rb b/lib/sequencer/unit/import/common/mapping/flat_keys.rb
new file mode 100644
index 000000000..302671ced
--- /dev/null
+++ b/lib/sequencer/unit/import/common/mapping/flat_keys.rb
@@ -0,0 +1,35 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Mapping
+          class FlatKeys < Sequencer::Unit::Base
+            include ::Sequencer::Unit::Import::Common::Mapping::Mixin::ProvideMapped
+
+            uses :resource
+            provides :mapped
+
+            def process
+              provide_mapped do
+                mapped
+              end
+            end
+
+            private
+
+            def mapped
+              resource_with_indifferent_access = resource.with_indifferent_access
+              mapping.symbolize_keys.collect do |source, local|
+                [local, resource_with_indifferent_access[source]]
+              end.to_h.with_indifferent_access
+            end
+
+            def mapping
+              raise "Missing implementation of '#{__method__}' method for '#{self.class.name}'"
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/mapping/mixin/provide_mapped.rb b/lib/sequencer/unit/import/common/mapping/mixin/provide_mapped.rb
new file mode 100644
index 000000000..544dc9727
--- /dev/null
+++ b/lib/sequencer/unit/import/common/mapping/mixin/provide_mapped.rb
@@ -0,0 +1,30 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Mapping
+          module Mixin
+            module ProvideMapped
+
+              def self.included(base)
+                base.provides :mapped
+              end
+
+              private
+
+              def existing_mapped
+                @existing_mapped ||= state.optional(:mapped) || ActiveSupport::HashWithIndifferentAccess.new
+              end
+
+              def provide_mapped
+                state.provide(:mapped) do
+                  existing_mapped.merge(yield)
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/model/associations/assign.rb b/lib/sequencer/unit/import/common/model/associations/assign.rb
new file mode 100644
index 000000000..00752ad1b
--- /dev/null
+++ b/lib/sequencer/unit/import/common/model/associations/assign.rb
@@ -0,0 +1,59 @@
+require 'sequencer/unit/import/common/model/mixin/handle_failure'
+
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Model
+          module Associations
+            class Assign < Sequencer::Unit::Base
+              include ::Sequencer::Unit::Import::Common::Model::Mixin::HandleFailure
+
+              uses :instance, :associations, :instance_action, :dry_run
+              provides :instance_action
+
+              def process
+                return if dry_run
+                return if instance.blank?
+
+                instance.assign_attributes(associations)
+
+                # execute associations check only if needed for performance reasons
+                return if instance_action != :unchanged
+                return if !changed?
+                state.provide(:instance_action, :changed)
+              rescue => e
+                handle_failure(e)
+              end
+
+              private
+
+              def changed?
+                logger.debug("Changed instance associations: #{changes.inspect}")
+                changes.present?
+              end
+
+              def changes
+                @changes ||= begin
+                  return {} if associations.blank?
+                  associations.collect do |association, value|
+                    before = compareable(instance.send(association))
+                    after  = compareable(value)
+                    next if before == after
+                    [association, [before, after]]
+                  end.compact.to_h.with_indifferent_access
+                end
+              end
+
+              def compareable(value)
+                return nil if value.blank?
+                return value.sort if value.respond_to(:sort)
+                value
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/model/associations/extract.rb b/lib/sequencer/unit/import/common/model/associations/extract.rb
new file mode 100644
index 000000000..40142b08e
--- /dev/null
+++ b/lib/sequencer/unit/import/common/model/associations/extract.rb
@@ -0,0 +1,65 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Model
+          module Associations
+            class Extract < Sequencer::Unit::Base
+
+              uses :model_class, :mapped
+              provides :associations
+
+              def process
+                state.provide(:associations) do
+                  associations.collect do |association|
+                    next if !mapped.key?(association)
+
+                    # remove from the mapped values if it's an association
+                    value = mapped.delete(association)
+
+                    # skip if we don't track them
+                    next if tracked_associations.exclude?(association)
+
+                    [association, value]
+                  end.compact.to_h
+                end
+              end
+
+              private
+
+              def associations
+                @associations ||= begin
+                  associations = []
+                  # loop over all reflections
+                  model_class.reflect_on_all_associations.each do |reflection|
+
+                    # refection name is something like groups or organization (singular/plural)
+                    associations.push(reflection.name)
+
+                    # key is something like group_id or organization_id (singular)
+                    key = reflection.klass.name.foreign_key
+
+                    # add trailing 's' to get pluralized key
+                    reflection_name = reflection.name.to_s
+                    if reflection_name.singularize == reflection_name
+                      key = "#{key}s"
+                    end
+
+                    # store _id/_ids name
+                    associations.push(key.to_sym)
+                  end
+                  associations
+                end
+              end
+
+              def tracked_associations
+                # track all associations by default
+                associations
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/model/attributes/add_by_ids.rb b/lib/sequencer/unit/import/common/model/attributes/add_by_ids.rb
new file mode 100644
index 000000000..23ab42192
--- /dev/null
+++ b/lib/sequencer/unit/import/common/model/attributes/add_by_ids.rb
@@ -0,0 +1,24 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Model
+          module Attributes
+            class AddByIds < Sequencer::Unit::Base
+              include ::Sequencer::Unit::Import::Common::Mapping::Mixin::ProvideMapped
+
+              def process
+                provide_mapped do
+                  {
+                    created_by_id: 1,
+                    updated_by_id: 1,
+                  }
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/model/attributes/check_mandatory.rb b/lib/sequencer/unit/import/common/model/attributes/check_mandatory.rb
new file mode 100644
index 000000000..dbb1ba529
--- /dev/null
+++ b/lib/sequencer/unit/import/common/model/attributes/check_mandatory.rb
@@ -0,0 +1,32 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Model
+          module Attributes
+            class CheckMandatory < Sequencer::Unit::Base
+              prepend ::Sequencer::Unit::Import::Common::Model::Mixin::SkipOnProvidedInstanceAction
+
+              uses :mapped
+              provides :instance_action
+
+              def process
+                mandatory.each do |mapped_attribute|
+                  next if mapped[mapped_attribute].present?
+                  state.provide(:instance_action, :skipped)
+                  break
+                end
+              end
+
+              private
+
+              def mandatory
+                raise "Missing implementation of '#{__method__}' method for '#{self.class.name}'"
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/model/attributes/remote_id.rb b/lib/sequencer/unit/import/common/model/attributes/remote_id.rb
new file mode 100644
index 000000000..412fbb773
--- /dev/null
+++ b/lib/sequencer/unit/import/common/model/attributes/remote_id.rb
@@ -0,0 +1,32 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Model
+          module Attributes
+            class RemoteId < Sequencer::Unit::Base
+              include ::Sequencer::Unit::Import::Common::Model::Mixin::HandleFailure
+
+              uses :resource
+              provides :remote_id
+
+              def process
+                state.provide(:remote_id) do
+                  resource.fetch(attribute)
+                end
+              rescue KeyError => e
+                handle_failure(e)
+              end
+
+              private
+
+              def attribute
+                :id
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/model/create.rb b/lib/sequencer/unit/import/common/model/create.rb
new file mode 100644
index 000000000..8aab65fb5
--- /dev/null
+++ b/lib/sequencer/unit/import/common/model/create.rb
@@ -0,0 +1,25 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Model
+          class Create < Sequencer::Unit::Base
+            include ::Sequencer::Unit::Import::Common::Model::Mixin::HandleFailure
+            prepend ::Sequencer::Unit::Import::Common::Model::Mixin::SkipOnProvidedInstanceAction
+
+            uses :mapped, :model_class
+            provides :instance, :instance_action
+
+            def process
+              instance = model_class.new(mapped)
+              state.provide(:instance, instance)
+              state.provide(:instance_action, :created)
+            rescue => e
+              handle_failure(e)
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/model/external_sync/create.rb b/lib/sequencer/unit/import/common/model/external_sync/create.rb
new file mode 100644
index 000000000..b1354a454
--- /dev/null
+++ b/lib/sequencer/unit/import/common/model/external_sync/create.rb
@@ -0,0 +1,29 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Model
+          module ExternalSync
+            class Create < Sequencer::Unit::Base
+              prepend ::Sequencer::Unit::Import::Common::Model::Mixin::SkipOnSkippedInstance
+
+              uses :instance, :instance_action, :remote_id, :dry_run, :external_sync_source, :model_class
+
+              def process
+                return if dry_run
+                return if instance_action != :created
+
+                ::ExternalSync.create(
+                  source:    external_sync_source,
+                  source_id: remote_id,
+                  object:    model_class.name,
+                  o_id:      instance.id
+                )
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/model/external_sync/local.rb b/lib/sequencer/unit/import/common/model/external_sync/local.rb
new file mode 100644
index 000000000..5d4c6f1f8
--- /dev/null
+++ b/lib/sequencer/unit/import/common/model/external_sync/local.rb
@@ -0,0 +1,63 @@
+require 'sequencer/unit/import/common/model/mixin/handle_failure'
+
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Model
+          module ExternalSync
+            class Local < Sequencer::Unit::Base
+              include ::Sequencer::Unit::Import::Common::Model::Mixin::HandleFailure
+              prepend ::Sequencer::Unit::Import::Common::Model::Mixin::SkipOnSkippedInstance
+
+              uses :mapped, :remote_id, :model_class, :external_sync_source, :instance_action
+              provides :instance
+
+              def process
+                return if state.provided?(:instance)
+
+                return if value.blank?
+                return if instance.blank?
+
+                create_external_sync
+
+                state.provide(:instance, instance)
+              end
+
+              private
+
+              def attribute
+                raise "Missing implementation of '#{__method__}' method for '#{self.class.name}'"
+              end
+
+              def value
+                mapped[attribute]
+              end
+
+              def instance
+                @instance ||= begin
+                  model_class.where(attribute => value).find do |local|
+                    !ExternalSync.exists?(
+                      source: external_sync_source,
+                      object: model_class.name,
+                      o_id:   local.id
+                    )
+                  end
+                end
+              end
+
+              def create_external_sync
+                ExternalSync.create(
+                  source:    external_sync_source,
+                  source_id: remote_id,
+                  object:    import_class.name,
+                  o_id:      instance.id
+                )
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/model/external_sync/lookup.rb b/lib/sequencer/unit/import/common/model/external_sync/lookup.rb
new file mode 100644
index 000000000..e9894d794
--- /dev/null
+++ b/lib/sequencer/unit/import/common/model/external_sync/lookup.rb
@@ -0,0 +1,34 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Model
+          module ExternalSync
+            class Lookup < Sequencer::Unit::Base
+              include ::Sequencer::Unit::Import::Common::Model::Mixin::HandleFailure
+              prepend ::Sequencer::Unit::Import::Common::Model::Mixin::SkipOnSkippedInstance
+
+              uses :remote_id, :model_class, :external_sync_source
+              provides :instance
+
+              def process
+                synced_instance = ::ExternalSync.find_by(
+                  source:    external_sync_source,
+                  source_id: remote_id,
+                  object:    model_class.name,
+                )
+                return if !synced_instance
+
+                state.provide(:instance) do
+                  model_class.find(synced_instance.o_id)
+                end
+              rescue => e
+                handle_failure(e)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/model/http_log.rb b/lib/sequencer/unit/import/common/model/http_log.rb
new file mode 100644
index 000000000..811e4f383
--- /dev/null
+++ b/lib/sequencer/unit/import/common/model/http_log.rb
@@ -0,0 +1,50 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Model
+          class HttpLog < Sequencer::Unit::Base
+
+            uses :dry_run, :instance_action, :remote_id, :mapped, :exception
+
+            def process
+              return if dry_run
+              ::HttpLog.create(
+                direction: 'out',
+                facility:  facility,
+                method:    'tcp',
+                url:       "#{instance_action} -> #{remote_id}",
+                status:    status,
+                ip:        nil,
+                request:   {
+                  content: mapped,
+                },
+                response: {
+                  message: response
+                },
+                created_by_id: 1,
+                updated_by_id: 1,
+              )
+            end
+
+            private
+
+            def status
+              @status ||= begin
+                instance_action == :failed ? :failed : :success
+              end
+            end
+
+            def response
+              exception ? exception.message : status
+            end
+
+            def facility
+              raise "Missing implementation of '#{__method__}' method for '#{self.class.name}'"
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/model/mixin/handle_failure.rb b/lib/sequencer/unit/import/common/model/mixin/handle_failure.rb
new file mode 100644
index 000000000..d2502de14
--- /dev/null
+++ b/lib/sequencer/unit/import/common/model/mixin/handle_failure.rb
@@ -0,0 +1,24 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Model
+          module Mixin
+            module HandleFailure
+
+              def self.included(base)
+                base.provides :exception, :instance_action
+              end
+
+              def handle_failure(e)
+                logger.error(e)
+                state.provide(:exception, e)
+                state.provide(:instance_action, :failed)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/model/mixin/skip_on_provided_instance_action.rb b/lib/sequencer/unit/import/common/model/mixin/skip_on_provided_instance_action.rb
new file mode 100644
index 000000000..2e9964d69
--- /dev/null
+++ b/lib/sequencer/unit/import/common/model/mixin/skip_on_provided_instance_action.rb
@@ -0,0 +1,22 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Model
+          module Mixin
+            module SkipOnProvidedInstanceAction
+
+              def process
+                if state.provided?(:instance_action)
+                  logger.debug("Skipping. Attribute 'instance_action' already provided.")
+                else
+                  super
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/model/mixin/skip_on_skipped_instance.rb b/lib/sequencer/unit/import/common/model/mixin/skip_on_skipped_instance.rb
new file mode 100644
index 000000000..8d849c2e9
--- /dev/null
+++ b/lib/sequencer/unit/import/common/model/mixin/skip_on_skipped_instance.rb
@@ -0,0 +1,26 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Model
+          module Mixin
+            module SkipOnSkippedInstance
+
+              def self.prepended(base)
+                base.uses :instance_action
+              end
+
+              def process
+                if instance_action == :skipped
+                  logger.debug("Skipping. Attribute 'instance_action' is set to :skipped.")
+                else
+                  super
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/model/save.rb b/lib/sequencer/unit/import/common/model/save.rb
new file mode 100644
index 000000000..8dec6b8ab
--- /dev/null
+++ b/lib/sequencer/unit/import/common/model/save.rb
@@ -0,0 +1,25 @@
+require 'sequencer/unit/import/common/model/mixin/handle_failure'
+
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Model
+          class Save < Sequencer::Unit::Base
+            include ::Sequencer::Unit::Import::Common::Model::Mixin::HandleFailure
+
+            uses :instance, :dry_run
+
+            def process
+              return if dry_run
+              return if instance.blank?
+              instance.save!
+            rescue => e
+              handle_failure(e)
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/model/skip/blank/base.rb b/lib/sequencer/unit/import/common/model/skip/blank/base.rb
new file mode 100644
index 000000000..d57a10126
--- /dev/null
+++ b/lib/sequencer/unit/import/common/model/skip/blank/base.rb
@@ -0,0 +1,43 @@
+require 'sequencer/unit/mixin/dynamic_attribute'
+
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Model
+          module Skip
+            module Blank
+              class Base < Sequencer::Unit::Base
+                prepend ::Sequencer::Unit::Import::Common::Model::Mixin::SkipOnProvidedInstanceAction
+                include ::Sequencer::Unit::Mixin::DynamicAttribute
+
+                provides :instance_action
+
+                def process
+                  return if !skip?
+                  logger.debug("Skipping. Blank #{attribute} found: #{attribute_value.inspect}")
+                  state.provide(:instance_action, :skipped)
+                end
+
+                private
+
+                def ignore
+                  [:id]
+                end
+
+                def skip?
+                  return true if attribute_value.blank?
+                  relevant_blank?
+                end
+
+                def relevant_blank?
+                  !attribute_value.except(*ignore).values.any?(&:present?)
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/model/skip/blank/mapped.rb b/lib/sequencer/unit/import/common/model/skip/blank/mapped.rb
new file mode 100644
index 000000000..25acaad86
--- /dev/null
+++ b/lib/sequencer/unit/import/common/model/skip/blank/mapped.rb
@@ -0,0 +1,17 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Model
+          module Skip
+            module Blank
+              class Mapped < Sequencer::Unit::Import::Common::Model::Skip::Blank::Base
+                uses :mapped
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/model/skip/blank/resource.rb b/lib/sequencer/unit/import/common/model/skip/blank/resource.rb
new file mode 100644
index 000000000..757ca4165
--- /dev/null
+++ b/lib/sequencer/unit/import/common/model/skip/blank/resource.rb
@@ -0,0 +1,17 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Model
+          module Skip
+            module Blank
+              class Resource < Sequencer::Unit::Import::Common::Model::Skip::Blank::Base
+                uses :resource
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/model/skip/missing_mandatory/base.rb b/lib/sequencer/unit/import/common/model/skip/missing_mandatory/base.rb
new file mode 100644
index 000000000..cb327161e
--- /dev/null
+++ b/lib/sequencer/unit/import/common/model/skip/missing_mandatory/base.rb
@@ -0,0 +1,46 @@
+require 'sequencer/unit/mixin/dynamic_attribute'
+
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Model
+          module Skip
+            module MissingMandatory
+              class Base < Sequencer::Unit::Base
+                prepend ::Sequencer::Unit::Import::Common::Model::Mixin::SkipOnProvidedInstanceAction
+                include ::Sequencer::Unit::Mixin::DynamicAttribute
+
+                provides :instance_action
+
+                def process
+                  return if !skip?
+                  logger.debug("Skipping. Missing mandatory attributes for #{attribute}: #{attribute_value.inspect}")
+                  state.provide(:instance_action, :skipped)
+                end
+
+                private
+
+                def mandatory
+                  raise "Missing implementation of '#{__method__}' method for '#{self.class.name}'"
+                end
+
+                def skip?
+                  return true if attribute_value.blank?
+                  mandatory_missing?
+                end
+
+                def mandatory_missing?
+                  values = attribute_value.fetch_values(*mandatory)
+                  !values.any?(&:present?)
+                rescue KeyError => e
+                  false
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/model/skip/missing_mandatory/resource.rb b/lib/sequencer/unit/import/common/model/skip/missing_mandatory/resource.rb
new file mode 100644
index 000000000..f33bc280b
--- /dev/null
+++ b/lib/sequencer/unit/import/common/model/skip/missing_mandatory/resource.rb
@@ -0,0 +1,17 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Model
+          module Skip
+            module MissingMandatory
+              class Resource < Sequencer::Unit::Import::Common::Model::Skip::MissingMandatory::Base
+                uses :resource
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/model/statistics/diff.rb b/lib/sequencer/unit/import/common/model/statistics/diff.rb
new file mode 100644
index 000000000..787123b1d
--- /dev/null
+++ b/lib/sequencer/unit/import/common/model/statistics/diff.rb
@@ -0,0 +1,21 @@
+require 'sequencer/unit/import/common/model/statistics/mixin/diff'
+
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Model
+          module Statistics
+            class Diff < Sequencer::Unit::Base
+              include ::Sequencer::Unit::Import::Common::Model::Statistics::Mixin::Diff
+
+              def process
+                state.provide(:statistics_diff, diff)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/model/statistics/mixin/diff.rb b/lib/sequencer/unit/import/common/model/statistics/mixin/diff.rb
new file mode 100644
index 000000000..1dd1194c7
--- /dev/null
+++ b/lib/sequencer/unit/import/common/model/statistics/mixin/diff.rb
@@ -0,0 +1,47 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Model
+          module Statistics
+            module Mixin
+              module Diff
+
+                def self.included(base)
+                  base.uses :instance_action
+                  base.provides :statistics_diff
+                end
+
+                private
+
+                def actions
+                  %i(skipped created updated unchanged failed deactivated)
+                end
+
+                def diff
+                  raise "Unknown action '#{instance_action}'" if !possible?
+                  defaults.merge(
+                    instance_action => 1,
+                    sum: 1,
+                  )
+                end
+
+                def possible?
+                  possible_actions.include?(instance_action)
+                end
+
+                def defaults
+                  possible_actions.collect { |key| [key, 0] }.to_h
+                end
+
+                def possible_actions
+                  @possible_actions ||= actions
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/model/update.rb b/lib/sequencer/unit/import/common/model/update.rb
new file mode 100644
index 000000000..fa0947317
--- /dev/null
+++ b/lib/sequencer/unit/import/common/model/update.rb
@@ -0,0 +1,56 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module Model
+          class Update < Sequencer::Unit::Base
+            include ::Sequencer::Unit::Import::Common::Model::Mixin::HandleFailure
+            prepend ::Sequencer::Unit::Import::Common::Model::Mixin::SkipOnProvidedInstanceAction
+
+            uses :instance, :mapped
+            provides :instance_action
+
+            def process
+              # check if no instance is given - so we can't update it
+              return if !instance
+
+              # lock the current instance for write access
+              instance.with_lock do
+                # delete since we have an update and
+                # the record is already created
+                mapped.delete(:created_by_id)
+
+                # assign regular attributes
+                instance.assign_attributes(mapped)
+
+                action = changed? ? :updated : :unchanged
+                state.provide(:instance_action, action)
+              end
+            rescue => e
+              handle_failure(e)
+            end
+
+            private
+
+            def changed?
+              logger.debug("Changed instance attributes: #{changes.inspect}")
+              changes.present?
+            end
+
+            def changes
+              @changes ||= begin
+                if instance.changed?
+                  # dry run
+                  instance.changes
+                else
+                  # live run
+                  instance.previous_changes
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/user/attributes/downcase.rb b/lib/sequencer/unit/import/common/user/attributes/downcase.rb
new file mode 100644
index 000000000..c5791e062
--- /dev/null
+++ b/lib/sequencer/unit/import/common/user/attributes/downcase.rb
@@ -0,0 +1,24 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module User
+          module Attributes
+            class Downcase < Sequencer::Unit::Base
+              prepend ::Sequencer::Unit::Import::Common::Model::Mixin::SkipOnSkippedInstance
+
+              uses :mapped
+
+              def process
+                %i(login email).each do |attribute|
+                  next if mapped[attribute].blank?
+                  mapped[attribute].downcase!
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/common/user/email/check_validity.rb b/lib/sequencer/unit/import/common/user/email/check_validity.rb
new file mode 100644
index 000000000..28f035d4f
--- /dev/null
+++ b/lib/sequencer/unit/import/common/user/email/check_validity.rb
@@ -0,0 +1,45 @@
+class Sequencer
+  class Unit
+    module Import
+      module Common
+        module User
+          module Email
+            class CheckValidity < Sequencer::Unit::Base
+              prepend ::Sequencer::Unit::Import::Common::Model::Mixin::SkipOnSkippedInstance
+
+              uses :mapped
+
+              def process
+                return if mapped[:email].blank?
+
+                # TODO: This should be done totally somewhere central
+                mapped[:email] = ensure_valid_email(mapped[:email])
+              end
+
+              private
+
+              def ensure_valid_email(source)
+                # TODO: should get unified with User#check_email
+                email = extract_email(source)
+                return if !email
+                email.downcase
+              end
+
+              def extract_email(source)
+                # Support format like "Bob Smith (bob@example.com)"
+                if source =~ /\((.+@.+)\)/
+                  source = $1
+                end
+
+                Mail::Address.new(source).address
+              rescue
+                return source if source !~ /<\s*([^>]+)/
+                $1.strip
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/exchange/attribute_examples.rb b/lib/sequencer/unit/import/exchange/attribute_examples.rb
new file mode 100644
index 000000000..f4c59c45a
--- /dev/null
+++ b/lib/sequencer/unit/import/exchange/attribute_examples.rb
@@ -0,0 +1,39 @@
+require 'sequencer/mixin/exchange/folder'
+
+class Sequencer
+  class Unit
+    module Import
+      module Exchange
+        class AttributeExamples < Sequencer::Unit::Base
+          include ::Sequencer::Mixin::Exchange::Folder
+
+          uses :ews_folder_ids
+          provides :ews_attributes_examples
+
+          def process
+            state.provide(:ews_attributes_examples) do
+              ::Import::Helper::AttributesExamples.new do |extractor|
+
+                ews_folder_ids.collect do |folder_id|
+
+                  begin
+                    ews_folder.find(folder_id).items.each do |resource|
+                      attributes = ::Import::Exchange::ItemAttributes.extract(resource)
+                      extractor.extract(attributes)
+                      break if extractor.enough
+                    end
+                  rescue NoMethodError => e
+                    raise if e.message !~ /Viewpoint::EWS::/
+
+                    logger.error e
+                    logger.error "Skipping folder_id '#{folder_id}' due to unsupported entries."
+                  end
+                end
+              end.examples
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/exchange/attribute_mapper/attribute_examples.rb b/lib/sequencer/unit/import/exchange/attribute_mapper/attribute_examples.rb
new file mode 100644
index 000000000..482a8cf3c
--- /dev/null
+++ b/lib/sequencer/unit/import/exchange/attribute_mapper/attribute_examples.rb
@@ -0,0 +1,18 @@
+class Sequencer
+  class Unit
+    module Import
+      module Exchange
+        module AttributeMapper
+          class AttributeExamples < Sequencer::Unit::Common::AttributeMapper
+
+            def self.map
+              {
+                ews_attributes_examples: :attributes,
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/exchange/attribute_mapper/available_folders.rb b/lib/sequencer/unit/import/exchange/attribute_mapper/available_folders.rb
new file mode 100644
index 000000000..c1b91c187
--- /dev/null
+++ b/lib/sequencer/unit/import/exchange/attribute_mapper/available_folders.rb
@@ -0,0 +1,18 @@
+class Sequencer
+  class Unit
+    module Import
+      module Exchange
+        module AttributeMapper
+          class AvailableFolders < Sequencer::Unit::Common::AttributeMapper
+
+            def self.map
+              {
+                ews_folder_id_path_map: :folders,
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/exchange/folder_contact/http_log.rb b/lib/sequencer/unit/import/exchange/folder_contact/http_log.rb
new file mode 100644
index 000000000..eefb9c553
--- /dev/null
+++ b/lib/sequencer/unit/import/exchange/folder_contact/http_log.rb
@@ -0,0 +1,18 @@
+class Sequencer
+  class Unit
+    module Import
+      module Exchange
+        module FolderContact
+          class HttpLog < Import::Common::Model::HttpLog
+
+            private
+
+            def facility
+              'EWS'
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/exchange/folder_contact/mapping.rb b/lib/sequencer/unit/import/exchange/folder_contact/mapping.rb
new file mode 100644
index 000000000..076492699
--- /dev/null
+++ b/lib/sequencer/unit/import/exchange/folder_contact/mapping.rb
@@ -0,0 +1,27 @@
+class Sequencer
+  class Unit
+    module Import
+      module Exchange
+        module FolderContact
+          class Mapping < Sequencer::Unit::Import::Common::Mapping::FlatKeys
+
+            uses :import_job
+
+            private
+
+            def mapping
+              from_import_job || ::Import::Exchange.config[:attributes]
+            end
+
+            def from_import_job
+              return if !state.provided?(:import_job)
+              payload = import_job.payload
+              return if payload.blank?
+              payload[:ews_attributes]
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/exchange/folder_contact/remote_id.rb b/lib/sequencer/unit/import/exchange/folder_contact/remote_id.rb
new file mode 100644
index 000000000..8cbfe713f
--- /dev/null
+++ b/lib/sequencer/unit/import/exchange/folder_contact/remote_id.rb
@@ -0,0 +1,17 @@
+class Sequencer
+  class Unit
+    module Import
+      module Exchange
+        module FolderContact
+          class RemoteId < Sequencer::Unit::Import::Common::Model::Attributes::RemoteId
+            private
+
+            def attribute
+              :item_id
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/exchange/folder_contact/static_attributes.rb b/lib/sequencer/unit/import/exchange/folder_contact/static_attributes.rb
new file mode 100644
index 000000000..e7e22e026
--- /dev/null
+++ b/lib/sequencer/unit/import/exchange/folder_contact/static_attributes.rb
@@ -0,0 +1,19 @@
+class Sequencer
+  class Unit
+    module Import
+      module Exchange
+        module FolderContact
+          class StaticAttributes < Sequencer::Unit::Base
+
+            provides :model_class, :external_sync_source
+
+            def process
+              state.provide(:model_class, ::User)
+              state.provide(:external_sync_source, 'EWS::FolderContact')
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/exchange/folder_contact/statistics/diff.rb b/lib/sequencer/unit/import/exchange/folder_contact/statistics/diff.rb
new file mode 100644
index 000000000..9ed81f27f
--- /dev/null
+++ b/lib/sequencer/unit/import/exchange/folder_contact/statistics/diff.rb
@@ -0,0 +1,39 @@
+class Sequencer
+  class Unit
+    module Import
+      module Exchange
+        module FolderContact
+          module Statistics
+            class Diff < Sequencer::Unit::Base
+              include ::Sequencer::Unit::Import::Common::Model::Statistics::Mixin::Diff
+
+              uses :ews_folder_name
+
+              def process
+                state.provide(:statistics_diff) do
+                  # remove :sum since it's already set via
+                  # the exchange item attribte
+                  result = diff.except(:sum)
+
+                  # build structure for a general diff
+                  # and a folder specific sub structure
+                  result.merge(
+                    folders: {
+                      ews_folder_name => result
+                    }
+                  )
+                end
+              end
+
+              private
+
+              def actions
+                %i(created updated unchanged skipped failed)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/exchange/folder_contacts/dry_run_payload.rb b/lib/sequencer/unit/import/exchange/folder_contacts/dry_run_payload.rb
new file mode 100644
index 000000000..5827d25d1
--- /dev/null
+++ b/lib/sequencer/unit/import/exchange/folder_contacts/dry_run_payload.rb
@@ -0,0 +1,14 @@
+class Sequencer
+  class Unit
+    module Import
+      module Exchange
+        module FolderContacts
+          class DryRunPayload < Sequencer::Unit::Import::Common::ImportJob::Payload::ToState
+
+            provides :ews_config, :ews_folder_ids
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/exchange/folder_contacts/folder_ids.rb b/lib/sequencer/unit/import/exchange/folder_contacts/folder_ids.rb
new file mode 100644
index 000000000..5e29a9cee
--- /dev/null
+++ b/lib/sequencer/unit/import/exchange/folder_contacts/folder_ids.rb
@@ -0,0 +1,27 @@
+require 'sequencer/mixin/exchange/folder'
+
+class Sequencer
+  class Unit
+    module Import
+      module Exchange
+        module FolderContacts
+          class FolderIds < Sequencer::Unit::Base
+            include ::Sequencer::Mixin::Exchange::Folder
+
+            provides :ews_folder_ids
+
+            def process
+              # check if ids are already processed
+              return if state.provided?(:ews_folder_ids)
+
+              state.provide(:ews_folder_ids) do
+                config = ::Import::Exchange.config
+                config[:folders]
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/exchange/folder_contacts/sub_sequence.rb b/lib/sequencer/unit/import/exchange/folder_contacts/sub_sequence.rb
new file mode 100644
index 000000000..6ddd1c970
--- /dev/null
+++ b/lib/sequencer/unit/import/exchange/folder_contacts/sub_sequence.rb
@@ -0,0 +1,37 @@
+require 'sequencer/mixin/exchange/folder'
+require 'sequencer/mixin/import_job/resource_loop'
+
+class Sequencer
+  class Unit
+    module Import
+      module Exchange
+        module FolderContacts
+          class SubSequence < Sequencer::Unit::Base
+            include ::Sequencer::Mixin::Exchange::Folder
+            include ::Sequencer::Mixin::ImportJob::ResourceLoop
+
+            uses :ews_folder_ids, :import_job
+
+            def process
+
+              ews_folder_ids.each do |folder_id|
+                folder       = ews_folder.find(folder_id)
+                display_path = ews_folder.display_path(folder)
+
+                resource_sequence('Import::Exchange::FolderContact', folder.items) do |item|
+
+                  logger.debug("Extracting attributes from Exchange item: #{item.get_all_properties!.inspect}")
+
+                  {
+                    resource:        ::Import::Exchange::ItemAttributes.extract(item),
+                    ews_folder_name: display_path,
+                  }
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/import/exchange/folder_contacts/sum.rb b/lib/sequencer/unit/import/exchange/folder_contacts/sum.rb
new file mode 100644
index 000000000..1f73d01d4
--- /dev/null
+++ b/lib/sequencer/unit/import/exchange/folder_contacts/sum.rb
@@ -0,0 +1,48 @@
+require 'sequencer/mixin/exchange/folder'
+
+class Sequencer
+  class Unit
+    module Import
+      module Exchange
+        module FolderContacts
+          class Sum < Sequencer::Unit::Base
+            include ::Sequencer::Mixin::Exchange::Folder
+
+            uses :ews_folder_ids
+            provides :statistics_diff
+
+            def process
+              state.provide(:statistics_diff, diff)
+            end
+
+            private
+
+            def diff
+              result = {
+                sum: 0,
+              }
+              folder_sum_map.each do |display_path, sum|
+
+                result[display_path] = {
+                  sum: sum
+                }
+
+                result[:sum] += sum
+              end
+              result
+            end
+
+            def folder_sum_map
+              ews_folder_ids.collect do |folder_id|
+                folder       = ews_folder.find(folder_id)
+                display_path = ews_folder.display_path(folder)
+
+                [display_path, folder.total_count]
+              end.to_h
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/unit/mixin/dynamic_attribute.rb b/lib/sequencer/unit/mixin/dynamic_attribute.rb
new file mode 100644
index 000000000..e37012d90
--- /dev/null
+++ b/lib/sequencer/unit/mixin/dynamic_attribute.rb
@@ -0,0 +1,35 @@
+# rubocop:disable Lint/NestedMethodDefinition
+class Sequencer
+  class Unit
+    module Mixin
+      module DynamicAttribute
+
+        def self.included(base)
+
+          class << base
+
+            def inherited(base)
+              base.extend(Forwardable)
+              base.instance_delegate [:attribute] => base
+            end
+
+            def attribute
+              @attribute ||= begin
+                if uses.size != 1
+                  raise "DynamicAttribute classes can use exactly one attribute. Found #{uses.size}."
+                end
+                uses.first
+              end
+            end
+          end
+        end
+
+        private
+
+        def attribute_value
+          @attribute_value ||= state.use(attribute)
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/units.rb b/lib/sequencer/units.rb
new file mode 100644
index 000000000..e926ead87
--- /dev/null
+++ b/lib/sequencer/units.rb
@@ -0,0 +1,70 @@
+require 'mixin/instance_wrapper'
+
+class Sequencer
+  class Units
+    include ::Enumerable
+    include ::Mixin::InstanceWrapper
+
+    wrap :@units
+
+    # Initializes a new Sequencer::Units instance with the given Units Array.
+    #
+    # @param [*Array] *units a list of Units with or without the Sequencer::Unit prefix.
+    #
+    # @example
+    #  Sequencer::Units.new('Example::Unit', 'Sequencer::Unit::Second::Unit')
+    def initialize(*units)
+      @units = units
+    end
+
+    # Required #each implementation for ::Enumerable functionality. Constantizes
+    # the list of units given when initialized.
+    #
+    # @example
+    #  units.each do |unit|
+    #    unit.process(sequencer)
+    #  end
+    #
+    # @return [nil]
+    def each
+      @units.each do |unit|
+        yield constantize(unit)
+      end
+    end
+
+    # Provides an Array of :uses and :provides declarations for each Unit.
+    #
+    # @example
+    #  units.declarations
+    #  #=> [{uses: [:question], provides: [:answer], ...}]
+    #
+    # @return [Array Array}>] the declarations of the Units
+    def declarations
+      collect do |unit|
+        {
+          uses:     unit.uses,
+          provides: unit.provides,
+        }
+      end
+    end
+
+    # Enables the access to an Unit class via index.
+    #
+    # @param [Integer] index the index for the requested Unit class.
+    #
+    # @example
+    #  units[1]
+    #  #=> Sequencer::Unit::Example
+    #
+    # @return [Object] the Unit class for the requested index
+    def [](index)
+      constantize(@units[index])
+    end
+
+    private
+
+    def constantize(unit)
+      Sequencer::Unit.constantize(unit)
+    end
+  end
+end
diff --git a/lib/sequencer/units/attribute.rb b/lib/sequencer/units/attribute.rb
new file mode 100644
index 000000000..3e716bb2b
--- /dev/null
+++ b/lib/sequencer/units/attribute.rb
@@ -0,0 +1,30 @@
+class Sequencer
+  class Units
+    class Attribute
+
+      attr_accessor :from, :to
+
+      # Checks if the attribute will be provided by one or more Units.
+      #
+      # @example
+      #  attribute.will_be_provided?
+      #  # => true
+      #
+      # @return [Boolean]
+      def will_be_provided?
+        !from.nil?
+      end
+
+      # Checks if the attribute will be used by one or more Units.
+      #
+      # @example
+      #  attribute.will_be_used?
+      #  # => true
+      #
+      # @return [Boolean]
+      def will_be_used?
+        !to.nil?
+      end
+    end
+  end
+end
diff --git a/lib/sequencer/units/attributes.rb b/lib/sequencer/units/attributes.rb
new file mode 100644
index 000000000..f9d47aa29
--- /dev/null
+++ b/lib/sequencer/units/attributes.rb
@@ -0,0 +1,87 @@
+require 'mixin/instance_wrapper'
+
+class Sequencer
+  class Units
+    class Attributes
+      include ::Mixin::InstanceWrapper
+
+      wrap :@attributes
+
+      # Initializes the lifespan store for the attributes
+      # of the given Units declarations.
+      #
+      # @param [Array Array<:Symbol>}>] declarations the list of Unit declarations.
+      #
+      # @example
+      #  declarations = [{uses: [:attribute1, ...], provides: [:result], ...}]
+      #  attributes = Sequencer::Units::Attributes(declarations)
+      #
+      # @return [nil]
+      def initialize(declarations)
+        @declarations = declarations
+
+        initialize_attributes
+        initialize_lifespan
+      end
+
+      # Lists all `provides` declarations of the Units the instance was initialized with.
+      #
+      # @example
+      #  attributes.provided
+      #  # => [:result, ...]
+      #
+      # @return [Array] the list of all `provides` declarations
+      def provided
+        select do |_attribute, instance|
+          instance.will_be_provided?
+        end.keys
+      end
+
+      # Lists all `uses` declarations of the Units the instance was initialized with.
+      #
+      # @example
+      #  attributes.used
+      #  # => [:attribute1, ...]
+      #
+      # @return [Array] the list of all `uses` declarations
+      def used
+        select do |_attribute, instance|
+          instance.will_be_used?
+        end.keys
+      end
+
+      # Checks if the given attribute is known in the list of Unit declarations.
+      #
+      # @example
+      #  attributes.known?(:attribute2)
+      #  # => false
+      #
+      # @return [Boolean]
+      def known?(attribute)
+        key?(attribute)
+      end
+
+      private
+
+      def initialize_attributes
+        @attributes = Hash.new do |hash, key|
+          hash[key] = Sequencer::Units::Attribute.new
+        end
+      end
+
+      def initialize_lifespan
+        @declarations.each_with_index do |unit, index|
+
+          unit[:uses].try(:each) do |attribute|
+            self[attribute].to = index
+          end
+
+          unit[:provides].try(:each) do |attribute|
+            next if self[attribute].will_be_provided?
+            self[attribute].from = index
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sessions.rb b/lib/sessions.rb
index 929213bff..c6e3d4435 100644
--- a/lib/sessions.rb
+++ b/lib/sessions.rb
@@ -5,7 +5,7 @@ module Sessions
 
   # get application root directory
   @root = Dir.pwd.to_s
-  if !@root || @root.empty? || @root == '/'
+  if @root.blank? || @root == '/'
     @root = Rails.root
   end
 
@@ -379,8 +379,8 @@ broadcase also not to sender
       next if !session
 
       if recipient != 'public'
-        next if !session[:user]
-        next if !session[:user]['id']
+        next if session[:user].blank?
+        next if session[:user]['id'].blank?
       end
 
       if sender_user_id
diff --git a/lib/stats/ticket_reopen.rb b/lib/stats/ticket_reopen.rb
index 38b3afacc..360d549d4 100644
--- a/lib/stats/ticket_reopen.rb
+++ b/lib/stats/ticket_reopen.rb
@@ -66,6 +66,7 @@ class Stats::TicketReopen
   def self.log(object, o_id, changes, updated_by_id)
     return if object != 'Ticket'
     ticket = Ticket.lookup(id: o_id)
+    return if !ticket
 
     # check if close_at is already set / if not, ticket is not reopend
     return if !ticket.close_at
diff --git a/lib/tweet_base.rb b/lib/tweet_base.rb
index 4d236f0be..8e67c0ac1 100644
--- a/lib/tweet_base.rb
+++ b/lib/tweet_base.rb
@@ -371,6 +371,10 @@ class TweetBase
     preferences.each { |_key, value|
       next if value.class != ActiveSupport::HashWithIndifferentAccess && value.class != Hash
       value.each { |sub_key, sub_level|
+        if sub_level.class == NilClass
+          value[sub_key] = nil
+          next
+        end
         if sub_level.class == Twitter::Place
           value[sub_key] = sub_level.attrs
           next
diff --git a/lib/user_agent.rb b/lib/user_agent.rb
index 1f835840a..620fb04c4 100644
--- a/lib/user_agent.rb
+++ b/lib/user_agent.rb
@@ -264,7 +264,10 @@ returns
   def self.get_http(uri, options)
 
     proxy = options['proxy'] || Setting.get('proxy')
-    if proxy.present?
+    proxy_no = options['proxy_no'] || Setting.get('proxy_no') || ''
+    proxy_no = proxy_no.split(',').map(&:strip) || []
+    proxy_no.push('localhost', '127.0.0.1', '::1')
+    if proxy.present? && !proxy_no.include?(uri.host.downcase)
       if proxy =~ /^(.+?):(.+?)$/
         proxy_host = $1
         proxy_port = $2
diff --git a/public/assets/chat/chat.coffee b/public/assets/chat/chat.coffee
index 94a5b00ef..23b008a31 100644
--- a/public/assets/chat/chat.coffee
+++ b/public/assets/chat/chat.coffee
@@ -159,7 +159,7 @@ do($ = window.jQuery, window) ->
       buttonClass: 'open-zammad-chat'
       inactiveClass: 'is-inactive'
       title: 'Chat with us!'
-      scrollHint: 'Scrolle nach unten um neue Nachrichten zu sehen'
+      scrollHint: 'Scroll down to see new messages'
       idleTimeout: 6
       idleTimeoutIntervallCheck: 0.5
       inactiveTimeout: 8
@@ -184,7 +184,6 @@ do($ = window.jQuery, window) ->
         'Chat with us!': 'Chatte mit uns!'
         'Scroll down to see new messages': 'Scrolle nach unten um neue Nachrichten zu sehen'
         'Online': 'Online'
-        'Online': 'Online'
         'Offline': 'Offline'
         'Connecting': 'Verbinden'
         'Connection re-established': 'Verbindung wiederhergestellt'
@@ -197,11 +196,26 @@ do($ = window.jQuery, window) ->
         'Since you didn\'t respond in the last %s minutes your conversation with %s got closed.': 'Da Sie in den letzten %s Minuten nichts geschrieben haben wurde Ihre Konversation mit %s geschlossen.'
         'Since you didn\'t respond in the last %s minutes your conversation got closed.': 'Da Sie in den letzten %s Minuten nichts geschrieben haben wurde Ihre Konversation geschlossen.'
         'We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!': 'Es tut uns leid, es dauert länger als erwartet, um einen freien Platz zu erhalten. Bitte versuchen Sie es zu einem späteren Zeitpunkt noch einmal oder schicken Sie uns eine E-Mail. Vielen Dank!'
+      'es':
+        'Chat with us!': 'Chatee con nosotros!'
+        'Scroll down to see new messages': 'Haga scroll hacia abajo para ver nuevos mensajes'
+        'Online': 'En linea'
+        'Offline': 'Desconectado'
+        'Connecting': 'Conectando'
+        'Connection re-established': 'Conexión restablecida'
+        'Today': 'Hoy'
+        'Send': 'Enviar'
+        'Compose your message...': 'Escriba su mensaje...'
+        'All colleagues are busy.': 'Todos los agentes están ocupados.'
+        'You are on waiting list position %s.': 'Usted está en la posición %s de la lista de espera.'
+        'Start new conversation': 'Iniciar nueva conversación'
+        'Since you didn\'t respond in the last %s minutes your conversation with %s got closed.': 'Puesto que usted no respondió en los últimos %s minutos su conversación con %s se ha cerrado.'
+        'Since you didn\'t respond in the last %s minutes your conversation got closed.': 'Puesto que usted no respondió en los últimos %s minutos su conversación se ha cerrado.'
+        'We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!': 'Lo sentimos, se tarda más tiempo de lo esperado para ser atendido por un agente. Inténtelo de nuevo más tarde o envíenos un correo electrónico. ¡Gracias!'
       'fr':
         'Chat with us!': 'Chattez avec nous!'
         'Scroll down to see new messages': 'Faites défiler pour lire les nouveaux messages'
         'Online': 'En-ligne'
-        'Online': 'En-ligne'
         'Offline': 'Hors-ligne'
         'Connecting': 'Connexion en cours'
         'Connection re-established': 'Connexion rétablie'
@@ -218,7 +232,6 @@ do($ = window.jQuery, window) ->
         'Chat with us!': '发起即时对话!'
         'Scroll down to see new messages': '向下滚动以查看新消息'
         'Online': '在线'
-        'Online': '在线'
         'Offline': '离线'
         'Connecting': '连接中'
         'Connection re-established': '正在重新建立连接'
@@ -235,7 +248,6 @@ do($ = window.jQuery, window) ->
         'Chat with us!': '開始即時對话!'
         'Scroll down to see new messages': '向下滑動以查看新訊息'
         'Online': '線上'
-        'Online': '線上'
         'Offline': '离线'
         'Connecting': '連線中'
         'Connection re-established': '正在重新建立連線中'
@@ -251,6 +263,11 @@ do($ = window.jQuery, window) ->
     sessionId: undefined
     scrolledToBottom: true
     scrollSnapTolerance: 10
+    richTextFormatKey:
+      66: true # b
+      73: true # i
+      85: true # u
+      83: true # s
 
     T: (string, items...) =>
       if @options.lang && @options.lang isnt 'en'
@@ -367,9 +384,211 @@ do($ = window.jQuery, window) ->
       @el.find('.zammad-chat-controls').on 'submit', @onSubmit
       @el.find('.zammad-chat-body').on 'scroll', @detectScrolledtoBottom
       @el.find('.zammad-scroll-hint').click @onScrollHintClick
-      @input.on
+      @input.on(
         keydown: @checkForEnter
         input: @onInput
+      )
+      @input.on('keydown', (e) =>
+        richtTextControl = false
+        if !e.altKey && !e.ctrlKey && e.metaKey
+          richtTextControl = true
+        else if !e.altKey && e.ctrlKey && !e.metaKey
+          richtTextControl = true
+
+        if richtTextControl && @richTextFormatKey[ e.keyCode ]
+          e.preventDefault()
+          if e.keyCode is 66
+            document.execCommand('bold')
+            return true
+          if e.keyCode is 73
+            document.execCommand('italic')
+            return true
+          if e.keyCode is 85
+            document.execCommand('underline')
+            return true
+          if e.keyCode is 83
+            document.execCommand('strikeThrough')
+            return true
+      )
+      @input.on('paste', (e) =>
+        e.stopPropagation()
+        e.preventDefault()
+
+        clipboardData
+        if e.clipboardData
+          clipboardData = e.clipboardData
+        else if window.clipboardData
+          clipboardData = window.clipboardData
+        else if e.originalEvent.clipboardData
+          clipboardData = e.originalEvent.clipboardData
+        else
+          throw 'No clipboardData support'
+
+        imageInserted = false
+        if clipboardData && clipboardData.items && clipboardData.items[0]
+          item = clipboardData.items[0]
+          if item.kind == 'file' && (item.type == 'image/png' || item.type == 'image/jpeg')
+            imageFile = item.getAsFile()
+            reader = new FileReader()
+
+            reader.onload = (e) =>
+              result = e.target.result
+              img = document.createElement('img')
+              img.src = result
+
+              insert = (dataUrl, width, height, isRetina) =>
+
+                # adapt image if we are on retina devices
+                if @isRetina()
+                  width = width / 2
+                  height = height / 2
+                result = dataUrl
+                img = ""
+                document.execCommand('insertHTML', false, img)
+
+              # resize if to big
+              @resizeImage(img.src, 460, 'auto', 2, 'image/jpeg', 'auto', insert)
+
+            reader.readAsDataURL(imageFile)
+            imageInserted = true
+
+        return if imageInserted
+
+        # check existing + paste text for limit
+        text = undefined
+        docType = undefined
+        try
+          text = clipboardData.getData('text/html')
+          docType = 'html'
+          if !text || text.length is 0
+            docType = 'text'
+            text = clipboardData.getData('text/plain')
+          if !text || text.length is 0
+            docType = 'text2'
+            text = clipboardData.getData('text')
+        catch e
+          console.log('Sorry, can\'t insert markup because browser is not supporting it.')
+          docType = 'text3'
+          text = clipboardData.getData('text')
+
+        if docType is 'text' || docType is 'text2' || docType is 'text3'
+          text = '
    ' + text.replace(/\n/g, '
    ') + '
    '
+          text = text.replace(/
    <\/div>/g, '

    ')
+        console.log('p', docType, text)
+        if docType is 'html'
+          html = $("
    #{text}
    ")
+          match = false
+          htmlTmp = text
+          regex = new RegExp('<(/w|w)\:[A-Za-z]')
+          if htmlTmp.match(regex)
+            match = true
+            htmlTmp = htmlTmp.replace(regex, '')
+          regex = new RegExp('<(/o|o)\:[A-Za-z]')
+          if htmlTmp.match(regex)
+            match = true
+            htmlTmp = htmlTmp.replace(regex, '')
+          if match
+            html = @wordFilter(html)
+          #html
+
+          html = $(html)
+
+          html.contents().each( ->
+            if @nodeType == 8
+              $(@).remove()
+          )
+
+          # remove tags, keep content
+          html.find('a, font, small, time, form, label').replaceWith( ->
+            $(@).contents()
+          )
+
+          # replace tags with generic div
+          # New type of the tag
+          replacementTag = 'div';
+
+          # Replace all x tags with the type of replacementTag
+          html.find('textarea').each( ->
+            outer = @outerHTML
+
+            # Replace opening tag
+            regex = new RegExp('<' + @tagName, 'i')
+            newTag = outer.replace(regex, '<' + replacementTag)
+
+            # Replace closing tag
+            regex = new RegExp('
+        e.stopPropagation()
+        e.preventDefault()
+
+        dataTransfer
+        if window.dataTransfer # ie
+          dataTransfer = window.dataTransfer
+        else if e.originalEvent.dataTransfer # other browsers
+          dataTransfer = e.originalEvent.dataTransfer
+        else
+          throw 'No clipboardData support'
+
+        x = e.clientX
+        y = e.clientY
+        file = dataTransfer.files[0]
+
+        # look for images
+        if file.type.match('image.*')
+          reader = new FileReader()
+          reader.onload = (e) =>
+            result = e.target.result
+            img = document.createElement('img')
+            img.src = result
+
+            # Insert the image at the carat
+            insert = (dataUrl, width, height, isRetina) =>
+
+              # adapt image if we are on retina devices
+              if @isRetina()
+                width = width / 2
+                height = height / 2
+
+              result = dataUrl
+              img = $("")
+              img = img.get(0)
+
+              if document.caretPositionFromPoint
+                pos = document.caretPositionFromPoint(x, y)
+                range = document.createRange()
+                range.setStart(pos.offsetNode, pos.offset)
+                range.collapse()
+                range.insertNode(img)
+              else if document.caretRangeFromPoint
+                range = document.caretRangeFromPoint(x, y)
+                range.insertNode(img)
+              else
+                console.log('could not find carat')
+
+            # resize if to big
+            @resizeImage(img.src, 460, 'auto', 2, 'image/jpeg', 'auto', insert)
+          reader.readAsDataURL(file)
+      )
+
       $(window).on('beforeunload', =>
         @onLeaveTemporary()
       )
@@ -471,7 +690,7 @@ do($ = window.jQuery, window) ->
             from: if message.created_by_id then 'agent' else 'customer'
 
         if unfinishedMessage
-          @input.val unfinishedMessage
+          @input.html(unfinishedMessage)
 
       # show wait list
       if data.position
@@ -489,7 +708,7 @@ do($ = window.jQuery, window) ->
       @el.find('.zammad-chat-message--unread')
         .removeClass 'zammad-chat-message--unread'
 
-      sessionStorage.setItem 'unfinished_message', @input.val()
+      sessionStorage.setItem 'unfinished_message', @input.html()
 
       @onTyping()
 
@@ -520,7 +739,7 @@ do($ = window.jQuery, window) ->
       @sendMessage()
 
     sendMessage: ->
-      message = @input.val()
+      message = @input.html()
       return if !message
 
       @inactiveTimeout.start()
@@ -536,14 +755,14 @@ do($ = window.jQuery, window) ->
       @maybeAddTimestamp()
 
       # add message before message typing loader
-      if @el.find('.zammad-chat-message--typing').size()
+      if @el.find('.zammad-chat-message--typing').get(0)
         @lastAddedType = 'typing-placeholder'
         @el.find('.zammad-chat-message--typing').before messageElement
       else
         @lastAddedType = 'message--customer'
         @el.find('.zammad-chat-body').append messageElement
 
-      @input.val('')
+      @input.html('')
       @scrollToBottom()
 
       # send message event
@@ -585,11 +804,6 @@ do($ = window.jQuery, window) ->
 
       @el.addClass('zammad-chat-is-open')
 
-      if !@inputInitialized
-        @inputInitialized = true
-        @input.autoGrow
-          extraLine: false
-
       remainerHeight = @el.height() - @el.find('.zammad-chat-header').outerHeight()
 
       @el.css 'bottom', -remainerHeight
@@ -725,7 +939,7 @@ do($ = window.jQuery, window) ->
       @stopTypingId = setTimeout(@onAgentTypingEnd, 3000)
 
       # never display two typing indicators
-      return if @el.find('.zammad-chat-message--typing').size()
+      return if @el.find('.zammad-chat-message--typing').get(0)
 
       @maybeAddTimestamp()
 
@@ -1032,4 +1246,204 @@ do($ = window.jQuery, window) ->
         else if direction is 'horizontal'
           return !!clientSize && ((compareRight <= viewRight) && (compareLeft >= viewLeft))
 
+    isRetina: ->
+      if window.matchMedia
+        mq = window.matchMedia('only screen and (min--moz-device-pixel-ratio: 1.3), only screen and (-o-min-device-pixel-ratio: 2.6/2), only screen and (-webkit-min-device-pixel-ratio: 1.3), only screen  and (min-device-pixel-ratio: 1.3), only screen and (min-resolution: 1.3dppx)')
+        return (mq && mq.matches || (window.devicePixelRatio > 1))
+      false
+
+    resizeImage: (dataURL, x = 'auto', y = 'auto', sizeFactor = 1, type, quallity, callback, force = true) ->
+
+      # load image from data url
+      imageObject = new Image()
+      imageObject.onload = ->
+        imageWidth  = imageObject.width
+        imageHeight = imageObject.height
+        console.log('ImageService', 'current size', imageWidth, imageHeight)
+        if y is 'auto' && x is 'auto'
+          x = imageWidth
+          y = imageHeight
+
+        # get auto dimensions
+        if y is 'auto'
+          factor = imageWidth / x
+          y = imageHeight / factor
+
+        if x is 'auto'
+          factor = imageWidth / y
+          x = imageHeight / factor
+
+        # check if resize is needed
+        resize = false
+        if x < imageWidth || y < imageHeight
+          resize = true
+          x = x * sizeFactor
+          y = y * sizeFactor
+        else
+          x = imageWidth
+          y = imageHeight
+
+        # create canvas and set dimensions
+        canvas        = document.createElement('canvas')
+        canvas.width  = x
+        canvas.height = y
+
+        # draw image on canvas and set image dimensions
+        context = canvas.getContext('2d')
+        context.drawImage(imageObject, 0, 0, x, y)
+
+        # set quallity based on image size
+        if quallity == 'auto'
+          if x < 200 && y < 200
+            quallity = 1
+          else if x < 400 && y < 400
+            quallity = 0.9
+          else if x < 600 && y < 600
+            quallity = 0.8
+          else if x < 900 && y < 900
+            quallity = 0.7
+          else
+            quallity = 0.6
+
+        # execute callback with resized image
+        newDataUrl = canvas.toDataURL(type, quallity)
+        if resize
+          console.log('ImageService', 'resize', x/sizeFactor, y/sizeFactor, quallity, (newDataUrl.length * 0.75)/1024/1024, 'in mb')
+          callback(newDataUrl, x/sizeFactor, y/sizeFactor, true)
+          return
+        console.log('ImageService', 'no resize', x, y, quallity, (newDataUrl.length * 0.75)/1024/1024, 'in mb')
+        callback(newDataUrl, x, y, false)
+
+      # load image from data url
+      imageObject.src = dataURL
+
+    # taken from https://stackoverflow.com/questions/6690752/insert-html-at-caret-in-a-contenteditable-div/6691294#6691294
+    pasteHtmlAtCaret: (html) ->
+      sel = undefined
+      range = undefined
+      if window.getSelection
+        sel = window.getSelection()
+        if sel.getRangeAt && sel.rangeCount
+          range = sel.getRangeAt(0)
+          range.deleteContents()
+
+          el = document.createElement('div')
+          el.innerHTML = html
+          frag = document.createDocumentFragment(node, lastNode)
+          while node = el.firstChild
+            lastNode = frag.appendChild(node)
+          range.insertNode(frag)
+
+          if lastNode
+            range = range.cloneRange()
+            range.setStartAfter(lastNode)
+            range.collapse(true)
+            sel.removeAllRanges()
+            sel.addRange(range)
+      else if document.selection && document.selection.type != 'Control'
+        document.selection.createRange().pasteHTML(html)
+
+    # (C) sbrin - https://github.com/sbrin
+    # https://gist.github.com/sbrin/6801034
+    wordFilter: (editor) ->
+      content = editor.html()
+
+      # Word comments like conditional comments etc
+      content = content.replace(//gi, '')
+
+      # Remove comments, scripts (e.g., msoShowComment), XML tag, VML content,
+      # MS Office namespaced tags, and a few other tags
+      content = content.replace(/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi, '')
+
+      # Convert  into  for line-though
+      content = content.replace(/<(\/?)s>/gi, '<$1strike>')
+
+      # Replace nbsp entites to char since it's easier to handle
+      # content = content.replace(/ /gi, "\u00a0")
+      content = content.replace(/ /gi, ' ')
+
+      # Convert ___ to string of alternating
+      # breaking/non-breaking spaces of same length
+      #content = content.replace(/([\s\u00a0]*)<\/span>/gi, (str, spaces) ->
+      #  return (spaces.length > 0) ? spaces.replace(/./, " ").slice(Math.floor(spaces.length/2)).split("").join("\u00a0") : ''
+      #)
+
+      editor.html(content)
+
+      # Parse out list indent level for lists
+      $('p', editor).each( ->
+        str = $(@).attr('style')
+        matches = /mso-list:\w+ \w+([0-9]+)/.exec(str)
+        if matches
+          $(@).data('_listLevel',  parseInt(matches[1], 10))
+      )
+
+      # Parse Lists
+      last_level = 0
+      pnt = null
+      $('p', editor).each(->
+        cur_level = $(@).data('_listLevel')
+        if cur_level != undefined
+          txt = $(@).text()
+          list_tag = '
      '
+          if (/^\s*\w+\./.test(txt))
+            matches = /([0-9])\./.exec(txt)
+            if matches
+              start = parseInt(matches[1], 10)
+              list_tag = start>1 ? '
        ' : '
          '
+            else
+              list_tag = '
            '
+
+          if cur_level > last_level
+            if last_level == 0
+              $(@).before(list_tag)
+              pnt = $(@).prev()
+            else
+              pnt = $(list_tag).appendTo(pnt)
+
+          if cur_level < last_level
+            for i in [i..last_level-cur_level]
+              pnt = pnt.parent()
+
+          $('span:first', @).remove()
+          pnt.append('
          1. ' + $(@).html() + '
            2. ')
+          $(@).remove()
+          last_level = cur_level
+        else
+          last_level = 0
+      )
+
+      $('[style]', editor).removeAttr('style')
+      $('[align]', editor).removeAttr('align')
+      $('span', editor).replaceWith(->
+        $(@).contents()
+      )
+      $('span:empty', editor).remove()
+      $("[class^='Mso']", editor).removeAttr('class')
+      $('p:empty', editor).remove()
+      editor
+
+    removeAttribute: (element) ->
+      return if !element
+      $element = $(element)
+      for att in element.attributes
+        if att && att.name
+          element.removeAttribute(att.name)
+          #$element.removeAttr(att.name)
+
+      $element.removeAttr('style')
+        .removeAttr('class')
+        .removeAttr('lang')
+        .removeAttr('type')
+        .removeAttr('align')
+        .removeAttr('id')
+        .removeAttr('wrap')
+        .removeAttr('title')
+
+    removeAttributes: (html, parent = true) =>
+      if parent
+        html.each((index, element) => @removeAttribute(element) )
+      html.find('*').each((index, element) => @removeAttribute(element) )
+      html
+
   window.ZammadChat = ZammadChat
diff --git a/public/assets/chat/chat.css b/public/assets/chat/chat.css
index 451ca8b09..255fa5b7a 100644
--- a/public/assets/chat/chat.css
+++ b/public/assets/chat/chat.css
@@ -320,9 +320,9 @@
 .zammad-chat-controls {
   overflow: hidden;
   display: none;
-  -webkit-align-items: flex-start;
-  -ms-flex-align: start;
-  align-items: flex-start;
+  -webkit-align-items: flex-end;
+  -ms-flex-align: end;
+  align-items: flex-end;
   border-top: 1px solid #ededed;
   padding: 0;
   margin: 0;
@@ -340,25 +340,23 @@
   margin: 0;
   padding: 1em 2em;
   float: left;
-  width: auto;
-  height: auto;
   max-height: 6em;
-  min-height: 1.4em !important;
+  min-height: 1.4em;
   font-family: inherit;
   line-height: 1.4em;
   font-size: inherit;
   -webkit-appearance: none;
   -moz-appearance: none;
   appearance: none;
-  border: none !important;
+  border: none;
   background: none;
-  box-shadow: none !important;
+  box-shadow: none;
   box-sizing: content-box;
   outline: none;
-  resize: none;
   -webkit-flex: 1;
   -ms-flex: 1;
-  flex: 1; }
+  flex: 1;
+  overflow: auto; }
 
 .zammad-chat-input::-webkit-input-placeholder {
   color: #d9d9d9; }
@@ -373,7 +371,7 @@
   background: #379ad7;
   color: white;
   padding: 0.5em 1.2em;
-  margin: 0.5em 1em 0.5em;
+  margin: 0.63em 1em;
   cursor: pointer;
   border: none;
   border-radius: 1.5em;
diff --git a/public/assets/chat/chat.js b/public/assets/chat/chat.js
index 480f5a78d..6183a6f63 100644
--- a/public/assets/chat/chat.js
+++ b/public/assets/chat/chat.js
@@ -121,7 +121,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
     };
 
     Log.prototype.log = function(level, items) {
-      var i, item, len, logString;
+      var item, j, len, logString;
       items.unshift('||');
       items.unshift(level);
       items.unshift(this.options.logPrefix);
@@ -130,8 +130,8 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
         return;
       }
       logString = '';
-      for (i = 0, len = items.length; i < len; i++) {
-        item = items[i];
+      for (j = 0, len = items.length; j < len; j++) {
+        item = items[j];
         logString += ' ';
         if (typeof item === 'object') {
           logString += JSON.stringify(item);
@@ -234,11 +234,11 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
       })(this);
       this.ws.onmessage = (function(_this) {
         return function(e) {
-          var i, len, pipe, pipes;
+          var j, len, pipe, pipes;
           pipes = JSON.parse(e.data);
           _this.log.debug('onMessage', e.data);
-          for (i = 0, len = pipes.length; i < len; i++) {
-            pipe = pipes[i];
+          for (j = 0, len = pipes.length; j < len; j++) {
+            pipe = pipes[j];
             if (pipe.event === 'pong') {
               _this.ping();
             }
@@ -333,7 +333,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
       buttonClass: 'open-zammad-chat',
       inactiveClass: 'is-inactive',
       title: 'Chat with us!',
-      scrollHint: 'Scrolle nach unten um neue Nachrichten zu sehen',
+      scrollHint: 'Scroll down to see new messages',
       idleTimeout: 6,
       idleTimeoutIntervallCheck: 0.5,
       inactiveTimeout: 8,
@@ -371,7 +371,6 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
         'Chat with us!': 'Chatte mit uns!',
         'Scroll down to see new messages': 'Scrolle nach unten um neue Nachrichten zu sehen',
         'Online': 'Online',
-        'Online': 'Online',
         'Offline': 'Offline',
         'Connecting': 'Verbinden',
         'Connection re-established': 'Verbindung wiederhergestellt',
@@ -385,11 +384,27 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
         'Since you didn\'t respond in the last %s minutes your conversation got closed.': 'Da Sie in den letzten %s Minuten nichts geschrieben haben wurde Ihre Konversation geschlossen.',
         'We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!': 'Es tut uns leid, es dauert länger als erwartet, um einen freien Platz zu erhalten. Bitte versuchen Sie es zu einem späteren Zeitpunkt noch einmal oder schicken Sie uns eine E-Mail. Vielen Dank!'
       },
+      'es': {
+        'Chat with us!': 'Chatee con nosotros!',
+        'Scroll down to see new messages': 'Haga scroll hacia abajo para ver nuevos mensajes',
+        'Online': 'En linea',
+        'Offline': 'Desconectado',
+        'Connecting': 'Conectando',
+        'Connection re-established': 'Conexión restablecida',
+        'Today': 'Hoy',
+        'Send': 'Enviar',
+        'Compose your message...': 'Escriba su mensaje...',
+        'All colleagues are busy.': 'Todos los agentes están ocupados.',
+        'You are on waiting list position %s.': 'Usted está en la posición %s de la lista de espera.',
+        'Start new conversation': 'Iniciar nueva conversación',
+        'Since you didn\'t respond in the last %s minutes your conversation with %s got closed.': 'Puesto que usted no respondió en los últimos %s minutos su conversación con %s se ha cerrado.',
+        'Since you didn\'t respond in the last %s minutes your conversation got closed.': 'Puesto que usted no respondió en los últimos %s minutos su conversación se ha cerrado.',
+        'We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!': 'Lo sentimos, se tarda más tiempo de lo esperado para ser atendido por un agente. Inténtelo de nuevo más tarde o envíenos un correo electrónico. ¡Gracias!'
+      },
       'fr': {
         'Chat with us!': 'Chattez avec nous!',
         'Scroll down to see new messages': 'Faites défiler pour lire les nouveaux messages',
         'Online': 'En-ligne',
-        'Online': 'En-ligne',
         'Offline': 'Hors-ligne',
         'Connecting': 'Connexion en cours',
         'Connection re-established': 'Connexion rétablie',
@@ -407,7 +422,6 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
         'Chat with us!': '发起即时对话!',
         'Scroll down to see new messages': '向下滚动以查看新消息',
         'Online': '在线',
-        'Online': '在线',
         'Offline': '离线',
         'Connecting': '连接中',
         'Connection re-established': '正在重新建立连接',
@@ -425,7 +439,6 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
         'Chat with us!': '開始即時對话!',
         'Scroll down to see new messages': '向下滑動以查看新訊息',
         'Online': '線上',
-        'Online': '線上',
         'Offline': '离线',
         'Connecting': '連線中',
         'Connection re-established': '正在重新建立連線中',
@@ -447,8 +460,15 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
 
     ZammadChat.prototype.scrollSnapTolerance = 10;
 
+    ZammadChat.prototype.richTextFormatKey = {
+      66: true,
+      73: true,
+      85: true,
+      83: true
+    };
+
     ZammadChat.prototype.T = function() {
-      var i, item, items, len, string, translations;
+      var item, items, j, len, string, translations;
       string = arguments[0], items = 2 <= arguments.length ? slice.call(arguments, 1) : [];
       if (this.options.lang && this.options.lang !== 'en') {
         if (!this.translations[this.options.lang]) {
@@ -462,8 +482,8 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
         }
       }
       if (items) {
-        for (i = 0, len = items.length; i < len; i++) {
-          item = items[i];
+        for (j = 0, len = items.length; j < len; j++) {
+          item = items[j];
           string = string.replace(/%s/, item);
         }
       }
@@ -486,6 +506,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
     };
 
     function ZammadChat(options) {
+      this.removeAttributes = bind(this.removeAttributes, this);
       this.startTimeoutObservers = bind(this.startTimeoutObservers, this);
       this.onCssLoaded = bind(this.onCssLoaded, this);
       this.setAgentOnlineState = bind(this.setAgentOnlineState, this);
@@ -613,6 +634,203 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
         keydown: this.checkForEnter,
         input: this.onInput
       });
+      this.input.on('keydown', (function(_this) {
+        return function(e) {
+          var richtTextControl;
+          richtTextControl = false;
+          if (!e.altKey && !e.ctrlKey && e.metaKey) {
+            richtTextControl = true;
+          } else if (!e.altKey && e.ctrlKey && !e.metaKey) {
+            richtTextControl = true;
+          }
+          if (richtTextControl && _this.richTextFormatKey[e.keyCode]) {
+            e.preventDefault();
+            if (e.keyCode === 66) {
+              document.execCommand('bold');
+              return true;
+            }
+            if (e.keyCode === 73) {
+              document.execCommand('italic');
+              return true;
+            }
+            if (e.keyCode === 85) {
+              document.execCommand('underline');
+              return true;
+            }
+            if (e.keyCode === 83) {
+              document.execCommand('strikeThrough');
+              return true;
+            }
+          }
+        };
+      })(this));
+      this.input.on('paste', (function(_this) {
+        return function(e) {
+          var clipboardData, docType, error, html, htmlTmp, imageFile, imageInserted, item, match, reader, regex, replacementTag, text;
+          e.stopPropagation();
+          e.preventDefault();
+          clipboardData;
+          if (e.clipboardData) {
+            clipboardData = e.clipboardData;
+          } else if (window.clipboardData) {
+            clipboardData = window.clipboardData;
+          } else if (e.originalEvent.clipboardData) {
+            clipboardData = e.originalEvent.clipboardData;
+          } else {
+            throw 'No clipboardData support';
+          }
+          imageInserted = false;
+          if (clipboardData && clipboardData.items && clipboardData.items[0]) {
+            item = clipboardData.items[0];
+            if (item.kind === 'file' && (item.type === 'image/png' || item.type === 'image/jpeg')) {
+              imageFile = item.getAsFile();
+              reader = new FileReader();
+              reader.onload = function(e) {
+                var img, insert, result;
+                result = e.target.result;
+                img = document.createElement('img');
+                img.src = result;
+                insert = function(dataUrl, width, height, isRetina) {
+                  if (_this.isRetina()) {
+                    width = width / 2;
+                    height = height / 2;
+                  }
+                  result = dataUrl;
+                  img = "";
+                  return document.execCommand('insertHTML', false, img);
+                };
+                return _this.resizeImage(img.src, 460, 'auto', 2, 'image/jpeg', 'auto', insert);
+              };
+              reader.readAsDataURL(imageFile);
+              imageInserted = true;
+            }
+          }
+          if (imageInserted) {
+            return;
+          }
+          text = void 0;
+          docType = void 0;
+          try {
+            text = clipboardData.getData('text/html');
+            docType = 'html';
+            if (!text || text.length === 0) {
+              docType = 'text';
+              text = clipboardData.getData('text/plain');
+            }
+            if (!text || text.length === 0) {
+              docType = 'text2';
+              text = clipboardData.getData('text');
+            }
+          } catch (error) {
+            e = error;
+            console.log('Sorry, can\'t insert markup because browser is not supporting it.');
+            docType = 'text3';
+            text = clipboardData.getData('text');
+          }
+          if (docType === 'text' || docType === 'text2' || docType === 'text3') {
+            text = '
            ' + text.replace(/\n/g, '
            ') + '
            ';
+            text = text.replace(/
            <\/div>/g, '

            ');
+          }
+          console.log('p', docType, text);
+          if (docType === 'html') {
+            html = $("
            " + text + "
            ");
+            match = false;
+            htmlTmp = text;
+            regex = new RegExp('<(/w|w)\:[A-Za-z]');
+            if (htmlTmp.match(regex)) {
+              match = true;
+              htmlTmp = htmlTmp.replace(regex, '');
+            }
+            regex = new RegExp('<(/o|o)\:[A-Za-z]');
+            if (htmlTmp.match(regex)) {
+              match = true;
+              htmlTmp = htmlTmp.replace(regex, '');
+            }
+            if (match) {
+              html = _this.wordFilter(html);
+            }
+            html = $(html);
+            html.contents().each(function() {
+              if (this.nodeType === 8) {
+                return $(this).remove();
+              }
+            });
+            html.find('a, font, small, time, form, label').replaceWith(function() {
+              return $(this).contents();
+            });
+            replacementTag = 'div';
+            html.find('textarea').each(function() {
+              var newTag, outer;
+              outer = this.outerHTML;
+              regex = new RegExp('<' + this.tagName, 'i');
+              newTag = outer.replace(regex, '<' + replacementTag);
+              regex = new RegExp('");
+                img = img.get(0);
+                if (document.caretPositionFromPoint) {
+                  pos = document.caretPositionFromPoint(x, y);
+                  range = document.createRange();
+                  range.setStart(pos.offsetNode, pos.offset);
+                  range.collapse();
+                  return range.insertNode(img);
+                } else if (document.caretRangeFromPoint) {
+                  range = document.caretRangeFromPoint(x, y);
+                  return range.insertNode(img);
+                } else {
+                  return console.log('could not find carat');
+                }
+              };
+              return _this.resizeImage(img.src, 460, 'auto', 2, 'image/jpeg', 'auto', insert);
+            };
+            return reader.readAsDataURL(file);
+          }
+        };
+      })(this));
       $(window).on('beforeunload', (function(_this) {
         return function() {
           return _this.onLeaveTemporary();
@@ -656,9 +874,9 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
     };
 
     ZammadChat.prototype.onWebSocketMessage = function(pipes) {
-      var i, len, pipe;
-      for (i = 0, len = pipes.length; i < len; i++) {
-        pipe = pipes[i];
+      var j, len, pipe;
+      for (j = 0, len = pipes.length; j < len; j++) {
+        pipe = pipes[j];
         this.log.debug('ws:onmessage', pipe);
         switch (pipe.event) {
           case 'chat_error':
@@ -744,15 +962,15 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
     };
 
     ZammadChat.prototype.onReopenSession = function(data) {
-      var i, len, message, ref, unfinishedMessage;
+      var j, len, message, ref, unfinishedMessage;
       this.log.debug('old messages', data.session);
       this.inactiveTimeout.start();
       unfinishedMessage = sessionStorage.getItem('unfinished_message');
       if (data.agent) {
         this.onConnectionEstablished(data);
         ref = data.session;
-        for (i = 0, len = ref.length; i < len; i++) {
-          message = ref[i];
+        for (j = 0, len = ref.length; j < len; j++) {
+          message = ref[j];
           this.renderMessage({
             message: message.content,
             id: message.id,
@@ -760,7 +978,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
           });
         }
         if (unfinishedMessage) {
-          this.input.val(unfinishedMessage);
+          this.input.html(unfinishedMessage);
         }
       }
       if (data.position) {
@@ -776,7 +994,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
 
     ZammadChat.prototype.onInput = function() {
       this.el.find('.zammad-chat-message--unread').removeClass('zammad-chat-message--unread');
-      sessionStorage.setItem('unfinished_message', this.input.val());
+      sessionStorage.setItem('unfinished_message', this.input.html());
       return this.onTyping();
     };
 
@@ -810,7 +1028,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
 
     ZammadChat.prototype.sendMessage = function() {
       var message, messageElement;
-      message = this.input.val();
+      message = this.input.html();
       if (!message) {
         return;
       }
@@ -823,14 +1041,14 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
         unreadClass: ''
       });
       this.maybeAddTimestamp();
-      if (this.el.find('.zammad-chat-message--typing').size()) {
+      if (this.el.find('.zammad-chat-message--typing').get(0)) {
         this.lastAddedType = 'typing-placeholder';
         this.el.find('.zammad-chat-message--typing').before(messageElement);
       } else {
         this.lastAddedType = 'message--customer';
         this.el.find('.zammad-chat-body').append(messageElement);
       }
-      this.input.val('');
+      this.input.html('');
       this.scrollToBottom();
       return this.send('chat_session_message', {
         content: message,
@@ -871,12 +1089,6 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
         this.showLoader();
       }
       this.el.addClass('zammad-chat-is-open');
-      if (!this.inputInitialized) {
-        this.inputInitialized = true;
-        this.input.autoGrow({
-          extraLine: false
-        });
-      }
       remainerHeight = this.el.height() - this.el.find('.zammad-chat-header').outerHeight();
       this.el.css('bottom', -remainerHeight);
       if (!this.sessionId) {
@@ -1022,7 +1234,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
         clearTimeout(this.stopTypingId);
       }
       this.stopTypingId = setTimeout(this.onAgentTypingEnd, 3000);
-      if (this.el.find('.zammad-chat-message--typing').size()) {
+      if (this.el.find('.zammad-chat-message--typing').get(0)) {
         return;
       }
       this.maybeAddTimestamp();
@@ -1389,104 +1601,223 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
       }
     };
 
+    ZammadChat.prototype.isRetina = function() {
+      var mq;
+      if (window.matchMedia) {
+        mq = window.matchMedia('only screen and (min--moz-device-pixel-ratio: 1.3), only screen and (-o-min-device-pixel-ratio: 2.6/2), only screen and (-webkit-min-device-pixel-ratio: 1.3), only screen  and (min-device-pixel-ratio: 1.3), only screen and (min-resolution: 1.3dppx)');
+        return mq && mq.matches || (window.devicePixelRatio > 1);
+      }
+      return false;
+    };
+
+    ZammadChat.prototype.resizeImage = function(dataURL, x, y, sizeFactor, type, quallity, callback, force) {
+      var imageObject;
+      if (x == null) {
+        x = 'auto';
+      }
+      if (y == null) {
+        y = 'auto';
+      }
+      if (sizeFactor == null) {
+        sizeFactor = 1;
+      }
+      if (force == null) {
+        force = true;
+      }
+      imageObject = new Image();
+      imageObject.onload = function() {
+        var canvas, context, factor, imageHeight, imageWidth, newDataUrl, resize;
+        imageWidth = imageObject.width;
+        imageHeight = imageObject.height;
+        console.log('ImageService', 'current size', imageWidth, imageHeight);
+        if (y === 'auto' && x === 'auto') {
+          x = imageWidth;
+          y = imageHeight;
+        }
+        if (y === 'auto') {
+          factor = imageWidth / x;
+          y = imageHeight / factor;
+        }
+        if (x === 'auto') {
+          factor = imageWidth / y;
+          x = imageHeight / factor;
+        }
+        resize = false;
+        if (x < imageWidth || y < imageHeight) {
+          resize = true;
+          x = x * sizeFactor;
+          y = y * sizeFactor;
+        } else {
+          x = imageWidth;
+          y = imageHeight;
+        }
+        canvas = document.createElement('canvas');
+        canvas.width = x;
+        canvas.height = y;
+        context = canvas.getContext('2d');
+        context.drawImage(imageObject, 0, 0, x, y);
+        if (quallity === 'auto') {
+          if (x < 200 && y < 200) {
+            quallity = 1;
+          } else if (x < 400 && y < 400) {
+            quallity = 0.9;
+          } else if (x < 600 && y < 600) {
+            quallity = 0.8;
+          } else if (x < 900 && y < 900) {
+            quallity = 0.7;
+          } else {
+            quallity = 0.6;
+          }
+        }
+        newDataUrl = canvas.toDataURL(type, quallity);
+        if (resize) {
+          console.log('ImageService', 'resize', x / sizeFactor, y / sizeFactor, quallity, (newDataUrl.length * 0.75) / 1024 / 1024, 'in mb');
+          callback(newDataUrl, x / sizeFactor, y / sizeFactor, true);
+          return;
+        }
+        console.log('ImageService', 'no resize', x, y, quallity, (newDataUrl.length * 0.75) / 1024 / 1024, 'in mb');
+        return callback(newDataUrl, x, y, false);
+      };
+      return imageObject.src = dataURL;
+    };
+
+    ZammadChat.prototype.pasteHtmlAtCaret = function(html) {
+      var el, frag, lastNode, node, range, sel;
+      sel = void 0;
+      range = void 0;
+      if (window.getSelection) {
+        sel = window.getSelection();
+        if (sel.getRangeAt && sel.rangeCount) {
+          range = sel.getRangeAt(0);
+          range.deleteContents();
+          el = document.createElement('div');
+          el.innerHTML = html;
+          frag = document.createDocumentFragment(node, lastNode);
+          while (node = el.firstChild) {
+            lastNode = frag.appendChild(node);
+          }
+          range.insertNode(frag);
+          if (lastNode) {
+            range = range.cloneRange();
+            range.setStartAfter(lastNode);
+            range.collapse(true);
+            sel.removeAllRanges();
+            return sel.addRange(range);
+          }
+        }
+      } else if (document.selection && document.selection.type !== 'Control') {
+        return document.selection.createRange().pasteHTML(html);
+      }
+    };
+
+    ZammadChat.prototype.wordFilter = function(editor) {
+      var content, last_level, pnt;
+      content = editor.html();
+      content = content.replace(//gi, '');
+      content = content.replace(/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi, '');
+      content = content.replace(/<(\/?)s>/gi, '<$1strike>');
+      content = content.replace(/ /gi, ' ');
+      editor.html(content);
+      $('p', editor).each(function() {
+        var matches, str;
+        str = $(this).attr('style');
+        matches = /mso-list:\w+ \w+([0-9]+)/.exec(str);
+        if (matches) {
+          return $(this).data('_listLevel', parseInt(matches[1], 10));
+        }
+      });
+      last_level = 0;
+      pnt = null;
+      $('p', editor).each(function() {
+        var cur_level, i, j, list_tag, matches, ref, ref1, ref2, start, txt;
+        cur_level = $(this).data('_listLevel');
+        if (cur_level !== void 0) {
+          txt = $(this).text();
+          list_tag = '
              ';
+          if (/^\s*\w+\./.test(txt)) {
+            matches = /([0-9])\./.exec(txt);
+            if (matches) {
+              start = parseInt(matches[1], 10);
+              list_tag = (ref = start > 1) != null ? ref : '
                ': '
                  '
+              };
+            } else {
+              list_tag = '
                    ';
+            }
+          }
+          if (cur_level > last_level) {
+            if (last_level === 0) {
+              $(this).before(list_tag);
+              pnt = $(this).prev();
+            } else {
+              pnt = $(list_tag).appendTo(pnt);
+            }
+          }
+          if (cur_level < last_level) {
+            for (i = j = ref1 = i, ref2 = last_level - cur_level; ref1 <= ref2 ? j <= ref2 : j >= ref2; i = ref1 <= ref2 ? ++j : --j) {
+              pnt = pnt.parent();
+            }
+          }
+          $('span:first', this).remove();
+          pnt.append('
                  1. ' + $(this).html() + '
                    2. ');
+          $(this).remove();
+          return last_level = cur_level;
+        } else {
+          return last_level = 0;
+        }
+      });
+      $('[style]', editor).removeAttr('style');
+      $('[align]', editor).removeAttr('align');
+      $('span', editor).replaceWith(function() {
+        return $(this).contents();
+      });
+      $('span:empty', editor).remove();
+      $("[class^='Mso']", editor).removeAttr('class');
+      $('p:empty', editor).remove();
+      return editor;
+    };
+
+    ZammadChat.prototype.removeAttribute = function(element) {
+      var $element, att, j, len, ref;
+      if (!element) {
+        return;
+      }
+      $element = $(element);
+      ref = element.attributes;
+      for (j = 0, len = ref.length; j < len; j++) {
+        att = ref[j];
+        if (att && att.name) {
+          element.removeAttribute(att.name);
+        }
+      }
+      return $element.removeAttr('style').removeAttr('class').removeAttr('lang').removeAttr('type').removeAttr('align').removeAttr('id').removeAttr('wrap').removeAttr('title');
+    };
+
+    ZammadChat.prototype.removeAttributes = function(html, parent) {
+      if (parent == null) {
+        parent = true;
+      }
+      if (parent) {
+        html.each((function(_this) {
+          return function(index, element) {
+            return _this.removeAttribute(element);
+          };
+        })(this));
+      }
+      html.find('*').each((function(_this) {
+        return function(index, element) {
+          return _this.removeAttribute(element);
+        };
+      })(this));
+      return html;
+    };
+
     return ZammadChat;
 
   })(Base);
   return window.ZammadChat = ZammadChat;
 })(window.jQuery, window);
 
-/*!
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- *  wrote this file. As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return. Jevin O. Sewaruth
- * ----------------------------------------------------------------------------
- *
- * Autogrow Textarea Plugin Version v3.0
- * http://www.technoreply.com/autogrow-textarea-plugin-3-0
- * 
- * THIS PLUGIN IS DELIVERD ON A PAY WHAT YOU WHANT BASIS. IF THE PLUGIN WAS USEFUL TO YOU, PLEASE CONSIDER BUYING THE PLUGIN HERE :
- * https://sites.fastspring.com/technoreply/instant/autogrowtextareaplugin
- *
- * Date: October 15, 2012
- *
- * Zammad modification: 
- *   - remove overflow:hidden when maximum height is reached
- *   - mirror box-sizing
- *
- */
-
-jQuery.fn.autoGrow = function(options) {
-  return this.each(function() {
-    var settings = jQuery.extend({
-      extraLine: true,
-    }, options);
-
-    var createMirror = function(textarea) {
-      jQuery(textarea).after('
                    ');
-      return jQuery(textarea).next('.autogrow-textarea-mirror')[0];
-    }
-
-    var sendContentToMirror = function (textarea) {
-      mirror.innerHTML = String(textarea.value)
-        .replace(/&/g, '&')
-        .replace(/"/g, '"')
-        .replace(/'/g, ''')
-        .replace(//g, '>')
-        .replace(/ /g, ' ')
-        .replace(/\n/g, '
                    ') +
-        (settings.extraLine? '.
                    .' : '')
-      ;
-
-      if (jQuery(textarea).height() != jQuery(mirror).height()) {
-        jQuery(textarea).height(jQuery(mirror).height());
-
-        var overflow = jQuery(mirror).height() > maxHeight ? '' : 'hidden';
-        jQuery(textarea).css('overflow', overflow);
-      }
-    }
-
-    var growTextarea = function () {
-      sendContentToMirror(this);
-    }
-
-    // Create a mirror
-    var mirror = createMirror(this);
-
-    // Store max-height
-    var maxHeight = parseInt(jQuery(this).css('max-height'), 10);
-    
-    // Style the mirror
-    mirror.style.display = 'none';
-    mirror.style.wordWrap = 'break-word';
-    mirror.style.whiteSpace = 'normal';
-    mirror.style.padding = jQuery(this).css('paddingTop') + ' ' + 
-      jQuery(this).css('paddingRight') + ' ' + 
-      jQuery(this).css('paddingBottom') + ' ' + 
-      jQuery(this).css('paddingLeft');
-      
-    mirror.style.width = jQuery(this).css('width');
-    mirror.style.fontFamily = jQuery(this).css('font-family');
-    mirror.style.fontSize = jQuery(this).css('font-size');
-    mirror.style.lineHeight = jQuery(this).css('line-height');
-    mirror.style.letterSpacing = jQuery(this).css('letter-spacing');
-    mirror.style.boxSizing = jQuery(this).css('boxSizing');
-
-    // Style the textarea
-    this.style.overflow = "hidden";
-    this.style.minHeight = this.rows+"em";
-
-    // Bind the textarea's event
-    this.onkeyup = growTextarea;
-    this.onfocus = growTextarea;
-
-    // Fire the event for text already present
-    sendContentToMirror(this);
-
-  });
-};
 if (!window.zammadChatTemplates) {
   window.zammadChatTemplates = {};
 }
@@ -1555,11 +1886,11 @@ window.zammadChatTemplates["chat"] = function (__obj) {
     
       __out.push(this.T(this.scrollHint));
     
-      __out.push('\n  
                    \n  
                    \n  
                    \n    \n    
                    \n    \n  \n
                    ")}).call(this)}.call(t),t.safe=i,t.escape=o,s.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.customer_timeout=function(t){t||(t={});var e,s=[],n=function(t){return t&&t.ecoSafe?t:"undefined"!=typeof t&&null!=t?o(t):""},i=t.safe,o=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},o||(o=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){s.push('
                    \n  '),this.agent?(s.push("\n    "),s.push(this.T("Since you didn't respond in the last %s minutes your conversation with %s got closed.",this.delay,this.agent)),s.push("\n  ")):(s.push("\n    "),s.push(this.T("Since you didn't respond in the last %s minutes your conversation got closed.",this.delay)),s.push("\n  ")),s.push('\n  
                    \n  
                    "),s.push(this.T("Start new conversation")),s.push("
                    \n
                    ")}).call(this)}.call(t),t.safe=i,t.escape=o,s.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.loader=function(t){t||(t={});var e,s=[],n=t.safe,i=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){s.push('\n  \n  \n  \n\n'),s.push(this.T("Connecting")),s.push("")}).call(this)}.call(t),t.safe=n,t.escape=i,s.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.message=function(t){t||(t={});var e,s=[],n=function(t){return t&&t.ecoSafe?t:"undefined"!=typeof t&&null!=t?o(t):""},i=t.safe,o=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},o||(o=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){s.push('
                    \n  "),s.push(this.message),s.push("\n
                    ")}).call(this)}.call(t),t.safe=i,t.escape=o,s.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.status=function(t){t||(t={});var e,s=[],n=t.safe,i=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){s.push('
                    \n  
                    \n    '),s.push(this.status),s.push("\n  
                    \n
                    ")}).call(this)}.call(t),t.safe=n,t.escape=i,s.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.timestamp=function(t){t||(t={});var e,s=[],n=function(t){return t&&t.ecoSafe?t:"undefined"!=typeof t&&null!=t?o(t):""},i=t.safe,o=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},o||(o=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){s.push('
                    '),s.push(n(this.label)),s.push(" "),s.push(n(this.time)),s.push("
                    ")}).call(this)}.call(t),t.safe=i,t.escape=o,s.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.typingIndicator=function(t){t||(t={});var e,s=[],n=t.safe,i=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){s.push('
                    \n  \n    \n      \n      \n      \n    \n  \n
                    ')}).call(this)}.call(t),t.safe=n,t.escape=i,s.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.waiting=function(t){t||(t={});var e,s=[],n=t.safe,i=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){s.push('
                    \n  \n    \n    \n    \n  \n  '),s.push(this.T("All colleagues are busy.")),s.push("
                    \n  "),s.push(this.T("You are on waiting list position %s.",this.position)),s.push("\n
                    ")}).call(this)}.call(t),t.safe=n,t.escape=i,s.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.waiting_list_timeout=function(t){t||(t={});var e,s=[],n=function(t){return t&&t.ecoSafe?t:"undefined"!=typeof t&&null!=t?o(t):""},i=t.safe,o=t.escape;return e=t.safe=function(t){if(t&&t.ecoSafe)return t;("undefined"==typeof t||null==t)&&(t="");var e=new String(t);return e.ecoSafe=!0,e},o||(o=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){s.push('
                    \n  '),s.push(this.T("We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!")),s.push('\n  
                    \n  
                    "),s.push(this.T("Start new conversation")),s.push("
                    \n
                    ")}).call(this)}.call(t),t.safe=i,t.escape=o,s.join("")};
\ No newline at end of file
+window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.agent=function(t){t||(t={});var e=[],s=function(t){return t&&t.ecoSafe?t:void 0!==t&&null!=t?i(t):""},n=t.safe,i=t.escape;return t.safe=function(t){if(t&&t.ecoSafe)return t;void 0!==t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){this.agent.avatar&&(e.push('\n\n')),e.push('\n\n  '),e.push(s(this.agent.name)),e.push("\n")}).call(this)}.call(t),t.safe=n,t.escape=i,e.join("")};var bind=function(t,e){return function(){return t.apply(e,arguments)}},slice=[].slice,extend=function(t,e){function s(){this.constructor=t}for(var n in e)hasProp.call(e,n)&&(t[n]=e[n]);return s.prototype=e.prototype,t.prototype=new s,t.__super__=e.prototype,t},hasProp={}.hasOwnProperty;!function(t,e){var s,n,i,o,a,r,l,h,c;c=document.getElementsByTagName("script"),r=c[c.length-1],l=r.src.match(".*://([^:/]*).*")[1],h=r.src.match("(.*)://[^:/]*.*")[1],s=function(){function e(e){this.options=t.extend({},this.defaults,e),this.log=new i({debug:this.options.debug,logPrefix:this.options.logPrefix||this.logPrefix})}return e.prototype.defaults={debug:!1},e}(),i=function(){function e(e){this.log=bind(this.log,this),this.error=bind(this.error,this),this.notice=bind(this.notice,this),this.debug=bind(this.debug,this),this.options=t.extend({},this.defaults,e)}return e.prototype.defaults={debug:!1},e.prototype.debug=function(){var t;if(t=1<=arguments.length?slice.call(arguments,0):[],this.options.debug)return this.log("debug",t)},e.prototype.notice=function(){var t;return t=1<=arguments.length?slice.call(arguments,0):[],this.log("notice",t)},e.prototype.error=function(){var t;return t=1<=arguments.length?slice.call(arguments,0):[],this.log("error",t)},e.prototype.log=function(e,s){var n,i,o,a;if(s.unshift("||"),s.unshift(e),s.unshift(this.options.logPrefix),console.log.apply(console,s),this.options.debug){for(a="",i=0,o=s.length;i"+a+"
                    ")}},e}(),o=function(t){function e(t){this.stop=bind(this.stop,this),this.start=bind(this.start,this),e.__super__.constructor.call(this,t)}return extend(e,s),e.prototype.timeoutStartedAt=null,e.prototype.logPrefix="timeout",e.prototype.defaults={debug:!1,timeout:4,timeoutIntervallCheck:.5},e.prototype.start=function(){var t,e;return this.stop(),e=new Date,t=function(t){return function(){var s;if(s=new Date-new Date(e.getTime()+1e3*t.options.timeout*60),t.log.debug("Timeout check for "+t.options.timeout+" minutes (left "+s/1e3+" sec.)"),!(s<0))return t.stop(),t.options.callback()}}(this),this.log.debug("Start timeout in "+this.options.timeout+" minutes"),this.intervallId=setInterval(t,1e3*this.options.timeoutIntervallCheck*60)},e.prototype.stop=function(){if(this.intervallId)return this.log.debug("Stop timeout of "+this.options.timeout+" minutes"),clearInterval(this.intervallId)},e}(),n=function(t){function n(t){this.ping=bind(this.ping,this),this.send=bind(this.send,this),this.reconnect=bind(this.reconnect,this),this.close=bind(this.close,this),this.connect=bind(this.connect,this),this.set=bind(this.set,this),n.__super__.constructor.call(this,t)}return extend(n,s),n.prototype.logPrefix="io",n.prototype.set=function(t){var e,s,n;s=[];for(e in t)n=t[e],s.push(this.options[e]=n);return s},n.prototype.connect=function(){return this.log.debug("Connecting to "+this.options.host),this.ws=new e.WebSocket(""+this.options.host),this.ws.onopen=function(t){return function(e){return t.log.debug("onOpen",e),t.options.onOpen(e),t.ping()}}(this),this.ws.onmessage=function(t){return function(e){var s,n,i;for(i=JSON.parse(e.data),t.log.debug("onMessage",e.data),s=0,n=i.length;sChat with us!",scrollHint:"Scroll down to see new messages",idleTimeout:6,idleTimeoutIntervallCheck:.5,inactiveTimeout:8,inactiveTimeoutIntervallCheck:.5,waitingListTimeout:4,waitingListTimeoutIntervallCheck:.5},a.prototype.logPrefix="chat",a.prototype._messageCount=0,a.prototype.isOpen=!1,a.prototype.blinkOnlineInterval=null,a.prototype.stopBlinOnlineStateTimeout=null,a.prototype.showTimeEveryXMinutes=2,a.prototype.lastTimestamp=null,a.prototype.lastAddedType=null,a.prototype.inputTimeout=null,a.prototype.isTyping=!1,a.prototype.state="offline",a.prototype.initialQueueDelay=1e4,a.prototype.translations={de:{"Chat with us!":"Chatte mit uns!","Scroll down to see new messages":"Scrolle nach unten um neue Nachrichten zu sehen",Online:"Online",Offline:"Offline",Connecting:"Verbinden","Connection re-established":"Verbindung wiederhergestellt",Today:"Heute",Send:"Senden","Compose your message...":"Ihre Nachricht...","All colleagues are busy.":"Alle Kollegen sind belegt.","You are on waiting list position %s.":"Sie sind in der Warteliste an der Position %s.","Start new conversation":"Neue Konversation starten","Since you didn't respond in the last %s minutes your conversation with %s got closed.":"Da Sie in den letzten %s Minuten nichts geschrieben haben wurde Ihre Konversation mit %s geschlossen.","Since you didn't respond in the last %s minutes your conversation got closed.":"Da Sie in den letzten %s Minuten nichts geschrieben haben wurde Ihre Konversation geschlossen.","We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!":"Es tut uns leid, es dauert länger als erwartet, um einen freien Platz zu erhalten. Bitte versuchen Sie es zu einem späteren Zeitpunkt noch einmal oder schicken Sie uns eine E-Mail. Vielen Dank!"},es:{"Chat with us!":"Chatee con nosotros!","Scroll down to see new messages":"Haga scroll hacia abajo para ver nuevos mensajes",Online:"En linea",Offline:"Desconectado",Connecting:"Conectando","Connection re-established":"Conexión restablecida",Today:"Hoy",Send:"Enviar","Compose your message...":"Escriba su mensaje...","All colleagues are busy.":"Todos los agentes están ocupados.","You are on waiting list position %s.":"Usted está en la posición %s de la lista de espera.","Start new conversation":"Iniciar nueva conversación","Since you didn't respond in the last %s minutes your conversation with %s got closed.":"Puesto que usted no respondió en los últimos %s minutos su conversación con %s se ha cerrado.","Since you didn't respond in the last %s minutes your conversation got closed.":"Puesto que usted no respondió en los últimos %s minutos su conversación se ha cerrado.","We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!":"Lo sentimos, se tarda más tiempo de lo esperado para ser atendido por un agente. Inténtelo de nuevo más tarde o envíenos un correo electrónico. ¡Gracias!"},fr:{"Chat with us!":"Chattez avec nous!","Scroll down to see new messages":"Faites défiler pour lire les nouveaux messages",Online:"En-ligne",Offline:"Hors-ligne",Connecting:"Connexion en cours","Connection re-established":"Connexion rétablie",Today:"Aujourdhui",Send:"Envoyer","Compose your message...":"Composez votre message...","All colleagues are busy.":"Tous les collègues sont actuellement occupés.","You are on waiting list position %s.":"Vous êtes actuellement en %s position dans la file d'attente.","Start new conversation":"Démarrer une nouvelle conversation","Since you didn't respond in the last %s minutes your conversation with %s got closed.":"Si vous ne répondez pas dans les %s minutes, votre conversation avec %s va être fermée.","Since you didn't respond in the last %s minutes your conversation got closed.":"Si vous ne répondez pas dans les %s minutes, votre conversation va être fermée.","We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!":"Nous sommes désolés, il faut plus de temps que prévu pour obtenir un emplacement vide. Veuillez réessayer ultérieurement ou nous envoyer un courriel. Je vous remercie!"},"zh-cn":{"Chat with us!":"发起即时对话!","Scroll down to see new messages":"向下滚动以查看新消息",Online:"在线",Offline:"离线",Connecting:"连接中","Connection re-established":"正在重新建立连接",Today:"今天",Send:"发送","Compose your message...":"正在输入信息...","All colleagues are busy.":"所有工作人员都在忙碌中.","You are on waiting list position %s.":"您目前的等候位置是第 %s 位.","Start new conversation":"开始新的会话","Since you didn't respond in the last %s minutes your conversation with %s got closed.":"由于您超过 %s 分钟没有回复, 您与 %s 的会话已被关闭.","Since you didn't respond in the last %s minutes your conversation got closed.":"由于您超过 %s 分钟没有任何回复, 该对话已被关闭.","We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!":"非常抱歉, 目前需要等候更长的时间才能接入对话, 请稍后重试或向我们发送电子邮件. 谢谢!"},"zh-tw":{"Chat with us!":"開始即時對话!","Scroll down to see new messages":"向下滑動以查看新訊息",Online:"線上",Offline:"离线",Connecting:"連線中","Connection re-established":"正在重新建立連線中",Today:"今天",Send:"發送","Compose your message...":"正在輸入訊息...","All colleagues are busy.":"所有服務人員都在忙碌中.","You are on waiting list position %s.":"你目前的等候位置是第 %s 順位.","Start new conversation":"開始新的對話","Since you didn't respond in the last %s minutes your conversation with %s got closed.":"由於你超過 %s 分鐘沒有回應, 你與 %s 的對話已被關閉.","Since you didn't respond in the last %s minutes your conversation got closed.":"由於你超過 %s 分鐘沒有任何回應, 該對話已被關閉.","We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!":"非常抱歉, 當前需要等候更長的時間方可排入對話程序, 請稍後重試或向我們寄送電子郵件. 謝謝!"}},a.prototype.sessionId=void 0,a.prototype.scrolledToBottom=!0,a.prototype.scrollSnapTolerance=10,a.prototype.richTextFormatKey={66:!0,73:!0,85:!0,83:!0},a.prototype.T=function(){var t,e,s,n,i,o;if(i=arguments[0],e=2<=arguments.length?slice.call(arguments,1):[],this.options.lang&&"en"!==this.options.lang&&(this.translations[this.options.lang]?((o=this.translations[this.options.lang])[i]||this.log.notice("Translation needed for '"+i+"'"),i=o[i]||i):this.log.notice("Translation '"+this.options.lang+"' needed!")),e)for(s=0,n=e.length;ss?e:document.body)},a.prototype.render=function(){return this.el&&t(".zammad-chat").get(0)||this.renderBase(),t("."+this.options.buttonClass).addClass(this.inactiveClass),this.setAgentOnlineState("online"),this.log.debug("widget rendered"),this.startTimeoutObservers(),this.idleTimeout.start(),this.sessionId=sessionStorage.getItem("sessionId"),this.send("chat_status_customer",{session_id:this.sessionId,url:e.location.href})},a.prototype.renderBase=function(){if(this.el=t(this.view("chat")({title:this.options.title,scrollHint:this.options.scrollHint})),this.options.target.append(this.el),this.input=this.el.find(".zammad-chat-input"),this.el.find(".js-chat-open").click(this.open),this.el.find(".js-chat-toggle").click(this.toggle),this.el.find(".zammad-chat-controls").on("submit",this.onSubmit),this.el.find(".zammad-chat-body").on("scroll",this.detectScrolledtoBottom),this.el.find(".zammad-scroll-hint").click(this.onScrollHintClick),this.input.on({keydown:this.checkForEnter,input:this.onInput}),this.input.on("keydown",function(t){return function(e){var s;if(s=!1,e.altKey||e.ctrlKey||!e.metaKey?e.altKey||!e.ctrlKey||e.metaKey||(s=!0):s=!0,s&&t.richTextFormatKey[e.keyCode]){if(e.preventDefault(),66===e.keyCode)return document.execCommand("bold"),!0;if(73===e.keyCode)return document.execCommand("italic"),!0;if(85===e.keyCode)return document.execCommand("underline"),!0;if(83===e.keyCode)return document.execCommand("strikeThrough"),!0}}}(this)),this.input.on("paste",function(s){return function(n){var i,o,a,r,l,h,c,d,u,p,m,g;if(n.stopPropagation(),n.preventDefault(),n.clipboardData)i=n.clipboardData;else if(e.clipboardData)i=e.clipboardData;else{if(!n.originalEvent.clipboardData)throw"No clipboardData support";i=n.originalEvent.clipboardData}if(h=!1,i&&i.items&&i.items[0]&&("file"!==(c=i.items[0]).kind||"image/png"!==c.type&&"image/jpeg"!==c.type||(l=c.getAsFile(),(u=new FileReader).onload=function(t){var e,n,i;return i=t.target.result,e=document.createElement("img"),e.src=i,n=function(t,n,o,a){return s.isRetina()&&(n/=2,2),i=t,e='',document.execCommand("insertHTML",!1,e)},s.resizeImage(e.src,460,"auto",2,"image/jpeg","auto",n)},u.readAsDataURL(l),h=!0)),!h){g=void 0,o=void 0;try{g=i.getData("text/html"),o="html",g&&0!==g.length||(o="text",g=i.getData("text/plain")),g&&0!==g.length||(o="text2",g=i.getData("text"))}catch(t){n=t,console.log("Sorry, can't insert markup because browser is not supporting it."),o="text3",g=i.getData("text")}return"text"!==o&&"text2"!==o&&"text3"!==o||(g="
                    "+g.replace(/\n/g,"
                    ")+"
                    ",g=g.replace(/
                    <\/div>/g,"

                    ")),console.log("p",o,g),"html"===o&&(a=t("
                    "+g+"
                    "),d=!1,r=g,p=new RegExp("<(/w|w):[A-Za-z]"),r.match(p)&&(d=!0,r=r.replace(p,"")),p=new RegExp("<(/o|o):[A-Za-z]"),r.match(p)&&(d=!0,r=r.replace(p,"")),d&&(a=s.wordFilter(a)),(a=t(a)).contents().each(function(){if(8===this.nodeType)return t(this).remove()}),a.find("a, font, small, time, form, label").replaceWith(function(){return t(this).contents()}),m="div",a.find("textarea").each(function(){var e,s;return s=this.outerHTML,p=new RegExp("<"+this.tagName,"i"),e=s.replace(p,"<"+m),p=new RegExp("'),n=n.get(0),document.caretPositionFromPoint?(c=document.caretPositionFromPoint(r,l),(d=document.createRange()).setStart(c.offsetNode,c.offset),d.collapse(),d.insertNode(n)):document.caretRangeFromPoint?(d=document.caretRangeFromPoint(r,l)).insertNode(n):console.log("could not find carat")},s.resizeImage(n.src,460,"auto",2,"image/jpeg","auto",i)},a.readAsDataURL(o)}}(this)),t(e).on("beforeunload",function(t){return function(){return t.onLeaveTemporary()}}(this)),t(e).bind("hashchange",function(t){return function(){if(!t.isOpen)return t.idleTimeout.start();t.sessionId&&t.send("chat_session_notice",{session_id:t.sessionId,message:e.location.href})}}(this)),this.isFullscreen)return this.input.on({focus:this.onFocus,focusout:this.onFocusOut})},a.prototype.checkForEnter=function(t){if(!t.shiftKey&&13===t.keyCode)return t.preventDefault(),this.sendMessage()},a.prototype.send=function(t,e){return null==e&&(e={}),e.chat_id=this.options.chatId,this.io.send(t,e)},a.prototype.onWebSocketMessage=function(t){var e,s,n;for(e=0,s=t.length;e0,t(e).scrollTop(0),s)return this.log.notice("virtual keyboard shown")},a.prototype.onFocusOut=function(){},a.prototype.onTyping=function(){if(!(this.isTyping&&this.isTyping>new Date((new Date).getTime()-1500)))return this.isTyping=new Date,this.send("chat_session_typing",{session_id:this.sessionId}),this.inactiveTimeout.start()},a.prototype.onSubmit=function(t){return t.preventDefault(),this.sendMessage()},a.prototype.sendMessage=function(){var t,e;if(t=this.input.html())return this.inactiveTimeout.start(),sessionStorage.removeItem("unfinished_message"),e=this.view("message")({message:t,from:"customer",id:this._messageCount++,unreadClass:""}),this.maybeAddTimestamp(),this.el.find(".zammad-chat-message--typing").get(0)?(this.lastAddedType="typing-placeholder",this.el.find(".zammad-chat-message--typing").before(e)):(this.lastAddedType="message--customer",this.el.find(".zammad-chat-body").append(e)),this.input.html(""),this.scrollToBottom(),this.send("chat_session_message",{content:t,id:this._messageCount,session_id:this.sessionId})},a.prototype.receiveMessage=function(t){return this.inactiveTimeout.start(),this.onAgentTypingEnd(),this.maybeAddTimestamp(),this.renderMessage({message:t.message.content,id:t.id,from:"agent"}),this.scrollToBottom({showHint:!0})},a.prototype.renderMessage=function(t){return this.lastAddedType="message--"+t.from,t.unreadClass=document.hidden?" zammad-chat-message--unread":"",this.el.find(".zammad-chat-body").append(this.view("message")(t))},a.prototype.open=function(){var t;{if(!this.isOpen)return this.isOpen=!0,this.log.debug("open widget"),this.sessionId||this.showLoader(),this.el.addClass("zammad-chat-is-open"),t=this.el.height()-this.el.find(".zammad-chat-header").outerHeight(),this.el.css("bottom",-t),this.sessionId?(this.el.css("bottom",0),this.onOpenAnimationEnd()):(this.el.animate({bottom:0},500,this.onOpenAnimationEnd),this.send("chat_session_init",{url:e.location.href}));this.log.debug("widget already open, block")}},a.prototype.onOpenAnimationEnd=function(){if(this.idleTimeout.stop(),this.isFullscreen)return this.disableScrollOnRoot()},a.prototype.sessionClose=function(){return this.send("chat_session_close",{session_id:this.sessionId}),this.inactiveTimeout.stop(),this.waitingListTimeout.stop(),sessionStorage.removeItem("unfinished_message"),this.onInitialQueueDelayId&&clearTimeout(this.onInitialQueueDelayId),this.setSessionId(void 0)},a.prototype.toggle=function(t){return this.isOpen?this.close(t):this.open(t)},a.prototype.close=function(t){var e;if(this.isOpen){if(this.initDelayId&&clearTimeout(this.initDelayId),this.sessionId)return this.log.debug("close widget"),t&&t.stopPropagation(),this.sessionClose(),this.isFullscreen&&this.enableScrollOnRoot(),e=this.el.height()-this.el.find(".zammad-chat-header").outerHeight(),this.el.animate({bottom:-e},500,this.onCloseAnimationEnd);this.log.debug("can't close widget without sessionId")}else this.log.debug("can't close widget, it's not open")},a.prototype.onCloseAnimationEnd=function(){return this.el.css("bottom",""),this.el.removeClass("zammad-chat-is-open"),this.showLoader(),this.el.find(".zammad-chat-welcome").removeClass("zammad-chat-is-hidden"),this.el.find(".zammad-chat-agent").addClass("zammad-chat-is-hidden"),this.el.find(".zammad-chat-agent-status").addClass("zammad-chat-is-hidden"),this.isOpen=!1,this.io.reconnect()},a.prototype.onWebSocketClose=function(){if(!this.isOpen)return this.el?(this.el.removeClass("zammad-chat-is-shown"),this.el.removeClass("zammad-chat-is-loaded")):void 0},a.prototype.show=function(){if("offline"!==this.state)return this.el.addClass("zammad-chat-is-loaded"),this.el.addClass("zammad-chat-is-shown")},a.prototype.disableInput=function(){return this.input.prop("disabled",!0),this.el.find(".zammad-chat-send").prop("disabled",!0)},a.prototype.enableInput=function(){return this.input.prop("disabled",!1),this.el.find(".zammad-chat-send").prop("disabled",!1)},a.prototype.hideModal=function(){return this.el.find(".zammad-chat-modal").html("")},a.prototype.onQueueScreen=function(t){var e;if(this.setSessionId(t.session_id),e=function(e){return function(){return e.onQueue(t),e.waitingListTimeout.start()}}(this),!this.initialQueueDelay||this.onInitialQueueDelayId)return this.onInitialQueueDelayId&&clearTimeout(this.onInitialQueueDelayId),e();this.onInitialQueueDelayId=setTimeout(e,this.initialQueueDelay)},a.prototype.onQueue=function(t){return this.log.notice("onQueue",t.position),this.inQueue=!0,this.el.find(".zammad-chat-modal").html(this.view("waiting")({position:t.position}))},a.prototype.onAgentTypingStart=function(){if(this.stopTypingId&&clearTimeout(this.stopTypingId),this.stopTypingId=setTimeout(this.onAgentTypingEnd,3e3),!this.el.find(".zammad-chat-message--typing").get(0)&&(this.maybeAddTimestamp(),this.el.find(".zammad-chat-body").append(this.view("typingIndicator")()),this.isVisible(this.el.find(".zammad-chat-message--typing"),!0)))return this.scrollToBottom()},a.prototype.onAgentTypingEnd=function(){return this.el.find(".zammad-chat-message--typing").remove()},a.prototype.onLeaveTemporary=function(){if(this.sessionId)return this.send("chat_session_leave_temporary",{session_id:this.sessionId})},a.prototype.maybeAddTimestamp=function(){var t,e,s;if(s=Date.now(),!this.lastTimestamp||s-this.lastTimestamp>6e4*this.showTimeEveryXMinutes)return t=this.T("Today"),e=(new Date).toTimeString().substr(0,5),"timestamp"===this.lastAddedType?(this.updateLastTimestamp(t,e),this.lastTimestamp=s):(this.el.find(".zammad-chat-body").append(this.view("timestamp")({label:t,time:e})),this.lastTimestamp=s,this.lastAddedType="timestamp",this.scrollToBottom())},a.prototype.updateLastTimestamp=function(t,e){if(this.el)return this.el.find(".zammad-chat-body").find(".zammad-chat-timestamp").last().replaceWith(this.view("timestamp")({label:t,time:e}))},a.prototype.addStatus=function(t){if(this.el)return this.maybeAddTimestamp(),this.el.find(".zammad-chat-body").append(this.view("status")({status:t})),this.scrollToBottom()},a.prototype.detectScrolledtoBottom=function(){var t;if(t=this.el.find(".zammad-chat-body").scrollTop()+this.el.find(".zammad-chat-body").outerHeight(),this.scrolledToBottom=Math.abs(t-this.el.find(".zammad-chat-body").prop("scrollHeight"))<=this.scrollSnapTolerance,this.scrolledToBottom)return this.el.find(".zammad-scroll-hint").addClass("is-hidden")},a.prototype.showScrollHint=function(){return this.el.find(".zammad-scroll-hint").removeClass("is-hidden"),this.el.find(".zammad-chat-body").scrollTop(this.el.find(".zammad-chat-body").scrollTop()+this.el.find(".zammad-scroll-hint").outerHeight())},a.prototype.onScrollHintClick=function(){return this.el.find(".zammad-chat-body").animate({scrollTop:this.el.find(".zammad-chat-body").prop("scrollHeight")},300)},a.prototype.scrollToBottom=function(e){var s;return s=(null!=e?e:{showHint:!1}).showHint,this.scrolledToBottom?this.el.find(".zammad-chat-body").scrollTop(t(".zammad-chat-body").prop("scrollHeight")):s?this.showScrollHint():void 0},a.prototype.destroy=function(t){return null==t&&(t={}),this.log.debug("destroy widget",t),this.setAgentOnlineState("offline"),t.remove&&this.el&&this.el.remove(),this.waitingListTimeout&&this.waitingListTimeout.stop(),this.inactiveTimeout&&this.inactiveTimeout.stop(),this.idleTimeout&&this.idleTimeout.stop(),this.io.close()},a.prototype.reconnect=function(){return this.log.notice("reconnecting"),this.disableInput(),this.lastAddedType="status",this.setAgentOnlineState("connecting"),this.addStatus(this.T("Connection lost"))},a.prototype.onConnectionReestablished=function(){return this.lastAddedType="status",this.setAgentOnlineState("online"),this.addStatus(this.T("Connection re-established"))},a.prototype.onSessionClosed=function(t){return this.addStatus(this.T("Chat closed by %s",t.realname)),this.disableInput(),this.setAgentOnlineState("offline"),this.inactiveTimeout.stop()},a.prototype.setSessionId=function(t){return this.sessionId=t,void 0===t?sessionStorage.removeItem("sessionId"):sessionStorage.setItem("sessionId",t)},a.prototype.onConnectionEstablished=function(t){return this.onInitialQueueDelayId&&clearTimeout(this.onInitialQueueDelayId),this.inQueue=!1,t.agent&&(this.agent=t.agent),t.session_id&&this.setSessionId(t.session_id),this.el.find(".zammad-chat-body").html(""),this.el.find(".zammad-chat-agent").html(this.view("agent")({agent:this.agent})),this.enableInput(),this.hideModal(),this.el.find(".zammad-chat-welcome").addClass("zammad-chat-is-hidden"),this.el.find(".zammad-chat-agent").removeClass("zammad-chat-is-hidden"),this.el.find(".zammad-chat-agent-status").removeClass("zammad-chat-is-hidden"),this.isFullscreen||this.input.focus(),this.setAgentOnlineState("online"),this.waitingListTimeout.stop(),this.idleTimeout.stop(),this.inactiveTimeout.start()},a.prototype.showCustomerTimeout=function(){var t;return this.el.find(".zammad-chat-modal").html(this.view("customer_timeout")({agent:this.agent.name,delay:this.options.inactiveTimeout})),t=function(){return location.reload()},this.el.find(".js-restart").click(t),this.sessionClose()},a.prototype.showWaitingListTimeout=function(){var t;return this.el.find(".zammad-chat-modal").html(this.view("waiting_list_timeout")({delay:this.options.watingListTimeout})),t=function(){return location.reload()},this.el.find(".js-restart").click(t),this.sessionClose()},a.prototype.showLoader=function(){return this.el.find(".zammad-chat-modal").html(this.view("loader")())},a.prototype.setAgentOnlineState=function(t){var e;if(this.state=t,this.el)return e=t.charAt(0).toUpperCase()+t.slice(1),this.el.find(".zammad-chat-agent-status").attr("data-status",t).text(this.T(e))},a.prototype.detectHost=function(){var t;return t="ws://","https"===h&&(t="wss://"),this.options.host=""+t+l+"/ws"},a.prototype.loadCss=function(){var t,e,s;if(this.options.cssAutoload)return(s=this.options.cssUrl)||(s=this.options.host.replace(/^wss/i,"https").replace(/^ws/i,"http").replace(/\/ws/i,""),s+="/assets/chat/chat.css"),this.log.debug("load css from '"+s+"'"),e="@import url('"+s+"');",t=document.createElement("link"),t.onload=this.onCssLoaded,t.rel="stylesheet",t.href="data:text/css,"+escape(e),document.getElementsByTagName("head")[0].appendChild(t)},a.prototype.onCssLoaded=function(){return this.socketReady?this.onReady():this.cssLoaded=!0},a.prototype.startTimeoutObservers=function(){return this.idleTimeout=new o({logPrefix:"idleTimeout",debug:this.options.debug,timeout:this.options.idleTimeout,timeoutIntervallCheck:this.options.idleTimeoutIntervallCheck,callback:function(t){return function(){return t.log.debug("Idle timeout reached, hide widget",new Date),t.destroy({remove:!0})}}(this)}),this.inactiveTimeout=new o({logPrefix:"inactiveTimeout",debug:this.options.debug,timeout:this.options.inactiveTimeout,timeoutIntervallCheck:this.options.inactiveTimeoutIntervallCheck,callback:function(t){return function(){return t.log.debug("Inactive timeout reached, show timeout screen.",new Date),t.showCustomerTimeout(),t.destroy({remove:!1})}}(this)}),this.waitingListTimeout=new o({logPrefix:"waitingListTimeout",debug:this.options.debug,timeout:this.options.waitingListTimeout,timeoutIntervallCheck:this.options.waitingListTimeoutIntervallCheck,callback:function(t){return function(){return t.log.debug("Waiting list timeout reached, show timeout screen.",new Date),t.showWaitingListTimeout(),t.destroy({remove:!1})}}(this)})},a.prototype.disableScrollOnRoot=function(){return this.rootScrollOffset=this.scrollRoot.scrollTop(),this.scrollRoot.css({overflow:"hidden",position:"fixed"})},a.prototype.enableScrollOnRoot=function(){return this.scrollRoot.scrollTop(this.rootScrollOffset),this.scrollRoot.css({overflow:"",position:""})},a.prototype.isVisible=function(s,n,i,o){var a,r,l,h,c,d,u,p,m,g,f,v,y,b,w,T,C,z,S,k,I,A,x,_,E,O;if(!(s.length<1))if(r=t(e),a=s.length>1?s.eq(0):s,z=a.get(0),O=r.width(),E=r.height(),o=o||"both",p=!0!==i||z.offsetWidth*z.offsetHeight,"function"==typeof z.getBoundingClientRect){if(C=z.getBoundingClientRect(),S=C.top>=0&&C.top0&&C.bottom<=E,b=C.left>=0&&C.left0&&C.right<=O,k=n?S||u:S&&u,y=n?b||T:b&&T,"both"===o)return p&&k&&y;if("vertical"===o)return p&&k;if("horizontal"===o)return p&&y}else{if(_=r.scrollTop(),I=_+E,A=r.scrollLeft(),x=A+O,w=a.offset(),d=w.top,l=d+a.height(),h=w.left,c=h+a.width(),v=!0===n?l:d,m=!0===n?d:l,g=!0===n?c:h,f=!0===n?h:c,"both"===o)return!!p&&m<=I&&v>=_&&f<=x&&g>=A;if("vertical"===o)return!!p&&m<=I&&v>=_;if("horizontal"===o)return!!p&&f<=x&&g>=A}},a.prototype.isRetina=function(){var t;return!!e.matchMedia&&((t=e.matchMedia("only screen and (min--moz-device-pixel-ratio: 1.3), only screen and (-o-min-device-pixel-ratio: 2.6/2), only screen and (-webkit-min-device-pixel-ratio: 1.3), only screen  and (min-device-pixel-ratio: 1.3), only screen and (min-resolution: 1.3dppx)"))&&t.matches||e.devicePixelRatio>1)},a.prototype.resizeImage=function(t,e,s,n,i,o,a,r){var l;return null==e&&(e="auto"),null==s&&(s="auto"),null==n&&(n=1),null==r&&(r=!0),l=new Image,l.onload=function(){var t,r,h,c,d;return h=l.width,r=l.height,console.log("ImageService","current size",h,r),"auto"===s&&"auto"===e&&(e=h,s=r),"auto"===s&&(s=r/(h/e)),"auto"===e&&(e=r/(h/s)),d=!1,e/gi,""),s=s.replace(/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,""),s=s.replace(/<(\/?)s>/gi,"<$1strike>"),s=s.replace(/ /gi," "),e.html(s),t("p",e).each(function(){var e,s;if(s=t(this).attr("style"),e=/mso-list:\w+ \w+([0-9]+)/.exec(s))return t(this).data("_listLevel",parseInt(e[1],10))}),n=0,i=null,t("p",e).each(function(){var e,s,o,a,r,l,h,c,d,u;if(void 0!==(e=t(this).data("_listLevel"))){if(u=t(this).text(),a="
                      ",/^\s*\w+\./.test(u)&&(a=(r=/([0-9])\./.exec(u))?null!=(l=(d=parseInt(r[1],10))>1)?l:'
                        ':"
                          "}:"
                            "),e>n&&(0===n?(t(this).before(a),i=t(this).prev()):i=t(a).appendTo(i)),e=c;s=h<=c?++o:--o)i=i.parent();return t("span:first",this).remove(),i.append("
                          1. "+t(this).html()+"
                            2. "),t(this).remove(),n=e}return n=0}),t("[style]",e).removeAttr("style"),t("[align]",e).removeAttr("align"),t("span",e).replaceWith(function(){return t(this).contents()}),t("span:empty",e).remove(),t("[class^='Mso']",e).removeAttr("class"),t("p:empty",e).remove(),e},a.prototype.removeAttribute=function(e){var s,n,i,o,a;if(e){for(s=t(e),i=0,o=(a=e.attributes).length;i/g,">").replace(/"/g,""")}),function(){(function(){e.push('
                            \n  
                            \n    
                            \n      \n      \n        \n        \n      \n    
                            \n    
                            \n    
                            \n    
                            \n      \n      '),e.push(this.T(this.title)),e.push('\n    
                            \n  
                            \n  
                            \n  \n  
                            \n  
                            \n    
                            \n    \n  
                            \n
                            ")}).call(this)}.call(t),t.safe=n,t.escape=i,e.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.customer_timeout=function(t){t||(t={});var e=[],s=function(t){return t&&t.ecoSafe?t:void 0!==t&&null!=t?i(t):""},n=t.safe,i=t.escape;return t.safe=function(t){if(t&&t.ecoSafe)return t;void 0!==t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){e.push('
                            \n  '),this.agent?(e.push("\n    "),e.push(this.T("Since you didn't respond in the last %s minutes your conversation with %s got closed.",this.delay,this.agent)),e.push("\n  ")):(e.push("\n    "),e.push(this.T("Since you didn't respond in the last %s minutes your conversation got closed.",this.delay)),e.push("\n  ")),e.push('\n  
                            \n  
                            "),e.push(this.T("Start new conversation")),e.push("
                            \n
                            ")}).call(this)}.call(t),t.safe=n,t.escape=i,e.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.loader=function(t){t||(t={});var e=[],s=t.safe,n=t.escape;return t.safe=function(t){if(t&&t.ecoSafe)return t;void 0!==t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},n||(n=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){e.push('\n  \n  \n  \n\n'),e.push(this.T("Connecting")),e.push("")}).call(this)}.call(t),t.safe=s,t.escape=n,e.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.message=function(t){t||(t={});var e=[],s=function(t){return t&&t.ecoSafe?t:void 0!==t&&null!=t?i(t):""},n=t.safe,i=t.escape;return t.safe=function(t){if(t&&t.ecoSafe)return t;void 0!==t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){e.push('
                            \n  "),e.push(this.message),e.push("\n
                            ")}).call(this)}.call(t),t.safe=n,t.escape=i,e.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.status=function(t){t||(t={});var e=[],s=t.safe,n=t.escape;return t.safe=function(t){if(t&&t.ecoSafe)return t;void 0!==t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},n||(n=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){e.push('
                            \n  
                            \n    '),e.push(this.status),e.push("\n  
                            \n
                            ")}).call(this)}.call(t),t.safe=s,t.escape=n,e.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.timestamp=function(t){t||(t={});var e=[],s=function(t){return t&&t.ecoSafe?t:void 0!==t&&null!=t?i(t):""},n=t.safe,i=t.escape;return t.safe=function(t){if(t&&t.ecoSafe)return t;void 0!==t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){e.push('
                            '),e.push(s(this.label)),e.push(" "),e.push(s(this.time)),e.push("
                            ")}).call(this)}.call(t),t.safe=n,t.escape=i,e.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.typingIndicator=function(t){t||(t={});var e=[],s=t.safe,n=t.escape;return t.safe=function(t){if(t&&t.ecoSafe)return t;void 0!==t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},n||(n=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){e.push('
                            \n  \n    \n      \n      \n      \n    \n  \n
                            ')}).call(this)}.call(t),t.safe=s,t.escape=n,e.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.waiting=function(t){t||(t={});var e=[],s=t.safe,n=t.escape;return t.safe=function(t){if(t&&t.ecoSafe)return t;void 0!==t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},n||(n=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){e.push('
                            \n  \n    \n    \n    \n  \n  '),e.push(this.T("All colleagues are busy.")),e.push("
                            \n  "),e.push(this.T("You are on waiting list position %s.",this.position)),e.push("\n
                            ")}).call(this)}.call(t),t.safe=s,t.escape=n,e.join("")},window.zammadChatTemplates||(window.zammadChatTemplates={}),window.zammadChatTemplates.waiting_list_timeout=function(t){t||(t={});var e=[],s=function(t){return t&&t.ecoSafe?t:void 0!==t&&null!=t?i(t):""},n=t.safe,i=t.escape;return t.safe=function(t){if(t&&t.ecoSafe)return t;void 0!==t&&null!=t||(t="");var e=new String(t);return e.ecoSafe=!0,e},i||(i=t.escape=function(t){return(""+t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){e.push('
                            \n  '),e.push(this.T("We are sorry, it takes longer as expected to get an empty slot. Please try again later or send us an email. Thank you!")),e.push('\n  
                            \n  
                            "),e.push(this.T("Start new conversation")),e.push("
                            \n
                            ")}).call(this)}.call(t),t.safe=n,t.escape=i,e.join("")};
\ No newline at end of file
diff --git a/public/assets/chat/chat.scss b/public/assets/chat/chat.scss
index 1cec7cef1..64f0c4cca 100644
--- a/public/assets/chat/chat.scss
+++ b/public/assets/chat/chat.scss
@@ -29,7 +29,7 @@
 }
 .zammad-chat.zammad-chat-is-open {
   height: 30em;
-  
+
   @media only screen and (max-width: 768px) {
     height: 100%;
   }
@@ -208,12 +208,12 @@
   padding: 7px 10px 6px;
   color: hsl(0,0%,60%);
   cursor: pointer;
-  
+
   &.is-hidden {
     display: none;
   }
 }
-  
+
 .zammad-scroll-hint-icon {
   fill: hsl(210,5%,78%);
   margin-right: 8px;
@@ -329,7 +329,7 @@
 .zammad-chat-controls {
   overflow: hidden;
   display: none;
-  align-items: flex-start;
+  align-items: flex-end;
   border-top: 1px solid hsl(0,0%,93%);
   padding: 0;
   margin: 0;
@@ -349,21 +349,19 @@
   margin: 0;
   padding: 1em 2em;
   float: left;
-  width: auto;
-  height: auto;
   max-height: 6em;
-  min-height: 1.4em !important;
+  min-height: 1.4em;
   font-family: inherit;
   line-height: 1.4em;
   font-size: inherit;
   appearance: none;
-  border: none !important;
+  border: none;
   background: none;
-  box-shadow: none !important;
+  box-shadow: none ;
   box-sizing: content-box;
   outline: none;
-  resize: none;
   flex: 1;
+  overflow: auto;
 }
 
 .zammad-chat-input::-webkit-input-placeholder {
@@ -378,7 +376,7 @@
   background: hsl(203,67%,53%);
   color: white;
   padding: 0.5em 1.2em;
-  margin: 0.5em 1em 0.5em;
+  margin: 0.63em 1em;
   cursor: pointer;
   border: none;
   border-radius: 1.5em;
diff --git a/public/assets/chat/gulpfile.js b/public/assets/chat/gulpfile.js
index 60372ab40..c2be20ca3 100644
--- a/public/assets/chat/gulpfile.js
+++ b/public/assets/chat/gulpfile.js
@@ -9,7 +9,7 @@ var rename = require('gulp-rename');
 var uglify = require('gulp-uglify');
 var merge = require('merge-stream');
 var plumber = require('gulp-plumber');
- 
+
 gulp.task('css', function(){
   return gulp.src('chat.scss')
     .pipe(sass.sync().on('error', gutil.log))
@@ -29,9 +29,7 @@ gulp.task('js', function(){
     .pipe(plumber())
     .pipe(coffee({bare: true}).on('error', gutil.log));
 
-  var autoGrow = gulp.src('jquery.autoGrow.js');
-
-  return merge(templates, js, autoGrow)
+  return merge(templates, js)
     .pipe(concat('chat.js'))
     .pipe(gulp.dest('./'))
     .pipe(uglify())
@@ -40,7 +38,7 @@ gulp.task('js', function(){
 });
 
 gulp.task('default', function(){
-  var cssWatcher = gulp.watch('chat.scss', ['css']);
+  var cssWatcher = gulp.watch(['chat.scss'], ['css']);
   cssWatcher.on('change', function(event) {
     console.log('File ' + event.path + ' was ' + event.type + ', running tasks...');
   });
diff --git a/public/assets/chat/jquery.autoGrow.js b/public/assets/chat/jquery.autoGrow.js
deleted file mode 100644
index cda824c42..000000000
--- a/public/assets/chat/jquery.autoGrow.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/*!
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- *  wrote this file. As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return. Jevin O. Sewaruth
- * ----------------------------------------------------------------------------
- *
- * Autogrow Textarea Plugin Version v3.0
- * http://www.technoreply.com/autogrow-textarea-plugin-3-0
- * 
- * THIS PLUGIN IS DELIVERD ON A PAY WHAT YOU WHANT BASIS. IF THE PLUGIN WAS USEFUL TO YOU, PLEASE CONSIDER BUYING THE PLUGIN HERE :
- * https://sites.fastspring.com/technoreply/instant/autogrowtextareaplugin
- *
- * Date: October 15, 2012
- *
- * Zammad modification: 
- *   - remove overflow:hidden when maximum height is reached
- *   - mirror box-sizing
- *
- */
-
-jQuery.fn.autoGrow = function(options) {
-  return this.each(function() {
-    var settings = jQuery.extend({
-      extraLine: true,
-    }, options);
-
-    var createMirror = function(textarea) {
-      jQuery(textarea).after('
                            ');
-      return jQuery(textarea).next('.autogrow-textarea-mirror')[0];
-    }
-
-    var sendContentToMirror = function (textarea) {
-      mirror.innerHTML = String(textarea.value)
-        .replace(/&/g, '&')
-        .replace(/"/g, '"')
-        .replace(/'/g, ''')
-        .replace(//g, '>')
-        .replace(/ /g, ' ')
-        .replace(/\n/g, '
                            ') +
-        (settings.extraLine? '.
                            .' : '')
-      ;
-
-      if (jQuery(textarea).height() != jQuery(mirror).height()) {
-        jQuery(textarea).height(jQuery(mirror).height());
-
-        var overflow = jQuery(mirror).height() > maxHeight ? '' : 'hidden';
-        jQuery(textarea).css('overflow', overflow);
-      }
-    }
-
-    var growTextarea = function () {
-      sendContentToMirror(this);
-    }
-
-    // Create a mirror
-    var mirror = createMirror(this);
-
-    // Store max-height
-    var maxHeight = parseInt(jQuery(this).css('max-height'), 10);
-    
-    // Style the mirror
-    mirror.style.display = 'none';
-    mirror.style.wordWrap = 'break-word';
-    mirror.style.whiteSpace = 'normal';
-    mirror.style.padding = jQuery(this).css('paddingTop') + ' ' + 
-      jQuery(this).css('paddingRight') + ' ' + 
-      jQuery(this).css('paddingBottom') + ' ' + 
-      jQuery(this).css('paddingLeft');
-      
-    mirror.style.width = jQuery(this).css('width');
-    mirror.style.fontFamily = jQuery(this).css('font-family');
-    mirror.style.fontSize = jQuery(this).css('font-size');
-    mirror.style.lineHeight = jQuery(this).css('line-height');
-    mirror.style.letterSpacing = jQuery(this).css('letter-spacing');
-    mirror.style.boxSizing = jQuery(this).css('boxSizing');
-
-    // Style the textarea
-    this.style.overflow = "hidden";
-    this.style.minHeight = this.rows+"em";
-
-    // Bind the textarea's event
-    this.onkeyup = growTextarea;
-    this.onfocus = growTextarea;
-
-    // Fire the event for text already present
-    sendContentToMirror(this);
-
-  });
-};
\ No newline at end of file
diff --git a/public/assets/chat/package.json b/public/assets/chat/package.json
index 087ef68ba..dec0faec0 100644
--- a/public/assets/chat/package.json
+++ b/public/assets/chat/package.json
@@ -3,17 +3,17 @@
   "version": "1.0.0",
   "description": "Zammad Customer Chat Javascript Widget",
   "devDependencies": {
-    "gulp": "^3.9.0",
-    "gulp-autoprefixer": "^3.0.2",
-    "gulp-coffee": "^2.3.1",
-    "gulp-concat": "^2.6.0",
+    "gulp": "^3.9.1",
+    "gulp-autoprefixer": "^3.1.1",
+    "gulp-coffee": "^2.3.4",
+    "gulp-concat": "^2.6.1",
     "gulp-eco": "0.0.2",
-    "gulp-plumber": "^1.0.1",
+    "gulp-plumber": "^1.1.0",
     "gulp-rename": "^1.2.2",
-    "gulp-sass": "^2.0.4",
-    "gulp-uglify": "^1.4.2",
-    "gulp-util": "^3.0.6",
-    "merge-stream": "^1.0.0",
-    "sass.js": "^0.9.2"
+    "gulp-sass": "^3.1.0",
+    "gulp-uglify": "^3.0.0",
+    "gulp-util": "^3.0.8",
+    "merge-stream": "^1.0.1",
+    "sass.js": "^0.10.5"
   }
 }
diff --git a/public/assets/chat/views/chat.eco b/public/assets/chat/views/chat.eco
index 6d73cc626..2860d193e 100644
--- a/public/assets/chat/views/chat.eco
+++ b/public/assets/chat/views/chat.eco
@@ -21,7 +21,7 @@
   
                            
   
                            
   
                            
-    
+    
                            
     
   
                            
 
                            
\ No newline at end of file
diff --git a/public/assets/images/icons.svg b/public/assets/images/icons.svg
index 5a377c4a6..b4b8b1d0e 100644
--- a/public/assets/images/icons.svg
+++ b/public/assets/images/icons.svg
@@ -1 +1 @@
-arrow-downarrow-leftarrow-rightarrow-upchatcheckbox-checkedcheckbox-indeterminatecheckboxcheckmarkclipboardclockcloudcogcrowndashboarddiagonal-crossdownloaddraggabledropdown-listemail-buttonemaileyedropperfacebook-buttonfacebookformgithub-buttongitlab-buttongoogle-buttongrouphelpimportantin-processinfoline-left-arrowline-right-arrowlinkedin-buttonlistloadinglock-openlocklogotypelong-arrow-rightmagnifiermarkermessageminus-smallminusmood-badmood-goodmood-okmood-superbadmood-supergoodmutenoteoauth2-buttonone-ticketorganizationoutbound-callsoverviewspackagepaperclippenpersonphoneplus-smallplusprinterradio-checkedradioreceived-callsreloadreopeningreply-allreplyreportsearchdetailsignoutsmall-dotsplitstatus-modified-outer-circlestatusstopwatchswitchViewtask-stateteamtelegramtemplatestoolstotal-ticketstrashtwitter-buttontwitterunmuteuserwebzoom-inzoom-out
\ No newline at end of file
+arrow-downarrow-leftarrow-rightarrow-upchatcheckbox-checkedcheckbox-indeterminatecheckboxcheckmarkclipboardclockcloudcogcrowndashboarddiagonal-crossdownloaddraggabledropdown-listemail-buttonemaileyedropperfacebook-buttonfacebookformgithub-buttongitlab-buttongoogle-buttongrouphelpimportantin-processinfoline-left-arrowline-right-arrowlinkedin-buttonlistloadinglock-openlocklogotypelong-arrow-rightmagnifiermarkermessageminus-smallminusmood-badmood-goodmood-okmood-superbadmood-supergoodmutenoteoauth2-buttonoffice365-buttonone-ticketorganizationoutbound-callsoverviewspackagepaperclippenpersonphoneplus-smallplusprinterradio-checkedradioreceived-callsreloadreopeningreply-allreplyreportsearchdetailsignoutsmall-dotsplitstatus-modified-outer-circlestatusstopwatchswitchViewtask-stateteamtelegramtemplatestoolstotal-ticketstrashtwitter-buttontwitterunmuteuserwebzoom-inzoom-out
\ No newline at end of file
diff --git a/public/assets/images/icons/office365-button.svg b/public/assets/images/icons/office365-button.svg
new file mode 100644
index 000000000..8fe7b1fda
--- /dev/null
+++ b/public/assets/images/icons/office365-button.svg
@@ -0,0 +1,12 @@
+
+
+    
+    office365-button
+    Created with Sketch.
+    
+    
+        
+            
+        
+    
+
\ No newline at end of file
diff --git a/public/assets/tests/html_utils.js b/public/assets/tests/html_utils.js
index a9c70a1b2..9b3263c48 100644
--- a/public/assets/tests/html_utils.js
+++ b/public/assets/tests/html_utils.js
@@ -201,12 +201,42 @@ test("html2text", function() {
 test("phoneify", function() {
 
   var source = "+1 123 123 123-123"
-  var should = 'tel://%2B1123123123-123'
+  var should = 'tel:+1123123123123'
   var result = App.Utils.phoneify(source)
   equal(result, should, source)
 
   source = "+1 123 123 A 123-123<>"
-  should = 'tel://%2B1123123A123-123%3C%3E'
+  should = 'tel:+1123123123123'
+  result = App.Utils.phoneify(source)
+  equal(result, should, source)
+
+  source = "+1 (123) 123 123-123"
+  should = 'tel:+1123123123123'
+  result = App.Utils.phoneify(source)
+  equal(result, should, source)
+
+  source = "+1 (123) 123 1#23-123"
+  should = 'tel:+11231231#23123'
+  result = App.Utils.phoneify(source)
+  equal(result, should, source)
+
+  source = "+1 (123) 12*3 1#23-123"
+  should = 'tel:+112312*31#23123'
+  result = App.Utils.phoneify(source)
+  equal(result, should, source)
+
+  source = "+1 (123) 12+3"
+  should = 'tel:+1123123'
+  result = App.Utils.phoneify(source)
+  equal(result, should, source)
+
+  source = "+1 (123) 123 "
+  should = 'tel:+1123123'
+  result = App.Utils.phoneify(source)
+  equal(result, should, source)
+
+  source = "  +1 (123) 123 "
+  should = 'tel:+1123123'
   result = App.Utils.phoneify(source)
   equal(result, should, source)
 })
@@ -1100,6 +1130,16 @@ test("check replace tags", function() {
   verify = App.Utils.replaceTags(message, data)
   equal(verify, result)
 
+  message = "
                            #{user.firstname} #{user.lastname}
                            "
+  result  = '
                            Bob Smith
                            '
+  data    = {
+    user: {
+      firstname: 'Bob',
+      lastname: 'Smith',
+    },
+  }
+  verify = App.Utils.replaceTags(message, data)
+  equal(verify, result)
 });
 
 // check attibute validation
diff --git a/script/scheduler.rb b/script/scheduler.rb
index 076a91d82..5be7db8c3 100755
--- a/script/scheduler.rb
+++ b/script/scheduler.rb
@@ -47,6 +47,7 @@ daemon_options = {
 
 name = 'scheduler'
 Daemons.run_proc(name, daemon_options) do
+
   if ARGV.include?('--')
     ARGV.slice! 0..ARGV.index('--')
   else
@@ -55,6 +56,12 @@ Daemons.run_proc(name, daemon_options) do
 
   after_fork(dir)
 
+  Rails.logger.info 'Scheduler started.'
+
+  at_exit do
+    Rails.logger.info 'Scheduler stopped.'
+  end
+
   require 'scheduler'
   Scheduler.threads
 end
diff --git a/spec/lib/import/base_resource_spec.rb b/spec/lib/import/base_resource_spec.rb
index f0fb77016..8b5321321 100644
--- a/spec/lib/import/base_resource_spec.rb
+++ b/spec/lib/import/base_resource_spec.rb
@@ -1,7 +1,5 @@
 require 'rails_helper'
 
-RSpec::Matchers.define_negated_matcher :not_change, :change
-
 RSpec.describe Import::BaseResource do
 
   it "needs an implementation of the 'import_class' method" do
diff --git a/spec/lib/import/ldap/user_spec.rb b/spec/lib/import/ldap/user_spec.rb
index f49140828..14e76c5bd 100644
--- a/spec/lib/import/ldap/user_spec.rb
+++ b/spec/lib/import/ldap/user_spec.rb
@@ -1,8 +1,6 @@
 require 'rails_helper'
 require 'import/ldap/user'
 
-RSpec::Matchers.define_negated_matcher :not_change, :change
-
 RSpec.describe Import::Ldap::User do
 
   let(:uid) { 'exampleuid' }
diff --git a/spec/lib/import/otrs/dynamic_field/checkbox_spec.rb b/spec/lib/import/otrs/dynamic_field/checkbox_spec.rb
index 658467d92..000ecc5a1 100644
--- a/spec/lib/import/otrs/dynamic_field/checkbox_spec.rb
+++ b/spec/lib/import/otrs/dynamic_field/checkbox_spec.rb
@@ -29,7 +29,7 @@ RSpec.describe Import::OTRS::DynamicField::Checkbox do
           true => 'Yes',
           false => 'No'
         },
-        null: false,
+        null: true,
         translate: true
       }
     }
diff --git a/spec/lib/import/otrs/dynamic_field/date_spec.rb b/spec/lib/import/otrs/dynamic_field/date_spec.rb
index 2fa688a37..0de5e4cb4 100644
--- a/spec/lib/import/otrs/dynamic_field/date_spec.rb
+++ b/spec/lib/import/otrs/dynamic_field/date_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe Import::OTRS::DynamicField::Date do
         future: false,
         past:   false,
         diff:   0,
-        null:   false
+        null:   true
       }
     }
 
diff --git a/spec/lib/import/otrs/dynamic_field/date_time_spec.rb b/spec/lib/import/otrs/dynamic_field/date_time_spec.rb
index 1fc1c7601..b2ac81093 100644
--- a/spec/lib/import/otrs/dynamic_field/date_time_spec.rb
+++ b/spec/lib/import/otrs/dynamic_field/date_time_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe Import::OTRS::DynamicField::DateTime do
         future: true,
         past: true,
         diff: 72,
-        null: false
+        null: true
       }
     }
 
diff --git a/spec/lib/import/otrs/dynamic_field/dropdown_spec.rb b/spec/lib/import/otrs/dynamic_field/dropdown_spec.rb
index 75b7bce81..5cc0f1365 100644
--- a/spec/lib/import/otrs/dynamic_field/dropdown_spec.rb
+++ b/spec/lib/import/otrs/dynamic_field/dropdown_spec.rb
@@ -32,8 +32,9 @@ RSpec.describe Import::OTRS::DynamicField::Dropdown do
           'Köln'    => 'Köln',
           'Berlin'  => 'Berlin'
         },
-        null:      true,
-        translate: false
+        nulloption: true,
+        null:       true,
+        translate:  false
       }
     }
 
diff --git a/spec/lib/import/otrs/dynamic_field/multiselect_spec.rb b/spec/lib/import/otrs/dynamic_field/multiselect_spec.rb
index 4b7e0e1c8..be8ca129b 100644
--- a/spec/lib/import/otrs/dynamic_field/multiselect_spec.rb
+++ b/spec/lib/import/otrs/dynamic_field/multiselect_spec.rb
@@ -32,8 +32,9 @@ RSpec.describe Import::OTRS::DynamicField::Multiselect do
           'Köln'    => 'Köln',
           'Berlin'  => 'Berlin'
         },
-        null:      false,
-        translate: false
+        nulloption: false,
+        null:       true,
+        translate:  false
       }
     }
 
diff --git a/spec/lib/import/otrs/dynamic_field/text_area_spec.rb b/spec/lib/import/otrs/dynamic_field/text_area_spec.rb
index fa8e430af..18199a7ca 100644
--- a/spec/lib/import/otrs/dynamic_field/text_area_spec.rb
+++ b/spec/lib/import/otrs/dynamic_field/text_area_spec.rb
@@ -26,7 +26,7 @@ RSpec.describe Import::OTRS::DynamicField::TextArea do
       data_option:   {
         default: '',
         rows:    '20',
-        null:    false
+        null:    true
       }
     }
 
diff --git a/spec/lib/import/otrs/dynamic_field/text_spec.rb b/spec/lib/import/otrs/dynamic_field/text_spec.rb
index 34201654b..1b0919958 100644
--- a/spec/lib/import/otrs/dynamic_field/text_spec.rb
+++ b/spec/lib/import/otrs/dynamic_field/text_spec.rb
@@ -27,7 +27,7 @@ RSpec.describe Import::OTRS::DynamicField::Text do
         default:   '',
         type:      'text',
         maxlength: 255,
-        null:      false
+        null:      true
       }
     }
 
diff --git a/spec/lib/import/otrs/state_factory_spec.rb b/spec/lib/import/otrs/state_factory_spec.rb
index 205cfb892..734025fec 100644
--- a/spec/lib/import/otrs/state_factory_spec.rb
+++ b/spec/lib/import/otrs/state_factory_spec.rb
@@ -1,8 +1,6 @@
 require 'rails_helper'
 require 'lib/import/transaction_factory_examples'
 
-RSpec::Matchers.define_negated_matcher :not_change, :change
-
 RSpec.describe Import::OTRS::StateFactory do
   it_behaves_like 'Import::TransactionFactory'
 
diff --git a/spec/lib/sequencer/unit/common/attribute_mapper_spec.rb b/spec/lib/sequencer/unit/common/attribute_mapper_spec.rb
new file mode 100644
index 000000000..991180335
--- /dev/null
+++ b/spec/lib/sequencer/unit/common/attribute_mapper_spec.rb
@@ -0,0 +1,42 @@
+require 'rails_helper'
+
+RSpec.describe Sequencer::Unit::Common::AttributeMapper, sequencer: :unit do
+
+  let(:map) {
+    {
+      old_key: :new_key,
+      second:  :new_second,
+    }
+  }
+
+  it 'expects an implementation of the .map method' do
+    expect do
+      described_class.map
+    end.to raise_error(RuntimeError)
+  end
+
+  it 'declares uses from map keys' do
+    expect(described_class).to receive(:map).and_return(map)
+    expect(described_class.uses).to eq(map.keys)
+  end
+
+  it 'declares provides from map values' do
+    expect(described_class).to receive(:map).and_return(map)
+    expect(described_class.provides).to eq(map.values)
+  end
+
+  it 'maps as configured' do
+
+    old = {
+      old_key: :value,
+      second:  :second_value,
+    }
+
+    allow(described_class).to receive(:map).and_return(map)
+    result = process(old)
+
+    expect(result.keys.size).to eq 2
+    expect(result[:new_key]).to eq old[:old_key]
+    expect(result[:new_second]).to eq old[:second]
+  end
+end
diff --git a/spec/lib/sequencer/unit/import/common/mapping/flat_keys_spec.rb b/spec/lib/sequencer/unit/import/common/mapping/flat_keys_spec.rb
new file mode 100644
index 000000000..0ce2aacd2
--- /dev/null
+++ b/spec/lib/sequencer/unit/import/common/mapping/flat_keys_spec.rb
@@ -0,0 +1,38 @@
+require 'rails_helper'
+
+RSpec.describe Sequencer::Unit::Import::Common::Mapping::FlatKeys, sequencer: :unit do
+
+  it 'raises an error if mapping method is not implemented' do
+    expect do
+      process(
+        resource: {
+          remote_attribute: 'value',
+        }
+      )
+    end.to raise_error(RuntimeError, /mapping/)
+  end
+
+  it 'maps flat key structures' do
+
+    parameters = {
+      resource: {
+        remote_attribute: 'value',
+      }
+    }
+
+    mapping = {
+      remote_attribute: :local_attribute
+    }
+
+    provided = process(parameters) do |instance|
+      expect(instance).to receive(:mapping).and_return(mapping)
+    end
+
+    expect(provided).to eq(
+      mapped: {
+        'local_attribute' => 'value',
+      }
+    )
+    expect(provided[:mapped]).to be_a(ActiveSupport::HashWithIndifferentAccess)
+  end
+end
diff --git a/spec/models/scheduler_spec.rb b/spec/models/scheduler_spec.rb
index 6f9302e65..7432186d0 100644
--- a/spec/models/scheduler_spec.rb
+++ b/spec/models/scheduler_spec.rb
@@ -1,7 +1,5 @@
 require 'rails_helper'
 
-RSpec::Matchers.define_negated_matcher :not_change, :change
-
 RSpec.describe Scheduler do
 
   before do
diff --git a/spec/models/ticket_spec.rb b/spec/models/ticket_spec.rb
index 3ef97f67e..f90bf2029 100644
--- a/spec/models/ticket_spec.rb
+++ b/spec/models/ticket_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 RSpec.describe Ticket do
 
-  describe '.merge_to' do
+  describe '#merge_to' do
 
     it 'reassigns all links to the target ticket after merge' do
       source_ticket     = create(:ticket)
@@ -32,9 +32,38 @@ RSpec.describe Ticket do
       expect(check_ticket_ids).to match_array(expected_ticket_ids)
     end
 
+    it 'prevents cross merging tickets' do
+      source_ticket     = create(:ticket)
+      target_ticket     = create(:ticket)
+
+      result = source_ticket.merge_to(
+        ticket_id: target_ticket.id,
+        user_id:   1,
+      )
+      expect(result).to be(true)
+
+      expect {
+        result = target_ticket.merge_to(
+          ticket_id: source_ticket.id,
+          user_id:   1,
+        )
+      }.to raise_error('ticket already merged, no merge into merged ticket possible')
+    end
+
+    it 'prevents merging ticket in it self' do
+      source_ticket = create(:ticket)
+
+      expect {
+        result = source_ticket.merge_to(
+          ticket_id: source_ticket.id,
+          user_id:   1,
+        )
+      }.to raise_error('Can\'t merge ticket with it self!')
+    end
+
   end
 
-  describe '.destroy' do
+  describe '#destroy' do
 
     it 'deletes all related objects before destroy' do
       ApplicationHandleInfo.current = 'application_server'
@@ -144,7 +173,7 @@ RSpec.describe Ticket do
 
   end
 
-  describe '.perform_changes' do
+  describe '#perform_changes' do
 
     it 'performes a ticket state change on a ticket' do
       source_ticket = create(:ticket)
@@ -174,4 +203,27 @@ RSpec.describe Ticket do
 
   end
 
+  context 'callbacks' do
+
+    describe '#reset_pending_time' do
+
+      it 'resets the pending time on state change' do
+        ticket = create(:ticket,
+                        state:        Ticket::State.lookup(name: 'pending reminder'),
+                        pending_time: Time.zone.now + 2.days)
+        expect(ticket.pending_time).not_to be nil
+
+        ticket.update_attribute(:state, Ticket::State.lookup(name: 'open'))
+        expect(ticket.pending_time).to be nil
+      end
+
+      it 'lets handle ActiveRecord nil as new value' do
+        ticket = create(:ticket)
+        expect do
+          ticket.update_attribute(:state, nil)
+        end.to raise_error(ActiveRecord::StatementInvalid)
+      end
+
+    end
+  end
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 8dc205a0f..e2a8bf18f 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -26,6 +26,34 @@ RSpec.describe User do
     end
   end
 
+  context '#out_of_office_agent' do
+
+    it 'responds to out_of_office_agent' do
+      user = create(:user)
+      expect(user).to respond_to(:out_of_office_agent)
+    end
+
+    context 'replacement' do
+
+      it 'finds assigned' do
+        user_replacement = create(:user)
+
+        user_ooo = create(:user,
+                          out_of_office:                true,
+                          out_of_office_start_at:       Time.zone.yesterday,
+                          out_of_office_end_at:         Time.zone.tomorrow,
+                          out_of_office_replacement_id: user_replacement.id,)
+
+        expect(user_ooo.out_of_office_agent).to eq user_replacement
+      end
+
+      it 'finds none for available users' do
+        user = create(:user)
+        expect(user.out_of_office_agent).to be nil
+      end
+    end
+  end
+
   context '#max_login_failed?' do
 
     it 'responds to max_login_failed?' do
diff --git a/spec/support/negated_matchers.rb b/spec/support/negated_matchers.rb
new file mode 100644
index 000000000..93f5b66e5
--- /dev/null
+++ b/spec/support/negated_matchers.rb
@@ -0,0 +1 @@
+RSpec::Matchers.define_negated_matcher :not_change, :change
diff --git a/spec/support/sequencer.rb b/spec/support/sequencer.rb
new file mode 100644
index 000000000..bbbfa9f8b
--- /dev/null
+++ b/spec/support/sequencer.rb
@@ -0,0 +1,19 @@
+module SequencerUnit
+
+  def process(parameters, &block)
+    Sequencer::Unit.process(described_class.name, parameters, &block)
+  end
+end
+
+module SequencerSequence
+
+  def process(parameters = {})
+    Sequencer.process(described_class.name,
+                      parameters: parameters)
+  end
+end
+
+RSpec.configure do |config|
+  config.include SequencerUnit, sequencer: :unit
+  config.include SequencerSequence, sequencer: :sequence
+end
diff --git a/spec/support/system_init.rb b/spec/support/system_init.rb
index 2ff4deb8c..3b4bcec18 100644
--- a/spec/support/system_init.rb
+++ b/spec/support/system_init.rb
@@ -1,11 +1,15 @@
 RSpec.configure do |config|
   config.before(:suite) do
-    FactoryGirl.create(:user,
-                       login:     'admin',
-                       firstname: 'Admin',
-                       lastname:  'Admin',
-                       email:     'admin@example.com',
-                       password:  'admin',
-                       roles:     [Role.lookup(name: 'Admin')],)
+
+    email = 'admin@example.com'
+    if !::User.exists?(email: email)
+      FactoryGirl.create(:user,
+                         login:     'admin',
+                         firstname: 'Admin',
+                         lastname:  'Admin',
+                         email:     email,
+                         password:  'admin',
+                         roles:     [Role.lookup(name: 'Admin')],)
+    end
   end
 end
diff --git a/test/browser/agent_ticket_update_and_reload_test.rb b/test/browser/agent_ticket_update_and_reload_test.rb
index 823477cf1..27a5583d1 100644
--- a/test/browser/agent_ticket_update_and_reload_test.rb
+++ b/test/browser/agent_ticket_update_and_reload_test.rb
@@ -25,6 +25,7 @@ class AgentTicketUpdateAndReloadTest < TestCase
     sleep 6
 
     # check if customer is shown in sidebar
+    click(css: '.active .tabsSidebar-tab[data-tab="customer"]')
     match(
       css: '.active .sidebar[data-tab="customer"]',
       value: 'nicole',
@@ -46,6 +47,7 @@ class AgentTicketUpdateAndReloadTest < TestCase
     reload()
 
     # check if customer is still shown in sidebar
+    click(css: '.active .tabsSidebar-tab[data-tab="customer"]')
     watch_for(
       css: '.active .sidebar[data-tab="customer"]',
       value: 'nicole',
diff --git a/test/browser_test_helper.rb b/test/browser_test_helper.rb
index 1e221f193..f0c42a8d1 100644
--- a/test/browser_test_helper.rb
+++ b/test/browser_test_helper.rb
@@ -2261,7 +2261,7 @@ wait untill text in selector disabppears
     9.times {
       begin
         text = instance.find_elements(css: '.content.active .js-reset')[0].text
-        if !text || text.empty?
+        if text.blank?
           screenshot(browser: instance, comment: 'ticket_update_ok')
           sleep 1
           return true
diff --git a/test/controllers/form_controller_test.rb b/test/controllers/form_controller_test.rb
index f3c8e3612..7637802d0 100644
--- a/test/controllers/form_controller_test.rb
+++ b/test/controllers/form_controller_test.rb
@@ -34,6 +34,12 @@ class FormControllerTest < ActionDispatch::IntegrationTest
     Rake::Task['searchindex:rebuild'].execute
   end
 
+  teardown do
+    if ENV['ES_URL'].present?
+      Rake::Task['searchindex:drop'].execute
+    end
+  end
+
   test '01 - get config call' do
     post '/api/v1/form_config', {}.to_json, @headers
     assert_response(401)
diff --git a/test/controllers/integration_check_mk_controller_test.rb b/test/controllers/integration_check_mk_controller_test.rb
new file mode 100644
index 000000000..6bef50bea
--- /dev/null
+++ b/test/controllers/integration_check_mk_controller_test.rb
@@ -0,0 +1,270 @@
+# encoding: utf-8
+require 'test_helper'
+
+class IntegationCheckMkControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    token = SecureRandom.urlsafe_base64(16)
+    Setting.set('check_mk_token', token)
+    Setting.set('check_mk_integration', true)
+  end
+
+  test '01 without token' do
+    post '/api/v1/integration/check_mk/', {}
+    assert_response(404)
+  end
+
+  test '01 invalid token & enabled feature' do
+    post '/api/v1/integration/check_mk/invalid_token', {}
+    assert_response(422)
+
+    result = JSON.parse(@response.body)
+    assert_equal(Hash, result.class)
+    assert_equal('Invalid token!', result['error'])
+  end
+
+  test '01 invalid token & disabled feature' do
+    Setting.set('check_mk_integration', false)
+
+    post '/api/v1/integration/check_mk/invalid_token', {}
+    assert_response(422)
+
+    result = JSON.parse(@response.body)
+    assert_equal(Hash, result.class)
+    assert_equal('Feature is disable, please contact your admin to enable it!', result['error'])
+  end
+
+  test '02 ticket create & close' do
+    params = {
+      event_id: '123',
+      state: 'down',
+      host: 'some host',
+      service: 'some service',
+    }
+    post "/api/v1/integration/check_mk/#{Setting.get('check_mk_token')}", params
+    assert_response(200)
+
+    result = JSON.parse(@response.body)
+    assert_equal(Hash, result.class)
+
+    assert(result['result'])
+    assert(result['ticket_id'])
+    assert(result['ticket_number'])
+
+    ticket = Ticket.find(result['ticket_id'])
+    assert_equal('new', ticket.state.name)
+    assert_equal(1, ticket.articles.count)
+
+    params = {
+      event_id: '123',
+      state: 'up',
+      host: 'some host',
+      service: 'some service',
+    }
+    post "/api/v1/integration/check_mk/#{Setting.get('check_mk_token')}", params
+    assert_response(200)
+
+    result = JSON.parse(@response.body)
+    assert_equal(Hash, result.class)
+
+    assert(result['result'])
+    assert(result['ticket_ids'].include?(ticket.id))
+
+    ticket.reload
+    assert_equal('closed', ticket.state.name)
+    assert_equal(2, ticket.articles.count)
+  end
+
+  test '02 ticket create & create & auto close' do
+    params = {
+      event_id: '123',
+      state: 'down',
+      host: 'some host',
+      service: 'some service',
+    }
+    post "/api/v1/integration/check_mk/#{Setting.get('check_mk_token')}", params
+    assert_response(200)
+
+    result = JSON.parse(@response.body)
+    assert_equal(Hash, result.class)
+
+    assert(result['result'])
+    assert(result['ticket_id'])
+    assert(result['ticket_number'])
+
+    ticket = Ticket.find(result['ticket_id'])
+    assert_equal('new', ticket.state.name)
+    assert_equal(1, ticket.articles.count)
+
+    params = {
+      event_id: '123',
+      state: 'down',
+      host: 'some host',
+      service: 'some service',
+    }
+    post "/api/v1/integration/check_mk/#{Setting.get('check_mk_token')}", params
+    assert_response(200)
+
+    result = JSON.parse(@response.body)
+    assert_equal(Hash, result.class)
+
+    assert_equal('ticket already open, added note', result['result'])
+    assert(result['ticket_ids'].include?(ticket.id))
+
+    ticket.reload
+    assert_equal('new', ticket.state.name)
+    assert_equal(2, ticket.articles.count)
+
+    params = {
+      event_id: '123',
+      state: 'up',
+      host: 'some host',
+      service: 'some service',
+    }
+    post "/api/v1/integration/check_mk/#{Setting.get('check_mk_token')}", params
+    assert_response(200)
+
+    result = JSON.parse(@response.body)
+    assert_equal(Hash, result.class)
+
+    assert(result['result'])
+    assert(result['ticket_ids'].include?(ticket.id))
+
+    ticket.reload
+    assert_equal('closed', ticket.state.name)
+    assert_equal(3, ticket.articles.count)
+  end
+
+  test '02 ticket close' do
+    params = {
+      event_id: '123',
+      state: 'up',
+      host: 'some host',
+      service: 'some service',
+    }
+    post "/api/v1/integration/check_mk/#{Setting.get('check_mk_token')}", params
+    assert_response(200)
+
+    result = JSON.parse(@response.body)
+    assert_equal(Hash, result.class)
+
+    assert_equal('no open tickets found, ignore action', result['result'])
+  end
+
+  test '02 ticket create & create & no auto close' do
+    Setting.set('check_mk_auto_close', false)
+    params = {
+      event_id: '123',
+      state: 'down',
+      host: 'some host',
+      service: 'some service',
+    }
+    post "/api/v1/integration/check_mk/#{Setting.get('check_mk_token')}", params
+    assert_response(200)
+
+    result = JSON.parse(@response.body)
+    assert_equal(Hash, result.class)
+
+    assert(result['result'])
+    assert(result['ticket_id'])
+    assert(result['ticket_number'])
+
+    ticket = Ticket.find(result['ticket_id'])
+    assert_equal('new', ticket.state.name)
+    assert_equal(1, ticket.articles.count)
+
+    params = {
+      event_id: '123',
+      state: 'down',
+      host: 'some host',
+      service: 'some service',
+    }
+    post "/api/v1/integration/check_mk/#{Setting.get('check_mk_token')}", params
+    assert_response(200)
+
+    result = JSON.parse(@response.body)
+    assert_equal(Hash, result.class)
+
+    assert_equal('ticket already open, added note', result['result'])
+    assert(result['ticket_ids'].include?(ticket.id))
+
+    ticket.reload
+    assert_equal('new', ticket.state.name)
+    assert_equal(2, ticket.articles.count)
+
+    params = {
+      event_id: '123',
+      state: 'up',
+      host: 'some host',
+      service: 'some service',
+    }
+    post "/api/v1/integration/check_mk/#{Setting.get('check_mk_token')}", params
+    assert_response(200)
+
+    result = JSON.parse(@response.body)
+    assert_equal(Hash, result.class)
+
+    assert_equal('ticket already open, added note', result['result'])
+    assert(result['ticket_ids'].include?(ticket.id))
+
+    ticket.reload
+    assert_equal('new', ticket.state.name)
+    assert_equal(3, ticket.articles.count)
+  end
+
+  test '02 ticket create & create & auto close - host only' do
+    params = {
+      event_id: '123',
+      state: 'down',
+      host: 'some host',
+    }
+    post "/api/v1/integration/check_mk/#{Setting.get('check_mk_token')}", params
+    assert_response(200)
+
+    result = JSON.parse(@response.body)
+    assert_equal(Hash, result.class)
+
+    assert(result['result'])
+    assert(result['ticket_id'])
+    assert(result['ticket_number'])
+
+    ticket = Ticket.find(result['ticket_id'])
+    assert_equal('new', ticket.state.name)
+    assert_equal(1, ticket.articles.count)
+
+    params = {
+      event_id: '123',
+      state: 'down',
+      host: 'some host',
+    }
+    post "/api/v1/integration/check_mk/#{Setting.get('check_mk_token')}", params
+    assert_response(200)
+
+    result = JSON.parse(@response.body)
+    assert_equal(Hash, result.class)
+
+    assert_equal('ticket already open, added note', result['result'])
+    assert(result['ticket_ids'].include?(ticket.id))
+
+    ticket.reload
+    assert_equal('new', ticket.state.name)
+    assert_equal(2, ticket.articles.count)
+
+    params = {
+      event_id: '123',
+      state: 'up',
+      host: 'some host',
+    }
+    post "/api/v1/integration/check_mk/#{Setting.get('check_mk_token')}", params
+    assert_response(200)
+
+    result = JSON.parse(@response.body)
+    assert_equal(Hash, result.class)
+
+    assert(result['result'])
+    assert(result['ticket_ids'].include?(ticket.id))
+
+    ticket.reload
+    assert_equal('closed', ticket.state.name)
+    assert_equal(3, ticket.articles.count)
+  end
+end
diff --git a/test/controllers/search_controller_test.rb b/test/controllers/search_controller_test.rb
index 2528238a2..dea48e6be 100644
--- a/test/controllers/search_controller_test.rb
+++ b/test/controllers/search_controller_test.rb
@@ -179,6 +179,12 @@ class SearchControllerTest < ActionDispatch::IntegrationTest
     end
   end
 
+  teardown do
+    if ENV['ES_URL'].present?
+      Rake::Task['searchindex:drop'].execute
+    end
+  end
+
   test 'settings index with nobody' do
     params = {
       query: 'test 1234',
diff --git a/test/controllers/user_organization_controller_test.rb b/test/controllers/user_organization_controller_test.rb
index 1107547ce..4754a75de 100644
--- a/test/controllers/user_organization_controller_test.rb
+++ b/test/controllers/user_organization_controller_test.rb
@@ -126,7 +126,23 @@ class UserOrganizationControllerTest < ActionDispatch::IntegrationTest
     assert_response(422)
     result = JSON.parse(@response.body)
     assert(result['error'])
-    assert_equal('User already exists!', result['error'])
+    assert_equal('Email address is already used for other user.', result['error'])
+
+    # email missing with enabled feature
+    params = { firstname: 'some firstname', signup: true }
+    post '/api/v1/users', params.to_json, headers
+    assert_response(422)
+    result = JSON.parse(@response.body)
+    assert(result['error'])
+    assert_equal('Attribute \'email\' required!', result['error'])
+
+    # email missing with enabled feature
+    params = { firstname: 'some firstname', signup: true }
+    post '/api/v1/users', params.to_json, headers
+    assert_response(422)
+    result = JSON.parse(@response.body)
+    assert(result['error'])
+    assert_equal('Attribute \'email\' required!', result['error'])
 
     # create user with enabled feature (take customer role)
     params = { firstname: 'Me First', lastname: 'Me Last', email: 'new_here@example.com', signup: true }
@@ -322,7 +338,7 @@ class UserOrganizationControllerTest < ActionDispatch::IntegrationTest
     assert_response(422)
     result = JSON.parse(@response.body)
     assert(result)
-    assert_equal('User already exists!', result['error'])
+    assert_equal('Email address is already used for other user.', result['error'])
 
     # missing required attributes
     params = { note: 'some note' }
@@ -330,15 +346,9 @@ class UserOrganizationControllerTest < ActionDispatch::IntegrationTest
     assert_response(422)
     result = JSON.parse(@response.body)
     assert(result)
-    assert_equal('Attribute \'login\' required!', result['error'])
-
-    params = { firstname: 'newfirstname123', note: 'some note' }
-    post '/api/v1/users', params.to_json, @headers.merge('Authorization' => credentials)
-    assert_response(422)
-    result = JSON.parse(@response.body)
-    assert(result)
-    assert_equal('Attribute \'login\' required!', result['error'])
+    assert_equal('Minimum one identifier (login, firstname, lastname, phone or email) for user is required.', result['error'])
 
+    # invalid email
     params = { firstname: 'newfirstname123', email: 'some_what', note: 'some note' }
     post '/api/v1/users', params.to_json, @headers.merge('Authorization' => credentials)
     assert_response(422)
@@ -346,6 +356,20 @@ class UserOrganizationControllerTest < ActionDispatch::IntegrationTest
     assert(result)
     assert_equal('Invalid email', result['error'])
 
+    # with valid attributes
+    params = { firstname: 'newfirstname123', note: 'some note' }
+    post '/api/v1/users', params.to_json, @headers.merge('Authorization' => credentials)
+    assert_response(201)
+    result = JSON.parse(@response.body)
+    assert(result)
+    user = User.find(result['id'])
+    assert_not(user.role?('Admin'))
+    assert_not(user.role?('Agent'))
+    assert(user.role?('Customer'))
+    assert(result['login'].start_with?('auto-'))
+    assert_equal('', result['email'])
+    assert_equal('newfirstname123', result['firstname'])
+    assert_equal('', result['lastname'])
   end
 
   test 'user index and create with agent' do
diff --git a/test/fixtures/calendar1.ics b/test/fixtures/calendar1.ics
new file mode 100644
index 000000000..ad2c285ca
--- /dev/null
+++ b/test/fixtures/calendar1.ics
@@ -0,0 +1,30 @@
+BEGIN:VCALENDAR
+METHOD:PUBLISH
+VERSION:2.0
+X-WR-CALNAME:test2
+PRODID:-//Apple Inc.//Mac OS X 10.12.6//EN
+X-APPLE-CALENDAR-COLOR:#CC73E1
+X-WR-TIMEZONE:Europe/Berlin
+CALSCALE:GREGORIAN
+BEGIN:VEVENT
+CREATED:20170824T123259Z
+UID:D49093CD-2D9D-4B79-9DDA-79E1528B010E
+RRULE:FREQ=YEARLY;INTERVAL=1
+DTEND;VALUE=DATE:20121225
+TRANSP:TRANSPARENT
+X-APPLE-TRAVEL-ADVISORY-BEHAVIOR:AUTOMATIC
+SUMMARY:Christmas1
+DTSTART;VALUE=DATE:20121224
+DTSTAMP:20170824T123314Z
+SEQUENCE:0
+BEGIN:VALARM
+X-WR-ALARMUID:D8B0F2C4-B45E-4D1B-9DC5-80DCDF5F06C1
+UID:D8B0F2C4-B45E-4D1B-9DC5-80DCDF5F06C1
+TRIGGER:-PT15H
+ATTACH;VALUE=URI:Basso
+X-APPLE-LOCAL-DEFAULT-ALARM:TRUE
+ACTION:AUDIO
+X-APPLE-DEFAULT-ALARM:TRUE
+END:VALARM
+END:VEVENT
+END:VCALENDAR
diff --git a/test/fixtures/calendar2.ics b/test/fixtures/calendar2.ics
new file mode 100644
index 000000000..5bed19d71
--- /dev/null
+++ b/test/fixtures/calendar2.ics
@@ -0,0 +1,51 @@
+BEGIN:VCALENDAR
+METHOD:PUBLISH
+VERSION:2.0
+X-WR-CALNAME:test2
+PRODID:-//Apple Inc.//Mac OS X 10.12.6//EN
+X-APPLE-CALENDAR-COLOR:#CC73E1
+X-WR-TIMEZONE:Europe/Berlin
+CALSCALE:GREGORIAN
+BEGIN:VEVENT
+CREATED:20170824T123259Z
+UID:D49093CD-2D9D-4B79-9DDA-79E1528B010E
+RRULE:FREQ=YEARLY;INTERVAL=1
+DTEND;VALUE=DATE:20121225
+TRANSP:TRANSPARENT
+X-APPLE-TRAVEL-ADVISORY-BEHAVIOR:AUTOMATIC
+SUMMARY:Christmas1
+DTSTART;VALUE=DATE:20121224
+DTSTAMP:20170824T123314Z
+SEQUENCE:0
+BEGIN:VALARM
+X-WR-ALARMUID:D8B0F2C4-B45E-4D1B-9DC5-80DCDF5F06C1
+UID:D8B0F2C4-B45E-4D1B-9DC5-80DCDF5F06C1
+TRIGGER:-PT15H
+ATTACH;VALUE=URI:Basso
+X-APPLE-LOCAL-DEFAULT-ALARM:TRUE
+ACTION:AUDIO
+X-APPLE-DEFAULT-ALARM:TRUE
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20170824T123259Z
+UID:D49093CD-2D9D-4B79-9DDA-79E1528B010G
+RRULE:FREQ=YEARLY;INTERVAL=1
+DTEND;VALUE=DATE:20121225
+TRANSP:TRANSPARENT
+X-APPLE-TRAVEL-ADVISORY-BEHAVIOR:AUTOMATIC
+SUMMARY:Christmas2
+DTSTART;VALUE=DATE:20121225
+DTSTAMP:20170824T123314Z
+SEQUENCE:0
+BEGIN:VALARM
+X-WR-ALARMUID:D8B0F2C4-B45E-4D1B-9DC5-80DCDF5F06C1
+UID:D8B0F2C4-B45E-4D1B-9DC5-80DCDF5F06C1
+TRIGGER:-PT15H
+ATTACH;VALUE=URI:Basso
+X-APPLE-LOCAL-DEFAULT-ALARM:TRUE
+ACTION:AUDIO
+X-APPLE-DEFAULT-ALARM:TRUE
+END:VALARM
+END:VEVENT
+END:VCALENDAR
diff --git a/test/fixtures/calendar3.ics b/test/fixtures/calendar3.ics
new file mode 100644
index 000000000..98649a964
--- /dev/null
+++ b/test/fixtures/calendar3.ics
@@ -0,0 +1,111 @@
+BEGIN:VCALENDAR
+METHOD:PUBLISH
+VERSION:2.0
+X-WR-CALNAME:test2
+PRODID:-//Apple Inc.//Mac OS X 10.12.6//EN
+X-APPLE-CALENDAR-COLOR:#CC73E1
+X-WR-TIMEZONE:Europe/Berlin
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:Europe/Berlin
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+DTSTART:19810329T020000
+TZNAME:GMT+2
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+DTSTART:19961027T030000
+TZNAME:GMT+1
+TZOFFSETTO:+0100
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20170824T123259Z
+UID:D49093CD-2D9D-4B79-9DDA-79E1528B010E
+RRULE:FREQ=YEARLY;INTERVAL=1
+DTEND;VALUE=DATE:20121225
+TRANSP:TRANSPARENT
+X-APPLE-TRAVEL-ADVISORY-BEHAVIOR:AUTOMATIC
+SUMMARY:Christmas1
+DTSTART;VALUE=DATE:20121224
+DTSTAMP:20170824T123314Z
+SEQUENCE:0
+BEGIN:VALARM
+X-WR-ALARMUID:D8B0F2C4-B45E-4D1B-9DC5-80DCDF5F06C1
+UID:D8B0F2C4-B45E-4D1B-9DC5-80DCDF5F06C1
+TRIGGER:-PT15H
+ATTACH;VALUE=URI:Basso
+X-APPLE-LOCAL-DEFAULT-ALARM:TRUE
+ACTION:AUDIO
+X-APPLE-DEFAULT-ALARM:TRUE
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20170824T123409Z
+UID:B461611E-DF33-42BA-B40E-DF32FAD3BA92
+RRULE:FREQ=MONTHLY;INTERVAL=1;COUNT=10
+DTEND;TZID=Europe/Berlin:20121228T100000
+TRANSP:OPAQUE
+X-APPLE-TRAVEL-ADVISORY-BEHAVIOR:AUTOMATIC
+SUMMARY:day4
+DTSTART;TZID=Europe/Berlin:20121228T090000
+DTSTAMP:20170824T134117Z
+SEQUENCE:0
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20170824T123419Z
+UID:4F1F0444-9F71-4FDD-9D4A-EBA6BF1EF72E
+RRULE:FREQ=MONTHLY;INTERVAL=1;COUNT=5
+DTEND;VALUE=DATE:20121227
+TRANSP:TRANSPARENT
+X-APPLE-TRAVEL-ADVISORY-BEHAVIOR:AUTOMATIC
+SUMMARY:day3
+DTSTART;VALUE=DATE:20161226
+DTSTAMP:20170824T134106Z
+SEQUENCE:0
+BEGIN:VALARM
+X-WR-ALARMUID:118EB330-738F-4956-9FAD-D548462CC26A
+UID:118EB330-738F-4956-9FAD-D548462CC26A
+TRIGGER:-PT15H
+ATTACH;VALUE=URI:Basso
+X-APPLE-LOCAL-DEFAULT-ALARM:TRUE
+ACTION:AUDIO
+X-APPLE-DEFAULT-ALARM:TRUE
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20170824T134043Z
+UID:3606DA64-D734-434A-A430-E2AC7ADECACF
+DTEND;TZID=Europe/Berlin:20121226T100000
+TRANSP:OPAQUE
+X-APPLE-TRAVEL-ADVISORY-BEHAVIOR:AUTOMATIC
+SUMMARY:day2
+DTSTART;TZID=Europe/Berlin:20121226T090000
+DTSTAMP:20170824T134043Z
+SEQUENCE:0
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20170824T134127Z
+UID:7B5AB905-39EA-42B6-AD31-1E63D4C5C2C7
+DTEND;VALUE=DATE:20121229
+TRANSP:TRANSPARENT
+X-APPLE-TRAVEL-ADVISORY-BEHAVIOR:AUTOMATIC
+SUMMARY:day5
+DTSTART;VALUE=DATE:20161228
+DTSTAMP:20170824T134134Z
+SEQUENCE:0
+BEGIN:VALARM
+X-WR-ALARMUID:45BF1D7B-3D2C-48DC-AB5C-BB391AFA7837
+UID:45BF1D7B-3D2C-48DC-AB5C-BB391AFA7837
+TRIGGER:-PT15H
+ATTACH;VALUE=URI:Basso
+X-APPLE-LOCAL-DEFAULT-ALARM:TRUE
+ACTION:AUDIO
+X-APPLE-DEFAULT-ALARM:TRUE
+END:VALARM
+END:VEVENT
+END:VCALENDAR
diff --git a/test/integration/elasticsearch_test.rb b/test/integration/elasticsearch_test.rb
index 1df367b88..6f7646b7d 100644
--- a/test/integration/elasticsearch_test.rb
+++ b/test/integration/elasticsearch_test.rb
@@ -100,6 +100,12 @@ class ElasticsearchTest < ActiveSupport::TestCase
     )
   end
 
+  teardown do
+    if ENV['ES_URL'].present?
+      Rake::Task['searchindex:drop'].execute
+    end
+  end
+
   # check search attributes
   test 'a - objects' do
 
diff --git a/test/integration/email_deliver_test.rb b/test/integration/email_deliver_test.rb
index 6d13296b6..7fa409897 100644
--- a/test/integration/email_deliver_test.rb
+++ b/test/integration/email_deliver_test.rb
@@ -4,16 +4,16 @@ require 'test_helper'
 class EmailDeliverTest < ActiveSupport::TestCase
   test 'basic check' do
 
-    if !ENV['MAIL_SERVER']
+    if ENV['MAIL_SERVER'].blank?
       raise "Need MAIL_SERVER as ENV variable like export MAIL_SERVER='mx.example.com'"
     end
-    if !ENV['MAIL_SERVER_ACCOUNT']
+    if ENV['MAIL_SERVER_ACCOUNT'].blank?
       raise "Need MAIL_SERVER_ACCOUNT as ENV variable like export MAIL_SERVER_ACCOUNT='user:somepass'"
     end
     server_login = ENV['MAIL_SERVER_ACCOUNT'].split(':')[0]
     server_password = ENV['MAIL_SERVER_ACCOUNT'].split(':')[1]
 
-    email_address = EmailAddress.create(
+    email_address = EmailAddress.create!(
       realname: 'me Helpdesk',
       email: "me#{rand(999_999_999)}@example.com",
       updated_by_id: 1,
@@ -27,7 +27,7 @@ class EmailDeliverTest < ActiveSupport::TestCase
       created_by_id: 1,
     )
 
-    channel = Channel.create(
+    channel = Channel.create!(
       area: 'Email::Account',
       group_id: group.id,
       options: {
@@ -50,9 +50,9 @@ class EmailDeliverTest < ActiveSupport::TestCase
     )
 
     email_address.channel_id = channel.id
-    email_address.save
+    email_address.save!
 
-    ticket1 = Ticket.create(
+    ticket1 = Ticket.create!(
       title: 'some delivery test',
       group: group,
       customer_id: 2,
@@ -63,7 +63,7 @@ class EmailDeliverTest < ActiveSupport::TestCase
     )
     assert(ticket1, 'ticket created')
 
-    article1 = Ticket::Article.create(
+    article1 = Ticket::Article.create!(
       ticket_id: ticket1.id,
       to: 'some_recipient@example_not_existing_what_ever.com',
       subject: 'some subject',
@@ -189,7 +189,7 @@ class EmailDeliverTest < ActiveSupport::TestCase
     # remove background jobs
     Delayed::Job.destroy_all
 
-    article2 = Ticket::Article.create(
+    article2 = Ticket::Article.create!(
       ticket_id: ticket1.id,
       to: 'some_recipient@example_not_existing_what_ever.com',
       subject: 'some subject2',
@@ -202,9 +202,13 @@ class EmailDeliverTest < ActiveSupport::TestCase
       created_by_id: 1,
     )
 
+    ticket1.state = Ticket::State.find_by(name: 'closed')
+    ticket1.save
+
     assert_raises(RuntimeError) {
       Scheduler.worker(true)
     }
+    ticket1.reload
 
     article2_lookup = Ticket::Article.find(article2.id)
     assert_equal(2, ticket1.articles.count)
@@ -214,6 +218,7 @@ class EmailDeliverTest < ActiveSupport::TestCase
     assert(article2_lookup.preferences['delivery_status_message'])
 
     Scheduler.worker(true)
+    ticket1.reload
 
     article2_lookup = Ticket::Article.find(article2.id)
     assert_equal(2, ticket1.articles.count)
@@ -221,11 +226,13 @@ class EmailDeliverTest < ActiveSupport::TestCase
     assert_equal('fail', article2_lookup.preferences['delivery_status'])
     assert(article2_lookup.preferences['delivery_status_date'])
     assert(article2_lookup.preferences['delivery_status_message'])
+    assert_equal('closed', ticket1.state.name)
 
     sleep 6
     assert_raises(RuntimeError) {
       Scheduler.worker(true)
     }
+    ticket1.reload
 
     article2_lookup = Ticket::Article.find(article2.id)
     assert_equal(2, ticket1.articles.count)
@@ -233,30 +240,39 @@ class EmailDeliverTest < ActiveSupport::TestCase
     assert_equal('fail', article2_lookup.preferences['delivery_status'])
     assert(article2_lookup.preferences['delivery_status_date'])
     assert(article2_lookup.preferences['delivery_status_message'])
+    assert_equal('closed', ticket1.state.name)
 
     Scheduler.worker(true)
+    ticket1.reload
+
     article2_lookup = Ticket::Article.find(article2.id)
     assert_equal(2, ticket1.articles.count)
     assert_equal(2, article2_lookup.preferences['delivery_retry'])
     assert_equal('fail', article2_lookup.preferences['delivery_status'])
     assert(article2_lookup.preferences['delivery_status_date'])
     assert(article2_lookup.preferences['delivery_status_message'])
+    assert_equal('closed', ticket1.state.name)
 
     sleep 11
     assert_raises(RuntimeError) {
       Scheduler.worker(true)
     }
+    ticket1.reload
+
     article2_lookup = Ticket::Article.find(article2.id)
     assert_equal(2, ticket1.articles.count)
     assert_equal(3, article2_lookup.preferences['delivery_retry'])
     assert_equal('fail', article2_lookup.preferences['delivery_status'])
     assert(article2_lookup.preferences['delivery_status_date'])
     assert(article2_lookup.preferences['delivery_status_message'])
+    assert_equal('closed', ticket1.state.name)
 
     sleep 16
     assert_raises(RuntimeError) {
       Scheduler.worker(true)
     }
+    ticket1.reload
+
     article2_lookup = Ticket::Article.find(article2.id)
     article_delivery_system = ticket1.articles.last
     assert_equal(3, ticket1.articles.count)
@@ -267,7 +283,8 @@ class EmailDeliverTest < ActiveSupport::TestCase
     assert_equal('System', article_delivery_system.sender.name)
     assert_equal(true, article_delivery_system.preferences['delivery_message'])
     assert_equal(article2.id, article_delivery_system.preferences['delivery_article_id_related'])
-
+    assert_equal(true, article_delivery_system.preferences['notification'])
+    assert_equal(Ticket::State.find_by(default_follow_up: true).name, ticket1.state.name)
   end
 
 end
diff --git a/test/integration/email_keep_on_server_test.rb b/test/integration/email_keep_on_server_test.rb
new file mode 100644
index 000000000..99d8069b9
--- /dev/null
+++ b/test/integration/email_keep_on_server_test.rb
@@ -0,0 +1,232 @@
+# encoding: utf-8
+require 'test_helper'
+require 'net/imap'
+
+class EmailKeepOnServerTest < ActiveSupport::TestCase
+  setup do
+
+    if ENV['KEEP_ON_MAIL_SERVER'].blank?
+      raise "Need KEEP_ON_MAIL_SERVER as ENV variable like export KEEP_ON_MAIL_SERVER='mx.example.com'"
+    end
+    if ENV['KEEP_ON_MAIL_SERVER_ACCOUNT'].blank?
+      raise "Need KEEP_ON_MAIL_SERVER_ACCOUNT as ENV variable like export KEEP_ON_MAIL_SERVER_ACCOUNT='user:somepass'"
+    end
+    @server_login = ENV['KEEP_ON_MAIL_SERVER_ACCOUNT'].split(':')[0]
+    @server_password = ENV['KEEP_ON_MAIL_SERVER_ACCOUNT'].split(':')[1]
+
+    @folder = "keep_on_mail_server_#{rand(999_999_999)}"
+
+    email_address = EmailAddress.create!(
+      realname: 'me Helpdesk',
+      email: "me#{rand(999_999_999)}@example.com",
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+
+    group = Group.create_or_update(
+      name: 'KeepOnServerTest',
+      email_address_id: email_address.id,
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+
+    @channel = Channel.create!(
+      area: 'Email::Account',
+      group_id: group.id,
+      options: {
+        inbound: {
+          adapter: 'imap',
+          options: {
+            host: ENV['KEEP_ON_MAIL_SERVER'],
+            user: @server_login,
+            password: @server_password,
+            ssl: true,
+            folder: @folder,
+            #keep_on_server: true,
+          }
+        },
+        outbound: {
+          adapter: 'sendmail'
+        }
+      },
+      active: true,
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    email_address.channel_id = @channel.id
+    email_address.save!
+
+  end
+
+  test 'keep on server' do
+    @channel.options[:inbound][:options][:keep_on_server] = true
+    @channel.save!
+
+    # clean mailbox
+    imap = Net::IMAP.new(ENV['KEEP_ON_MAIL_SERVER'], 993, true, nil, false)
+    imap.login(@server_login, @server_password)
+    imap.create(@folder)
+    imap.select(@folder)
+
+    # put unseen message in it
+    imap.append(@folder, "Subject: hello1
+From: shugo@example.com
+To: shugo@example.com
+Message-ID: 
+
+hello world
+".gsub(/\n/, "\r\n"), [], Time.zone.now)
+
+    # verify if message is still on server
+    message_ids = imap.sort(['DATE'], ['ALL'], 'US-ASCII')
+    assert_equal(1, message_ids.count)
+
+    message_meta = imap.fetch(1, ['FLAGS'])[0].attr
+    assert_not(message_meta['FLAGS'].include?(:Seen))
+
+    # fetch messages
+    article_count = Ticket::Article.count
+    @channel.fetch(true)
+    assert_equal(article_count + 1, Ticket::Article.count)
+
+    # verify if message is still on server
+    message_ids = imap.sort(['DATE'], ['ALL'], 'US-ASCII')
+    assert_equal(1, message_ids.count)
+
+    message_meta = imap.fetch(1, ['RFC822.HEADER', 'FLAGS'])[0].attr
+    assert(message_meta['FLAGS'].include?(:Seen))
+
+    # fetch messages
+    article_count = Ticket::Article.count
+    @channel.fetch(true)
+    assert_equal(article_count, Ticket::Article.count)
+
+    # verify if message is still on server
+    message_ids = imap.sort(['DATE'], ['ALL'], 'US-ASCII')
+    assert_equal(1, message_ids.count)
+
+    # put unseen message in it
+    imap.append(@folder, "Subject: hello2
+From: shugo@example.com
+To: shugo@example.com
+Message-ID: 
+
+hello world
+".gsub(/\n/, "\r\n"), [], Time.zone.now)
+
+    message_meta = imap.fetch(1, ['FLAGS'])[0].attr
+    assert(message_meta['FLAGS'].include?(:Seen))
+    message_meta = imap.fetch(2, ['FLAGS'])[0].attr
+    assert_not(message_meta['FLAGS'].include?(:Seen))
+
+    # fetch messages
+    article_count = Ticket::Article.count
+    @channel.fetch(true)
+    assert_equal(article_count + 1, Ticket::Article.count)
+
+    # verify if message is still on server
+    message_ids = imap.sort(['DATE'], ['ALL'], 'US-ASCII')
+    assert_equal(2, message_ids.count)
+
+    message_meta = imap.fetch(1, ['FLAGS'])[0].attr
+    assert(message_meta['FLAGS'].include?(:Seen))
+    message_meta = imap.fetch(2, ['FLAGS'])[0].attr
+    assert(message_meta['FLAGS'].include?(:Seen))
+
+    # set messages to not seen
+    imap.store(1, '-FLAGS', [:Seen])
+    imap.store(2, '-FLAGS', [:Seen])
+
+    # fetch messages
+    article_count = Ticket::Article.count
+    @channel.fetch(true)
+    assert_equal(article_count, Ticket::Article.count)
+
+    imap.delete(@folder)
+    @channel.destroy!
+  end
+
+  test 'keep not on server' do
+    @channel.options[:inbound][:options][:keep_on_server] = false
+    @channel.save!
+
+    # clean mailbox
+    imap = Net::IMAP.new(ENV['KEEP_ON_MAIL_SERVER'], 993, true, nil, false)
+    imap.login(@server_login, @server_password)
+    imap.create(@folder)
+    imap.select(@folder)
+
+    # put unseen message in it
+    imap.append(@folder, "Subject: hello1
+From: shugo@example.com
+To: shugo@example.com
+Message-ID: 
+
+hello world
+".gsub(/\n/, "\r\n"), [], Time.zone.now)
+
+    # verify if message is still on server
+    message_ids = imap.sort(['DATE'], ['ALL'], 'US-ASCII')
+    assert_equal(1, message_ids.count)
+
+    message_meta = imap.fetch(1, ['FLAGS'])[0].attr
+    assert_not(message_meta['FLAGS'].include?(:Seen))
+
+    # fetch messages
+    article_count = Ticket::Article.count
+    @channel.fetch(true)
+    assert_equal(article_count + 1, Ticket::Article.count)
+
+    # verify if message is still on server
+    message_ids = imap.sort(['DATE'], ['ALL'], 'US-ASCII')
+    assert_equal(1, message_ids.count)
+
+    # put unseen message in it
+    imap.append(@folder, "Subject: hello2
+From: shugo@example.com
+To: shugo@example.com
+Message-ID: 
+
+hello world
+".gsub(/\n/, "\r\n"), [], Time.zone.now)
+
+    # verify if message is still on server
+    message_ids = imap.sort(['DATE'], ['ALL'], 'US-ASCII')
+    assert_equal(1, message_ids.count)
+
+    message_meta = imap.fetch(1, ['FLAGS'])[0].attr
+    assert_not(message_meta['FLAGS'].include?(:Seen))
+
+    # fetch messages
+    article_count = Ticket::Article.count
+    @channel.fetch(true)
+    assert_equal(article_count + 1, Ticket::Article.count)
+
+    # verify if message is still on server
+    message_ids = imap.sort(['DATE'], ['ALL'], 'US-ASCII')
+    assert_equal(1, message_ids.count)
+
+    # put unseen message in it
+    imap.append(@folder, "Subject: hello2
+From: shugo@example.com
+To: shugo@example.com
+Message-ID: 
+
+hello world
+".gsub(/\n/, "\r\n"), [], Time.zone.now)
+
+    # verify if message is still on server
+    message_ids = imap.sort(['DATE'], ['ALL'], 'US-ASCII')
+    assert_equal(1, message_ids.count)
+
+    # fetch messages
+    article_count = Ticket::Article.count
+    @channel.fetch(true)
+    assert_equal(article_count + 1, Ticket::Article.count)
+
+    imap.delete(@folder)
+    @channel.destroy!
+
+  end
+
+end
diff --git a/test/integration/geo_location_test.rb b/test/integration/geo_location_test.rb
index 388378255..8bd148a9a 100644
--- a/test/integration/geo_location_test.rb
+++ b/test/integration/geo_location_test.rb
@@ -51,7 +51,7 @@ class GeoLocationTest < ActiveSupport::TestCase
       login: 'some_geo_login2',
       firstname: 'First',
       lastname: 'Last',
-      email: 'some_geo_login1@example.com',
+      email: 'some_geo_login2@example.com',
       password: 'test',
       street: 'Marienstrasse 13',
       city: 'Berlin',
diff --git a/test/integration/report_test.rb b/test/integration/report_test.rb
index c90f7a561..90b52a714 100644
--- a/test/integration/report_test.rb
+++ b/test/integration/report_test.rb
@@ -7,7 +7,7 @@ class ReportTest < ActiveSupport::TestCase
   setup do
 
     # set config
-    if !ENV['ES_URL']
+    if ENV['ES_URL'].blank?
       raise "ERROR: Need ES_URL - hint ES_URL='http://127.0.0.1:9200'"
     end
     Setting.set('es_url', ENV['ES_URL'])
@@ -250,6 +250,12 @@ class ReportTest < ActiveSupport::TestCase
 
   end
 
+  teardown do
+    if ENV['ES_URL'].present?
+      Rake::Task['searchindex:drop'].execute
+    end
+  end
+
   test 'compare' do
 
     # first solution
diff --git a/test/integration/zendesk_import_test.rb b/test/integration/zendesk_import_test.rb
index 96191bd55..563ed7bff 100644
--- a/test/integration/zendesk_import_test.rb
+++ b/test/integration/zendesk_import_test.rb
@@ -180,6 +180,10 @@ class ZendeskImportTest < ActiveSupport::TestCase
       last_login
       source
       login_failed
+      out_of_office
+      out_of_office_start_at
+      out_of_office_end_at
+      out_of_office_replacement_id
       preferences
       updated_by_id
       created_by_id
@@ -475,6 +479,7 @@ If you\'re reading this message in your email, click the ticket number link that
       last_contact_at
       last_contact_agent_at
       last_contact_customer_at
+      last_owner_update_at
       create_article_type_id
       create_article_sender_id
       article_count
diff --git a/test/unit/activity_stream_test.rb b/test/unit/activity_stream_test.rb
index 27b905ad1..8da295f33 100644
--- a/test/unit/activity_stream_test.rb
+++ b/test/unit/activity_stream_test.rb
@@ -10,7 +10,7 @@ class ActivityStreamTest < ActiveSupport::TestCase
       login: 'admin',
       firstname: 'Bob',
       lastname: 'Smith',
-      email: 'bob@example.com',
+      email: 'bob+active_stream@example.com',
       password: 'some_pass',
       active: true,
       roles: roles,
@@ -23,7 +23,7 @@ class ActivityStreamTest < ActiveSupport::TestCase
   end
 
   test 'ticket+user' do
-    ticket = Ticket.create(
+    ticket = Ticket.create!(
       group_id: Group.lookup(name: 'Users').id,
       customer_id: @current_user.id,
       owner_id: User.lookup(login: '-').id,
@@ -35,7 +35,7 @@ class ActivityStreamTest < ActiveSupport::TestCase
     )
     travel 2.seconds
 
-    article = Ticket::Article.create(
+    article = Ticket::Article.create!(
       ticket_id: ticket.id,
       updated_by_id: @current_user.id,
       created_by_id: @current_user.id,
@@ -86,12 +86,12 @@ class ActivityStreamTest < ActiveSupport::TestCase
     assert(stream.empty?)
 
     # cleanup
-    ticket.destroy
+    ticket.destroy!
     travel_back
   end
 
   test 'organization' do
-    organization = Organization.create(
+    organization = Organization.create!(
       name: 'some name',
       updated_by_id: @current_user.id,
       created_by_id: @current_user.id,
@@ -125,12 +125,12 @@ class ActivityStreamTest < ActiveSupport::TestCase
     assert(stream.empty?)
 
     # cleanup
-    organization.destroy
+    organization.destroy!
     travel_back
   end
 
   test 'user with update check false' do
-    user = User.create(
+    user = User.create!(
       login: 'someemail@example.com',
       email: 'someemail@example.com',
       firstname: 'Bob Smith II',
@@ -157,12 +157,12 @@ class ActivityStreamTest < ActiveSupport::TestCase
     assert(stream.empty?)
 
     # cleanup
-    user.destroy
+    user.destroy!
     travel_back
   end
 
   test 'user with update check true' do
-    user = User.create(
+    user = User.create!(
       login: 'someemail@example.com',
       email: 'someemail@example.com',
       firstname: 'Bob Smith II',
@@ -204,7 +204,7 @@ class ActivityStreamTest < ActiveSupport::TestCase
     assert(stream.empty?)
 
     # cleanup
-    user.destroy
+    user.destroy!
     travel_back
   end
 
diff --git a/test/unit/calendar_test.rb b/test/unit/calendar_test.rb
index 197d5e1f3..6561e3569 100644
--- a/test/unit/calendar_test.rb
+++ b/test/unit/calendar_test.rb
@@ -3,7 +3,7 @@ require 'test_helper'
 
 class CalendarTest < ActiveSupport::TestCase
   test 'default test' do
-    Calendar.delete_all
+    Calendar.destroy_all
     calendar1 = Calendar.create_or_update(
       name: 'US 1',
       timezone: 'America/Los_Angeles',
@@ -91,4 +91,154 @@ class CalendarTest < ActiveSupport::TestCase
     travel_back
   end
 
+  test 'sync test' do
+    Calendar.destroy_all
+
+    travel_to Time.zone.parse('2017-08-24T01:04:44Z0')
+
+    calendar1 = Calendar.create_or_update(
+      name: 'Sync 1',
+      timezone: 'America/Los_Angeles',
+      business_hours: {
+        mon: { '09:00' => '17:00' },
+        tue: { '09:00' => '17:00' },
+        wed: { '09:00' => '17:00' },
+        thu: { '09:00' => '17:00' },
+        fri: { '09:00' => '17:00' }
+      },
+      default: true,
+      ical_url: 'test/fixtures/calendar1.ics',
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+
+    assert_equal(true, calendar1.public_holidays['2016-12-24']['active'])
+    assert_equal('Christmas1', calendar1.public_holidays['2016-12-24']['summary'])
+    assert_nil(calendar1.public_holidays['2016-12-25'])
+    assert_equal(true, calendar1.public_holidays['2017-12-24']['active'])
+    assert_equal('Christmas1', calendar1.public_holidays['2017-12-24']['summary'])
+    assert_nil(calendar1.public_holidays['2017-12-25'])
+    assert_equal(true, calendar1.public_holidays['2018-12-24']['active'])
+    assert_equal('Christmas1', calendar1.public_holidays['2018-12-24']['summary'])
+    assert_nil(calendar1.public_holidays['2018-12-25'])
+    assert_equal(true, calendar1.public_holidays['2019-12-24']['active'])
+    assert_equal('Christmas1', calendar1.public_holidays['2019-12-24']['summary'])
+    assert_nil(calendar1.public_holidays['2019-12-25'])
+    assert_nil(calendar1.public_holidays['2020-12-24'])
+
+    Calendar.sync
+
+    assert_equal(true, calendar1.public_holidays['2016-12-24']['active'])
+    assert_equal('Christmas1', calendar1.public_holidays['2016-12-24']['summary'])
+    assert_nil(calendar1.public_holidays['2016-12-25'])
+    assert_equal(true, calendar1.public_holidays['2017-12-24']['active'])
+    assert_equal('Christmas1', calendar1.public_holidays['2017-12-24']['summary'])
+    assert_nil(calendar1.public_holidays['2017-12-25'])
+    assert_equal(true, calendar1.public_holidays['2018-12-24']['active'])
+    assert_equal('Christmas1', calendar1.public_holidays['2018-12-24']['summary'])
+    assert_nil(calendar1.public_holidays['2018-12-25'])
+    assert_equal(true, calendar1.public_holidays['2019-12-24']['active'])
+    assert_equal('Christmas1', calendar1.public_holidays['2019-12-24']['summary'])
+    assert_nil(calendar1.public_holidays['2019-12-25'])
+    assert_nil(calendar1.public_holidays['2020-12-24'])
+
+    cache_key = "CalendarIcal::#{calendar1.id}"
+    cache = Cache.get(cache_key)
+
+    calendar1.update_columns(ical_url: 'test/fixtures/calendar2.ics')
+    cache_key = "CalendarIcal::#{calendar1.id}"
+    cache = Cache.get(cache_key)
+    cache[:ical_url] = 'test/fixtures/calendar2.ics'
+    Cache.write(
+      cache_key,
+      cache,
+      { expires_in: 1.day },
+    )
+
+    Calendar.sync
+
+    calendar1.reload
+    assert_equal(true, calendar1.public_holidays['2016-12-24']['active'])
+    assert_equal('Christmas1', calendar1.public_holidays['2016-12-24']['summary'])
+    assert_nil(calendar1.public_holidays['2016-12-25'])
+    assert_equal(true, calendar1.public_holidays['2017-12-24']['active'])
+    assert_equal('Christmas1', calendar1.public_holidays['2017-12-24']['summary'])
+    assert_nil(calendar1.public_holidays['2017-12-25'])
+    assert_equal(true, calendar1.public_holidays['2018-12-24']['active'])
+    assert_equal('Christmas1', calendar1.public_holidays['2018-12-24']['summary'])
+    assert_nil(calendar1.public_holidays['2018-12-25'])
+    assert_equal(true, calendar1.public_holidays['2019-12-24']['active'])
+    assert_equal('Christmas1', calendar1.public_holidays['2019-12-24']['summary'])
+    assert_nil(calendar1.public_holidays['2019-12-25'])
+    assert_nil(calendar1.public_holidays['2020-12-24'])
+
+    travel 2.days
+
+    Calendar.sync
+
+    calendar1.reload
+    assert_equal(true, calendar1.public_holidays['2016-12-24']['active'])
+    assert_equal('Christmas1', calendar1.public_holidays['2016-12-24']['summary'])
+    assert_equal(true, calendar1.public_holidays['2016-12-25']['active'])
+    assert_equal('Christmas2', calendar1.public_holidays['2016-12-25']['summary'])
+    assert_equal(true, calendar1.public_holidays['2017-12-24']['active'])
+    assert_equal('Christmas1', calendar1.public_holidays['2017-12-24']['summary'])
+    assert_equal(true, calendar1.public_holidays['2017-12-25']['active'])
+    assert_equal('Christmas2', calendar1.public_holidays['2017-12-25']['summary'])
+    assert_equal(true, calendar1.public_holidays['2018-12-24']['active'])
+    assert_equal('Christmas1', calendar1.public_holidays['2018-12-24']['summary'])
+    assert_equal(true, calendar1.public_holidays['2018-12-25']['active'])
+    assert_equal('Christmas2', calendar1.public_holidays['2018-12-25']['summary'])
+    assert_equal(true, calendar1.public_holidays['2019-12-24']['active'])
+    assert_equal('Christmas1', calendar1.public_holidays['2019-12-24']['summary'])
+    assert_equal(true, calendar1.public_holidays['2019-12-25']['active'])
+    assert_equal('Christmas2', calendar1.public_holidays['2019-12-25']['summary'])
+    assert_nil(calendar1.public_holidays['2020-12-24'])
+    assert_nil(calendar1.public_holidays['2020-12-25'])
+
+    Calendar.destroy_all
+
+    calendar1 = Calendar.create_or_update(
+      name: 'Sync 2',
+      timezone: 'America/Los_Angeles',
+      business_hours: {
+        mon: { '09:00' => '17:00' },
+        tue: { '09:00' => '17:00' },
+        wed: { '09:00' => '17:00' },
+        thu: { '09:00' => '17:00' },
+        fri: { '09:00' => '17:00' }
+      },
+      default: true,
+      ical_url: 'test/fixtures/calendar3.ics',
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+
+    assert_equal(true, calendar1.public_holidays['2016-12-24']['active'])
+    assert_equal('Christmas1', calendar1.public_holidays['2016-12-24']['summary'])
+    assert_equal(true, calendar1.public_holidays['2016-12-26']['active'])
+    assert_equal('day3', calendar1.public_holidays['2016-12-26']['summary'])
+    assert_equal(true, calendar1.public_holidays['2016-12-28']['active'])
+    assert_equal('day5', calendar1.public_holidays['2016-12-28']['summary'])
+    assert_equal(true, calendar1.public_holidays['2017-01-26']['active'])
+    assert_equal('day3', calendar1.public_holidays['2017-01-26']['summary'])
+    assert_equal(true, calendar1.public_holidays['2017-02-26']['active'])
+    assert_equal('day3', calendar1.public_holidays['2017-02-26']['summary'])
+    assert_equal(true, calendar1.public_holidays['2017-03-26']['active'])
+    assert_equal('day3', calendar1.public_holidays['2017-03-26']['summary'])
+    assert_equal(true, calendar1.public_holidays['2017-04-26']['active'])
+    assert_equal('day3', calendar1.public_holidays['2017-04-26']['summary'])
+    assert_nil(calendar1.public_holidays['2017-05-26'])
+    assert_equal(true, calendar1.public_holidays['2017-12-24']['active'])
+    assert_equal('Christmas1', calendar1.public_holidays['2017-12-24']['summary'])
+    assert_equal(true, calendar1.public_holidays['2018-12-24']['active'])
+    assert_equal('Christmas1', calendar1.public_holidays['2018-12-24']['summary'])
+    assert_equal(true, calendar1.public_holidays['2019-12-24']['active'])
+    assert_equal('Christmas1', calendar1.public_holidays['2019-12-24']['summary'])
+    assert_nil(calendar1.public_holidays['2020-12-24'])
+
+    travel_back
+
+  end
+
 end
diff --git a/test/unit/cti_caller_id_test.rb b/test/unit/cti_caller_id_test.rb
index 8619fd9b5..94c08c078 100644
--- a/test/unit/cti_caller_id_test.rb
+++ b/test/unit/cti_caller_id_test.rb
@@ -3,12 +3,12 @@ require 'test_helper'
 
 class CtiCallerIdTest < ActiveSupport::TestCase
 
-  test '2 lookups' do
+  setup do
 
     Ticket.destroy_all
     Cti::CallerId.destroy_all
 
-    agent1 = User.create_or_update(
+    @agent1 = User.create_or_update(
       login: 'ticket-caller_id-agent1@example.com',
       firstname: 'CallerId',
       lastname: 'Agent1',
@@ -22,7 +22,7 @@ class CtiCallerIdTest < ActiveSupport::TestCase
       updated_by_id: 1,
       created_by_id: 1,
     )
-    agent2 = User.create_or_update(
+    @agent2 = User.create_or_update(
       login: 'ticket-caller_id-agent2@example.com',
       firstname: 'CallerId',
       lastname: 'Agent2',
@@ -34,7 +34,7 @@ class CtiCallerIdTest < ActiveSupport::TestCase
       updated_by_id: 1,
       created_by_id: 1,
     )
-    agent3 = User.create_or_update(
+    @agent3 = User.create_or_update(
       login: 'ticket-caller_id-agent3@example.com',
       firstname: 'CallerId',
       lastname: 'Agent3',
@@ -46,7 +46,7 @@ class CtiCallerIdTest < ActiveSupport::TestCase
       created_by_id: 1,
     )
 
-    customer1 = User.create_or_update(
+    @customer1 = User.create_or_update(
       login: 'ticket-caller_id-customer1@example.com',
       firstname: 'CallerId',
       lastname: 'Customer1',
@@ -57,6 +57,10 @@ class CtiCallerIdTest < ActiveSupport::TestCase
       created_by_id: 1,
     )
 
+  end
+
+  test '1 lookups' do
+
     Cti::CallerId.rebuild
 
     caller_ids = Cti::CallerId.lookup('491111222277')
@@ -64,27 +68,27 @@ class CtiCallerIdTest < ActiveSupport::TestCase
 
     caller_ids = Cti::CallerId.lookup('491111222223')
     assert_equal(1, caller_ids.length)
-    assert_equal(agent1.id, caller_ids[0].user_id)
+    assert_equal(@agent1.id, caller_ids[0].user_id)
     assert_equal('known', caller_ids[0].level)
 
     caller_ids = Cti::CallerId.lookup('492222222222')
     assert_equal(2, caller_ids.length)
-    assert_equal(agent3.id, caller_ids[0].user_id)
+    assert_equal(@agent3.id, caller_ids[0].user_id)
     assert_equal('known', caller_ids[0].level)
-    assert_equal(agent2.id, caller_ids[1].user_id)
+    assert_equal(@agent2.id, caller_ids[1].user_id)
     assert_equal('known', caller_ids[1].level)
 
     # create ticket in group
-    ticket1 = Ticket.create(
+    ticket1 = Ticket.create!(
       title: 'some caller id test 1',
       group: Group.lookup(name: 'Users'),
-      customer: customer1,
+      customer: @customer1,
       state: Ticket::State.lookup(name: 'new'),
       priority: Ticket::Priority.lookup(name: '2 normal'),
-      updated_by_id: agent1.id,
-      created_by_id: agent1.id,
+      updated_by_id: @agent1.id,
+      created_by_id: @agent1.id,
     )
-    article1 = Ticket::Article.create(
+    article1 = Ticket::Article.create!(
       ticket_id: ticket1.id,
       from: 'some_sender@example.com',
       to: 'some_recipient@example.com',
@@ -96,22 +100,22 @@ Mob: +49 333 8362222",
       internal: false,
       sender: Ticket::Article::Sender.where(name: 'Customer').first,
       type: Ticket::Article::Type.where(name: 'email').first,
-      updated_by_id: customer1.id,
-      created_by_id: customer1.id,
+      updated_by_id: @customer1.id,
+      created_by_id: @customer1.id,
     )
     assert(ticket1)
 
     # create ticket in group
-    ticket2 = Ticket.create(
+    ticket2 = Ticket.create!(
       title: 'some caller id test 2',
       group: Group.lookup(name: 'Users'),
-      customer: customer1,
+      customer: @customer1,
       state: Ticket::State.lookup(name: 'new'),
       priority: Ticket::Priority.lookup(name: '2 normal'),
-      updated_by_id: agent1.id,
-      created_by_id: agent1.id,
+      updated_by_id: @agent1.id,
+      created_by_id: @agent1.id,
     )
-    article2 = Ticket::Article.create(
+    article2 = Ticket::Article.create!(
       ticket_id: ticket2.id,
       from: 'some_sender@example.com',
       to: 'some_recipient@example.com',
@@ -123,8 +127,8 @@ Mob: +49 333 1112222",
       internal: false,
       sender: Ticket::Article::Sender.where(name: 'Agent').first,
       type: Ticket::Article::Type.where(name: 'email').first,
-      updated_by_id: agent1.id,
-      created_by_id: agent1.id,
+      updated_by_id: @agent1.id,
+      created_by_id: @agent1.id,
     )
     assert(ticket2)
 
@@ -135,19 +139,19 @@ Mob: +49 333 1112222",
 
     caller_ids = Cti::CallerId.lookup('491111222223')
     assert_equal(1, caller_ids.length)
-    assert_equal(agent1.id, caller_ids[0].user_id)
+    assert_equal(@agent1.id, caller_ids[0].user_id)
     assert_equal('known', caller_ids[0].level)
 
     caller_ids = Cti::CallerId.lookup('492222222222')
     assert_equal(2, caller_ids.length)
-    assert_equal(agent3.id, caller_ids[0].user_id)
+    assert_equal(@agent3.id, caller_ids[0].user_id)
     assert_equal('known', caller_ids[0].level)
-    assert_equal(agent2.id, caller_ids[1].user_id)
+    assert_equal(@agent2.id, caller_ids[1].user_id)
     assert_equal('known', caller_ids[1].level)
 
     caller_ids = Cti::CallerId.lookup('492226112222')
     assert_equal(1, caller_ids.length)
-    assert_equal(customer1.id, caller_ids[0].user_id)
+    assert_equal(@customer1.id, caller_ids[0].user_id)
     assert_equal('maybe', caller_ids[0].level)
 
     caller_ids = Cti::CallerId.lookup('492221112222')
@@ -155,7 +159,7 @@ Mob: +49 333 1112222",
 
   end
 
-  test '3 lookups' do
+  test '2 lookups' do
 
     Cti::CallerId.destroy_all
 
@@ -244,4 +248,83 @@ Mob: +49 333 1112222",
     assert_nil(caller_ids[0].comment)
 
   end
+
+  test '3 process - log' do
+
+    ticket1 = Ticket.create!(
+      title: 'some caller id test 1',
+      group: Group.lookup(name: 'Users'),
+      customer: @customer1,
+      state: Ticket::State.lookup(name: 'new'),
+      priority: Ticket::Priority.lookup(name: '2 normal'),
+      updated_by_id: @agent1.id,
+      created_by_id: @agent1.id,
+    )
+    article1 = Ticket::Article.create!(
+      ticket_id: ticket1.id,
+      from: 'some_sender@example.com',
+      to: 'some_recipient@example.com',
+      subject: 'some subject',
+      message_id: 'some@id',
+      body: "some message\nFon (GEL): +49 111 366-1111 Mi-Fr
+Fon (LIN): +49 222 6112222 Mo-Di
+Mob: +49 333 8362222",
+      internal: false,
+      sender: Ticket::Article::Sender.where(name: 'Customer').first,
+      type: Ticket::Article::Type.where(name: 'email').first,
+      updated_by_id: @customer1.id,
+      created_by_id: @customer1.id,
+    )
+    assert(ticket1)
+    ticket2 = Ticket.create!(
+      title: 'some caller id test 2',
+      group: Group.lookup(name: 'Users'),
+      customer: @customer1,
+      state: Ticket::State.lookup(name: 'new'),
+      priority: Ticket::Priority.lookup(name: '2 normal'),
+      updated_by_id: @agent1.id,
+      created_by_id: @agent1.id,
+    )
+    article2 = Ticket::Article.create!(
+      ticket_id: ticket2.id,
+      from: 'some_sender@example.com',
+      to: 'some_recipient@example.com',
+      subject: 'some subject',
+      message_id: 'some@id',
+      body: "some message\nFon (GEL): +49 111 366-1111 Mi-Fr
+Fon (LIN): +49 222 6112222 Mo-Di
+Mob: +49 333 8362222",
+      internal: false,
+      sender: Ticket::Article::Sender.where(name: 'Customer').first,
+      type: Ticket::Article::Type.where(name: 'email').first,
+      updated_by_id: @customer1.id,
+      created_by_id: @customer1.id,
+    )
+    assert(ticket2)
+
+    Cti::CallerId.rebuild
+
+    Cti::Log.process(
+      'cause' => '',
+      'event' => 'newCall',
+      'user' => 'user 1',
+      'from' => '491113661111',
+      'to' => '4930600000000',
+      'callId' => '4991155921769858278-1',
+      'direction' => 'in',
+    )
+
+    log = Cti::Log.log
+    assert(log[:list])
+    assert(log[:assets])
+    assert(log[:list][0])
+    assert_not(log[:list][1])
+    assert(log[:list][0].preferences)
+    assert(log[:list][0].preferences[:from])
+    assert_equal(1, log[:list][0].preferences[:from].count)
+    assert_equal(@customer1.id, log[:list][0].preferences[:from][0][:user_id])
+    assert_equal('maybe', log[:list][0].preferences[:from][0][:level])
+
+  end
+
 end
diff --git a/test/unit/email_build_test.rb b/test/unit/email_build_test.rb
index 7e2d3410e..8d161ea5b 100644
--- a/test/unit/email_build_test.rb
+++ b/test/unit/email_build_test.rb
@@ -22,6 +22,12 @@ class EmailBuildTest < ActiveSupport::TestCase
     assert(result !~ /font-family/, 'test 2')
     assert(result =~ %r{test}, 'test 2')
 
+    # Issue #1230, missing backslashes
+    # 'Test URL: \\storage\project\100242-Inc'
+    html = 'Test URL: \\\\storage\\project\\100242-Inc'
+    result = Channel::EmailBuild.html_complete_check(html)
+    assert(result.include?(html), 'backslashes must be kept')
+
   end
 
   test 'html email + attachment check' do
diff --git a/test/unit/email_parser_test.rb b/test/unit/email_parser_test.rb
index 121b6e5db..08b472ba4 100644
--- a/test/unit/email_parser_test.rb
+++ b/test/unit/email_parser_test.rb
@@ -499,7 +499,7 @@ Managing Director: Martin Edenhofer
         body_md5: '6021dd92d8e7844e6bb9b5bb7a4adfb8',
         params: {
           from: '"我" <>',
-          from_email: '"我" <>',
+          from_email: 'vipyiming@126.com',
           from_display_name: '',
           subject: '《欧美简讯》',
           to: '377861373 <377861373@qq.com>',
diff --git a/test/unit/email_postmaster_test.rb b/test/unit/email_postmaster_test.rb
index afffb22be..3893ddab3 100644
--- a/test/unit/email_postmaster_test.rb
+++ b/test/unit/email_postmaster_test.rb
@@ -3,6 +3,376 @@
 require 'test_helper'
 
 class EmailPostmasterTest < ActiveSupport::TestCase
+  test 'valid/invalid postmaster filter' do
+    PostmasterFilter.create!(
+      name: 'not used',
+      match: {
+        from: {
+          operator: 'contains',
+          value: 'nobody@example.com',
+        },
+      },
+      perform: {
+        'X-Zammad-Ticket-priority' => {
+          value: '3 high',
+        },
+      },
+      channel: 'email',
+      active: true,
+      created_by_id: 1,
+      updated_by_id: 1,
+    )
+    assert_raises(Exceptions::UnprocessableEntity) {
+      PostmasterFilter.create!(
+        name: 'empty filter should not work',
+        match: {},
+        perform: {
+          'X-Zammad-Ticket-priority' => {
+            value: '3 high',
+          },
+        },
+        channel: 'email',
+        active: true,
+        created_by_id: 1,
+        updated_by_id: 1,
+      )
+    }
+    assert_raises(Exceptions::UnprocessableEntity) {
+      PostmasterFilter.create!(
+        name: 'empty filter should not work',
+        match: {
+          from: {
+            operator: 'contains',
+            value: '',
+          },
+        },
+        perform: {
+          'X-Zammad-Ticket-priority' => {
+            value: '3 high',
+          },
+        },
+        channel: 'email',
+        active: true,
+        created_by_id: 1,
+        updated_by_id: 1,
+      )
+    }
+    assert_raises(Exceptions::UnprocessableEntity) {
+      PostmasterFilter.create!(
+        name: 'invalid regex',
+        match: {
+          from: {
+            operator: 'contains',
+            value: 'regex:[]',
+          },
+        },
+        perform: {
+          'X-Zammad-Ticket-priority' => {
+            value: '3 high',
+          },
+        },
+        channel: 'email',
+        active: true,
+        created_by_id: 1,
+        updated_by_id: 1,
+      )
+    }
+    assert_raises(Exceptions::UnprocessableEntity) {
+      PostmasterFilter.create!(
+        name: 'invalid regex',
+        match: {
+          from: {
+            operator: 'contains',
+            value: 'regex:??',
+          },
+        },
+        perform: {
+          'X-Zammad-Ticket-priority' => {
+            value: '3 high',
+          },
+        },
+        channel: 'email',
+        active: true,
+        created_by_id: 1,
+        updated_by_id: 1,
+      )
+    }
+    assert_raises(Exceptions::UnprocessableEntity) {
+      PostmasterFilter.create!(
+        name: 'invalid regex',
+        match: {
+          from: {
+            operator: 'contains',
+            value: 'regex:*',
+          },
+        },
+        perform: {
+          'X-Zammad-Ticket-priority' => {
+            value: '3 high',
+          },
+        },
+        channel: 'email',
+        active: true,
+        created_by_id: 1,
+        updated_by_id: 1,
+      )
+    }
+    PostmasterFilter.create!(
+      name: 'use .*',
+      match: {
+        from: {
+          operator: 'contains',
+          value: '*',
+        },
+      },
+      perform: {
+        'X-Zammad-Ticket-priority' => {
+          value: '3 high',
+        },
+      },
+      channel: 'email',
+      active: true,
+      created_by_id: 1,
+      updated_by_id: 1,
+    )
+  end
+
+  test 'process with postmaster filter with regex' do
+    group_default = Group.lookup(name: 'Users')
+    group1 = Group.create_if_not_exists(
+      name: 'Test Group1',
+      created_by_id: 1,
+      updated_by_id: 1,
+    )
+    group2 = Group.create_if_not_exists(
+      name: 'Test Group2',
+      created_by_id: 1,
+      updated_by_id: 1,
+    )
+
+    PostmasterFilter.destroy_all
+    PostmasterFilter.create!(
+      name: 'used - empty selector',
+      match: {
+        from: {
+          operator: 'contains',
+          value: 'regex:.*',
+        },
+      },
+      perform: {
+        'X-Zammad-Ticket-group_id' => {
+          value: group2.id,
+        },
+        'X-Zammad-Ticket-priority_id' => {
+          value: '1',
+        },
+        'x-Zammad-Article-Internal' => {
+          value: true,
+        },
+      },
+      channel: 'email',
+      active: true,
+      created_by_id: 1,
+      updated_by_id: 1,
+    )
+
+    data = 'From: Some Body 
+To: Bob 
+Cc: any@example.com
+Subject: some subject - no selector
+
+Some Text'
+
+    parser = Channel::EmailParser.new
+    ticket, article, user = parser.process({ group_id: group_default.id, trusted: false }, data)
+
+    assert_equal('Test Group2', ticket.group.name)
+    assert_equal('1 low', ticket.priority.name)
+    assert_equal('some subject - no selector', ticket.title)
+
+    assert_equal('Customer', article.sender.name)
+    assert_equal('email', article.type.name)
+    assert_equal(true, article.internal)
+
+    PostmasterFilter.destroy_all
+    PostmasterFilter.create!(
+      name: 'used - empty selector',
+      match: {
+        from: {
+          operator: 'contains',
+          value: '*',
+        },
+      },
+      perform: {
+        'X-Zammad-Ticket-group_id' => {
+          value: group2.id,
+        },
+        'X-Zammad-Ticket-priority_id' => {
+          value: '1',
+        },
+        'x-Zammad-Article-Internal' => {
+          value: true,
+        },
+      },
+      channel: 'email',
+      active: true,
+      created_by_id: 1,
+      updated_by_id: 1,
+    )
+
+    data = 'From: Some Body 
+To: Bob 
+Cc: any@example.com
+Subject: some subject - no selector
+
+Some Text'
+
+    parser = Channel::EmailParser.new
+    ticket, article, user = parser.process({ group_id: group_default.id, trusted: false }, data)
+
+    assert_equal('Test Group2', ticket.group.name)
+    assert_equal('1 low', ticket.priority.name)
+    assert_equal('some subject - no selector', ticket.title)
+
+    assert_equal('Customer', article.sender.name)
+    assert_equal('email', article.type.name)
+    assert_equal(true, article.internal)
+
+    PostmasterFilter.destroy_all
+    PostmasterFilter.create!(
+      name: 'used - empty selector',
+      match: {
+        subject: {
+          operator: 'contains',
+          value: '*me*',
+        },
+      },
+      perform: {
+        'X-Zammad-Ticket-group_id' => {
+          value: group2.id,
+        },
+        'X-Zammad-Ticket-priority_id' => {
+          value: '1',
+        },
+        'x-Zammad-Article-Internal' => {
+          value: true,
+        },
+      },
+      channel: 'email',
+      active: true,
+      created_by_id: 1,
+      updated_by_id: 1,
+    )
+
+    data = 'From: Some Body 
+To: Bob 
+Cc: any@example.com
+Subject: *me*
+
+Some Text'
+
+    parser = Channel::EmailParser.new
+    ticket, article, user = parser.process({ group_id: group_default.id, trusted: false }, data)
+
+    assert_equal('Test Group2', ticket.group.name)
+    assert_equal('1 low', ticket.priority.name)
+    assert_equal('*me*', ticket.title)
+
+    assert_equal('Customer', article.sender.name)
+    assert_equal('email', article.type.name)
+    assert_equal(true, article.internal)
+
+    PostmasterFilter.destroy_all
+    PostmasterFilter.create!(
+      name: 'used - empty selector',
+      match: {
+        subject: {
+          operator: 'contains not',
+          value: '*me*',
+        },
+      },
+      perform: {
+        'X-Zammad-Ticket-group_id' => {
+          value: group2.id,
+        },
+        'X-Zammad-Ticket-priority_id' => {
+          value: '1',
+        },
+        'x-Zammad-Article-Internal' => {
+          value: true,
+        },
+      },
+      channel: 'email',
+      active: true,
+      created_by_id: 1,
+      updated_by_id: 1,
+    )
+
+    data = 'From: Some Body 
+To: Bob 
+Cc: any@example.com
+Subject: *mo*
+
+Some Text'
+
+    parser = Channel::EmailParser.new
+    ticket, article, user = parser.process({ group_id: group_default.id, trusted: false }, data)
+
+    assert_equal('Test Group2', ticket.group.name)
+    assert_equal('1 low', ticket.priority.name)
+    assert_equal('*mo*', ticket.title)
+
+    assert_equal('Customer', article.sender.name)
+    assert_equal('email', article.type.name)
+    assert_equal(true, article.internal)
+
+    PostmasterFilter.destroy_all
+    PostmasterFilter.create!(
+      name: 'used - empty selector',
+      match: {
+        subject: {
+          operator: 'contains not',
+          value: '*me*',
+        },
+      },
+      perform: {
+        'X-Zammad-Ticket-group_id' => {
+          value: group2.id,
+        },
+        'X-Zammad-Ticket-priority_id' => {
+          value: '1',
+        },
+        'x-Zammad-Article-Internal' => {
+          value: true,
+        },
+      },
+      channel: 'email',
+      active: true,
+      created_by_id: 1,
+      updated_by_id: 1,
+    )
+
+    data = 'From: Some Body 
+To: Bob 
+Cc: any@example.com
+Subject: *me*
+
+Some Text'
+
+    parser = Channel::EmailParser.new
+    ticket, article, user = parser.process({ group_id: group_default.id, trusted: false }, data)
+
+    assert_equal('Users', ticket.group.name)
+    assert_equal('2 normal', ticket.priority.name)
+    assert_equal('*me*', ticket.title)
+
+    assert_equal('Customer', article.sender.name)
+    assert_equal('email', article.type.name)
+    assert_equal(false, article.internal)
+
+    PostmasterFilter.destroy_all
+  end
+
   test 'process with postmaster filter' do
     group_default = Group.lookup(name: 'Users')
     group1 = Group.create_if_not_exists(
@@ -159,51 +529,6 @@ Some Text'
 
     PostmasterFilter.destroy_all
 
-    PostmasterFilter.create!(
-      name: 'used - empty selector',
-      match: {
-        from: {
-          operator: 'contains',
-          value: '',
-        },
-      },
-      perform: {
-        'X-Zammad-Ticket-group_id' => {
-          value: group2.id,
-        },
-        'X-Zammad-Ticket-priority_id' => {
-          value: '1',
-        },
-        'x-Zammad-Article-Internal' => {
-          value: true,
-        },
-      },
-      channel: 'email',
-      active: true,
-      created_by_id: 1,
-      updated_by_id: 1,
-    )
-
-    data = 'From: Some Body 
-To: Bob 
-Cc: any@example.com
-Subject: some subject - no selector
-
-Some Text'
-
-    parser = Channel::EmailParser.new
-    ticket, article, user = parser.process({ group_id: group_default.id, trusted: false }, data)
-
-    assert_equal('Users', ticket.group.name)
-    assert_equal('2 normal', ticket.priority.name)
-    assert_equal('some subject - no selector', ticket.title)
-
-    assert_equal('Customer', article.sender.name)
-    assert_equal('email', article.type.name)
-    assert_equal(false, article.internal)
-
-    PostmasterFilter.destroy_all
-
     # follow up with create post master filter test
     PostmasterFilter.create!(
       name: 'used - empty selector',
@@ -477,6 +802,110 @@ Some Text'
 To: customer@example.com
 Subject: some subject
 
+Some Text'
+
+    parser = Channel::EmailParser.new
+    ticket, article, user = parser.process({ group_id: group_default.id, trusted: false }, data)
+    assert_equal('Users', ticket.group.name)
+    assert_equal('2 normal', ticket.priority.name)
+    assert_equal('some subject', ticket.title)
+    assert_equal('me@example.com', ticket.customer.email)
+    assert_equal('2 normal', ticket.priority.name)
+
+    assert_equal('Customer', article.sender.name)
+    assert_equal('email', article.type.name)
+    assert_equal(false, article.internal)
+
+    PostmasterFilter.destroy_all
+    PostmasterFilter.create!(
+      name: 'Autoresponder',
+      match: {
+        'auto-submitted' => {
+          'operator' => 'contains not',
+          'value' => 'auto-generated',
+        },
+        'to' => {
+          'operator' => 'contains',
+          'value' => 'customer@example.com',
+        },
+        'from' => {
+          'operator' => 'contains',
+          'value' => '@example.com',
+        }
+      },
+      perform: {
+        'x-zammad-article-internal' => {
+          'value' => 'true',
+        },
+        'x-zammad-article-type_id' => {
+          'value' => Ticket::Article::Type.find_by(name: 'note').id.to_s,
+        },
+        'x-zammad-ignore' => {
+          'value' => 'false',
+        },
+      },
+      channel: 'email',
+      active: true,
+      created_by_id: 1,
+      updated_by_id: 1,
+    )
+
+    data = 'From: ME Bob 
+To: customer@example.com
+Subject: some subject
+
+Some Text'
+
+    parser = Channel::EmailParser.new
+    ticket, article, user = parser.process({ group_id: group_default.id, trusted: false }, data)
+    assert_equal('Users', ticket.group.name)
+    assert_equal('2 normal', ticket.priority.name)
+    assert_equal('some subject', ticket.title)
+    assert_equal('me@example.com', ticket.customer.email)
+    assert_equal('2 normal', ticket.priority.name)
+
+    assert_equal('Customer', article.sender.name)
+    assert_equal('note', article.type.name)
+    assert_equal(true, article.internal)
+
+    PostmasterFilter.destroy_all
+    PostmasterFilter.create!(
+      name: 'Autoresponder',
+      match: {
+        'auto-submitted' => {
+          'operator' => 'contains',
+          'value' => 'auto-generated',
+        },
+        'to' => {
+          'operator' => 'contains',
+          'value' => 'customer1@example.com',
+        },
+        'from' => {
+          'operator' => 'contains',
+          'value' => '@example.com',
+        }
+      },
+      perform: {
+        'x-zammad-article-internal' => {
+          'value' => 'true',
+        },
+        'x-zammad-article-type_id' => {
+          'value' => Ticket::Article::Type.find_by(name: 'note').id.to_s,
+        },
+        'x-zammad-ignore' => {
+          'value' => 'false',
+        },
+      },
+      channel: 'email',
+      active: true,
+      created_by_id: 1,
+      updated_by_id: 1,
+    )
+
+    data = 'From: ME Bob 
+To: customer@example.com
+Subject: some subject
+
 Some Text'
 
     parser = Channel::EmailParser.new
diff --git a/test/unit/email_process_sender_is_system_address_or_agent_test.rb b/test/unit/email_process_sender_is_system_address_or_agent_test.rb
index f4a62daba..47c0f62e4 100644
--- a/test/unit/email_process_sender_is_system_address_or_agent_test.rb
+++ b/test/unit/email_process_sender_is_system_address_or_agent_test.rb
@@ -7,7 +7,7 @@ class EmailProcessSenderIsSystemAddressOrAgent < ActiveSupport::TestCase
     EmailAddress.create_or_update(
       channel_id: 1,
       realname: 'My System',
-      email: 'myzammad@system.test',
+      email: 'Myzammad@system.TEST',
       active: true,
       updated_by_id: 1,
       created_by_id: 1,
@@ -176,5 +176,56 @@ Some Text"
     assert_equal(agent1.id, ticket.created_by_id)
     assert_equal(agent1.id, article.created_by_id)
 
+    email_raw_string = "From: ticket-system-sender-AGENT1@example.com
+To: MYZAMMAD@system.test, ticket-system-sender-CUSTOMER1@example.com
+Subject: some subject #4
+
+Some Text"
+
+    ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string)
+    ticket = Ticket.find(ticket_p.id)
+    article = Ticket::Article.find(article_p.id)
+    assert_equal('some subject #4', ticket.title)
+    assert_equal('open', ticket.state.name)
+    assert_equal('Agent', ticket.create_article_sender.name)
+    assert_equal('Agent', article.sender.name)
+    assert_equal('ticket-system-sender-customer1@example.com', ticket.customer.email)
+    assert_equal(agent1.id, ticket.created_by_id)
+    assert_equal(agent1.id, article.created_by_id)
+
+    email_raw_string = "From: ticket-system-sender-agent1@example.com
+To: myzammad@system.test
+Subject: some subject #5
+
+Some Text"
+
+    ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string)
+    ticket = Ticket.find(ticket_p.id)
+    article = Ticket::Article.find(article_p.id)
+    assert_equal('some subject #5', ticket.title)
+    assert_equal('open', ticket.state.name)
+    assert_equal('Agent', ticket.create_article_sender.name)
+    assert_equal('Agent', article.sender.name)
+    assert_equal('ticket-system-sender-agent1@example.com', ticket.customer.email)
+    assert_equal(agent1.id, ticket.created_by_id)
+    assert_equal(agent1.id, article.created_by_id)
+
+    email_raw_string = "From: ticket-system-sender-agent1@example.com
+To: myZammad@system.Test
+Subject: some subject #6
+
+Some Text"
+
+    ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string)
+    ticket = Ticket.find(ticket_p.id)
+    article = Ticket::Article.find(article_p.id)
+    assert_equal('some subject #6', ticket.title)
+    assert_equal('open', ticket.state.name)
+    assert_equal('Agent', ticket.create_article_sender.name)
+    assert_equal('Agent', article.sender.name)
+    assert_equal('ticket-system-sender-agent1@example.com', ticket.customer.email)
+    assert_equal(agent1.id, ticket.created_by_id)
+    assert_equal(agent1.id, article.created_by_id)
+
   end
 end
diff --git a/test/unit/email_process_test.rb b/test/unit/email_process_test.rb
index 3e4627d50..e2ecb83d7 100644
--- a/test/unit/email_process_test.rb
+++ b/test/unit/email_process_test.rb
@@ -134,6 +134,94 @@ Some Textäöü".encode('ISO-8859-1'),
           },
         },
       },
+      {
+        data: "From: Realname
+To: customer@example.com
+Subject: abc some subject
+Reply-To: \"no-reply-without-from-email@example.com\" 
+
+Some Text",
+        success: true,
+        result: {
+          0 => {
+            priority: '2 normal',
+            title: 'abc some subject',
+          },
+          1 => {
+            body: 'Some Text',
+            sender: 'Customer',
+            type: 'email',
+            internal: false,
+          },
+        },
+        verify: {
+          users: [
+            {
+              firstname: 'no-reply-without-from-email@example.com',
+              lastname: '',
+              fullname: 'no-reply-without-from-email@example.com',
+              email: 'no-reply-without-from-email@example.com',
+            },
+          ],
+        },
+      },
+      {
+        data: "From: me@example.com
+To: Alexander Ha ,
+ Alexander Re , Hauke Ko
+ , Jens Ro ,
+ =?UTF-8?Q?B=c3=bc_Yi?= ,
+ Ja Bl ,
+ \"lars.73@example.de\" ,
+ Luk Hl ,
+ =?UTF-8?Q?Ma_Gr=c3=b6ner_,
+ Malte Bi , =?UTF-8?Q?Ma_Bfu=c3=9f?=
+ , Marco Fe ,
+ heidt@example.de, matt.ga@example.com,
+ Nick Ku , Sergej I ,
+ Thomas Ga ,
+ Peter Wo ,
+ =?UTF-8?B?SsO8cmdlbiB2b24gUsO2bm4=?= ,
+ Frank-Ingo Br 
+Subject: test 1
+
+test 1",
+        success: true,
+        result: {
+          0 => {
+            priority: '2 normal',
+            title: 'test 1',
+          },
+          1 => {
+            body: 'test 1',
+            sender: 'Customer',
+            type: 'email',
+            internal: false,
+          },
+        },
+        verify: {
+          users: [
+            {
+              firstname: 'Alexander',
+              lastname: 'Ha',
+              fullname: 'Alexander Ha',
+              email: 'service-d1@example.com',
+            },
+            {
+              firstname: 'Alexander',
+              lastname: 'Re',
+              fullname: 'Alexander Re',
+              email: 're-mail@example.de',
+            },
+            {
+              firstname: 'Ma',
+              lastname: 'Gröner',
+              fullname: 'Ma Gröner',
+              email: 'ma.g@example.com',
+            },
+          ],
+        }
+      },
       {
         data: "From: me@example.com
 To: customer@example.com
diff --git a/test/unit/history_test.rb b/test/unit/history_test.rb
index f8061c68d..989b92152 100644
--- a/test/unit/history_test.rb
+++ b/test/unit/history_test.rb
@@ -155,12 +155,12 @@ class HistoryTest < ActiveSupport::TestCase
 
       # use transaction
       ActiveRecord::Base.transaction do
-        ticket = Ticket.create(test[:ticket_create][:ticket])
+        ticket = Ticket.create!(test[:ticket_create][:ticket])
         test[:ticket_create][:article][:ticket_id] = ticket.id
-        article = Ticket::Article.create(test[:ticket_create][:article])
+        article = Ticket::Article.create!(test[:ticket_create][:article])
 
-        assert_equal(ticket.class.to_s, 'Ticket')
-        assert_equal(article.class.to_s, 'Ticket::Article')
+        assert_equal(ticket.class, Ticket)
+        assert_equal(article.class, Ticket::Article)
 
         # update ticket
         if test[:ticket_update][:ticket]
@@ -185,25 +185,21 @@ class HistoryTest < ActiveSupport::TestCase
     }
 
     # delete tickets
-    tickets.each { |ticket|
-      ticket_id = ticket.id
-      ticket.destroy
-      found = Ticket.where(id: ticket_id).first
-      assert_not(found, 'Ticket destroyed')
-    }
+    tickets.each(&:destroy!)
   end
 
   test 'user' do
+    name = rand(999_999)
     tests = [
 
       # test 1
       {
         user_create: {
           user: {
-            login: 'some_login_test',
+            login: "some_login_test-#{name}",
             firstname: 'Bob',
             lastname: 'Smith',
-            email: 'somebody@example.com',
+            email: "somebody-#{name}@example.com",
             active: true,
             updated_by_id: current_user.id,
             created_by_id: current_user.id,
@@ -213,7 +209,7 @@ class HistoryTest < ActiveSupport::TestCase
           user: {
             firstname: 'Bob',
             lastname: 'Master',
-            email: 'master@example.com',
+            email: "master-#{name}@example.com",
             active: false,
           },
         },
@@ -236,8 +232,8 @@ class HistoryTest < ActiveSupport::TestCase
             history_object: 'User',
             history_type: 'updated',
             history_attribute: 'email',
-            value_from: 'somebody@example.com',
-            value_to: 'master@example.com',
+            value_from: "somebody-#{name}@example.com",
+            value_to: "master-#{name}@example.com",
           },
           {
             result: true,
@@ -258,9 +254,8 @@ class HistoryTest < ActiveSupport::TestCase
 
       # user transaction
       ActiveRecord::Base.transaction do
-        user = User.create(test[:user_create][:user])
-
-        assert_equal(user.class.to_s, 'User')
+        user = User.create!(test[:user_create][:user])
+        assert_equal(user.class, User)
 
         # update user
         if test[:user_update][:user]
@@ -277,12 +272,7 @@ class HistoryTest < ActiveSupport::TestCase
     }
 
     # delete user
-    users.each { |user|
-      user_id = user.id
-      user.destroy
-      found = User.where(id: user_id).first
-      assert_not(found, 'User destroyed')
-    }
+    users.each(&:destroy!)
   end
 
   test 'organization' do
@@ -328,9 +318,8 @@ class HistoryTest < ActiveSupport::TestCase
 
       # user transaction
       ActiveRecord::Base.transaction do
-        organization = Organization.create(test[:organization_create][:organization])
-
-        assert_equal(organization.class.to_s, 'Organization')
+        organization = Organization.create!(test[:organization_create][:organization])
+        assert_equal(organization.class, Organization)
 
         # update organization
         if test[:organization_update][:organization]
@@ -346,12 +335,7 @@ class HistoryTest < ActiveSupport::TestCase
     }
 
     # delete user
-    organizations.each { |organization|
-      organization_id = organization.id
-      organization.destroy
-      found = Organization.where(id: organization_id).first
-      assert_not(found, 'Organization destroyed')
-    }
+    organizations.each(&:destroy!)
   end
 
   def history_check(history_list, history_check)
diff --git a/test/unit/integration_icinga_test.rb b/test/unit/integration_icinga_test.rb
index 55a5f7273..b10e656ff 100644
--- a/test/unit/integration_icinga_test.rb
+++ b/test/unit/integration_icinga_test.rb
@@ -19,7 +19,7 @@ User-Agent: Heirloom mailx 12.5 7/5/10
 MIME-Version: 1.0
 Content-Type: text/plain; charset=us-ascii
 Content-Transfer-Encoding: quoted-printable
-Message-Id: <20160131094621.29ECD400F29C-icinga-1@monitoring.znuny.com>
+Message-Id: <20160131094621.29ECD400F29C-icinga-1-0@monitoring.znuny.com>
 From: icinga_not_matching@monitoring.example.com (icinga)
 
 ***** Icinga  *****
@@ -41,9 +41,102 @@ Comment: [] =
     ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string)
     assert_equal('new', ticket_p.state.name)
     assert(ticket_p.preferences)
-    assert_not(ticket_p.preferences['integration'])
     assert_not(ticket_p.preferences['icinga'])
 
+    # RBL check
+    email_raw_string = "To: support@example.com
+Subject: [PROBLEM] RBL check on apn4711.dc.example.com is CRITICAL!
+User-Agent: Heirloom mailx 12.5 7/5/10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+Content-Transfer-Encoding: quoted-printable
+Message-Id: <20160131094621.29ECD400F29C-icinga-1-1@monitoring.znuny.com>
+From: icinga@monitoring.example.com (icinga)
+
+***** Icinga 2 Service Monitoring on apn4711.dc.example.com *****
+
+=3D=3D> RBL check on apn4711.dc.example.com is CRITICAL! <=3D=3D
+
+Info:    CHECK_RBL CRITICAL - apn4711.dc.example.com BLACKLISTED on 1 server of=
+ 38 (ix.dnsbl.example.com)=20
+
+When:    2017-08-06 22:18:43 +0200
+Service: RBL check (Display Name: \"RBL check\")
+Host:    apn4711.dc.example.com (Display Name: \"apn4711.dc.example.com\")
+IPv4:    127.0.0.1="
+
+    ticket_0, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string)
+    assert_equal('new', ticket_0.state.name)
+    assert(ticket_0.preferences)
+    assert(ticket_0.preferences['icinga'])
+    assert_equal('apn4711.dc.example.com (Display Name: "apn4711.dc.example.com")', ticket_0.preferences['icinga']['host'])
+    assert_equal('CHECK_RBL CRITICAL - apn4711.dc.example.com BLACKLISTED on 1 server of 38 (ix.dnsbl.example.com)', ticket_0.preferences['icinga']['info'])
+    assert_equal('RBL check (Display Name: "RBL check")', ticket_0.preferences['icinga']['service'])
+    assert_equal('CRITICAL', ticket_0.preferences['icinga']['state'])
+
+    # RBL check II
+    email_raw_string = "To: support@example.com
+Subject: [PROBLEM] RBL check on apn4711.dc.example.com is CRITICAL!
+User-Agent: Heirloom mailx 12.5 7/5/10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+Content-Transfer-Encoding: quoted-printable
+Message-Id: <20160131094621.29ECD400F29C-icinga-1-2@monitoring.znuny.com>
+From: icinga@monitoring.example.com (icinga)
+
+***** Icinga 2 Service Monitoring on apn4711.dc.example.com *****
+
+=3D=3D> RBL check on apn4711.dc.example.com is CRITICAL! <=3D=3D
+
+Info:    CHECK_RBL CRITICAL - apn4711.dc.example.com BLACKLISTED on 1 server of=
+ 38 (ix.dnsbl.example.com)=20
+
+When:    2017-08-06 22:18:43 +0200
+Service: RBL check (Display Name: \"RBL check\")
+Host:    apn4711.dc.example.com (Display Name: \"apn4711.dc.example.com\")
+IPv4:    127.0.0.1="
+
+    ticket_0_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string)
+    assert_equal('new', ticket_0_1.state.name)
+    assert(ticket_0_1.preferences)
+    assert(ticket_0_1.preferences['icinga'])
+    assert_equal('apn4711.dc.example.com (Display Name: "apn4711.dc.example.com")', ticket_0_1.preferences['icinga']['host'])
+    assert_equal('CHECK_RBL CRITICAL - apn4711.dc.example.com BLACKLISTED on 1 server of 38 (ix.dnsbl.example.com)', ticket_0_1.preferences['icinga']['info'])
+    assert_equal('RBL check (Display Name: "RBL check")', ticket_0_1.preferences['icinga']['service'])
+    assert_equal('CRITICAL', ticket_0_1.preferences['icinga']['state'])
+    assert_equal(ticket_0_1.id, ticket_0.id)
+
+    email_raw_string = "To: support@example.com
+Subject: [PROBLEM] RBL check on apn4711.dc.example.com is OK!
+User-Agent: Heirloom mailx 12.5 7/5/10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+Content-Transfer-Encoding: quoted-printable
+Message-Id: <20160131094621.29ECD400F29C-icinga-1-2@monitoring.znuny.com>
+From: icinga@monitoring.example.com (icinga)
+
+***** Icinga 2 Service Monitoring on apn4711.dc.example.com *****
+
+=3D=3D> RBL check on apn4711.dc.example.com is OK! <=3D=3D
+
+Info:    CHECK_RBL OK - apn4711.dc.example.com BLACKLISTED on 1 server of=
+ 38 (ix.dnsbl.example.com)=20
+
+When:    2017-08-06 22:18:43 +0200
+Service: RBL check (Display Name: \"RBL check\")
+Host:    apn4711.dc.example.com (Display Name: \"apn4711.dc.example.com\")
+IPv4:    127.0.0.1="
+
+    ticket_0_2, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string)
+    assert_equal('closed', ticket_0_2.state.name)
+    assert(ticket_0_2.preferences)
+    assert(ticket_0_2.preferences['icinga'])
+    assert_equal('apn4711.dc.example.com (Display Name: "apn4711.dc.example.com")', ticket_0_2.preferences['icinga']['host'])
+    assert_equal('CHECK_RBL CRITICAL - apn4711.dc.example.com BLACKLISTED on 1 server of 38 (ix.dnsbl.example.com)', ticket_0_2.preferences['icinga']['info'])
+    assert_equal('RBL check (Display Name: "RBL check")', ticket_0_2.preferences['icinga']['service'])
+    assert_equal('CRITICAL', ticket_0_2.preferences['icinga']['state'])
+    assert_equal(ticket_0_2.id, ticket_0.id)
+
     # matching sender - CPU Load/host.internal.loc
     email_raw_string = "To: support@example.com
 Subject: PROBLEM - host.internal.loc - CPU Load is WARNING
@@ -73,8 +166,6 @@ Comment: [] =
     ticket_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string)
     assert_equal('new', ticket_1.state.name)
     assert(ticket_1.preferences)
-    assert(ticket_1.preferences['integration'])
-    assert_equal('icinga', ticket_1.preferences['integration'])
     assert(ticket_1.preferences['icinga'])
     assert_equal('host.internal.loc', ticket_1.preferences['icinga']['host'])
     assert_equal('CPU Load', ticket_1.preferences['icinga']['service'])
@@ -109,8 +200,6 @@ Comment: [] =
     ticket_2, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string)
     assert_equal('new', ticket_2.state.name)
     assert(ticket_2.preferences)
-    assert(ticket_2.preferences['integration'])
-    assert_equal('icinga', ticket_2.preferences['integration'])
     assert(ticket_2.preferences['icinga'])
     assert_equal('host.internal.loc', ticket_2.preferences['icinga']['host'])
     assert_equal('Disk Usage 123', ticket_2.preferences['icinga']['service'])
@@ -146,8 +235,6 @@ Comment: [] =
     ticket_1_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string)
     assert_equal('new', ticket_1_1.state.name)
     assert(ticket_1_1.preferences)
-    assert(ticket_1_1.preferences['integration'])
-    assert_equal('icinga', ticket_1_1.preferences['integration'])
     assert(ticket_1_1.preferences['icinga'])
     assert_equal('host.internal.loc', ticket_1_1.preferences['icinga']['host'])
     assert_equal('CPU Load', ticket_1_1.preferences['icinga']['service'])
@@ -184,8 +271,6 @@ Comment: [] =
     assert_equal(ticket_1.id, ticket_1_2.id)
     assert_equal('closed', ticket_1_2.state.name)
     assert(ticket_1_2.preferences)
-    assert(ticket_1_2.preferences['integration'])
-    assert_equal('icinga', ticket_1_2.preferences['integration'])
     assert(ticket_1_2.preferences['icinga'])
     assert_equal('host.internal.loc', ticket_1_2.preferences['icinga']['host'])
     assert_equal('CPU Load', ticket_1_2.preferences['icinga']['service'])
@@ -218,8 +303,6 @@ Comment: [] =
     ticket_3, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string)
     assert_equal('new', ticket_3.state.name)
     assert(ticket_3.preferences)
-    assert(ticket_3.preferences['integration'])
-    assert_equal('icinga', ticket_3.preferences['integration'])
     assert(ticket_3.preferences['icinga'])
     assert_equal('apn4711.dc.example.com', ticket_3.preferences['icinga']['host'])
     assert_nil(ticket_3.preferences['icinga']['service'])
@@ -254,8 +337,6 @@ Comment: [] =
     assert_equal(ticket_3.id, ticket_3_1.id)
     assert_equal('closed', ticket_3_1.state.name)
     assert(ticket_3_1.preferences)
-    assert(ticket_3_1.preferences['integration'])
-    assert_equal('icinga', ticket_3_1.preferences['integration'])
     assert(ticket_3_1.preferences['icinga'])
     assert_equal('apn4711.dc.example.com', ticket_3.preferences['icinga']['host'])
     assert_nil(ticket_3_1.preferences['icinga']['service'])
diff --git a/test/unit/integration_nagios_test.rb b/test/unit/integration_nagios_test.rb
index 5b4136352..e4ef19189 100644
--- a/test/unit/integration_nagios_test.rb
+++ b/test/unit/integration_nagios_test.rb
@@ -37,7 +37,6 @@ WARNING - load average: 3.44, 0.99, 0.35
     ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string)
     assert_equal('new', ticket_p.state.name)
     assert(ticket_p.preferences)
-    assert_not(ticket_p.preferences['integration'])
     assert_not(ticket_p.preferences['nagios'])
 
     # matching sender - CPU Load/host.internal.loc
@@ -67,8 +66,6 @@ WARNING - load average: 3.44, 0.99, 0.35
     ticket_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string)
     assert_equal('new', ticket_1.state.name)
     assert(ticket_1.preferences)
-    assert(ticket_1.preferences['integration'])
-    assert_equal('nagios', ticket_1.preferences['integration'])
     assert(ticket_1.preferences['nagios'])
     assert_equal('host.internal.loc', ticket_1.preferences['nagios']['host'])
     assert_equal('CPU Load', ticket_1.preferences['nagios']['service'])
@@ -101,8 +98,6 @@ WARNING - load average: 3.44, 0.99, 0.35
     ticket_2, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string)
     assert_equal('new', ticket_2.state.name)
     assert(ticket_2.preferences)
-    assert(ticket_2.preferences['integration'])
-    assert_equal('nagios', ticket_2.preferences['integration'])
     assert(ticket_2.preferences['nagios'])
     assert_equal('host.internal.loc', ticket_2.preferences['nagios']['host'])
     assert_equal('Disk Usage 123', ticket_2.preferences['nagios']['service'])
@@ -136,8 +131,6 @@ WARNING - load average: 3.44, 0.99, 0.35
     ticket_1_1, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string)
     assert_equal('new', ticket_1_1.state.name)
     assert(ticket_1_1.preferences)
-    assert(ticket_1_1.preferences['integration'])
-    assert_equal('nagios', ticket_1_1.preferences['integration'])
     assert(ticket_1_1.preferences['nagios'])
     assert_equal('host.internal.loc', ticket_1_1.preferences['nagios']['host'])
     assert_equal('CPU Load', ticket_1_1.preferences['nagios']['service'])
@@ -170,8 +163,6 @@ Additional Info:
     assert_equal(ticket_1.id, ticket_1_2.id)
     assert_equal('closed', ticket_1_2.state.name)
     assert(ticket_1_2.preferences)
-    assert(ticket_1_2.preferences['integration'])
-    assert_equal('nagios', ticket_1_2.preferences['integration'])
     assert(ticket_1_2.preferences['nagios'])
     assert_equal('host.internal.loc', ticket_1_2.preferences['nagios']['host'])
     assert_equal('CPU Load', ticket_1_2.preferences['nagios']['service'])
@@ -204,8 +195,6 @@ Comment: [] =
     ticket_3, article_p, user_p, mail = Channel::EmailParser.new.process({}, email_raw_string)
     assert_equal('new', ticket_3.state.name)
     assert(ticket_3.preferences)
-    assert(ticket_3.preferences['integration'])
-    assert_equal('nagios', ticket_3.preferences['integration'])
     assert(ticket_3.preferences['nagios'])
     assert_equal('apn4711.dc.example.com', ticket_3.preferences['nagios']['host'])
     assert_nil(ticket_3.preferences['nagios']['service'])
@@ -240,8 +229,6 @@ Comment: [] =
     assert_equal(ticket_3.id, ticket_3_1.id)
     assert_equal('closed', ticket_3_1.state.name)
     assert(ticket_3_1.preferences)
-    assert(ticket_3_1.preferences['integration'])
-    assert_equal('nagios', ticket_3_1.preferences['integration'])
     assert(ticket_3_1.preferences['nagios'])
     assert_equal('apn4711.dc.example.com', ticket_3.preferences['nagios']['host'])
     assert_nil(ticket_3_1.preferences['nagios']['service'])
diff --git a/test/unit/notification_factory_renderer_test.rb b/test/unit/notification_factory_renderer_test.rb
index a09c73015..d3bcffed1 100644
--- a/test/unit/notification_factory_renderer_test.rb
+++ b/test/unit/notification_factory_renderer_test.rb
@@ -148,6 +148,16 @@ class NotificationFactoryRendererTest < ActiveSupport::TestCase
     ).render
     assert_equal(CGI.escapeHTML(ticket.title), result)
 
+    template = "\#{ticket.\" title}"
+    result = described_class.new(
+      {
+        ticket: ticket,
+      },
+      'en-us',
+      template,
+    ).render
+    assert_equal(CGI.escapeHTML(ticket.title), result)
+
     template = "some test
                            \#{article.body}"
     result = described_class.new(
       {
diff --git a/test/unit/overview_test.rb b/test/unit/overview_test.rb
new file mode 100644
index 000000000..145b64951
--- /dev/null
+++ b/test/unit/overview_test.rb
@@ -0,0 +1,215 @@
+# encoding: utf-8
+require 'test_helper'
+
+class OverviewTest < ActiveSupport::TestCase
+
+  test 'overview link' do
+    UserInfo.current_user_id = 1
+    overview = Overview.create!(
+      name: 'Not Shown Admin 2',
+      condition: {
+        'ticket.state_id' => {
+          operator: 'is',
+          value: [1, 2, 3],
+        },
+      },
+      order: {
+        by: 'created_at',
+        direction: 'DESC',
+      },
+      view: {
+        d: %w(title customer state created_at),
+        s: %w(number title customer state created_at),
+        m: %w(number title customer state created_at),
+        view_mode_default: 's',
+      },
+    )
+    assert_equal(overview.link, 'not_shown_admin_2')
+    overview.destroy!
+
+    overview = Overview.create!(
+      name: 'My assigned Tickets',
+      condition: {
+        'ticket.state_id' => {
+          operator: 'is',
+          value: [1, 2, 3],
+        },
+      },
+      order: {
+        by: 'created_at',
+        direction: 'DESC',
+      },
+      view: {
+        d: %w(title customer state created_at),
+        s: %w(number title customer state created_at),
+        m: %w(number title customer state created_at),
+        view_mode_default: 's',
+      },
+    )
+    assert_equal(overview.link, 'my_assigned_tickets')
+    overview.destroy!
+
+    overview = Overview.create!(
+      name: 'Übersicht',
+      condition: {
+        'ticket.state_id' => {
+          operator: 'is',
+          value: [1, 2, 3],
+        },
+      },
+      order: {
+        by: 'created_at',
+        direction: 'DESC',
+      },
+      view: {
+        d: %w(title customer state created_at),
+        s: %w(number title customer state created_at),
+        m: %w(number title customer state created_at),
+        view_mode_default: 's',
+      },
+    )
+    assert_equal(overview.link, 'ubersicht')
+    overview.destroy!
+
+    overview = Overview.create!(
+      name: "   Übersicht   \n",
+      condition: {
+        'ticket.state_id' => {
+          operator: 'is',
+          value: [1, 2, 3],
+        },
+      },
+      order: {
+        by: 'created_at',
+        direction: 'DESC',
+      },
+      view: {
+        d: %w(title customer state created_at),
+        s: %w(number title customer state created_at),
+        m: %w(number title customer state created_at),
+        view_mode_default: 's',
+      },
+    )
+    assert_equal(overview.link, 'ubersicht')
+    overview.destroy!
+
+    overview1 = Overview.create!(
+      name: 'Meine Übersicht',
+      condition: {
+        'ticket.state_id' => {
+          operator: 'is',
+          value: [1, 2, 3],
+        },
+      },
+      order: {
+        by: 'created_at',
+        direction: 'DESC',
+      },
+      view: {
+        d: %w(title customer state created_at),
+        s: %w(number title customer state created_at),
+        m: %w(number title customer state created_at),
+        view_mode_default: 's',
+      },
+    )
+    assert_equal(overview1.link, 'meine_ubersicht')
+    overview2 = Overview.create!(
+      name: 'Meine Übersicht',
+      condition: {
+        'ticket.state_id' => {
+          operator: 'is',
+          value: [1, 2, 3],
+        },
+      },
+      order: {
+        by: 'created_at',
+        direction: 'DESC',
+      },
+      view: {
+        d: %w(title customer state created_at),
+        s: %w(number title customer state created_at),
+        m: %w(number title customer state created_at),
+        view_mode_default: 's',
+      },
+    )
+    assert(overview2.link.start_with?('meine_ubersicht'))
+    assert_not_equal(overview1.link, overview2.link)
+    overview1.destroy!
+    overview2.destroy!
+
+    overview = Overview.create!(
+      name: 'Д дФ ф',
+      condition: {
+        'ticket.state_id' => {
+          operator: 'is',
+          value: [1, 2, 3],
+        },
+      },
+      order: {
+        by: 'created_at',
+        direction: 'DESC',
+      },
+      view: {
+        d: %w(title customer state created_at),
+        s: %w(number title customer state created_at),
+        m: %w(number title customer state created_at),
+        view_mode_default: 's',
+      },
+    )
+    assert_match(/^\d{1,3}$/, overview.link)
+    overview.destroy!
+
+    overview = Overview.create!(
+      name: ' Д дФ ф abc ',
+      condition: {
+        'ticket.state_id' => {
+          operator: 'is',
+          value: [1, 2, 3],
+        },
+      },
+      order: {
+        by: 'created_at',
+        direction: 'DESC',
+      },
+      view: {
+        d: %w(title customer state created_at),
+        s: %w(number title customer state created_at),
+        m: %w(number title customer state created_at),
+        view_mode_default: 's',
+      },
+    )
+    assert_equal(overview.link, 'abc')
+    overview.destroy!
+
+    overview = Overview.create!(
+      name: 'Übersicht',
+      link: 'my_overview',
+      condition: {
+        'ticket.state_id' => {
+          operator: 'is',
+          value: [1, 2, 3],
+        },
+      },
+      order: {
+        by: 'created_at',
+        direction: 'DESC',
+      },
+      view: {
+        d: %w(title customer state created_at),
+        s: %w(number title customer state created_at),
+        m: %w(number title customer state created_at),
+        view_mode_default: 's',
+      },
+    )
+    assert_equal(overview.link, 'my_overview')
+
+    overview.name = 'Übersicht2'
+    overview.link = 'my_overview2'
+    overview.save!
+
+    assert_equal(overview.link, 'my_overview2')
+
+    overview.destroy!
+
+  end
+end
diff --git a/test/unit/ticket_last_owner_update_test.rb b/test/unit/ticket_last_owner_update_test.rb
new file mode 100644
index 000000000..33492783c
--- /dev/null
+++ b/test/unit/ticket_last_owner_update_test.rb
@@ -0,0 +1,258 @@
+# encoding: utf-8
+require 'test_helper'
+
+class TicketLastOwnerUpdateTest < ActiveSupport::TestCase
+
+  setup do
+    group = Group.create_or_update(
+      name: 'LastOwnerUpdate',
+      assignment_timeout: 60,
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    roles = Role.where(name: 'Agent')
+    @agent1 = User.create_or_update(
+      login: 'ticket-assignment_timeout-agent1@example.com',
+      firstname: 'Overview',
+      lastname: 'Agent1',
+      email: 'ticket-assignment_timeout-agent1@example.com',
+      password: 'agentpw',
+      active: true,
+      roles: roles,
+      groups: Group.all,
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+  end
+
+  test 'last_owner_update_at check' do
+
+    ticket = Ticket.create!(
+      title: 'assignment_timeout test 1',
+      group: Group.lookup(name: 'LastOwnerUpdate'),
+      customer_id: 2,
+      state: Ticket::State.lookup(name: 'new'),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    assert_nil(ticket.last_owner_update_at)
+
+    travel 1.hour
+    ticket.owner = @agent1
+    ticket.save!
+    assert_equal(ticket.last_owner_update_at.to_s, ticket.updated_at.to_s)
+
+    ticket = Ticket.create!(
+      title: 'assignment_timeout test 1',
+      group: Group.lookup(name: 'LastOwnerUpdate'),
+      customer_id: 2,
+      state: Ticket::State.lookup(name: 'closed'),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    assert_nil(ticket.last_owner_update_at)
+
+    travel 1.hour
+    ticket.owner = @agent1
+    ticket.save!
+    assert_equal(ticket.last_owner_update_at.to_s, ticket.updated_at.to_s)
+
+    ticket = Ticket.create!(
+      title: 'assignment_timeout test 1',
+      group: Group.lookup(name: 'LastOwnerUpdate'),
+      owner: @agent1,
+      customer_id: 2,
+      state: Ticket::State.lookup(name: 'new'),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    assert_equal(ticket.last_owner_update_at.to_s, ticket.updated_at.to_s)
+
+    ticket.owner_id = 1
+    ticket.save!
+    assert_nil(ticket.last_owner_update_at)
+
+    ticket = Ticket.create!(
+      title: 'assignment_timeout test 1',
+      group: Group.lookup(name: 'LastOwnerUpdate'),
+      owner: @agent1,
+      customer_id: 2,
+      state: Ticket::State.lookup(name: 'closed'),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    assert_equal(ticket.last_owner_update_at.to_s, ticket.updated_at.to_s)
+
+    ticket.owner_id = 1
+    ticket.save!
+    assert_nil(ticket.last_owner_update_at)
+
+    ticket = Ticket.create!(
+      title: 'assignment_timeout test 2',
+      group: Group.lookup(name: 'Users'),
+      customer_id: 2,
+      state: Ticket::State.lookup(name: 'new'),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    assert_nil(ticket.last_owner_update_at)
+
+    travel 1.hour
+    ticket.owner = @agent1
+    ticket.save!
+    assert_equal(ticket.last_owner_update_at.to_s, ticket.updated_at.to_s)
+
+    ticket = Ticket.create!(
+      title: 'assignment_timeout test 2',
+      group: Group.lookup(name: 'Users'),
+      customer_id: 2,
+      state: Ticket::State.lookup(name: 'closed'),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    assert_nil(ticket.last_owner_update_at)
+
+    travel 1.hour
+    ticket.owner = @agent1
+    ticket.save!
+    assert_equal(ticket.last_owner_update_at.to_s, ticket.updated_at.to_s)
+
+    ticket = Ticket.create!(
+      title: 'assignment_timeout test 2',
+      group: Group.lookup(name: 'Users'),
+      owner: @agent1,
+      customer_id: 2,
+      state: Ticket::State.lookup(name: 'new'),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    assert_equal(ticket.last_owner_update_at.to_s, ticket.updated_at.to_s)
+
+    ticket.owner_id = 1
+    ticket.save!
+    assert_nil(ticket.last_owner_update_at)
+
+    ticket = Ticket.create!(
+      title: 'assignment_timeout test 2',
+      group: Group.lookup(name: 'Users'),
+      owner: @agent1,
+      customer_id: 2,
+      state: Ticket::State.lookup(name: 'closed'),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    assert_equal(ticket.last_owner_update_at.to_s, ticket.updated_at.to_s)
+
+    ticket.owner_id = 1
+    ticket.save!
+    assert_nil(ticket.last_owner_update_at)
+
+  end
+
+  test 'last_owner_update_at assignment_timeout check' do
+
+    ticket1 = Ticket.create!(
+      title: 'assignment_timeout test 1',
+      group: Group.lookup(name: 'LastOwnerUpdate'),
+      customer_id: 2,
+      state: Ticket::State.lookup(name: 'new'),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    assert_nil(ticket1.last_owner_update_at)
+
+    ticket2 = Ticket.create!(
+      title: 'assignment_timeout test 2',
+      group: Group.lookup(name: 'LastOwnerUpdate'),
+      owner: @agent1,
+      customer_id: 2,
+      state: Ticket::State.lookup(name: 'new'),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    assert_equal(ticket2.last_owner_update_at.to_s, ticket2.updated_at.to_s)
+
+    ticket3 = Ticket.create!(
+      title: 'assignment_timeout test 3',
+      group: Group.lookup(name: 'LastOwnerUpdate'),
+      owner: @agent1,
+      customer_id: 2,
+      state: Ticket::State.lookup(name: 'closed'),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    assert_equal(ticket3.last_owner_update_at.to_s, ticket3.updated_at.to_s)
+
+    ticket4 = Ticket.create!(
+      title: 'assignment_timeout test 4',
+      group: Group.lookup(name: 'Users'),
+      customer_id: 2,
+      state: Ticket::State.lookup(name: 'new'),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    assert_nil(ticket4.last_owner_update_at)
+
+    ticket5 = Ticket.create!(
+      title: 'assignment_timeout test 5',
+      group: Group.lookup(name: 'Users'),
+      owner: @agent1,
+      customer_id: 2,
+      state: Ticket::State.lookup(name: 'new'),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    assert_equal(ticket5.last_owner_update_at.to_s, ticket5.updated_at.to_s)
+
+    travel 55.minutes
+    Ticket.process_auto_unassign
+
+    ticket1after = Ticket.find(ticket1.id)
+    assert_nil(ticket1.last_owner_update_at)
+    assert_equal(ticket1.updated_at.to_s, ticket1after.updated_at.to_s)
+
+    ticket2after = Ticket.find(ticket2.id)
+    assert_equal(ticket2.last_owner_update_at.to_s, ticket2after.last_owner_update_at.to_s)
+    assert_equal(ticket2.updated_at.to_s, ticket2after.updated_at.to_s)
+
+    ticket3after = Ticket.find(ticket3.id)
+    assert_equal(ticket3.last_owner_update_at.to_s, ticket3after.last_owner_update_at.to_s)
+    assert_equal(ticket3.updated_at.to_s, ticket3after.updated_at.to_s)
+
+    ticket4after = Ticket.find(ticket4.id)
+    assert_nil(ticket4.last_owner_update_at)
+    assert_equal(ticket4.updated_at.to_s, ticket4after.updated_at.to_s)
+
+    ticket5after = Ticket.find(ticket5.id)
+    assert_equal(ticket5after.owner_id, @agent1.id)
+    assert_equal(ticket5.updated_at.to_s, ticket5after.updated_at.to_s)
+
+    travel 15.minutes
+    Ticket.process_auto_unassign
+    ticket2_updated_at = Time.current
+
+    ticket1after = Ticket.find(ticket1.id)
+    assert_nil(ticket1.last_owner_update_at)
+    assert_equal(ticket1.updated_at.to_s, ticket1after.updated_at.to_s)
+
+    ticket2after = Ticket.find(ticket2.id)
+    assert_nil(ticket2after.last_owner_update_at)
+    assert_equal(ticket2after.owner_id, 1)
+    assert_equal(ticket2_updated_at.to_s, ticket2after.updated_at.to_s)
+
+    ticket3after = Ticket.find(ticket3.id)
+    assert_equal(ticket3after.owner_id, @agent1.id)
+    assert_equal(ticket3.last_owner_update_at.to_s, ticket3after.last_owner_update_at.to_s)
+    assert_equal(ticket3.updated_at.to_s, ticket3after.updated_at.to_s)
+
+    ticket4after = Ticket.find(ticket4.id)
+    assert_nil(ticket4.last_owner_update_at)
+    assert_equal(ticket4.updated_at.to_s, ticket4after.updated_at.to_s)
+
+    ticket5after = Ticket.find(ticket5.id)
+    assert_equal(ticket5after.owner_id, @agent1.id)
+    assert_equal(ticket5.updated_at.to_s, ticket5after.updated_at.to_s)
+
+  end
+
+end
diff --git a/test/unit/ticket_notification_test.rb b/test/unit/ticket_notification_test.rb
index 9d6ae786c..0288f41dd 100644
--- a/test/unit/ticket_notification_test.rb
+++ b/test/unit/ticket_notification_test.rb
@@ -56,6 +56,7 @@ class TicketNotificationTest < ActiveSupport::TestCase
       lastname: 'Agent1',
       email: 'ticket-notification-agent1@example.com',
       password: 'agentpw',
+      out_of_office: false,
       active: true,
       roles: roles,
       groups: groups,
@@ -71,6 +72,7 @@ class TicketNotificationTest < ActiveSupport::TestCase
       lastname: 'Agent2',
       email: 'ticket-notification-agent2@example.com',
       password: 'agentpw',
+      out_of_office: false,
       active: true,
       roles: roles,
       groups: groups,
@@ -80,6 +82,38 @@ class TicketNotificationTest < ActiveSupport::TestCase
       updated_by_id: 1,
       created_by_id: 1,
     )
+    @agent3 = User.create_or_update(
+      login: 'ticket-notification-agent3@example.com',
+      firstname: 'Notification',
+      lastname: 'Agent3',
+      email: 'ticket-notification-agent3@example.com',
+      password: 'agentpw',
+      out_of_office: false,
+      active: true,
+      roles: roles,
+      groups: groups,
+      preferences: {
+        locale: 'de-de',
+      },
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    @agent4 = User.create_or_update(
+      login: 'ticket-notification-agent4@example.com',
+      firstname: 'Notification',
+      lastname: 'Agent4',
+      email: 'ticket-notification-agent4@example.com',
+      password: 'agentpw',
+      out_of_office: false,
+      active: true,
+      roles: roles,
+      groups: groups,
+      preferences: {
+        locale: 'de-de',
+      },
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
     Group.create_if_not_exists(
       name: 'WithoutAccess',
       note: 'Test for notification check.',
@@ -944,6 +978,126 @@ class TicketNotificationTest < ActiveSupport::TestCase
 
   end
 
+  test 'ticket notification - out of office' do
+
+    # create ticket in group
+    ticket1 = Ticket.create!(
+      title: 'some notification test out of office',
+      group: Group.lookup(name: 'TicketNotificationTest'),
+      customer: @customer,
+      owner_id: @agent2.id,
+      #state: Ticket::State.lookup(name: 'new'),
+      #priority: Ticket::Priority.lookup(name: '2 normal'),
+      updated_by_id: @customer.id,
+      created_by_id: @customer.id,
+    )
+    Ticket::Article.create!(
+      ticket_id: ticket1.id,
+      from: 'some_sender@example.com',
+      to: 'some_recipient@example.com',
+      subject: 'some subject',
+      message_id: 'some@id',
+      body: 'some message',
+      internal: false,
+      sender: Ticket::Article::Sender.where(name: 'Customer').first,
+      type: Ticket::Article::Type.where(name: 'email').first,
+      updated_by_id: @customer.id,
+      created_by_id: @customer.id,
+    )
+    assert(ticket1, 'ticket created - ticket notification simple')
+
+    # execute object transaction
+    Observer::Transaction.commit
+    Scheduler.worker(true)
+
+    # verify notifications to @agent1 + @agent2
+    assert_equal(0, NotificationFactory::Mailer.already_sent?(ticket1, @agent1, 'email'), ticket1.id)
+    assert_equal(1, NotificationFactory::Mailer.already_sent?(ticket1, @agent2, 'email'), ticket1.id)
+    assert_equal(0, NotificationFactory::Mailer.already_sent?(ticket1, @agent3, 'email'), ticket1.id)
+    assert_equal(0, NotificationFactory::Mailer.already_sent?(ticket1, @agent4, 'email'), ticket1.id)
+
+    @agent2.out_of_office = true
+    @agent2.preferences[:out_of_office_text] = 'at the doctor'
+    @agent2.out_of_office_replacement_id = @agent3.id
+    @agent2.out_of_office_start_at = Time.zone.today - 2.days
+    @agent2.out_of_office_end_at = Time.zone.today + 2.days
+    @agent2.save!
+
+    # create ticket in group
+    ticket2 = Ticket.create!(
+      title: 'some notification test out of office',
+      group: Group.lookup(name: 'TicketNotificationTest'),
+      customer: @customer,
+      owner_id: @agent2.id,
+      #state: Ticket::State.lookup(name: 'new'),
+      #priority: Ticket::Priority.lookup(name: '2 normal'),
+      updated_by_id: @customer.id,
+      created_by_id: @customer.id,
+    )
+    Ticket::Article.create!(
+      ticket_id: ticket2.id,
+      from: 'some_sender@example.com',
+      to: 'some_recipient@example.com',
+      subject: 'some subject',
+      message_id: 'some@id',
+      body: 'some message',
+      internal: false,
+      sender: Ticket::Article::Sender.where(name: 'Customer').first,
+      type: Ticket::Article::Type.where(name: 'email').first,
+      updated_by_id: @customer.id,
+      created_by_id: @customer.id,
+    )
+    assert(ticket2, 'ticket created - ticket notification simple')
+
+    # execute object transaction
+    Observer::Transaction.commit
+    Scheduler.worker(true)
+
+    # verify notifications to @agent1 + @agent2
+    assert_equal(0, NotificationFactory::Mailer.already_sent?(ticket2, @agent1, 'email'), ticket2.id)
+    assert_equal(1, NotificationFactory::Mailer.already_sent?(ticket2, @agent2, 'email'), ticket2.id)
+    assert_equal(1, NotificationFactory::Mailer.already_sent?(ticket2, @agent3, 'email'), ticket2.id)
+    assert_equal(0, NotificationFactory::Mailer.already_sent?(ticket2, @agent4, 'email'), ticket2.id)
+
+    # update ticket attributes
+    ticket2.title    = "#{ticket2.title} - #2"
+    ticket2.priority = Ticket::Priority.lookup(name: '3 high')
+    ticket2.save!
+
+    # execute object transaction
+    Observer::Transaction.commit
+    Scheduler.worker(true)
+
+    # verify notifications to @agent1 + @agent2
+    assert_equal(0, NotificationFactory::Mailer.already_sent?(ticket2, @agent1, 'email'), ticket2.id)
+    assert_equal(2, NotificationFactory::Mailer.already_sent?(ticket2, @agent2, 'email'), ticket2.id)
+    assert_equal(2, NotificationFactory::Mailer.already_sent?(ticket2, @agent3, 'email'), ticket2.id)
+    assert_equal(0, NotificationFactory::Mailer.already_sent?(ticket2, @agent4, 'email'), ticket2.id)
+
+    @agent3.out_of_office = true
+    @agent3.preferences[:out_of_office_text] = 'at the doctor'
+    @agent3.out_of_office_replacement_id = @agent4.id
+    @agent3.out_of_office_start_at = Time.zone.today - 2.days
+    @agent3.out_of_office_end_at = Time.zone.today + 2.days
+    @agent3.save!
+
+    # update ticket attributes
+    ticket2.title    = "#{ticket2.title} - #3"
+    ticket2.priority = Ticket::Priority.lookup(name: '3 high')
+    ticket2.save!
+
+    # execute object transaction
+    Observer::Transaction.commit
+    Scheduler.worker(true)
+
+    # verify notifications to @agent1 + @agent2
+    assert_equal(0, NotificationFactory::Mailer.already_sent?(ticket2, @agent1, 'email'), ticket2.id)
+    assert_equal(3, NotificationFactory::Mailer.already_sent?(ticket2, @agent2, 'email'), ticket2.id)
+    assert_equal(3, NotificationFactory::Mailer.already_sent?(ticket2, @agent3, 'email'), ticket2.id)
+    assert_equal(1, NotificationFactory::Mailer.already_sent?(ticket2, @agent4, 'email'), ticket2.id)
+
+  end
+
   test 'ticket notification template' do
 
     # create ticket in group
diff --git a/test/unit/ticket_null_byte_test.rb b/test/unit/ticket_null_byte_test.rb
new file mode 100644
index 000000000..aa3fdbd6a
--- /dev/null
+++ b/test/unit/ticket_null_byte_test.rb
@@ -0,0 +1,34 @@
+# encoding: utf-8
+require 'test_helper'
+
+class TicketNullByteTest < ActiveSupport::TestCase
+  test 'null byte test' do
+    ticket1 = Ticket.create!(
+      title: "some title \u0000 123",
+      group: Group.lookup(name: 'Users'),
+      customer_id: 2,
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    assert(ticket1, 'ticket created')
+
+    article1 = Ticket::Article.create!(
+      ticket_id: ticket1.id,
+      from: 'some_customer_com-1@example.com',
+      to: 'some_zammad_com-1@example.com',
+      subject: "com test 1\u0000",
+      message_id: 'some@id_com_1',
+      body: "some\u0000message 123",
+      internal: false,
+      sender: Ticket::Article::Sender.find_by(name: 'Customer'),
+      type: Ticket::Article::Type.find_by(name: 'email'),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    assert(article1, 'ticket created')
+
+    ticket1.destroy!
+    article1.destroy!
+
+  end
+end
diff --git a/test/unit/ticket_overview_test.rb b/test/unit/ticket_overview_test.rb
index 8c1acc94d..029c18e6d 100644
--- a/test/unit/ticket_overview_test.rb
+++ b/test/unit/ticket_overview_test.rb
@@ -302,7 +302,7 @@ class TicketOverviewTest < ActiveSupport::TestCase
     )
   end
 
-  test 'bbb overiview index' do
+  test 'bbb overview index' do
 
     result = Ticket::Overviews.all(
       current_user: @agent1,
@@ -343,7 +343,7 @@ class TicketOverviewTest < ActiveSupport::TestCase
 
   end
 
-  test 'ccc overiview content' do
+  test 'ccc overview content' do
 
     Ticket.destroy_all
 
diff --git a/test/unit/ticket_test.rb b/test/unit/ticket_test.rb
index ec07825d3..dcb2d9f9b 100644
--- a/test/unit/ticket_test.rb
+++ b/test/unit/ticket_test.rb
@@ -289,7 +289,7 @@ class TicketTest < ActiveSupport::TestCase
 
   test 'ticket subject' do
 
-    ticket1 = Ticket.create(
+    ticket = Ticket.create(
       title: 'subject test 1',
       group: Group.lookup(name: 'Users'),
       customer_id: 2,
@@ -298,12 +298,48 @@ class TicketTest < ActiveSupport::TestCase
       updated_by_id: 1,
       created_by_id: 1,
     )
-    assert_equal('subject test 1', ticket1.title)
-    assert_equal("ABC subject test 1 [Ticket##{ticket1.number}]", ticket1.subject_build('ABC subject test 1'))
-    assert_equal("RE: ABC subject test 1 [Ticket##{ticket1.number}]", ticket1.subject_build('ABC subject test 1', true))
-    assert_equal("RE: ABC subject test 1 [Ticket##{ticket1.number}]", ticket1.subject_build('  ABC subject test 1', true))
-    assert_equal("RE: ABC subject test 1 [Ticket##{ticket1.number}]", ticket1.subject_build('ABC subject test 1  ', true))
-    ticket1.destroy
+    assert_equal('subject test 1', ticket.title)
+    assert_equal("ABC subject test 1 [Ticket##{ticket.number}]", ticket.subject_build('ABC subject test 1'))
+    assert_equal("RE: ABC subject test 1 [Ticket##{ticket.number}]", ticket.subject_build('ABC subject test 1', true))
+    assert_equal("RE: ABC subject test 1 [Ticket##{ticket.number}]", ticket.subject_build('  ABC subject test 1', true))
+    assert_equal("RE: ABC subject test 1 [Ticket##{ticket.number}]", ticket.subject_build('ABC subject test 1  ', true))
+    ticket.destroy
+
+    Setting.set('ticket_hook_position', 'left')
+
+    ticket = Ticket.create(
+      title: 'subject test 1',
+      group: Group.lookup(name: 'Users'),
+      customer_id: 2,
+      state: Ticket::State.lookup(name: 'new'),
+      priority: Ticket::Priority.lookup(name: '2 normal'),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    assert_equal('subject test 1', ticket.title)
+    assert_equal("[Ticket##{ticket.number}] ABC subject test 1", ticket.subject_build('ABC subject test 1'))
+    assert_equal("RE: [Ticket##{ticket.number}] ABC subject test 1", ticket.subject_build('ABC subject test 1', true))
+    assert_equal("RE: [Ticket##{ticket.number}] ABC subject test 1", ticket.subject_build('  ABC subject test 1', true))
+    assert_equal("RE: [Ticket##{ticket.number}] ABC subject test 1", ticket.subject_build('ABC subject test 1  ', true))
+    ticket.destroy
+
+    Setting.set('ticket_hook_position', 'none')
+
+    ticket = Ticket.create(
+      title: 'subject test 1',
+      group: Group.lookup(name: 'Users'),
+      customer_id: 2,
+      state: Ticket::State.lookup(name: 'new'),
+      priority: Ticket::Priority.lookup(name: '2 normal'),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    assert_equal('subject test 1', ticket.title)
+    assert_equal('ABC subject test 1', ticket.subject_build('ABC subject test 1'))
+    assert_equal('RE: ABC subject test 1', ticket.subject_build('ABC subject test 1', true))
+    assert_equal('RE: ABC subject test 1', ticket.subject_build('  ABC subject test 1', true))
+    assert_equal('RE: ABC subject test 1', ticket.subject_build('ABC subject test 1  ', true))
+    ticket.destroy
 
   end
 
diff --git a/test/unit/ticket_trigger_test.rb b/test/unit/ticket_trigger_test.rb
index 7a7d6f628..724650e60 100644
--- a/test/unit/ticket_trigger_test.rb
+++ b/test/unit/ticket_trigger_test.rb
@@ -1414,6 +1414,228 @@ class TicketTriggerTest < ActiveSupport::TestCase
 
   end
 
+  test '6.1 owner auto assignment based on organization' do
+    trigger1 = Trigger.create_or_update(
+      name: 'aaa auto assignment',
+      condition: {
+        'ticket.organization_id' => {
+          'operator' => 'is not',
+          'pre_condition' => 'not_set',
+          'value' => '',
+          'value_completion' => '',
+        },
+        'ticket.action' => {
+          'operator' => 'is',
+          'value' => 'update',
+        },
+      },
+      perform: {
+        'ticket.owner_id' => {
+          'pre_condition' => 'current_user.id',
+          'value' => '',
+          'value_completion' => '',
+        },
+      },
+      disable_notification: true,
+      active: true,
+      created_by_id: 1,
+      updated_by_id: 1,
+    )
+    roles = Role.where(name: 'Agent')
+    agent = User.create_or_update(
+      login: 'agent@example.com',
+      firstname: 'Trigger',
+      lastname: 'Agent1',
+      email: 'agent@example.com',
+      password: 'agentpw',
+      active: true,
+      roles: roles,
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    roles = Role.where(name: 'Customer')
+    customer = User.create_or_update(
+      login: 'customer@example.com',
+      firstname: 'Trigger',
+      lastname: 'Customer1',
+      email: 'customer@example.com',
+      password: 'customerpw',
+      vip: true,
+      active: true,
+      roles: roles,
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+
+    ticket1 = Ticket.create(
+      title: 'test 123',
+      group: Group.lookup(name: 'Users'),
+      customer: customer,
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    Ticket::Article.create(
+      ticket_id: ticket1.id,
+      from: 'some_sender@example.com',
+      to: 'some_recipient@example.com',
+      subject: 'some subject',
+      message_id: 'some@id',
+      body: "some message note\nnew line",
+      internal: false,
+      sender: Ticket::Article::Sender.find_by(name: 'Agent'),
+      type: Ticket::Article::Type.find_by(name: 'note'),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    Observer::Transaction.commit
+
+    assert_equal('test 123', ticket1.title, 'ticket1.title verify')
+    assert_equal('Users', ticket1.group.name, 'ticket1.group verify')
+    assert_equal(1, ticket1.owner_id, 'ticket1.owner_id verify')
+    assert_equal('new', ticket1.state.name, 'ticket1.state verify')
+    assert_equal('2 normal', ticket1.priority.name, 'ticket1.priority verify')
+    assert_equal(1, ticket1.articles.count, 'ticket1.articles verify')
+    assert_equal([], ticket1.tag_list)
+
+    ticket1.update_attribute(:customer, User.lookup(email: 'nicole.braun@zammad.org') )
+
+    UserInfo.current_user_id = agent.id
+    Ticket::Article.create(
+      ticket_id: ticket1.id,
+      from: 'some_sender@example.com',
+      to: 'some_recipient@example.com',
+      subject: 'update',
+      message_id: 'some@id',
+      content_type: 'text/html',
+      body: 'update',
+      internal: false,
+      sender: Ticket::Article::Sender.find_by(name: 'Agent'),
+      type: Ticket::Article::Type.find_by(name: 'note'),
+    )
+    Observer::Transaction.commit
+    UserInfo.current_user_id = nil
+
+    ticket1.reload
+    assert_equal('test 123', ticket1.title, 'ticket1.title verify')
+    assert_equal('Users', ticket1.group.name, 'ticket1.group verify')
+    assert_equal(agent.id, ticket1.owner_id, 'ticket1.owner_id verify')
+    assert_equal('new', ticket1.state.name, 'ticket1.state verify')
+    assert_equal('2 normal', ticket1.priority.name, 'ticket1.priority verify')
+    assert_equal(2, ticket1.articles.count, 'ticket1.articles verify')
+    assert_equal([], ticket1.tag_list)
+  end
+
+  test '6.2 owner auto assignment based on organization' do
+    trigger1 = Trigger.create_or_update(
+      name: 'aaa auto assignment',
+      condition: {
+        'ticket.organization_id' => {
+          'operator' => 'is',
+          'pre_condition' => 'not_set',
+          'value' => '',
+          'value_completion' => '',
+        },
+        'ticket.action' => {
+          'operator' => 'is',
+          'value' => 'update',
+        },
+      },
+      perform: {
+        'ticket.owner_id' => {
+          'pre_condition' => 'current_user.id',
+          'value' => '',
+          'value_completion' => '',
+        },
+      },
+      disable_notification: true,
+      active: true,
+      created_by_id: 1,
+      updated_by_id: 1,
+    )
+    roles = Role.where(name: 'Agent')
+    agent = User.create_or_update(
+      login: 'agent@example.com',
+      firstname: 'Trigger',
+      lastname: 'Agent1',
+      email: 'agent@example.com',
+      password: 'agentpw',
+      active: true,
+      roles: roles,
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    roles = Role.where(name: 'Customer')
+    customer = User.create_or_update(
+      login: 'customer@example.com',
+      firstname: 'Trigger',
+      lastname: 'Customer1',
+      email: 'customer@example.com',
+      password: 'customerpw',
+      vip: true,
+      active: true,
+      roles: roles,
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+
+    ticket1 = Ticket.create(
+      title: 'test 123',
+      group: Group.lookup(name: 'Users'),
+      customer: User.lookup(email: 'nicole.braun@zammad.org'),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    Ticket::Article.create(
+      ticket_id: ticket1.id,
+      from: 'some_sender@example.com',
+      to: 'some_recipient@example.com',
+      subject: 'some subject',
+      message_id: 'some@id',
+      body: "some message note\nnew line",
+      internal: false,
+      sender: Ticket::Article::Sender.find_by(name: 'Agent'),
+      type: Ticket::Article::Type.find_by(name: 'note'),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    Observer::Transaction.commit
+
+    assert_equal('test 123', ticket1.title, 'ticket1.title verify')
+    assert_equal('Users', ticket1.group.name, 'ticket1.group verify')
+    assert_equal(1, ticket1.owner_id, 'ticket1.owner_id verify')
+    assert_equal('new', ticket1.state.name, 'ticket1.state verify')
+    assert_equal('2 normal', ticket1.priority.name, 'ticket1.priority verify')
+    assert_equal(1, ticket1.articles.count, 'ticket1.articles verify')
+    assert_equal([], ticket1.tag_list)
+
+    ticket1.update_attribute(:customer, customer )
+
+    UserInfo.current_user_id = agent.id
+    Ticket::Article.create(
+      ticket_id: ticket1.id,
+      from: 'some_sender@example.com',
+      to: 'some_recipient@example.com',
+      subject: 'update',
+      message_id: 'some@id',
+      content_type: 'text/html',
+      body: 'update',
+      internal: false,
+      sender: Ticket::Article::Sender.find_by(name: 'Agent'),
+      type: Ticket::Article::Type.find_by(name: 'note'),
+    )
+    Observer::Transaction.commit
+    UserInfo.current_user_id = nil
+
+    ticket1.reload
+    assert_equal('test 123', ticket1.title, 'ticket1.title verify')
+    assert_equal('Users', ticket1.group.name, 'ticket1.group verify')
+    assert_equal(agent.id, ticket1.owner_id, 'ticket1.owner_id verify')
+    assert_equal('new', ticket1.state.name, 'ticket1.state verify')
+    assert_equal('2 normal', ticket1.priority.name, 'ticket1.priority verify')
+    assert_equal(2, ticket1.articles.count, 'ticket1.articles verify')
+    assert_equal([], ticket1.tag_list)
+  end
+
   test '7 owner auto assignment' do
     trigger1 = Trigger.create_or_update(
       name: 'aaa auto assignment',
@@ -3145,4 +3367,117 @@ class TicketTriggerTest < ActiveSupport::TestCase
 
   end
 
+  test '3 invalid condition' do
+    trigger1 = Trigger.create_or_update(
+      name: 'aaa loop check',
+      condition: {
+        'ticket.action' => {
+          'operator' => 'is',
+          'value' => 'create',
+        },
+      },
+      perform: {
+        'ticket.tags' => {
+          'operator' => 'add',
+          'value' => 'xxx',
+        },
+      },
+      disable_notification: true,
+      active: true,
+      created_by_id: 1,
+      updated_by_id: 1,
+    )
+    trigger1.update_column(:condition, {
+                             'ticket.action' => {
+                               'operator' => 'is',
+                               'value' => 'create',
+                             },
+                             'ticket.first_response_at' => {
+                               'operator' => 'before (absolute)',
+                               'value' => 'invalid invalid 4',
+                             },
+                           })
+    assert_equal('invalid invalid 4', trigger1.condition['ticket.first_response_at']['value'])
+
+    trigger2 = Trigger.create_or_update(
+      name: 'auto reply',
+      condition: {
+        'ticket.action' => {
+          'operator' => 'is',
+          'value' => 'create',
+        },
+        'ticket.state_id' => {
+          'operator' => 'is',
+          'value' => Ticket::State.lookup(name: 'new').id.to_s,
+        }
+      },
+      perform: {
+        'notification.email' => {
+          'body' => 'some text
                            #{ticket.customer.lastname}
                            #{ticket.title}
                            #{article.body}',
+          'recipient' => 'ticket_customer',
+          'subject' => 'Thanks for your inquiry (#{ticket.title})!',
+        },
+        'ticket.priority_id' => {
+          'value' => Ticket::Priority.lookup(name: '3 high').id.to_s,
+        },
+        'ticket.tags' => {
+          'operator' => 'add',
+          'value' => 'aa, kk',
+        },
+      },
+      disable_notification: true,
+      active: true,
+      created_by_id: 1,
+      updated_by_id: 1,
+    )
+
+    ticket1 = Ticket.create(
+      title: "some title\n äöüß",
+      group: Group.lookup(name: 'Users'),
+      customer: User.lookup(email: 'nicole.braun@zammad.org'),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    assert(ticket1, 'ticket1 created')
+    Ticket::Article.create(
+      ticket_id: ticket1.id,
+      from: 'some_sender@example.com',
+      to: 'some_recipient@example.com',
+      subject: 'some subject',
+      message_id: 'some@id',
+      body: "some message note\nnew line",
+      internal: false,
+      sender: Ticket::Article::Sender.find_by(name: 'Agent'),
+      type: Ticket::Article::Type.find_by(name: 'note'),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+
+    ticket1.reload
+    assert_equal('some title  äöüß', ticket1.title, 'ticket1.title verify')
+    assert_equal('Users', ticket1.group.name, 'ticket1.group verify')
+    assert_equal('new', ticket1.state.name, 'ticket1.state verify')
+    assert_equal('2 normal', ticket1.priority.name, 'ticket1.priority verify')
+    assert_equal(1, ticket1.articles.count, 'ticket1.articles verify')
+    assert_equal([], ticket1.tag_list)
+
+    Observer::Transaction.commit
+
+    ticket1.reload
+    assert_equal('some title  äöüß', ticket1.title, 'ticket1.title verify')
+    assert_equal('Users', ticket1.group.name, 'ticket1.group verify')
+    assert_equal('new', ticket1.state.name, 'ticket1.state verify')
+    assert_equal('3 high', ticket1.priority.name, 'ticket1.priority verify')
+    assert_equal(2, ticket1.articles.count, 'ticket1.articles verify')
+    assert_equal(%w(aa kk), ticket1.tag_list)
+    article1 = ticket1.articles.last
+    assert_match('Zammad ', article1.from)
+    assert_match('nicole.braun@zammad.org', article1.to)
+    assert_match('Thanks for your inquiry (some title  äöüß)!', article1.subject)
+    assert_match('Braun
                            some <b>title</b>', article1.body)
+    assert_match('> some message <b>note</b>
                            > new line', article1.body)
+    assert_equal('text/html', article1.content_type)
+
+  end
+
 end
diff --git a/test/unit/user_out_of_office_test.rb b/test/unit/user_out_of_office_test.rb
new file mode 100644
index 000000000..6d8f68968
--- /dev/null
+++ b/test/unit/user_out_of_office_test.rb
@@ -0,0 +1,131 @@
+require 'test_helper'
+
+class UserOutOfOfficeTest < ActiveSupport::TestCase
+  setup do
+
+    UserInfo.current_user_id = 1
+
+    groups = Group.all
+    roles = Role.where(name: 'Agent')
+    @agent1 = User.create_or_update(
+      login: 'user-out_of_office-agent1@example.com',
+      firstname: 'UserOutOfOffice',
+      lastname: 'Agent1',
+      email: 'user-out_of_office-agent1@example.com',
+      password: 'agentpw',
+      active: true,
+      roles: roles,
+      groups: groups,
+    )
+    @agent2 = User.create_or_update(
+      login: 'user-out_of_office-agent2@example.com',
+      firstname: 'UserOutOfOffice',
+      lastname: 'Agent2',
+      email: 'user-out_of_office-agent2@example.com',
+      password: 'agentpw',
+      active: true,
+      roles: roles,
+      groups: groups,
+    )
+    @agent3 = User.create_or_update(
+      login: 'user-out_of_office-agent3@example.com',
+      firstname: 'UserOutOfOffice',
+      lastname: 'Agent3',
+      email: 'user-out_of_office-agent3@example.com',
+      password: 'agentpw',
+      active: true,
+      roles: roles,
+      groups: groups,
+    )
+  end
+
+  test 'check out_of_office?' do
+
+    # check
+    assert_not(@agent1.out_of_office?)
+    assert_not(@agent2.out_of_office?)
+    assert_not(@agent3.out_of_office?)
+
+    assert_raises(Exceptions::UnprocessableEntity) {
+      @agent1.out_of_office = true
+      @agent1.out_of_office_start_at = Time.zone.now + 2.days
+      @agent1.out_of_office_end_at = Time.zone.now
+      @agent1.save!
+    }
+
+    assert_raises(Exceptions::UnprocessableEntity) {
+      @agent1.out_of_office = true
+      @agent1.out_of_office_start_at = Time.zone.now
+      @agent1.out_of_office_end_at = Time.zone.now - 2.days
+      @agent1.save!
+    }
+
+    assert_raises(Exceptions::UnprocessableEntity) {
+      @agent1.out_of_office = true
+      @agent1.out_of_office_start_at = nil
+      @agent1.out_of_office_end_at = Time.zone.now
+      @agent1.save!
+    }
+
+    assert_raises(Exceptions::UnprocessableEntity) {
+      @agent1.out_of_office = true
+      @agent1.out_of_office_start_at = Time.zone.now
+      @agent1.out_of_office_end_at = nil
+      @agent1.save!
+    }
+
+    @agent1.out_of_office = false
+    @agent1.out_of_office_start_at = Time.zone.now + 2.days
+    @agent1.out_of_office_end_at = Time.zone.now
+    @agent1.save!
+
+    assert_not(@agent1.out_of_office?)
+
+    assert_raises(Exceptions::UnprocessableEntity) {
+      @agent1.out_of_office = true
+      @agent1.out_of_office_start_at = Time.zone.now + 2.days
+      @agent1.out_of_office_end_at = Time.zone.now + 4.days
+      @agent1.save!
+    }
+    assert_raises(Exceptions::UnprocessableEntity) {
+      @agent1.out_of_office_replacement_id = 999_999_999_999 # not existing
+      @agent1.save!
+    }
+    @agent1.out_of_office_replacement_id = @agent2.id
+    @agent1.save!
+
+    assert_not(@agent1.out_of_office?)
+
+    travel 2.days
+
+    assert(@agent1.out_of_office?)
+
+    travel 1.day
+
+    assert(@agent1.out_of_office?)
+
+    travel 1.day
+
+    assert(@agent1.out_of_office?)
+
+    travel 1.day
+
+    assert_not(@agent1.out_of_office?)
+
+    assert_not(@agent1.out_of_office_agent)
+
+    assert_not(@agent2.out_of_office_agent)
+
+    @agent2.out_of_office = true
+    @agent2.out_of_office_start_at = Time.zone.now
+    @agent2.out_of_office_end_at = Time.zone.now + 4.days
+    @agent2.out_of_office_replacement_id = @agent3.id
+    @agent2.save!
+
+    assert(@agent2.out_of_office?)
+
+    assert_equal(@agent2.out_of_office_agent.id, @agent3.id)
+
+  end
+
+end
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 799294515..89447737c 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -245,9 +245,9 @@ class UserTest < ActiveSupport::TestCase
     tests.each { |test|
 
       # check if user exists
-      user = User.where( login: test[:create][:login] ).first
+      user = User.where(login: test[:create][:login]).first
       if user
-        user.destroy
+        user.destroy!
       end
 
       user = User.create( test[:create] )
@@ -266,8 +266,8 @@ class UserTest < ActiveSupport::TestCase
         end
       }
       if test[:create_verify][:image_md5]
-        file = Avatar.get_by_hash( user.image )
-        file_md5 = Digest::MD5.hexdigest( file.content )
+        file = Avatar.get_by_hash(user.image)
+        file_md5 = Digest::MD5.hexdigest(file.content)
         assert_equal(test[:create_verify][:image_md5], file_md5, "create avatar md5 check in (#{test[:name]})")
       end
       if test[:update]
@@ -275,7 +275,7 @@ class UserTest < ActiveSupport::TestCase
 
         test[:update_verify].each { |key, value|
           next if key == :image_md5
-          if user.respond_to?( key )
+          if user.respond_to?(key)
             assert_equal(value, user.send(key), "update check #{key} in (#{test[:name]})")
           else
             assert_equal(value, user[key], "update check #{key} in (#{test[:name]})")
@@ -289,10 +289,252 @@ class UserTest < ActiveSupport::TestCase
         end
       end
 
-      user.destroy
+      user.destroy!
     }
   end
 
+  test 'without email - but login eq email' do
+    name = rand(999_999_999)
+
+    login = "admin-role_without_email#{name}@example.com"
+    email = "admin-role_without_email#{name}@example.com"
+    admin = User.create_or_update(
+      login: login,
+      firstname: 'Role',
+      lastname: "Admin#{name}",
+      #email: "",
+      password: 'adminpw',
+      active: true,
+      roles: Role.where(name: %w(Admin Agent)),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+
+    assert(admin.id)
+    assert_equal(admin.login, login)
+    assert_equal(admin.email, '')
+
+    admin.email = email
+    admin.save!
+
+    assert_equal(admin.login, login)
+    assert_equal(admin.email, email)
+
+    admin.email = ''
+    admin.save!
+
+    assert(admin.id)
+    assert(admin.login)
+    assert_not_equal(admin.login, login)
+    assert_equal(admin.email, '')
+
+    admin.destroy!
+  end
+
+  test 'without email - but login ne email' do
+    name = rand(999_999_999)
+
+    login = "admin-role_without_email#{name}"
+    email = "admin-role_without_email#{name}@example.com"
+    admin = User.create_or_update(
+      login: login,
+      firstname: 'Role',
+      lastname: "Admin#{name}",
+      #email: "",
+      password: 'adminpw',
+      active: true,
+      roles: Role.where(name: %w(Admin Agent)),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+
+    assert(admin.id)
+    assert_equal(admin.login, login)
+    assert_equal(admin.email, '')
+
+    admin.email = email
+    admin.save!
+
+    assert_equal(admin.login, login)
+    assert_equal(admin.email, email)
+
+    admin.email = ''
+    admin.save!
+
+    assert(admin.id)
+    assert_equal(admin.login, login)
+    assert_equal(admin.email, '')
+
+    admin.destroy!
+  end
+
+  test 'uniq email' do
+    name = rand(999_999_999)
+
+    email1 = "admin1-role_without_email#{name}@example.com"
+    admin1 = User.create!(
+      login: email1,
+      firstname: 'Role',
+      lastname: "Admin1#{name}",
+      email: email1,
+      password: 'adminpw',
+      active: true,
+      roles: Role.where(name: %w(Admin Agent)),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+
+    assert(admin1.id)
+    assert_equal(admin1.email, email1)
+
+    assert_raises(Exceptions::UnprocessableEntity) {
+      User.create!(
+        login: "#{email1}-1",
+        firstname: 'Role',
+        lastname: "Admin1#{name}",
+        email: email1,
+        password: 'adminpw',
+        active: true,
+        roles: Role.where(name: %w(Admin Agent)),
+        updated_by_id: 1,
+        created_by_id: 1,
+      )
+    }
+
+    email2 = "admin2-role_without_email#{name}@example.com"
+    admin2 = User.create!(
+      firstname: 'Role',
+      lastname: "Admin2#{name}",
+      email: email2,
+      password: 'adminpw',
+      active: true,
+      roles: Role.where(name: %w(Admin Agent)),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+
+    assert_raises(Exceptions::UnprocessableEntity) {
+      admin2.email = email1
+      admin2.save!
+    }
+
+    admin1.email = admin1.email
+    admin1.save!
+
+    admin2.destroy!
+    admin1.destroy!
+  end
+
+  test 'uniq email - multiple use' do
+    Setting.set('user_email_multiple_use', true)
+    name = rand(999_999_999)
+
+    email1 = "admin1-role_without_email#{name}@example.com"
+    admin1 = User.create!(
+      login: email1,
+      firstname: 'Role',
+      lastname: "Admin1#{name}",
+      email: email1,
+      password: 'adminpw',
+      active: true,
+      roles: Role.where(name: %w(Admin Agent)),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+
+    assert(admin1.id)
+    assert_equal(admin1.email, email1)
+
+    admin2 = User.create!(
+      login: "#{email1}-1",
+      firstname: 'Role',
+      lastname: "Admin1#{name}",
+      email: email1,
+      password: 'adminpw',
+      active: true,
+      roles: Role.where(name: %w(Admin Agent)),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    assert_equal(admin2.email, email1)
+    admin2.destroy!
+    admin1.destroy!
+    Setting.set('user_email_multiple_use', false)
+  end
+
+  test 'ensure roles' do
+    name = rand(999_999_999)
+
+    admin = User.create_or_update(
+      login: "admin-role#{name}@example.com",
+      firstname: 'Role',
+      lastname: "Admin#{name}",
+      email: "admin-role#{name}@example.com",
+      password: 'adminpw',
+      active: true,
+      roles: Role.where(name: %w(Admin Agent)),
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+
+    customer1 = User.create_or_update(
+      login: "user-ensure-role1-#{name}@example.com",
+      firstname: 'Role',
+      lastname: "Customer#{name}",
+      email: "user-ensure-role1-#{name}@example.com",
+      password: 'customerpw',
+      active: true,
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    assert_equal(customer1.role_ids.sort, Role.signup_role_ids)
+
+    roles = Role.where(name: 'Agent')
+    customer1.roles = roles
+    customer1.save!
+
+    assert_equal(customer1.role_ids.count, 1)
+    assert_equal(customer1.role_ids.first, roles.first.id)
+    assert_equal(customer1.roles.first.id, roles.first.id)
+
+    customer1.roles = []
+    customer1.save!
+
+    assert_equal(customer1.role_ids.sort, Role.signup_role_ids)
+    customer1.destroy!
+
+    customer2 = User.create_or_update(
+      login: "user-ensure-role2-#{name}@example.com",
+      firstname: 'Role',
+      lastname: "Customer#{name}",
+      email: "user-ensure-role2-#{name}@example.com",
+      password: 'customerpw',
+      roles: roles,
+      active: true,
+      updated_by_id: 1,
+      created_by_id: 1,
+    )
+    assert_equal(customer2.role_ids.count, 1)
+    assert_equal(customer2.role_ids.first, roles.first.id)
+    assert_equal(customer2.roles.first.id, roles.first.id)
+
+    roles = Role.where(name: 'Admin')
+    customer2.role_ids = [roles.first.id]
+    customer2.save!
+
+    assert_equal(customer2.role_ids.count, 1)
+    assert_equal(customer2.role_ids.first, roles.first.id)
+    assert_equal(customer2.roles.first.id, roles.first.id)
+
+    customer2.roles = []
+    customer2.save!
+
+    assert_equal(customer2.role_ids.sort, Role.signup_role_ids)
+    customer2.destroy!
+
+    admin.destroy!
+  end
+
   test 'user default preferences' do
     name = rand(999_999_999)
     groups = Group.where(name: 'Users')
@@ -352,7 +594,6 @@ class UserTest < ActiveSupport::TestCase
     assert(customer1.preferences['notification_config'])
     assert(customer1.preferences['notification_config']['matrix']['create'])
     assert(customer1.preferences['notification_config']['matrix']['update'])
-
   end
 
   test 'permission' do
@@ -557,7 +798,7 @@ class UserTest < ActiveSupport::TestCase
     # So we need to merge them with the User Nr 1 and destroy them afterwards
     User.with_permissions('admin').each do |user|
       Models.merge('User', 1, user.id)
-      user.destroy
+      user.destroy!
     end
 
     # store current admin count
diff --git a/vendor/lib/microsoft_office365_database.rb b/vendor/lib/microsoft_office365_database.rb
new file mode 100644
index 000000000..5d51c084a
--- /dev/null
+++ b/vendor/lib/microsoft_office365_database.rb
@@ -0,0 +1,13 @@
+class MicrosoftOffice365Database < OmniAuth::Strategies::MicrosoftOffice365
+  option :name, 'microsoft_office365'
+
+  def initialize(app, *args, &block)
+
+    # database lookup
+    config  = Setting.get('auth_microsoft_office365_credentials') || {}
+    args[0] = config['app_id']
+    args[1] = config['app_secret']
+    super
+  end
+
+end