gems

Merge remote-tracking branch 'origin/stable-5.0' into antifascista-stable
Trigger a build.
2022-04-14 15:47:43 -03:00 · 2022-04-14 15:45:53 -03:00 · 2022-03-15 12:02:20 +01:00 · 2022-03-08 21:16:37 +01:00 · 2022-03-01 10:14:30 +01:00 · 2022-02-22 12:51:05 +00:00
366 changed files with 9939 additions and 5635 deletions
--- a/.coffeelint/rules/prevent_underscore_backport.coffee
+++ b/.coffeelint/rules/prevent_underscore_backport.coffee
@ -0,0 +1,20 @@
+module.exports = class PreventUnderscoreBackport
+
+  rule:
+    name: 'prevent_underscore_backport'
+    level: 'error'
+    message: 'The method __(...) is not available in current stable'
+    description: '''
+      '''
+
+  constructor: ->
+    @callTokens = []
+
+  tokens: ['CALL_START']
+
+  lintToken: (token, tokenApi) ->
+    [type, tokenValue] = token
+
+    p = tokenApi.peek(-1)
+    if p[1] == '__'
+      return { }
--- a/.gitignore
+++ b/.gitignore
@ -84,6 +84,9 @@
 # Eclipse
 /.project

+# VSCode
+/.vscode
+
 # Byebug
 /.byebug_history

--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,5 +1,5 @@
 default:
-  image: registry.znuny.com/docker/zammad-ci:2.7.4
+  image: $CI_REGISTRY/docker/zammad-ci:2.7.4

 include:
  - local: '/.gitlab/ci/base.yml'
@ -55,7 +55,7 @@ cache:
 # Initialize application env
 before_script:
  - source /etc/profile.d/rvm.sh
-  - source /opt/rh/rh-nodejs12/enable
+  - source /opt/rh/rh-nodejs*/enable
  - bundle install -j $(nproc) --path vendor
  - bundle exec ruby .gitlab/configure_environment.rb
  - source .gitlab/environment.env
--- a/.gitlab/ci/base.yml
+++ b/.gitlab/ci/base.yml
@ -74,35 +74,35 @@

 # DB Docker
 .docker_mysql: &docker_mysql
-  name: registry.znuny.com/docker/zammad-mysql:stable
+  name: $CI_REGISTRY/docker/zammad-mysql:stable
  alias: mysql

 .docker_postgresql: &docker_postgresql
-  name: registry.znuny.com/docker/zammad-postgresql:stable
+  name: $CI_REGISTRY/docker/zammad-postgresql:stable
  alias: postgresql

 .docker_elasticsearch: &docker_elasticsearch
-  name: registry.znuny.com/docker/zammad-elasticsearch:$ELASTICSEARCH_TAG
+  name: $CI_REGISTRY/docker/zammad-elasticsearch:$ELASTICSEARCH_TAG
  alias: elasticsearch

 .docker_selenium_chrome: &docker_selenium_chrome
-  name: registry.znuny.com/docker/zammad-selenium-chrome:stable
+  name: $CI_REGISTRY/docker/zammad-selenium-chrome:stable
  alias: selenium-chrome

 .docker_selenium_firefox: &docker_selenium_firefox
-  name: registry.znuny.com/docker/zammad-selenium-firefox:stable
+  name: $CI_REGISTRY/docker/zammad-selenium-firefox:stable
  alias: selenium-firefox

 .docker_imap: &docker_imap
-  name: registry.znuny.com/docker/zammad-imap:stable
+  name: $CI_REGISTRY/docker/zammad-imap:stable
  alias: mail

 .docker_redis: &docker_redis
-  name: registry.znuny.com/docker/zammad-redis:stable
+  name: $CI_REGISTRY/docker/zammad-redis:stable
  alias: redis

 .docker_memcached: &docker_memcached
-  name: registry.znuny.com/docker/zammad-memcached:stable
+  name: $CI_REGISTRY/docker/zammad-memcached:stable
  alias: memcached
  command: ["memcached", "-m", "256M"]

--- a/.gitlab/ci/browser-core/api_client_php.yml
+++ b/.gitlab/ci/browser-core/api_client_php.yml
@ -8,7 +8,7 @@ api_client_php:
  script:
    - RAILS_ENV=test bundle exec rake db:create
    - RAILS_ENV=test bundle exec rake zammad:ci:test:start zammad:setup:auto_wizard
-    - git clone https://github.com/zammad/zammad-api-client-php.git
+    - git clone https://github.com/zammad/zammad-api-client-php.git -b zammad-ci-5.0 # Use state with tests compatible to 5.0
    - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
    - php composer-setup.php --install-dir=/usr/local/bin
    - ln -s /usr/local/bin/composer.phar /usr/local/bin/composer
--- a/.gitlab/ci/browser-integration/otrs_chrome.yml
+++ b/.gitlab/ci/browser-integration/otrs_chrome.yml
@ -7,11 +7,11 @@ otrs_chrome:
    IMPORT_OTRS_ENDPOINT: "http://zammad-ci-otrsimport-app/otrs/public.pl?Action=ZammadMigrator"
    TZ: "Europe/Berlin"       # Required for the zammad-ci-otrsimport-app containers
  services:
-    - name: registry.znuny.com/docker/zammad-postgresql:stable
+    - name: $CI_REGISTRY/docker/zammad-postgresql:stable
      alias: postgresql
-    - name: registry.znuny.com/docker/zammad-selenium-chrome:stable
+    - name: $CI_REGISTRY/docker/zammad-selenium-chrome:stable
      alias: selenium-chrome
-    - name: registry.znuny.com/docker/zammad-ci-otrsimport-db:otrs6
+    - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-db:otrs6
      alias: zammad-ci-otrsimport-db
-    - name: registry.znuny.com/docker/zammad-ci-otrsimport-app:otrs6
+    - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-app:otrs6
      alias: zammad-ci-otrsimport-app
--- a/.gitlab/ci/integration/es.yml
+++ b/.gitlab/ci/integration/es.yml
@ -11,7 +11,6 @@
    - bundle exec rails test test/integration/elasticsearch_active_test.rb
    - bundle exec rails test test/integration/elasticsearch_test.rb
    - bundle exec rspec --tag searchindex --tag ~type:system --profile 10
-    - bundle exec rails test test/integration/report_test.rb

 es:7:
  <<: *template_integration_es
--- a/.gitlab/ci/integration/otrs.yml
+++ b/.gitlab/ci/integration/otrs.yml
@ -12,71 +12,71 @@
 otrs:6:
  <<: *template_integration_otrs
  services:
-    - name: registry.znuny.com/docker/zammad-mysql:stable
+    - name: $CI_REGISTRY/docker/zammad-mysql:stable
      alias: mysql
-    - name: registry.znuny.com/docker/zammad-postgresql:stable
+    - name: $CI_REGISTRY/docker/zammad-postgresql:stable
      alias: postgresql
-    - name: registry.znuny.com/docker/zammad-ci-otrsimport-db:otrs6
+    - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-db:otrs6
      alias: zammad-ci-otrsimport-db
-    - name: registry.znuny.com/docker/zammad-ci-otrsimport-app:otrs6
+    - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-app:otrs6
      alias: zammad-ci-otrsimport-app

 otrs:5:
  <<: *template_integration_otrs
  services:
-    - name: registry.znuny.com/docker/zammad-mysql:stable
+    - name: $CI_REGISTRY/docker/zammad-mysql:stable
      alias: mysql
-    - name: registry.znuny.com/docker/zammad-postgresql:stable
+    - name: $CI_REGISTRY/docker/zammad-postgresql:stable
      alias: postgresql
-    - name: registry.znuny.com/docker/zammad-ci-otrsimport-db:otrs5
+    - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-db:otrs5
      alias: zammad-ci-otrsimport-db
-    - name: registry.znuny.com/docker/zammad-ci-otrsimport-app:otrs5
+    - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-app:otrs5
      alias: zammad-ci-otrsimport-app

 otrs:4:
  <<: *template_integration_otrs
  services:
-    - name: registry.znuny.com/docker/zammad-mysql:stable
+    - name: $CI_REGISTRY/docker/zammad-mysql:stable
      alias: mysql
-    - name: registry.znuny.com/docker/zammad-postgresql:stable
+    - name: $CI_REGISTRY/docker/zammad-postgresql:stable
      alias: postgresql
-    - name: registry.znuny.com/docker/zammad-ci-otrsimport-db:otrs4
+    - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-db:otrs4
      alias: zammad-ci-otrsimport-db
-    - name: registry.znuny.com/docker/zammad-ci-otrsimport-app:otrs4
+    - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-app:otrs4
      alias: zammad-ci-otrsimport-app

 otrs:33:
  <<: *template_integration_otrs
  services:
-    - name: registry.znuny.com/docker/zammad-mysql:stable
+    - name: $CI_REGISTRY/docker/zammad-mysql:stable
      alias: mysql
-    - name: registry.znuny.com/docker/zammad-postgresql:stable
+    - name: $CI_REGISTRY/docker/zammad-postgresql:stable
      alias: postgresql
-    - name: registry.znuny.com/docker/zammad-ci-otrsimport-db:otrs33
+    - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-db:otrs33
      alias: zammad-ci-otrsimport-db
-    - name: registry.znuny.com/docker/zammad-ci-otrsimport-app:otrs33
+    - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-app:otrs33
      alias: zammad-ci-otrsimport-app

 otrs:32:
  <<: *template_integration_otrs
  services:
-    - name: registry.znuny.com/docker/zammad-mysql:stable
+    - name: $CI_REGISTRY/docker/zammad-mysql:stable
      alias: mysql
-    - name: registry.znuny.com/docker/zammad-postgresql:stable
+    - name: $CI_REGISTRY/docker/zammad-postgresql:stable
      alias: postgresql
-    - name: registry.znuny.com/docker/zammad-ci-otrsimport-db:otrs32
+    - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-db:otrs32
      alias: zammad-ci-otrsimport-db
-    - name: registry.znuny.com/docker/zammad-ci-otrsimport-app:otrs32
+    - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-app:otrs32
      alias: zammad-ci-otrsimport-app

 otrs:31:
  <<: *template_integration_otrs
  services:
-    - name: registry.znuny.com/docker/zammad-mysql:stable
+    - name: $CI_REGISTRY/docker/zammad-mysql:stable
      alias: mysql
-    - name: registry.znuny.com/docker/zammad-postgresql:stable
+    - name: $CI_REGISTRY/docker/zammad-postgresql:stable
      alias: postgresql
-    - name: registry.znuny.com/docker/zammad-ci-otrsimport-db:otrs31
+    - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-db:otrs31
      alias: zammad-ci-otrsimport-db
-    - name: registry.znuny.com/docker/zammad-ci-otrsimport-app:otrs31
+    - name: $CI_REGISTRY/docker/zammad-ci-otrsimport-app:otrs31
      alias: zammad-ci-otrsimport-app
--- a/.gitlab/ci/pre.yml
+++ b/.gitlab/ci/pre.yml
@ -6,7 +6,7 @@
    - .rules_singletest
  before_script:
    - source /etc/profile.d/rvm.sh # ensure RVM is loaded
-    - source /opt/rh/rh-nodejs12/enable # ensure Node.js is available
+    - source /opt/rh/rh-nodejs*/enable # ensure Node.js is available

 rubocop:
  <<: *template_pre
@ -39,7 +39,7 @@ brakeman:
  artifacts:
    expire_in: 1 week
    paths:
-    - tmp/brakeman-report.html
+      - tmp/brakeman-report.html
    when: on_failure
  script:
    - bundle install -j $(nproc) --path vendor
@ -48,7 +48,7 @@ brakeman:
 coffeelint:
  <<: *template_pre
  script:
-    - coffeelint app/
+    - coffeelint --rules ./.coffeelint/rules/* app/

 bundle-audit:
  <<: *template_pre
@ -62,8 +62,9 @@ github:
  tags:
    - deploy
  before_script:
-    - "" # no RVM present in deploy ENV
+    - '' # no RVM present in deploy ENV
  script:
+    - git fetch --unshallow
    - script/build/sync_repo.sh git@github.com:zammad/zammad.git

 global_refresh_envs:
@ -77,7 +78,7 @@ global_refresh_envs:
  artifacts:
    expire_in: 1 day
    paths:
-    - fresh.env
+      - fresh.env
  rules:
    - if: $CI_MERGE_REQUEST_ID
      when: never
--- a/.pkgr.yml
+++ b/.pkgr.yml
@ -56,6 +56,18 @@ targets:
      - libimlib2
      - libimlib2-dev
      - shared-mime-info
+  debian-11:
+    dependencies:
+      - curl
+      - elasticsearch|elasticsearch-oss
+      - nginx|apache2
+      - postgresql|mariadb-server
+      - libimlib2
+      - shared-mime-info
+    build_dependencies:
+      - libimlib2
+      - libimlib2-dev
+      - shared-mime-info
  ubuntu-16.04:
    dependencies:
      - curl
@ -116,6 +128,6 @@ env:
  - ZAMMAD_RAILS_PORT=3000
  - ZAMMAD_WEBSOCKET_PORT=6042
 services:
-  - postgres
+  - postgres:13
 before_install: contrib/packager.io/preinstall.sh
 after_install: contrib/packager.io/postinstall.sh
--- a/.rubocop/cop/zammad/exists_db_strategy.rb
+++ b/.rubocop/cop/zammad/exists_db_strategy.rb
@ -17,7 +17,7 @@ module RuboCop
        PATTERN

        def_node_matcher :has_reset?, <<-PATTERN
-          $(send _ {:describe :context :it} (_ ...) (hash ... (pair (sym :db_strategy) (sym {:reset :reset_all}))))
+          $(send _ {:describe :context :it :shared_examples} (_ ...) (hash <(pair (sym :db_strategy) (sym {:reset :reset_all})) ...>  ))
        PATTERN

        MSG = 'Add a `db_strategy: :reset` to your context/decribe when you are creating object manager attributes!'.freeze
--- a/.rubocop/cop/zammad/prevent_underscore_backport.rb
+++ b/.rubocop/cop/zammad/prevent_underscore_backport.rb
@ -0,0 +1,17 @@
+# Copyright (C) 2012-2021 Zammad Foundation, http://zammad-foundation.org/
+
+module RuboCop
+  module Cop
+    module Zammad
+      class PreventUnderscroreBackport < Base
+        MSG = <<~ERROR_MESSAGE.freeze
+          The method __(...) is not available in current stable.
+        ERROR_MESSAGE
+
+        def on_send(node)
+          add_offense(node) if node.method_name.eql? :__
+        end
+      end
+    end
+  end
+end
--- a/.rubocop/cop/zammad/update_copyright.rb
+++ b/.rubocop/cop/zammad/update_copyright.rb
@ -13,7 +13,8 @@ module RuboCop

        def on_new_investigation
          if processed_source.raw_source.include? '# Copyright (C) 2012-'
-            update_copyright
+            # Disabled for stable branches.
+            # update_copyright
          else
            insert_copyright
          end
--- a/.rubocop/rubocop_zammad.rb
+++ b/.rubocop/rubocop_zammad.rb
@ -10,3 +10,4 @@ require_relative 'cop/zammad/no_to_sym_on_string'
 require_relative 'cop/zammad/prefer_negated_if_over_unless'
 require_relative 'cop/zammad/update_copyright'
 require_relative 'cop/zammad/forbid_rand'
+require_relative 'cop/zammad/prevent_underscore_backport'
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,15 +1,264 @@
 # Change Log

-## [5.0.0](https://github.com/zammad/zammad/tree/5.0.0) (2021-xx-xx)
+## [5.0.3](https://github.com/zammad/zammad/tree/5.0.3) (2021-12-07)
+
+[Full Changelog](https://github.com/zammad/zammad/compare/5.0.2...5.0.3)
+
+
+**Implemented enhancements:**
+
+- Possibility to specify the order of objects [294](https://github.com/zammad/zammad/issues/294) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[object manager attribute](https://github.com/zammad/zammad/labels/object manager attribute)]
+- Display callback urls for third-party applications [3622](https://github.com/zammad/zammad/issues/3622) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)]
+- Add clear selection action or has changed condition [3821](https://github.com/zammad/zammad/issues/3821) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[specification required](https://github.com/zammad/zammad/labels/specification required)] [[core workflows](https://github.com/zammad/zammad/labels/core workflows)]
+
+**Fixed bugs:**
+
+- Missing ticket updates on high load in MariaDB/MySQL environments [3877](https://github.com/zammad/zammad/issues/3877) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Wrong SLA is used (alphabetical order is ignored) [3871](https://github.com/zammad/zammad/issues/3871) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[regression](https://github.com/zammad/zammad/labels/regression)]
+- Agent with CREATE only permission acts "on behalf" ticket customer on shared organizations [3872](https://github.com/zammad/zammad/issues/3872) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Provide meaningful modal if report profile tries to use dates out side the filtered date range [3616](https://github.com/zammad/zammad/issues/3616) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[reporting](https://github.com/zammad/zammad/labels/reporting)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Allow `position` to determine an attributes position entirely [3594](https://github.com/zammad/zammad/issues/3594) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[object manager attribute](https://github.com/zammad/zammad/labels/object manager attribute)] [[specification required](https://github.com/zammad/zammad/labels/specification required)]
+- Till label not assigned to corresponding input fields in calendar edit view [3793](https://github.com/zammad/zammad/issues/3793) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[frontend / JS app](https://github.com/zammad/zammad/labels/frontend / JS app)]
+- Simple quote characters (`'`) not properly displayed [3846](https://github.com/zammad/zammad/issues/3846) [[bug](https://github.com/zammad/zammad/labels/bug)] [[frontend / JS app](https://github.com/zammad/zammad/labels/frontend / JS app)]
+- Remove api user and password for sipgate integration [3848](https://github.com/zammad/zammad/issues/3848) [[bug](https://github.com/zammad/zammad/labels/bug)] [[admin area](https://github.com/zammad/zammad/labels/admin area)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- No signature on new ticket if email is default message type [3844](https://github.com/zammad/zammad/issues/3844) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Forwarding no longer possible for email and web articles [3855](https://github.com/zammad/zammad/issues/3855) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[regression](https://github.com/zammad/zammad/labels/regression)]
+- Default values of new group dialog is different in german vs. english [3851](https://github.com/zammad/zammad/issues/3851) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- If no date is set the UI show it's shown as NaN.NaN.NaN. [3850](https://github.com/zammad/zammad/issues/3850) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Number of to show caller log entries is inconsistent setting wise [3852](https://github.com/zammad/zammad/issues/3852) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[admin area](https://github.com/zammad/zammad/labels/admin area)] [[integration](https://github.com/zammad/zammad/labels/integration)]
+- Reply all: Duplicate email on changing recipient and cc in a certain way [3825](https://github.com/zammad/zammad/issues/3825) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Removing calendars via UI and API does not check for references [3845](https://github.com/zammad/zammad/issues/3845) [[bug](https://github.com/zammad/zammad/labels/bug)] [[blocker](https://github.com/zammad/zammad/labels/blocker)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[escalation logic](https://github.com/zammad/zammad/labels/escalation logic)]
+- Email address not shown inside forwarded email [3824](https://github.com/zammad/zammad/issues/3824) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Wrong escalation update time in admin interface is shown [3837](https://github.com/zammad/zammad/issues/3837) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Zammad returns stack error when one tries to remove groups via API [3841](https://github.com/zammad/zammad/issues/3841) [[bug](https://github.com/zammad/zammad/labels/bug)] [[API](https://github.com/zammad/zammad/labels/API)]
+- Zammad ignores relative GitLab URLs [3830](https://github.com/zammad/zammad/issues/3830) [[bug](https://github.com/zammad/zammad/labels/bug)] [[integration](https://github.com/zammad/zammad/labels/integration)]
+- If selected value is not part of the restriction of set_fixed_to it should recalculate it with the new value [3822](https://github.com/zammad/zammad/issues/3822) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Invalid group and owner list for tickets created via customer profile [3835](https://github.com/zammad/zammad/issues/3835) [[bug](https://github.com/zammad/zammad/labels/bug)] [[core workflows](https://github.com/zammad/zammad/labels/core workflows)]
+- Ticket zoom will loose attachments on rerender [3831](https://github.com/zammad/zammad/issues/3831) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Package installation creates database.yml as `root` and thus breaks the installation until next update [3834](https://github.com/zammad/zammad/issues/3834) [[bug](https://github.com/zammad/zammad/labels/bug)] [[blocker](https://github.com/zammad/zammad/labels/blocker)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[regression](https://github.com/zammad/zammad/labels/regression)]
+- Ticket create screen will loose attachments by time [3827](https://github.com/zammad/zammad/issues/3827) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Simple quote characters (`'`) not properly displayed [3733](https://github.com/zammad/zammad/issues/3733) [[bug](https://github.com/zammad/zammad/labels/bug)] [[frontend / JS app](https://github.com/zammad/zammad/labels/frontend / JS app)]
+- When quoting, no breakout from div container possible [3094](https://github.com/zammad/zammad/issues/3094) [[bug](https://github.com/zammad/zammad/labels/bug)] [[ticket](https://github.com/zammad/zammad/labels/ticket)]
+- Quoting not working cleanly, if content gets too much [2334](https://github.com/zammad/zammad/issues/2334) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[ticket](https://github.com/zammad/zammad/labels/ticket)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Zammad database credentials are world-readable [3828](https://github.com/zammad/zammad/issues/3828) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Update time SLAs escalates tickets with agent response [3140](https://github.com/zammad/zammad/issues/3140) [[bug](https://github.com/zammad/zammad/labels/bug)] [[escalation logic](https://github.com/zammad/zammad/labels/escalation logic)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+
+## [5.0.2](https://github.com/zammad/zammad/tree/5.0.2) (2021-10-28)
+
+[Full Changelog](https://github.com/zammad/zammad/compare/5.0.1...5.0.2)
+
+**Fixed bugs:**
+
+- When looking for customers, it is no longer possible to change into organizations [3815](https://github.com/zammad/zammad/issues/3815) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)]
+- Owner should get cleared if not listed in changed group [3818](https://github.com/zammad/zammad/issues/3818) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[core workflows](https://github.com/zammad/zammad/labels/core workflows)]
+- Custom date and datetime attributes are filled with dates on creation of tickets/users after update from 4.1 to 5.x [3810](https://github.com/zammad/zammad/issues/3810) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- ActionController::UnknownHttpMethod FRAGE [3807](https://github.com/zammad/zammad/issues/3807) [[bug](https://github.com/zammad/zammad/labels/bug)] [[blocker](https://github.com/zammad/zammad/labels/blocker)] [[overviews](https://github.com/zammad/zammad/labels/overviews)] [[macros](https://github.com/zammad/zammad/labels/macros)]
+- Remote change of the group id does show it falsly as user change and not render the new value to the ticket [3801](https://github.com/zammad/zammad/issues/3801) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[core workflows](https://github.com/zammad/zammad/labels/core workflows)]
+- Adding private keys allows adding certificates [3727](https://github.com/zammad/zammad/issues/3727) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Able to create custom fields for existing relation (e. g. ticket.state) - will lead to non bootable Zammad [3811](https://github.com/zammad/zammad/issues/3811) [[bug](https://github.com/zammad/zammad/labels/bug)] [[regression](https://github.com/zammad/zammad/labels/regression)]
+- Sort order group_by broken (alphabetical) [3800](https://github.com/zammad/zammad/issues/3800) [[bug](https://github.com/zammad/zammad/labels/bug)] [[overviews](https://github.com/zammad/zammad/labels/overviews)] [[regression](https://github.com/zammad/zammad/labels/regression)]
+- Ticket owner selection is not updated if owner selection should be empty [3809](https://github.com/zammad/zammad/issues/3809) [[bug](https://github.com/zammad/zammad/labels/bug)] [[core workflows](https://github.com/zammad/zammad/labels/core workflows)]
+- Chat can't be closed after timeout [2471](https://github.com/zammad/zammad/issues/2471) [[bug](https://github.com/zammad/zammad/labels/bug)] [[chat](https://github.com/zammad/zammad/labels/chat)]
+- Support workflow mechanism to do pending reminder state hide pending time use case [3790](https://github.com/zammad/zammad/issues/3790) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Cache.clear in postinstall.sh throws ugly errors on fresh installations [3808](https://github.com/zammad/zammad/issues/3808) [[bug](https://github.com/zammad/zammad/labels/bug)] [[blocker](https://github.com/zammad/zammad/labels/blocker)] [[regression](https://github.com/zammad/zammad/labels/regression)]
+- Example payload in webhook view leads to 500 error [3794](https://github.com/zammad/zammad/issues/3794) [[bug](https://github.com/zammad/zammad/labels/bug)] [[regression](https://github.com/zammad/zammad/labels/regression)]
+- OS package upgrade fails (activity_stream_object_id) [3797](https://github.com/zammad/zammad/issues/3797) [[bug](https://github.com/zammad/zammad/labels/bug)]
+
+## [5.0.1](https://github.com/zammad/zammad/tree/5.0.1) (2021-10-08)
+
+[Full Changelog](https://github.com/zammad/zammad/compare/5.0.0...5.0.1)
+
+**Fixed bugs:**
+
+- Bug Report 4.1.x Overview Sort - Grouped by user [3737](https://github.com/zammad/zammad/issues/3737) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[overviews](https://github.com/zammad/zammad/labels/overviews)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[regression](https://github.com/zammad/zammad/labels/regression)]
+- Article box opening on tickets with no changes [3789](https://github.com/zammad/zammad/issues/3789) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)]
+- UploadCacheCleanupJob does not execute [3787](https://github.com/zammad/zammad/issues/3787) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- lib/fill_db.rb fails to work in production environments [3788](https://github.com/zammad/zammad/issues/3788) [[bug](https://github.com/zammad/zammad/labels/bug)]
+
+## [5.0.0](https://github.com/zammad/zammad/tree/5.0.0) (2021-10-05)
+
 [Full Changelog](https://github.com/zammad/zammad/compare/4.1.0...5.0.0)

 **Implemented enhancements:**

-
-
+- Core Workflow: Add organization condition attributes for object User [3779](https://github.com/zammad/zammad/issues/3779) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- No script content (e. g. javascript) in emails [3365](https://github.com/zammad/zammad/issues/3365) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[mail processing](https://github.com/zammad/zammad/labels/mail processing)]
+- Read-only custom objects [2102](https://github.com/zammad/zammad/issues/2102) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[object manager attribute](https://github.com/zammad/zammad/labels/object manager attribute)] [[core workflows](https://github.com/zammad/zammad/labels/core workflows)]
+- Granular admin permission for google channel is missing [3194](https://github.com/zammad/zammad/issues/3194) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)]
+- Use country codes (e.g. `DE` or `ES`) for knowledgebase answer selection [3574](https://github.com/zammad/zammad/issues/3574) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[knowledge base](https://github.com/zammad/zammad/labels/knowledge base)]
+- New email account expert view cannot be opened without filling in all fields [3137](https://github.com/zammad/zammad/issues/3137) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)]
+- Don't provide option to create API-Token if authentication via API token is disabled [3168](https://github.com/zammad/zammad/issues/3168) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)]
+- Define default "stay on tab" / "close tab" behavior [257](https://github.com/zammad/zammad/issues/257) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Space after ticket hook in ticket/zoom [3265](https://github.com/zammad/zammad/issues/3265) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[ticket](https://github.com/zammad/zammad/labels/ticket)]
+- Enhance LDAP login to not affect "failed logins" [2389](https://github.com/zammad/zammad/issues/2389) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[LDAP](https://github.com/zammad/zammad/labels/LDAP)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Detect Jira follow-ups [3695](https://github.com/zammad/zammad/issues/3695) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[mail processing](https://github.com/zammad/zammad/labels/mail processing)]
+- csv import example file download (organizations) is empty [3514](https://github.com/zammad/zammad/issues/3514) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)]
+- Add bulk option to extended search [445](https://github.com/zammad/zammad/issues/445) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- MessageBird integration [3672](https://github.com/zammad/zammad/issues/3672) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[channel](https://github.com/zammad/zammad/labels/channel)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Add attachment via Trigger and scheduler if wanted by admin [2485](https://github.com/zammad/zammad/issues/2485) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[admin area](https://github.com/zammad/zammad/labels/admin area)] [[trigger](https://github.com/zammad/zammad/labels/trigger)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Tag KB Answers [2612](https://github.com/zammad/zammad/issues/2612) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[knowledge base](https://github.com/zammad/zammad/labels/knowledge base)]
+- Backtrace lines pollute log [3556](https://github.com/zammad/zammad/issues/3556) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[authentication](https://github.com/zammad/zammad/labels/authentication)]
+- Visualise locked users in UI and make them unlock-able for admin [2565](https://github.com/zammad/zammad/issues/2565) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Representation of inactive customers and orgnizations [3302](https://github.com/zammad/zammad/issues/3302) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- No possibility to enforce auto response if one of the blocking auto response mail header exists [3667](https://github.com/zammad/zammad/issues/3667) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[mail processing](https://github.com/zammad/zammad/labels/mail processing)]
+- REST doc of Online Notification controler is outdated/wrong and expand param is missing. [3635](https://github.com/zammad/zammad/issues/3635) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)]
+- Scroll background instead of foreground [978](https://github.com/zammad/zammad/issues/978) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[frontend / JS app](https://github.com/zammad/zammad/labels/frontend / JS app)]
+- Log if a active user (in UI) has been logged out due to SessionTimeout [3614](https://github.com/zammad/zammad/issues/3614) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)]
+- The rake task `zammad:package:migrate` does not execute migrations for linked packages. [3606](https://github.com/zammad/zammad/issues/3606) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[developer experience](https://github.com/zammad/zammad/labels/developer experience)]
+- Accept 2xx as response for requests in UserAgent [3573](https://github.com/zammad/zammad/pull/3573) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)]
+- Don't fail job is `deletable_id` is no longer available [3536](https://github.com/zammad/zammad/issues/3536) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[data privacy](https://github.com/zammad/zammad/labels/data privacy)]
+- Add console output for searchindex rebuild status [3562](https://github.com/zammad/zammad/issues/3562) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)]
+- Display minutes for session timeouts instead of seconds [3575](https://github.com/zammad/zammad/issues/3575) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[admin area](https://github.com/zammad/zammad/labels/admin area)]

 **Fixed bugs:**

-
-
-
+- Inconstant alignment in the listing of attachments/submit button in new article area [3773](https://github.com/zammad/zammad/issues/3773) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Improve contrasts in answer search for articles [3783](https://github.com/zammad/zammad/issues/3783) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[knowledge base](https://github.com/zammad/zammad/labels/knowledge base)]
+- escaped 'Set fixed' workflows don't refresh set values on active ticket sessions [3757](https://github.com/zammad/zammad/issues/3757) [[bug](https://github.com/zammad/zammad/labels/bug)] [[core workflows](https://github.com/zammad/zammad/labels/core workflows)]
+- ObjectManager Attribute without screen attribute causes CoreWorkflows migration to fail [3781](https://github.com/zammad/zammad/issues/3781) [[bug](https://github.com/zammad/zammad/labels/bug)] [[migration / update](https://github.com/zammad/zammad/labels/migration / update)]
+- Zammad preflight check warning output causes Syntax-Error in postinstall.sh and failing installation [2674](https://github.com/zammad/zammad/issues/2674) [[bug](https://github.com/zammad/zammad/labels/bug)] [[migration / update](https://github.com/zammad/zammad/labels/migration / update)]
+- Shared organization issue (Create your first ticket) [2780](https://github.com/zammad/zammad/issues/2780) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[ticket](https://github.com/zammad/zammad/labels/ticket)]
+- Force users to reload after system migration [3776](https://github.com/zammad/zammad/issues/3776) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Unable to cancel attachment upload [2351](https://github.com/zammad/zammad/issues/2351) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)]
+- [BUG] miss spell in db/migrate/20210923172256_issue_2619_kb_header_link_color.rb [3777](https://github.com/zammad/zammad/issues/3777) [[bug](https://github.com/zammad/zammad/labels/bug)] [[blocker](https://github.com/zammad/zammad/labels/blocker)] [[migration / update](https://github.com/zammad/zammad/labels/migration / update)]
+- KB header and footer link-color not changeable [2619](https://github.com/zammad/zammad/issues/2619) [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[knowledge base](https://github.com/zammad/zammad/labels/knowledge base)] [[specification required](https://github.com/zammad/zammad/labels/specification required)] [[theming / skinning](https://github.com/zammad/zammad/labels/theming / skinning)]
+- Syntax errors break scheduler job for good [3028](https://github.com/zammad/zammad/issues/3028) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Existing tickets: New article modal with padding-left: 0; padding-right: 0; [3772](https://github.com/zammad/zammad/issues/3772) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[regression](https://github.com/zammad/zammad/labels/regression)]
+- Possible race condition causing OTRS import to fail [3765](https://github.com/zammad/zammad/issues/3765) [[bug](https://github.com/zammad/zammad/labels/bug)] [[import](https://github.com/zammad/zammad/labels/import)]
+- Incorrect alignment in the listing of attachments when creating a ticket [3746](https://github.com/zammad/zammad/issues/3746) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Saved conditions break on selections without reloading [3758](https://github.com/zammad/zammad/issues/3758) [[bug](https://github.com/zammad/zammad/labels/bug)] [[core workflows](https://github.com/zammad/zammad/labels/core workflows)]
+- Misleading view of user icons which are on vacation and disabled [3075](https://github.com/zammad/zammad/issues/3075) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[ticket](https://github.com/zammad/zammad/labels/ticket)]
+- User with user_id 1 is show in admin interface (which should not) [3755](https://github.com/zammad/zammad/issues/3755) [[bug](https://github.com/zammad/zammad/labels/bug)] [[blocker](https://github.com/zammad/zammad/labels/blocker)]
+- Unable to close tickets in certran cases if core workflow is used [3710](https://github.com/zammad/zammad/issues/3710) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[core workflows](https://github.com/zammad/zammad/labels/core workflows)]
+- Login failed after upgrade to zammad 5.0 [3759](https://github.com/zammad/zammad/issues/3759) [[bug](https://github.com/zammad/zammad/labels/bug)] [[blocker](https://github.com/zammad/zammad/labels/blocker)] [[migration / update](https://github.com/zammad/zammad/labels/migration / update)]
+- Unable to create a ticket in web app if default for additional boolean value is FALSE [3762](https://github.com/zammad/zammad/issues/3762) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- User search / selection does not always work if you want to correct your search [3696](https://github.com/zammad/zammad/issues/3696) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Unable to create new organization [3751](https://github.com/zammad/zammad/issues/3751) [[bug](https://github.com/zammad/zammad/labels/bug)] [[core workflows](https://github.com/zammad/zammad/labels/core workflows)]
+- Core Workflow "is not" operator is working unexpected [3752](https://github.com/zammad/zammad/issues/3752) [[bug](https://github.com/zammad/zammad/labels/bug)] [[core workflows](https://github.com/zammad/zammad/labels/core workflows)]
+- scrollPageHeader disappears when answering via email [3736](https://github.com/zammad/zammad/issues/3736) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)]
+- Scheduler ignores "disable notifications == no" [3684](https://github.com/zammad/zammad/issues/3684) [[bug](https://github.com/zammad/zammad/labels/bug)] [[notification](https://github.com/zammad/zammad/labels/notification)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Notes on existing ticks are discarded by editing profile settings [3088](https://github.com/zammad/zammad/issues/3088) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)]
+- Owner selection empty or pending reminder data picker not shown if customer field has content but no customer is selected (in ticket create screen) [3743](https://github.com/zammad/zammad/issues/3743) [[bug](https://github.com/zammad/zammad/labels/bug)] [[core workflows](https://github.com/zammad/zammad/labels/core workflows)]
+- Removal of Microsoft365-Channel not possible via UI when having no email address relation [3741](https://github.com/zammad/zammad/issues/3741) [[bug](https://github.com/zammad/zammad/labels/bug)] [[channel](https://github.com/zammad/zammad/labels/channel)]
+- Removal of Google-Channel not possible via UI when having a normal email channel of same account [3203](https://github.com/zammad/zammad/issues/3203) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[channel](https://github.com/zammad/zammad/labels/channel)]
+- Core-Workflow: Option manipulation of boolean attributes not possible [3740](https://github.com/zammad/zammad/issues/3740) [[bug](https://github.com/zammad/zammad/labels/bug)] [[core workflows](https://github.com/zammad/zammad/labels/core workflows)]
+- Core Workflow: Show hidden attributes on group selection (ticket edit) [3739](https://github.com/zammad/zammad/issues/3739) [[bug](https://github.com/zammad/zammad/labels/bug)] [[core workflows](https://github.com/zammad/zammad/labels/core workflows)]
+- OTRS migration doesn't import article creation time [3235](https://github.com/zammad/zammad/issues/3235) [[bug](https://github.com/zammad/zammad/labels/bug)] [[import](https://github.com/zammad/zammad/labels/import)]
+- Spaces stay URL-encoded when going back to search results on KB for agents [3378](https://github.com/zammad/zammad/issues/3378) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[knowledge base](https://github.com/zammad/zammad/labels/knowledge base)]
+- Not working unpack of mail body if decrypted body is in signed-data attachment [3705](https://github.com/zammad/zammad/issues/3705) [[bug](https://github.com/zammad/zammad/labels/bug)] [[mail processing](https://github.com/zammad/zammad/labels/mail processing)]
+- It should be possible to show attributes which are configured `shown` false [3726](https://github.com/zammad/zammad/issues/3726) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[core workflows](https://github.com/zammad/zammad/labels/core workflows)]
+- admin.core_workflow permission is missing [3732](https://github.com/zammad/zammad/issues/3732) [[bug](https://github.com/zammad/zammad/labels/bug)] [[core workflows](https://github.com/zammad/zammad/labels/core workflows)]
+- AttributeManager doesn't display boolean default values within the UI [3271](https://github.com/zammad/zammad/issues/3271) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[object manager attribute](https://github.com/zammad/zammad/labels/object manager attribute)]
+- Spaces in front of mentions can cause partly content removal [3717](https://github.com/zammad/zammad/issues/3717) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Drop files here not disappearing after dropping a file [3725](https://github.com/zammad/zammad/issues/3725) [[bug](https://github.com/zammad/zammad/labels/bug)] [[regression](https://github.com/zammad/zammad/labels/regression)]
+- ⚙ -> Manage -> Calendars -> Edit: "Subscribe to public holidays in" sorted wrong [2528](https://github.com/zammad/zammad/issues/2528) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)]
+- Pending reminder notifications are not sent if ticket is opened in tab [2931](https://github.com/zammad/zammad/issues/2931) [[bug](https://github.com/zammad/zammad/labels/bug)] [[ticket](https://github.com/zammad/zammad/labels/ticket)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[frontend / JS app](https://github.com/zammad/zammad/labels/frontend / JS app)]
+- Fields are falsey displayed as mandatory if they contain historic screen values [3721](https://github.com/zammad/zammad/issues/3721) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[core workflows](https://github.com/zammad/zammad/labels/core workflows)]
+- `ticket.customer_id` is `current_user` breaks email fetching [3503](https://github.com/zammad/zammad/issues/3503) [[bug](https://github.com/zammad/zammad/labels/bug)] [[channel](https://github.com/zammad/zammad/labels/channel)] [[ticket](https://github.com/zammad/zammad/labels/ticket)]
+- Scheduler jobs don't ensure current ticket information if they're running a long time [3329](https://github.com/zammad/zammad/issues/3329) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- groups selection for customer panel is not working anymore (with core workflows) [3713](https://github.com/zammad/zammad/issues/3713) [[bug](https://github.com/zammad/zammad/labels/bug)] [[core workflows](https://github.com/zammad/zammad/labels/core workflows)]
+- Scheduler Time offset [457](https://github.com/zammad/zammad/issues/457) [[bug](https://github.com/zammad/zammad/labels/bug)] [[trigger](https://github.com/zammad/zammad/labels/trigger)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- "Warten auf Erinnerung" - Inconsistent timestamps [2366](https://github.com/zammad/zammad/issues/2366) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Ical escaltion update the calendar entry to 2:00 am [2157](https://github.com/zammad/zammad/issues/2157) [[bug](https://github.com/zammad/zammad/labels/bug)] [[notification](https://github.com/zammad/zammad/labels/notification)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Inheritance of out of office settings [3694](https://github.com/zammad/zammad/issues/3694) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Core worflow perform action "select" should not make multiple values selectable [3712](https://github.com/zammad/zammad/issues/3712) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[core workflows](https://github.com/zammad/zammad/labels/core workflows)]
+- Setting for CheckMK not saved in zammad [3707](https://github.com/zammad/zammad/issues/3707) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Any user can be set as a replacement for out of office [2293](https://github.com/zammad/zammad/issues/2293) [[bug](https://github.com/zammad/zammad/labels/bug)] [[personal settings/menu](https://github.com/zammad/zammad/labels/personal settings/menu)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Core Workflow Implementation [3709](https://github.com/zammad/zammad/issues/3709) [[feature backlog](https://github.com/zammad/zammad/labels/feature backlog)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[core](https://github.com/zammad/zammad/labels/core)] [[core workflows](https://github.com/zammad/zammad/labels/core workflows)]
+- Can't remove auto assignment timeout [2544](https://github.com/zammad/zammad/issues/2544) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Assign Follow ups has no affect [2455](https://github.com/zammad/zammad/issues/2455) [[bug](https://github.com/zammad/zammad/labels/bug)] [[ticket](https://github.com/zammad/zammad/labels/ticket)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- The calendar shows Chilean holidays one day in advance [3706](https://github.com/zammad/zammad/issues/3706) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[regression](https://github.com/zammad/zammad/labels/regression)]
+- Organization removal does not clear organization_id from Tickets [3703](https://github.com/zammad/zammad/issues/3703) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[regression](https://github.com/zammad/zammad/labels/regression)]
+- Merge not possible with not set, required attributes [2634](https://github.com/zammad/zammad/issues/2634) [[bug](https://github.com/zammad/zammad/labels/bug)] [[ticket](https://github.com/zammad/zammad/labels/ticket)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[object manager attribute](https://github.com/zammad/zammad/labels/object manager attribute)]
+- Merging tickets doesn’t trigger notification for target ticket [3105](https://github.com/zammad/zammad/issues/3105) [[bug](https://github.com/zammad/zammad/labels/bug)] [[notification](https://github.com/zammad/zammad/labels/notification)] [[ticket](https://github.com/zammad/zammad/labels/ticket)]
+- One of DB migrations timestamp breaks migrations queue [3702](https://github.com/zammad/zammad/issues/3702) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Tags in ticket create screen displayed wrong [3701](https://github.com/zammad/zammad/issues/3701) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[regression](https://github.com/zammad/zammad/labels/regression)] [[knowledge base](https://github.com/zammad/zammad/labels/knowledge base)]
+- Custom date attributes provide inconsistent sorting within grouping [3663](https://github.com/zammad/zammad/issues/3663) [[bug](https://github.com/zammad/zammad/labels/bug)] [[overviews](https://github.com/zammad/zammad/labels/overviews)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Mix of binary encoded ISO-8859-1 data in header fields (e.g. to) fails mail processing [3697](https://github.com/zammad/zammad/issues/3697) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[mail processing](https://github.com/zammad/zammad/labels/mail processing)]
+- Zammad sends mails even though there is no email address visible in TO or CC fields (any more) [3554](https://github.com/zammad/zammad/issues/3554) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)]
+- Error 500 / zammad {"error":" 123456 is out of range for ActiveModel::Type::Integer with limit 4 bytes"} [3647](https://github.com/zammad/zammad/issues/3647) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Default value not set for attributes of type input, select, tree_select, richtext, textarea, checkbox [1653](https://github.com/zammad/zammad/issues/1653) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[object manager attribute](https://github.com/zammad/zammad/labels/object manager attribute)]
+- When replying, quote article content only [3539](https://github.com/zammad/zammad/issues/3539) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Trigger ignores changes on some Ticket attributes [3428](https://github.com/zammad/zammad/issues/3428) [[bug](https://github.com/zammad/zammad/labels/bug)] [[trigger](https://github.com/zammad/zammad/labels/trigger)]
+- KB search does not allow pagination on endpoint [3068](https://github.com/zammad/zammad/issues/3068) [[bug](https://github.com/zammad/zammad/labels/bug)] [[API](https://github.com/zammad/zammad/labels/API)] [[search](https://github.com/zammad/zammad/labels/search)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[knowledge base](https://github.com/zammad/zammad/labels/knowledge base)]
+- “You have not created a ticket yet” shown but I already have closed tickets [3053](https://github.com/zammad/zammad/issues/3053) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[overviews](https://github.com/zammad/zammad/labels/overviews)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[🚧 refactoring 2.0 🚧](https://github.com/zammad/zammad/labels/🚧 refactoring 2.0 🚧)]
+- Support HTML5 'required' attribute in forms [1890](https://github.com/zammad/zammad/pull/1890)
+- Freshdesk import works not with more then 30_000 tickets [3681](https://github.com/zammad/zammad/issues/3681) [[bug](https://github.com/zammad/zammad/labels/bug)] [[import](https://github.com/zammad/zammad/labels/import)]
+- Pagination for knowledge base answer sorting breaks sorting [3660](https://github.com/zammad/zammad/issues/3660) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[admin area](https://github.com/zammad/zammad/labels/admin area)] [[knowledge base](https://github.com/zammad/zammad/labels/knowledge base)]
+- Zendesk-Import `Connection reset by peer` cancels import [3583](https://github.com/zammad/zammad/issues/3583) [[bug](https://github.com/zammad/zammad/labels/bug)] [[import](https://github.com/zammad/zammad/labels/import)] [[waiting for feedback](https://github.com/zammad/zammad/labels/waiting for feedback)]
+- Prefer HTTP standard header "From" over custom "X-On-Behalf-Of" for impersonation [3113](https://github.com/zammad/zammad/issues/3113) [[API](https://github.com/zammad/zammad/labels/API)] [[help appreciated](https://github.com/zammad/zammad/labels/help appreciated)] [[authentication](https://github.com/zammad/zammad/labels/authentication)] [[hacktoberfest](https://github.com/zammad/zammad/labels/hacktoberfest)] [[:construction: refactoring :construction:](https://github.com/zammad/zammad/labels/:construction: refactoring :construction:)] [[specification required](https://github.com/zammad/zammad/labels/specification required)] [[good first issue](https://github.com/zammad/zammad/labels/good first issue)] [[deprecation](https://github.com/zammad/zammad/labels/deprecation)]
+- Do not send `domain` and migrate `domain` out of Google and Microsoft 365 channels [3669](https://github.com/zammad/zammad/issues/3669) [[bug](https://github.com/zammad/zammad/labels/bug)] [[channel](https://github.com/zammad/zammad/labels/channel)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- high organization user count relates to bad performance [3648](https://github.com/zammad/zammad/issues/3648) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[performance](https://github.com/zammad/zammad/labels/performance)]
+- Removing organizations removes user and ticket as well [3688](https://github.com/zammad/zammad/issues/3688) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Wrong user is used when "X-On-Behalf-Of” header value is an email that starts with digits [2851](https://github.com/zammad/zammad/issues/2851) [[bug](https://github.com/zammad/zammad/labels/bug)] [[API](https://github.com/zammad/zammad/labels/API)]
+- Allow out of office for one day without setting two days [3590](https://github.com/zammad/zammad/issues/3590) [[bug](https://github.com/zammad/zammad/labels/bug)] [[personal settings/menu](https://github.com/zammad/zammad/labels/personal settings/menu)]
+- FreshDesk Import doesn't pull in auto-assign domain(s) for organizations [3687](https://github.com/zammad/zammad/issues/3687) [[bug](https://github.com/zammad/zammad/labels/bug)] [[import](https://github.com/zammad/zammad/labels/import)]
+- FreshDesk Import brings in all users as inactive [3689](https://github.com/zammad/zammad/issues/3689) [[bug](https://github.com/zammad/zammad/labels/bug)] [[import](https://github.com/zammad/zammad/labels/import)]
+- KB Public UI icons are misspaced [3680](https://github.com/zammad/zammad/issues/3680) [[bug](https://github.com/zammad/zammad/labels/bug)] [[knowledge base](https://github.com/zammad/zammad/labels/knowledge base)]
+- FreshDesk Import Error - undefined method `body' for 10:Integer [3661](https://github.com/zammad/zammad/issues/3661) [[bug](https://github.com/zammad/zammad/labels/bug)] [[import](https://github.com/zammad/zammad/labels/import)]
+- Cannot select multiple tickets in ticket overview with shift+click in Firefox [3449](https://github.com/zammad/zammad/issues/3449) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[overviews](https://github.com/zammad/zammad/labels/overviews)]
+- "Drop files here" drag area not always hiding [3460](https://github.com/zammad/zammad/issues/3460) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[help appreciated](https://github.com/zammad/zammad/labels/help appreciated)]
+- CTI Callerlog signaling hides "+" for new ticket if more than one user is found [2930](https://github.com/zammad/zammad/issues/2930) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[frontend / JS app](https://github.com/zammad/zammad/labels/frontend / JS app)]
+- Zendesk URL check fails with Net::HTTPForbidden 403 error [3679](https://github.com/zammad/zammad/issues/3679) [[bug](https://github.com/zammad/zammad/labels/bug)] [[import](https://github.com/zammad/zammad/labels/import)]
+- Mac Mail inline PDF destroys E-Mail-Body [2407](https://github.com/zammad/zammad/issues/2407) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[mail processing](https://github.com/zammad/zammad/labels/mail processing)]
+- Outdated urls on security page (third-party logins) [3627](https://github.com/zammad/zammad/issues/3627) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Duplicated article after bulk action was executed for newly created tickets without a browser refresh in between [3568](https://github.com/zammad/zammad/issues/3568) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Text Editor deletes text unrecoverably if quicktext was canceled with Ctrl+Backspace [2886](https://github.com/zammad/zammad/issues/2886) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[ticket](https://github.com/zammad/zammad/labels/ticket)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[frontend / JS app](https://github.com/zammad/zammad/labels/frontend / JS app)]
+- The defined ignored attributes in the popover context are not working [3668](https://github.com/zammad/zammad/issues/3668) [[bug](https://github.com/zammad/zammad/labels/bug)] [[frontend / JS app](https://github.com/zammad/zammad/labels/frontend / JS app)]
+- Ensure Upload Cache files are removed after grace period [3579](https://github.com/zammad/zammad/issues/3579) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Package installation fails because of too long file names [3666](https://github.com/zammad/zammad/issues/3666) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Package migrations fail on package installation or update due to codebase self-modification [3580](https://github.com/zammad/zammad/issues/3580) [[bug](https://github.com/zammad/zammad/labels/bug)] [[core](https://github.com/zammad/zammad/labels/core)]
+- saving Boolean field with empty values [2973](https://github.com/zammad/zammad/issues/2973) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)]
+- CTI-API should handle doubled requests better [3247](https://github.com/zammad/zammad/issues/3247) [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[CTI](https://github.com/zammad/zammad/labels/CTI)] [[specification required](https://github.com/zammad/zammad/labels/specification required)]
+- In some situations the chat button is visible without a active websocket connection [2258](https://github.com/zammad/zammad/issues/2258) [[bug](https://github.com/zammad/zammad/labels/bug)] [[chat](https://github.com/zammad/zammad/labels/chat)]
+- Fixes mistypes in article_view.coffee [3658](https://github.com/zammad/zammad/pull/3658)
+- Creating and editing users via office 365 failes with Image source is invalid [3617](https://github.com/zammad/zammad/issues/3617) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- FreshDesk Import fails with timeout error [3653](https://github.com/zammad/zammad/issues/3653) [[bug](https://github.com/zammad/zammad/labels/bug)] [[import](https://github.com/zammad/zammad/labels/import)]
+- Chat widget cannot load CSS on (sub)domains that contain "ws" characters [3654](https://github.com/zammad/zammad/issues/3654) [[bug](https://github.com/zammad/zammad/labels/bug)] [[chat](https://github.com/zammad/zammad/labels/chat)]
+- timezone issue with elasticsearch [2085](https://github.com/zammad/zammad/issues/2085) [[duplicate](https://github.com/zammad/zammad/labels/duplicate)]
+- Invalid html signature detection for exchange warning boxes [3571](https://github.com/zammad/zammad/issues/3571) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Searching for integer fields does not work as expected [3599](https://github.com/zammad/zammad/issues/3599) [[bug](https://github.com/zammad/zammad/labels/bug)] [[search](https://github.com/zammad/zammad/labels/search)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- FreshDesk import fails on certain custom field types [3628](https://github.com/zammad/zammad/issues/3628) [[bug](https://github.com/zammad/zammad/labels/bug)] [[import](https://github.com/zammad/zammad/labels/import)]
+- Freshdesk import subdomain selection fails [3631](https://github.com/zammad/zammad/issues/3631) [[bug](https://github.com/zammad/zammad/labels/bug)] [[import](https://github.com/zammad/zammad/labels/import)]
+- Search results missing for users with two names within lastname [3598](https://github.com/zammad/zammad/issues/3598) [[bug](https://github.com/zammad/zammad/labels/bug)] [[search](https://github.com/zammad/zammad/labels/search)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- New location notification with X-On-Behalf [3611](https://github.com/zammad/zammad/issues/3611) [[bug](https://github.com/zammad/zammad/labels/bug)] [[API](https://github.com/zammad/zammad/labels/API)] [[notification](https://github.com/zammad/zammad/labels/notification)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- State list of tickets ignore locale for their sorting [3335](https://github.com/zammad/zammad/issues/3335) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[ticket](https://github.com/zammad/zammad/labels/ticket)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Newly created users are only shown in the admin interface after reload [3050](https://github.com/zammad/zammad/issues/3050) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[frontend / JS app](https://github.com/zammad/zammad/labels/frontend / JS app)]
+- Migration 3.6.1 to 4.1 : No configured business hours found! [3641](https://github.com/zammad/zammad/issues/3641) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Verification tokens questionable behavior in developer mode [3116](https://github.com/zammad/zammad/issues/3116) [[developer experience](https://github.com/zammad/zammad/labels/developer experience)]
+- Replacing a mention with a new leads to mentioning both agents [3636](https://github.com/zammad/zammad/issues/3636) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Attachment order is wrong [3584](https://github.com/zammad/zammad/issues/3584) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)]
+- When disconnecting a Chat, customer can still continue posting messages [2559](https://github.com/zammad/zammad/issues/2559) [[bug](https://github.com/zammad/zammad/labels/bug)] [[chat](https://github.com/zammad/zammad/labels/chat)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- some macros are hidden in the drag & drop- overview with a small screen size [3359](https://github.com/zammad/zammad/issues/3359) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Add redis as an (optional) session store backend [3450](https://github.com/zammad/zammad/pull/3450)
+- Text Module widget is broken/hidden after pressing backspace (once) [3637](https://github.com/zammad/zammad/issues/3637) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Mention widget show same users several times (if rest requests will return in different order) [3639](https://github.com/zammad/zammad/issues/3639) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- The rebuild of the index is failing [3633](https://github.com/zammad/zammad/issues/3633) [[bug](https://github.com/zammad/zammad/labels/bug)] [[chat](https://github.com/zammad/zammad/labels/chat)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Monitoring endpoint complains about `Failed to run SessionTimeoutJob.perform_now after 10 tries #<NoMethodError: undefined method `id' for nil:NilClass` [3632](https://github.com/zammad/zammad/issues/3632) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Updating package-based installations can break the front end. [3629](https://github.com/zammad/zammad/issues/3629) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- backup: stop using su for pg_dump [3352](https://github.com/zammad/zammad/pull/3352) [[waiting for feedback](https://github.com/zammad/zammad/labels/waiting for feedback)]
+- Reply-to header ignored if from contains a system address [2551](https://github.com/zammad/zammad/issues/2551) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Maintenance: Fix handling of test that require secrets not to run for GitHub PRs. [3626](https://github.com/zammad/zammad/pull/3626)
+- replacing find -mtime with find -mmin [3570](https://github.com/zammad/zammad/pull/3570)
+- Ensure to migrate old calendar URLs for google calendar sources [3618](https://github.com/zammad/zammad/issues/3618) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[regression](https://github.com/zammad/zammad/labels/regression)]
+- Mentions/Subscribe with read permissions [3615](https://github.com/zammad/zammad/issues/3615) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Chat-Message references not cleared with data privacy task [3610](https://github.com/zammad/zammad/issues/3610) [[bug](https://github.com/zammad/zammad/labels/bug)] [[data privacy](https://github.com/zammad/zammad/labels/data privacy)]
+- Overview names are hidden in mobile view for RTL languages [3500](https://github.com/zammad/zammad/issues/3500) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[mobile](https://github.com/zammad/zammad/labels/mobile)]
+- SMTP-Attachments missing when using the API under high load [2991](https://github.com/zammad/zammad/issues/2991) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Inline image conversion from jpeg to png causes huge overhead [3538](https://github.com/zammad/zammad/issues/3538) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- session timeout does regulary logout active users before timeout because of dead old sessions [3605](https://github.com/zammad/zammad/issues/3605) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Zendesk import creates new ticket numbers rather than using the Zendesk ticket IDs also as ticket numbers in Zammad [3593](https://github.com/zammad/zammad/issues/3593) [[bug](https://github.com/zammad/zammad/labels/bug)] [[import](https://github.com/zammad/zammad/labels/import)] [[ticket](https://github.com/zammad/zammad/labels/ticket)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- wrong behaviour for the disabled option in session timeout [3600](https://github.com/zammad/zammad/issues/3600) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Header links are not responsive [3133](https://github.com/zammad/zammad/issues/3133) [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[knowledge base](https://github.com/zammad/zammad/labels/knowledge base)]
+- Update description of the session timeout setting [3597](https://github.com/zammad/zammad/issues/3597) [[bug](https://github.com/zammad/zammad/labels/bug)] [[admin area](https://github.com/zammad/zammad/labels/admin area)]
+- Escalation calculation breaks data privacy ticket deletion [3588](https://github.com/zammad/zammad/issues/3588) [[bug](https://github.com/zammad/zammad/labels/bug)] [[data privacy](https://github.com/zammad/zammad/labels/data privacy)]
+- `SessionTimeoutJob.perform_now` fails if user no longer exists [3586](https://github.com/zammad/zammad/issues/3586) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Robots.txt should allow indexing Knowledge Base on custom URLs [3164](https://github.com/zammad/zammad/issues/3164) [[bug](https://github.com/zammad/zammad/labels/bug)] [[knowledge base](https://github.com/zammad/zammad/labels/knowledge base)]
+- DataPrivacy may fail to clear user relations [3585](https://github.com/zammad/zammad/issues/3585) [[bug](https://github.com/zammad/zammad/labels/bug)] [[data privacy](https://github.com/zammad/zammad/labels/data privacy)]
+- SessionTimeoutJob.perform_now scheduler job fails on update if scheduler process wasn't restarted [3581](https://github.com/zammad/zammad/issues/3581) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Freshdesk import attribute ID mapping lookup constants fail application boot in systems with changed default names [3582](https://github.com/zammad/zammad/issues/3582) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- mentioned KB entries with the same title in different categories can not distinguished [3559](https://github.com/zammad/zammad/issues/3559) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[knowledge base](https://github.com/zammad/zammad/labels/knowledge base)]
+- Invalid auto assignment conditions may break ticket view for unassigned tickets [3567](https://github.com/zammad/zammad/issues/3567) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
+- Add Greek translation for chat [3569](https://github.com/zammad/zammad/pull/3569) [[chat](https://github.com/zammad/zammad/labels/chat)] [[translation](https://github.com/zammad/zammad/labels/translation)]
+- Freshdesk [865](https://github.com/zammad/zammad/issues/865) [[feature backlog](https://github.com/zammad/zammad/labels/feature backlog)] [[import](https://github.com/zammad/zammad/labels/import)]
+- Old JQuery version delivered [3431](https://github.com/zammad/zammad/issues/3431) [[bug](https://github.com/zammad/zammad/labels/bug)] [[chat](https://github.com/zammad/zammad/labels/chat)]
--- a/8
+++ b/8
@ -1,9 +1,9 @@
 # Copyright (C) 2012-2021 Zammad Foundation, http://zammad-foundation.org/

-source 'https://rubygems.org'
+source 'https://gems.sutty.nl'

 # core - base
-ruby '2.7.4'
+ruby '2.7.5'
 gem 'rails', '~> 6.0'

 # core - rails additions
@ -227,10 +227,6 @@ group :development, :test do

  # Slack helper for testing
  gem 'slack-ruby-client', require: false
-
-  # Can be used to detect for example the current
-  # operating system in tests, to handle things differently.
-  gem 'os'
 end

 # Want to extend Zammad with additional gems?
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -17,54 +17,54 @@ GIT
      mini_mime (>= 0.1.1)

 GEM
-  remote: https://rubygems.org/
+  remote: https://gems.sutty.nl/
  specs:
    aasm (5.2.0)
      concurrent-ruby (~> 1.0)
-    actioncable (6.0.4.1)
-      actionpack (= 6.0.4.1)
+    actioncable (6.0.4.7)
+      actionpack (= 6.0.4.7)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      activejob (= 6.0.4.1)
-      activerecord (= 6.0.4.1)
-      activestorage (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
+    actionmailbox (6.0.4.7)
+      actionpack (= 6.0.4.7)
+      activejob (= 6.0.4.7)
+      activerecord (= 6.0.4.7)
+      activestorage (= 6.0.4.7)
+      activesupport (= 6.0.4.7)
      mail (>= 2.7.1)
-    actionmailer (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      actionview (= 6.0.4.1)
-      activejob (= 6.0.4.1)
+    actionmailer (6.0.4.7)
+      actionpack (= 6.0.4.7)
+      actionview (= 6.0.4.7)
+      activejob (= 6.0.4.7)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 2.0)
-    actionpack (6.0.4.1)
-      actionview (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
+    actionpack (6.0.4.7)
+      actionview (= 6.0.4.7)
+      activesupport (= 6.0.4.7)
      rack (~> 2.0, >= 2.0.8)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      activerecord (= 6.0.4.1)
-      activestorage (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
+    actiontext (6.0.4.7)
+      actionpack (= 6.0.4.7)
+      activerecord (= 6.0.4.7)
+      activestorage (= 6.0.4.7)
+      activesupport (= 6.0.4.7)
      nokogiri (>= 1.8.5)
-    actionview (6.0.4.1)
-      activesupport (= 6.0.4.1)
+    actionview (6.0.4.7)
+      activesupport (= 6.0.4.7)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.4.1)
-      activesupport (= 6.0.4.1)
+    activejob (6.0.4.7)
+      activesupport (= 6.0.4.7)
      globalid (>= 0.3.6)
-    activemodel (6.0.4.1)
-      activesupport (= 6.0.4.1)
-    activerecord (6.0.4.1)
-      activemodel (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
+    activemodel (6.0.4.7)
+      activesupport (= 6.0.4.7)
+    activerecord (6.0.4.7)
+      activemodel (= 6.0.4.7)
+      activesupport (= 6.0.4.7)
    activerecord-import (1.2.0)
      activerecord (>= 3.2)
    activerecord-nulldb-adapter (0.7.0)
@ -75,12 +75,12 @@ GEM
      multi_json (~> 1.11, >= 1.11.2)
      rack (>= 2.0.8, < 3)
      railties (>= 5.2.4.1)
-    activestorage (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      activejob (= 6.0.4.1)
-      activerecord (= 6.0.4.1)
+    activestorage (6.0.4.7)
+      actionpack (= 6.0.4.7)
+      activejob (= 6.0.4.7)
+      activerecord (= 6.0.4.7)
      marcel (~> 1.0.0)
-    activesupport (6.0.4.1)
+    activesupport (6.0.4.7)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 0.7, < 2)
      minitest (~> 5.1)
@ -93,6 +93,9 @@ GEM
    argon2 (2.0.3)
      ffi (~> 1.14)
      ffi-compiler (~> 1.0)
+    argon2 (2.0.3-x86_64-linux-musl)
+      ffi (~> 1.14)
+      ffi-compiler (~> 1.0)
    ast (2.4.2)
    async (1.29.1)
      console (~> 1.10)
@ -121,11 +124,14 @@ GEM
      tzinfo
    bootsnap (1.9.1)
      msgpack (~> 1.0)
+    bootsnap (1.9.1-x86_64-linux-musl)
+      msgpack (~> 1.0)
    brakeman (5.1.1)
    browser (5.3.1)
    buftok (0.2.0)
    builder (3.2.4)
    byebug (11.1.3)
+    byebug (11.1.3-x86_64-linux-musl)
    capybara (3.35.3)
      addressable
      mini_mime (>= 0.1.3)
@ -169,6 +175,7 @@ GEM
    daemons (1.4.1)
    dalli (2.7.11)
    debug_inspector (1.1.0)
+    debug_inspector (1.1.0-x86_64-linux-musl)
    delayed_job (4.1.9)
      activesupport (>= 3.0, < 6.2)
    delayed_job_active_record (4.1.6)
@ -195,6 +202,7 @@ GEM
    equalizer (0.0.11)
    erubi (1.10.0)
    eventmachine (1.2.7)
+    eventmachine (1.2.7-x86_64-linux-musl)
    execjs (2.8.1)
    factory_bot (6.2.0)
      activesupport (>= 5.0.0)
@ -226,7 +234,7 @@ GEM
    faraday-rack (1.0.0)
    faraday_middleware (1.0.0)
      faraday (~> 1.0)
-    ffi (1.15.3)
+    ffi (1.15.3-x86_64-linux-musl)
    ffi-compiler (1.0.1)
      ffi (>= 1.0.0)
      rake
@ -242,7 +250,7 @@ GEM
      rainbow (>= 2.2.1)
      rake (>= 10.0)
    gli (2.20.1)
-    globalid (0.5.2)
+    globalid (1.0.0)
      activesupport (>= 5.0)
    gmail_xoauth (0.4.2)
      oauth (>= 0.3.6)
@ -267,6 +275,7 @@ GEM
    hashdiff (1.0.1)
    hashie (4.1.0)
    hiredis (0.6.3)
+    hiredis (0.6.3-x86_64-linux-musl)
    htmlentities (4.3.4)
    http (4.4.1)
      addressable (~> 2.3)
@ -277,11 +286,12 @@ GEM
    http-cookie (1.0.4)
      domain_name (~> 0.5)
    http-form_data (2.3.0)
-    http-parser (1.2.3)
+    http-parser (1.2.3-x86_64-linux-musl)
      ffi-compiler (>= 1.0, < 2.0)
    http_parser.rb (0.6.0)
+    http_parser.rb (0.6.0-x86_64-linux-musl)
    httpclient (2.8.3)
-    i18n (1.8.10)
+    i18n (1.10.0)
      concurrent-ruby (~> 1.0)
    icalendar (2.7.1)
      ice_cube (~> 0.16)
@ -293,13 +303,15 @@ GEM
    iniparse (1.5.0)
    interception (0.5)
    json (2.5.1)
+    json (2.5.1-x86_64-linux-musl)
    jwt (2.2.3)
    kgio (2.11.4)
+    kgio (2.11.4-x86_64-linux-musl)
    koala (3.0.0)
      addressable
      faraday
      json (>= 1.8)
-    libv8 (8.4.255.0)
+    libv8 (8.4.255.0-x86_64-linux)
    listen (3.5.1)
      rb-fsevent (~> 0.10, >= 0.10.3)
      rb-inotify (~> 0.9, >= 0.9.10)
@ -307,11 +319,11 @@ GEM
    logging (2.3.0)
      little-plugger (~> 1.1)
      multi_json (~> 1.14)
-    loofah (2.12.0)
+    loofah (2.14.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
    lumberjack (1.2.8)
-    marcel (1.0.1)
+    marcel (1.0.2)
    memoizable (0.4.2)
      thread_safe (~> 0.3, >= 0.3.1)
    messagebird-rest (3.0.0)
@ -319,24 +331,30 @@ GEM
    mime-types (3.3.1)
      mime-types-data (~> 3.2015)
    mime-types-data (3.2021.0225)
-    mini_mime (1.1.1)
-    mini_portile2 (2.6.1)
+    mini_mime (1.1.2)
+    mini_portile2 (2.8.0)
    mini_racer (0.2.9)
      libv8 (>= 6.9.411)
-    minitest (5.14.4)
+    minitest (5.15.0)
    msgpack (1.4.2)
+    msgpack (1.4.2-x86_64-linux-musl)
    multi_json (1.15.0)
    multi_xml (0.6.0)
    multipart-post (2.1.1)
    mysql2 (0.5.3)
+    mysql2 (0.5.3-x86_64-linux-musl)
    naught (1.1.0)
    nenv (0.3.0)
    nestful (1.1.4)
    net-ldap (0.17.0)
    netrc (0.11.0)
    nio4r (2.5.8)
-    nokogiri (1.12.4)
-      mini_portile2 (~> 2.6.1)
+    nio4r (2.5.8-x86_64-linux-musl)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    nokogiri (1.13.3-x86_64-linux-musl)
+      mini_portile2 (~> 2.8.0)
      racc (~> 1.4)
    nori (2.6.0)
    notiffany (0.1.3)
@ -392,7 +410,7 @@ GEM
      omniauth (~> 1.5)
      omniauth-oauth2 (>= 1.4.0)
    openssl (2.2.0)
-    os (1.1.1)
+    openssl (2.2.0-x86_64-linux-musl)
    overcommit (0.58.0)
      childprocess (>= 0.6.3, < 5)
      iniparse (~> 1.4)
@ -401,6 +419,7 @@ GEM
    parser (3.0.2.0)
      ast (~> 2.4.1)
    pg (0.21.0)
+    pg (0.21.0-x86_64-linux-musl)
    power_assert (2.0.1)
    protocol-hpack (1.4.2)
    protocol-http (0.22.4)
@ -424,32 +443,35 @@ GEM
      binding_of_caller (~> 1.0)
      pry (~> 0.13)
    public_suffix (4.0.6)
-    puma (4.3.8)
+    puma (4.3.11)
+      nio4r (~> 2.0)
+    puma (4.3.8-x86_64-linux-musl)
      nio4r (~> 2.0)
    pundit (2.1.1)
      activesupport (>= 3.0.0)
    pundit-matchers (1.7.0)
      rspec-rails (>= 3.0.0)
-    racc (1.5.2)
+    racc (1.6.0)
+    racc (1.6.0-x86_64-linux-musl)
    rack (2.2.3)
    rack-livereload (0.3.17)
      rack
    rack-test (1.1.0)
      rack (>= 1.0, < 3)
-    rails (6.0.4.1)
-      actioncable (= 6.0.4.1)
-      actionmailbox (= 6.0.4.1)
-      actionmailer (= 6.0.4.1)
-      actionpack (= 6.0.4.1)
-      actiontext (= 6.0.4.1)
-      actionview (= 6.0.4.1)
-      activejob (= 6.0.4.1)
-      activemodel (= 6.0.4.1)
-      activerecord (= 6.0.4.1)
-      activestorage (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
+    rails (6.0.4.7)
+      actioncable (= 6.0.4.7)
+      actionmailbox (= 6.0.4.7)
+      actionmailer (= 6.0.4.7)
+      actionpack (= 6.0.4.7)
+      actiontext (= 6.0.4.7)
+      actionview (= 6.0.4.7)
+      activejob (= 6.0.4.7)
+      activemodel (= 6.0.4.7)
+      activerecord (= 6.0.4.7)
+      activestorage (= 6.0.4.7)
+      activesupport (= 6.0.4.7)
      bundler (>= 1.3.0)
-      railties (= 6.0.4.1)
+      railties (= 6.0.4.7)
      sprockets-rails (>= 2.0.0)
    rails-controller-testing (1.0.5)
      actionpack (>= 5.0.1.rc1)
@ -458,16 +480,17 @@ GEM
    rails-dom-testing (2.0.3)
      activesupport (>= 4.2.0)
      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.1)
+    rails-html-sanitizer (1.4.2)
      loofah (~> 2.3)
-    railties (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
+    railties (6.0.4.7)
+      actionpack (= 6.0.4.7)
+      activesupport (= 6.0.4.7)
      method_source
      rake (>= 0.8.7)
      thor (>= 0.20.3, < 2.0)
    rainbow (3.0.0)
    raindrops (0.19.2)
+    raindrops (0.19.2-x86_64-linux-musl)
    rake (13.0.6)
    rb-fsevent (0.11.0)
    rb-inotify (0.10.1)
@ -499,6 +522,7 @@ GEM
      rspec-support (~> 3.10)
    rspec-support (3.10.2)
    rszr (0.5.2)
+    rszr (0.5.2-x86_64-linux-musl)
    rubocop (1.21.0)
      parallel (~> 1.10)
      parser (>= 3.0.0.0)
@ -531,6 +555,8 @@ GEM
    rubyzip (2.3.0)
    sassc (2.4.0)
      ffi (~> 1.9)
+    sassc (2.4.0-x86_64-linux-musl)
+      ffi (~> 1.9)
    sassc-rails (2.1.2)
      railties (>= 4.0.0)
      sassc (>= 2.0)
@ -571,9 +597,9 @@ GEM
    sprockets (3.7.2)
      concurrent-ruby (~> 1.0)
      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
      sprockets (>= 3.0.0)
    sync (0.5.0)
    tcr (0.2.2)
@ -584,7 +610,7 @@ GEM
      tins (~> 1.0)
    test-unit (3.4.7)
      power_assert
-    thor (1.1.0)
+    thor (1.2.1)
    thread_safe (0.3.6)
    tilt (2.0.10)
    timers (4.3.3)
@ -611,11 +637,14 @@ GEM
      execjs (>= 0.3.0, < 3)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.7.7)
+    unf_ext (0.0.7.7-x86_64-linux-musl)
    unicode-display_width (2.1.0)
    unicorn (6.0.0)
      kgio (~> 2.6)
      raindrops (~> 0.7)
+    unicorn (6.0.0-x86_64-linux-musl)
+      kgio (~> 2.6)
+      raindrops (~> 0.7)
    valid_email2 (4.0.0)
      activemodel (>= 3.2)
      mail (~> 2.5)
@ -631,11 +660,13 @@ GEM
      hashdiff (>= 0.4.0, < 2.0.0)
    websocket-driver (0.7.5)
      websocket-extensions (>= 0.1.0)
+    websocket-driver (0.7.5-x86_64-linux-musl)
+      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.5)
    writeexcel (1.0.5)
    xpath (3.2.0)
      nokogiri (~> 1.8)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.4)
    zendesk_api (1.33.0)
      faraday (>= 0.9.0, < 2.0.0)
      hashie (>= 3.5.2, < 5.0.0)
@ -645,6 +676,7 @@ GEM

 PLATFORMS
  ruby
+  x86_64-linux-musl

 DEPENDENCIES
  aasm
@ -711,7 +743,6 @@ DEPENDENCIES
  omniauth-twitter
  omniauth-weibo-oauth2
  openssl
-  os
  overcommit
  pg (= 0.21.0)
  pry-rails
@ -761,7 +792,7 @@ DEPENDENCIES
  zendesk_api

 RUBY VERSION
-   ruby 2.7.4p191
+   ruby 2.7.5p203

 BUNDLED WITH
   2.2.20
--- a/149
+++ b/149
@ -0,0 +1,149 @@
+SHELL := /bin/bash
+.DEFAULT_GOAL := help
+
+# Copiar el archivo de configuración y avisar cuando hay que
+# actualizarlo.
+.env: .env.example
+	@test -f $@ || cp -v $< $@
+	@test -f $@ && echo "Revisa $@ para actualizarlo con respecto a $<"
+	@test -f $@ && diff -auN --color $@ $<
+
+include .env
+
+export
+
+# XXX: El espacio antes del comentario cuenta como espacio
+args ?=## Argumentos para Hain
+commit ?= origin/rails## Commit desde el que actualizar
+env ?= staging## Entorno del nodo delegado
+sutty ?= $(SUTTY)## Dirección local
+delegate ?= $(DELEGATE)## Cambia el nodo delegado
+hain ?= $(HAINISH)## Ubicación de Hainish
+
+# El nodo delegado tiene dos entornos, production y staging.
+# Dependiendo del entorno que elijamos, se van a generar los assets y el
+# contenedor y subirse a un servidor u otro.  No utilizamos CI/CD (aún).
+#
+# Production es el entorno de panel.sutty.nl
+ifeq ($(env),production)
+container ?= sutty
+## TODO: Cambiar a otra cosa
+branch ?= rails
+public ?= public
+endif
+
+# Staging es el entorno de panel.staging.sutty.nl
+ifeq ($(env),staging)
+container := staging
+branch := staging
+public := staging
+endif
+
+help: always ## Ayuda
+	@echo -e "Sutty\n" | sed -re "s/^.*/\x1B[38;5;197m&\x1B[0m/"
+	@echo -e "Servidor: https://panel.$(SUTTY_WITH_PORT)/\n"
+	@echo -e "Uso: make TAREA args=\"ARGUMENTOS\"\n"
+	@echo -e "Tareas:\n"
+	@grep -E "^[a-z\-]+:.*##" Makefile | sed -re "s/(.*):.*##(.*)/\1;\2/" | column -s ";" -t | sed -re "s/^([^ ]+) /\x1B[38;5;197m\1\x1B[0m/"
+	@echo -e "\nArgumentos:\n"
+	@grep -E "^[a-z\-]+ \?=.*##" Makefile | sed -re "s/(.*) \?=.*##(.*)/\1;\2/" | column -s ";" -t | sed -re "s/^([^ ]+) /\x1B[38;5;197m\1\x1B[0m/"
+
+assets: node_modules public/packs/manifest.json.br ## Compilar los assets
+
+test: always ## Ejecutar los tests
+	$(MAKE) rake args="test RAILS_ENV=test $(args)"
+
+postgresql: /etc/hosts ## Iniciar la base de datos
+	pgrep postgres >/dev/null || $(hain) postgresql
+
+serve-js: /etc/hosts node_modules ## Iniciar el servidor de desarrollo de Javascript
+	$(hain) 'bundle exec ./bin/webpack-dev-server'
+
+serve: /etc/hosts postgresql Gemfile.lock ## Iniciar el servidor de desarrollo de Rails
+	$(MAKE) rails args=server
+
+rails: ## Corre rails dentro del entorno de desarrollo (pasar argumentos con args=).
+	$(MAKE) bundle args="exec rails $(args)"
+
+rake: ## Corre rake dentro del entorno de desarrollo (pasar argumentos con args=).
+	$(MAKE) bundle args="exec rake $(args)"
+
+bundle: ## Corre bundle dentro del entorno de desarrollo (pasar argumentos con args=).
+	$(hain) 'bundle $(args)'
+
+rubocop: ## Yutea el código que está por ser commiteado
+	git status --porcelain \
+  | grep -E "^(A|M)" \
+  | sed "s/^...//" \
+  | grep ".rb$$" \
+  | ../haini.sh/haini.sh "xargs -r ./bin/rubocop --auto-correct"
+
+audit: ## Encuentra dependencias con vulnerabilidades
+	$(hain) 'gem install bundler-audit'
+	$(hain) 'bundle audit --update'
+
+brakeman: ## Busca posibles vulnerabilidades en Sutty
+	$(MAKE) bundle args='exec brakeman'
+
+yarn: ## Tareas de yarn
+	$(hain) 'yarn $(args)'
+
+clean: ## Limpieza
+	rm -rf _sites/test-* _deploy/test-* log/*.log tmp/cache tmp/letter_opener tmp/miniprofiler tmp/storage
+
+build: Gemfile.lock ## Generar la imagen Docker
+	time docker build --build-arg="BRANCH=$(branch)" --build-arg="RAILS_MASTER_KEY=`cat config/master.key`" -t sutty/$(container) .
+	docker tag sutty/$(container):latest sutty:keep
+	@echo -e "\a"
+
+save: ## Subir la imagen Docker al nodo delegado
+	time docker save sutty/$(container):latest | ssh root@$(delegate) docker load
+	date +%F | xargs -I {} git tag -f $(container)-{}
+	@echo -e "\a"
+
+ota-js: assets ## Actualizar Javascript en el nodo delegado
+	sudo chgrp -R 82 public/
+	rsync -avi --delete-after public/ root@$(delegate):/srv/sutty/srv/http/data/_$(public)/
+	ssh root@$(delegate) docker exec $(container) sh -c "cat /srv/http/tmp/puma.pid | xargs -r kill -USR2"
+
+ota: ## Actualizar Rails en el nodo delegado
+	umask 022; git format-patch $(commit)
+	scp ./0*.patch $(delegate):/tmp/
+	ssh $(delegate) mkdir -p /tmp/patches-$(commit)/
+	scp ./0*.patch $(delegate):/tmp/patches-$(commit)/
+	scp ./ota.sh $(delegate):/tmp/
+	ssh $(delegate) docker cp /tmp/patches-$(shell echo $(commit) | cut -d / -f 1) $(container):/tmp/
+	ssh $(delegate) docker cp /tmp/ota.sh $(container):/usr/local/bin/ota
+	ssh $(delegate) docker exec $(container) apk add --no-cache patch
+	ssh $(delegate) docker exec $(container) ota $(commit)
+	rm ./0*.patch
+
+# Todos los archivos de assets.  Si alguno cambia, se van a recompilar
+# los assets que luego se suben al nodo delegado.
+assets := package.json yarn.lock $(shell find app/assets/ app/javascript/ -type f)
+public/packs/manifest.json.br: $(assets)
+	$(hain) 'PANEL_URL=https://panel.sutty.nl RAILS_ENV=production NODE_ENV=production bundle exec rake assets:precompile assets:clean'
+
+# Correr un test en particular por ejemplo
+# `make test/models/usuarie_test.rb`
+tests := $(shell find test/ -name "*_test.rb")
+$(tests): always
+	$(MAKE) test args="TEST=$@"
+
+# Agrega las direcciones locales al sistema
+/etc/hosts: always
+	@echo "Chequeando si es necesario agregar el dominio local $(SUTTY)"
+	@grep -q " $(SUTTY)$$" $@ || echo -e "127.0.0.1 $(SUTTY)\n::1 $(SUTTY)" | sudo tee -a $@
+	@grep -q " api.$(SUTTY)$$" $@ || echo -e "127.0.0.1 api.$(SUTTY)\n::1 api.$(SUTTY)" | sudo tee -a $@
+	@grep -q " panel.$(SUTTY)$$" $@ || echo -e "127.0.0.1 panel.$(SUTTY)\n::1 panel.$(SUTTY)" | sudo tee -a $@
+	@grep -q " postgresql.$(SUTTY)$$" $@ || echo -e "127.0.0.1 postgresql.$(SUTTY)\n::1 postgresql.$(SUTTY)" | sudo tee -a $@
+
+# Instala las dependencias de Javascript
+node_modules: package.json
+	$(MAKE) yarn
+
+# Instala las dependencias de Rails
+Gemfile.lock: Gemfile 
+	$(MAKE) bundle args=install
+
+.PHONY: always
--- a/app/assets/javascripts/app/controllers/_application_controller/_base.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller/_base.coffee
@ -300,9 +300,10 @@ class App.Controller extends Spine.Controller

  frontendTimeUpdateItem: (item, currentVal) =>
    timestamp = item.attr('datetime')
-    time      = @humanTime(timestamp, item.hasClass('escalation'))
+    return if timestamp is 'null'

    # only do dom updates on changes
+    time = @humanTime(timestamp, item.hasClass('escalation'))
    return if time is currentVal

    newTitle = App.i18n.translateTimestamp(timestamp)
--- a/app/assets/javascripts/app/controllers/_application_controller/form.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller/form.coffee
@ -418,11 +418,11 @@ class App.ControllerForm extends App.Controller

      if !@constructor.fieldIsMandatory(field_by_name)
        field_by_name.attr('required', true)
-        field_by_name.parents('.form-group').find('label span').html('*')
+        field_by_name.closest('.form-group').find('label span').html('*')
        field_by_name.closest('.form-group').addClass('is-required')
      if !@constructor.fieldIsMandatory(field_by_data)
        field_by_data.attr('required', true)
-        field_by_data.parents('.form-group').find('label span').html('*')
+        field_by_data.closest('.form-group').find('label span').html('*')
        field_by_data.closest('.form-group').addClass('is-required')

  optional: (name, el = @form) ->
@ -434,11 +434,11 @@ class App.ControllerForm extends App.Controller

      if @constructor.fieldIsMandatory(field_by_name)
        field_by_name.attr('required', false)
-        field_by_name.parents('.form-group').find('label span').html('')
+        field_by_name.closest('.form-group').find('label span').html('')
        field_by_name.closest('.form-group').removeClass('is-required')
      if @constructor.fieldIsMandatory(field_by_data)
        field_by_data.attr('required', false)
-        field_by_data.parents('.form-group').find('label span').html('')
+        field_by_data.closest('.form-group').find('label span').html('')
        field_by_data.closest('.form-group').removeClass('is-required')

  readonly: (name, el = @form) ->
--- a/app/assets/javascripts/app/controllers/_application_controller/observer.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller/observer.coffee
@ -2,6 +2,7 @@ class App.ControllerObserver extends App.Controller
  model: 'Ticket'
  template: 'tba'
  globalRerender: true
+  lastAttributes: undefined

  ###
  observe:
@ -25,7 +26,7 @@ class App.ControllerObserver extends App.Controller
    # rerender, e. g. on language change
    if @globalRerender
      @controllerBind('ui:rerender', =>
-        @lastAttributres = undefined
+        @lastAttributes = undefined
        @maybeRender(App[@model].fullLocal(@object_id))
      )

@ -43,32 +44,40 @@ class App.ControllerObserver extends App.Controller
    if !@subscribeId
      @subscribeId = object.subscribe(@subscribe)

-    # remember current attributes
+    return if !@hasChanged(object)
+
+    @render(object)
+
+  hasChanged: (object) =>
    currentAttributes = {}
+
+    objectCloned = $.extend(true, {}, object)
    if @observe
      for key, active of @observe
-        if active
-          currentAttributes[key] = object[key]
+        if active && !_.isFunction(value)
+          currentAttributes[key] = objectCloned[key]
+
    if @observeNot
-      for key, value of object
-        if key isnt 'cid' && !@observeNot[key] && !_.isFunction(value) && !_.isObject(value)
+      for key, value of objectCloned
+        if key isnt 'cid' && !@observeNot[key] && !_.isFunction(value)
          currentAttributes[key] = value

-    if !@lastAttributres
-      @lastAttributres = {}
-    else
-      diff = difference(currentAttributes, @lastAttributres)
-      if _.isEmpty(diff)
-        @log 'debug', 'maybeRender no diff, no rerender'
-        return
+    if !@lastAttributes
+      @lastAttributes = currentAttributes
+      return true
+
+    diff = difference(currentAttributes, @lastAttributes)
+    if _.isEmpty(diff)
+      @log 'debug', 'maybeRender no diff, no rerender'
+      return false

    @log 'debug', 'maybeRender.diff', diff, @observe, @model
-    @lastAttributres = currentAttributes
+    @lastAttributes = currentAttributes

-    @render(object, diff)
+    true

-  render: (object, diff) =>
-    @log 'debug', 'render', @template, object, diff
+  render: (object) =>
+    @log 'debug', 'render', @template, object
    @html App.view(@template)(
      object: object
    )
--- a/app/assets/javascripts/app/controllers/_application_controller/table.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller/table.coffee
@ -493,6 +493,15 @@ class App.ControllerTable extends App.Controller
      sortable:   @dndCallback
    ))

+  sortObjectKeys: (objects, direction) ->
+    sorted = Object.keys(objects).sort()
+
+    switch direction
+      when 'DESC'
+        sorted.reverse()
+      else
+        sorted
+
  renderTableRows: (sort = false) =>
    if sort is true
      @sortList()
@ -506,11 +515,11 @@ class App.ControllerTable extends App.Controller
    objectsToShow = @objectsOfPage(@pagerShownPage)
    if @groupBy
      # group by raw (and not printable) value so dates work also
-      objectsGrouped = _.groupBy(objectsToShow, (object) => object[@groupBy])
+      objectsGrouped = _.groupBy(objectsToShow, (object) => @groupObjectName(object, @groupBy, excludeTags: ['date', 'datetime']))
    else
      objectsGrouped = { '': objectsToShow }

-    for groupValue in Object.keys(objectsGrouped).sort()
+    for groupValue in @sortObjectKeys(objectsGrouped, @groupDirection)
      groupObjects = objectsGrouped[groupValue]

      for object in groupObjects
@ -846,11 +855,15 @@ class App.ControllerTable extends App.Controller
    @objects = localObjects
    @lastSortedobjects = localObjects

-  groupObjectName: (object, key = undefined) ->
+  groupObjectName: (object, key = undefined, options = {}) ->
    group = object
    if key
      if key not of object
        key += '_id'
+
+      # return internal value if needed
+      return object[key] if options.excludeTags && _.find(@attributesList, (attr) -> attr.name == key && _.contains(options.excludeTags, attr.tag))
+
      group = App.viewPrint(object, key, @attributesList)
    if _.isEmpty(group)
      group = ''
--- a/app/assets/javascripts/app/controllers/_application_controller/technical_error_modal.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller/technical_error_modal.coffee
@ -0,0 +1,9 @@
+class App.ControllerTechnicalErrorModal extends App.ControllerModal
+  head:         "StatusCode: #{status}"
+  contentCode:  ''
+  buttonClose:  false
+  buttonSubmit: 'Ok'
+  onSubmit:     (e) -> @close(e)
+
+  content: ->
+    "<pre><code>#{@contentCode}</code></pre>"
--- a/app/assets/javascripts/app/controllers/_channel/email.coffee
+++ b/app/assets/javascripts/app/controllers/_channel/email.coffee
@ -428,20 +428,7 @@ class ChannelEmailAccountWizard extends App.ControllerWizardModal
      ui.hide('options::folder')
      ui.hide('options::keep_on_server')

-    handlePort = (params, attribute, attributes, classname, form, ui) ->
-      return if !params
-      return if !params.options
-      currentPort = @$('[name="options::port"]').val()
-      if params.options.ssl is true
-        if !currentPort || currentPort is '143'
-          @$('[name="options::port"]').val('993')
-        return
-      if params.options.ssl is false
-        if !currentPort || currentPort is '993'
-          @$('[name="options::port"]').val('143')
-        return
-
-    new App.ControllerForm(
+    form = new App.ControllerForm(
      el:    @$('.base-inbound-settings'),
      model:
        configure_attributes: configureAttributesInbound
@ -449,10 +436,16 @@ class ChannelEmailAccountWizard extends App.ControllerWizardModal
      params: @account.inbound
      handlers: [
        showHideFolder,
-        handlePort,
      ]
    )

+    form.el.find("select[name='options::ssl']").off('change').on('change', (e) ->
+      if $(e.target).val() is 'true'
+        form.el.find("[name='options::port']").val('993')
+      else
+        form.el.find("[name='options::port']").val('143')
+    )
+
  toggleOutboundAdapter: =>

    # fill user / password based on intro info
--- a/app/assets/javascripts/app/controllers/_integration/placetel.coffee
+++ b/app/assets/javascripts/app/controllers/_integration/placetel.coffee
@ -60,6 +60,30 @@ class Form extends App.Controller
      placetel_token: App.Setting.get('placetel_token')
    )

+    configure_attributes = [
+      {
+        name: 'view_limit',
+        display: '',
+        tag: 'select',
+        null: false,
+        options: [
+          { name: 60, value: 60 }
+          { name: 120, value: 120 }
+          { name: 180, value: 180 }
+          { name: 240, value: 240 }
+          { name: 300, value: 300 }
+        ]
+      },
+    ]
+    new App.ControllerForm(
+      el: @$('.js-viewLimit')
+      model:
+        configure_attributes: configure_attributes,
+      params:
+        view_limit: @config['view_limit']
+      autofocus: false
+    )
+
  updateCurrentConfig: =>
    config = @config
    cleanupInput = @cleanupInput
@ -70,6 +94,10 @@ class Form extends App.Controller
    default_caller_id = @$('input[name=default_caller_id]').val()
    config.outbound.default_caller_id = cleanupInput(default_caller_id)

+    # default view limit
+    view_limit = @$('select[name=view_limit]').val()
+    config.view_limit = parseInt(view_limit)
+
    # routing table
    config.outbound.routing_table = []
    @$('.js-outboundRouting .js-row').each(->
--- a/app/assets/javascripts/app/controllers/_integration/sipgate_io.coffee
+++ b/app/assets/javascripts/app/controllers/_integration/sipgate_io.coffee
@ -59,17 +59,42 @@ class Form extends App.Controller
      config: @config
    )

+    configure_attributes = [
+      {
+        name: 'view_limit',
+        display: '',
+        tag: 'select',
+        null: false,
+        options: [
+          { name: 60, value: 60 }
+          { name: 120, value: 120 }
+          { name: 180, value: 180 }
+          { name: 240, value: 240 }
+          { name: 300, value: 300 }
+        ]
+      },
+    ]
+    new App.ControllerForm(
+      el: @$('.js-viewLimit')
+      model:
+        configure_attributes: configure_attributes,
+      params:
+        view_limit: @config['view_limit']
+      autofocus: false
+    )
+
  updateCurrentConfig: =>
    config = @config
    cleanupInput = @cleanupInput

-    config.api_user = cleanupInput(@$('input[name=api_user]').val())
-    config.api_password = cleanupInput(@$('input[name=api_password]').val())
-
    # default caller_id
    default_caller_id = @$('input[name=default_caller_id]').val()
    config.outbound.default_caller_id = cleanupInput(default_caller_id)

+    # default view limit
+    view_limit = @$('select[name=view_limit]').val()
+    config.view_limit = parseInt(view_limit)
+
    # routing table
    config.outbound.routing_table = []
    @$('.js-outboundRouting .js-row').each(->
--- a/app/assets/javascripts/app/controllers/_ui_element/_application_selector.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/_application_selector.coffee
@ -96,6 +96,8 @@ class App.UiElement.ApplicationSelector
          # ignore passwords and relations
          if row.type isnt 'password' && row.name.substr(row.name.length-4,4) isnt '_ids' && row.searchable isnt false
            config = _.clone(row)
+            if config.tag is 'textarea'
+              config.expanding = false
            if config.type is 'email' || config.type is 'tel'
              config.type = 'text'
            for operatorRegEx, operator of operators_type
--- a/app/assets/javascripts/app/controllers/_ui_element/_application_ui_element.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/_application_ui_element.coffee
@ -46,7 +46,7 @@ class App.UiElement.ApplicationUiElement
    result = []
    for row in selection
      if attribute.translate
-        row.name = App.i18n.translateInline(row.name)
+        row.name = App.i18n.translatePlain(row.name)
        if !_.isEmpty(row.children)
          row.children = @getConfigOptionListArray(attribute, row.children)
      result.push row
@ -65,7 +65,7 @@ class App.UiElement.ApplicationUiElement
      for key in order
        name_new = selection[key]
        if attribute.translate
-          name_new = App.i18n.translateInline(name_new)
+          name_new = App.i18n.translatePlain(name_new)
        attribute.options.push {
          name:  name_new
          value: key
@ -162,7 +162,7 @@ class App.UiElement.ApplicationUiElement
          nameNew = item.name

        if attribute.translate
-          nameNew = App.i18n.translateInline(nameNew)
+          nameNew = App.i18n.translatePlain(nameNew)

        row =
          value: item.id,
--- a/app/assets/javascripts/app/controllers/_ui_element/auth_provider.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/auth_provider.coffee
@ -0,0 +1,9 @@
+# coffeelint: disable=camel_case_classes
+class App.UiElement.auth_provider
+  @render: (attribute) ->
+    for key, value of App.Config.get('auth_provider_all')
+      continue if value.config isnt attribute.provider
+      attribute.value = "#{App.Config.get('http_type')}://#{App.Config.get('fqdn')}#{value.url}/callback"
+      break
+
+    $( App.view('generic/auth_provider')( attribute: attribute ) )
--- a/app/assets/javascripts/app/controllers/_ui_element/basedate.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/basedate.coffee
@ -155,4 +155,4 @@ class App.UiElement.basedate
      clear: 'clear'
    }

-    App.i18n.translateDeep(data)
+    App.i18n.translateDeepPlain(data)
--- a/app/assets/javascripts/app/controllers/_ui_element/core_workflow_condition.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/core_workflow_condition.coffee
@ -23,7 +23,7 @@ class App.UiElement.core_workflow_condition extends App.UiElement.ApplicationSel
      organization:
        name: 'Organization'
        model: 'Organization'
-        model_show: ['Organization']
+        model_show: ['User', 'Organization']
      'customer.organization':
        name: 'Organization'
        model: 'Organization'
@ -50,15 +50,15 @@ class App.UiElement.core_workflow_condition extends App.UiElement.ApplicationSel

    operatorsType =
      'active$': ['is']
-      'boolean$': ['is', 'is not', 'is set', 'not set']
-      'integer$': ['is', 'is not', 'is set', 'not set']
-      '^select$': ['is', 'is not', 'is set', 'not set']
-      '^tree_select$': ['is', 'is not', 'is set', 'not set']
-      '^(input|textarea|richtext)$': ['is', 'is not', 'is set', 'not set', 'regex match', 'regex mismatch']
+      'boolean$': ['is', 'is not', 'is set', 'not set', 'has changed', 'changed to']
+      'integer$': ['is', 'is not', 'is set', 'not set', 'has changed', 'changed to']
+      '^select$': ['is', 'is not', 'is set', 'not set', 'has changed', 'changed to']
+      '^tree_select$': ['is', 'is not', 'is set', 'not set', 'has changed', 'changed to']
+      '^(input|textarea|richtext)$': ['is', 'is not', 'is set', 'not set', 'has changed', 'changed to', 'regex match', 'regex mismatch']

    operatorsName =
-      '_id$': ['is', 'is not', 'is set', 'not set']
-      '_ids$': ['is', 'is not', 'is set', 'not set']
+      '_id$': ['is', 'is not', 'is set', 'not set', 'has changed', 'changed to']
+      '_ids$': ['is', 'is not', 'is set', 'not set', 'has changed', 'changed to']

    # merge config
    elements = {}
@ -153,6 +153,8 @@ class App.UiElement.core_workflow_condition extends App.UiElement.ApplicationSel
        # ignore passwords and relations
        if row.type isnt 'password' && row.name.substr(row.name.length-4,4) isnt '_ids' && row.searchable isnt false
          config = _.clone(row)
+          if config.tag is 'textarea'
+            config.expanding = false
          if config.tag is 'select'
            config.multiple = true
            config.default  = undefined
@ -175,7 +177,7 @@ class App.UiElement.core_workflow_condition extends App.UiElement.ApplicationSel
    currentOperator = elementRow.find('.js-operator option:selected').attr('value')
    name            = @buildValueName(elementFull, elementRow, groupAndAttribute, elements, meta, attribute)

-    if _.contains(['is set', 'not set'], currentOperator)
+    if _.contains(['is set', 'not set', 'has changed'], currentOperator)
      elementRow.find('.js-value').addClass('hide').html('<input type="hidden" name="' + name + '" value="true" />')
      return

--- a/app/assets/javascripts/app/controllers/_ui_element/core_workflow_perform.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/core_workflow_perform.coffee
@ -39,6 +39,7 @@ class App.UiElement.core_workflow_perform extends App.UiElement.ApplicationSelec
    operatorsType =
      'boolean$': ['show', 'hide', 'remove', 'set_mandatory', 'set_optional', 'set_readonly', 'unset_readonly', 'add_option', 'remove_option', 'set_fixed_to']
      'integer$': ['show', 'hide', 'remove', 'set_mandatory', 'set_optional', 'set_readonly', 'unset_readonly']
+      '^date': ['show', 'hide', 'remove', 'set_mandatory', 'set_optional', 'set_readonly', 'unset_readonly']
      '^select$': ['show', 'hide', 'remove', 'set_mandatory', 'set_optional', 'set_readonly', 'unset_readonly', 'add_option', 'remove_option', 'set_fixed_to', 'select', 'auto_select']
      '^tree_select$': ['show', 'hide', 'remove', 'set_mandatory', 'set_optional', 'set_readonly', 'unset_readonly', 'add_option', 'remove_option', 'set_fixed_to', 'select', 'auto_select']
      '^input$': ['show', 'hide', 'remove', 'set_mandatory', 'set_optional', 'set_readonly', 'unset_readonly', 'fill_in', 'fill_in_empty']
@ -63,8 +64,9 @@ class App.UiElement.core_workflow_perform extends App.UiElement.ApplicationSelec
        continue

      for row in App[groupMeta.model].configure_attributes
-        continue if !_.contains(['input', 'select', 'integer', 'boolean', 'tree_select'], row.tag)
-        continue if groupKey is 'ticket' && _.contains(['number', 'organization_id', 'title'], row.name)
+        continue if !_.contains(['input', 'select', 'integer', 'boolean', 'tree_select', 'date', 'datetime'], row.tag)
+        continue if _.contains(['created_at', 'updated_at'], row.name)
+        continue if groupKey is 'ticket' && _.contains(['number', 'organization_id', 'title', 'escalation_at', 'first_response_escalation_at', 'update_escalation_at', 'close_escalation_at', 'last_contact_at', 'last_contact_agent_at', 'last_contact_customer_at', 'first_response_at', 'close_at'], row.name)

        # ignore passwords and relations
        if row.type isnt 'password' && row.name.substr(row.name.length-4,4) isnt '_ids' && row.searchable isnt false
@ -126,11 +128,12 @@ class App.UiElement.core_workflow_perform extends App.UiElement.ApplicationSelec
    super(elementFull, elementRow, groupAndAttribute, elements, meta, attribute)

  @buildValueConfigMultiple: (config, meta) ->
-    if _.contains(['add_option', 'remove_option', 'set_fixed_to'], meta.operator)
+    if _.contains(['add_option', 'remove_option', 'set_fixed_to', 'select'], meta.operator)
      config.multiple = true
+      config.nulloption = true
    else
      config.multiple = false
-    config.nulloption = false
+      config.nulloption = false
    return config

  @HasPreCondition: ->
--- a/app/assets/javascripts/app/controllers/_ui_element/object_manager_attribute.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/object_manager_attribute.coffee
@ -244,7 +244,7 @@ class App.UiElement.object_manager_attribute extends App.UiElement.ApplicationUi
      params: params
    )
    configureAttributes = [
-      { name: 'data_option::diff', display: 'Default time Diff (minutes)', tag: 'integer', null: false, default: 24 },
+      { name: 'data_option::diff', display: 'Default time Diff (minutes)', tag: 'integer', null: true },
    ]
    datetimeDiff = new App.ControllerForm(
      model:
@ -258,7 +258,7 @@ class App.UiElement.object_manager_attribute extends App.UiElement.ApplicationUi

  @date: (item, localParams, params) ->
    configureAttributes = [
-      { name: 'data_option::diff', display: 'Default time Diff (hours)', tag: 'integer', null: false, default: 24 },
+      { name: 'data_option::diff', display: 'Default time Diff (hours)', tag: 'integer', null: true },
    ]
    dateDiff = new App.ControllerForm(
      model:
--- a/app/assets/javascripts/app/controllers/_ui_element/richtext.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/richtext.coffee
@ -6,7 +6,7 @@ class App.UiElement.richtext
      attribute.value = attribute.value.text

    item = $( App.view('generic/richtext')(attribute: attribute, toolButtons: @toolButtons) )
-    @contenteditable = item.find('[contenteditable]').ce(
+    item.find('[contenteditable]').ce(
      mode:      attribute.type
      maxlength: attribute.maxlength
      buttons:   attribute.buttons
@ -21,12 +21,14 @@ class App.UiElement.richtext
        new App[plugin.controller](params)

    if attribute.upload
-      @attachments = []
+      attachments = []
      item.append( $( App.view('generic/attachment')(attribute: attribute) ) )

-      renderFile = (file) =>
+      renderFile = (file) ->
        item.find('.attachments').append(App.view('generic/attachment_item')(file))
-        @attachments.push file
+        attachments.push file
+        if form.richTextUploadRenderCallback
+          form.richTextUploadRenderCallback(attribute, attachments)

      if params && params.attachments
        for file in params.attachments
@ -46,14 +48,16 @@ class App.UiElement.richtext
      , form.form_id)

      # remove items
-      item.find('.attachments').on('click', '.js-delete', (e) =>
+      item.find('.attachments').on('click', '.js-delete', (e) ->
        id = $(e.currentTarget).data('id')
-        @attachments = _.filter(
-          @attachments,
+        attachments = _.filter(
+          attachments,
          (item) ->
            return if item.id.toString() is id.toString()
            item
        )
+        if form.richTextUploadDeleteCallback
+          form.richTextUploadDeleteCallback(attribute, attachments)

        form_id = item.closest('form').find('[name=form_id]').val()

@ -71,67 +75,35 @@ class App.UiElement.richtext
          element.empty()
      )

-      @progressBar           = item.find('.attachmentUpload-progressBar')
-      @progressText          = item.find('.js-percentage')
-      @attachmentPlaceholder = item.find('.attachmentPlaceholder')
-      @attachmentUpload      = item.find('.attachmentUpload')
-      @attachmentsHolder     = item.find('.attachments')
-      @cancelContainer       = item.find('.js-cancel')
+      App.Delay.set( ->
+        uploader = new App.Html5Upload(
+          uploadUrl:              "#{App.Config.get('api_path')}/attachments"
+          dropContainer:          item.closest('form')
+          cancelContainer:        item.find('.js-cancel')
+          inputField:             item.find('input')
+          data:
+            form_id: item.closest('form').find('[name=form_id]').val()

-      u = => html5Upload.initialize(
-        uploadUrl:              "#{App.Config.get('api_path')}/attachments"
-        dropContainer:          item.closest('form').get(0)
-        cancelContainer:        @cancelContainer
-        inputField:             item.find('input').get(0)
-        maxSimultaneousUploads: 1,
-        key:                    'File'
-        data:
-          form_id: item.closest('form').find('[name=form_id]').val()
-        onFileAdded: (file) =>
+          onFileStartCallback: ->
+            item.find('[contenteditable]').trigger('fileUploadStart')

-          file.on(
-            onStart: =>
-              @attachmentPlaceholder.addClass('hide')
-              @attachmentUpload.removeClass('hide')
-              @cancelContainer.removeClass('hide')
-              item.find('[contenteditable]').trigger('fileUploadStart')
-              App.Log.debug 'UiElement.richtext', 'upload start'
+          onFileCompletedCallback: (response) ->
+            renderFile(response.data)
+            item.find('input').val('')
+            item.find('[contenteditable]').trigger('fileUploadStop', ['completed'])

-            onAborted: =>
-              @attachmentPlaceholder.removeClass('hide')
-              @attachmentUpload.addClass('hide')
-              item.find('input').val('')
-              item.find('[contenteditable]').trigger('fileUploadStop', ['aborted'])
+          onFileAbortedCallback: ->
+            item.find('input').val('')
+            item.find('[contenteditable]').trigger('fileUploadStop', ['aborted'])

-            # Called after received response from the server
-            onCompleted: (response) =>
-              response = JSON.parse(response)
+          attachmentPlaceholder: item.find('.attachmentPlaceholder')
+          attachmentUpload:      item.find('.attachmentUpload')
+          progressBar:           item.find('.attachmentUpload-progressBar')
+          progressText:          item.find('.js-percentage')
+        )

-              @attachmentPlaceholder.removeClass('hide')
-              @attachmentUpload.addClass('hide')
-
-              # reset progress bar
-              @progressBar.width(parseInt(0) + '%')
-              @progressText.text('')
-
-              renderFile(response.data)
-              item.find('input').val('')
-              item.find('[contenteditable]').trigger('fileUploadStop', ['completed'])
-              App.Log.debug 'UiElement.richtext', 'upload complete', response.data
-
-            # Called during upload progress, first parameter
-            # is decimal value from 0 to 100.
-            onProgress: (progress, fileSize, uploadedBytes) =>
-              @progressBar.width(parseInt(progress) + '%')
-              @progressText.text(parseInt(progress))
-              # hide cancel on 90%
-              if parseInt(progress) >= 90
-                @cancelContainer.addClass('hide')
-              App.Log.debug 'UiElement.richtext', 'uploadProgress ', parseInt(progress)
-
-          )
-      )
-      App.Delay.set(u, 100, undefined, 'form_upload')
+        uploader.render()
+      , 100, undefined, 'form_upload')

    item

--- a/app/assets/javascripts/app/controllers/_ui_element/sla_times.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/sla_times.coffee
@ -8,9 +8,11 @@ class App.UiElement.sla_times
    item = $( App.view('generic/sla_times')(
      attribute: attribute
      first_response_time: params.first_response_time
+      response_time: params.response_time
      update_time: params.update_time
      solution_time: params.solution_time
      first_response_time_in_text: @toText(params.first_response_time)
+      response_time_in_text: @toText(params.response_time)
      update_time_in_text: @toText(params.update_time)
      solution_time_in_text: @toText(params.solution_time)
    ) )
@ -26,12 +28,16 @@ class App.UiElement.sla_times
      row = element.closest('tr')
      if element.prop('checked')
        row.addClass('is-active')
+
+        if row.has('.js-updateTypeSelector').length > 0 && row.has('.js-updateTypeSelector:checked').length == 0
+          row.find('.js-updateTypeSelector:first').prop('checked', true)
      else
        row.removeClass('is-active')

        # reset data item
        row.find('.js-timeConvertFrom').val('')
        row.find('.js-timeConvertTo').val('')
+        row.find('.js-updateTypeSelector').attr('checked', false)
        row.find('.help-inline').empty()
        row.removeClass('has-error')
    )
@ -42,12 +48,16 @@ class App.UiElement.sla_times
      inText = element.val()

      row = element.closest('tr')
-      row.find('.js-activateRow').prop('checked', true)
+
+      row
+        .find('.js-activateRow')
+        .prop('checked', true)
+        .trigger('change')
+
      row.addClass('is-active')

-      element
-        .closest('td')
-        .find('.js-timeConvertTo')
+      row
+        .find("[name='#{element.data('name')}']")
        .val(@toMinutes(inText) || '')
    )

@ -56,9 +66,19 @@ class App.UiElement.sla_times
      $(e.currentTarget).closest('tr').find('.checkbox-replacement').click()
    )

+    # toggle update type on clicking around the element
+    item.find('.js-forward-radio').bind('click', (e) ->
+      elem = $(e.currentTarget).closest('p').find('.js-updateTypeSelector')
+
+      elem.prop('checked', true)
+      elem.trigger('change')
+    )
+
    # focus time input on clicking surrounding cell
    item.find('.js-focus-input').bind('click', (e) ->
-      $(e.currentTarget).find('.form-control').focus()
+      $(e.currentTarget)
+        .find('.form-control:visible')
+        .focus()
    )

    # show placeholder instead of 00:00
@ -67,15 +87,36 @@ class App.UiElement.sla_times
        $(e.currentTarget).val('')
    )

+    # switch update/response times when type is selected accordingly
+    item.find('.js-updateTypeSelector').bind('change', (e) ->
+      element = $(e.target)
+      row = element.closest('tr')
+      row.find('.js-activateRow').prop('checked', true)
+      row.addClass('is-active')
+
+      row
+        .find('.js-timeConvertFrom')
+        .addClass('hidden')
+        .val('')
+
+      row
+        .find('.js-timeConvertTo')
+        .val('')
+
+      row
+        .find("[data-name='#{element.val()}_time']")
+        .removeClass('hidden')
+    )
+
    # set initial active/inactive rows
    item.find('.js-timeConvertFrom').each(->
      row = $(@).closest('tr')
      checkbox = row.find('.js-activateRow')
-      if $(@).val()
-        checkbox.prop('checked', true)
-        row.addClass('is-active')
-      else
-        checkbox.prop('checked', false)
+
+      return if !$(@).val()
+
+      checkbox.prop('checked', true)
+      row.addClass('is-active')
    )

    item
--- a/app/assets/javascripts/app/controllers/_ui_element/textarea.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/textarea.coffee
@ -4,16 +4,17 @@ class App.UiElement.textarea
    fileUploaderId = 'file-uploader-' + new Date().getTime() + '-' + Math.floor( Math.random() * 99999 )
    item = $( App.view('generic/textarea')( attribute: attribute ) + '<div class="file-uploader ' + attribute.class + '" id="' + fileUploaderId + '"></div>' )

-    a = ->
-      visible = $( item[0] ).is(':visible')
-      if visible && !$( item[0] ).expanding('active')
-        $( item[0] ).expanding()
-      $( item[0] ).on('focus', ->
+    if attribute.expanding isnt false
+      a = ->
        visible = $( item[0] ).is(':visible')
        if visible && !$( item[0] ).expanding('active')
-          $( item[0] ).expanding().focus()
-      )
-    App.Delay.set(a, 80)
+          $( item[0] ).expanding()
+        $( item[0] ).on('focus', ->
+          visible = $( item[0] ).is(':visible')
+          if visible && !$( item[0] ).expanding('active')
+            $( item[0] ).expanding().focus()
+        )
+      App.Delay.set(a, 80)

    if attribute.upload

@ -41,4 +42,4 @@ class App.UiElement.textarea
            debug: false
          )
      App.Delay.set(u, 100, undefined, 'form_upload')
-    item
+    item
--- a/app/assets/javascripts/app/controllers/agent_ticket_create.coffee
+++ b/app/assets/javascripts/app/controllers/agent_ticket_create.coffee
@ -8,7 +8,7 @@ class App.TicketCreate extends App.Controller
  events:
    'click .type-tabs .tab':   'changeFormType'
    'submit form':             'submit'
-    'click .js-cancel':        'cancel'
+    'click .form-controls .js-cancel':        'cancel'
    'click .js-active-toggle': 'toggleButton'

  types: {
@ -48,12 +48,15 @@ class App.TicketCreate extends App.Controller
    if @ticket_id && @article_id
      @split = "/#{@ticket_id}/#{@article_id}"

-    load = (data) =>
-      App.Collection.loadAssets(data.assets)
-      @formMeta = data.form_meta
-      @buildScreen(params)
-    @bindId = App.TicketCreateCollection.bind(load, false)
-    App.TicketCreateCollection.fetch()
+    @ajax(
+      type: 'GET'
+      url:  "#{@apiPath}/ticket_create"
+      processData: true
+      success: (data, status, xhr) =>
+        App.Collection.loadAssets(data.assets)
+        @formMeta = data.form_meta
+        @buildScreen(params)
+    )

    # rerender view, e. g. on langauge change
    @controllerBind('ui:rerender', =>
@ -69,9 +72,6 @@ class App.TicketCreate extends App.Controller
      @sidebarWidget.render(@params())
    )

-  release: =>
-    App.TicketCreateCollection.unbindById(@bindId)
-
  currentChannel: =>
    if !type
      type = @$('.type-tabs .tab.active').data('type')
@ -184,8 +184,11 @@ class App.TicketCreate extends App.Controller
    @controllerUnbind('ticket_create_rerender', (template) => @renderQueue(template))

  changed: =>
+    return true if @hasAttachments()
+
    formCurrent = @formParam( @$('.ticket-create') )
    diff = difference(@formDefault, formCurrent)
+
    return false if !diff || _.isEmpty(diff)
    return true

@ -279,8 +282,15 @@ class App.TicketCreate extends App.Controller
    return if !@formMeta
    App.QueueManager.run(@queueKey)

+  updateTaskManagerAttachments: (attribute, attachments) =>
+    taskData = App.TaskManager.get(@taskKey)
+    return if _.isEmpty(taskData)
+
+    taskData.attachments = attachments
+    App.TaskManager.update(@taskKey, taskData)
+
  render: (template = {}) ->
-    return if !@formMeta
+
    # get params
    params = @prefilledParams || {}
    if template && !_.isEmpty(template.options)
@ -322,17 +332,16 @@ class App.TicketCreate extends App.Controller
    handlers = @Config.get('TicketCreateFormHandler')

    @controllerFormCreateMiddle = new App.ControllerForm(
-      el:                      @$('.ticket-form-middle')
-      form_id:                 @formId
-      model:                   App.Ticket
-      screen:                  'create_middle'
-      handlersConfig:          handlers
-      filter:                  @formMeta.filter
-      formMeta:                @formMeta
-      params:                  params
-      noFieldset:              true
-      taskKey:                 @taskKey
-      rejectNonExistentValues: true
+      el:                       @$('.ticket-form-middle')
+      form_id:                  @formId
+      model:                    App.Ticket
+      screen:                   'create_middle'
+      handlersConfig:           handlers
+      formMeta:                 @formMeta
+      params:                   params
+      noFieldset:               true
+      taskKey:                  @taskKey
+      rejectNonExistentValues:  true
    )

    # tunnel events to make sure core workflow does know
@ -356,8 +365,6 @@ class App.TicketCreate extends App.Controller
      events:
        'change [name=customer_id]': @localUserInfo
      handlersConfig: handlersTunnel
-      filter:         @formMeta.filter
-      formMeta:       @formMeta
      autofocus:      true
      params:         params
      taskKey:        @taskKey
@ -373,6 +380,8 @@ class App.TicketCreate extends App.Controller
      handlersConfig: handlersTunnel
      params:  params
      taskKey: @taskKey
+      richTextUploadRenderCallback: @updateTaskManagerAttachments
+      richTextUploadDeleteCallback: @updateTaskManagerAttachments
    )
    @controllerFormCreateBottom = new App.ControllerForm(
      el:             @$('.ticket-form-bottom')
@ -380,8 +389,6 @@ class App.TicketCreate extends App.Controller
      model:          App.Ticket
      screen:         'create_bottom'
      handlersConfig: handlersTunnel
-      filter:         @formMeta.filter
-      formMeta:       @formMeta
      params:         params
      taskKey:        @taskKey
    )
@ -461,6 +468,9 @@ class App.TicketCreate extends App.Controller
  params: =>
    params = @formParam(@$('.main form'))

+  hasAttachments: =>
+    @$('.richtext .attachments .attachment').length > 0
+
  submit: (e) =>
    e.preventDefault()

@ -563,7 +573,7 @@ class App.TicketCreate extends App.Controller
    # save ticket, create article
    # check attachment
    if article['body']
-      if @$('.richtext .attachments .attachment').length < 1
+      if !@hasAttachments()
        matchingWord = App.Utils.checkAttachmentReference(article['body'])
        if matchingWord
          if !confirm(App.i18n.translateContent('You use %s in text but no attachment is attached. Do you want to continue?', matchingWord))
--- a/app/assets/javascripts/app/controllers/agent_ticket_create/form_handler_signature.coffee
+++ b/app/assets/javascripts/app/controllers/agent_ticket_create/form_handler_signature.coffee
@ -1,4 +1,4 @@
-class TicketCreateFormHanderSignature
+class TicketCreateFormHandlerSignature

  @run: (params, attribute, attributes, classname, form, ui) ->
    return if !attribute
@ -19,10 +19,7 @@ class TicketCreateFormHanderSignature
        if App.Utils.signatureCheck(currentBody.html() || '', signatureFinished)

          # if signature has changed, in case remove old signature
-          signature_id = ui.el.closest('.content').find('[data-signature=true]').data('signature-id')
-          if signature_id && signature_id.toString() isnt signature.id.toString()
-
-            ui.el.closest('.content').find('[data-signature="true"]').remove()
+          ui.el.closest('.content').find('[data-signature="true"]').remove()

          if !App.Utils.htmlLastLineEmpty(currentBody)
            currentBody.append('<br><br>')
@ -35,4 +32,4 @@ class TicketCreateFormHanderSignature
    else
      ui.el.closest('.content').find('[data-name="body"]').find('[data-signature=true]').remove()

-App.Config.set('200-ticketFormSignature', TicketCreateFormHanderSignature, 'TicketCreateFormHandler')
+App.Config.set('200-ticketFormSignature', TicketCreateFormHandlerSignature, 'TicketCreateFormHandler')
--- a/app/assets/javascripts/app/controllers/core_workflow.coffee
+++ b/app/assets/javascripts/app/controllers/core_workflow.coffee
@ -1,6 +1,6 @@
 class CoreWorkflow extends App.ControllerSubContent
  requiredPermission: 'admin.core_workflow'
-  header: 'Core Workflow'
+  header: 'Core Workflows'
  constructor: ->
    super

@ -54,4 +54,4 @@ class CoreWorkflow extends App.ControllerSubContent
    }
    return mapping[screen] || screen

-App.Config.set('CoreWorkflowObject', { prio: 1750, parent: '#system', name: 'Core Workflow', target: '#system/core_workflow', controller: CoreWorkflow, permission: ['admin.core_workflow'] }, 'NavBarAdmin')
+App.Config.set('CoreWorkflowObject', { prio: 1750, parent: '#system', name: 'Core Workflows', target: '#system/core_workflow', controller: CoreWorkflow, permission: ['admin.core_workflow'] }, 'NavBarAdmin')
--- a/app/assets/javascripts/app/controllers/customer_ticket_create.coffee
+++ b/app/assets/javascripts/app/controllers/customer_ticket_create.coffee
@ -13,13 +13,7 @@ class CustomerTicketCreate extends App.ControllerAppContent
    @form_id = App.ControllerForm.formId()

    @navupdate '#customer_ticket_new'
-
-    load = (data) =>
-      App.Collection.loadAssets(data.assets)
-      @formMeta = data.form_meta
-      @render()
-    @bindId = App.TicketCreateCollection.bind(load, false)
-    App.TicketCreateCollection.fetch()
+    @render()

  render: (template = {}) ->
    if !@Config.get('customer_ticket_create')
@ -43,8 +37,6 @@ class CustomerTicketCreate extends App.ControllerAppContent
      form_id:                 @form_id
      model:                   App.Ticket
      screen:                  'create_middle'
-      filter:                  @formMeta.filter
-      formMeta:                @formMeta
      params:                  defaults
      noFieldset:              true
      handlersConfig:          handlers
@ -70,8 +62,6 @@ class CustomerTicketCreate extends App.ControllerAppContent
      model:          App.Ticket
      screen:         'create_top'
      handlersConfig: handlersTunnel
-      filter:         @formMeta.filter
-      formMeta:       @formMeta
      autofocus:      true
      params:         defaults
    )
@ -83,8 +73,6 @@ class CustomerTicketCreate extends App.ControllerAppContent
      events:
        'fileUploadStart .richtext': => @submitDisable()
        'fileUploadStop .richtext': => @submitEnable()
-      filter:         @formMeta.filter
-      formMeta:       @formMeta
      params:         defaults
      handlersConfig: handlersTunnel
    )
@ -95,8 +83,6 @@ class CustomerTicketCreate extends App.ControllerAppContent
        model:          App.Ticket
        screen:         'create_bottom'
        handlersConfig: handlersTunnel
-        filter:         @formMeta.filter
-        formMeta:       @formMeta
        params:         defaults
      )

--- a/app/assets/javascripts/app/controllers/getting_started/channel_email.coffee
+++ b/app/assets/javascripts/app/controllers/getting_started/channel_email.coffee
@ -91,20 +91,7 @@ class GettingStartedChannelEmail extends App.ControllerWizardFullScreen
      ui.hide('options::folder')
      ui.hide('options::keep_on_server')

-    handlePort = (params, attribute, attributes, classname, form, ui) ->
-      return if !params
-      return if !params.options
-      currentPort = @$('.base-inbound-settings [name="options::port"]').val()
-      if params.options.ssl is true
-        if !currentPort
-          @$('.base-inbound-settings [name="options::port"]').val('993')
-        return
-      if params.options.ssl is false
-        if !currentPort || currentPort is '993'
-          @$('.base-inbound-settings [name="options::port"]').val('143')
-        return
-
-    new App.ControllerForm(
+    form = new App.ControllerForm(
      el:    @$('.base-inbound-settings')
      model:
        configure_attributes: configureAttributesInbound
@ -112,10 +99,16 @@ class GettingStartedChannelEmail extends App.ControllerWizardFullScreen
      params: @account.inbound
      handlers: [
        showHideFolder,
-        handlePort,
      ]
    )

+    form.el.find("select[name='options::ssl']").off('change').on('change', (e) ->
+      if $(e.target).val() is 'true'
+        form.el.find("[name='options::port']").val('993')
+      else
+        form.el.find("[name='options::port']").val('143')
+    )
+
  toggleOutboundAdapter: =>

    # fill user / password based on intro info
--- a/app/assets/javascripts/app/controllers/import_freshdesk.coffee
+++ b/app/assets/javascripts/app/controllers/import_freshdesk.coffee
@ -165,7 +165,7 @@ class ImportFreshdesk extends App.ControllerWizardFullScreen
          @$('.js-error').addClass('hide')

        if !_.isEmpty(data.finished_at) && _.isEmpty(data.result['error'])
-          window.location.reload()
+          @redirectToLogin()
          return

        if !_.isEmpty(data.result)
--- a/app/assets/javascripts/app/controllers/import_zendesk.coffee
+++ b/app/assets/javascripts/app/controllers/import_zendesk.coffee
@ -163,7 +163,7 @@ class ImportZendesk extends App.ControllerWizardFullScreen
          @$('.js-error').addClass('hide')

        if !_.isEmpty(data.finished_at) && _.isEmpty(data.result['error'])
-          window.location.reload()
+          @redirectToLogin()
          return

        if !_.isEmpty(data.result)
--- a/app/assets/javascripts/app/controllers/knowledge_base/public_menu_manager.coffee
+++ b/app/assets/javascripts/app/controllers/knowledge_base/public_menu_manager.coffee
@ -27,11 +27,13 @@ class App.KnowledgeBasePublicMenuManager extends App.Controller
      {
        headline: 'Header menu',
        identifier: 'header',
-        color:      kb.color_header
+        color:      kb.color_header,
+        color_link: kb.color_header_link
      },
      {
        headline: 'Footer menu',
-        identifier: 'footer'
+        identifier: 'footer',
+        color_link: 'hsl(207,12%,50%)'
      }
    ]

--- a/app/assets/javascripts/app/controllers/object_manager.coffee
+++ b/app/assets/javascripts/app/controllers/object_manager.coffee
@ -247,8 +247,6 @@ class Edit extends App.ControllerGenericEdit
      #if attribute.name is 'data_type'
      #  attribute.disabled = true

-    console.log('configure_attributes', configure_attributes)
-
    @controller = new App.ControllerForm(
      model:
        configure_attributes: configure_attributes
--- a/app/assets/javascripts/app/controllers/organization_profile.coffee
+++ b/app/assets/javascripts/app/controllers/organization_profile.coffee
@ -153,7 +153,7 @@ class Object extends App.ControllerObserver
      elLocal.find('.js-userList').html(members)
    )

-    if @organization.member_ids.length < @memberLimit
+    if @organization.member_ids.length <= @memberLimit
      @el.find('.js-showMoreMembers').parent().addClass('hidden')
    else
      @el.find('.js-showMoreMembers').parent().removeClass('hidden')
@ -202,7 +202,7 @@ class Object extends App.ControllerObserver
    value = $(e.target).html()
    org   = App.Organization.find(@object_id)
    if org[name] isnt value
-      @lastAttributres[name] = value
+      @lastAttributes[name] = value
      data = {}
      data[name] = value
      org.updateAttributes(data)
--- a/app/assets/javascripts/app/controllers/report.coffee
+++ b/app/assets/javascripts/app/controllers/report.coffee
@ -171,6 +171,13 @@ class Graph extends App.Controller
        backends:  @params.backendSelected
      )
      processData: true
+      error:       (xhr) =>
+        return if !_.include([401, 403, 404, 422, 502], xhr.status)
+
+        @bodyModal = new App.ControllerTechnicalErrorModal(
+          head:        'Cannot generate report'
+          contentCode: xhr.responseJSON.error
+        )
      success: (data) =>
        @update(data)
        @delay(@render, interval, 'report-update', 'page')
--- a/app/assets/javascripts/app/controllers/search.coffee
+++ b/app/assets/javascripts/app/controllers/search.coffee
@ -56,13 +56,9 @@ class App.Search extends App.Controller
    @navupdate(url: '#search', type: 'menu')
    return if _.isEmpty(params.query)

-    @$('.js-search').val(params.query).trigger('change')
-    return if @shown
-
-    @search(1000, true)
+    @$('.js-search').val(params.query).trigger('keyup')

  hide: ->
-    @shown = false
    if @table
      @table.hide()

@ -108,6 +104,7 @@ class App.Search extends App.Controller
      return

    # on other keys, show result
+    @navigate "#search/#{encodeURIComponent(@searchInput.val())}"
    @search(0)

  empty: =>
--- a/app/assets/javascripts/app/controllers/sla.coffee
+++ b/app/assets/javascripts/app/controllers/sla.coffee
@ -26,12 +26,6 @@ class Sla extends App.ControllerSubContent
      sortBy: 'name'
    )
    for sla in slas
-      if sla.first_response_time
-        sla.first_response_time_in_text = @toText(sla.first_response_time)
-      if sla.update_time
-        sla.update_time_in_text = @toText(sla.update_time)
-      if sla.solution_time
-        sla.solution_time_in_text = @toText(sla.solution_time)
      sla.rules = App.UiElement.ticket_selector.humanText(sla.condition)
      sla.calendar = App.Calendar.find(sla.calendar_id)

@ -95,21 +89,8 @@ class Sla extends App.ControllerSubContent

  description: (e) =>
    new App.ControllerGenericDescription(
-      description: App.Calendar.description
+      description: App.Sla.description
      container:   @el.closest('.content')
    )

-  toText: (m) ->
-    m = parseInt(m)
-    return if !m
-    minutes = m % 60
-    hours = Math.floor(m / 60)
-
-    if minutes < 10
-      minutes = "0#{minutes}"
-    if hours < 10
-      hours = "0#{hours}"
-
-    "#{hours}:#{minutes}"
-
 App.Config.set('Sla', { prio: 2900, name: 'SLAs', parent: '#manage', target: '#manage/slas', controller: Sla, permission: ['admin.sla'] }, 'NavBarAdmin')
--- a/app/assets/javascripts/app/controllers/ticket_overview.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_overview.coffee
@ -206,22 +206,13 @@ class App.TicketOverview extends App.Controller
          article: article
        )
        ticket.article = article
-        ticket.ajax().update(
-          ticket.attributes()
-          # this option will prevent callbacks and invalid data states in case of an error
-          failResponseNoTrigger: true
+        ticket.save(
          done: (r) =>
            @batchCountIndex++

            # refresh view after all tickets are proceeded
            if @batchCountIndex == @batchCount
              App.Event.trigger('overview:fetch')
-          fail: (record, settings, details) ->
-            console.log('record, settings, details', record, settings, details)
-            App.Event.trigger('notify', {
-              type: 'error'
-              msg: App.i18n.translateContent('Bulk action stopped %s!', error)
-            })
        )
      return

@ -234,21 +225,13 @@ class App.TicketOverview extends App.Controller
        ticket.owner_id = id
        if !_.isEmpty(groupId)
          ticket.group_id = groupId
-        ticket.ajax().update(
-          ticket.attributes()
-          # this option will prevent callbacks and invalid data states in case of an error
-          failResponseNoTrigger: true
+        ticket.save(
          done: (r) =>
            @batchCountIndex++

            # refresh view after all tickets are proceeded
            if @batchCountIndex == @batchCount
              App.Event.trigger('overview:fetch')
-          fail: (record, settings, details) ->
-            App.Event.trigger('notify', {
-              type: 'error'
-              msg: App.i18n.translateContent('Bulk action stopped %s!', settings.error)
-            })
        )
      return

@ -259,21 +242,13 @@ class App.TicketOverview extends App.Controller
        #console.log "perform action #{action} with id #{id} on ", $(item).val()
        ticket = App.Ticket.find($(item).val())
        ticket.group_id = id
-        ticket.ajax().update(
-          ticket.attributes()
-          # this option will prevent callbacks and invalid data states in case of an error
-          failResponseNoTrigger: true
+        ticket.save(
          done: (r) =>
            @batchCountIndex++

            # refresh view after all tickets are proceeded
            if @batchCountIndex == @batchCount
              App.Event.trigger('overview:fetch')
-          fail: (record, settings, details) ->
-            App.Event.trigger('notify', {
-              type: 'error'
-              msg: App.i18n.translateContent('Bulk action stopped %s!', error)
-            })
        )
      return

@ -1314,7 +1289,7 @@ class Table extends App.Controller
    return if ticketListShow[0] || @permissionCheck('ticket.agent')

    tickets_count = user.lifetimeCustomerTicketsCount()
-    @html App.view('customer_not_ticket_exists')(has_any_tickets: tickets_count > 0)
+    @html App.view('customer_not_ticket_exists')(has_any_tickets: tickets_count > 0, is_allowed_to_create_ticket: @Config.get('customer_ticket_create'))

    if tickets_count == 0
      @listenTo user, 'refresh', =>
--- a/app/assets/javascripts/app/controllers/ticket_zoom.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom.coffee
@ -200,10 +200,10 @@ class App.TicketZoom extends App.Controller
    formMeta   = data.form_meta

    # on the following states we want to rerender the ticket:
-    # - if the object attribute configuration has changed (attribute values, restrictions, filters)
+    # - if the object attribute configuration has changed (attribute values, dependecies, filters)
    # - if the user view has changed (agent/customer)
    # - if the ticket permission has changed (read/write/full)
-    if @view && ( !_.isEqual(@formMeta, formMeta) || @view isnt view || @readable isnt readable || @changeable isnt changeable || @fullable isnt fullable )
+    if @view && ( !_.isEqual(@formMeta.configure_attributes, formMeta.configure_attributes) || !_.isEqual(@formMeta.dependencies, formMeta.dependencies) || !_.isEqual(@formMeta.filter, formMeta.filter) || @view isnt view || @readable isnt readable || @changeable isnt changeable || @fullable isnt fullable )
      @renderDone = false

    @view       = view
@ -214,6 +214,7 @@ class App.TicketZoom extends App.Controller

    # render page
    @render(local)
+    App.Event.trigger('ui::ticket::load', data)

  meta: =>

@ -492,16 +493,22 @@ class App.TicketZoom extends App.Controller
      @form_id = @taskGet('article').form_id || App.ControllerForm.formId()

      @articleNew = new App.TicketZoomArticleNew(
-        ticket:                  @ticket
-        ticket_id:               @ticket_id
-        el:                      elLocal.find('.article-new')
-        formMeta:                @formMeta
-        form_id:                 @form_id
-        defaults:                @taskGet('article')
-        taskKey:                 @taskKey
-        ui:                      @
-        callbackFileUploadStart: @submitDisable
-        callbackFileUploadStop:  @submitEnable
+        ticket:                       @ticket
+        ticket_id:                    @ticket_id
+        el:                           elLocal.find('.article-new')
+        formMeta:                     @formMeta
+        form_id:                      @form_id
+        defaults:                     @taskGet('article')
+        taskKey:                      @taskKey
+        ui:                           @
+        richTextUploadStartCallback:  @submitDisable
+        richTextUploadRenderCallback: (attachments) =>
+          @submitEnable()
+          @taskUpdateAttachments('article', attachments)
+          @delay(@markForm, 250, 'ticket-zoom-form-update')
+        richTextUploadDeleteCallback: (attachments) =>
+          @taskUpdateAttachments('article', attachments)
+          @delay(@markForm, 250, 'ticket-zoom-form-update')
      )

      @highligher = new App.TicketZoomHighlighter(
@ -640,6 +647,7 @@ class App.TicketZoom extends App.Controller
    # update changes in ui
    currentStore = @currentStore()
    modelDiff = @formDiff(currentParams, currentStore)
+    return if _.isEmpty(modelDiff)

    # set followup state if needed
    @setDefaultFollowUpState(modelDiff, currentStore)
@ -719,7 +727,7 @@ class App.TicketZoom extends App.Controller
    # add attachments if exist
    attachmentCount = @$('.article-add .textBubble .attachments .attachment').length
    if attachmentCount > 0
-      currentParams.article.attachments = true
+      currentParams.article.attachments = attachmentCount
    else
      delete currentParams.article.attachments

@ -734,6 +742,14 @@ class App.TicketZoom extends App.Controller

    # do not compare null or undefined value
    if currentStore.ticket
+
+      # make sure that the compared state is same in local storage and
+      # rendered html. Else we could have race conditions of data
+      # which is not rendered yet
+      renderedUpdatedAt = @el.find('.edit').attr('data-ticket-updated-at')
+      return if !renderedUpdatedAt
+      return if currentStore.ticket.updated_at.toString() isnt renderedUpdatedAt
+
      for key, value of currentStore.ticket
        if value is null || value is undefined
          currentStore.ticket[key] = ''
@ -968,15 +984,14 @@ class App.TicketZoom extends App.Controller
      processData: true
      success: (data) =>

-        #App.SessionStorage.set(@key, data)
-        @load(data, true, true)
-
        # reset article - should not be resubmitted on next ticket update
        ticket.article = undefined

        # reset form after save
        @reset()

+        @load(data, false, true)
+
        if @sidebarWidget
          @sidebarWidget.commit()

@ -1069,6 +1084,13 @@ class App.TicketZoom extends App.Controller

    App.TaskManager.update(@taskKey, taskData)

+  taskUpdateAttachments: (area, attachments) =>
+    taskData = App.TaskManager.get(@taskKey)
+    return if !taskData
+
+    taskData.attachments = attachments
+    App.TaskManager.update(@taskKey, taskData)
+
  taskUpdateAll: (data) =>
    @localTaskData = data
    @localTaskData.article['form_id'] = @form_id
@ -1091,7 +1113,7 @@ class App.TicketZoom extends App.Controller
    @localTaskData =
      ticket:  {}
      article: {}
-    App.TaskManager.update(@taskKey, { 'state': @localTaskData })
+    App.TaskManager.update(@taskKey, { 'state': @localTaskData, attachments: [] })

  renderOverviewNavigator: (parentEl) ->
    new App.TicketZoomOverviewNavigator(
--- a/app/assets/javascripts/app/controllers/ticket_zoom/article_action/email_reply.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/email_reply.coffee
@ -257,7 +257,7 @@ class EmailReply extends App.Controller

    quote_header = App.FullQuoteHeader.fullQuoteHeaderForward(article)

-    body = "<br/><div>---Begin forwarded message:---<br/><br/></div><div><blockquote type=\"cite\">#{quote_header}#{body}</blockquote></div><div><br></div>"
+    body = "<br/><div>---#{App.i18n.translateInline('Begin forwarded message')}:---<br/><br/></div><div><blockquote type=\"cite\">#{quote_header}#{body}</blockquote></div><div><br></div>"

    articleNew = {}
    articleNew.body = body
--- a/app/assets/javascripts/app/controllers/ticket_zoom/article_action/internal.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/internal.coffee
@ -24,7 +24,7 @@ class Internal
    internal = true
    if article.internal == true
      internal = false
-    ui.lastAttributres.internal = internal
+    ui.lastAttributes.internal = internal
    article.updateAttributes(internal: internal)

    # runtime update
--- a/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee
@ -98,7 +98,7 @@ class App.TicketZoomArticleNew extends App.Controller
    @controllerBind('ui:rerender', =>
      @adjustedTextarea = false
      @defaults         = @ui.taskGet('article')
-      @attachments      = @defaults.attachments
+      @attachments      = @defaults.attachments || []
      @render()
    )

@ -117,7 +117,7 @@ class App.TicketZoomArticleNew extends App.Controller

    @tokanice(@type)

-    if @defaults.body or @isIE10()
+    if @defaults.body or @attachments.length > 0 or @isIE10()
      @openTextarea(null, true)

  tokanice: (type = 'email') ->
@ -191,82 +191,30 @@ class App.TicketZoomArticleNew extends App.Controller
      maxlength: 150000
    })

-    html5Upload.initialize(
-      uploadUrl:       "#{App.Config.get('api_path')}/upload_caches/#{@form_id}"
-      dropContainer:   @$('.article-add').get(0)
-      cancelContainer: @cancelContainer
-      inputField:      @$('.article-attachment input').get(0)
-      key:             'File'
-      maxSimultaneousUploads: 1
-      onFileAdded:            (file) =>
+    new App.Html5Upload(
+      uploadUrl:              "#{App.Config.get('api_path')}/upload_caches/#{@form_id}"
+      dropContainer:          @$('.article-add')
+      cancelContainer:        @cancelContainer
+      inputField:             @$('.article-attachment input')

-        file.on(
+      onFileStartCallback: =>
+        @richTextUploadStartCallback?()

-          onStart: =>
-            @attachmentPlaceholder.addClass('hide')
-            @attachmentUpload.removeClass('hide')
-            @cancelContainer.removeClass('hide')
+      onFileCompletedCallback: (response) =>
+        @attachments.push response.data
+        @renderAttachment(response.data)
+        @$('.article-attachment input').val('')

-            if @callbackFileUploadStart
-              @callbackFileUploadStart()
+        @richTextUploadRenderCallback?(@attachments)

-          onAborted: =>
-            @attachmentPlaceholder.removeClass('hide')
-            @attachmentUpload.addClass('hide')
-            @$('.article-attachment input').val('')
+      onFileAbortedCallback: =>
+        @richTextUploadRenderCallback?(@attachments)

-            if @callbackFileUploadStop
-              @callbackFileUploadStop()
-
-          # Called after received response from the server
-          onCompleted: (response) =>
-
-            response = JSON.parse(response)
-            @attachments.push response.data
-
-            @attachmentPlaceholder.removeClass('hide')
-            @attachmentUpload.addClass('hide')
-
-            # reset progress bar
-            @progressBar.width(parseInt(0) + '%')
-            @progressText.text('')
-
-            @renderAttachment(response.data)
-            @$('.article-attachment input').val('')
-
-            if @callbackFileUploadStop
-              @callbackFileUploadStop()
-
-          # Called during upload progress, first parameter
-          # is decimal value from 0 to 100.
-          onProgress: (progress, fileSize, uploadedBytes) =>
-            @progressBar.width(parseInt(progress) + '%')
-            @progressText.text(parseInt(progress))
-            # hide cancel on 90%
-            if parseInt(progress) >= 90
-              @cancelContainer.addClass('hide')
-
-          # Called when upload failed
-          onError: (message) =>
-            @attachmentPlaceholder.removeClass('hide')
-            @attachmentUpload.addClass('hide')
-            @$('.article-attachment input').val('')
-
-            if @callbackFileUploadStop
-              @callbackFileUploadStop()
-
-            new App.ControllerModal(
-              head: 'Upload Failed'
-              buttonCancel: 'Cancel'
-              buttonCancelClass: 'btn--danger'
-              buttonSubmit: false
-              message: message
-              shown: true
-              small: true
-              container: @el.closest('.content')
-            )
-        )
-    )
+      attachmentPlaceholder: @attachmentPlaceholder
+      attachmentUpload:      @attachmentUpload
+      progressBar:           @progressBar
+      progressText:          @progressText
+    ).render()

    @bindAttachmentDelete()

@ -339,7 +287,6 @@ class App.TicketZoomArticleNew extends App.Controller
      params.preferences ||= {}
      params.preferences.security = @paramsSecurity()

-    params.attachments = @attachments
    params

  validate: =>
@ -676,6 +623,8 @@ class App.TicketZoomArticleNew extends App.Controller
      $(e.currentTarget).closest('.attachment').remove()
      if element.find('.attachment').length == 0
        element.empty()
+
+      @richTextUploadDeleteCallback?(@attachments)
    )

  actions: ->
--- a/app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee
@ -218,11 +218,11 @@ class ArticleViewItem extends App.ControllerObserver
    )

    @articleActions = new App.TicketZoomArticleActions(
-      el:              @$('.js-article-actions')
-      ticket:          @ticket
-      article:         article
-      lastAttributres: @lastAttributres
-      form_id:         @form_id
+      el:             @$('.js-article-actions')
+      ticket:         @ticket
+      article:        article
+      lastAttributes: @lastAttributes
+      form_id:        @form_id
    )

    # set see more
@ -305,34 +305,38 @@ class ArticleViewItem extends App.ControllerObserver
    e.stopPropagation()

    article_id = $(e.target).closest('.ticket-article-item').data('id')
+    article    = App.TicketArticle.find(article_id)

    @ajax(
      id:   'retrySecurityProcess'
      type: 'POST'
      url:  "#{@apiPath}/ticket_articles/#{article_id}/retry_security_process"
      processData: true
-      success: (data, status, xhr) =>
-        if data.sign.success
-          @notify
-            type: 'success'
-            msg:  App.i18n.translateContent('Verify sign success!')
-        else if data.sign.comment
-          comment = App.i18n.translateContent('Verify sign failed!') + ' ' + App.i18n.translateContent(data.sign.comment || '')
-          @notify
-            type: 'error'
-            msg: comment
-            timeout: 2000
+      success: (encryption_data, status, xhr) =>
+        for data in encryption_data
+          continue if article.preferences.security.type isnt data.type

-        if data.encryption.success
-          @notify
-            type: 'success'
-            msg:  App.i18n.translateContent('Decryption success!')
-        else if data.encryption.comment
-          comment = App.i18n.translateContent('Decryption failed!') + ' ' + App.i18n.translateContent(data.encryption.comment || '')
-          @notify
-            type: 'error'
-            msg:  comment
-            timeout: 2000
+          if data.sign.success
+            @notify
+              type: 'success'
+              msg:  App.i18n.translateContent('Verify sign success!')
+          else if data.sign.comment
+            comment = App.i18n.translateContent('Verify sign failed!') + ' ' + App.i18n.translateContent(data.sign.comment || '')
+            @notify
+              type: 'error'
+              msg: comment
+              timeout: 2000
+
+          if data.encryption.success
+            @notify
+              type: 'success'
+              msg:  App.i18n.translateContent('Decryption success!')
+          else if data.encryption.comment
+            comment = App.i18n.translateContent('Decryption failed!') + ' ' + App.i18n.translateContent(data.encryption.comment || '')
+            @notify
+              type: 'error'
+              msg:  comment
+              timeout: 2000

      error: (xhr) =>
        @notify
--- a/app/assets/javascripts/app/controllers/ticket_zoom/form_handler_core_workflow.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/form_handler_core_workflow.coffee
@ -79,6 +79,12 @@ class App.FormHandlerCoreWorkflow
    return if !App.WebSocket.channel()
    return !App.Config.get('core_workflow_ajax_mode')

+  @restrictValuesAttributeCache: (attribute, values) ->
+    result = { values: values }
+    return result if !attribute.relation
+    result.lastUpdatedAt = App[attribute.relation].lastUpdatedAt()
+    return result
+
  # restricts the dropdown and tree select values of a form
  @restrictValues: (classname, form, ui, attributes, params, data) ->
    return if _.isEmpty(data.restrict_values)
@ -111,15 +117,17 @@ class App.FormHandlerCoreWorkflow
        # cache state for performance and only run
        # if values or param differ
        if coreWorkflowRestrictions?[classname]?[item.name]
-          compare = values
+          compare = App.FormHandlerCoreWorkflow.restrictValuesAttributeCache(attribute, values)
          continue if _.isEqual(coreWorkflowRestrictions[classname][item.name], compare)

        coreWorkflowRestrictions[classname] ||= {}
-        coreWorkflowRestrictions[classname][item.name] = values
+        coreWorkflowRestrictions[classname][item.name] = App.FormHandlerCoreWorkflow.restrictValuesAttributeCache(attribute, values)

        valueFound = false
        for value in values
-          if value && paramValue
+
+          # false values are valid values e.g. for boolean fields (be careful)
+          if value isnt undefined && paramValue isnt undefined && value isnt null && paramValue isnt null
            if value.toString() == paramValue.toString()
              valueFound = true
              break
@ -131,6 +139,11 @@ class App.FormHandlerCoreWorkflow
        if valueFound
          item.default  = paramValue
          item.newValue = paramValue
+        else if params.id
+          obj = App[ui.model.className].find(params.id)
+          if obj && obj[item.name]
+            item.default  = obj[item.name]
+            item.newValue = obj[item.name]
        else
          item.default  = ''
          item.newValue = ''
@ -297,6 +310,11 @@ class App.FormHandlerCoreWorkflow
      screen: ui.screen
    }

+    # send last changed attribute only once for has changed condition
+    if ui.lastChangedAttribute
+      requestData.last_changed_attribute = ui.lastChangedAttribute
+      ui.lastChangedAttribute            = '-'
+
    if App.FormHandlerCoreWorkflow.useWebSockets()
      App.WebSocket.send(requestData)
    else
@ -322,8 +340,12 @@ class App.FormHandlerCoreWorkflow

    # get params and add id from ui if needed
    params = App.FormHandlerCoreWorkflow.cleanParams(params_ref)
-    if ui?.params?.id
+
+    # add object id for edit screens
+    if ui?.params?.id && ui.screen.match(/edit/)
      params.id = ui.params.id
+    else
+      delete params.id

    # skip double checks
    return if _.isEqual(coreWorkflowParams[classname], params)
--- a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_ticket.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_ticket.coffee
@ -1,12 +1,21 @@
-class Edit extends App.ControllerObserver
-  model: 'Ticket'
-  observeNot:
-    created_at: true
-    updated_at: true
-  globalRerender: false
+# No usage of a ControllerObserver here because we want to use
+# the data of the ticket zoom ajax request which is using the all=true parameter
+# and contain the core workflow information as well. Without observer we also
+# dont have double rendering because of the zoom (all=true) and observer (full=true) render callback
+class Edit extends App.Controller
+  constructor: (params) ->
+    super
+    @controllerBind('ui::ticket::load', (data) =>
+      return if data.ticket_id.toString() isnt @ticket.id.toString()

-  render: (ticket, diff) =>
-    defaults = ticket.attributes()
+      @ticket   = App.Ticket.find(@ticket.id)
+      @formMeta = data.form_meta
+      @render()
+    )
+    @render()
+
+  render: =>
+    defaults = @ticket.attributes()
    delete defaults.article # ignore article infos
    followUpPossible = App.Group.find(defaults.group_id).follow_up_possible
    ticketState = App.TicketState.find(defaults.state_id).name
@ -16,49 +25,44 @@ class Edit extends App.ControllerObserver

    if !_.isEmpty(taskState)
      defaults = _.extend(defaults, taskState)
+      # remove core workflow data because it should trigger a request to get data
+      # for the new ticket + eventually changed task state
+      @formMeta.core_workflow = undefined

-    if followUpPossible == 'new_ticket' && ticketState != 'closed' ||
-       followUpPossible != 'new_ticket' ||
-       @permissionCheck('admin') || ticket.currentView() is 'agent'
-      @controllerFormSidebarTicket = new App.ControllerForm(
-        elReplace:      @el
-        model:          { className: 'Ticket', configure_attributes: @formMeta.configure_attributes || App.Ticket.configure_attributes }
-        screen:         'edit'
-        handlersConfig: handlers
-        filter:         @formMeta.filter
-        formMeta:       @formMeta
-        params:         defaults
-        isDisabled:     !ticket.editable()
-        taskKey:        @taskKey
-        core_workflow: {
-          callbacks: [@markForm]
-        }
-        #bookmarkable:  true
-      )
-    else
-      @controllerFormSidebarTicket = new App.ControllerForm(
-        elReplace:      @el
-        model:          { className: 'Ticket', configure_attributes: @formMeta.configure_attributes || App.Ticket.configure_attributes }
-        screen:         'edit'
-        handlersConfig: handlers
-        filter:         @formMeta.filter
-        formMeta:       @formMeta
-        params:         defaults
-        isDisabled:     ticket.editable()
-        taskKey:        @taskKey
-        core_workflow: {
-          callbacks: [@markForm]
-        }
-        #bookmarkable:  true
-      )
+    editable = @ticket.editable()
+    if followUpPossible == 'new_ticket' && ticketState != 'closed' || followUpPossible != 'new_ticket' || @permissionCheck('admin') || @ticket.currentView() is 'agent'
+      editable = !editable

+    # reset updated_at for the sidbar because we render a new state
+    # it is used to compare the ticket with the rendered data later
+    # and needed to prevent race conditions
+    @el.removeAttr('data-ticket-updated-at')
+
+    @controllerFormSidebarTicket = new App.ControllerForm(
+      elReplace:      @el
+      model:          { className: 'Ticket', configure_attributes: @formMeta.configure_attributes || App.Ticket.configure_attributes }
+      screen:         'edit'
+      handlersConfig: handlers
+      filter:         @formMeta.filter
+      formMeta:       @formMeta
+      params:         defaults
+      isDisabled:     editable
+      taskKey:        @taskKey
+      core_workflow: {
+        callbacks: [@markForm]
+      }
+      #bookmarkable:  true
+    )
+
+    # set updated_at for the sidbar because we render a new state
+    @el.attr('data-ticket-updated-at', defaults.updated_at)
    @markForm(true)

    return if @resetBind
    @resetBind = true
    @controllerBind('ui::ticket::taskReset', (data) =>
-      return if data.ticket_id.toString() isnt ticket.id.toString()
-      @render(ticket)
+      return if data.ticket_id.toString() isnt @ticket.id.toString()
+      @render()
    )

 class SidebarTicket extends App.Controller
@ -128,6 +132,7 @@ class SidebarTicket extends App.Controller

    @edit = new Edit(
      object_id: @ticket.id
+      ticket:    @ticket
      el:        localEl.find('.edit')
      taskGet:   @taskGet
      formMeta:  @formMeta
--- a/app/assets/javascripts/app/controllers/ticket_zoom/title.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/title.coffee
@ -19,7 +19,7 @@ class App.TicketZoomTitle extends App.ControllerObserver
    title = $(e.target).ceg() || ''

    # update title
-    return if title is @lastAttributres.title
+    return if title is @lastAttributes.title
    ticket = App.Ticket.find(@object_id)
    ticket.title = title

--- a/app/assets/javascripts/app/controllers/user_profile.coffee
+++ b/app/assets/javascripts/app/controllers/user_profile.coffee
@ -220,7 +220,7 @@ class Object extends App.ControllerObserver
    value = $(e.target).html()
    user  = App.User.find(@object_id)
    if user[name] isnt value
-      @lastAttributres[name] = value
+      @lastAttributes[name] = value
      data = {}
      data[name] = value
      user.updateAttributes(data)
--- a/app/assets/javascripts/app/controllers/widget/organization.coffee
+++ b/app/assets/javascripts/app/controllers/widget/organization.coffee
@ -33,7 +33,7 @@ class App.WidgetOrganization extends App.Controller
      elLocal.find('.js-userList').html(members)
    )

-    if @organization.member_ids.length < @memberLimit
+    if @organization.member_ids.length <= @memberLimit
      @el.find('.js-showMoreMembers').parent().addClass('hidden')
    else
      @el.find('.js-showMoreMembers').parent().removeClass('hidden')
--- a/app/assets/javascripts/app/lib/app_post/_object_organization_autocompletion.coffee
+++ b/app/assets/javascripts/app/lib/app_post/_object_organization_autocompletion.coffee
@ -14,6 +14,7 @@ class App.ObjectOrganizationAutocompletion extends App.Controller
    'click':                                  'stopPropagation'
    'change .js-objectId':                    'executeCallback'
    'click .js-remove':                       'removeThisToken'
+    'click .js-showMoreMembers':              'showMoreMembers'

  elements:
    '.recipientList':   'recipientList'
@ -251,14 +252,42 @@ class App.ObjectOrganizationAutocompletion extends App.Controller
      objectCount: objectCount
    )

+  showMoreMembers: (e) ->
+    @preventDefaultAndStopPropagation(e)
+
+    memberElement  = $(e.target).closest('.js-showMoreMembers')
+    oldMemberLimit = memberElement.attr('organization-member-limit')
+    newMemberLimit = (parseInt(oldMemberLimit / 25) + 1) * 25
+    memberElement.attr('organization-member-limit', newMemberLimit)
+
+    @renderMembers(memberElement, oldMemberLimit, newMemberLimit)
+
+  renderMembers: (element, fromMemberLimit, toMemberLimit) ->
+    id           = element.closest('.recipientList-organizationMembers').attr('organization-id')
+    organization = App.Organization.find(id)
+
+    # only first 10 members else we would need more ajax requests
+    organization.members(fromMemberLimit, toMemberLimit, (users) =>
+      for user in users
+        element.before(@buildObjectItem(user))
+
+      if element.closest('ul').hasClass('is-shown')
+        @showOrganizationMembers(undefined, element.closest('ul'))
+    )
+
+    if organization.member_ids.length <= toMemberLimit
+      element.addClass('hidden')
+    else
+      element.removeClass('hidden')
+
  buildOrganizationMembers: (organization) =>
-    organizationMemebers = $( App.view(@templateOrganizationItemMembers)(
+    organizationMembers = $( App.view(@templateOrganizationItemMembers)(
      organization: organization
    ) )
-    if organization[@referenceAttribute]
-      for objectId in organization[@referenceAttribute]
-        object = App[@objectSingle].fullLocal(objectId)
-        organizationMemebers.append(@buildObjectItem(object))
+
+    @renderMembers(organizationMembers.find('.js-showMoreMembers'), 0, 10)
+
+    organizationMembers

  buildObjectItem: (object) =>
    icon = @objectIcon
@ -404,8 +433,7 @@ class App.ObjectOrganizationAutocompletion extends App.Controller
      e.stopPropagation()
      listEntry = $(e.currentTarget)

-    organizationId = listEntry.data('organization-id')
-
+    organizationId = listEntry.data('organization-id') || listEntry.attr('organization-id')
    @organizationList = @$("[organization-id=#{ organizationId }]")

    return if !@organizationList.get(0)
--- a/app/assets/javascripts/app/lib/app_post/ajax.coffee
+++ b/app/assets/javascripts/app/lib/app_post/ajax.coffee
@ -102,12 +102,18 @@ class _ajaxSingleton
      # do not show any error message with code 502
      return if status is 502

+      try
+        json = JSON.parse(detail)
+        text = json.error_human || json.error
+
+      text = detail if !text
+
+      escaped = App.Utils.htmlEscape(text)
+
      # show error message
-      new App.ControllerModal(
-        head:          "StatusCode: #{status}"
-        contentInline: "<pre>#{App.Utils.htmlEscape(detail)}</pre>"
-        buttonClose:   true
-        buttonSubmit:  false
+      new App.ControllerTechnicalErrorModal(
+        contentCode: escaped
+        head:        "StatusCode: #{status}"
      )
    )

--- a/app/assets/javascripts/app/lib/app_post/full_quote_header.coffee
+++ b/app/assets/javascripts/app/lib/app_post/full_quote_header.coffee
@ -28,7 +28,7 @@ class App.FullQuoteHeader

  @fullQuoteHeaderForwardTo: (article) ->
    if article.type.name is 'email' || article.type.name is 'web'
-      @fullQuoteHeaderEnsurePrivacy(article.to) || article.to
+      @fullQuoteHeaderEnsureMultiPrivacy(article.to)
    else if article.sender.name is 'Customer' && article.type.name is 'phone'
      if email_address_id = App.Group.findByAttribute('name', article.to)?.email_address_id
        App.EmailAddress.find(email_address_id).displayName()
@ -36,15 +36,17 @@ class App.FullQuoteHeader
        article.to
    else if article.sender.name is 'Agent' && article.type.name is 'phone'
      ticket = App.Ticket.find article.ticket_id
-      @fullQuoteHeaderEnsurePrivacy(ticket.customer_id) || @fullQuoteHeaderEnsurePrivacy(article.to) || article.to
+      @fullQuoteHeaderEnsurePrivacy(ticket.customer_id) || @fullQuoteHeaderEnsureMultiPrivacy(article.to)
    else
      article.to

  @fullQuoteHeaderForwardCC: (article) ->
-    return if !article.cc
+    @fullQuoteHeaderEnsureMultiPrivacy(article.cc)

-    article
-      .cc
+  @fullQuoteHeaderEnsureMultiPrivacy: (input) ->
+    return if !input
+
+    input
      .split(',')
      .map (elem) ->
        elem.trim()
--- a/app/assets/javascripts/app/lib/app_post/html5_upload.coffee
+++ b/app/assets/javascripts/app/lib/app_post/html5_upload.coffee
@ -0,0 +1,98 @@
+class App.Html5Upload extends App.Controller
+  uploadUrl:              null
+  maxSimultaneousUploads: 1
+  key:                    'File'
+  data:                   null
+
+  onFileStartCallback:     null
+  onFileCompletedCallback: null
+  onFileAbortedCallback:   null
+
+  dropContainer:         null
+  cancelContainer:       null
+  inputField:            null
+  attachmentPlaceholder: null
+  attachmentUpload:      null
+  progressBar:           null
+  progressText:          null
+
+  render: =>
+    html5Upload.initialize(
+      uploadUrl:              @uploadUrl
+      dropContainer:          @dropContainer.get(0)
+      cancelContainer:        @cancelContainer
+      inputField:             @inputField.get(0)
+      maxSimultaneousUploads: @maxSimultaneousUploads
+      key:                    @key
+      data:                   @data
+      onFileAdded:            @onFileAdded
+    )
+
+  onFileAdded: (file) =>
+    file.on(
+      onStart:     @onFileStart
+      onAborted:   @onFileAborted
+      onCompleted: @onFileCompleted
+      onProgress:  @onFileProgress
+      onError:     @onFileError
+    )
+
+  onFileStart: =>
+    @attachmentPlaceholder.addClass('hide')
+    @attachmentUpload.removeClass('hide')
+    @cancelContainer.removeClass('hide')
+
+    App.Log.debug 'Html5Upload', 'upload start'
+    @onFileStartCallback?()
+
+  onFileProgress: (progress, fileSize, uploadedBytes) =>
+    progress = parseInt(progress)
+
+    @progressBar.width(progress + '%')
+    @progressText.text(progress)
+    # hide cancel on 90%
+    if progress >= 90
+      @cancelContainer.addClass('hide')
+
+    App.Log.debug 'Html5Upload', 'uploadProgress ', progress
+
+
+  onFileCompleted: (response) =>
+    response = JSON.parse(response)
+
+    @hideFileUploading()
+    @onFileCompletedCallback?(response)
+
+    App.Log.debug 'Html5Upload', 'upload complete', response.data
+
+  onFileAborted: =>
+    @hideFileUploading()
+    @onFileAbortedCallback?()
+
+    App.Log.debug 'Html5Upload', 'upload aborted'
+
+  onFileError: (message) =>
+    @hideFileUploading()
+    @inputField.val('')
+
+    @callbackFileUploadStop?()
+
+    new App.ControllerModal(
+      head: 'Upload Failed'
+      buttonCancel: 'Cancel'
+      buttonCancelClass: 'btn--danger'
+      buttonSubmit: false
+      message: message || 'Cannot upload file'
+      shown: true
+      small: true
+      container: @inputField.closest('.content')
+    )
+
+    App.Log.debug 'Html5Upload', 'upload error'
+
+  hideFileUploading: =>
+    @attachmentPlaceholder.removeClass('hide')
+    @attachmentUpload.addClass('hide')
+
+    @progressBar.width('0%')
+    @progressText.text('0')
--- a/app/assets/javascripts/app/lib/app_post/i18n.coffee
+++ b/app/assets/javascripts/app/lib/app_post/i18n.coffee
@ -8,7 +8,12 @@ class App.i18n
  @translateDeep: (input, args...) ->
    if _instance == undefined
      _instance ?= new _i18nSingleton()
-    _instance.translateDeep(input, args)
+    _instance.translateDeep(input, args, false)
+
+  @translateDeepPlain: (input, args...) ->
+    if _instance == undefined
+      _instance ?= new _i18nSingleton()
+    _instance.translateDeep(input, args, true)

  @translateContent: (string, args...) ->
    if _instance == undefined
@ -230,17 +235,20 @@ class _i18nSingleton extends Spine.Module
    return string if !string
    @translate(string, args, true)

-  translateDeep: (input, args) =>
+  translateDeep: (input, args, plain) =>
    if _.isArray(input)
      _.map input, (item) =>
-        @translateDeep(item, args)
+        @translateDeep(item, args, plain)
    else if _.isObject(input)
      _.reduce _.keys(input), (memo, item) =>
-        memo[item] = @translateDeep(input[item])
+        memo[item] = @translateDeep(input[item], args, plain)
        memo
      , {}
    else
-      @translateInline(input, args)
+      if plain
+        @translatePlain(input, args)
+      else
+        @translateInline(input, args)


  translateContent: (string, args) =>
--- a/app/assets/javascripts/app/lib/app_post/ticket_create_collection.coffee
+++ b/app/assets/javascripts/app/lib/app_post/ticket_create_collection.coffee
@ -1,27 +0,0 @@
-class _Singleton extends App._CollectionSingletonBase
-  event: 'ticket_create_attributes'
-  restEndpoint: '/ticket_create'
-
-class App.TicketCreateCollection
-  _instance = new _Singleton
-
-  @get: ->
-    _instance.get()
-
-  @one: (callback, init = true) ->
-    _instance.bind(callback, init, true)
-
-  @bind: (callback, init = true) ->
-    _instance.bind(callback, init, false)
-
-  @unbind: (callback) ->
-    _instance.unbind(callback)
-
-  @unbindById: (id) ->
-    _instance.unbindById(id)
-
-  @trigger: ->
-    _instance.trigger()
-
-  @fetch: ->
-    _instance.fetch()
--- a/app/assets/javascripts/app/lib/app_post/utils.coffee
+++ b/app/assets/javascripts/app/lib/app_post/utils.coffee
@ -1327,7 +1327,7 @@ class App.Utils
        if type is 'email' && !e.attrs.value.match(/@/) || e.attrs.value.match(/\s/)
          e.preventDefault()
          return false
-        e.attrs.label = e.attrs.value
+        e.attrs.label ||= e.attrs.value
        true
      )
    App.Delay.set(a, 500, undefined, 'tags')
--- a/app/assets/javascripts/app/lib/base/bootstrap-tokenfield.js
+++ b/app/assets/javascripts/app/lib/base/bootstrap-tokenfield.js
@ -654,6 +654,11 @@
      var tokensBefore = this.getTokensList()
      this.setTokens( this.$input.val(), true )

+      // remove token text was cleared while editing
+      if (this.$input.data( 'edit' ) && !this.$input.val()) {
+        this.$element.val( this.getTokensList() )
+      }
+
      if (tokensBefore == this.getTokensList() && this.$input.val().length)
        return false // No tokens were added, do nothing (prevent form submit)

--- a/app/assets/javascripts/app/lib/base/html5Upload.js
+++ b/app/assets/javascripts/app/lib/base/html5Upload.js
@ -255,7 +255,7 @@
                    manager.ajaxUpload(manager.uploadsQueue.shift());
                }
            };
-            xhr.abort = function (event) {
+            xhr.onabort = function (event) {
                console.log('Upload abort');

                // Reduce number of active uploads:
@ -269,6 +269,7 @@
            // Triggered when upload fails:
            xhr.onerror = function () {
                console.log('Upload failed: ', upload.fileName);
+                upload.events.onError('Upload failed: ' + upload.fileName);
            };

            // Append additional data if provided:
--- a/app/assets/javascripts/app/lib/base/jquery.contenteditable.js
+++ b/app/assets/javascripts/app/lib/base/jquery.contenteditable.js
@ -114,11 +114,22 @@
      sel = window.getSelection()
      if (sel) {
        node = $(sel.anchorNode)
-        if (node && node.parent() && node.parent().is('blockquote')) {
-          e.preventDefault()
-          document.execCommand('Insertparagraph')
-          document.execCommand('Outdent')
-          return
+
+        if (node.closest('blockquote').length > 0) {
+
+          // Special handling when the line is not wrapped inside of a html element.
+          if (!node.is('div') && node.parent().is('blockquote') && node.text()) {
+            e.preventDefault()
+            document.execCommand('formatBlock', false, 'div')
+            document.execCommand('insertParagraph')
+            return
+          }
+          if (!e.shiftKey && node && (node.is('blockquote') || (node.parent() && node.parent().is('blockquote')) || !node.text())) {
+            e.preventDefault()
+            document.execCommand('insertParagraph')
+            document.execCommand('outdent')
+            return
+          }
        }
      }

--- a/app/assets/javascripts/app/lib/mixins/view_helpers.coffee
+++ b/app/assets/javascripts/app/lib/mixins/view_helpers.coffee
@ -41,17 +41,33 @@ App.ViewHelpers =
    return '' if isNaN(parseInt(time))

    # Hours, minutes and seconds
-    hrs = ~~parseInt((time / 3600))
+    hrs  = ~~parseInt((time / 3600))
    mins = ~~parseInt(((time % 3600) / 60))
    secs = parseInt(time % 60)

    # Output like "1:01" or "4:03:59" or "123:03:59"
    mins = "0#{mins}" if mins < 10
    secs = "0#{secs}" if secs < 10
+
    if hrs > 0
      return "#{hrs}:#{mins}:#{secs}"
+
    "#{mins}:#{secs}"

+  # define time_duration / hh:mm
+  time_duration_hh_mm: (time_in_minutes) ->
+    return '' if !time_in_minutes
+    return '' if isNaN(parseInt(time_in_minutes))
+
+    # Hours, minutes and seconds
+    hrs  = ~~parseInt((time_in_minutes / 60))
+    mins = ~~parseInt((time_in_minutes % 60))
+
+    hrs  = "0#{hrs}" if hrs < 10
+    mins = "0#{mins}" if mins < 10
+
+    "#{hrs}:#{mins}"
+
  # define mask helper
  # mask an value like 'a***********yz'
  M: (item, start = 1, end = 2) ->
--- a/app/assets/javascripts/app/lib/spine/ajax.coffee
+++ b/app/assets/javascripts/app/lib/spine/ajax.coffee
@ -234,12 +234,11 @@ class Singleton extends Base

  failResponse: (options) =>
    (xhr, statusText, error, settings) =>
-      if options.failResponseNoTrigger isnt true
-        switch settings.type
-          when 'POST' then @createFailed()
-          when 'DELETE' then @destroyFailed()
-        # add errors to calllback
-        @record.trigger('ajaxError', @record, xhr, statusText, error, settings)
+      switch settings.type
+        when 'POST' then @createFailed()
+        when 'DELETE' then @destroyFailed()
+      # add errors to calllback
+      @record.trigger('ajaxError', @record, xhr, statusText, error, settings)

      #options.fail?.call(@record, settings)
      detailsRaw = xhr.responseText
@ -247,8 +246,7 @@ class Singleton extends Base
        details = JSON.parse(detailsRaw)
      options.fail?.call(@record, settings, details)

-      if options.failResponseNoTrigger isnt true
-        @record.trigger('destroy', @record)
+      @record.trigger('destroy', @record)
      # /add errors to calllback

  createFailed: ->
--- a/app/assets/javascripts/app/models/_application_model.coffee
+++ b/app/assets/javascripts/app/models/_application_model.coffee
@ -916,20 +916,25 @@ set new attributes of model (remove already available attributes)

      # use jquery instead of ._clone() because we need a deep copy of the obj
      @org_configure_attributes = $.extend(true, [], @configure_attributes)
+    configure_attributes = $.extend(true, [], @configure_attributes)
+    allAttributes = []
    for attribute in attributes
      @attributes.push attribute.name

      found = false
-      for attribute_model, index in @configure_attributes
+      for attribute_model, index in configure_attributes
        continue if attribute_model.name != attribute.name

-        @configure_attributes[index] = _.extend(attribute_model, attribute)
+        allAttributes.push $.extend(true, attribute_model, attribute)
+        configure_attributes.splice(index, 1) # remove found attribute

        found = true
        break

      if !found
-        @configure_attributes.push attribute
+        allAttributes.push $.extend(true, {}, attribute)
+
+    @configure_attributes = $.extend(true, [], allAttributes.concat(configure_attributes))

  @resetAttributes: ->
    return if _.isEmpty(@org_configure_attributes)
--- a/app/assets/javascripts/app/models/knowledge_base.coffee
+++ b/app/assets/javascripts/app/models/knowledge_base.coffee
@ -1,5 +1,5 @@
 class App.KnowledgeBase extends App.Model
-  @configure 'KnowledgeBase', 'iconset', 'color_highlight', 'color_header', 'translation_ids', 'locale_ids', 'homepage_layout', 'category_layout', 'custom_address'
+  @configure 'KnowledgeBase', 'iconset', 'color_highlight', 'color_header', 'color_header_link', 'translation_ids', 'locale_ids', 'homepage_layout', 'category_layout', 'custom_address'
  @extend Spine.Model.Ajax
  @extend App.KnowledgeBaseActions
  @url: @apiPath + '/knowledge_bases'
@ -148,6 +148,17 @@ class App.KnowledgeBase extends App.Model
          display:    false
          horizontal: true
          shown:      true
+    }, {
+      name: 'color_header_link'
+      display: 'Header Link Color'
+      tag: 'color'
+      style: 'block'
+      null: false
+      screen:
+        admin_style_color_header_link:
+          display:    false
+          horizontal: true
+          shown:      true
    # Layout picker is disabled in V1
    #}, {
    #  name:     'homepage_layout'
--- a/app/assets/javascripts/app/models/object_manager_attribute.coffee
+++ b/app/assets/javascripts/app/models/object_manager_attribute.coffee
@ -6,8 +6,8 @@ class App.ObjectManagerAttribute extends App.Model
    { name: 'name',       display: 'Name',     tag: 'input',     type: 'text', limit: 100, null: false },
    { name: 'display',    display: 'Display',  tag: 'input',     type: 'text', limit: 100, null: false },
    { name: 'object',     display: 'Object',   tag: 'input',     readonly: 1 },
-    { name: 'position',   display: 'Position', tag: 'input',     readonly: 1 },
    { name: 'active',     display: 'Active',   tag: 'active',    default: true },
    { name: 'data_type',  display: 'Format',   tag: 'object_manager_attribute', null: false },
    { name: 'updated_at', display: 'Updated',  tag: 'datetime',  readonly: 1 },
+    { name: 'position',   display: 'Position', tag: 'integer', type: 'number', limit: 100, null: true },
  ]
--- a/app/assets/javascripts/app/models/organization.coffee
+++ b/app/assets/javascripts/app/models/organization.coffee
@ -36,7 +36,7 @@ Using **Organisations** you can **group** customers. This has among others two i
    userResult = ->
      users = []
      for user_id in member_ids
-        user = App.User.find(user_id)
+        user = App.User.fullLocal(user_id)
        continue if !user
        users.push(user)
      return users
--- a/app/assets/javascripts/app/models/sla.coffee
+++ b/app/assets/javascripts/app/models/sla.coffee
@ -1,5 +1,5 @@
 class App.Sla extends App.Model
-  @configure 'Sla', 'name', 'first_response_time', 'update_time', 'solution_time', 'condition', 'calendar_id'
+  @configure 'Sla', 'name', 'first_response_time', 'response_time', 'update_time', 'solution_time', 'condition', 'calendar_id'
  @extend Spine.Model.Ajax
  @url: @apiPath + '/slas'
  @configure_attributes = [
@ -12,6 +12,7 @@ class App.Sla extends App.Model
    { name: 'updated_by_id',  display: 'Updated by',      relation: 'User', readonly: 1 },
    { name: 'updated_at',     display: 'Updated',         tag: 'datetime', readonly: 1 },
    { name: 'first_response_time',skipRendering: true },
+    { name: 'response_time',        skipRendering: true },
    { name: 'update_time',        skipRendering: true },
    { name: 'solution_time',      skipRendering: true },
  ]
--- a/app/assets/javascripts/app/models/user.coffee
+++ b/app/assets/javascripts/app/models/user.coffee
@ -344,9 +344,12 @@ class App.User extends App.Model
    @sameOrganization?(requester)

  isChangeableBy: (requester) ->
+    # full access for admins
    return true if requester.permission('admin.user')
-    # allow agents to change customers
+    # forbid non-agents to change users
    return false if !requester.permission('ticket.agent')
+    # allow agents to change customers only
+    return false if @permission(['admin.user', 'ticket.agent'])
    @permission('ticket.customer')

  isDeleteableBy: (requester) ->
--- a/app/assets/javascripts/app/views/customer_not_ticket_exists.jst.eco
+++ b/app/assets/javascripts/app/views/customer_not_ticket_exists.jst.eco
@ -6,11 +6,15 @@
        <% if @has_any_tickets: %>
          <p><%- @T('You have no tickets to display in this overview.') %></p>
        <% else: %>
-          <p><%- @T('You have not created a ticket yet.') %></p>
-          <p><%- @T('The way to communicate with us is this thing called "ticket".') %></p>
-          <p><%- @T('Please click the button below to create your first one.') %></p>
+          <% if @is_allowed_to_create_ticket: %>
+            <p><%- @T('You have not created a ticket yet.') %></p>
+            <p><%- @T('The way to communicate with us is this thing called "ticket".') %></p>
+            <p><%- @T('Please click the button below to create your first one.') %></p>

-          <p><a class="btn btn--primary" href="#customer_ticket_new"><%- @T('Create your first ticket') %></a></p>
+            <p><a class="btn btn--primary" href="#customer_ticket_new"><%- @T('Create your first ticket') %></a></p>
+          <% else: %>
+            <p><%- @T('You currently don\'t have any tickets.') %></p>
+          <% end %>
        <% end %>
      </div>
    </div>
--- a/app/assets/javascripts/app/views/data_privacy/preview.jst.eco
+++ b/app/assets/javascripts/app/views/data_privacy/preview.jst.eco
@ -14,7 +14,7 @@
  </div>
  <div class="form-group js-sure">
    <h3 class="danger-color"><%- @T('Warning') %></h3>
-    <p class="danger-color"><%- @T('There is no rollback of this deletion possible. If you are absolutely sure to do this, then type in "%s" into the input.', App.i18n.translateInline('delete').toUpperCase()) %></p>
+    <p class="danger-color"><%- @T('There is no rollback of this deletion possible. If you are absolutely sure to do this, then type in "%s" into the input.', App.i18n.translatePlain('delete').toUpperCase()) %></p>
    <%- @sure_html %>
  </div>
 </div>
--- a/app/assets/javascripts/app/views/generic/attachment.jst.eco
+++ b/app/assets/javascripts/app/views/generic/attachment.jst.eco
@ -17,7 +17,7 @@
        <%- @T('Uploading') %> (<span class="js-percentage">0</span>%) ...
      </div>
      <div class="attachmentUpload-cancel js-cancel">
-        <%- @Icon('diagonal-cross') %></div><%- @T('Cancel Upload') %>
+        <%- @Icon('diagonal-cross') %><%- @T('Cancel Upload') %>
      </div>
    </div>
    <div class="attachmentUpload-progressBar" style="width: 0%"></div>
--- a/app/assets/javascripts/app/views/generic/auth_provider.jst.eco
+++ b/app/assets/javascripts/app/views/generic/auth_provider.jst.eco
@ -0,0 +1 @@
+<input type="text" disabled="disabled" readonly="readonly" value="<%= @attribute.value %>" class="form-control" />
--- a/app/assets/javascripts/app/views/generic/business_hours.jst.eco
+++ b/app/assets/javascripts/app/views/generic/business_hours.jst.eco
@ -20,8 +20,8 @@
      <td data-day="<%- id %>" data-slot="<%- slot %>" class="form-group day-time<%- ' is-active' if @hours[id].active %>">
        <label for="<%- id %>_start_time">from</label>
        <input type="text" id="<%- id %>_start_time" name="<%= @attribute.name %>::<%- id %>::start" value="<%- @hours[id].timeframes[slot][0] %>" data-day="<%- id %>" data-slot="<%- slot %>" data-i="0" class="form-control form-control--small time js-time">
-        <label for="monday_end_time">till</label>
-        <input type="text" id="monday_end_time" name="<%= @attribute.name %>::<%- id %>::end" value="<%- @hours[id].timeframes[slot][1] %>" data-day="<%- id %>" data-slot="<%- slot %>" data-i="1" class="form-control form-control--small time js-time">
+        <label for="<%- id %>_end_time">till</label>
+        <input type="text" id="<%- id %>_end_time" name="<%= @attribute.name %>::<%- id %>::end" value="<%- @hours[id].timeframes[slot][1] %>" data-day="<%- id %>" data-slot="<%- slot %>" data-i="1" class="form-control form-control--small time js-time">
      <% else: %>
      <td class="empty-cell">
      <% end %>
@ -45,4 +45,4 @@
    <td data-day="<%- id %>" class="settings-list-action-cell js-add-time<%- ' is-active' if @hours[id].active %>">
      <%- @Icon('plus-small') %>
    <% end %>
-</tbody>
+</tbody>
--- a/app/assets/javascripts/app/views/generic/object_search/input.jst.eco
+++ b/app/assets/javascripts/app/views/generic/object_search/input.jst.eco
@ -3,10 +3,10 @@
  <% if @attribute.multiple: %>
    <%- @tokens %>
  <% end %>
-  <input name="<%- @attribute.name %>_completion" class="user-select token-input js-objectSelect" autocapitalize="off" placeholder="<%- @Ti(@attribute.placeholder) %>" autocomplete="off" <%= @attribute.autofocus %> role="textbox" aria-autocomplete="list" value="<%= @name %>" aria-haspopup="true">
+  <input name="<%= @attribute.name %>_completion" class="user-select token-input js-objectSelect form-control" autocapitalize="off" placeholder="<%- @Ti(@attribute.placeholder) %>" autocomplete="off" <%= @attribute.autofocus %> role="textbox" aria-autocomplete="list" value="<%= @name %>" aria-haspopup="true">
  <% if @attribute.disableCreateObject isnt true: %><%- @Icon('arrow-down', 'dropdown-arrow') %><% end %>
 </div>

 <div class="dropdown-menu" aria-labelledby="customer_id">
  <ul class="recipientList" role="menu"></ul>
-</div>
+</div>
--- a/app/assets/javascripts/app/views/generic/object_search/item_organization_members.jst.eco
+++ b/app/assets/javascripts/app/views/generic/object_search/item_organization_members.jst.eco
@ -4,4 +4,9 @@
      <%- @Icon('arrow-left') %>
      <span class="btn-label"><%- @T('Back') %></span>
    </div>
-</ul>
+
+  <li class="recipientList-controls js-showMoreMembers" organization-member-limit="10">
+    <div class="btn btn--action btn--onDark">
+      <span class="btn-label"><%- @T('show more') %></span>
+    </div>
+</ul>
--- a/app/assets/javascripts/app/views/generic/sla_times.jst.eco
+++ b/app/assets/javascripts/app/views/generic/sla_times.jst.eco
@ -6,7 +6,7 @@
      <th><%- @T('Time') %> <span class="text-muted"><%- @T('in hours') %></span>
  </thead>
  <tbody>
-    <tr class="form-group">
+    <tr>
      <td class="u-positionOrigin">
        <label class="checkbox-replacement checkbox-replacement--fullscreen dont-grey-out">
          <input type="checkbox" class="js-activateRow" id="first_response_time" name="first_response_time_enabled">
@ -16,25 +16,51 @@
      <td class="u-clickable js-forward-click">
        <div><%- @T('First Response Time') %></div>
        <p class="subtle"><%- @T('Timeframe for the first response.') %></p>
-      <td class="u-clickable js-focus-input">
+      <td class="u-clickable js-focus-input form-group">
        <input type="hidden" name="first_response_time" value="<%= @first_response_time %>" class="js-timeConvertTo">
        <input type="text" value="<%= @first_response_time_in_text %>" class="form-control form-control--small timeframe js-timeConvertFrom"  placeholder="hh:mm" name="first_response_time_in_text" data-name="first_response_time">

-    <tr class="form-group">
+    <tr>
      <td class="u-positionOrigin">
        <label class="checkbox-replacement checkbox-replacement--fullscreen dont-grey-out">
          <input type="checkbox" class="js-activateRow" id="update_time" name="update_time_enabled">
          <%- @Icon('checkbox', 'icon-unchecked') %>
          <%- @Icon('checkbox-checked', 'icon-checked') %>
        </label>
-      <td class="u-clickable js-forward-click">
-        <div><%- @T('Update Time') %></div>
-        <p class="subtle"><%- @T('Timeframe for every following response.') %></p>
      <td>
-        <input type="hidden" name="update_time" value="<%= @update_time %>" class="js-timeConvertTo">
-        <input type="text" value="<%= @update_time_in_text %>" class="form-control form-control--small timeframe js-timeConvertFrom" placeholder="hh:mm" name="update_time_in_text" data-name="update_time">
+        <div class="u-clickable js-forward-click">
+          <div><%- @T('Update Time') %></div>
+          <p class="subtle"><%- @T('Timeframe between agent updates or for an agent to respond.') %></p>
+        </div>

-    <tr class="form-group">
+        <p class="sla_radio_container js-forward-radio">
+          <label class="inline-label radio-replacement">
+            <input class="js-updateTypeSelector" type="radio" name="update_type" value="update" <% if @update_time: %>checked<% end %>>
+            <%- @Icon('radio', 'icon-unchecked') %>
+            <%- @Icon('radio-checked', 'icon-checked') %>
+            <span class="label-text"><%- @T('between agent updates') %></span>
+          </label>
+        </p>
+
+        <p class="sla_radio_container js-forward-radio u-clickable">
+          <label class="inline-label radio-replacement">
+            <input class="js-updateTypeSelector" type="radio" name="update_type" value="response" <% if @response_time: %>checked<% end %>>
+            <%- @Icon('radio', 'icon-unchecked') %>
+            <%- @Icon('radio-checked', 'icon-checked') %>
+            <span class="label-text"><%- @T('for an agent to respond') %></span>
+          </label>
+        </p>
+      <td class="form-group u-clickable js-focus-input u-clickable">
+        <span class="form-group">
+          <input type="hidden" name="update_time" value="<%= @update_time %>" class="js-timeConvertTo">
+          <input type="text" value="<%= @update_time_in_text %>" class="form-control form-control--small timeframe js-timeConvertFrom <% if @response_time: %>hidden<% end %>" placeholder="hh:mm" name="update_time_in_text" data-name="update_time">
+        </span>
+        <span class="form-group">
+          <input type="hidden" name="response_time" value="<%= @response_time %>" class="js-timeConvertTo">
+          <input type="text" value="<%= @response_time_in_text %>" class="form-control form-control--small timeframe js-timeConvertFrom <% if !@response_time: %>hidden<% end %>" placeholder="hh:mm" name="response_time_in_text" data-name="response_time">
+        </span>
+
+    <tr>
      <td class="u-positionOrigin">
        <label class="checkbox-replacement checkbox-replacement--fullscreen dont-grey-out">
          <input type="checkbox" id="solution_time" class="js-activateRow" name="solution_time_enabled">
@ -44,7 +70,7 @@
      <td class="u-clickable js-forward-click">
        <div><%- @T('Solution Time') %></div>
        <p class="subtle"><%- @T('Timeframe for solving the problem.') %></p>
-      <td>
+      <td class="form-group u-clickable js-focus-input">
        <input type="hidden" name="solution_time" value="<%= @solution_time %>" class="js-timeConvertTo">
        <input type="text" value="<%= @solution_time_in_text %>" class="form-control form-control--small timeframe js-timeConvertFrom" placeholder="hh:mm" name="solution_time_in_text" data-name="solution_time">

--- a/app/assets/javascripts/app/views/integration/cti.jst.eco
+++ b/app/assets/javascripts/app/views/integration/cti.jst.eco
@ -82,7 +82,7 @@
    <table class="settings-list" style="width: 100%;">
      <thead>
        <tr>
-          <th width="50%"><%- @T('Name') %>
+          <th width="50%"><%- @T('Value') %>
          <th width="50%"><%- @T('Description') %>
      </thead>
      <tbody>
--- a/app/assets/javascripts/app/views/integration/placetel.jst.eco
+++ b/app/assets/javascripts/app/views/integration/placetel.jst.eco
@ -91,24 +91,30 @@
      </tbody>
    </table>
  </div>
+-->

-  <p><%- @T('Default caller id.') %>
+  <p><%- @T('Settings') %>

  <div class="settings-entry">
    <table class="settings-list" style="width: 100%;">
      <thead>
        <tr>
-          <th width="50%"><%- @T('Default caller id') %>
-          <th width="50%"><%- @T('Note') %>
+          <th width="50%"><%- @T('Value') %>
+          <th width="50%"><%- @T('Description') %>
      </thead>
      <tbody>
+<!--
        <tr>
          <td class="settings-list-control-cell"><input name="default_caller_id" value="<%= @config.outbound.default_caller_id %>" placeholder="4930609854189" class="form-control form-control--small js-summary">
          <td class="settings-list-row-control"><%- @T('Default caller id for outbound calls.') %>
+-->
+        <tr>
+          <td class="settings-list-control-cell js-viewLimit">
+          <td class="settings-list-row-control"><%- @T('Shown records in caller log.') %>
      </tbody>
    </table>
  </div>
-->
+
  <h2><%- @T('User assignment to telephones') %></h2>

  <p><%- @T('User assignment to telephones to be able to offer extended like open new ticket screen on answering a call.') %>
@ -137,4 +143,4 @@
  </div>

  <button type="submit" class="btn btn--primary js-submit"><%- @T('Save') %></button>
-</form>
+</form>
--- a/app/assets/javascripts/app/views/integration/sipgate.jst.eco
+++ b/app/assets/javascripts/app/views/integration/sipgate.jst.eco
@ -79,38 +79,22 @@
    </table>
  </div>

-  <p><%- @T('Default caller id.') %>
+  <p><%- @T('Settings') %>

  <div class="settings-entry">
    <table class="settings-list" style="width: 100%;">
      <thead>
        <tr>
-          <th width="50%"><%- @T('Default caller id') %>
-          <th width="50%"><%- @T('Note') %>
+          <th width="50%"><%- @T('Value') %>
+          <th width="50%"><%- @T('Description') %>
      </thead>
      <tbody>
        <tr>
          <td class="settings-list-control-cell"><input name="default_caller_id" value="<%= @config.outbound.default_caller_id %>" placeholder="4930609854189" class="form-control form-control--small js-summary">
          <td class="settings-list-row-control"><%- @T('Default caller id for outbound calls.') %>
-      </tbody>
-    </table>
-  </div>
-
-  <p><%- @T('In order for Zammad to access %s, a %s API user and password must be stored here', 'Sipgate', 'Sipgate') %>:<p>
-  <div class="settings-entry">
-    <table class="settings-list" style="width: 100%;">
-      <thead>
        <tr>
-          <th width="20%"><%- @T('Type') %>
-          <th width="80%"><%- @T('Content') %>
-      </thead>
-      <tbody>
-        <tr>
-          <td class="settings-list-row-control"><%- @T('API User') %>
-          <td class="settings-list-control-cell"><input type="input" class="form-control form-control--small js-select" value="<%= @config.api_user %>" name="api_user" placeholder="someuser@example.com">
-        <tr>
-          <td class="settings-list-row-control"><%- @T('API Password') %>
-          <td class="settings-list-control-cell"><input type="password" class="form-control form-control--small js-select" value="<%= @config.api_password %>" name="api_password" placeholder="">
+          <td class="settings-list-control-cell js-viewLimit">
+          <td class="settings-list-row-control"><%- @T('Shown records in caller log.') %>
      </tbody>
    </table>
  </div>
@ -143,4 +127,4 @@
  </div>

  <button type="submit" class="btn btn--primary js-submit"><%- @T('Save') %></button>
-</form>
+</form>
--- a/app/assets/javascripts/app/views/knowledge_base/new_modal.coffee
+++ b/app/assets/javascripts/app/views/knowledge_base/new_modal.coffee
@ -26,11 +26,12 @@ class App.KnowledgeBaseNewModal extends App.ControllerModal
      App.UiElement[attribute.tag].prepareParams?(attribute, dom, params)

  applyDefaults: (params) ->
-    params['iconset']         = 'FontAwesome'
-    params['color_highlight'] = '#38ae6a'
-    params['color_header']    = '#f9fafb'
-    params['homepage_layout'] = 'grid'
-    params['category_layout'] = 'grid'
+    params['iconset']           = 'FontAwesome'
+    params['color_highlight']   = '#38ae6a'
+    params['color_header']      = '#f9fafb'
+    params['color_header_link'] = 'hsl(206,8%,50%)'
+    params['homepage_layout']   = 'grid'
+    params['category_layout']   = 'grid'

  onSubmit: (e) ->
    params = @formParams(@el)
--- a/app/assets/javascripts/app/views/knowledge_base/public_menu_manager.jst.eco
+++ b/app/assets/javascripts/app/views/knowledge_base/public_menu_manager.jst.eco
@ -14,7 +14,7 @@
      <div class="kb-menu-preview">
        <div class="label"><%= kb_locale.systemLocale().name %></div>

-        <div class="kb-menu-preview-container kb-menu-preview-container--<%= location.identifier %>" style="background-color: <%= location.color %>">
+        <div class="kb-menu-preview-container kb-menu-preview-container--<%= location.identifier %>" style="background-color: <%= location.color %>; color: <%= location.color_link %>;">
          <% menu_items = App.KnowledgeBaseMenuItem.using_kb_locale_location(kb_locale, location.identifier) %>

          <% if menu_items.length == 0: %>
--- a/app/assets/javascripts/app/views/object_manager/index.jst.eco
+++ b/app/assets/javascripts/app/views/object_manager/index.jst.eco
@ -55,6 +55,7 @@
        <th class=""><%- @T('Display') %></th>
        <th class=""><%- @T('Name') %></th>
        <th class="" style="width: 200px;"><%- @T('Type') %></th>
+        <th><%- @T('Position') %></th>
        <th class="" style="width: 140px;"><%- @T('Action') %></th>
      </tr>
    </thead>
@ -64,6 +65,7 @@
        <td><%= item.display %></td>
        <td><%= item.name %></td>
        <td><%= item.data_type %></td>
+        <td><%= item.position %></td>
        <td>
          <% if item.to_create is true: %>
            <%- @T('will be created') %>
--- a/app/assets/javascripts/app/views/package.jst.eco
+++ b/app/assets/javascripts/app/views/package.jst.eco
@ -3,6 +3,11 @@
 </div>

 <div class="page-content">
+  <p>
+    <%- @T('The installation of packages comes with security implications, because arbitrary code will be executed in the context of the Zammad application.') %>
+    <br>
+    <%- @T('Only packages from known, trusted and verfied sources should be installed.') %>
+  </p>
  <p>
    <%- @T('After installing, updating or uninstalling packages the following commands need to be executed on the server:') %>
    <ul>
@ -48,4 +53,4 @@
    <% end %>
    </tbody>
  </table>
-</div>
+</div>
--- a/app/assets/javascripts/app/views/popover/organization.jst.eco
+++ b/app/assets/javascripts/app/views/popover/organization.jst.eco
@ -3,7 +3,7 @@
 <% if  @object.member_ids: %>
  <hr>
  <div class="popover-block">
-    <label><%- @T('Members') %></label>
+    <label><%- @T('Members') %> (<%= @object.member_ids.length %>)</label>
    <div class="userList js-userList"></div>
  </div>
 <% end %>
--- a/app/assets/javascripts/app/views/sla/index.jst.eco
+++ b/app/assets/javascripts/app/views/sla/index.jst.eco
@ -34,15 +34,19 @@
      <div class="action-block action-block--flex">
        <div class="label"><%- @T('Escalation Times') %></div>
        <% if sla.first_response_time: %>
-          <%- sla.first_response_time_in_text %> <%- @T('hours') %> - <%- @T('First Response Time') %>
+          <%- @time_duration_hh_mm(sla.first_response_time) %> <%- @T('hours') %> - <%- @T('First Response Time') %>
+        <% end %>
+        <% if sla.response_time: %>
+          <br>
+          <%- @time_duration_hh_mm(sla.response_time) %> <%- @T('hours') %> - <%- @T('Response Time') %>
        <% end %>
        <% if sla.update_time: %>
          <br>
-          <%- sla.update_time_in_text %> <%- @T('hours') %> - <%- @T('Update Time') %>
+          <%- @time_duration_hh_mm(sla.update_time) %> <%- @T('hours') %> - <%- @T('Update Time') %>
        <% end %>
        <% if sla.solution_time: %>
          <br>
-          <%- sla.solution_time_in_text %> <%- @T('hours') %> - <%- @T('Solution Time') %>
+          <%- @time_duration_hh_mm(sla.solution_time) %> <%- @T('hours') %> - <%- @T('Solution Time') %>
        <% end %>
        <br>
      </div>
@ -57,4 +61,4 @@
    </div>
  </div>
  <% end %>
-</div>
+</div>
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@ -65,9 +65,9 @@ Date.prototype.getWeek = function() {

 function difference(object1, object2) {
  var changes = {};
-  for (var name in object1) {
-    if (name in object2) {
-      if (_.isObject(object2[name]) && !_.isArray(object2[name])) {
+  _.uniq(Object.keys(object1).concat(Object.keys(object2))).forEach(function(name) {
+    if (name in object1 && name in object2) {
+      if (_.isObject(object1[name]) && !_.isArray(object1[name]) && _.isObject(object2[name]) && !_.isArray(object2[name])) {
        var diff = difference(object1[name], object2[name]);
        if (!_.isEmpty(diff)) {
            changes[name] = diff;
@ -75,8 +75,10 @@ function difference(object1, object2) {
      } else if (!_.isEqual(object1[name], object2[name])) {
        changes[name] = object2[name];
      }
+    } else {
+      changes[name] = object2[name]
    }
-  }
+  })
  return changes;
 }

--- a/app/assets/stylesheets/font.css
+++ b/app/assets/stylesheets/font.css
@ -1,39 +1,39 @@
@font-face {
  font-family: 'Fira Sans';
-  src: url('fonts/FiraSans-Bold.eot');
-  src: url('fonts/FiraSans-Bold.woff2') format('woff2'),
-     url('fonts/FiraSans-Bold.woff') format('woff'),
-     url('fonts/FiraSans-Bold.ttf') format('truetype');
+  src: url('assets/fonts/FiraSans-Bold.eot');
+  src: url('assets/fonts/FiraSans-Bold.woff2') format('woff2'),
+    url('assets/fonts/FiraSans-Bold.woff') format('woff'),
+    url('assets/fonts/FiraSans-Bold.ttf') format('truetype');
  font-weight: bold;
  font-style: normal;
 }

@font-face {
  font-family: 'Fira Sans';
-  src: url('fonts/FiraSans-Regular.eot');
-  src: url('fonts/FiraSans-Regular.woff2') format('woff2'),
-     url('fonts/FiraSans-Regular.woff') format('woff'),
-     url('fonts/FiraSans-Regular.ttf') format('truetype');
+  src: url('assets/fonts/FiraSans-Regular.eot');
+  src: url('assets/fonts/FiraSans-Regular.woff2') format('woff2'),
+    url('assets/fonts/FiraSans-Regular.woff') format('woff'),
+    url('assets/fonts/FiraSans-Regular.ttf') format('truetype');
  font-weight: normal;
  font-style: normal;
 }

@font-face {
  font-family: 'Fira Sans';
-  src: url('fonts/FiraSans-Medium.eot');
-  src: url('fonts/FiraSans-Medium.woff2') format('woff2'),
-     url('fonts/FiraSans-Medium.woff') format('woff'),
-     url('fonts/FiraSans-Medium.ttf') format('truetype');
+  src: url('assets/fonts/FiraSans-Medium.eot');
+  src: url('assets/fonts/FiraSans-Medium.woff2') format('woff2'),
+    url('assets/fonts/FiraSans-Medium.woff') format('woff'),
+    url('assets/fonts/FiraSans-Medium.ttf') format('truetype');
  font-weight: 500;
  font-style: normal;
 }

@font-face {
  font-family: 'Fira Sans';
-  src: url('fonts/FiraSans-Light.eot');
-  src: url('fonts/FiraSans-Light.woff2') format('woff2'),
-     url('fonts/FiraSans-Light.woff') format('woff'),
-     url('fonts/FiraSans-Light.ttf') format('truetype');
+  src: url('assets/fonts/FiraSans-Light.eot');
+  src: url('assets/fonts/FiraSans-Light.woff2') format('woff2'),
+    url('assets/fonts/FiraSans-Light.woff') format('woff'),
+    url('assets/fonts/FiraSans-Light.ttf') format('truetype');
  font-weight: 300;
  font-style: normal;
-}
+}
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@ -358,6 +358,26 @@ ol, ul {
  z-index: 1;
 }

+code {
+  background: hsla(0, 0%, 0%, 0.2);
+  border-radius: 3px;
+  box-decoration-break: clone;
+}
+
+code,
+.hljs {
+  padding: 2px 4px;
+  font-size: 0.88em;
+}
+
+.hljs {
+  background: none;
+}
+
+pre code.hljs {
+  font-size: 1em;
+}
+
 pre {
  display: block;
  padding: 9.5px;
@ -371,30 +391,26 @@ pre {
  border: 1px solid hsl(0,0%,90%);
  border-radius: 3px;
 }
+
+.modal-content pre {
+  background: hsl(0, 0%, 97%);
+  border: 1px solid hsl(0, 0%, 87%);
+}
+
 pre code {
  padding: 0;
  font-size: inherit;
  color: inherit;
  white-space: pre-wrap;
-  background-color: transparent;
-  border-radius: 0;
-}
-
-.hljs,
-code {
  background: none;
-  padding: 2px 4px;
-  font-size: 0.88em;
-}
+  border-radius: 0;
+  border: none;
+  overflow-x: auto;

-code:not(.hljs) {
-  border: 1px solid rgba(0,0,0,.2);
-  border-radius: 3px;
-  white-space: nowrap;
-}
-
-pre code.hljs {
-  font-size: 1em;
+  &.hljs {
+    padding: 0;
+    background: none;
+  }
 }

 .textarea::placeholder,
@ -2661,7 +2677,7 @@ input.has-error {
  }

  a {
-    color: hsl(206,8%,50%);
+    color: inherit;
  }

  .label {
@ -4997,6 +5013,11 @@ footer {
    }
  }

+  &--vacation {
+    filter: grayscale(70%);
+    opacity: 1;
+  }
+
  &--idle {
    filter: grayscale(100%);
    opacity: 0.5;
@ -5007,11 +5028,6 @@ footer {
    opacity: 0.2;
  }

-  &--vacation {
-    filter: grayscale(70%);
-    opacity: 1;
-  }
-
  &--unique {
    background-image: image_url("/assets/images/avatar-bg.png");
    background-size: 300px 226px;
@ -7051,7 +7067,7 @@ footer {
    padding: 10px 0;
    color: #b3b3b3;
    overflow: hidden;
-    @extend .u-unclickable, .u-textTruncate;
+    @extend .u-textTruncate;
  }

    .attachments:not(:empty) {
@ -7060,6 +7076,16 @@ footer {
      margin: 6px -12px 30px;
    }

+    .ticket-create .attachments:not(:empty) {
+      margin-left: 0;
+      margin-right: 0;
+      margin-bottom: 56px;
+    }
+
+    .ticket-create .attachment--row {
+      line-height: 1.45;
+    }
+
    .attachment.attachment--row {
      font-size: 13px;
      padding: 1px 10px 1px 7px;
@ -8442,6 +8468,10 @@ footer {

  .dropdown li.with-category, .dropdown.dropdown--actions li.with-category {
    line-height: 19.5px;
+
+    small {
+      color: #fff !important;
+    }
  }

  .dropdown.dropdown--actions li.with-category {
@ -13143,3 +13173,10 @@ span.is-disabled {
 .text-modules-box {
  max-height: 40vh;
 }
+
+.sla_times {
+  .sla_radio_container {
+    padding-top: 0.5em;
+    padding-left: 0.5em;
+  }
+}
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -10,8 +10,8 @@ class ApplicationController < ActionController::Base
  include ApplicationController::RendersModels
  include ApplicationController::HasUser
  include ApplicationController::HasResponseExtentions
+  include ApplicationController::HasDownload
  include ApplicationController::PreventsCsrf
-  include ApplicationController::HasSecureContentSecurityPolicyForDownloads
  include ApplicationController::LogsHttpAccess
  include ApplicationController::Authorizes
 end
--- a/app/controllers/application_controller/authenticates.rb
+++ b/app/controllers/application_controller/authenticates.rb
@ -43,6 +43,10 @@ module ApplicationController::Authenticates
  end

  def authentication_check_only(auth_param = {})
+    if Rails.env.test? && ENV['FAKE_SELENIUM_LOGIN_USER_ID'].present? && session[:user_id].blank?
+      session[:user_id] = ENV['FAKE_SELENIUM_LOGIN_USER_ID'].to_i
+    end
+
    # logger.debug 'authentication_check'
    # logger.debug params.inspect
    # logger.debug session.inspect
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`<input type="text" disabled="disabled" readonly="readonly" value="<%= @attribute.value %>" class="form-control" />`