v6.78

Try to fix some security issue.
Thanks to Responsible Security Disclousure contributors and xet7 !
2023-02-28 14:21:46 +02:00 · 2023-02-28 14:16:08 +02:00 · 2023-02-27 17:29:57 +02:00 · 2023-02-27 17:26:08 +02:00 · 2023-02-27 17:24:54 +02:00 · 2023-02-27 17:03:47 +02:00
435 changed files with 35099 additions and 7184 deletions
@@ -10,7 +10,7 @@ ENV DEBIAN_FRONTEND=noninteractive

 ENV \
    DEBUG=false \
-    NODE_VERSION=v14.19.3 \
+    NODE_VERSION=v14.21.3 \
    METEOR_RELEASE=1.10.2 \
    USE_EDGE=false \
    METEOR_EDGE=1.5-beta.17 \
@@ -30,6 +30,12 @@ ENV \
    RICHER_CARD_COMMENT_EDITOR=false \
    CARD_OPENED_WEBHOOK_ENABLED=false \
    ATTACHMENTS_STORE_PATH="" \
+    ATTACHMENTS_UPLOAD_EXTERNAL_PROGRAM="" \
+    ATTACHMENTS_UPLOAD_MIME_TYPES="" \
+    ATTACHMENTS_UPLOAD_MAX_SIZE=0 \
+    AVATARS_UPLOAD_EXTERNAL_PROGRAM="" \
+    AVATARS_UPLOAD_MIME_TYPES="" \
+    AVATARS_UPLOAD_MAX_SIZE=0 \
    MAX_IMAGE_PIXEL="" \
    IMAGE_COMPRESS_RATIO="" \
    NOTIFICATION_TRAY_AFTER_READ_DAYS_BEFORE_REMOVE="" \
@@ -137,7 +143,9 @@ ENV \
    SAML_LOCAL_PROFILE_MATCH_ATTRIBUTE="" \
    SAML_ATTRIBUTES="" \
    DEFAULT_WAIT_SPINNER="" \
-    NODE_OPTIONS="--max_old_space_size=4096"
+    S3=""
+# \
+#    NODE_OPTIONS="--max_old_space_size=4096"

 #---------------------------------------------------------------------
 # https://github.com/wekan/wekan/issues/3585#issuecomment-1021522132
@@ -3,7 +3,7 @@ version: '3.7'
 services:

  wekandb-dev:
-    image: mongo:5.0
+    image: mongo:6
    container_name: wekan-dev-db
    restart: unless-stopped
    command: mongod --oplogSize 128
@@ -81,7 +81,7 @@ parts:
    wekan:
        source: .
        plugin: nodejs
-        node-engine: 14.19.3
+        node-engine: 14.21.3
        node-packages:
            - node-gyp
            - node-pre-gyp
@@ -0,0 +1,6 @@
+version: 2
+updates:
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+      interval: "weekly"
@@ -9,8 +9,15 @@ on:
  schedule:
    - cron: '0 16 * * 3'

+permissions:
+  contents: read
+
 jobs:
  analyze:
+    permissions:
+      actions: read  # for github/codeql-action/init to get workflow details
+      contents: read  # for actions/checkout to fetch code
+      security-events: write  # for github/codeql-action/autobuild to send a status report
    name: Analyze
    runs-on: ubuntu-latest

@@ -25,7 +32,7 @@ jobs:

    steps:
    - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
      with:
        # We must fetch at least the immediate parents so that if this is
        # a pull request then we can checkout the head.
@@ -38,14 +45,14 @@ jobs:

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
      with:
        languages: ${{ matrix.language }}

    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
    # If this step fails, then you should remove it and run the build manually (see below)
    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2

    # ℹ️ Command-line programs to run using the OS shell.
    # 📚 https://git.io/JvXDl
@@ -59,4 +66,4 @@ jobs:
    #   make release

    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
@@ -0,0 +1,14 @@
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v3
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@v3
@@ -32,13 +32,13 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      # Login against a Docker registry except on PR
      # https://github.com/docker/login-action
      - name: Log into registry ${{ env.REGISTRY }}
        if: github.event_name != 'pull_request'
-        uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
        with:
          registry: ${{ env.REGISTRY }}
          username: ${{ github.actor }}
@@ -48,14 +48,14 @@ jobs:
      # https://github.com/docker/metadata-action
      - name: Extract Docker metadata
        id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        uses: docker/metadata-action@507c2f2dc502c992ad446e3d7a5dfbe311567a96
        with:
          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

      # Build and push Docker image with Buildx (don't push on PR)
      # https://github.com/docker/build-push-action
      - name: Build and push Docker image
-        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
        with:
          context: .
          push: ${{ github.event_name != 'pull_request' }}
@@ -5,6 +5,9 @@ on:
    branches:
      - master

+permissions:
+  contents: read
+
 jobs:

  build:
@@ -12,6 +15,6 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
    - name: Build the Docker image
      run: docker build . --file Dockerfile --tag wekan:$(date +%s)
@@ -5,12 +5,17 @@ on:
    branches:
      - master

+permissions:
+  contents: read
+
 jobs:
  release:
+    permissions:
+      contents: write  # for helm/chart-releaser-action to push chart release and create a release
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0

@@ -20,6 +25,6 @@ jobs:
          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"

      - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.1.0
+        uses: helm/chart-releaser-action@v1.5.0
        env:
          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
@@ -6,6 +6,9 @@ on:
      - master
  pull_request:

+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
 # the following are optional jobs and need to be configured according
 # to this project's settings:
@@ -15,7 +18,7 @@ jobs:
 #    runs-on: ubuntu-latest
 #    steps:
 #    - name: checkout
-#      uses: actions/checkout@v2
+#      uses: actions/checkout@v3
 #
 #    - name: setup node
 #      uses: actions/setup-node@v1
@@ -39,7 +42,7 @@ jobs:
 #    needs: [lintcode]
 #    steps:
 #    - name: checkout
-#      uses: actions/checkout@v2
+#      uses: actions/checkout@v3
 #
 #    - name: setup node
 #      uses: actions/setup-node@v1
@@ -62,7 +65,7 @@ jobs:
 #    needs: [lintcode,lintstyle]
 #    steps:
 #    - name: checkout
-#      uses: actions/checkout@v2
+#      uses: actions/checkout@v3
 #
 #    - name: setup node
 #      uses: actions/setup-node@v1
@@ -87,12 +90,12 @@ jobs:

      # CHECKOUTS
      - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      # CACHING
      - name: Install Meteor
        id: cache-meteor-install
-        uses: actions/cache@v2
+        uses: actions/cache@v3
        with:
          path: ~/.meteor
          key: v1-meteor-${{ hashFiles('.meteor/versions') }}
@@ -101,7 +104,7 @@ jobs:

      - name: Cache NPM dependencies
        id: cache-meteor-npm
-        uses: actions/cache@v2
+        uses: actions/cache@v3
        with:
          path: ~/.npm
          key: v1-npm-${{ hashFiles('package-lock.json') }}
@@ -110,7 +113,7 @@ jobs:

      - name: Cache Meteor build
        id: cache-meteor-build
-        uses: actions/cache@v2
+        uses: actions/cache@v3
        with:
          path: |
            .meteor/local/resolver-result-cache.json
@@ -133,7 +136,7 @@ jobs:
        run: sh ./test-wekan.sh -cv

      - name: Upload coverage
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
        with:
          name: coverage-folder
          path: .coverage/
@@ -144,17 +147,17 @@ jobs:
    needs: [tests]
    steps:
      - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Download coverage
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
        with:
          name: coverage-folder
          path: .coverage/


      - name: Coverage Report
-        uses: VeryGoodOpenSource/very_good_coverage@v1.1.1
+        uses: VeryGoodOpenSource/very_good_coverage@v2.1.0
        with:
          path: ".coverage/lcov.info"
          min_coverage: 1 # TODO add tests and increase to 95!
@@ -6,9 +6,8 @@
 meteor-base@1.5.1

 # Build system
-ecmascript@0.16.2
-standard-minifier-css@1.8.1
-standard-minifier-js@2.8.0
+ecmascript@0.16.5
+standard-minifier-js@2.8.1
 mquandalle:jade
 coffeescript@2.4.1!

@@ -21,23 +20,31 @@ cfs:standard-packages
 cottz:publish-relations
 dburles:collection-helpers
 idmontie:migrations
-matteodem:easy-search
-mongo@1.15.0
+easy:search
+mongo@1.16.4
 mquandalle:collection-mutations

 # Account system
-#wekan-ldap
-#wekan-accounts-cas
-#wekan-accounts-oidc
+accounts-password@2.3.3
+useraccounts:core
+useraccounts:flow-routing
+useraccounts:unstyled
+simple:rest-accounts-password
+wekan-ldap
+wekan-accounts-cas
+wekan-accounts-sandstorm
+wekan-accounts-lockout
+wekan-oidc
+wekan-accounts-oidc

 # Utilities
-check@1.3.1
+check@1.3.2
 jquery@1.11.10
-random@1.2.0
-reactive-dict@1.3.0
-session@1.2.0
-tracker@1.2.0
-underscore@1.0.10
+random@1.2.1
+reactive-dict@1.3.1
+session@1.2.1
+tracker@1.3.0
+underscore@1.0.11
 arillo:flow-router-helpers
 audit-argument-checks@1.0.7
 kadira:blaze-layout
@@ -50,7 +57,7 @@ http@2.0.0! # force new http package
 # UI components
 blaze
 ostrio:i18n
-reactive-var@1.0.11
+reactive-var@1.0.12
 fortawesome:fontawesome
 mousetrap:mousetrap
 mquandalle:jquery-textcomplete
@@ -60,9 +67,9 @@ templates:tabs
 meteor-autosize
 rajit:bootstrap3-datepicker
 shell-server@0.5.0
-email@2.2.1
+email@2.2.3
+horka:swipebox
 dynamic-import@0.7.2
-
 cfs:gridfs
 rzymek:fullcalendar
 msavin:usercache
@@ -74,7 +81,7 @@ konecty:mongo-counter
 percolate:synced-cron
 cfs:filesystem
 ostrio:cookies
-ostrio:files@2.0.1
+ostrio:files@2.3.0
 rajit:bootstrap3-datepicker-fi
 rajit:bootstrap3-datepicker-ar
 rajit:bootstrap3-datepicker-bg
@@ -128,21 +135,10 @@ pascoual:pdfkit
 lmieulet:meteor-coverage
 meteortesting:mocha@2.0.3
 aldeed:simple-schema
-accounts-password@2.3.1
 matb33:collection-hooks
 simple:json-routes
 kadira:flow-router
 spacebars
-useraccounts:core
-useraccounts:flow-routing
-useraccounts:unstyled
-service-configuration@1.3.0
+service-configuration@1.3.1
 communitypackages:picker
-simple:rest-accounts-password
-wekan-accounts-sandstorm
-wekan-accounts-lockout
-wekan-oidc
-wekan-accounts-oidc
-wekan-ldap
-wekan-accounts-cas
-czbaker:lightbox2
+minifier-css@1.6.2
@@ -1 +1 @@
-METEOR@2.7.2
+METEOR@2.10.0
@@ -1,6 +1,6 @@
-accounts-base@2.2.3
-accounts-oauth@1.4.1
-accounts-password@2.3.1
+accounts-base@2.2.6
+accounts-oauth@1.4.2
+accounts-password@2.3.3
 aldeed:collection2@2.10.0
 aldeed:collection2-core@1.2.0
 aldeed:schema-deny@1.1.0
@@ -10,16 +10,16 @@ allow-deny@1.1.1
 arillo:flow-router-helpers@0.5.2
 audit-argument-checks@1.0.7
 autoupdate@1.8.0
-babel-compiler@7.9.0
-babel-runtime@1.5.0
+babel-compiler@7.10.2
+babel-runtime@1.5.1
 base64@1.0.12
 binary-heap@1.0.11
-blaze@2.6.0
+blaze@2.6.1
 blaze-tools@1.1.3
 boilerplate-generator@1.7.1
 caching-compiler@1.2.2
 caching-html-compiler@1.2.1
-callback-hook@1.4.0
+callback-hook@1.5.0
 cfs:access-point@0.1.49
 cfs:base-package@0.0.30
 cfs:collection@0.5.5
@@ -38,33 +38,35 @@ cfs:storage-adapter@0.2.4
 cfs:tempstore@0.1.6
 cfs:upload-http@0.0.20
 cfs:worker@0.1.5
-check@1.3.1
+check@1.3.2
 coffeescript@2.4.1
 coffeescript-compiler@2.4.1
 communitypackages:picker@1.1.0
 cottz:publish-relations@2.0.8
-czbaker:lightbox2@2.7.1_1
 dburles:collection-helpers@1.1.0
-ddp@1.4.0
-ddp-client@2.5.0
+ddp@1.4.1
+ddp-client@2.6.1
 ddp-common@1.4.0
-ddp-rate-limiter@1.1.0
-ddp-server@2.5.0
+ddp-rate-limiter@1.1.1
+ddp-server@2.6.0
 deps@1.0.12
-diff-sequence@1.1.1
+diff-sequence@1.1.2
 dynamic-import@0.7.2
+easy:search@2.2.1
 easylogic:summernote@0.8.8
-ecmascript@0.16.2
+easysearch:components@2.2.2
+easysearch:core@2.2.2
+ecmascript@0.16.5
 ecmascript-runtime@0.8.0
 ecmascript-runtime-client@0.12.1
 ecmascript-runtime-server@0.11.0
-ejson@1.1.2
-email@2.2.1
+ejson@1.1.3
+email@2.2.3
 es5-shim@4.8.0
-fastclick@1.0.13
-fetch@0.1.1
+fetch@0.1.3
 fortawesome:fontawesome@4.7.0
-geojson-utils@1.0.10
+geojson-utils@1.0.11
+horka:swipebox@1.0.2
 hot-code-push@1.0.4
 html-tools@1.1.3
 htmljs@1.1.1
@@ -77,35 +79,31 @@ kadira:blaze-layout@2.3.0
 kadira:dochead@1.5.0
 kadira:flow-router@2.12.1
 konecty:mongo-counter@0.0.5_3
-launch-screen@1.3.0
 livedata@1.0.18
 lmieulet:meteor-coverage@1.1.4
 localstorage@1.2.0
 logging@1.3.1
-matb33:collection-hooks@1.1.2
-matteodem:easy-search@1.6.4
+matb33:collection-hooks@1.2.0
 mdg:validation-error@0.5.1
-meteor@1.10.0
+meteor@1.11.0
 meteor-autosize@5.0.1
 meteor-base@1.5.1
-meteor-platform@1.2.6
 meteorhacks:aggregate@1.3.0
 meteorhacks:collection-utils@1.2.0
 meteorhacks:picker@1.0.3
 meteorhacks:subs-manager@1.6.4
-meteortesting:browser-tests@1.3.5
-meteortesting:mocha@2.0.3
+meteortesting:browser-tests@1.4.2
+meteortesting:mocha@2.0.4
 meteortesting:mocha-core@8.0.1
-minifier-css@1.6.0
-minifier-js@2.7.4
+minifier-css@1.6.2
+minifier-js@2.7.5
 minifiers@1.1.8-faster-rebuild.0
-minimongo@1.8.0
-mobile-status-bar@1.1.0
-modern-browsers@0.1.8
-modules@0.18.0
-modules-runtime@0.13.0
+minimongo@1.9.1
+modern-browsers@0.1.9
+modules@0.19.0
+modules-runtime@0.13.1
 momentjs:moment@2.29.3
-mongo@1.15.0
+mongo@1.16.4
 mongo-decimal@0.1.3
 mongo-dev-server@1.1.0
 mongo-id@1.0.8
@@ -118,16 +116,16 @@ mquandalle:jade-compiler@0.4.5
 mquandalle:jquery-textcomplete@0.8.0_1
 mquandalle:mousetrap-bindglobal@0.0.1
 msavin:usercache@1.8.0
-npm-mongo@4.3.1
-oauth@2.1.2
-oauth2@1.3.1
+npm-mongo@4.12.1
+oauth@2.1.3
+oauth2@1.3.2
 observe-sequence@1.0.20
 ongoworks:speakingurl@1.1.0
 ordered-dict@1.1.0
-ostrio:cookies@2.7.0
-ostrio:cstorage@2.2.2
-ostrio:files@2.0.1
-ostrio:i18n@3.1.0
+ostrio:cookies@2.7.2
+ostrio:cstorage@4.0.1
+ostrio:files@2.3.2
+ostrio:i18n@3.2.0
 pascoual:pdfkit@1.0.7
 peerlibrary:assert@0.3.0
 peerlibrary:base-component@0.17.1
@@ -136,7 +134,7 @@ peerlibrary:computed-field@0.10.0
 peerlibrary:data-lookup@0.3.0
 peerlibrary:reactive-field@0.6.0
 percolate:synced-cron@1.3.2
-promise@0.12.0
+promise@0.12.2
 raix:eventemitter@0.1.3
 raix:handlebar-helpers@0.2.5
 rajit:bootstrap3-datepicker@1.7.1_1
@@ -188,17 +186,17 @@ rajit:bootstrap3-datepicker-uk@1.7.1
 rajit:bootstrap3-datepicker-vi@1.7.1
 rajit:bootstrap3-datepicker-zh-cn@1.7.1
 rajit:bootstrap3-datepicker-zh-tw@1.7.1
-random@1.2.0
+random@1.2.1
 rate-limit@1.0.9
-react-fast-refresh@0.2.3
-reactive-dict@1.3.0
-reactive-var@1.0.11
+react-fast-refresh@0.2.5
+reactive-dict@1.3.1
+reactive-var@1.0.12
 reload@1.3.1
 retry@1.1.0
 routepolicy@1.1.1
 rzymek:fullcalendar@3.8.0
-service-configuration@1.3.0
-session@1.2.0
+service-configuration@1.3.1
+session@1.2.1
 sha@1.0.9
 shell-server@0.5.0
 simple:authenticate-user-by-token@1.2.1
@@ -209,23 +207,22 @@ simple:rest-json-error-handler@1.1.1
 socket-stream-client@0.5.0
 spacebars@1.3.0
 spacebars-compiler@1.3.1
-standard-minifier-css@1.8.1
-standard-minifier-js@2.8.0
+standard-minifier-js@2.8.1
 templates:tabs@2.3.0
 templating@1.4.1
 templating-compiler@1.4.1
 templating-runtime@1.5.0
 templating-tools@1.2.2
-tracker@1.2.0
+tracker@1.3.0
 twbs:bootstrap@3.3.6
 ui@1.0.13
-underscore@1.0.10
+underscore@1.0.11
 url@1.3.2
 useraccounts:core@1.16.2
 useraccounts:flow-routing@1.15.0
 useraccounts:unstyled@1.14.2
-webapp@1.13.1
-webapp-hashing@1.1.0
+webapp@1.13.3
+webapp-hashing@1.1.1
 wekan-accounts-cas@0.1.0
 wekan-accounts-lockout@1.0.0
 wekan-accounts-oidc@1.0.10
@@ -235,3 +232,4 @@ wekan-markdown@1.0.9
 wekan-oidc@1.0.12
 yasaricli:slugify@0.0.7
 zimme:active-route@2.3.2
+zodern:types@1.0.9
@@ -3,7 +3,7 @@ sudo: required

 env:
  TRAVIS_DOCKER_COMPOSE_VERSION: 1.24.0
-  TRAVIS_NODE_VERSION: 14.19.3
+  TRAVIS_NODE_VERSION: 14.21.3
  TRAVIS_NPM_VERSION: latest

 before_install:
@@ -1,55 +1,10 @@
-# This is the configuration of the Transifex tool that we use to manage the
-# translations on Wekan. Documentation at: http://docs.transifex.com/client.
-#
-# Push
-# ====
-#
-# It is recommended that contributors use the Transifex web UI to create and
-# edit translated strings. However in case a contributor has directly jumped
-# into the code and made its translations in the corresponding i18n.json file
-# we can push it using
-#
-# > tx push -t -l ar
-#
-# Where `ar` is the language identifier. In addition, the project maintainer
-# should push the English source file to Transifex at least before each release
-# candidate using:
-#
-# > tx push -s
-#
-# Pull
-# ====
-#
-# The set of accepted language is directly managed in Transifex, the only
-# restriction we define to bundle a new language in the application, is that its
-# completion is at least at 75%.
-#
-# We use:
-#
-# > tx pull
-#
-# to download new versions of existing translations, and
-#
-# > tx pull -a --minimum-perc=75
-#
-# to download new sufficiently advanced translations.
-
 [main]
-host = https://www.transifex.com
-# tap:i18n requires us to use `-` separator in the language identifiers whereas
-# Transifex uses a `_` separator, without an option to customize it on one side
-# or the other, so we need to do a Manual mapping.
-lang_map = ar_EG:ar-EG, bg_BG:bg, cs_CZ:cs-CZ, cy_GB:cy-GB, de_AT:de-AT, de_CH:de-CH, en_BR:en-BR, en_DE:en-DE, en_IT:en-IT, en_GB:en-GB, et_EE:et-EE, es_AR:es-AR, en@ysv:en-YS, es_CL:es-CL, es_419:es-LA, es_PE:es-PE, es_MX:es-MX, es_TX:es-TX, es_PY:es-PY, el_GR:el-GR, fa_IR:fa-IR, fi_FI:fi, fr_FR:fr-FR, fr_CH:fr-CH, fy_NL:fy-NL, gl_ES:gl-ES, gu_IN:gu-IN, he_IL:he-IL, hi_IN:hi-IN, hu_HU:hu, id_ID:id, mn_MN:mn, ms_MY:ms-MY, nl_NL:nl-NL, ko_KR:ko-KR, lv_LV:lv, pl_PL:pl-PL, pt_BR:pt-BR, ro_RO:ro, ru_UA:ru-UA, sl_SI:sl, uk_UA:uk-UA, uz@Arab:uz-AR, uz@Latn:uz-LA, uz_UZ:uz-UZ, vec:ve-CC, vep:ve-PP, vls:vl-SS, war:wa-RR, vi_VN:vi-VN, zh_CN:zh-CN, zh_TW:zh-TW, zh_Hans:zh-Hans, zh_HK:zh-HK, zu_ZA:zu-ZA
+host     = https://www.transifex.com
+lang_map = es_AR: es-AR, es_419: es-LA, es_TX: es-TX, he_IL: he-IL, zh_CN: zh-CN, ar_EG: ar-EG, cs_CZ: cs-CZ, fa_IR: fa-IR, ms_MY: ms-MY, nl_NL: nl-NL, de_CH: de-CH, en_IT: en-IT, uz_UZ: uz-UZ, fr_CH: fr-CH, hi_IN: hi-IN, et_EE: et-EE, es_PE: es-PE, es_MX: es-MX, gl_ES: gl-ES, mn_MN: mn, sl_SI: sl, zh_TW: zh-TW, ast_ES: ast-ES, es_CL: es-CL, ja_JP: ja, lv_LV: lv, ro_RO: ro-RO, az_AZ: az-AZ, cy_GB: cy-GB, gu_IN: gu-IN, pl_PL: pl-PL, vep: ve-PP, en_BR: en-BR, en@ysv: en-YS, hu_HU: hu, ko_KR: ko-KR, pt_BR: pt-BR, zh_HK: zh-HK, zu_ZA: zu-ZA, en_MY: en-MY, ja-Hira: ja-HI, fi_FI: fi, vec: ve-CC, vi_VN: vi-VN, fr_FR: fr-FR, id_ID: id, zh_Hans: zh-Hans, en_DE: en-DE, en_GB: en-GB, el_GR: el-GR, uk_UA: uk-UA, az@latin: az-LA, de_AT: de-AT, uz@Latn: uz-LA, vls: vl-SS, ar_DZ: ar-DZ, bg_BG: bg, es_PY: es-PY, fy_NL: fy-NL, uz@Arab: uz-AR, ru_UA: ru-UA, war: wa-RR

-[wekan.application]
+[o:wekan:p:wekan:r:application]
 file_filter = imports/i18n/data/<lang>.i18n.json
+source_file = imports/i18n/data/en.i18n.json
 source_lang = en
-type = KEYVALUEJSON
+type        = KEYVALUEJSON

-# We might have a dedicated second resource later to translate the “Welcome
-# Board” data.
-#
-# [wekan.welcomeBoard]
-# file_filter = private/welcomeBoard/<lang>.json
-# source_lang = en
-# type = KEYVALUEJSON
@@ -0,0 +1,55 @@
+# This is the configuration of the Transifex tool that we use to manage the
+# translations on Wekan. Documentation at: http://docs.transifex.com/client.
+#
+# Push
+# ====
+#
+# It is recommended that contributors use the Transifex web UI to create and
+# edit translated strings. However in case a contributor has directly jumped
+# into the code and made its translations in the corresponding i18n.json file
+# we can push it using
+#
+# > tx push -t -l ar
+#
+# Where `ar` is the language identifier. In addition, the project maintainer
+# should push the English source file to Transifex at least before each release
+# candidate using:
+#
+# > tx push -s
+#
+# Pull
+# ====
+#
+# The set of accepted language is directly managed in Transifex, the only
+# restriction we define to bundle a new language in the application, is that its
+# completion is at least at 75%.
+#
+# We use:
+#
+# > tx pull
+#
+# to download new versions of existing translations, and
+#
+# > tx pull -a --minimum-perc=75
+#
+# to download new sufficiently advanced translations.
+
+[main]
+host = https://www.transifex.com
+# tap:i18n requires us to use `-` separator in the language identifiers whereas
+# Transifex uses a `_` separator, without an option to customize it on one side
+# or the other, so we need to do a Manual mapping.
+lang_map = ar_DZ:ar-DZ, ar_EG:ar-EG, az_AZ:az-AZ, az@latin:az-LA, bg_BG:bg, cs_CZ:cs-CZ, cy_GB:cy-GB, de_AT:de-AT, de_CH:de-CH, en_BR:en-BR, en_DE:en-DE, en_IT:en-IT, en_GB:en-GB, en_MY:en-MY, et_EE:et-EE, ast_ES:ast-ES, es_AR:es-AR, en@ysv:en-YS, es_CL:es-CL, es_419:es-LA, es_PE:es-PE, es_MX:es-MX, es_TX:es-TX, es_PY:es-PY, el_GR:el-GR, fa_IR:fa-IR, ja-Hira:ja-HI, ja_JP:ja, fi_FI:fi, fr_FR:fr-FR, fr_CH:fr-CH, fy_NL:fy-NL, gl_ES:gl-ES, gu_IN:gu-IN, he_IL:he-IL, hi_IN:hi-IN, hu_HU:hu, id_ID:id, mn_MN:mn, ms_MY:ms-MY, nl_NL:nl-NL, ko_KR:ko-KR, lv_LV:lv, pl_PL:pl-PL, pt_BR:pt-BR, ro_RO:ro-RO, ru_UA:ru-UA, sl_SI:sl, uk_UA:uk-UA, uz@Arab:uz-AR, uz@Latn:uz-LA, uz_UZ:uz-UZ, vec:ve-CC, vep:ve-PP, vls:vl-SS, war:wa-RR, vi_VN:vi-VN, zh_CN:zh-CN, zh_TW:zh-TW, zh_Hans:zh-Hans, zh_HK:zh-HK, zu_ZA:zu-ZA
+
+[wekan.application]
+file_filter = imports/i18n/data/<lang>.i18n.json
+source_lang = en
+type = KEYVALUEJSON
+
+# We might have a dedicated second resource later to translate the “Welcome
+# Board” data.
+#
+# [wekan.welcomeBoard]
+# file_filter = private/welcomeBoard/<lang>.json
+# source_lang = en
+# type = KEYVALUEJSON
@@ -1,4 +1,73 @@
-To get started, [please sign the Contributor License Agreement](https://www.clahub.com/agreements/wekan/wekan).
+## Contributing Security related

-[Then, please read documentation at wiki](https://github.com/wekan/wekan/wiki).
+For responsible security disclosure, please follow this process:
+https://github.com/wekan/wekan/blob/master/SECURITY.md

+CVE Hall of Fame is at https://wekan.github.io/hall-of-fame/
+
+## Contributing to Documentation Wiki
+
+Please clone wiki:
+```
+git clone https://github.com/wekan/wekan.wiki
+```
+Edit .md files, and add changed files in .zip attachment
+directly to comment of new issue at
+https://github.com/wekan/wekan/issues 
+
+## Contributing code
+
+[Building WeKan and sending PR](https://github.com/wekan/wekan/wiki/Emoji).
+
+WeKan code contributors Hall of Fame is at ChangeLog, where
+GitHub usernames are mentioned with changes added:
+
+https://github.com/wekan/wekan/blob/master/CHANGELOG.md
+
+Changes can be like typo fixes, bugfixes, features, or anything else
+like for example at open GitHub issues https://github.com/wekan/wekan/issues .
+Closed issues are already fixed or implemented.
+
+Also see other docs at wiki, for example:
+
+https://github.com/wekan/wekan/wiki/Developer-Documentation
+
+Do not use code formatting or linting like eslist or prettier.
+
+Only send minimal changed code lines, that are related to feature or fix.
+
+WeKan code has MIT license.
+
+About 300 persons have contributed to WeKan, stats at:
+
+https://www.openhub.net/p/wekan
+
+WeKan maintainer xet7 checks PR for typos etc before accepting to WeKan,
+so that WeKan code will still work OK.
+
+## Contributing translations
+
+Non-English translations are contributed only at
+https://transifex.com/wekan/wekan
+
+When adding new features, in your PR to
+https://github.com/wekan/wekan/pulls
+only add new English source language strings
+to https://github.com/wekan/wekan/blob/master/imports/i18n/data/en.i18n.json
+
+Maintainer of WeKan xet7 downloads all newest
+translations from Transifex and adds
+them to WeKan repo before making
+new release.
+
+## About WeKan Organization https://github.com/wekan
+
+xet7 rarely adds any new members to GitHub Organization,
+because xet7 prefers to check PRs.
+
+For some repos (other than https://github.com/wekan/wekan ),
+some contributors have direct commit access.
+
+Some contributors are mentioned at this outdated page:
+
+https://github.com/wekan/wekan/wiki/Team
@@ -1,6 +1,11 @@
-FROM ubuntu:21.10
+FROM --platform=linux/amd64 ubuntu:22.10 as wekan
 LABEL maintainer="wekan"

+# 2022-09-04:
+# - above "--platform=linux/amd64 ubuntu:22.04 as wekan" is needed to build Dockerfile
+#   correctly on Mac M1 etc, to not get this error:
+#   https://stackoverflow.com/questions/71040681/qemu-x86-64-could-not-open-lib64-ld-linux-x86-64-so-2-no-such-file-or-direc
+
 # 2022-04-25:
 # - gyp does not yet work with Ubuntu 22.04 ubuntu:rolling,
 #   so changing to 21.10. https://github.com/wekan/wekan/issues/4488
@@ -16,8 +21,8 @@ ARG DEBIAN_FRONTEND=noninteractive

 ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-essential git ca-certificates python3" \
    DEBUG=false \
-    NODE_VERSION=v14.19.3 \
-    METEOR_RELEASE=1.10.2 \
+    NODE_VERSION=v14.21.3 \
+    METEOR_RELEASE=2.8.1 \
    USE_EDGE=false \
    METEOR_EDGE=1.5-beta.17 \
    NPM_VERSION=latest \
@@ -33,6 +38,12 @@ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-
    ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD=60 \
    ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW=15 \
    ACCOUNTS_COMMON_LOGIN_EXPIRATION_IN_DAYS=90 \
+    ATTACHMENTS_UPLOAD_EXTERNAL_PROGRAM="" \
+    ATTACHMENTS_UPLOAD_MIME_TYPES="" \
+    ATTACHMENTS_UPLOAD_MAX_SIZE=0 \
+    AVATARS_UPLOAD_EXTERNAL_PROGRAM="" \
+    AVATARS_UPLOAD_MIME_TYPES="" \
+    AVATARS_UPLOAD_MAX_SIZE=72000 \
    RICHER_CARD_COMMENT_EDITOR=false \
    CARD_OPENED_WEBHOOK_ENABLED=false \
    MAX_IMAGE_PIXEL="" \
@@ -46,10 +57,12 @@ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-
    MATOMO_SITE_ID="" \
    MATOMO_DO_NOT_TRACK=true \
    MATOMO_WITH_USERNAME=false \
+    METRICS_ALLOWED_IP_ADDRESSES="" \
    BROWSER_POLICY_ENABLED=true \
    TRUSTED_URL="" \
    WEBHOOKS_ATTRIBUTES="" \
    OAUTH2_ENABLED=false \
+    OIDC_REDIRECTION_ENABLED=false \
    OAUTH2_CA_CERT="" \
    OAUTH2_ADFS_ENABLED=false \
    OAUTH2_LOGIN_STYLE=redirect \
@@ -144,15 +157,15 @@ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-
    SAML_ATTRIBUTES="" \
    ORACLE_OIM_ENABLED=false \
    WAIT_SPINNER="" \
-    NODE_OPTIONS="--max_old_space_size=4096" \
-    WRITABLE_PATH=/data
+    WRITABLE_PATH=/data \
+    S3=""

-#---------------------------------------------------------------------
-# https://github.com/wekan/wekan/issues/3585#issuecomment-1021522132
-# Add more Node heap:
-#   NODE_OPTIONS="--max_old_space_size=4096"
-# Add more stack:
-#   bash -c "ulimit -s 65500; exec node --stack-size=65500 main.js"
+#   NODE_OPTIONS="--max_old_space_size=4096" \
+
+#---------------------------------------------
+# == at docker-compose.yml: AUTOLOGIN WITH OIDC/OAUTH2 ====
+# https://github.com/wekan/wekan/wiki/autologin
+#- OIDC_REDIRECTION_ENABLED=true
 #---------------------------------------------------------------------

 # Copy the app to the image
@@ -165,7 +178,6 @@ RUN \
    \
    # OS dependencies
    apt-get update -y && apt-get install -y --no-install-recommends ${BUILD_DEPS} && \
-    #pip3 install -U pip setuptools wheel && \
    \
    # Meteor installer doesn't work with the default tar binary, so using bsdtar while installing.
    # https://github.com/coreos/bugs/issues/1095#issuecomment-350574389
@@ -176,43 +188,9 @@ RUN \
    wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
    wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \
    #---------------------------------------------------------------------------------------------
-    # Node Fibers 100% CPU usage issue:
-    # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-381453161
-    # https://github.com/meteor/meteor/issues/9796#issuecomment-381676326
-    # https://github.com/sandstorm-io/sandstorm/blob/0f1fec013fe7208ed0fd97eb88b31b77e3c61f42/shell/server/00-startup.js#L99-L129
-    # Also see beginning of wekan/server/authentication.js
-    #   import Fiber from "fibers";
-    #   Fiber.poolSize = 1e9;
-    # OLD: Download node version 8.12.0 prerelease that has fix included, => Official 8.12.0 has been released
-    # Description at https://releases.wekan.team/node.txt
-    #wget https://releases.wekan.team/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
-    #echo "1ed54adb8497ad8967075a0b5d03dd5d0a502be43d4a4d84e5af489c613d7795  node-v8.12.0-linux-x64.tar.gz" >> SHASUMS256.txt.asc && \
    \
    # Verify nodejs authenticity
    grep ${NODE_VERSION}-${ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | shasum -a 256 -c - && \
-    #export GNUPGHOME="$(mktemp -d)" && \
-    #\
-    # Try other key servers if ha.pool.sks-keyservers.net is unreachable
-    # Code from https://github.com/chorrell/docker-node/commit/2b673e17547c34f17f24553db02beefbac98d23c
-    # gpg keys listed at https://github.com/nodejs/node#release-team
-    # and keys listed here from previous version of this Dockerfile
-    #for key in \
-    #9554F04D7259F04124DE6B476D5A82AC7E37093B \
-    #94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
-    #FD3A5288F042B6850C66B31F09FE44734EB7990E \
-    #71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-    #DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
-    #C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
-    #B9AE9905FFD7803F25714661B63B535A4C206CA9 \
-    #; do \
-    #gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
-    #gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
-    #gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
-    #done && \
-    #gpg --verify SHASUMS256.txt.asc && \
-    # Ignore socket files then delete files then delete directories
-    #find "$GNUPGHOME" -type f | xargs rm -f && \
-    #find "$GNUPGHOME" -type d | xargs rm -fR && \
    rm -f SHASUMS256.txt.asc && \
    \
    # Install Node
@@ -229,90 +207,32 @@ RUN \
    \
    # Install Node dependencies. Python path for node-gyp.
    npm install -g npm@${NPM_VERSION} && \
-    #npm config set python python2.7 && \
-    #npm install -g node-gyp && \
-    #npm install -g fibers@${FIBERS_VERSION} && \
    \
    # Change user to wekan and install meteor
    cd /home/wekan/ && \
    chown wekan --recursive /home/wekan && \
-    #curl "https://install.meteor.com" -o /home/wekan/install_meteor.sh && \
-    #curl "https://install.meteor.com/?release=${METEOR_RELEASE}" -o /home/wekan/install_meteor.sh && \
-    # OLD: sed -i "s|RELEASE=.*|RELEASE=${METEOR_RELEASE}\"\"|g" ./install_meteor.sh && \
-    # Install Meteor forcing its progress
-    #sed -i 's/VERBOSITY="--silent"/VERBOSITY="--progress-bar"/' ./install_meteor.sh && \
    echo "Starting meteor ${METEOR_RELEASE} installation...   \n" && \
    gosu wekan:wekan curl https://install.meteor.com/ | /bin/sh && \
    mv /root/.meteor /home/wekan/ && \
    chown wekan --recursive /home/wekan/.meteor && \
    \
-    # Check if opting for a release candidate instead of major release
-    #if [ "$USE_EDGE" = false ]; then \
-      #gosu wekan:wekan sh /home/wekan/install_meteor.sh; \
-    #  gosu wekan:wekan curl https://install.meteor.com/ | sh; \
-    #else \
-    #  gosu wekan:wekan git clone --recursive --depth 1 -b release/METEOR@${METEOR_EDGE} https://github.com/meteor/meteor.git /home/wekan/.meteor; \
-    #fi; \
-    #\
-    # Get additional packages
-    #mkdir -p /home/wekan/app/packages && \
-    #chown wekan:wekan --recursive /home/wekan && \
-    # REPOS BELOW ARE INCLUDED TO WEKAN REPO
-    #cd /home/wekan/app/packages && \
-    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router && \
-    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \
-    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git && \
-    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git && \
-    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git && \
-    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git && \
-    #gosu wekan:wekan git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git && \
-    #gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan-accounts-oidc && \
-    #gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_oidc wekan-oidc && \
-    #gosu wekan:wekan rm -rf meteor-accounts-oidc && \
    sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/app/packages/meteor-useraccounts-core/package.js && \
    cd /home/wekan/.meteor && \
    gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \
    \
-    # extract the OpenAPI specification
-    #npm install -g api2html@0.3.3 && \
-    #mkdir -p /home/wekan/python && \
-    #chown wekan --recursive /home/wekan/python && \
-    #cd /home/wekan/python && \
-    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/Kronuz/esprima-python && \
-    #cd /home/wekan/python/esprima-python && \
-    #python3 setup.py install --record files.txt && \
-    #cd /home/wekan/app && \
-    #mkdir -p /home/wekan/app/public/api && \
-    #chown wekan --recursive /home/wekan/app && \
-    #gosu wekan:wekan python3 ./openapi/generate_openapi.py --release $(git describe --tags --abbrev=0) > ./public/api/wekan.yml && \
-    #gosu wekan:wekan /opt/nodejs/bin/api2html -c ./public/logo-header.png -o ./public/api/wekan.html ./public/api/wekan.yml; \
    # Build app
    cd /home/wekan/app && \
    mkdir -p /home/wekan/.npm && \
    chown wekan --recursive /home/wekan/.npm /home/wekan/.config /home/wekan/.meteor && \
-    #gosu wekan:wekan /home/wekan/.meteor/meteor add standard-minifier-js && \
    chmod u+w *.json && \
    gosu wekan:wekan npm install && \
    gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build && \
-    #rm /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs && \
-    #Removed binary version of bcrypt because of security vulnerability that is not fixed yet.
-    #https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac
-    #https://github.com/wekan/wekan/commit/7eeabf14be3c63fae2226e561ef8a0c1390c8d3c
-    #cd /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt && \
-    #gosu wekan:wekan rm -rf node_modules/bcrypt && \
-    #gosu wekan:wekan npm install bcrypt && \
-    #
-    # Delete phantomjs
-    #cd /home/wekan/app_build/bundle && \
-    #find . -name "*phantomjs*" | xargs rm -rf && \
-    #
    cd /home/wekan/app_build/bundle/programs/server/ && \
    chmod u+w *.json && \
    gosu wekan:wekan npm install && \
    cd node_modules/fibers && \
    node build.js && \
    cd ../.. && \
-    #gosu wekan:wekan npm install bcrypt && \
    # Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc.
    rm -rf /home/wekan/app_build/bundle/programs/web.browser.legacy && \
    mv /home/wekan/app_build/bundle /build && \
@@ -339,6 +259,8 @@ ENV PORT=8080
 EXPOSE $PORT
 USER wekan

+STOPSIGNAL SIGKILL
+
 #---------------------------------------------------------------------
 # https://github.com/wekan/wekan/issues/3585#issuecomment-1021522132
 # Add more Node heap:
@@ -349,4 +271,5 @@ USER wekan
 #
 # CMD ["node", "/build/main.js"]

-CMD ["bash", "-c", "ulimit -s 65500; exec node --stack-size=65500 /build/main.js"]
+#CMD ["bash", "-c", "ulimit -s 65500; exec node --stack-size=65500 /build/main.js"]
+CMD ["bash", "-c", "ulimit -s 65500; exec node /build/main.js"]
@@ -4,7 +4,7 @@ FROM amd64/alpine:3.7 AS builder
 ENV QEMU_VERSION=v4.2.0-6 \
    QEMU_ARCHITECTURE=aarch64 \
    NODE_ARCHITECTURE=linux-arm64 \
-    NODE_VERSION=v14.19.3 \
+    NODE_VERSION=v14.21.3 \
    WEKAN_VERSION=latest  \
    WEKAN_ARCHITECTURE=arm64 \
    NODE_OPTIONS="--max_old_space_size=4096"
@@ -49,7 +49,7 @@ LABEL maintainer="wekan"
 # Set the environment variables (defaults where required)
 ENV QEMU_ARCHITECTURE=aarch64 \
    NODE_ARCHITECTURE=linux-arm64 \
-    NODE_VERSION=v14.19.3 \
+    NODE_VERSION=v14.21.3 \
    NODE_ENV=production \
    NPM_VERSION=latest \
    WITH_API=true \
@@ -93,5 +93,6 @@ USER wekan
 #
 #CMD ["node", "/home/wekan/bundle/main.js"]

-CMD ["bash", "-c", "ulimit -s 65500; exec node --stack-size=65500 /home/wekan/bundle/main.js"]
+#CMD ["bash", "-c", "ulimit -s 65500; exec node --stack-size=65500 /home/wekan/bundle/main.js"]
+CMD ["bash", "-c", "ulimit -s 65500; exec node /home/wekan/bundle/main.js"]

@@ -1,25 +1,27 @@
-[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/wekan/wekan)
+[Gitpod Ready-to-Code](https://gitpod.io/#https://github.com/wekan/wekan)

 # WeKan ® - Open Source kanban

-[![Contributors](https://img.shields.io/github/contributors/wekan/wekan.svg "Contributors")](https://github.com/wekan/wekan/graphs/contributors)
-[![Docker Repository on Quay](https://quay.io/repository/wekan/wekan/status "Docker Repository on Quay")](https://quay.io/repository/wekan/wekan)
-[![Docker Hub container status](https://img.shields.io/docker/build/wekanteam/wekan.svg "Docker Hub container status")](https://hub.docker.com/r/wekanteam/wekan)
-[![Docker Hub pulls](https://img.shields.io/docker/pulls/wekanteam/wekan.svg "Docker Hub Pulls")](https://hub.docker.com/r/wekanteam/wekan)
-[![Wekan Build Status][travis_badge]][travis_status]
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/02137ecec4e34c5aa303f57637196a93 "Codacy Badge")](https://www.codacy.com/app/xet7/wekan?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=wekan/wekan&amp;utm_campaign=Badge_Grade)
-[![Code Climate](https://codeclimate.com/github/wekan/wekan/badges/gpa.svg "Code Climate")](https://codeclimate.com/github/wekan/wekan)
-[![Project Dependencies](https://david-dm.org/wekan/wekan.svg "Project Dependencies")](https://david-dm.org/wekan/wekan)
-[![Code analysis at Open Hub](https://img.shields.io/badge/code%20analysis-at%20Open%20Hub-brightgreen.svg "Code analysis at Open Hub")](https://www.openhub.net/p/wekan)
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwekan%2Fwekan.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fwekan%2Fwekan?ref=badge_shield)
-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/4619/badge)](https://bestpractices.coreinfrastructure.org/projects/4619)
+## Docker Containers
+
+- [Quay](https://quay.io/repository/wekan/wekan)
+- [Docker Hub](https://hub.docker.com/r/wekanteam/wekan)
+
+Other platforms and compatible software versions at https://wekan.github.io Download section.
+
+## Code stats
+
+- [Code Climate](https://codeclimate.com/github/wekan/wekan)
+- [Open Hub](https://www.openhub.net/p/wekan)
+- [OSS Insight](https://ossinsight.io/analyze/wekan/wekan)
+- [CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/4619)

 ## [Translate WeKan ® at Transifex](https://transifex.com/wekan/wekan)

 Translations to non-English languages are accepted only at [Transifex](https://transifex.com/wekan/wekan) using webbrowser.
-New English strings of new features can be added as PRs to edge branch file wekan/i18n/en.i18n.json .
+New English strings of new features can be added as PRs to master branch file wekan/imports/i18n/data/en.i18n.json .

-## [Wekan feature requests and bugs](https://github.com/wekan/wekan/issues)
+## [WeKan ® feature requests and bugs](https://github.com/wekan/wekan/issues)

 Please add most of your questions as GitHub issue: [WeKan ® Feature Requests and Bugs](https://github.com/wekan/wekan/issues).
 It's better than at chat where details get lost when chat scrolls up.
@@ -28,12 +30,12 @@ It's better than at chat where details get lost when chat scrolls up.

 [Discussions][discussions] - WeKan Community GitHub Discussions, that are not [Feature Requests and Bugs](https://github.com/wekan/wekan/issues).

-[Wekan IRC FAQ](https://github.com/wekan/wekan/wiki/IRC-FAQ)
+[WeKan IRC FAQ](https://github.com/wekan/wekan/wiki/IRC-FAQ)

-## Docker: Please only use Docker release tags
+## Docker: Latest tag has newest release

-Note: With Docker, please don't use latest tag. Only use release tags.
-See https://github.com/wekan/wekan/issues/3874
+You can use latest tag to get newest release tag.
+See bottom of https://github.com/wekan/wekan/issues/3874

 ## FAQ

@@ -56,8 +58,8 @@ install Wekan on your own computer or server. In fact we encourage you to do
 that by providing one-click installation on various platforms.

 - WeKan ® is used in [most countries of the world](https://snapcraft.io/wekan).
- Wekan largest user has 22k users using Wekan in their company.
- Wekan has been [translated](https://transifex.com/wekan/wekan) to about 105 languages.
+- WeKan ® largest user has 22k users using WeKan ® in their company.
+- WeKan ® has been [translated](https://transifex.com/wekan/wekan) to about 105 languages.
 - [Features][features]: WeKan ® has real-time user interface.
 - [Platforms][platforms]: WeKan ® supports many platforms.
  WeKan ® is critical part of new platforms Wekan is currently being integrated to.
@@ -113,12 +115,8 @@ with [Meteor](https://www.meteor.com).
 [wekan_issues]: https://github.com/wekan/wekan/issues
 [wekan_issues]: https://github.com/wekan/wekan/issues
 [docker_image]: https://hub.docker.com/r/wekanteam/wekan/
-[travis_badge]: https://travis-ci.org/wekan/wekan.svg?branch=devel
-[travis_status]: https://travis-ci.org/wekan/wekan
 [wekan_wiki]: https://github.com/wekan/wekan/wiki
 [translate_wekan]: https://www.transifex.com/wekan/wekan/
 [open_source]: https://en.wikipedia.org/wiki/Open-source_software
 [free_software]: https://en.wikipedia.org/wiki/Free_software
 [discussions]: https://github.com/wekan/wekan/discussions
-
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwekan%2Fwekan.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fwekan%2Fwekan?ref=badge_large)
@@ -105,7 +105,7 @@ a security issue, we'd like to know about it, and also how to fix it:

 Typical already known or "no impact" bugs such as:

- Brute force password guessign. Currently there is
+- Brute force password guessing. Currently there is
  [brute force protection with eluck:accounts-lockout](https://github.com/wekan/wekan/blob/master/CHANGELOG.md#v080-2018-04-04-wekan-release).
 - Security issues related to that Wekan uses Meteor 1.6.0.1 related packages, and upgrading to newer
  Meteor 1.6.1 is complicated process that requires lots of changes to many dependency packages.
@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v6.26.0"
+appVersion: "v6.78.0"
 files:
  userUploads:
    - README.md
@@ -21,31 +21,39 @@ import sys

 arguments = len(sys.argv) - 1

+syntax = """=== Wekan API Python CLI: Shows IDs for addcard ===
+# AUTHORID is USERID that writes card or custom field.
+If *nix:  chmod +x api.py => ./api.py users
+  Syntax:
+    User API:
+    python3 api.py user                 # Current user and list of current user boards
+    python3 api.py boards USERID        # Boards of USERID
+    python3 api.py swimlanes BOARDID    # Swimlanes of BOARDID
+    python3 api.py lists BOARDID        # Lists of BOARDID
+    python3 api.py list BOARDID LISTID  # Info of LISTID
+    python3 api.py createlist BOARDID LISTTITLE # Create list
+    python3 api.py addcard AUTHORID BOARDID SWIMLANEID LISTID CARDTITLE CARDDESCRIPTION
+    python3 api.py editcard BOARDID LISTID CARDID NEWCARDTITLE NEWCARDDESCRIPTION
+    python3 api.py customfields BOARDID # Custom Fields of BOARDID
+    python3 api.py customfield BOARDID CUSTOMFIELDID # Info of CUSTOMFIELDID
+    python3 api.py addcustomfieldtoboard AUTHORID BOARDID NAME TYPE SETTINGS SHOWONCARD AUTOMATICALLYONCARD SHOWLABELONMINICARD SHOWSUMATTOPOFLIST # Add Custom Field to Board
+    python3 api.py listattachments BOARDID # List attachments
+
+  Admin API:
+    python3 api.py users                # All users
+    python3 api.py boards               # All Public Boards
+    python3 api.py newuser USERNAME EMAIL PASSWORD
+"""
+
 if arguments == 0:
-    print("=== Wekan API Python CLI: Shows IDs for addcard ===")
-    print("AUTHORID is USERID that writes card.")
-    print("If *nix:  chmod +x api.py => ./api.py users")
-    print("Syntax:")
-    print("  python3 api.py users                # All users")
-    print("  python3 api.py boards               # All Public Boards")
-    print("  python3 api.py boards USERID        # Boards of USERID")
-    print("  python3 api.py board BOARDID        # Info of BOARDID")
-    print("  python3 api.py customfields BOARDID # Custom Fields of BOARDID")
-    print("  python3 api.py customfield BOARDID CUSTOMFIELDID # Info of CUSTOMFIELDID")
-    print("  python3 api.py addcustomfieldtoboard AUTHORID BOARDID NAME TYPE SETTINGS SHOWONCARD AUTOMATICALLYONCARD SHOWLABELONMINICARD SHOWSUMATTOPOFLIST # Add Custom Field to Board")
-    print("  python3 api.py swimlanes BOARDID    # Swimlanes of BOARDID")
-    print("  python3 api.py lists BOARDID        # Lists of BOARDID")
-    print("  python3 api.py list BOARDID LISTID  # Info of LISTID")
-    print("  python3 api.py createlist BOARDID LISTTITLE # Create list")
-    print("  python3 api.py addcard AUTHORID BOARDID SWIMLANEID LISTID CARDTITLE CARDDESCRIPTION")
-    print("  python3 api.py editcard BOARDID LISTID CARDID NEWCARDTITLE NEWCARDDESCRIPTION")
-    print("  python3 api.py listattachments BOARDID # List attachments")
+    print(syntax)
+    exit
+
 # TODO:
 #   print("  python3 api.py attachmentjson BOARDID ATTACHMENTID # One attachment as JSON base64")
 #   print("  python3 api.py attachmentbinary BOARDID ATTACHMENTID # One attachment as binary file")
 #   print("  python3 api.py attachmentdownload BOARDID ATTACHMENTID # One attachment as file")
 #   print("  python3 api.py attachmentsdownload BOARDID # All attachments as files")
-    exit

 # ------- SETTINGS START -------------

@@ -61,33 +69,6 @@ wekanurl = 'http://localhost:4000/'
 # ------- SETTINGS END -------------

 """
-EXAMPLE:
-
-python3 api.py
-
-OR:
-chmod +x api.py
-./api.py
-
-=== Wekan API Python CLI: Shows IDs for addcard ===
-AUTHORID is USERID that writes card.
-Syntax:
-  python3 api.py users                # All users
-  python3 api.py boards USERID        # Boards of USERID
-  python3 api.py board BOARDID        # Info of BOARDID
-  python3 api.py customfields BOARDID # Custom Fields of BOARDID
-  python3 api.py customfield BOARDID CUSTOMFIELDID # Info of CUSTOMFIELDID
-  python3 api.py addcustomfieldtoboard AUTHORID BOARDID NAME TYPE SETTINGS SHOWONCARD AUTOMATICALLYONCARD SHOWLABELONMINICARD SHOWSUMATTOPOFLIST # Add Custom Field to Board
-  python3 api.py swimlanes BOARDID    # Swimlanes of BOARDID
-  python3 api.py lists BOARDID        # Lists of BOARDID
-  python3 api.py list BOARDID LISTID  # Info of LISTID
-  python3 api.py createlist BOARDID LISTTITLE # Create list
-  python3 api.py addcard AUTHORID BOARDID SWIMLANEID LISTID CARDTITLE CARDDESCRIPTION
-  python3 api.py editcard BOARDID LISTID CARDID NEWCARDTITLE NEWCARDDESCRIPTION
-  python3 api.py listattachments BOARDID # List attachments
-  python3 api.py attachmentjson BOARDID ATTACHMENTID # One attachment as JSON base64
-  python3 api.py attachmentbinary BOARDID ATTACHMENTID # One attachment as binary file
-
 === ADD CUSTOM FIELD TO BOARD ===

 Type: text, number, date, dropdown, checkbox, currency, stringtemplate.
@@ -144,6 +125,8 @@ wekanloginurl = wekanurl + loginurl
 apiboards = 'api/boards/'
 apiattachments = 'api/attachments/'
 apiusers = 'api/users'
+apiuser = 'api/user'
+apiallusers = 'api/allusers'
 e = 'export'
 s = '/'
 l = 'lists'
@@ -152,17 +135,20 @@ sws = 'swimlanes'
 cs = 'cards'
 cf = 'custom-fields'
 bs = 'boards'
+apbs = 'allpublicboards'
 atl = 'attachmentslist'
 at = 'attachment'
 ats = 'attachments'
 users = wekanurl + apiusers
+user = wekanurl + apiuser
+allusers = wekanurl + apiallusers

 # ------- API URL GENERATION END -----------

 # ------- LOGIN TOKEN START -----------

 data = {"username": username, "password": password}
-body = requests.post(wekanloginurl, data=data)
+body = requests.post(wekanloginurl, json=data)
 d = body.json()
 apikey = d['token']

@@ -231,6 +217,21 @@ if arguments == 6:
        print(data2)
        # ------- EDIT CARD END -----------

+if arguments == 4:
+
+    if sys.argv[1] == 'newuser':
+
+        # ------- CREATE NEW USER START -----------
+        username = sys.argv[2]
+        email = sys.argv[3]
+        password = sys.argv[4]
+        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
+        post_data = {'username': '{}'.format(username),'email': '{}'.format(email),'password': '{}'.format(password)}
+        body = requests.post(users, data=post_data, headers=headers)
+        print("=== CREATE NEW USER ===\n")
+        print(body.text)
+        # ------- CREATE NEW USER END -----------
+
 if arguments == 3:

    if sys.argv[1] == 'createlist':
@@ -356,6 +357,16 @@ if arguments == 1:
        print(data2)
        # ------- LIST OF USERS END -----------

+    if sys.argv[1] == 'user':
+        # ------- LIST OF ALL USERS START -----------
+        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
+        print(user)
+        print("=== USER ===\n")
+        body = requests.get(user, headers=headers)
+        data2 = body.text.replace('}',"}\n")
+        print(data2)
+        # ------- LIST OF ALL USERS END -----------
+
    if sys.argv[1] == 'boards':

        # ------- LIST OF PUBLIC BOARDS START -----------
@@ -14,6 +14,7 @@ template(name="archivedBoards")
            i.fa.fa-undo
            | {{_ 'restore-board'}}
          = title
+        span {{ moment archivedAt 'LLL' }}
    else
      li.no-items-message {{_ 'no-archived-boards'}}

@@ -193,7 +193,7 @@ BlazeComponent.extendComponent({
    });

    this.autorun(() => {
-      if (Utils.isMiniScreenOrShowDesktopDragHandles()) {
+      if (Utils.isTouchScreenOrShowDesktopDragHandles()) {
        $swimlanesDom.sortable({
          handle: '.js-swimlane-header-handle',
        });
@@ -228,10 +228,10 @@ BlazeComponent.extendComponent({
    }
  },

-  notDisplayThisBoard(){
+  notDisplayThisBoard() {
    let allowPrivateVisibilityOnly = TableVisibilityModeSettings.findOne('tableVisibilityMode-allowPrivateOnly');
    let currentBoard = Boards.findOne(Session.get('currentBoard'));
-    if(allowPrivateVisibilityOnly !== undefined && allowPrivateVisibilityOnly.booleanValue && currentBoard.permission == 'public'){
+    if (allowPrivateVisibilityOnly !== undefined && allowPrivateVisibilityOnly.booleanValue && currentBoard.permission == 'public') {
      return true;
    }

@@ -319,7 +319,7 @@ BlazeComponent.extendComponent({

 BlazeComponent.extendComponent({
  onRendered() {
-    this.autorun(function() {
+    this.autorun(function () {
      $('#calendar-view').fullCalendar('refetchEvents');
    });
  },
@@ -351,7 +351,7 @@ BlazeComponent.extendComponent({
      events(start, end, timezone, callback) {
        const currentBoard = Boards.findOne(Session.get('currentBoard'));
        const events = [];
-        const pushEvent = function(card, title, start, end, extraCls) {
+        const pushEvent = function (card, title, start, end, extraCls) {
          start = start || card.startAt;
          end = end || card.endAt;
          title = title || card.title;
@@ -375,12 +375,12 @@ BlazeComponent.extendComponent({
        };
        currentBoard
          .cardsInInterval(start.toDate(), end.toDate())
-          .forEach(function(card) {
+          .forEach(function (card) {
            pushEvent(card);
          });
        currentBoard
          .cardsDueInBetween(start.toDate(), end.toDate())
-          .forEach(function(card) {
+          .forEach(function (card) {
            pushEvent(
              card,
              `${card.title} ${TAPi18n.__('card-due')}`,
@@ -388,7 +388,7 @@ BlazeComponent.extendComponent({
              new Date(card.dueAt.getTime() + 36e5),
            );
          });
-        events.sort(function(first, second) {
+        events.sort(function (first, second) {
          return first.id > second.id ? 1 : -1;
        });
        callback(events);
@@ -411,8 +411,10 @@ BlazeComponent.extendComponent({
        if (card) {
          // TODO: add a flag for allDay events
          if (!event.allDay) {
-            card.setStart(event.start.toDate());
-            card.setEnd(event.end.toDate());
+            // https://github.com/wekan/wekan/issues/2917#issuecomment-1236753962
+            //card.setStart(event.start.toDate());
+            //card.setEnd(event.end.toDate());
+            card.setDue(event.start.toDate());
            isOk = true;
          }
        }
@@ -782,9 +782,11 @@
  background-color: rgba(255,255,255,0.3) !important;
 }
 .board-color-dark .list >.list-header,
+/* Comment out, fixed white swimlane text not visible https://github.com/wekan/wekan/issues/4451
 .board-color-dark .swimlane-header {
  color: rgba(255,255,255,0.7);
 }
+*/
 .board-color-dark .minicard-wrapper.is-selected .minicard,
 .board-color-dark .minicard:hover,
 .board-color-dark .minicard-composer.js-composer,
@@ -1141,7 +1143,7 @@
  color: rgba(0,0,0,0.5);
  position: absolute;
  margin-top: -34px;
-  margin-let: -11px;
+  margin-left: -11px;
 }
 .board-color-clearblue a.fa,
 .board-color-clearblue a i.fa {
@@ -1403,7 +1405,7 @@
  background: rgba(255,255,255,0.2);
 }
 .board-color-modern#header #header-main-bar h1 {
-  font-family: Poppins;
+/*  font-family: Poppins; */
  font-weight: bold;
 }
 .board-color-modern#header-quick-access #header-user-bar {
@@ -1430,13 +1432,13 @@
  background: none;
 }
 .board-color-modern .swimlane .swimlane-header-wrap .swimlane-header {
-  font-family: Poppins;
+  /* font-family: Poppins; */
 }
 .board-color-modern .board-list .board-list-item {
  padding: 20px;
 }
 .board-color-modern .board-list-item-name {
-  font-family: Poppins;
+  /* font-family: Poppins; */
 }
 .board-color-modern .list {
  background: transparent;
@@ -1464,7 +1466,7 @@
  background: none;
 }
 .board-color-modern .list-header .list-header-name {
-  font-family: Poppins;
+  /* font-family: Poppins; */
  color: #000;
  font-weight: 500;
 }
@@ -1493,7 +1495,7 @@
  padding: 3px 5px;
 }
 .board-color-modern .header-title {
-  font-family: Poppins;
+  /* font-family: Poppins; */
  font-size: 16px;
  color: #333;
 }
@@ -1509,7 +1511,7 @@
  background: #eee;
 }
 .board-color-modern .pop-over .header .header-title {
-  font-family: Poppins;
+  /* font-family: Poppins; */
  font-size: 16px;
  color: #333;
 }
@@ -1547,7 +1549,7 @@
  background: #eee;
 }
 .board-color-modern .board-color-modern section#notifications-drawer .header h5 {
-  font-family: Poppins;
+  /* font-family: Poppins; */
  font-weight: bold;
 }
 .board-color-modern .board-color-modern section#notifications-drawer .header .close {
@@ -1593,6 +1595,11 @@
  background: #262626;
  color: #fff;
 }
+@media screen and (min-width: 801px) {
+  .board-color-moderndark .js-toggle-desktop-drag-handles {
+    padding-top: 6px
+  }
+}
 .board-color-moderndark#header #header-main-bar .board-header-btn.emphasis {
  background: #2a2a2a;
 }
@@ -1627,6 +1634,9 @@
    background: #2a2a2a;
    color: #fff;
  }
+  #header.board-color-moderndark #header-main-bar .board-header-btn i.fa {
+    margin: 0 8px;
+  }
 }
 .board-color-moderndark#header ul li.current,
 .board-color-moderndark#header-quick-access ul li.current {
@@ -1702,7 +1712,6 @@
  background: rgba(255,255,255,0.2);
 }
 .board-color-moderndark#header #header-main-bar h1 {
-  font-family: Poppins;
  font-weight: bold;
  line-height: 0.8em;
  padding-top: 10px;
@@ -1715,9 +1724,6 @@
  color: #ccc;
  padding: 4px 0;
 }
-.board-color-moderndark .swimlane .swimlane-header-wrap .swimlane-header {
-  font-family: Poppins;
-}
 .board-color-moderndark .swimlane .swimlane-header-wrap .swimlane-header-menu {
  padding: 6px;
  font-size: 16px;
@@ -1758,6 +1764,19 @@
  line-height: 14px;
  color: #eee;
 }
+@media screen and (max-width: 800px) {
+  .board-color-moderndark .list-header .list-header-name {
+    line-height: 40px;
+  }
+}
+@media screen and (min-width: 801px) {
+  .board-color-moderndark .list-header .list-header-name {
+    float: left;
+  }
+  .board-color-moderndark .list-header .list-header-menu {
+    padding: 0 10px 10px;
+  }
+}
 .board-color-moderndark .list-header .list-header-menu {
  padding: 10px;
  top: 0;
@@ -1856,6 +1875,15 @@
  .board-color-moderndark .card-details {
    width: 98%;
  }
+  .card-details-popup {
+    padding: 0px;
+  }
+  .card-details-left, .card-details-right {
+    padding: 0px 10px;
+  }
+  .card-details .card-details-header .card-details-menu-mobile-web {
+    margin-right: 0;
+  }
 }
@media screen and (min-width: 801px) {
  .board-color-moderndark .card-details {
@@ -1963,7 +1991,7 @@
  background-color: #333;
 }
 .pop-over.board-color-moderndark .header-title {
-  font-family: Poppins;
+  /* font-family: Poppins; */
  font-size: 16px;
  color: #ccc;
 }
@@ -2045,12 +2073,14 @@
 .board-color-exodark body {
  background: #222;
 }
+/* Uncomment to fix change color selected checkmark not visible
 .board-color-exodark i {
-  color: #00897b !important;
+  color: #fff !important;
 }
+*/
 .board-color-exodark .board-canvas {
  background: #222;
-  font-family: Poppins;
+  /* font-family: Poppins; */
 }
 .board-color-exodark .swimlane {
  background: #222;
@@ -2147,9 +2177,12 @@
 .board-color-exodark h4,
 .board-color-exodark h5,
 .board-color-exodark h6,
-.board-color-exodark p,
-.board-color-exodark a,
-.board-color-exodark span {
+/* Below added .card-details > to p/a/span to fix white swimlane text not visible
+   https://github.com/wekan/wekan/issues/4451
+*/
+.board-color-exodark .card-details > p,
+.board-color-exodark .card-details > a,
+.board-color-exodark .card-details > span {
  color: #fff !important;
 }
 .board-color-exodark .activity-desc {
@@ -2164,7 +2197,7 @@
  border: 1px solid #00897b;
 }
 .board-color-exodark .toggle-switch:checked ~ .toggle-label {
-  background-color: #00897b !important;
+  background-color: #fff !important;
 }
 .pop-over.board-color-exodark {
  background: #2b2b2b;
@@ -1,4 +1,4 @@
-@import url("css/reset.css") print, screen;
+@import url("../../../css/reset.css") print, screen;

 .board-list {
  margin: 0 8px;
@@ -62,7 +62,7 @@ template(name="boardList")
                    i.fa.js-has-spenttime-cards(
                      class="fa-circle{{#if hasOvertimeCards}} has-overtime-card-active{{else}} no-overtime-card-active{{/if}}"
                      title="{{#if hasOvertimeCards}}{{_ 'has-overtime-cards'}}{{else}}{{_ 'has-spenttime-cards'}}{{/if}}")
-                  if isMiniScreenOrShowDesktopDragHandles
+                  if isTouchScreenOrShowDesktopDragHandles
                    i.fa.board-handle(
                        class="fa-arrows"
                        title="{{_ 'Drag board'}}")
@@ -94,16 +94,18 @@ template(name="boardList")
                  span.board-list-item-name(title="{{_ 'board-drag-drop-reorder-or-click-open'}}")
                    +viewer
                      = title
-                  if allowsBoardMemberList
-                    .minicard-members
-                      each member in boardMembers _id
-                        a.name
-                          +userAvatar(userId=member noRemove=true)
-                  if allowsCardCounterList
-                    .minicard-lists.flex.flex-wrap
-                      each list in boardLists _id
-                        .item
-                          | {{ list }}
+                  unless currentSetting.hideBoardMemberList
+                    if allowsBoardMemberList
+                      .minicard-members
+                        each member in boardMembers _id
+                          a.name
+                            +userAvatar(userId=member noRemove=true)
+                  unless currentSetting.hideCardCounterList
+                    if allowsCardCounterList
+                      .minicard-lists.flex.flex-wrap
+                        each list in boardLists _id
+                          .item
+                            | {{ list }}
                  i.fa.js-star-board(
                    class="fa-star{{#if isStarred}} is-star-active{{else}}-o{{/if}}"
                    title="{{_ 'star-board-title'}}")
@@ -114,7 +116,7 @@ template(name="boardList")
                    i.fa.js-has-spenttime-cards(
                      class="fa-circle{{#if hasOvertimeCards}} has-overtime-card-active{{else}} no-overtime-card-active{{/if}}"
                      title="{{#if hasOvertimeCards}}{{_ 'has-overtime-cards'}}{{else}}{{_ 'has-spenttime-cards'}}{{/if}}")
-                  if isMiniScreenOrShowDesktopDragHandles
+                  if isTouchScreenOrShowDesktopDragHandles
                    i.fa.board-handle(
                        class="fa-arrows"
                        title="{{_ 'Drag board'}}")
@@ -2,6 +2,18 @@ import { TAPi18n } from '/imports/i18n';

 const subManager = new SubsManager();

+Template.boardList.helpers({
+  currentSetting() {
+    return Settings.findOne();
+  },
+  hideCardCounterList() {
+    return Utils.isMiniScreen() && Session.get('currentBoard');
+  },
+  hideBoardMemberList() {
+    return Utils.isMiniScreen() && Session.get('currentBoard');
+  },
+})
+
 Template.boardListHeaderBar.events({
  'click .js-open-archived-board'() {
    Modal.open('archivedBoards');
@@ -30,7 +42,7 @@ BlazeComponent.extendComponent({
    Meteor.subscribe('tableVisibilityModeSettings');
    let currUser = Meteor.user();
    let userLanguage;
-    if(currUser && currUser.profile){
+    if (currUser && currUser.profile) {
      userLanguage = currUser.profile.language
    }
    if (userLanguage) {
@@ -79,54 +91,54 @@ BlazeComponent.extendComponent({

    // Disable drag-dropping if the current user is not a board member or is comment only
    this.autorun(() => {
-      if (Utils.isMiniScreenOrShowDesktopDragHandles()) {
+      if (Utils.isTouchScreenOrShowDesktopDragHandles()) {
        $boards.sortable({
          handle: '.board-handle',
        });
      }
    });
  },
-  userHasTeams(){
-    if(Meteor.user() != null && Meteor.user().teams && Meteor.user().teams.length > 0)
+  userHasTeams() {
+    if (Meteor.user() != null && Meteor.user().teams && Meteor.user().teams.length > 0)
      return true;
    else
      return false;
  },
  teamsDatas() {
-    if(Meteor.user().teams)
+    if (Meteor.user().teams)
      return Meteor.user().teams.sort((a, b) => a.teamDisplayName.localeCompare(b.teamDisplayName));
    else
      return [];
  },
-  userHasOrgs(){
-    if(Meteor.user() != null && Meteor.user().orgs && Meteor.user().orgs.length > 0)
+  userHasOrgs() {
+    if (Meteor.user() != null && Meteor.user().orgs && Meteor.user().orgs.length > 0)
      return true;
    else
      return false;
  },
-/*
-  userHasTemplates(){
-    if(Meteor.user() != null && Meteor.user().orgs && Meteor.user().orgs.length > 0)
-      return true;
-    else
-      return false;
-  },
-*/
+  /*
+    userHasTemplates(){
+      if(Meteor.user() != null && Meteor.user().orgs && Meteor.user().orgs.length > 0)
+        return true;
+      else
+        return false;
+    },
+  */
  orgsDatas() {
-    if(Meteor.user().orgs)
+    if (Meteor.user().orgs)
      return Meteor.user().orgs.sort((a, b) => a.orgDisplayName.localeCompare(b.orgDisplayName));
    else
      return [];
  },
-  userHasOrgsOrTeams(){
+  userHasOrgsOrTeams() {
    let boolUserHasOrgs;
-    if(Meteor.user() != null && Meteor.user().orgs && Meteor.user().orgs.length > 0)
+    if (Meteor.user() != null && Meteor.user().orgs && Meteor.user().orgs.length > 0)
      boolUserHasOrgs = true;
    else
      boolUserHasOrgs = false;

    let boolUserHasTeams;
-    if(Meteor.user() != null && Meteor.user().teams && Meteor.user().teams.length > 0)
+    if (Meteor.user() != null && Meteor.user().teams && Meteor.user().teams.length > 0)
      boolUserHasTeams = true;
    else
      boolUserHasTeams = false;
@@ -139,18 +151,19 @@ BlazeComponent.extendComponent({
      // { type: { $in: ['board','template-container'] } },
      $and: [
        { archived: false },
-        { type: { $in: ['board','template-container'] } },
-        { $or:[] }
+        { type: { $in: ['board', 'template-container'] } },
+        { $or: [] },
+        { title: { $not: { $regex: /^\^.*\^$/ } } }
      ]
    };

    let allowPrivateVisibilityOnly = TableVisibilityModeSettings.findOne('tableVisibilityMode-allowPrivateOnly');

-    if (FlowRouter.getRouteName() === 'home'){
-      query.$and[2].$or.push({'members.userId': Meteor.userId()});
+    if (FlowRouter.getRouteName() === 'home') {
+      query.$and[2].$or.push({ 'members.userId': Meteor.userId() });

-      if(allowPrivateVisibilityOnly !== undefined && allowPrivateVisibilityOnly.booleanValue){
-        query.$and.push({'permission': 'private'});
+      if (allowPrivateVisibilityOnly !== undefined && allowPrivateVisibilityOnly.booleanValue) {
+        query.$and.push({ 'permission': 'private' });
      }
      const currUser = Users.findOne(Meteor.userId());

@@ -162,27 +175,27 @@ BlazeComponent.extendComponent({
      // });

      let orgIdsUserBelongs = currUser !== undefined && currUser.teams !== 'undefined' ? currUser.orgIdsUserBelongs() : '';
-      if(orgIdsUserBelongs && orgIdsUserBelongs != ''){
+      if (orgIdsUserBelongs && orgIdsUserBelongs != '') {
        let orgsIds = orgIdsUserBelongs.split(',');
        // for(let i = 0; i < orgsIds.length; i++){
        //   query.$and[2].$or.push({'orgs.orgId': orgsIds[i]});
        // }

        //query.$and[2].$or.push({'orgs': {$elemMatch : {orgId: orgsIds[0]}}});
-        query.$and[2].$or.push({'orgs.orgId': {$in : orgsIds}});
+        query.$and[2].$or.push({ 'orgs.orgId': { $in: orgsIds } });
      }

      let teamIdsUserBelongs = currUser !== undefined && currUser.teams !== 'undefined' ? currUser.teamIdsUserBelongs() : '';
-      if(teamIdsUserBelongs && teamIdsUserBelongs != ''){
+      if (teamIdsUserBelongs && teamIdsUserBelongs != '') {
        let teamsIds = teamIdsUserBelongs.split(',');
        // for(let i = 0; i < teamsIds.length; i++){
        //   query.$or[2].$or.push({'teams.teamId': teamsIds[i]});
        // }
        //query.$and[2].$or.push({'teams': { $elemMatch : {teamId: teamsIds[0]}}});
-        query.$and[2].$or.push({'teams.teamId': {$in : teamsIds}});
+        query.$and[2].$or.push({ 'teams.teamId': { $in: teamsIds } });
      }
    }
-    else if(allowPrivateVisibilityOnly !== undefined && !allowPrivateVisibilityOnly.booleanValue){
+    else if (allowPrivateVisibilityOnly !== undefined && !allowPrivateVisibilityOnly.booleanValue) {
      query = {
        archived: false,
        //type: { $in: ['board','template-container'] },
@@ -197,9 +210,9 @@ BlazeComponent.extendComponent({
  },
  boardLists(boardId) {
    let boardLists = [];
-    const lists = Lists.find({'boardId' : boardId})
+    const lists = Lists.find({ 'boardId': boardId, 'archived': false },{sort: ['sort','asc']});
    lists.forEach(list => {
-      let cardCount = Cards.find({'boardId':boardId, 'listId':list._id}).count()
+      let cardCount = Cards.find({ 'boardId': boardId, 'listId': list._id }).count()
      boardLists.push(`${list.title}: ${cardCount}`);
    });
    return boardLists
@@ -207,7 +220,7 @@ BlazeComponent.extendComponent({

  boardMembers(boardId) {
    let boardMembers = [];
-    const lists = Boards.findOne({'_id' : boardId})
+    const lists = Boards.findOne({ '_id': boardId })
    let members = lists.members
    members.forEach(member => {
      boardMembers.push(member.userId);
@@ -291,10 +304,10 @@ BlazeComponent.extendComponent({
            }
          });
        },
-        'click #resetBtn'(event){
+        'click #resetBtn'(event) {
          let allBoards = document.getElementsByClassName("js-board");
          let currBoard;
-          for(let i=0; i < allBoards.length; i++){
+          for (let i = 0; i < allBoards.length; i++) {
            currBoard = allBoards[i];
            currBoard.style.display = "block";
          }
@@ -302,57 +315,55 @@ BlazeComponent.extendComponent({
        'click #filterBtn'(event) {
          event.preventDefault();
          let selectedTeams = document.querySelectorAll('#jsAllBoardTeams option:checked');
-          let selectedTeamsValues = Array.from(selectedTeams).map(function(elt){return elt.value});
+          let selectedTeamsValues = Array.from(selectedTeams).map(function (elt) { return elt.value });
          let index = selectedTeamsValues.indexOf("-1");
          if (index > -1) {
            selectedTeamsValues.splice(index, 1);
          }

          let selectedOrgs = document.querySelectorAll('#jsAllBoardOrgs option:checked');
-          let selectedOrgsValues = Array.from(selectedOrgs).map(function(elt){return elt.value});
+          let selectedOrgsValues = Array.from(selectedOrgs).map(function (elt) { return elt.value });
          index = selectedOrgsValues.indexOf("-1");
          if (index > -1) {
            selectedOrgsValues.splice(index, 1);
          }

-          if(selectedTeamsValues.length > 0 || selectedOrgsValues.length > 0){
+          if (selectedTeamsValues.length > 0 || selectedOrgsValues.length > 0) {
            const query = {
              $and: [
                { archived: false },
                { type: 'board' },
-                { $or:[] }
+                { $or: [] }
              ]
            };
-            if(selectedTeamsValues.length > 0)
-            {
-              query.$and[2].$or.push({'teams.teamId': {$in : selectedTeamsValues}});
+            if (selectedTeamsValues.length > 0) {
+              query.$and[2].$or.push({ 'teams.teamId': { $in: selectedTeamsValues } });
            }
-            if(selectedOrgsValues.length > 0)
-            {
-              query.$and[2].$or.push({'orgs.orgId': {$in : selectedOrgsValues}});
+            if (selectedOrgsValues.length > 0) {
+              query.$and[2].$or.push({ 'orgs.orgId': { $in: selectedOrgsValues } });
            }

            let filteredBoards = Boards.find(query, {}).fetch();
            let allBoards = document.getElementsByClassName("js-board");
            let currBoard;
-            if(filteredBoards.length > 0){
+            if (filteredBoards.length > 0) {
              let currBoardId;
              let found;
-              for(let i=0; i < allBoards.length; i++){
+              for (let i = 0; i < allBoards.length; i++) {
                currBoard = allBoards[i];
                currBoardId = currBoard.classList[0];
-                found = filteredBoards.find(function(board){
+                found = filteredBoards.find(function (board) {
                  return board._id == currBoardId;
                });

-                if(found !== undefined)
+                if (found !== undefined)
                  currBoard.style.display = "block";
                else
                  currBoard.style.display = "none";
              }
            }
-            else{
-              for(let i=0; i < allBoards.length; i++){
+            else {
+              for (let i = 0; i < allBoards.length; i++) {
                currBoard = allBoards[i];
                currBoard.style.display = "none";
              }
@@ -1,3 +1,12 @@
+.slide {
+  /* swipebox slide background gradient of black to blue, so that back SVG images are visible */
+  background: rgb(2,0,36);
+  background: linear-gradient(90deg, rgba(2,0,36,1) 0%, rgba(9,9,121,1) 14%, rgba(0,212,255,1) 100%); 
+}
+.attachment-upload {
+  text-align: center;
+  font-weight: bold;
+}
 .attachments-galery {
  display: flex;
  flex-wrap: wrap;
@@ -1,10 +1,25 @@
 template(name="cardAttachmentsPopup")
-  ul.pop-over-list
-    li
-      input.js-attach-file.hide(type="file" name="file" multiple)
-      a.js-computer-upload {{_ 'computer'}}
-    li
-      a.js-upload-clipboard-image {{_ 'clipboard'}}
+  if $gt uploads.length 0
+    .attachment-upload {{_ 'uploading'}}
+      table
+        tr
+          th.upload-file-name-descr {{_ 'name'}}
+          th.upload-progress-descr {{_ 'progress'}}
+          th.upload-remaining-descr {{_ 'remaining_time'}}
+          th.upload-speed-descr {{_ 'speed'}}
+        each upload in uploads
+          tr
+            td.upload-file-name-value {{upload.file.name}}
+            td.upload-progress-value {{upload.progress.get}}%
+            td.upload-remaining-value {{getEstimateTime upload}}
+            td.upload-speed-value {{getEstimateSpeed upload}}
+  else
+    ul.pop-over-list
+      li
+        input.js-attach-file.hide(type="file" name="file" multiple)
+        a.js-computer-upload {{_ 'computer'}}
+      li
+        a.js-upload-clipboard-image {{_ 'clipboard'}}

 template(name="previewClipboardImagePopup")
  p <kbd>Ctrl</kbd>+<kbd>V</kbd> {{_ "paste-or-dragdrop"}}
@@ -19,29 +34,27 @@ template(name="attachmentsGalery")
  .attachments-galery
    each attachments
      .attachment-item
-        a.attachment-thumbnail(href="{{link}}" title="{{name}}" data-lightbox="{{name}}")
+        a.attachment-thumbnail.swipebox(href="{{link}}" title="{{sanitize name}}")
          if link
            if isImage
-              img.attachment-thumbnail-img(src="{{link}}")
+              img.attachment-thumbnail-img(src="{{link}}" title="{{sanitize name}}")
            else if($eq extension 'mp3')
-                video(width="100%" height="100%" controls="true")
-                  source(src="{{link}}" type="audio/mpeg")
+              video(width="100%" height="100%" title="{{sanitize name}}" controls="true")
+                source(src="{{link}}" type="audio/mpeg")
            else if($eq extension 'ogg')
-                video(width="100%" height="100%" controls="true")
-                  source(src="{{link}}" type="video/ogg")
+              video(width="100%" height="100%" title="{{sanitize name}}" controls="true")
+                source(src="{{link}}" type="video/ogg")
            else if($eq extension 'webm')
-                video(width="100%" height="100%" controls="true")
-                  source(src="{{link}}" type="video/webm")
+              video(width="100%" height="100%" title="{{sanitize name}}" controls="true")
+                source(src="{{link}}" type="video/webm")
            else if($eq extension 'mp4')
-                video(width="100%" height="100%" controls="true")
-                  source(src="{{link}}" type="video/mp4")
+              video(width="100%" height="100%" title="{{sanitize name}}" controls="true")
+                source(src="{{link}}" type="video/mp4")
            else
              span.attachment-thumbnail-ext= extension
-          else
-            +spinner
        p.attachment-details
          = name
-          span.file-size ({{fileSize size}} KB)
+          span.file-size ({{fileSize size}})
          span.attachment-details-actions
            a.js-download(href="{{link}}?download=true", download="{{name}}")
              i.fa.fa-download
@@ -89,6 +102,12 @@ template(name="attachmentActionsPopup")
              i.fa.fa-arrow-right
              | {{_ 'attachment-move-storage-gridfs'}}

+        if $neq versions.original.storage "s3"
+          if versions.original.storage
+            a.js-move-storage-s3
+              i.fa.fa-arrow-right
+              | {{_ 'attachment-move-storage-s3'}}
+
 template(name="attachmentRenamePopup")
  input.js-edit-attachment-name(type='text' autofocus value="{{getNameWithoutExtension}}" dir="auto")
  .edit-controls.clearfix
@@ -1,3 +1,9 @@
+import { ObjectID } from 'bson';
+import DOMPurify from 'dompurify';
+
+const filesize = require('filesize');
+const prettyMilliseconds = require('pretty-ms');
+
 Template.attachmentsGalery.events({
  'click .js-add-attachment': Popup.open('cardAttachments'),
  // If we let this event bubble, FlowRouter will handle it and empty the page
@@ -13,37 +19,75 @@ Template.attachmentsGalery.helpers({
    return Meteor.user().isBoardAdmin();
  },
  fileSize(size) {
-    return Math.round(size / 1024);
+    const ret = filesize(size);
+    return ret;
+  },
+  sanitize(value) {
+    return DOMPurify.sanitize(value);
  },
 });

+Template.cardAttachmentsPopup.onCreated(function() {
+  this.uploads = new ReactiveVar([]);
+});
+
+Template.cardAttachmentsPopup.helpers({
+  getEstimateTime(upload) {
+    const ret = prettyMilliseconds(upload.estimateTime.get());
+    return ret;
+  },
+  getEstimateSpeed(upload) {
+    const ret = filesize(upload.estimateSpeed.get(), {round: 0}) + "/s";
+    return ret;
+  },
+  uploads() {
+    return Template.instance().uploads.get();
+  }
+});
+
 Template.cardAttachmentsPopup.events({
-  'change .js-attach-file'(event) {
+  'change .js-attach-file'(event, templateInstance) {
    const card = this;
-    if (event.currentTarget.files && event.currentTarget.files[0]) {
-      const fileId = Random.id();
-      const config = {
-        file: event.currentTarget.files[0],
-        fileId: fileId,
-        meta: Utils.getCommonAttachmentMetaFrom(card),
-        chunkSize: 'dynamic',
-      };
-      config.meta.fileId = fileId;
-      const uploader = Attachments.insert(
-        config,
-        false,
-      );
-      uploader.on('uploaded', (error, fileRef) => {
-        if (!error) {
-          if (fileRef.isImage) {
-            card.setCover(fileRef._id);
-          }
+    const files = event.currentTarget.files;
+    if (files) {
+      let uploads = [];
+      for (const file of files) {
+        const fileId = new ObjectID().toString();
+        // If filename is not same as sanitized filename, has XSS, then cancel upload
+        if (file.name !== DOMPurify.sanitize(file.name)) {
+          return false;
        }
-      });
-      uploader.on('end', (error, fileRef) => {
-        Popup.back();
-      });
-      uploader.start();
+        const config = {
+          file: file,
+          fileId: fileId,
+          meta: Utils.getCommonAttachmentMetaFrom(card),
+          chunkSize: 'dynamic',
+        };
+        config.meta.fileId = fileId;
+        const uploader = Attachments.insert(
+          config,
+          false,
+        );
+        uploader.on('start', function() {
+          uploads.push(this);
+          templateInstance.uploads.set(uploads);
+        });
+        uploader.on('uploaded', (error, fileRef) => {
+          if (!error) {
+            if (fileRef.isImage) {
+              card.setCover(fileRef._id);
+            }
+          }
+        });
+        uploader.on('end', (error, fileRef) => {
+          uploads = uploads.filter(_upload => _upload.config.fileId != fileRef._id);
+          templateInstance.uploads.set(uploads);
+          if (uploads.length == 0 ) {
+            Popup.back();
+          }
+        });
+        uploader.start();
+      }
    }
  },
  'click .js-computer-upload'(event, templateInstance) {
@@ -96,7 +140,7 @@ Template.previewClipboardImagePopup.events({
    if (pastedResults && pastedResults.file) {
      const file = pastedResults.file;
      window.oPasted = pastedResults;
-      const fileId = Random.id();
+      const fileId = new ObjectID().toString();
      const config = {
        file,
        fileId: fileId,
@@ -155,6 +199,10 @@ BlazeComponent.extendComponent({
          Meteor.call('moveAttachmentToStorage', this.data()._id, "gridfs");
          Popup.back();
        },
+        'click .js-move-storage-s3'() {
+          Meteor.call('moveAttachmentToStorage', this.data()._id, "s3");
+          Popup.back();
+        },
      }
    ]
  }
@@ -180,7 +228,9 @@ BlazeComponent.extendComponent({
          const name = this.$('.js-edit-attachment-name')[0]
            .value
            .trim() + this.data().extensionWithDot;
-          Meteor.call('renameAttachment', this.data()._id, name);
+          if (name === DOMPurify.sanitize(name)) {
+            Meteor.call('renameAttachment', this.data()._id, name);
+          }
          Popup.back(2);
        },
      }
@@ -2,6 +2,7 @@ import moment from 'moment/min/moment-with-locales';
 import { TAPi18n } from '/imports/i18n';
 import { DatePicker } from '/client/lib/datepicker';
 import Cards from '/models/cards';
+import { CustomFieldStringTemplate } from '/client/lib/customFields'

 Template.cardCustomFieldsPopup.helpers({
  hasCustomField() {
@@ -245,21 +246,18 @@ CardCustomField.register('cardCustomField');
 }.register('cardCustomField-dropdown'));

 // cardCustomField-stringtemplate
-(class extends CardCustomField {
+class CardCustomFieldStringTemplate extends CardCustomField {
  onCreated() {
    super.onCreated();

-    this.stringtemplateFormat = this.data().definition.settings.stringtemplateFormat;
-    this.stringtemplateSeparator = this.data().definition.settings.stringtemplateSeparator;
+    this.customField = new CustomFieldStringTemplate(this.data().definition);

    this.stringtemplateItems = new ReactiveVar(this.data().value ?? []);
  }

  formattedValue() {
-    return (this.data().value ?? [])
-      .filter(value => !!value.trim())
-      .map(value => this.stringtemplateFormat.replace(/%\{value\}/gi, value))
-      .join(this.stringtemplateSeparator ?? '');
+    const ret = this.customField.getFormattedValue(this.data().value);
+    return ret;
  }

  getItems() {
@@ -330,4 +328,5 @@ CardCustomField.register('cardCustomField');
      },
    ];
  }
-}.register('cardCustomField-stringtemplate'));
+}
+CardCustomFieldStringTemplate.register('cardCustomField-stringtemplate');
@@ -337,7 +337,7 @@ input[type="submit"].attachment-add-link-submit {
  }
 }
 .card-details-white {
-  background: unset !important;
+  background: #fff !important;
  color: #000 !important;
  border: 1px solid #eee;
 }
@@ -682,13 +682,12 @@ template(name="cardDetailsActionsPopup")
          i.fa.fa-copy
          | {{_ 'copyCardPopup-title'}}
  unless currentUser.isWorker
-    hr
    ul.pop-over-list
      li
        a.js-copy-checklist-cards
-          i.fa.fa-list
          i.fa.fa-copy
-          | {{_ 'copyChecklistToManyCardsPopup-title'}}
+          i.fa.fa-copy
+          | {{_ 'copyManyCardsPopup-title'}}
    unless archived
      hr
      ul.pop-over-list
@@ -712,39 +711,42 @@ template(name="exportCardPopup")
        | {{_ 'export-card-pdf'}}

 template(name="moveCardPopup")
-  +boardsAndLists
+  +copyAndMoveCard

 template(name="copyCardPopup")
  label(for='copy-card-title') {{_ 'title'}}:
  textarea#copy-card-title.minicard-composer-textarea.js-card-title(autofocus)
    = getTitle
-  +boardsAndLists
+  +copyAndMoveCard

-template(name="copyChecklistToManyCardsPopup")
-  label(for='copy-checklist-cards-title') {{_ 'copyChecklistToManyCardsPopup-instructions'}}:
+template(name="copyManyCardsPopup")
+  label(for='copy-checklist-cards-title') {{_ 'copyManyCardsPopup-instructions'}}:
  textarea#copy-card-title.minicard-composer-textarea.js-card-title(autofocus)
-    | {{_ 'copyChecklistToManyCardsPopup-format'}}
-  +boardsAndLists
+    | {{_ 'copyManyCardsPopup-format'}}
+  +copyAndMoveCard

-template(name="boardsAndLists")
+template(name="convertChecklistItemToCardPopup")
+  label(for='convert-checklist-item-to-card-title') {{_ 'title'}}:
+  textarea#copy-card-title.minicard-composer-textarea.js-card-title(autofocus)
+    = item.title
+  +copyAndMoveCard
+
+template(name="copyAndMoveCard")
  unless currentUser.isWorker
    label {{_ 'boards'}}:
    select.js-select-boards(autofocus)
      each boards
-        if $eq _id currentBoard._id
-          option(value="{{_id}}" selected) {{_ 'current'}}
-        else
-          option(value="{{_id}}" selected="{{#if isMoveAndCopyDialogOptionBoardId _id}}selected{{/if}}") {{title}}
+        option(value="{{_id}}" selected="{{#if isDialogOptionBoardId _id}}selected{{/if}}") {{title}}

  label {{_ 'swimlanes'}}:
  select.js-select-swimlanes
    each swimlanes
-      option(value="{{_id}}" selected="{{#if isMoveAndCopyDialogOptionSwimlaneId _id}}selected{{/if}}") {{title}}
+      option(value="{{_id}}" selected="{{#if isDialogOptionSwimlaneId _id}}selected{{/if}}") {{title}}

  label {{_ 'lists'}}:
  select.js-select-lists
-    each aBoardLists
-      option(value="{{_id}}" selected="{{#if isMoveAndCopyDialogOptionListId _id}}selected{{/if}}") {{title}}
+    each lists
+      option(value="{{_id}}" selected="{{#if isDialogOptionListId _id}}selected{{/if}}") {{title}}

  .edit-controls.clearfix
    button.primary.confirm.js-done {{_ 'done'}}
@@ -10,6 +10,7 @@ import Lists from '/models/lists';
 import CardComments from '/models/cardComments';
 import { ALLOWED_COLORS } from '/config/const';
 import { UserAvatar } from '../users/userAvatar';
+import { DialogWithBoardSwimlaneList } from '/client/lib/dialogWithBoardSwimlaneList';

 const subManager = new SubsManager();
 const { calculateIndexData } = Utils;
@@ -86,17 +87,29 @@ BlazeComponent.extendComponent({
  scrollParentContainer() {
    const cardPanelWidth = 600;
    const parentComponent = this.parentComponent();
-    // TODO sometimes parentComponent is not available, maybe because it's not
-    // yet created?!
-    if (!parentComponent) return;
-    const bodyBoardComponent = parentComponent.parentComponent();
+
+    /*
+        // Incomplete fix about bug where opening card scrolls to wrong place
+        // https://github.com/wekan/wekan/issues/4572#issuecomment-1184149395
+        // TODO sometimes parentComponent is not available, maybe because it's not
+        // yet created?!
+        if (!parentComponent) return;
+        const bodyBoardComponent = parentComponent.parentComponent();
+    */
+
    //On Mobile View Parent is Board, Not Board Body. I cant see how this funciton should work then.
    if (bodyBoardComponent === null) return;
    const $cardView = this.$(this.firstNode());
    const $cardContainer = bodyBoardComponent.$('.js-swimlanes');
-    // TODO sometimes cardContainer is not available, maybe because it's not yet
-    // created?!
-    if (!$cardContainer) return;
+
+    /*
+        // Incomplete fix about bug where opening card scrolls to wrong place
+        // https://github.com/wekan/wekan/issues/4572#issuecomment-1184149395
+        // TODO sometimes cardContainer is not available, maybe because it's not yet
+        // created?!
+        if (!$cardContainer) return;
+    */
+
    const cardContainerScroll = $cardContainer.scrollLeft();
    const cardContainerWidth = $cardContainer.width();

@@ -212,11 +225,6 @@ BlazeComponent.extendComponent({
      //-------------
    }

-    if (!Utils.isMiniScreen()) {
-      Meteor.setTimeout(() => {
-        this.scrollParentContainer();
-      }, 500);
-    }
    const $checklistsDom = this.$('.card-checklist-items');

    $checklistsDom.sortable({
@@ -299,7 +307,7 @@ BlazeComponent.extendComponent({
        $checklistsDom.data('sortable')
      ) {
        $checklistsDom.sortable('option', 'disabled', disabled);
-        if (Utils.isMiniScreenOrShowDesktopDragHandles()) {
+        if (Utils.isTouchScreenOrShowDesktopDragHandles()) {
          $checklistsDom.sortable({ handle: '.checklist-handle' });
        }
      }
@@ -393,7 +401,9 @@ BlazeComponent.extendComponent({
          let card = this.data();
          const listSelect = this.$('.js-select-card-details-lists')[0];
          const listId = listSelect.options[listSelect.selectedIndex].value;
-          card.move(card.boardId, card.swimlaneId, listId, card.sort);
+
+          const minOrder = card.getMinSort(listId, card.swimlaneId);
+          card.move(card.boardId, card.swimlaneId, listId, minOrder - 1);
        },
        'click .js-go-to-linked-card'() {
          Utils.goCardId(this.data().linkedId);
@@ -440,10 +450,20 @@ BlazeComponent.extendComponent({
        'click .js-maximize-card-details'() {
          Meteor.call('toggleCardMaximized');
          autosize($('.card-details'));
+          if (!Utils.isMiniScreen()) {
+            Meteor.setTimeout(() => {
+              this.scrollParentContainer();
+            }, 500);
+          }
        },
        'click .js-minimize-card-details'() {
          Meteor.call('toggleCardMaximized');
          autosize($('.card-details'));
+          if (!Utils.isMiniScreen()) {
+            Meteor.setTimeout(() => {
+              this.scrollParentContainer();
+            }, 500);
+          }
        },
        'click .js-vote'(e) {
          const forIt = $(e.target).hasClass('js-vote-positive');
@@ -668,25 +688,17 @@ Template.cardDetailsActionsPopup.events({
  'click .js-move-card': Popup.open('moveCard'),
  'click .js-copy-card': Popup.open('copyCard'),
  'click .js-convert-checklist-item-to-card': Popup.open('convertChecklistItemToCard'),
-  'click .js-copy-checklist-cards': Popup.open('copyChecklistToManyCards'),
+  'click .js-copy-checklist-cards': Popup.open('copyManyCards'),
  'click .js-set-card-color': Popup.open('setCardColor'),
  'click .js-move-card-to-top'(event) {
    event.preventDefault();
-    const minOrder = _.min(
-      this.list()
-        .cardsUnfiltered(this.swimlaneId)
-        .map((c) => c.sort),
-    );
+    const minOrder = this.getMinSort();
    this.move(this.boardId, this.swimlaneId, this.listId, minOrder - 1);
    Popup.back();
  },
  'click .js-move-card-to-bottom'(event) {
    event.preventDefault();
-    const maxOrder = _.max(
-      this.list()
-        .cardsUnfiltered(this.swimlaneId)
-        .map((c) => c.sort),
-    );
+    const maxOrder = this.getMaxSort();
    this.move(this.boardId, this.swimlaneId, this.listId, maxOrder + 1);
    Popup.back();
  },
@@ -782,8 +794,8 @@ const filterMembers = (filterTerm) => {
        user: Users.findOne(member.userId)
      }))
      .filter(({ user }) =>
-      (user.profile.fullname !== undefined && user.profile.fullname.toLowerCase().indexOf(filterTerm.toLowerCase()) !== -1)
-      || user.profile.fullname === undefined && user.profile.username !== undefined && user.profile.username.toLowerCase().indexOf(filterTerm.toLowerCase()) !== -1)
+        (user.profile.fullname !== undefined && user.profile.fullname.toLowerCase().indexOf(filterTerm.toLowerCase()) !== -1)
+        || user.profile.fullname === undefined && user.profile.username !== undefined && user.profile.username.toLowerCase().indexOf(filterTerm.toLowerCase()) !== -1)
      .map(({ member }) => member);
  }
  return members;
@@ -815,178 +827,58 @@ Template.editCardAssignerForm.events({
  },
 });

-Template.moveCardPopup.events({
-  'click .js-done'() {
-    const card = Cards.findOne(this._id);
-    const bSelect = $('.js-select-boards')[0];
-    let boardId;
-    // if we are a worker, we won't have a board select so we just use the
-    // current boardId of the card.
-    if (bSelect) {
-      boardId = bSelect.options[bSelect.selectedIndex].value;
-    } else {
-      boardId = card.boardId;
-    }
-    const lSelect = $('.js-select-lists')[0];
-    const listId = lSelect.options[lSelect.selectedIndex].value;
-    const slSelect = $('.js-select-swimlanes')[0];
-    const swimlaneId = slSelect.options[slSelect.selectedIndex].value;
-    card.move(boardId, swimlaneId, listId, 0);
-
-    // set new id's to card object in case the card is moved to top by the comment "moveCard" after this command (.js-move-card)
-    this.boardId = boardId;
-    this.swimlaneId = swimlaneId;
-    this.listId = listId;
-
-    Popup.back();
-  },
-});
-BlazeComponent.extendComponent({
-  onCreated() {
-    this.currentBoardId = Utils.getCurrentBoardId();
-    this.selectedBoardId = new ReactiveVar(this.currentBoardId);
-    this.setMoveAndCopyDialogOption(this.currentBoardId);
-  },
-
-  /** set the last confirmed dialog field values
-   * @param boardId the current board id
-   */
-  setMoveAndCopyDialogOption(boardId) {
-    this.moveAndCopyDialogOption = {
-      'boardId' : "",
-      'swimlaneId' : "",
-      'listId' : "",
-    }
-
-    let currentOptions = Meteor.user().getMoveAndCopyDialogOptions();
-    if (currentOptions && boardId && currentOptions[boardId]) {
-      this.moveAndCopyDialogOption = currentOptions[boardId];
-      if (this.moveAndCopyDialogOption.boardId) {
-        this.selectedBoardId.set(this.moveAndCopyDialogOption.boardId)
-      }
-    }
-    subManager.subscribe('board', this.selectedBoardId.get(), false);
-  },
-
-  /** returns if the board id was the last confirmed one
-   * @param boardId check this board id
-   * @return if the board id was the last confirmed one
-   */
-  isMoveAndCopyDialogOptionBoardId(boardId) {
-    let ret = this.moveAndCopyDialogOption.boardId == boardId;
+/** Move Card Dialog */
+(class extends DialogWithBoardSwimlaneList {
+  getDialogOptions() {
+    const ret = Meteor.user().getMoveAndCopyDialogOptions();
    return ret;
-  },
+  }
+  setDone(boardId, swimlaneId, listId, options) {
+    Meteor.user().setMoveAndCopyDialogOption(this.currentBoardId, options);
+    const card = this.data();
+    const minOrder = card.getMinSort(listId, swimlaneId);
+    card.move(boardId, swimlaneId, listId, minOrder - 1);
+  }
+}).register('moveCardPopup');

-  /** returns if the swimlane id was the last confirmed one
-   * @param swimlaneId check this swimlane id
-   * @return if the swimlane id was the last confirmed one
-   */
-  isMoveAndCopyDialogOptionSwimlaneId(swimlaneId) {
-    let ret = this.moveAndCopyDialogOption.swimlaneId == swimlaneId;
+/** Copy Card Dialog */
+(class extends DialogWithBoardSwimlaneList {
+  getDialogOptions() {
+    const ret = Meteor.user().getMoveAndCopyDialogOptions();
    return ret;
-  },
+  }
+  setDone(boardId, swimlaneId, listId, options) {
+    Meteor.user().setMoveAndCopyDialogOption(this.currentBoardId, options);
+    const card = this.data();

-  /** returns if the list id was the last confirmed one
-   * @param listId check this list id
-   * @return if the list id was the last confirmed one
-   */
-  isMoveAndCopyDialogOptionListId(listId) {
-    let ret = this.moveAndCopyDialogOption.listId == listId;
-    return ret;
-  },
-
-  boards() {
-    return Boards.find(
-      {
-        archived: false,
-        'members.userId': Meteor.userId(),
-        _id: { $ne: Meteor.user().getTemplatesBoardId() },
-      },
-      {
-        sort: { sort: 1 /* boards default sorting */ },
-      },
-    );
-  },
-
-  swimlanes() {
-    const board = Boards.findOne(this.selectedBoardId.get());
-    return board.swimlanes();
-  },
-
-  aBoardLists() {
-    const board = Boards.findOne(this.selectedBoardId.get());
-    return board.lists();
-  },
-
-  events() {
-    return [
-      {
-        'click .js-done'() {
-          const boardSelect = this.$('.js-select-boards')[0];
-          const boardId = boardSelect.options[boardSelect.selectedIndex].value;
-
-          const listSelect = this.$('.js-select-lists')[0];
-          const listId = listSelect.options[listSelect.selectedIndex].value;
-
-          const swimlaneSelect = this.$('.js-select-swimlanes')[0];
-          const swimlaneId = swimlaneSelect.options[swimlaneSelect.selectedIndex].value;
-
-          const options = {
-            'boardId' : boardId,
-            'swimlaneId' : swimlaneId,
-            'listId' : listId,
-          }
-          Meteor.user().setMoveAndCopyDialogOption(this.currentBoardId, options);
-        },
-        'change .js-select-boards'(event) {
-          const boardId = $(event.currentTarget).val();
-          this.selectedBoardId.set(boardId);
-          subManager.subscribe('board', boardId, false);
-        },
-      },
-    ];
-  },
-}).register('boardsAndLists');
-
-Template.copyCardPopup.events({
-  'click .js-done'() {
-    const card = Utils.getCurrentCard();
-    const lSelect = $('.js-select-lists')[0];
-    const listId = lSelect.options[lSelect.selectedIndex].value;
-    const slSelect = $('.js-select-swimlanes')[0];
-    const swimlaneId = slSelect.options[slSelect.selectedIndex].value;
-    const bSelect = $('.js-select-boards')[0];
-    const boardId = bSelect.options[bSelect.selectedIndex].value;
-    const textarea = $('#copy-card-title');
+    // const textarea = $('#copy-card-title');
+    const textarea = this.$('#copy-card-title');
    const title = textarea.val().trim();
-    // insert new card to the bottom of new list
-    card.sort = Lists.findOne(card.listId).cards().count();

    if (title) {
-      card.title = title;
-      card.coverId = '';
-      const _id = card.copy(boardId, swimlaneId, listId);
+      // insert new card to the top of new list
+      const newCardId = Meteor.call('copyCard', card._id, boardId, swimlaneId, listId, true, {title: title});
+
      // In case the filter is active we need to add the newly inserted card in
      // the list of exceptions -- cards that are not filtered. Otherwise the
      // card will disappear instantly.
      // See https://github.com/wekan/wekan/issues/80
-      Filter.addException(_id);
-
-      Popup.back();
+      Filter.addException(newCardId);
    }
-  },
-});
+  }
+}).register('copyCardPopup');

-Template.convertChecklistItemToCardPopup.events({
-  'click .js-done'() {
-    const card = Utils.getCurrentCard();
-    const lSelect = $('.js-select-lists')[0];
-    const listId = lSelect.options[lSelect.selectedIndex].value;
-    const slSelect = $('.js-select-swimlanes')[0];
-    const swimlaneId = slSelect.options[slSelect.selectedIndex].value;
-    const bSelect = $('.js-select-boards')[0];
-    const boardId = bSelect.options[bSelect.selectedIndex].value;
-    const textarea = $('#copy-card-title');
+/** Convert Checklist-Item to card dialog */
+(class extends DialogWithBoardSwimlaneList {
+  getDialogOptions() {
+    const ret = Meteor.user().getMoveAndCopyDialogOptions();
+    return ret;
+  }
+  setDone(boardId, swimlaneId, listId, options) {
+    Meteor.user().setMoveAndCopyDialogOption(this.currentBoardId, options);
+    const card = this.data();
+
+    const textarea = this.$('#copy-card-title');
    const title = textarea.val().trim();

    if (title) {
@@ -997,68 +889,42 @@ Template.convertChecklistItemToCardPopup.events({
        swimlaneId: swimlaneId,
        sort: 0,
      });
+      const card = Cards.findOne(_id);
+      const minOrder = card.getMinSort();
+      card.move(card.boardId, card.swimlaneId, card.listId, minOrder - 1);
+
      Filter.addException(_id);
-
-      Popup.back();
-
    }
-  },
-});
+  }
+}).register('convertChecklistItemToCardPopup');

-Template.copyChecklistToManyCardsPopup.events({
-  'click .js-done'() {
-    const card = Utils.getCurrentCard();
-    const oldId = card._id;
-    card._id = null;
-    const lSelect = $('.js-select-lists')[0];
-    card.listId = lSelect.options[lSelect.selectedIndex].value;
-    const slSelect = $('.js-select-swimlanes')[0];
-    card.swimlaneId = slSelect.options[slSelect.selectedIndex].value;
-    const bSelect = $('.js-select-boards')[0];
-    card.boardId = bSelect.options[bSelect.selectedIndex].value;
-    const textarea = $('#copy-card-title');
-    const titleEntry = textarea.val().trim();
-    // insert new card to the bottom of new list
-    card.sort = Lists.findOne(card.listId).cards().count();
+/** Copy many cards dialog */
+(class extends DialogWithBoardSwimlaneList {
+  getDialogOptions() {
+    const ret = Meteor.user().getMoveAndCopyDialogOptions();
+    return ret;
+  }
+  setDone(boardId, swimlaneId, listId, options) {
+    Meteor.user().setMoveAndCopyDialogOption(this.currentBoardId, options);
+    const card = this.data();
+
+    const textarea = this.$('#copy-card-title');
+    const title = textarea.val().trim();
+
+    if (title) {
+      const titleList = JSON.parse(title);
+      for (const obj of titleList) {
+        const newCardId = Meteor.call('copyCard', card._id, boardId, swimlaneId, listId, false, {title: obj.title, description: obj.description});

-    if (titleEntry) {
-      const titleList = JSON.parse(titleEntry);
-      for (let i = 0; i < titleList.length; i++) {
-        const obj = titleList[i];
-        card.title = obj.title;
-        card.description = obj.description;
-        card.coverId = '';
-        const _id = Cards.insert(card);
        // In case the filter is active we need to add the newly inserted card in
        // the list of exceptions -- cards that are not filtered. Otherwise the
        // card will disappear instantly.
        // See https://github.com/wekan/wekan/issues/80
-        Filter.addException(_id);
-
-        // copy checklists
-        Checklists.find({ cardId: oldId }).forEach((ch) => {
-          ch.copy(_id);
-        });
-
-        // copy subtasks
-        const cursor = Cards.find({ parentId: oldId });
-        cursor.forEach(function () {
-          'use strict';
-          const subtask = arguments[0];
-          subtask.parentId = _id;
-          subtask._id = null;
-          /* const newSubtaskId = */ Cards.insert(subtask);
-        });
-
-        // copy card comments
-        CardComments.find({ cardId: oldId }).forEach((cmt) => {
-          cmt.copy(_id);
-        });
+        Filter.addException(newCardId);
      }
-      Popup.back();
    }
-  },
-});
+  }
+}).register('copyManyCardsPopup');

 BlazeComponent.extendComponent({
  onCreated() {
@@ -1711,10 +1577,29 @@ BlazeComponent.extendComponent({
 EscapeActions.register(
  'detailsPane',
  () => {
+    // if card description diverges from database due to editing
+    // ask user whether changes should be applied
+    if (Meteor.user()) {
+      if (Meteor.user().profile.rescueCardDescription == true) {
+        currentDescription = document.getElementsByClassName("editor js-new-description-input").item(0)
+        if (currentDescription?.value && !(currentDescription.value === Utils.getCurrentCard().getDescription())) {
+          if (confirm(TAPi18n.__('rescue-card-description-dialogue'))) {
+            Utils.getCurrentCard().setDescription(document.getElementsByClassName("editor js-new-description-input").item(0).value);
+            // Save it!
+            console.log(document.getElementsByClassName("editor js-new-description-input").item(0).value);
+            console.log("current description", Utils.getCurrentCard().getDescription());
+          } else {
+            // Do nothing!
+            console.log('Description changes were not saved to the database.');
+          }
+        }
+      }
+    }
    if (Session.get('cardDetailsIsDragging')) {
      // Reset dragging status as the mouse landed outside the cardDetails template area and this will prevent a mousedown event from firing
      Session.set('cardDetailsIsDragging', false);
      Session.set('cardDetailsIsMouseDown', false);
+
    } else {
      // Prevent close card when the user is selecting text and moves the mouse cursor outside the card detail area
      Utils.goBoardId(Session.get('currentBoard'));
@@ -1777,13 +1662,7 @@ Template.cardAssigneesPopup.helpers({

 Template.cardAssigneePopup.helpers({
  userData() {
-    // We need to handle a special case for the search results provided by the
-    // `matteodem:easy-search` package. Since these results gets published in a
-    // separate collection, and not in the standard Meteor.Users collection as
-    // expected, we use a component parameter ("property") to distinguish the
-    // two cases.
-    const userCollection = this.esSearch ? ESSearchResults : Users;
-    return userCollection.findOne(this.userId, {
+    return Users.findOne(this.userId, {
      fields: {
        profile: 1,
        username: 1,
@@ -1796,17 +1675,17 @@ Template.cardAssigneePopup.helpers({
    return user && user.isBoardAdmin() ? 'admin' : 'normal';
  },

-/*
-  presenceStatusClassName() {
-    const user = Users.findOne(this.userId);
-    const userPresence = presences.findOne({ userId: this.userId });
-    if (user && user.isInvitedTo(Session.get('currentBoard'))) return 'pending';
-    else if (!userPresence) return 'disconnected';
-    else if (Session.equals('currentBoard', userPresence.state.currentBoardId))
-      return 'active';
-    else return 'idle';
-  },
-*/
+  /*
+    presenceStatusClassName() {
+      const user = Users.findOne(this.userId);
+      const userPresence = presences.findOne({ userId: this.userId });
+      if (user && user.isInvitedTo(Session.get('currentBoard'))) return 'pending';
+      else if (!userPresence) return 'disconnected';
+      else if (Session.equals('currentBoard', userPresence.state.currentBoardId))
+        return 'active';
+      else return 'idle';
+    },
+  */
  isCardAssignee() {
    const card = Template.parentData();
    const cardAssignees = card.getAssignees();
@@ -34,13 +34,13 @@ template(name="checklistDetail")
          a.fa.fa-navicon.checklist-details-menu.js-open-checklist-details-menu(title="{{_ 'checklistActionsPopup-title'}}")

        if canModifyCard
-          h2.title.js-open-inlined-form.is-editable
-            if isMiniScreenOrShowDesktopDragHandles
+          h4.title.js-open-inlined-form.is-editable
+            if isTouchScreenOrShowDesktopDragHandles
              span.fa.checklist-handle(class="fa-arrows" title="{{_ 'dragChecklist'}}")
            +viewer
              = checklist.title
        else
-          h2.title
+          h4.title
            +viewer
                = checklist.title

@@ -61,7 +61,7 @@ template(name="addChecklistItemForm")
  textarea.js-add-checklist-item(rows='1' autofocus)
  .edit-controls.clearfix
    button.primary.confirm.js-submit-add-checklist-item-form(type="submit") {{_ 'save'}}
-    a.fa.fa-times-thin.js-close-inlined-form
+    a.fa.fa-times-thin.js-close-inlined-form(title="{{_ 'close-add-checklist-item'}}")
    if showNewlineBecomesNewChecklistItem
      .material-toggle-switch(title="{{_ 'newlineBecomesNewChecklistItem'}}")
        input.toggle-switch(type="checkbox" id="toggleNewlineBecomesNewChecklistItem")
@@ -77,7 +77,7 @@ template(name="editChecklistItemForm")
      = checklist.title
  .edit-controls.clearfix
    button.primary.confirm.js-submit-edit-checklist-item-form(type="submit") {{_ 'save'}}
-    a.fa.fa-times-thin.js-close-inlined-form
+    a.fa.fa-times-thin.js-close-inlined-form(title="{{_ 'close-edit-checklist-item'}}")
    span(title=createdAt) {{ moment createdAt }}
    if canModifyCard
      a.js-delete-checklist-item {{_ "delete"}}...
@@ -100,11 +100,12 @@ template(name="checklistItems")
          i.fa.fa-plus

 template(name='checklistItemDetail')
-  .js-checklist-item.checklist-item(class="{{#if item.isFinished }}is-checked{{#if hideCheckedItems}} invisible{{/if}}{{/if}}")
+  .js-checklist-item.checklist-item(class="{{#if item.isFinished }}is-checked{{#if hideCheckedItems}} invisible{{/if}}{{/if}}"
+    role="checkbox" aria-checked="{{#if item.isFinished }}true{{else}}false{{/if}}" tabindex="0")
    if canModifyCard
      .check-box-container
        .check-box.materialCheckBox(class="{{#if item.isFinished }}is-checked{{/if}}")
-      if isMiniScreenOrShowDesktopDragHandles
+      if isTouchScreenOrShowDesktopDragHandles
        span.fa.checklistitem-handle(class="fa-arrows" title="{{_ 'dragChecklistItem'}}")
      .item-title.js-open-inlined-form.is-editable(class="{{#if item.isFinished }}is-checked{{/if}}")
        +viewer
@@ -115,35 +116,6 @@ template(name='checklistItemDetail')
        +viewer
          = item.title

-template(name="convertChecklistItemToCardPopup")
-  label(for='convert-checklist-item-to-card-title') {{_ 'title'}}:
-  textarea#copy-card-title.minicard-composer-textarea.js-card-title(autofocus)
-    = item.title
-  +boardsSwimlanesAndLists
-
-template(name="boardsSwimlanesAndLists")
-  unless currentUser.isWorker
-    label {{_ 'boards'}}:
-    select.js-select-boards(autofocus)
-      each boards
-        if $eq _id currentBoard._id
-          option(value="{{_id}}" selected) {{_ 'current'}}
-        else
-          option(value="{{_id}}") {{title}}
-
-  label {{_ 'swimlanes'}}:
-  select.js-select-swimlanes
-    each swimlanes
-      option(value="{{_id}}") {{title}}
-
-  label {{_ 'lists'}}:
-  select.js-select-lists
-    each aBoardLists
-      option(value="{{_id}}") {{title}}
-
-  .edit-controls.clearfix
-    button.primary.confirm.js-done {{_ 'done'}}
-
 template(name="checklistActionsPopup")
  ul.pop-over-list
    li
@@ -171,22 +143,22 @@ template(name="copyAndMoveChecklist")
        if $eq _id currentBoard._id
          option(value="{{_id}}" selected) {{_ 'current'}}
        else
-          option(value="{{_id}}" selected="{{#if isChecklistDialogOptionBoardId _id}}selected{{/if}}") {{title}}
+          option(value="{{_id}}" selected="{{#if isDialogOptionBoardId _id}}selected{{/if}}") {{title}}

  label {{_ 'swimlanes'}}:
  select.js-select-swimlanes
    each swimlanes
-      option(value="{{_id}}" selected="{{#if isChecklistDialogOptionSwimlaneId _id}}selected{{/if}}") {{title}}
+      option(value="{{_id}}" selected="{{#if isDialogOptionSwimlaneId _id}}selected{{/if}}") {{title}}

  label {{_ 'lists'}}:
  select.js-select-lists
    each lists
-      option(value="{{_id}}" selected="{{#if isChecklistDialogOptionListId _id}}selected{{/if}}") {{title}}
+      option(value="{{_id}}" selected="{{#if isDialogOptionListId _id}}selected{{/if}}") {{title}}

  label {{_ 'cards'}}:
  select.js-select-cards
    each cards
-      option(value="{{_id}}" selected="{{#if isChecklistDialogOptionCardId _id}}selected{{/if}}") {{title}}
+      option(value="{{_id}}" selected="{{#if isDialogOptionCardId _id}}selected{{/if}}") {{title}}

  .edit-controls.clearfix
    button.primary.confirm.js-done {{_ 'done'}}
@@ -1,6 +1,7 @@
 import { TAPi18n } from '/imports/i18n';
 import Cards from '/models/cards';
 import Boards from '/models/boards';
+import { DialogWithBoardSwimlaneListCard } from '/client/lib/dialogWithBoardSwimlaneListCard';

 const subManager = new SubsManager();
 const { calculateIndexData, capitalize } = Utils;
@@ -48,7 +49,7 @@ BlazeComponent.extendComponent({
    const self = this;
    self.itemsDom = this.$('.js-checklist-items');
    initSorting(self.itemsDom);
-    self.itemsDom.mousedown(function(evt) {
+    self.itemsDom.mousedown(function (evt) {
      evt.stopPropagation();
    });

@@ -61,7 +62,7 @@ BlazeComponent.extendComponent({
      const $itemsDom = $(self.itemsDom);
      if ($itemsDom.data('uiSortable') || $itemsDom.data('sortable')) {
        $(self.itemsDom).sortable('option', 'disabled', !userIsMember());
-        if (Utils.isMiniScreenOrShowDesktopDragHandles()) {
+        if (Utils.isTouchScreenOrShowDesktopDragHandles()) {
          $(self.itemsDom).sortable({
            handle: 'span.fa.checklistitem-handle',
          });
@@ -306,15 +307,15 @@ BlazeComponent.extendComponent({
  events() {
    return [
      {
-        'click .js-delete-checklist' : Popup.afterConfirm('checklistDelete', function () {
+        'click .js-delete-checklist': Popup.afterConfirm('checklistDelete', function () {
          Popup.back(2);
          const checklist = this.checklist;
          if (checklist && checklist._id) {
            Checklists.remove(checklist._id);
          }
        }),
-        'click .js-move-checklist' : Popup.open('moveChecklist'),
-        'click .js-copy-checklist' : Popup.open('copyChecklist'),
+        'click .js-move-checklist': Popup.open('moveChecklist'),
+        'click .js-copy-checklist': Popup.open('copyChecklist'),
      }
    ]
  }
@@ -380,213 +381,9 @@ BlazeComponent.extendComponent({
  },
 }).register('checklistItemDetail');

-class DialogWithBoardSwimlaneListAndCard extends BlazeComponent {
-  /** returns the checklist dialog options
-   * @return Object with properties { boardId, swimlaneId, listId, cardId }
-   */
-  getChecklistDialogOptions() {
-  }
-
-  /** checklist is done
-   * @param cardId the selected card id
-   * @param options the selected options (Object with properties { boardId, swimlaneId, listId, cardId })
-   */
-  setDone(cardId, options) {
-  }
-
-  onCreated() {
-    this.currentBoardId = Utils.getCurrentBoardId();
-    this.selectedBoardId = new ReactiveVar(this.currentBoardId);
-    this.selectedSwimlaneId = new ReactiveVar('');
-    this.selectedListId = new ReactiveVar('');
-    this.setChecklistDialogOption(this.currentBoardId);
-  }
-
-  /** set the last confirmed dialog field values
-   * @param boardId the current board id
-   */
-  setChecklistDialogOption(boardId) {
-    this.checklistDialogOption = {
-      'boardId' : "",
-      'swimlaneId' : "",
-      'listId' : "",
-      'cardId': "",
-    }
-
-    let currentOptions = this.getChecklistDialogOptions();
-    if (currentOptions && boardId && currentOptions[boardId]) {
-      this.checklistDialogOption = currentOptions[boardId];
-      if (this.checklistDialogOption.boardId &&
-          this.checklistDialogOption.swimlaneId &&
-          this.checklistDialogOption.listId
-      )
-      {
-        this.selectedBoardId.set(this.checklistDialogOption.boardId)
-        this.selectedSwimlaneId.set(this.checklistDialogOption.swimlaneId);
-        this.selectedListId.set(this.checklistDialogOption.listId);
-      }
-    }
-    this.getBoardData(this.selectedBoardId.get());
-    if (!this.selectedSwimlaneId.get() || !Swimlanes.findOne({_id: this.selectedSwimlaneId.get(), boardId: this.selectedBoardId.get()})) {
-      this.setFirstSwimlaneId();
-    }
-    if (!this.selectedListId.get() || !Lists.findOne({_id: this.selectedListId.get(), boardId: this.selectedBoardId.get()})) {
-      this.setFirstListId();
-    }
-  }
-  /** sets the first swimlane id */
-  setFirstSwimlaneId() {
-    try {
-      const board = Boards.findOne(this.selectedBoardId.get());
-      const swimlaneId = board.swimlanes().fetch()[0]._id;
-      this.selectedSwimlaneId.set(swimlaneId);
-    } catch (e) {}
-  }
-  /** sets the first list id */
-  setFirstListId() {
-    try {
-      const board = Boards.findOne(this.selectedBoardId.get());
-      const listId = board.lists().fetch()[0]._id;
-      this.selectedListId.set(listId);
-    } catch (e) {}
-  }
-
-  /** returns if the board id was the last confirmed one
-   * @param boardId check this board id
-   * @return if the board id was the last confirmed one
-   */
-  isChecklistDialogOptionBoardId(boardId) {
-    let ret = this.checklistDialogOption.boardId == boardId;
-    return ret;
-  }
-
-  /** returns if the swimlane id was the last confirmed one
-   * @param swimlaneId check this swimlane id
-   * @return if the swimlane id was the last confirmed one
-   */
-  isChecklistDialogOptionSwimlaneId(swimlaneId) {
-    let ret = this.checklistDialogOption.swimlaneId == swimlaneId;
-    return ret;
-  }
-
-  /** returns if the list id was the last confirmed one
-   * @param listId check this list id
-   * @return if the list id was the last confirmed one
-   */
-  isChecklistDialogOptionListId(listId) {
-    let ret = this.checklistDialogOption.listId == listId;
-    return ret;
-  }
-
-  /** returns if the card id was the last confirmed one
-   * @param cardId check this card id
-   * @return if the card id was the last confirmed one
-   */
-  isChecklistDialogOptionCardId(cardId) {
-    let ret = this.checklistDialogOption.cardId == cardId;
-    return ret;
-  }
-
-  /** returns all available board */
-  boards() {
-    const ret = Boards.find(
-      {
-        archived: false,
-        'members.userId': Meteor.userId(),
-        _id: { $ne: Meteor.user().getTemplatesBoardId() },
-      },
-      {
-        sort: { sort: 1 },
-      },
-    );
-    return ret;
-  }
-
-  /** returns all available swimlanes of the current board */
-  swimlanes() {
-    const board = Boards.findOne(this.selectedBoardId.get());
-    const ret = board.swimlanes();
-    return ret;
-  }
-
-  /** returns all available lists of the current board */
-  lists() {
-    const board = Boards.findOne(this.selectedBoardId.get());
-    const ret = board.lists();
-    return ret;
-  }
-
-  /** returns all available cards of the current list */
-  cards() {
-    const list = Lists.findOne(this.selectedListId.get());
-    const ret = list.cards(this.selectedSwimlaneId.get());
-    return ret;
-  }
-
-  /** get the board data from the server
-   * @param boardId get the board data of this board id
-   */
-  getBoardData(boardId) {
-    const self = this;
-    Meteor.subscribe('board', boardId, false, {
-      onReady() {
-        const sameBoardId = self.selectedBoardId.get() == boardId;
-        self.selectedBoardId.set(boardId);
-
-        if (!sameBoardId) {
-          // reset swimlane id (for selection in cards())
-          self.setFirstSwimlaneId();
-
-          // reset list id (for selection in cards())
-          self.setFirstListId();
-        }
-      },
-    });
-  }
-
-  events() {
-    return [
-      {
-        'click .js-done'() {
-          const boardSelect = this.$('.js-select-boards')[0];
-          const boardId = boardSelect.options[boardSelect.selectedIndex].value;
-
-          const listSelect = this.$('.js-select-lists')[0];
-          const listId = listSelect.options[listSelect.selectedIndex].value;
-
-          const swimlaneSelect = this.$('.js-select-swimlanes')[0];
-          const swimlaneId = swimlaneSelect.options[swimlaneSelect.selectedIndex].value;
-
-          const cardSelect = this.$('.js-select-cards')[0];
-          const cardId = cardSelect.options[cardSelect.selectedIndex].value;
-
-          const options = {
-            'boardId' : boardId,
-            'swimlaneId' : swimlaneId,
-            'listId' : listId,
-            'cardId': cardId,
-          }
-          this.setDone(cardId, options);
-          Popup.back(2);
-        },
-        'change .js-select-boards'(event) {
-          const boardId = $(event.currentTarget).val();
-          this.getBoardData(boardId);
-        },
-        'change .js-select-swimlanes'(event) {
-          this.selectedSwimlaneId.set($(event.currentTarget).val());
-        },
-        'change .js-select-lists'(event) {
-          this.selectedListId.set($(event.currentTarget).val());
-        },
-      },
-    ];
-  }
-}
-
 /** Move Checklist Dialog */
-(class extends DialogWithBoardSwimlaneListAndCard {
-  getChecklistDialogOptions() {
+(class extends DialogWithBoardSwimlaneListCard {
+  getDialogOptions() {
    const ret = Meteor.user().getMoveChecklistDialogOptions();
    return ret;
  }
@@ -597,8 +394,8 @@ class DialogWithBoardSwimlaneListAndCard extends BlazeComponent {
 }).register('moveChecklistPopup');

 /** Copy Checklist Dialog */
-(class extends DialogWithBoardSwimlaneListAndCard {
-  getChecklistDialogOptions() {
+(class extends DialogWithBoardSwimlaneListCard {
+  getDialogOptions() {
    const ret = Meteor.user().getCopyChecklistDialogOptions();
    return ret;
  }
@@ -29,7 +29,7 @@ template(name="cardLabelsPopup")
    each board.labels
      li.js-card-label-item
        a.card-label-edit-button.fa.fa-pencil.js-edit-label
-        if isMiniScreenOrShowDesktopDragHandles
+        if isTouchScreenOrShowDesktopDragHandles
          span.fa.label-handle(class="fa-arrows" title="{{_ 'dragLabel'}}")
        span.card-label.card-label-selectable.js-select-label.card-label-wrapper(class="card-label-{{color}}"
          class="{{# if isLabelSelected ../_id }}active{{/if}}")
@@ -50,8 +50,7 @@ BlazeComponent.extendComponent({
      appendTo: '.edit-labels-pop-over',
      helper(element, currentItem) {
        let ret = currentItem.clone();
-        if (currentItem.closest('.popup-container-depth-0').size() == 0)
-        { // only set css transform at every sub-popup, not at the main popup
+        if (currentItem.closest('.popup-container-depth-0').size() == 0) { // only set css transform at every sub-popup, not at the main popup
          const content = currentItem.closest('.content')[0]
          const offsetLeft = content.offsetLeft;
          const offsetTop = $('.pop-over > .header').height() * -1;
@@ -76,7 +75,7 @@ BlazeComponent.extendComponent({

    // Disable drag-dropping if the current user is not a board member or is comment only
    this.autorun(() => {
-      if (Utils.isMiniScreenOrShowDesktopDragHandles()) {
+      if (Utils.isTouchScreenOrShowDesktopDragHandles()) {
        $labels.sortable({
          handle: '.label-handle',
        });
@@ -130,7 +129,7 @@ Template.createLabelPopup.events({
 });

 Template.editLabelPopup.events({
-  'click .js-delete-label': Popup.afterConfirm('deleteLabel', function() {
+  'click .js-delete-label': Popup.afterConfirm('deleteLabel', function () {
    const board = Boards.findOne(Session.get('currentBoard'));
    board.removeLabel(this._id);
    Popup.back(2);
@@ -28,18 +28,35 @@
 .minicard-wrapper .multi-selection-checkbox + .minicard {
  margin-left: 8px;
 }
-.minicard {
-  padding: 6px 8px 2px;
-  position: relative;
-  flex: 1;
-  flex-wrap: wrap;
-  background-color: #fff;
-  min-height: 20px;
-  box-shadow: 0 1px 2px rgba(0,0,0,0.15);
-  border-radius: 2px;
-  color: #4d4d4d;
-  overflow: hidden;
-  transition: transform 0.2s, border-radius 0.2s;
+@media only screen {
+  .minicard {
+    padding: 6px 8px 2px;
+    position: relative;
+    flex: 1;
+    flex-wrap: wrap;
+    background-color: #fff;
+    min-height: 20px;
+    box-shadow: 0 1px 2px rgba(0,0,0,0.15);
+    border-radius: 2px;
+    color: #4d4d4d;
+    overflow: hidden;
+    transition: transform 0.2s, border-radius 0.2s;
+  }
+}
+.minicard-details-menu-with-handle {
+  float: right;
+  font-size: 18px;
+  padding-right: 30px;
+}
+.minicard-details-menu {
+  float: right;
+  font-size: 18px;
+}
+@media print {
+  .minicard-details-menu,
+  .minicard-details-menu-with-handle {
+    display: none;
+  }
 }
 .minicard.linked-board .linked-icon,
 .minicard.linked-card .linked-icon {
@@ -125,13 +142,15 @@
  display: inline-block;
  margin-right: 5px;
 }
-.minicard .minicard-title p:last-child {
-  margin-bottom: 0;
-}
-.minicard .minicard-title .viewer {
-  display: block;
-  word-wrap: break-word;
-  max-width: 230px;
+@media only screen {
+  .minicard .minicard-title p:last-child {
+    margin-bottom: 0;
+  }
+  .minicard .minicard-title .viewer {
+    display: block;
+    word-wrap: break-word;
+    max-width: 230px;
+  }
 }
 .minicard .dates {
  display: flex;
@@ -221,13 +240,17 @@
  display: none;
 }
 .minicard .minicard-description {
-  padding: 6px 0 6px 8px;
+  padding: 6px 0 0 8px;
  background-color: #eee;
  width: 100%;
  margin-bottom: 2px;
  margin-left: -4px;
  border-radius: 3px;
-  display: inline-block;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 3;
+  -webkit-box-orient: vertical;
 }
 .minicard.minicard-composer {
  margin-bottom: 10px;
@@ -3,11 +3,14 @@ template(name="minicard")
    class="{{#if isLinkedCard}}linked-card{{/if}}"
    class="{{#if isLinkedBoard}}linked-board{{/if}}"
    class="{{#if colorClass}}minicard-{{colorClass}}{{/if}}")
-    if isMiniScreenOrShowDesktopDragHandles
+    if isTouchScreenOrShowDesktopDragHandles
+      a.fa.fa-navicon.minicard-details-menu-with-handle.js-open-minicard-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}")
      .handle
        .fa.fa-arrows
+    else
+      a.fa.fa-navicon.minicard-details-menu.js-open-minicard-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}")
    if cover
-      .minicard-cover(style="background-image: url('{{cover.link 'original' '/'}}?dummyReloadAfterSessionEstablished={{sess}}');")
+      .minicard-cover(style="background-image: url('{{cover.link 'original'}}?dummyReloadAfterSessionEstablished={{sess}}');")
    if labels
      .minicard-labels(class="{{#if hiddenMinicardLabelText}}minicard-labels-no-text{{/if}}")
        each labels
@@ -155,3 +158,48 @@ template(name="editCardSortOrderPopup")
  input.js-edit-card-sort-popup(type='text' autofocus value=sort dir="auto")
  .edit-controls.clearfix
    button.primary.confirm.js-submit-edit-card-sort-popup(type="submit") {{_ 'save'}}
+
+template(name="minicardDetailsActionsPopup")
+  ul.pop-over-list
+    if currentUser.isBoardAdmin
+      li
+        a.js-move-card
+          i.fa.fa-arrow-right
+          | {{_ 'moveCardPopup-title'}}
+    unless currentUser.isWorker
+      li
+        a.js-copy-card
+          i.fa.fa-copy
+          | {{_ 'copyCardPopup-title'}}
+      hr
+      li
+        a.js-archive
+          i.fa.fa-arrow-right
+          i.fa.fa-archive
+          | {{_ 'archive-card'}}
+      hr
+      li
+        a.js-move-card-to-top
+          i.fa.fa-arrow-up
+          | {{_ 'moveCardToTop-title'}}
+      li
+        a.js-move-card-to-bottom
+          i.fa.fa-arrow-down
+          | {{_ 'moveCardToBottom-title'}}
+      hr
+      li
+        a.js-add-labels
+          i.fa.fa-tags
+          | {{_ 'card-edit-labels'}}
+      li
+        a.js-due-date
+          i.fa.fa-sign-in
+          | {{_ 'editCardDueDatePopup-title'}}
+      li
+        a.js-set-card-color
+          i.fa.fa-paint-brush
+          | {{_ 'setCardColorPopup-title'}}
+      li
+        a.js-link
+          i.fa.fa-link
+          | {{_ 'link-card'}}
@@ -1,4 +1,5 @@
 import { TAPi18n } from '/imports/i18n';
+import { CustomFieldStringTemplate } from '/client/lib/customFields'

 // Template.cards.events({
 //   'click .member': Popup.open('cardMember')
@@ -31,12 +32,8 @@ BlazeComponent.extendComponent({
    const customFieldTrueValue =
      customField && customField.trueValue ? customField.trueValue : [];

-    return customFieldTrueValue
-      .filter(value => !!value.trim())
-      .map(value =>
-        definition.settings.stringtemplateFormat.replace(/%\{value\}/gi, value),
-      )
-      .join(definition.settings.stringtemplateSeparator ?? '');
+    const ret = new CustomFieldStringTemplate(definition).getFormattedValue(customFieldTrueValue);
+    return ret;
  },

  showCreator() {
@@ -100,6 +97,7 @@ BlazeComponent.extendComponent({
        },
        'click span.badge-icon.fa.fa-sort, click span.badge-text.check-list-sort' : Popup.open("editCardSortOrder"),
        'click .minicard-labels' : this.cardLabelsPopup,
+        'click .js-open-minicard-details-menu': Popup.open('minicardDetailsActions'),
      }
    ];
  },
@@ -150,3 +148,29 @@ BlazeComponent.extendComponent({
    ]
  }
 }).register('editCardSortOrderPopup');
+
+Template.minicardDetailsActionsPopup.events({
+  'click .js-due-date': Popup.open('editCardDueDate'),
+  'click .js-move-card': Popup.open('moveCard'),
+  'click .js-copy-card': Popup.open('copyCard'),
+  'click .js-set-card-color': Popup.open('setCardColor'),
+  'click .js-add-labels': Popup.open('cardLabels'),
+  'click .js-link': Popup.open('linkCard'),
+  'click .js-move-card-to-top'(event) {
+    event.preventDefault();
+    const minOrder = this.getMinSort();
+    this.move(this.boardId, this.swimlaneId, this.listId, minOrder - 1);
+    Popup.back();
+  },
+  'click .js-move-card-to-bottom'(event) {
+    event.preventDefault();
+    const maxOrder = this.getMaxSort();
+    this.move(this.boardId, this.swimlaneId, this.listId, maxOrder + 1);
+    Popup.back();
+  },
+  'click .js-archive': Popup.afterConfirm('cardArchive', function () {
+    Popup.close();
+    this.archive();
+    Utils.goBoardId(this.boardId);
+  }),
+});
@@ -269,6 +269,11 @@ textarea::-moz-placeholder {
  margin-top: 0px;
  margin-bottom: 12px;
 }
+@media print {
+  .add-controls {
+    display: none;
+  }
+}
 .edit-controls button[type=submit],
 .add-controls button[type=submit],
 .edit-controls input[type=button],
@@ -56,17 +56,17 @@ template(name="importMapMembersAddPopup")
    p
      | {{_ 'import-user-select'}}
    .js-map-member
-      +esInput(index="users")
+      +EasySearch.Input(index=searchIndex)
    ul.pop-over-list
-      +esEach(index="users")
+      +EasySearch.Each(index=searchIndex)
        li.item.js-member-item
-          a.name.js-select-import(title="{{profile.fullname}} ({{username}})" data-id="{{_id}}")
-            +userAvatar(userId=_id esSearch=true)
+          a.name.js-select-import(title="{{profile.fullname}} ({{username}})" data-id="{{__originalId}}")
+            +userAvatar(userId=__originalId)
            span.full-name
              = profile.fullname
              | (<span class="username">{{username}}</span>)
-      +ifEsIsSearching(index='users')
+      +EasySearch.IfSearching(index=searchIndex)
        +spinner
-      +ifEsHasNoResults(index="users")
+      +EasySearch.IfNoResults(index=searchIndex)
        .manage-member-section
          p.quiet {{_ 'no-results'}}
@@ -297,7 +297,7 @@ BlazeComponent.extendComponent({
  },

  onSelectUser() {
-    Popup.getOpenerComponent().mapSelectedMember(this.currentData()._id);
+    Popup.getOpenerComponent(5).mapSelectedMember(this.currentData().__originalId);
    Popup.back();
  },

@@ -309,3 +309,7 @@ BlazeComponent.extendComponent({
    ];
  },
 }).register('importMapMembersAddPopup');
+
+Template.importMapMembersAddPopup.helpers({
+  searchIndex: () => UserSearchIndex,
+})
@@ -9,6 +9,11 @@
  float: left;
  min-width: 270px;
  max-width: 270px;
+  /* Reverted incomplete change list width: */
+  /* https://github.com/wekan/wekan/issues/4558 */
+  /* Orinal width: 270px. Changes not saved yet: */
+  /*resize: both;  - List width and height resizeable */
+  /* overflow: auto; - List width and height resizeable */
 }
 .list:first-child {
  margin-left: 5px;
@@ -83,6 +88,12 @@
 .list-header .list-header-menu {
  float: right;
 }
+@media print {
+  .list-header .list-header-menu,
+  .list-header .list-header-menu-icon {
+    display: none;
+  }
+}
 .list-header .list-header-plus-top {
  color: #a6a6a6;
  margin-right: 15px;
@@ -101,6 +112,9 @@
  color: #4d4d4d;
  padding-left: 4px;
 }
+.js-open-list-menu {
+  font-size: 18px;
+}
 .list-body {
  flex: 1 1 auto;
  flex-direction: column;
@@ -115,6 +129,9 @@
 .list-body .minicards form {
  margin-bottom: 9px;
 }
+.list-body .minicards .add-controls button {
+  min-height: 50px;
+}
 .list-body .open-minicard-composer {
  border-radius: 2px;
  color: #8c8c8c;
@@ -124,6 +141,11 @@
  text-decoration: none;
  animation: fadeIn 0.3s;
 }
+@media print {
+  .list-body .open-minicard-composer {
+    display: none;
+  }
+}
 .list-body .open-minicard-composer i.fa {
  margin-right: 7px;
 }
@@ -96,7 +96,7 @@ BlazeComponent.extendComponent({
        $cards.sortable('cancel');

        if (MultiSelection.isActive()) {
-          Cards.find(MultiSelection.getMongoSelector(), {sort: ['sort']}).forEach((card, i) => {
+          Cards.find(MultiSelection.getMongoSelector(), { sort: ['sort'] }).forEach((card, i) => {
            const newSwimlaneId = targetSwimlaneId
              ? targetSwimlaneId
              : card.swimlaneId || defaultSwimlaneId;
@@ -119,35 +119,31 @@ BlazeComponent.extendComponent({
      },
      sort(event, ui) {
        const $boardCanvas = $('.board-canvas');
-        const  boardCanvas = $boardCanvas[0];
+        const boardCanvas = $boardCanvas[0];

-        if (event.pageX < 10)
-        { // scroll to the left
+        if (event.pageX < 10) { // scroll to the left
          boardCanvas.scrollLeft -= 15;
          ui.helper[0].offsetLeft -= 15;
        }
        if (
          event.pageX > boardCanvas.offsetWidth - 10 &&
          boardCanvas.scrollLeft < $boardCanvas.data('scrollLeftMax') // don't scroll more than possible
-        )
-        { // scroll to the right
+        ) { // scroll to the right
          boardCanvas.scrollLeft += 15;
        }
        if (
          event.pageY > boardCanvas.offsetHeight - 10 &&
          event.pageY + boardCanvas.scrollTop < $boardCanvas.data('scrollTopMax') // don't scroll more than possible
-        )
-        { // scroll to the bottom
+        ) { // scroll to the bottom
          boardCanvas.scrollTop += 15;
        }
-        if (event.pageY < 10)
-        { // scroll to the top
+        if (event.pageY < 10) { // scroll to the top
          boardCanvas.scrollTop -= 15;
        }
      },
      activate(event, ui) {
        const $boardCanvas = $('.board-canvas');
-        const  boardCanvas = $boardCanvas[0];
+        const boardCanvas = $boardCanvas[0];
        // scrollTopMax and scrollLeftMax only available at Firefox (https://developer.mozilla.org/en-US/docs/Web/API/Element/scrollTopMax)
        // https://www.it-swarm.com.de/de/javascript/so-erhalten-sie-den-maximalen-dokument-scrolltop-wert/1069126844/
        $boardCanvas.data('scrollTopMax', boardCanvas.scrollHeight - boardCanvas.clientTop);
@@ -157,7 +153,7 @@ BlazeComponent.extendComponent({
    });

    this.autorun(() => {
-      if (Utils.isMiniScreenOrShowDesktopDragHandles()) {
+      if (Utils.isTouchScreenOrShowDesktopDragHandles()) {
        $cards.sortable({
          handle: '.handle',
        });
@@ -44,7 +44,7 @@ template(name="listHeader")
              a.js-add-card.fa.fa-plus.list-header-plus-top(title="{{_ 'add-card-to-top-of-list'}}")
            a.fa.fa-navicon.js-open-list-menu(title="{{_ 'listActionPopup-title'}}")
          if currentUser.isBoardAdmin
-            if isShowDesktopDragHandles
+            if isTouchScreenOrShowDesktopDragHandles
              a.list-header-handle.handle.fa.fa-arrows.js-list-handle

 template(name="editListTitleForm")
@@ -309,11 +309,11 @@ BlazeComponent.extendComponent({
        },
        'click .js-submit'() {
          this.currentList.setColor(this.currentColor.get());
-          Popup.back();
+          Popup.close();
        },
        'click .js-remove-color'() {
          this.currentList.setColor(null);
-          Popup.back();
+          Popup.close();
        },
      },
    ];
@@ -394,6 +394,9 @@ Template.viewer.events({
    } else {
      const href = event.currentTarget.href;
      if (href) {
+        // Open links in current browser tab, changed from _blank to _self, and back to _blank:
+        // https://github.com/wekan/wekan/discussions/3534
+        //window.open(href, '_self');
        window.open(href, '_blank');
      }
    }
@@ -1,30 +1,32 @@
+/*
@font-face {
  font-family: 'Roboto';
  font-style: normal;
  font-weight: 400;
-  src: local('Roboto'), local('Roboto-Regular'), url("/fonts/roboto-regular.woff2") format('woff2'), url("/fonts/roboto-regular.woff") format('woff');
+  src: local('Roboto'), local('Roboto-Regular'), url("../../../roboto-regular.woff2") format('woff2'), url("../../../roboto-regular.woff") format('woff');
 }
@font-face {
  font-family: 'Roboto';
  font-style: normal;
  font-weight: 700;
-  src: local('Roboto Bold'), local('Roboto-Bold'), url("/fonts/roboto-bold.woff2") format('woff2'), url("/fonts/roboto-bold.woff") format('woff');
+  src: local('Roboto Bold'), local('Roboto-Bold'), url("../../../roboto-bold.woff2") format('woff2'), url("../../../roboto-bold.woff") format('woff');
 }
@font-face {
  font-family: 'Poppins';
  font-style: normal;
  font-weight: 400;
-  src: local('Poppins'), local('Poppins-Regular'), url("/fonts/poppins-regular.woff") format('woff');
+  src: local('Poppins'), local('Poppins-Regular'), url("../../../poppins-regular.woff") format('woff');
 }
@font-face {
  font-family: 'Poppins';
  font-style: normal;
  font-weight: 500;
-  src: local('Poppins Medium'), local('Poppins-Medium'), url("/fonts/poppins-medium.woff") format('woff');
+  src: local('Poppins Medium'), local('Poppins-Medium'), url("../../../poppins-medium.woff") format('woff');
 }
@font-face {
  font-family: 'Poppins';
  font-style: normal;
  font-weight: 700;
-  src: local('Poppins Bold'), local('Poppins-Bold'), url("/fonts/poppins-bold.woff") format('woff');
+  src: local('Poppins Bold'), local('Poppins-Bold'), url("../../../poppins-bold.woff") format('woff');
 }
+*/
@@ -107,6 +107,12 @@
 #header-quick-access a {
  text-decoration: none;
 }
+#header-quick-access i.fa {
+  color: #fff;
+}
+#header-quick-access i.fa:hover {
+  color: #ccc;
+}
 #header-quick-access #header-user-bar,
 #header-quick-access #header-new-board-icon,
 #header-quick-access ul li {
@@ -178,13 +184,15 @@
  top: -5px;
  margin-right: 5px;
 }
-#header-quick-access #header-user-bar .header-user-bar-avatar .member {
+#header-quick-access #header-user-bar .header-user-bar-avatar .member,
+#header-quick-access #header-help {
  width: 24px;
  height: 24px;
  margin: 0;
  margin-top: 1px;
 }
-#header-quick-access #header-user-bar .header-user-bar-name {
+#header-quick-access #header-user-bar .header-user-bar-name,
+#header-quick-access #header-help  {
  margin: 4px 8px 0 0;
  float: left;
 }
@@ -244,6 +252,19 @@
    margin: -8px 0 -10px -10px;
  }
 }
+@media print {
+  #header-quick-access .allBoards,
+  #header-quick-access ul,
+  #header-quick-access .js-toggle-desktop-drag-handles,
+  #header-quick-access #notifications,
+  #header-quick-access #header-new-board-icon,
+  #header #header-main-bar .board-header-btns {
+    display: none;
+  }
+  #header #header-user-bar {
+    float: right;
+  }
+}
 .announcement .viewer {
  display: inline-block;
 }
@@ -10,7 +10,6 @@ template(name="header")
        span
          a(href="{{pathFor 'home'}}")
            span.fa.fa-home
-
        ul.header-quick-access-list
          if currentList
            each currentBoard.lists
@@ -24,6 +23,12 @@ template(name="header")
                a(href="{{pathFor 'board' id=_id slug=slug}}")
                  +viewer
                    = title
+        a.js-toggle-desktop-drag-handles(title="{{_ 'show-desktop-drag-handles'}}" alt="{{_ 'show-desktop-drag-handles'}}")
+          i.fa.fa-arrows
+            if isShowDesktopDragHandles
+              i.fa.fa-check-square-o
+            unless isShowDesktopDragHandles
+              i.fa.fa-ban
        #header-new-board-icon
      else
        //-
@@ -56,7 +61,12 @@ template(name="header")
                  = title
          else
            li.current.empty {{_ 'quick-access-description'}}
-
+        a.js-toggle-desktop-drag-handles(title="{{_ 'show-desktop-drag-handles'}}" alt="{{_ 'show-desktop-drag-handles'}}")
+          i.fa.fa-arrows
+            if isShowDesktopDragHandles
+              i.fa.fa-check-square-o
+            unless isShowDesktopDragHandles
+              i.fa.fa-ban
      // Next line is used only for spacing at header,
      // there is no visible clickable icon.
      #header-new-board-icon
@@ -67,6 +77,11 @@ template(name="header")

      +notifications

+      if currentSetting.customHelpLinkUrl
+        #header-help
+          a(href="{{currentSetting.customHelpLinkUrl}}", title="{{_ 'help'}}", target="_blank", rel="noopener noreferrer")
+            span.fa.fa-question
+
      +headerUserBar

  #header(class=currentBoard.colorClass)
@@ -57,6 +57,19 @@ Template.header.events({
    Session.set('currentList', this._id);
    Session.set('currentCard', null);
  },
+  'click .js-toggle-desktop-drag-handles'() {
+    //currentUser = Meteor.user();
+    //if (currentUser) {
+    //  Meteor.call('toggleDesktopDragHandles');
+    //} else if (window.localStorage.getItem('showDesktopDragHandles')) {
+    if (window.localStorage.getItem('showDesktopDragHandles')) {
+      window.localStorage.removeItem('showDesktopDragHandles');
+      location.reload();
+    } else {
+      window.localStorage.setItem('showDesktopDragHandles', 'true');
+      location.reload();
+    }
+  },
 });

 Template.offlineWarning.events({
@@ -1,6 +1,9 @@
+* {
+  -webkit-box-sizing: unset;
+  box-sizing: unset;
+}
 /* Fixed missing 'import nib' stylesheet reset and extra li bullet points
 * https://github.com/wekan/wekan/issues/4512#issuecomment-1129347536
- * https://github.com/stylus/nib/blob/master/lib/nib/reset.styl
 */
 a, abbr, acronym, address, applet, big, blockquote, body, caption, cite,
 code, dd, del, dfn, div, dl, dt, em, fieldset, form, h1, h2, h3, h4, h5,
@@ -16,51 +19,6 @@ table, tbody, td, tfoot, th, thread, tr, tt, ul, var {
  font-size: 100%;
  vertical-align: baseline;
 }
-ol, ul {
-  list-style: none;
-}
-a img {
-  border: none;
-}
-/* reset body */
-body {
-  line-height: 1;
-  color: black;
-  background: white;
-}
-/* reset table cell */
-table {
-  border-collapse: separate;
-  border-spacing: 0;
-  vertical-align: middle;
-}
-caption, td, th {
-  text-align: left;
-  font-weight: normal;
-  vertical-align: middle;
-}
-/* reset html5 */
-article, aside, canvas, details, figcaption,
-  figure, footer, header, hgroup, menu, nav,
-  section, summary, main {
-  display: block;
-}
-audio, canvas, video {
-  display: inline-block;
-  *display: inline;
-  *zoom: 1;
-}
-audio:not([controls]),[hidden] {
-  display: none;
-}
-
-/* End of reset css */
-
-
-* {
-  -webkit-box-sizing: unset;
-  box-sizing: unset;
-}
 .note-popover .popover-content .note-color-palette div .note-color-btn,
 .panel-heading.note-toolbar .note-color-palette div .note-color-btn {
  background: none;
@@ -6,16 +6,17 @@ head
    where the application is deployed with a path prefix, but it seems to be
    difficult to do that cleanly with Blaze -- at least without adding extra
    packages.
-  link(rel="shortcut icon" type="image/x-icon" href="/favicon.ico")
-  link(rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png")
-  link(rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png")
-  link(rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png")
-  link(rel="manifest" href="/site.webmanifest")
-  link(rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5")
+  link(rel="shortcut icon" type="image/x-icon" href="favicon.ico")
+  link(rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png")
+  link(rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png")
+  link(rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png")
+  link(rel="manifest" crossOrigin="use-credentials" href="/site.webmanifest")
+  link(rel="mask-icon" href="safari-pinned-tab.svg" color="#5bbad5")
  meta(name="apple-mobile-web-app-title" content="Wekan")
  meta(name="application-name" content="Wekan")
  meta(name="msapplication-TileColor" content="#00aba9")
  meta(name="theme-color" content="#ffffff")
+  //link(rel="stylesheet" type="text/css" class="__meteor-css__" href="css/html5-default-theme.css")

 template(name="userFormsLayout")
  section.auth-layout
@@ -4,7 +4,7 @@ BlazeLayout.setRoot('body');

 let alreadyCheck = 1;
 let isCheckDone = false;
-
+let counter = 0;
 const validator = {
  set(obj, prop, value) {
    if (prop === 'state' && value !== 'signIn') {
@@ -21,7 +21,7 @@ const validator = {

 // let isSettingDatabaseFctCallDone = false;

-Template.userFormsLayout.onCreated(function() {
+Template.userFormsLayout.onCreated(function () {
  const templateInstance = this;
  templateInstance.currentSetting = new ReactiveVar();
  templateInstance.isLoading = new ReactiveVar(false);
@@ -37,7 +37,7 @@ Template.userFormsLayout.onCreated(function() {
      }

      // isSettingDatabaseFctCallDone = true;
-      if(currSetting && currSetting !== undefined && currSetting.customLoginLogoImageUrl !== undefined)
+      if (currSetting && currSetting !== undefined && currSetting.customLoginLogoImageUrl !== undefined)
        document.getElementById("isSettingDatabaseCallDone").style.display = 'none';
      else
        document.getElementById("isSettingDatabaseCallDone").style.display = 'block';
@@ -50,6 +50,18 @@ Template.userFormsLayout.onCreated(function() {
    }
  });

+  if (!Meteor.user()?.profile) {
+      Meteor.call('isOidcRedirectionEnabled', (_, result) => {
+        if (result) {
+          AccountsTemplates.options.socialLoginStyle = 'redirect';
+          options = {
+            loginStyle: AccountsTemplates.options.socialLoginStyle,
+          };
+          Meteor.loginWithOidc(options);
+        }
+        else console.log("oidc redirect not set");
+      });
+  }
  Meteor.call('isDisableRegistration', (_, result) => {
    if (result) {
      $('.at-signup-link').hide();
@@ -81,22 +93,22 @@ Template.userFormsLayout.helpers({
  //   return isSettingDatabaseFctCallDone;
  // },

-  isLegalNoticeLinkExist(){
+  isLegalNoticeLinkExist() {
    const currSet = Template.instance().currentSetting.get();
-    if(currSet && currSet !== undefined && currSet != null){
+    if (currSet && currSet !== undefined && currSet != null) {
      return currSet.legalNotice !== undefined && currSet.legalNotice.trim() != "";
    }
    else
      return false;
  },

-  getLegalNoticeWithWritTraduction(){
+  getLegalNoticeWithWritTraduction() {
    let spanLegalNoticeElt = $("#legalNoticeSpan");
-    if(spanLegalNoticeElt != null && spanLegalNoticeElt != undefined){
+    if (spanLegalNoticeElt != null && spanLegalNoticeElt != undefined) {
      spanLegalNoticeElt.html(TAPi18n.__('acceptance_of_our_legalNotice', {}));
    }
    let atLinkLegalNoticeElt = $("#legalNoticeAtLink");
-    if(atLinkLegalNoticeElt != null && atLinkLegalNoticeElt != undefined){
+    if (atLinkLegalNoticeElt != null && atLinkLegalNoticeElt != undefined) {
      atLinkLegalNoticeElt.html(TAPi18n.__('legalNotice', {}));
    }
    return true;
@@ -147,41 +159,41 @@ Template.userFormsLayout.events({
    }
    isCheckDone = false;
  },
-  'click #at-signUp'(event, templateInstance){
+  'click #at-signUp'(event, templateInstance) {
    isCheckDone = false;
  },
-  'DOMSubtreeModified #at-oidc'(event){
-    if(alreadyCheck <= 2){
+  'DOMSubtreeModified #at-oidc'(event) {
+    if (alreadyCheck <= 2) {
      let currSetting = Settings.findOne();
      let oidcBtnElt = $("#at-oidc");
-      if(currSetting && currSetting !== undefined && currSetting.oidcBtnText !== undefined && oidcBtnElt != null && oidcBtnElt != undefined){
+      if (currSetting && currSetting !== undefined && currSetting.oidcBtnText !== undefined && oidcBtnElt != null && oidcBtnElt != undefined) {
        let htmlvalue = "<i class='fa fa-oidc'></i>" + currSetting.oidcBtnText;
-        if(alreadyCheck == 1){
+        if (alreadyCheck == 1) {
          alreadyCheck++;
          oidcBtnElt.html("");
        }
-        else{
+        else {
          alreadyCheck++;
          oidcBtnElt.html(htmlvalue);
        }
      }
    }
-    else{
+    else {
      alreadyCheck = 1;
    }
  },
-  'DOMSubtreeModified .at-form'(event){
-    if(alreadyCheck <= 2 && !isCheckDone){
-      if(document.getElementById("at-oidc") != null){
+  'DOMSubtreeModified .at-form'(event) {
+    if (alreadyCheck <= 2 && !isCheckDone) {
+      if (document.getElementById("at-oidc") != null) {
        let currSetting = Settings.findOne();
        let oidcBtnElt = $("#at-oidc");
-        if(currSetting && currSetting !== undefined && currSetting.oidcBtnText !== undefined && oidcBtnElt != null && oidcBtnElt != undefined){
+        if (currSetting && currSetting !== undefined && currSetting.oidcBtnText !== undefined && oidcBtnElt != null && oidcBtnElt != undefined) {
          let htmlvalue = "<i class='fa fa-oidc'></i>" + currSetting.oidcBtnText;
-          if(alreadyCheck == 1){
+          if (alreadyCheck == 1) {
            alreadyCheck++;
            oidcBtnElt.html("");
          }
-          else{
+          else {
            alreadyCheck++;
            isCheckDone = true;
            oidcBtnElt.html(htmlvalue);
@@ -189,7 +201,7 @@ Template.userFormsLayout.events({
        }
      }
    }
-    else{
+    else {
      alreadyCheck = 1;
    }
  },
@@ -221,7 +233,7 @@ async function authentication(event, templateInstance) {
  switch (result) {
    case 'ldap':
      return new Promise(resolve => {
-        Meteor.loginWithLDAP(match, password, function() {
+        Meteor.loginWithLDAP(match, password, function () {
          resolve(FlowRouter.go('/'));
        });
      });
@@ -233,7 +245,7 @@ async function authentication(event, templateInstance) {
          {
            provider,
          },
-          function() {
+          function () {
            resolve(FlowRouter.go('/'));
          },
        );
@@ -241,7 +253,7 @@ async function authentication(event, templateInstance) {

    case 'cas':
      return new Promise(resolve => {
-        Meteor.loginWithCas(match, password, function() {
+        Meteor.loginWithCas(match, password, function () {
          resolve(FlowRouter.go('/'));
        });
      });
@@ -267,7 +279,6 @@ function getUserAuthenticationMethod(defaultAuthenticationMethod, match) {
      Meteor.subscribe('user-authenticationMethod', match, {
        onReady() {
          const user = Users.findOne();
-
          const authenticationMethod = user
            ? user.authenticationMethod
            : defaultAuthenticationMethod;
@@ -63,6 +63,7 @@
 .my-cards-card-title-table {
  font-weight: bold;
  padding-left: 2px;
+  max-width: 243px;
 }
 .my-cards-board-badge {
  width: 36px;
@@ -77,6 +77,29 @@ template(name="boardActions")
    div.trigger-button.js-create-card-action.js-goto-rules
      i.fa.fa-plus

+  div.trigger-item
+    div.trigger-content
+      div.trigger-text
+        | {{_'r-link-card'}}
+      div.trigger-text
+        | {{_'r-the-board'}}
+      div.trigger-dropdown
+        select(id="board-id-link")
+          each boards
+            if $eq _id currentBoard._id
+              option(value="{{_id}}" selected) {{_ 'current'}}
+            else
+              option(value="{{_id}}") {{title}}
+      div.trigger-text
+        | {{_'r-in-list'}}
+      div.trigger-dropdown
+        input(id="listName-link",type=text,placeholder="{{_'r-name'}}")
+      div.trigger-text
+        | {{_'r-in-swimlane'}}
+      div.trigger-dropdown
+        input(id="swimlaneName-link",type=text,placeholder="{{_'r-name'}}")
+    div.trigger-button.js-link-card-action.js-goto-rules
+      i.fa.fa-plus



@@ -178,6 +178,29 @@ BlazeComponent.extendComponent({
            });
          }
        },
+        'click .js-link-card-action'(event) {
+          const ruleName = this.data().ruleName.get();
+          const trigger = this.data().triggerVar.get();
+          const swimlaneName = this.find('#swimlaneName-link').value || '*';
+          const listName = this.find('#listName-link').value || '*';
+          const boardId = Session.get('currentBoard');
+          const destBoardId = this.find('#board-id-link').value;
+          const desc = Utils.getTriggerActionDesc(event, this);
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'linkCard',
+            listName,
+            swimlaneName,
+            boardId: destBoardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        },
      },
    ];
  },
@@ -88,7 +88,7 @@ template(name="filesReport")
      each att in results
        tr
          td {{ att.name }}
-          td.right {{fileSize att.size }}
+          td.right {{ fileSize att.size }}
          td {{ att.type }}
          td {{ att._id }}
          td {{ att.meta.boardId }}
@@ -4,6 +4,7 @@ import { CardSearchPagedComponent } from '/client/lib/cardSearch';
 import SessionData from '/models/usersessiondata';
 import { QueryParams } from '/config/query-classes';
 import { OPERATOR_LIMIT } from '/config/search-const';
+const filesize = require('filesize');

 BlazeComponent.extendComponent({
  subscription: null,
@@ -114,7 +115,8 @@ class AdminReport extends BlazeComponent {
  }

  fileSize(size) {
-    return Math.round(size / 1024);
+    const ret = filesize(size);
+    return ret;
  }

  abbreviate(text) {
@@ -23,6 +23,8 @@ template(name="moveAttachments")
      button.js-move-all-attachments-to-fs {{_ 'move-all-attachments-to-fs'}}
    .js-move-attachment
      button.js-move-all-attachments-to-gridfs {{_ 'move-all-attachments-to-gridfs'}}
+    .js-move-attachment
+      button.js-move-all-attachments-to-s3 {{_ 'move-all-attachments-to-s3'}}

  each board in getBoardsWithAttachments
    +moveBoardAttachments board
@@ -43,6 +45,8 @@ template(name="moveBoardAttachments")
      button.js-move-all-attachments-of-board-to-fs {{_ 'move-all-attachments-of-board-to-fs'}}
    .js-move-attachment
      button.js-move-all-attachments-of-board-to-gridfs {{_ 'move-all-attachments-of-board-to-gridfs'}}
+    .js-move-attachment
+      button.js-move-all-attachments-of-board-to-s3 {{_ 'move-all-attachments-of-board-to-s3'}}

  .board-attachments
    table
@@ -52,7 +56,7 @@ template(name="moveBoardAttachments")
        th {{_ 'name'}}
        th {{_ 'path'}}
        th {{_ 'version-name'}}
-        th {{_ 'size'}} (B)
+        th {{_ 'size'}}
        th GridFsFileId
        th {{_ 'storage'}}
        th {{_ 'action'}}
@@ -68,8 +72,9 @@ template(name="moveAttachment")
      td {{ name }}
      td {{ version.path }}
      td {{ version.versionName }}
-      td {{ version.size }}
+      td {{ fileSize version.size }}
      td {{ version.meta.gridFsFileId }}
+      td {{ version.meta.s3FileId }}
      td {{ version.storageName }}
      td
        if $neq version.storageName "fs"
@@ -82,3 +87,9 @@ template(name="moveAttachment")
            button.js-move-storage-gridfs
              i.fa.fa-arrow-right
              | {{_ 'attachment-move-storage-gridfs'}}
+
+        if $neq version.storageName "s3"
+          if version.storageName
+            button.js-move-storage-s3
+              i.fa.fa-arrow-right
+              | {{_ 'attachment-move-storage-s3'}}
@@ -1,4 +1,5 @@
 import Attachments, { fileStoreStrategyFactory } from '/models/attachments';
+const filesize = require('filesize');

 BlazeComponent.extendComponent({
  subscription: null,
@@ -83,6 +84,11 @@ BlazeComponent.extendComponent({
            Meteor.call('moveAttachmentToStorage', _attachment._id, "gridfs");
          });
        },
+        'click button.js-move-all-attachments-to-s3'(event) {
+          this.attachments.forEach(_attachment => {
+            Meteor.call('moveAttachmentToStorage', _attachment._id, "s3");
+          });
+        },
      }
    ]
  }
@@ -102,12 +108,21 @@ BlazeComponent.extendComponent({
            Meteor.call('moveAttachmentToStorage', _attachment._id, "gridfs");
          });
        },
+        'click button.js-move-all-attachments-of-board-to-s3'(event) {
+          this.data().attachments.forEach(_attachment => {
+            Meteor.call('moveAttachmentToStorage', _attachment._id, "s3");
+          });
+        },
      }
    ]
  },
 }).register('moveBoardAttachments');

 BlazeComponent.extendComponent({
+  fileSize(size) {
+    const ret = filesize(size);
+    return ret;
+  },
  events() {
    return [
      {
@@ -117,6 +132,9 @@ BlazeComponent.extendComponent({
        'click button.js-move-storage-gridfs'(event) {
          Meteor.call('moveAttachmentToStorage', this.data()._id, "gridfs");
        },
+        'click button.js-move-storage-s3'(event) {
+          Meteor.call('moveAttachmentToStorage', this.data()._id, "s3");
+        },
      }
    ]
  },
@@ -58,38 +58,38 @@ template(name='statistics')
          td {{numFormat statistics.os.loadavg.[0]}}, {{numFormat statistics.os.loadavg.[1]}}, {{numFormat statistics.os.loadavg.[2]}}
        tr
          th {{_ 'OS_Totalmem'}}
-          td {{bytesToSize statistics.os.totalmem}}
+          td {{fileSize statistics.os.totalmem}}
        tr
          th {{_ 'OS_Freemem'}}
-          td {{bytesToSize statistics.os.freemem}}
+          td {{fileSize statistics.os.freemem}}
        tr
          th {{_ 'OS_Cpus'}}
          td {{statistics.os.cpus.length}}
        unless isSandstorm
          tr
            th {{_ 'Node_heap_total_heap_size'}}
-            td {{bytesToSize statistics.nodeHeapStats.totalHeapSize}}
+            td {{fileSize statistics.nodeHeapStats.totalHeapSize}}
          tr
            th {{_ 'Node_heap_total_heap_size_executable'}}
-            td {{bytesToSize statistics.nodeHeapStats.totalHeapSizeExecutable}}
+            td {{fileSize statistics.nodeHeapStats.totalHeapSizeExecutable}}
          tr
            th {{_ 'Node_heap_total_physical_size'}}
-            td {{bytesToSize statistics.nodeHeapStats.totalPhysicalSize}}
+            td {{fileSize statistics.nodeHeapStats.totalPhysicalSize}}
          tr
            th {{_ 'Node_heap_total_available_size'}}
-            td {{bytesToSize statistics.nodeHeapStats.totalAvailableSize}}
+            td {{fileSize statistics.nodeHeapStats.totalAvailableSize}}
          tr
            th {{_ 'Node_heap_used_heap_size'}}
-            td {{bytesToSize statistics.nodeHeapStats.usedHeapSize}}
+            td {{fileSize statistics.nodeHeapStats.usedHeapSize}}
          tr
            th {{_ 'Node_heap_heap_size_limit'}}
-            td {{bytesToSize statistics.nodeHeapStats.heapSizeLimit}}
+            td {{fileSize statistics.nodeHeapStats.heapSizeLimit}}
          tr
            th {{_ 'Node_heap_malloced_memory'}}
-            td {{bytesToSize statistics.nodeHeapStats.mallocedMemory}}
+            td {{fileSize statistics.nodeHeapStats.mallocedMemory}}
          tr
            th {{_ 'Node_heap_peak_malloced_memory'}}
-            td {{bytesToSize statistics.nodeHeapStats.peakMallocedMemory}}
+            td {{fileSize statistics.nodeHeapStats.peakMallocedMemory}}
          tr
            th {{_ 'Node_heap_does_zap_garbage'}}
            td {{statistics.nodeHeapStats.doesZapGarbage}}
@@ -101,13 +101,16 @@ template(name='statistics')
            td {{statistics.nodeHeapStats.numberOfDetachedContexts}}
          tr
            th {{_ 'Node_memory_usage_rss'}}
-            td {{bytesToSize statistics.nodeMemoryUsage.rss}}
+            td {{fileSize statistics.nodeMemoryUsage.rss}}
          tr
            th {{_ 'Node_memory_usage_heap_total'}}
-            td {{bytesToSize statistics.nodeMemoryUsage.heapTotal}}
+            td {{fileSize statistics.nodeMemoryUsage.heapTotal}}
          tr
            th {{_ 'Node_memory_usage_heap_used'}}
-            td {{bytesToSize statistics.nodeMemoryUsage.heapUsed}}
+            td {{fileSize statistics.nodeMemoryUsage.heapUsed}}
          tr
            th {{_ 'Node_memory_usage_external'}}
-            td {{bytesToSize statistics.nodeMemoryUsage.external}}
+            td {{fileSize statistics.nodeMemoryUsage.external}}
+          tr
+            th {{_ 'Mongo_sessions_count'}}
+            td {{statistics.session.sessionsCount}}
@@ -1,4 +1,5 @@
 import { TAPi18n } from '/imports/i18n';
+const filesize = require('filesize');

 BlazeComponent.extendComponent({
  onCreated() {
@@ -39,12 +40,8 @@ BlazeComponent.extendComponent({
    return parseFloat(number).toFixed(2);
  },

-  bytesToSize(bytes) {
-    const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
-    if (bytes === 0) {
-      return '0 Byte';
-    }
-    const i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)), 10);
-    return `${Math.round(bytes / Math.pow(1024, i), 2)}  ${sizes[i]}`;
+  fileSize(size) {
+    const ret = filesize(size);
+    return ret;
  },
 }).register('statistics');
@@ -190,22 +190,19 @@ BlazeComponent.extendComponent({

 Template.orgRow.helpers({
  orgData() {
-    const orgCollection = this.esSearch ? ESSearchResults : Org;
-    return orgCollection.findOne(this.orgId);
+    return Org.findOne(this.orgId);
  },
 });

 Template.teamRow.helpers({
  teamData() {
-    const teamCollection = this.esSearch ? ESSearchResults : Team;
-    return teamCollection.findOne(this.teamId);
+    return Team.findOne(this.teamId);
  },
 });

 Template.peopleRow.helpers({
  userData() {
-    const userCollection = this.esSearch ? ESSearchResults : Users;
-    return userCollection.findOne(this.userId);
+    return Users.findOne(this.userId);
  },
 });

@@ -229,6 +229,10 @@ template(name='layoutSettings')
      .title {{_ 'custom-login-logo-link-url'}}
      .form-group
        input.wekan-form-control#custom-login-logo-link-url(type="text", placeholder="" value="{{currentSetting.customLoginLogoLinkUrl}}")
+    li.layout-form
+      .title {{_ 'custom-help-link-url'}}
+      .form-group
+        input.wekan-form-control#custom-help-link-url(type="text", placeholder="" value="{{currentSetting.customHelpLinkUrl}}")
    li.layout-form
      .title {{_ 'text-below-custom-login-logo'}}
      .form-group
@@ -249,6 +253,20 @@ template(name='layoutSettings')
      .title {{_ 'automatic-linked-url-schemes'}}
      .form-group
        textarea#automatic-linked-url-schemes.wekan-form-control= currentSetting.automaticLinkedUrlSchemes
+    li.layout-form
+      .title {{_ 'hide-card-counter-list'}}
+      .form-group.flex
+        input.wekan-form-control#hide-card-counter-list(type="radio" name="hideCardCounterList" value="true" checked="{{#if currentSetting.hideCardCounterList}}checked{{/if}}")
+        span {{_ 'yes'}}
+        input.wekan-form-control#hide-card-counter-list(type="radio" name="hideCardCounterList" value="false" checked="{{#unless currentSetting.hideCardCounterList}}checked{{/unless}}")
+        span {{_ 'no'}}
+    li.layout-form
+      .title {{_ 'hide-board-member-list'}}
+      .form-group.flex
+        input.wekan-form-control#hide-board-member-list(type="radio" name="hideBoardMemberList" value="true" checked="{{#if currentSetting.hideBoardMemberList}}checked{{/if}}")
+        span {{_ 'yes'}}
+        input.wekan-form-control#hide-board-member-list(type="radio" name="hideBoardMemberList" value="false" checked="{{#unless currentSetting.hideBoardMemberList}}checked{{/unless}}")
+        span {{_ 'no'}}
    li
      button.js-save-layout.primary {{_ 'save'}}

@@ -85,6 +85,12 @@ BlazeComponent.extendComponent({
  toggleHideLogo() {
    $('#hide-logo').toggleClass('is-checked');
  },
+  toggleHideCardCounterList() {
+    $('#hide-card-counter-list').toggleClass('is-checked');
+  },
+  toggleHideBoardMemberList() {
+    $('#hide-board-member-list').toggleClass('is-checked');
+  },
  toggleDisplayAuthenticationMethod() {
    $('#display-authentication-method').toggleClass('is-checked');
  },
@@ -189,6 +195,9 @@ BlazeComponent.extendComponent({
    const customLoginLogoLinkUrl = $('#custom-login-logo-link-url')
      .val()
      .trim();
+    const customHelpLinkUrl = $('#custom-help-link-url')
+      .val()
+      .trim();
    const textBelowCustomLoginLogo = $('#text-below-custom-login-logo')
      .val()
      .trim();
@@ -227,6 +236,8 @@ BlazeComponent.extendComponent({
      .val()
      .trim();
    const hideLogoChange = $('input[name=hideLogo]:checked').val() === 'true';
+    const hideCardCounterListChange = $('input[name=hideCardCounterList]:checked').val() === 'true';
+    const hideBoardMemberListChange = $('input[name=hideBoardMemberList]:checked').val() === 'true';
    const displayAuthenticationMethod =
      $('input[name=displayAuthenticationMethod]:checked').val() === 'true';
    const defaultAuthenticationMethod = $('#defaultAuthenticationMethod').val();
@@ -238,8 +249,11 @@ BlazeComponent.extendComponent({
        $set: {
          productName,
          hideLogo: hideLogoChange,
+          hideCardCounterList: hideCardCounterListChange,
+          hideBoardMemberList: hideBoardMemberListChange,
          customLoginLogoImageUrl,
          customLoginLogoLinkUrl,
+          customHelpLinkUrl,
          textBelowCustomLoginLogo,
          customTopLeftCornerLogoImageUrl,
          customTopLeftCornerLogoLinkUrl,
@@ -287,6 +301,8 @@ BlazeComponent.extendComponent({
        'click button.js-save': this.saveMailServerInfo,
        'click button.js-send-smtp-test-email': this.sendSMTPTestEmail,
        'click a.js-toggle-hide-logo': this.toggleHideLogo,
+        'click a.js-toggle-hide-card-counter-list': this.toggleHideCardCounterList,
+        'click a.js-toggle-hide-board-member-list': this.toggleHideBoardMemberList,
        'click button.js-save-layout': this.saveLayout,
        'click a.js-toggle-display-authentication-method': this
          .toggleDisplayAuthenticationMethod,
@@ -15,6 +15,7 @@ template(name="sidebar")
        +Template.dynamic(template=getViewTemplate)

 template(name='homeSidebar')
+  hr
  +membersWidget
  hr
  +labelsWidget
@@ -31,61 +32,59 @@ template(name='homeSidebar')
    +activities(mode="board")

 template(name="membersWidget")
-  if AtLeastOneOrgWasCreated
-    .board-widget.board-widget-members
+  unless currentUser.isCommentOnly
+    unless currentUser.isWorker
      h3
-        i.fa.fa-users
-        | {{_ 'organizations'}}
-
-      .board-widget-content
-        +boardOrgGeneral
-        .clearfix
-    br
-    hr
-  if AtLeastOneTeamWasCreated
-    .board-widget.board-widget-members
-      h3
-        i.fa.fa-users
-        | {{_ 'teams'}}
-
-      .board-widget-content
-        +boardTeamGeneral
-        .clearfix
-    br
-    hr
+        a.board-header-btn.js-open-board-menu(title="{{_ 'boardMenuPopup-title'}}")
+          i.board-header-btn-icon.fa.fa-cog
+          | {{_ 'boardMenuPopup-title'}}
  .board-widget.board-widget-members
-    h3
-      i.fa.fa-users
-      | {{_ 'members'}}
-
      .sidebar-shortcuts
        a.board-header-btn.js-shortcuts(title="{{_ 'keyboard-shortcuts' }}")
          i.fa.fa-keyboard-o
          span {{_ 'keyboard-shortcuts' }}
-
-      unless currentUser.isCommentOnly
+  hr
+  h3
+    i.fa.fa-users
+    | {{_ 'members'}}
+  +basicTabs(tabs=tabs)
+      +tabContent(slug="people")
        unless currentUser.isWorker
-          a.board-header-btn.js-open-board-menu(title="{{_ 'boardMenuPopup-title'}}").right
-            i.board-header-btn-icon.fa.fa-cog
-
-    .board-widget-content
-      each currentBoard.activeMembers
-        +userAvatar(userId=this.userId showStatus=true)
-      if isSandstorm
-        if currentUser.isBoardMember
-          a.member.add-member.sandstorm-powerbox-request-identity(title="{{_ 'add-members'}}")
-            i.fa.fa-plus
-      else if currentUser.isBoardAdmin
-        a.member.add-member.js-manage-board-members(title="{{_ 'add-members'}}")
-          i.fa.fa-plus
-      .clearfix
-  if isInvited
-    hr
-    p
-      i.fa.fa-exclamation-circle
-      | {{_ 'just-invited'}}
-    button.js-member-invite-accept.primary {{_ 'accept'}}
-    button.js-member-invite-decline {{_ 'decline'}}
+          p.quiet
+        .board-widget-content
+          each currentBoard.activeMembers
+            +userAvatar(userId=this.userId showStatus=true)
+          if isSandstorm
+            if currentUser.isBoardMember
+              a.member.add-member.sandstorm-powerbox-request-identity(title="{{_ 'add-members'}}")
+                i.fa.fa-plus
+          else if currentUser.isBoardAdmin
+            a.member.add-member.js-manage-board-members(title="{{_ 'add-members'}}")
+              i.fa.fa-plus
+          .clearfix
+          if isInvited
+            hr
+            p
+              i.fa.fa-exclamation-circle
+              | {{_ 'just-invited'}}
+            button.js-member-invite-accept.primary {{_ 'accept'}}
+            button.js-member-invite-decline {{_ 'decline'}}
+      +tabContent(slug='organizations')
+        unless currentUser.isWorker
+          p.quiet
+        if AtLeastOneOrgWasCreated
+          .board-widget.board-widget-members
+            .board-widget-content
+              +boardOrgGeneral
+              .clearfix
+      +tabContent(slug="teams")
+        unless currentUser.isWorker
+          p.quiet
+        if AtLeastOneTeamWasCreated
+          .board-widget.board-widget-members
+            .board-widget-content
+              +boardTeamGeneral
+              .clearfix

 template(name="boardOrgGeneral")
  table
@@ -141,18 +140,20 @@ template(name="boardChangeColorPopup")
 template(name="boardInfoOnMyBoardsPopup")
  form.board-info-on-my-boards
    h3 {{_ 'show-at-all-boards-page'}}
-    div.check-div
-      a.flex.js-field-has-cardcounterlist(class="{{#if allowsCardCounterList}}is-checked{{/if}}")
-        .materialCheckBox(class="{{#if allowsCardCounterList}}is-checked{{/if}}")
-        span
-          i.fa.fa-sign-out
-          | {{_ 'show-card-counter-per-list'}}
-    div.check-div
-      a.flex.js-field-has-boardmemberlist(class="{{#if allowsBoardMemberList}}is-checked{{/if}}")
-        .materialCheckBox(class="{{#if allowsBoardMemberList}}is-checked{{/if}}")
-        span
-          i.fa.fa-hourglass-start
-          | {{_ 'show-board_members-avatar'}}
+    unless currentSetting.hideCardCounterList
+      div.check-div
+        a.flex.js-field-has-cardcounterlist(class="{{#if allowsCardCounterList}}is-checked{{/if}}")
+          .materialCheckBox(class="{{#if allowsCardCounterList}}is-checked{{/if}}")
+          span
+            i.fa.fa-sign-out
+            | {{_ 'show-card-counter-per-list'}}
+    unless currentSetting.hideBoardMemberList
+      div.check-div
+        a.flex.js-field-has-boardmemberlist(class="{{#if allowsBoardMemberList}}is-checked{{/if}}")
+          .materialCheckBox(class="{{#if allowsBoardMemberList}}is-checked{{/if}}")
+          span
+            i.fa.fa-hourglass-start
+            | {{_ 'show-board_members-avatar'}}

 template(name="boardCardSettingsPopup")
  form.board-card-settings
@@ -408,10 +409,12 @@ template(name="boardMenuPopup")
          i.fa.fa-paint-brush
          | {{_ 'board-change-color'}}
    if currentUser.isBoardAdmin
-      li
-        a.js-board-info-on-my-boards(title="{{_ 'board-info-on-my-boards'}}")
-          i.fa.fa-id-card-o
-          | {{_ 'board-info-on-my-boards'}}
+      unless currentSetting.hideBoardMemberList
+        unless currentSetting.hideCardCounterList
+          li
+            a.js-board-info-on-my-boards(title="{{_ 'board-info-on-my-boards'}}")
+              i.fa.fa-id-card-o
+              | {{_ 'board-info-on-my-boards'}}
  hr
  ul.pop-over-list
    if withApi
@@ -561,7 +564,7 @@ template(name="removeBoardTeamPopup")

 template(name="addMemberPopup")
  .js-search-member
-    +esInput(index="users")
+    +EasySearch.Input(index=searchIndex)

  if loading.get
    +spinner
@@ -569,20 +572,20 @@ template(name="addMemberPopup")
    .warning {{_ error.get}}
  else
    ul.pop-over-list
-      +esEach(index="users")
+      +EasySearch.Each(index=searchIndex)
        li.item.js-member-item(class="{{#if isBoardMember}}disabled{{/if}}")
          a.name.js-select-member(title="{{profile.fullname}} ({{username}})")
-            +userAvatar(userId=_id esSearch=true)
+            +userAvatar(userId=__originalId)
            span.full-name
              = profile.fullname
              | (<span class="username">{{username}}</span>)
            if isBoardMember
              .quiet ({{_ 'joined'}})

-      +ifEsIsSearching(index='users')
+      +EasySearch.IfSearching(index=searchIndex)
        +spinner

-      +ifEsHasNoResults(index="users")
+      +EasySearch.IfNoResults(index=searchIndex)
        .manage-member-section
          p.quiet {{_ 'no-results'}}
    button.js-email-invite.primary.full {{_ 'email-invite'}}
@@ -22,6 +22,8 @@ BlazeComponent.extendComponent({
  onCreated() {
    this._isOpen = new ReactiveVar(false);
    this._view = new ReactiveVar(defaultView);
+    this._hideCardCounterList = new ReactiveVar(false);
+    this._hideBoardMemberList = new ReactiveVar(false);
    Sidebar = this;
  },

@@ -143,6 +145,18 @@ Template.homeSidebar.helpers({
  },
 });

+Template.boardInfoOnMyBoardsPopup.helpers({
+  currentSetting() {
+    return Settings.findOne();
+  },
+  hideCardCounterList() {
+    return Utils.isMiniScreen() && Session.get('currentBoard');
+  },
+  hideBoardMemberList() {
+    return Utils.isMiniScreen() && Session.get('currentBoard');
+  },
+})
+
 EscapeActions.register(
  'sidebarView',
  () => {
@@ -330,6 +344,14 @@ BlazeComponent.extendComponent({
  isLoading() {
    return this.loading.get();
  },
+
+  tabs() {
+    return [
+      { name: TAPi18n.__('people'), slug: 'people' },
+      { name: TAPi18n.__('organizations'), slug: 'organizations' },
+      { name: TAPi18n.__('teams'), slug: 'teams' },
+    ];
+  },
 }).register('membersWidget');

 Template.membersWidget.helpers({
@@ -1333,7 +1355,7 @@ BlazeComponent.extendComponent({
  },

  isBoardMember() {
-    const userId = this.currentData()._id;
+    const userId = this.currentData().__originalId;
    const user = Users.findOne(userId);
    return user && user.isBoardMember();
  },
@@ -1373,7 +1395,7 @@ BlazeComponent.extendComponent({
          this.setError('');
        },
        'click .js-select-member'() {
-          const userId = this.currentData()._id;
+          const userId = this.currentData().__originalId;
          const currentBoard = Boards.findOne(Session.get('currentBoard'));
          if (!currentBoard.hasMember(userId)) {
            this.inviteUser(userId);
@@ -1390,6 +1412,10 @@ BlazeComponent.extendComponent({
  },
 }).register('addMemberPopup');

+Template.addMemberPopup.helpers({
+  searchIndex: () => UserSearchIndex,
+})
+
 BlazeComponent.extendComponent({
  onCreated() {
    this.error = new ReactiveVar('');
@@ -25,10 +25,10 @@ template(name="swimlaneFixedHeader")
      if currentUser.isBoardAdmin
        a.fa.fa-plus.js-open-add-swimlane-menu.swimlane-header-plus-icon(title="{{_ 'add-swimlane'}}")
        a.fa.fa-navicon.js-open-swimlane-menu(title="{{_ 'swimlaneActionPopup-title'}}")
-      unless isMiniScreen
+      unless isTouchScreen
        if isShowDesktopDragHandles
          a.swimlane-header-handle.handle.fa.fa-arrows.js-swimlane-header-handle
-      if isMiniScreen
+      if isTouchScreen
        a.swimlane-header-miniscreen-handle.handle.fa.fa-arrows.js-swimlane-header-handle

 template(name="editSwimlaneTitleForm")
@@ -86,6 +86,11 @@
  padding: 5px 5px;
  font-size: 22px;
 }
+@media print {
+  .swimlane .swimlane-header-wrap .swimlane-header-menu {
+    display: none;
+  }
+}
 .swimlane .swimlane-header-wrap .swimlane-header-plus-icon {
  margin-left: 5px;
  padding-right: 20px;
@@ -10,10 +10,10 @@ function currentListIsInThisSwimlane(swimlaneId) {

 function currentCardIsInThisList(listId, swimlaneId) {
  const currentCard = Utils.getCurrentCard();
-  const currentUser = Meteor.user();
+  //const currentUser = Meteor.user();
  if (
-    currentUser &&
-    currentUser.profile &&
+    //currentUser &&
+    //currentUser.profile &&
    Utils.boardView() === 'board-view-swimlanes'
  )
    return (
@@ -21,7 +21,15 @@ function currentCardIsInThisList(listId, swimlaneId) {
      currentCard.listId === listId &&
      currentCard.swimlaneId === swimlaneId
    );
-  else return currentCard && currentCard.listId === listId;
+  else if (
+    //currentUser &&
+    //currentUser.profile &&
+    Utils.boardView() === 'board-view-lists'
+  )
+    return (
+      currentCard &&
+      currentCard.listId === listId
+    );

  // https://github.com/wekan/wekan/issues/1623
  // https://github.com/ChronikEwok/wekan/commit/cad9b20451bb6149bfb527a99b5001873b06c3de
@@ -77,6 +85,15 @@ function initSortable(boardComponent, $listsDom) {
      const listDomElement = ui.item.get(0);
      const list = Blaze.getData(listDomElement);

+      /*
+            Reverted incomplete change list width,
+            removed from below Lists.update:
+             https://github.com/wekan/wekan/issues/4558
+                $set: {
+                  width: list._id.width(),
+                  height: list._id.height(),
+      */
+
      Lists.update(list._id, {
        $set: {
          sort: sortIndex.base,
@@ -97,7 +114,7 @@ function initSortable(boardComponent, $listsDom) {
  //}

  boardComponent.autorun(() => {
-    if (Utils.isMiniScreenOrShowDesktopDragHandles()) {
+    if (Utils.isTouchScreenOrShowDesktopDragHandles()) {
      $listsDom.sortable({
        handle: '.js-list-handle',
      });
@@ -183,7 +200,7 @@ BlazeComponent.extendComponent({
          // his mouse.

          const noDragInside = ['a', 'input', 'textarea', 'p'].concat(
-            Utils.isMiniScreenOrShowDesktopDragHandles()
+            Utils.isTouchScreenOrShowDesktopDragHandles()
              ? ['.js-list-handle', '.js-swimlane-header-handle']
              : ['.js-list-header'],
          );
@@ -3,17 +3,10 @@ import Avatars from '/models/avatars';
 import Users from '/models/users';
 import Org from '/models/org';
 import Team from '/models/team';
-import { formatFleURL } from 'meteor/ostrio:files/lib';

 Template.userAvatar.helpers({
  userData() {
-    // We need to handle a special case for the search results provided by the
-    // `matteodem:easy-search` package. Since these results gets published in a
-    // separate collection, and not in the standard Meteor.Users collection as
-    // expected, we use a component parameter ("property") to distinguish the
-    // two cases.
-    const userCollection = this.esSearch ? ESSearchResults : Users;
-    return userCollection.findOne(this.userId, {
+    return Users.findOne(this.userId, {
      fields: {
        profile: 1,
        username: 1,
@@ -95,8 +88,7 @@ BlazeComponent.extendComponent({

 Template.boardOrgRow.helpers({
  orgData() {
-    const orgCollection = this.esSearch ? ESSearchResults : Org;
-    return orgCollection.findOne(this.orgId);
+    return Org.findOne(this.orgId);
  },
  currentUser(){
    return Meteor.user();
@@ -158,8 +150,7 @@ BlazeComponent.extendComponent({

 Template.boardTeamRow.helpers({
  teamData() {
-    const teamCollection = this.esSearch ? ESSearchResults : Team;
-    return teamCollection.findOne(this.teamId);
+    return Team.findOne(this.teamId);
  },
  currentUser(){
    return Meteor.user();
@@ -226,13 +217,6 @@ BlazeComponent.extendComponent({
              },
              false,
            );
-            uploader.on('uploaded', (error, fileRef) => {
-              if (!error) {
-                self.setAvatar(
-                  `${formatFleURL(fileRef)}?auth=false&brokenIsFine=true`,
-                );
-              }
-            });
            uploader.on('error', (error, fileData) => {
              self.setError(error.reason);
            });
@@ -246,8 +230,9 @@ BlazeComponent.extendComponent({
        'click .js-select-initials'() {
          this.setAvatar('');
        },
-        'click .js-delete-avatar'() {
+        'click .js-delete-avatar'(event) {
          Avatars.remove(this.currentData()._id);
+          event.stopPropagation();
        },
      },
    ];
@@ -159,12 +159,12 @@ template(name="changeSettingsPopup")
    //    | {{_ 'hide-system-messages'}}
    //    if hiddenSystemMessages
    //      i.fa.fa-check
-    li
-      a.js-toggle-desktop-drag-handles
-        i.fa.fa-arrows
-        | {{_ 'show-desktop-drag-handles'}}
-        if isShowDesktopDragHandles
-          i.fa.fa-check
+    //li
+    //  a.js-toggle-desktop-drag-handles
+    //    i.fa.fa-arrows
+    //    | {{_ 'show-desktop-drag-handles'}}
+    //    if isShowDesktopDragHandles
+    //      i.fa.fa-check
    unless currentUser.isWorker
      li
        label.bold.clear
@@ -180,6 +180,13 @@ template(name="changeSettingsPopup")
              option(selected="true", value="#{day.value}") #{day.name}
            else
              option(value="#{day.value}") #{day.name}
+        label.bold.clear
+          | {{_ 'card-settings'}}
+        ul#cards.card-description-rescued
+          a.flex.js-rescue-card-description(title="{{_ 'rescue-card-description'}}")
+            b &nbsp;
+            #rescue-card-description.materialCheckBox.left(class="{{#if rescueCardDescription}}is-checked{{/if}}", value=rescueCardDescription)
+            span {{_ 'rescue-card-description'}}
        input.js-apply-user-settings.left(type="submit" value="{{_ 'apply'}}")

 template(name="userDeletePopup")
@@ -297,6 +297,16 @@ Template.changeSettingsPopup.helpers({
      return false;
    }
  },
+  rescueCardDescription() {
+    currentUser = Meteor.user();
+    if (currentUser) {
+      return (currentUser.profile || {}).rescueCardDescription;
+    } else if (window.localStorage.getItem('rescueCardDescription')) {
+      return true;
+    } else {
+      return false;
+    }
+  },
  showCardsCountAt() {
    currentUser = Meteor.user();
    if (currentUser) {
@@ -356,6 +366,9 @@ Template.changeSettingsPopup.events({
      window.localStorage.setItem('hasHiddenSystemMessages', 'true');
    }
  },
+  'click .js-rescue-card-description'() {
+    Meteor.call('toggleRescueCardDescription')
+    },
  'click .js-apply-user-settings'(event, templateInstance) {
    event.preventDefault();
    let minLimit = parseInt(
@@ -27,12 +27,14 @@ Blaze.registerHelper('concat', (...args) => args.slice(0, -1).join(''));

 Blaze.registerHelper('isMiniScreen', () => Utils.isMiniScreen());

+Blaze.registerHelper('isTouchScreen', () => Utils.isTouchScreen());
+
 Blaze.registerHelper('isShowDesktopDragHandles', () =>
  Utils.isShowDesktopDragHandles(),
 );

-Blaze.registerHelper('isMiniScreenOrShowDesktopDragHandles', () =>
-  Utils.isMiniScreenOrShowDesktopDragHandles(),
+Blaze.registerHelper('isTouchScreenOrShowDesktopDragHandles', () =>
+  Utils.isTouchScreenOrShowDesktopDragHandles(),
 );

 Blaze.registerHelper('moment', (...args) => {
@@ -0,0 +1,38 @@
+class CustomField {
+  constructor(definition) {
+    this.definition = definition;
+  }
+}
+
+export class CustomFieldStringTemplate extends CustomField {
+  constructor(definition) {
+    super(definition);
+    this.format = definition.settings.stringtemplateFormat;
+    this.separator = definition.settings.stringtemplateSeparator;
+  }
+
+  getFormattedValue(rawValue) {
+    const ret = (rawValue ?? [])
+      .filter(value => !!value.trim())
+      .map(value => {
+        let _ret = this.format.replace(/[%$]\{.+?[^0-9]\}/g, function(_match) {
+          let __ret;
+          if (_match.match(/%\{value\}/i)) {
+            __ret = value;
+          } else {
+            _match = _match.replace(/^\$/, "");
+            try {
+              const _json = JSON.parse(_match);
+              __ret =  value.replace(new RegExp(_json.regex, _json.flags), _json.replace);
+            } catch (err) {
+              console.error(err);
+            }
+          }
+          return __ret;
+        });
+        return _ret;
+      })
+      .join(this.separator ?? '');
+    return ret;
+  }
+}
@@ -0,0 +1,188 @@
+export class DialogWithBoardSwimlaneList extends BlazeComponent {
+  /** returns the card dialog options
+   * @return Object with properties { boardId, swimlaneId, listId }
+   */
+  getDialogOptions() {
+  }
+
+  /** list is done
+   * @param listId the selected list id
+   * @param options the selected options (Object with properties { boardId, swimlaneId, listId })
+   */
+  setDone(listId, options) {
+  }
+
+  /** get the default options
+   * @return the options
+   */
+  getDefaultOption(boardId) {
+    const ret = {
+      'boardId' : "",
+      'swimlaneId' : "",
+      'listId' : "",
+    }
+    return ret;
+  }
+
+  onCreated() {
+    this.currentBoardId = Utils.getCurrentBoardId();
+    this.selectedBoardId = new ReactiveVar(this.currentBoardId);
+    this.selectedSwimlaneId = new ReactiveVar('');
+    this.selectedListId = new ReactiveVar('');
+    this.setOption(this.currentBoardId);
+  }
+
+  /** set the last confirmed dialog field values
+   * @param boardId the current board id
+   */
+  setOption(boardId) {
+    this.cardOption = this.getDefaultOption();
+
+    let currentOptions = this.getDialogOptions();
+    if (currentOptions && boardId && currentOptions[boardId]) {
+      this.cardOption = currentOptions[boardId];
+      if (this.cardOption.boardId &&
+          this.cardOption.swimlaneId &&
+          this.cardOption.listId
+      )
+      {
+        this.selectedBoardId.set(this.cardOption.boardId)
+        this.selectedSwimlaneId.set(this.cardOption.swimlaneId);
+        this.selectedListId.set(this.cardOption.listId);
+      }
+    }
+    this.getBoardData(this.selectedBoardId.get());
+    if (!this.selectedSwimlaneId.get() || !Swimlanes.findOne({_id: this.selectedSwimlaneId.get(), boardId: this.selectedBoardId.get()})) {
+      this.setFirstSwimlaneId();
+    }
+    if (!this.selectedListId.get() || !Lists.findOne({_id: this.selectedListId.get(), boardId: this.selectedBoardId.get()})) {
+      this.setFirstListId();
+    }
+  }
+  /** sets the first swimlane id */
+  setFirstSwimlaneId() {
+    try {
+      const board = Boards.findOne(this.selectedBoardId.get());
+      const swimlaneId = board.swimlanes().fetch()[0]._id;
+      this.selectedSwimlaneId.set(swimlaneId);
+    } catch (e) {}
+  }
+  /** sets the first list id */
+  setFirstListId() {
+    try {
+      const board = Boards.findOne(this.selectedBoardId.get());
+      const listId = board.lists().fetch()[0]._id;
+      this.selectedListId.set(listId);
+    } catch (e) {}
+  }
+
+  /** returns if the board id was the last confirmed one
+   * @param boardId check this board id
+   * @return if the board id was the last confirmed one
+   */
+  isDialogOptionBoardId(boardId) {
+    let ret = this.cardOption.boardId == boardId;
+    return ret;
+  }
+
+  /** returns if the swimlane id was the last confirmed one
+   * @param swimlaneId check this swimlane id
+   * @return if the swimlane id was the last confirmed one
+   */
+  isDialogOptionSwimlaneId(swimlaneId) {
+    let ret = this.cardOption.swimlaneId == swimlaneId;
+    return ret;
+  }
+
+  /** returns if the list id was the last confirmed one
+   * @param listId check this list id
+   * @return if the list id was the last confirmed one
+   */
+  isDialogOptionListId(listId) {
+    let ret = this.cardOption.listId == listId;
+    return ret;
+  }
+
+  /** returns all available board */
+  boards() {
+    const ret = Boards.find(
+      {
+        archived: false,
+        'members.userId': Meteor.userId(),
+        _id: { $ne: Meteor.user().getTemplatesBoardId() },
+      },
+      {
+        sort: { sort: 1 },
+      },
+    );
+    return ret;
+  }
+
+  /** returns all available swimlanes of the current board */
+  swimlanes() {
+    const board = Boards.findOne(this.selectedBoardId.get());
+    const ret = board.swimlanes();
+    return ret;
+  }
+
+  /** returns all available lists of the current board */
+  lists() {
+    const board = Boards.findOne(this.selectedBoardId.get());
+    const ret = board.lists();
+    return ret;
+  }
+
+  /** get the board data from the server
+   * @param boardId get the board data of this board id
+   */
+  getBoardData(boardId) {
+    const self = this;
+    Meteor.subscribe('board', boardId, false, {
+      onReady() {
+        const sameBoardId = self.selectedBoardId.get() == boardId;
+        self.selectedBoardId.set(boardId);
+
+        if (!sameBoardId) {
+          // reset swimlane id (for selection in cards())
+          self.setFirstSwimlaneId();
+
+          // reset list id (for selection in cards())
+          self.setFirstListId();
+        }
+      },
+    });
+  }
+
+  events() {
+    return [
+      {
+        'click .js-done'() {
+          const boardSelect = this.$('.js-select-boards')[0];
+          const boardId = boardSelect.options[boardSelect.selectedIndex].value;
+
+          const listSelect = this.$('.js-select-lists')[0];
+          const listId = listSelect.options[listSelect.selectedIndex].value;
+
+          const swimlaneSelect = this.$('.js-select-swimlanes')[0];
+          const swimlaneId = swimlaneSelect.options[swimlaneSelect.selectedIndex].value;
+
+          const options = {
+            'boardId' : boardId,
+            'swimlaneId' : swimlaneId,
+            'listId' : listId,
+          }
+          this.setDone(boardId, swimlaneId, listId, options);
+          Popup.back(2);
+        },
+        'change .js-select-boards'(event) {
+          const boardId = $(event.currentTarget).val();
+          this.getBoardData(boardId);
+        },
+        'change .js-select-swimlanes'(event) {
+          this.selectedSwimlaneId.set($(event.currentTarget).val());
+        },
+      },
+    ];
+  }
+}
+
@@ -0,0 +1,71 @@
+import { DialogWithBoardSwimlaneList } from '/client/lib/dialogWithBoardSwimlaneList';
+
+export class DialogWithBoardSwimlaneListCard extends DialogWithBoardSwimlaneList {
+  getDefaultOption(boardId) {
+    const ret = {
+      'boardId' : "",
+      'swimlaneId' : "",
+      'listId' : "",
+      'cardId': "",
+    }
+    return ret;
+  }
+
+  /** returns if the card id was the last confirmed one
+   * @param cardId check this card id
+   * @return if the card id was the last confirmed one
+   */
+  isDialogOptionCardId(cardId) {
+    let ret = this.cardOption.cardId == cardId;
+    return ret;
+  }
+
+  /** returns all available cards of the current list */
+  cards() {
+    const list = Lists.findOne(this.selectedListId.get());
+    let ret = [];
+    if (list) {
+      ret = list.cards(this.selectedSwimlaneId.get());
+    }
+    return ret;
+  }
+
+  events() {
+    return [
+      {
+        'click .js-done'() {
+          const boardSelect = this.$('.js-select-boards')[0];
+          const boardId = boardSelect.options[boardSelect.selectedIndex].value;
+
+          const listSelect = this.$('.js-select-lists')[0];
+          const listId = listSelect.options[listSelect.selectedIndex].value;
+
+          const swimlaneSelect = this.$('.js-select-swimlanes')[0];
+          const swimlaneId = swimlaneSelect.options[swimlaneSelect.selectedIndex].value;
+
+          const cardSelect = this.$('.js-select-cards')[0];
+          const cardId = cardSelect.options[cardSelect.selectedIndex].value;
+
+          const options = {
+            'boardId' : boardId,
+            'swimlaneId' : swimlaneId,
+            'listId' : listId,
+            'cardId': cardId,
+          }
+          this.setDone(cardId, options);
+          Popup.back(2);
+        },
+        'change .js-select-boards'(event) {
+          const boardId = $(event.currentTarget).val();
+          this.getBoardData(boardId);
+        },
+        'change .js-select-swimlanes'(event) {
+          this.selectedSwimlaneId.set($(event.currentTarget).val());
+        },
+        'change .js-select-lists'(event) {
+          this.selectedListId.set($(event.currentTarget).val());
+        },
+      },
+    ];
+  }
+}
@@ -149,12 +149,12 @@ window.Popup = new (class {
    }
  }

-  getOpenerComponent() {
-    const { openerElement } = Template.parentData(4);
+  getOpenerComponent(n=4) {
+    const { openerElement } = Template.parentData(n);
    return BlazeComponent.getComponentForElement(openerElement);
  }

-  // An utility fonction that returns the top element of the internal stack
+  // An utility function that returns the top element of the internal stack
  _getTopStack() {
    return this._stack[this._stack.length - 1];
  }
@@ -5,20 +5,20 @@ import { Random } from 'meteor/random';
 import '../utils';


-describe('Utils', function() {
-  beforeEach(function() {
-    sinon.stub(Utils, 'reload').callsFake(() => {});
+describe('Utils', function () {
+  beforeEach(function () {
+    sinon.stub(Utils, 'reload').callsFake(() => { });
  });

-  afterEach(function() {
+  afterEach(function () {
    window.localStorage.removeItem(boardView);
    sinon.restore();
  });

  const boardView = 'boardView';

-  describe(Utils.setBoardView.name, function() {
-    it('sets the board view if the user exists', function(done) {
+  describe(Utils.setBoardView.name, function () {
+    it('sets the board view if the user exists', function (done) {
      const viewId = Random.id();
      const user = {
        setBoardView: (view) => {
@@ -32,14 +32,14 @@ describe('Utils', function() {
      expect(window.localStorage.getItem(boardView)).to.equal(viewId);
    });

-    it('sets a specific view if no user exists but a view is defined', function() {
+    it('sets a specific view if no user exists but a view is defined', function () {
      const views = [
        'board-view-swimlanes',
        'board-view-lists',
        'board-view-cal'
      ];

-      sinon.stub(Meteor, 'user').callsFake(() => {});
+      sinon.stub(Meteor, 'user').callsFake(() => { });

      views.forEach(viewName => {
        Utils.setBoardView(viewName);
@@ -47,15 +47,15 @@ describe('Utils', function() {
      });
    });

-    it('sets a default view if no user and no view are given', function() {
-      sinon.stub(Meteor, 'user').callsFake(() => {});
+    it('sets a default view if no user and no view are given', function () {
+      sinon.stub(Meteor, 'user').callsFake(() => { });
      Utils.setBoardView();
      expect(window.localStorage.getItem(boardView)).to.equal('board-view-swimlanes');
    });
  });

-  describe(Utils.unsetBoardView.name, function() {
-    it('removes the boardview from localStoage', function() {
+  describe(Utils.unsetBoardView.name, function () {
+    it('removes the boardview from localStoage', function () {
      window.localStorage.setItem(boardView, Random.id());
      window.localStorage.setItem('collapseSwimlane', Random.id());

@@ -66,8 +66,8 @@ describe('Utils', function() {
    });
  });

-  describe(Utils.boardView.name, function() {
-    it('returns the user\'s board view if a user exists', function() {
+  describe(Utils.boardView.name, function () {
+    it('returns the user\'s board view if a user exists', function () {
      const viewId = Random.id();
      const user = {};
      sinon.stub(Meteor, 'user').callsFake(() => user);
@@ -78,108 +78,108 @@ describe('Utils', function() {

      expect(Utils.boardView()).to.equal(boardView);
    });
-    it('returns the current defined view', function() {
+    it('returns the current defined view', function () {
      const views = [
        'board-view-swimlanes',
        'board-view-lists',
        'board-view-cal'
      ];

-      sinon.stub(Meteor, 'user').callsFake(() => {});
+      sinon.stub(Meteor, 'user').callsFake(() => { });

      views.forEach(viewName => {
        window.localStorage.setItem(boardView, viewName);
        expect(Utils.boardView()).to.equal(viewName);
      });
    });
-    it('returns a default if nothing is set', function() {
-      sinon.stub(Meteor, 'user').callsFake(() => {});
+    it('returns a default if nothing is set', function () {
+      sinon.stub(Meteor, 'user').callsFake(() => { });
      expect(Utils.boardView()).to.equal('board-view-swimlanes');
      expect(window.localStorage.getItem(boardView)).to.equal('board-view-swimlanes');
    });
  });

-  describe(Utils.myCardsSort.name, function() {
+  describe(Utils.myCardsSort.name, function () {
    it('has no tests yet');
  });

-  describe(Utils.myCardsSortToggle.name, function() {
+  describe(Utils.myCardsSortToggle.name, function () {
    it('has no tests yet');
  });

-  describe(Utils.setMyCardsSort.name, function() {
+  describe(Utils.setMyCardsSort.name, function () {
    it('has no tests yet');
  });

-  describe(Utils.archivedBoardIds.name, function() {
+  describe(Utils.archivedBoardIds.name, function () {
    it('has no tests yet');
  });

-  describe(Utils.dueCardsView.name, function() {
+  describe(Utils.dueCardsView.name, function () {
    it('has no tests yet');
  });

-  describe(Utils.setDueCardsView.name, function() {
+  describe(Utils.setDueCardsView.name, function () {
    it('has no tests yet');
  });

-  describe(Utils.goBoardId.name, function() {
+  describe(Utils.goBoardId.name, function () {
    it('has no tests yet');
  });

-  describe(Utils.goCardId.name, function() {
+  describe(Utils.goCardId.name, function () {
    it('has no tests yet');
  });

-  describe(Utils.processUploadedAttachment.name, function() {
+  describe(Utils.processUploadedAttachment.name, function () {
    it('has no tests yet');
  });

-  describe(Utils.shrinkImage.name, function() {
+  describe(Utils.shrinkImage.name, function () {
    it('has no tests yet');
  });

-  describe(Utils.capitalize.name, function() {
+  describe(Utils.capitalize.name, function () {
    it('has no tests yet');
  });

-  describe(Utils.isMiniScreen.name, function() {
+  describe(Utils.isMiniScreen.name, function () {
    it('has no tests yet');
  });

-  describe(Utils.isShowDesktopDragHandles.name, function() {
+  describe(Utils.isShowDesktopDragHandles.name, function () {
    it('has no tests yet');
  });

-  describe(Utils.isMiniScreenOrShowDesktopDragHandles.name, function() {
+  describe(Utils.isTouchScreenOrShowDesktopDragHandles.name, function () {
    it('has no tests yet');
  });

-  describe(Utils.calculateIndexData.name, function() {
+  describe(Utils.calculateIndexData.name, function () {
    it('has no tests yet');
  });

-  describe(Utils.calculateIndex.name, function() {
+  describe(Utils.calculateIndex.name, function () {
    it('has no tests yet');
  });

-  describe(Utils.manageCustomUI.name, function() {
+  describe(Utils.manageCustomUI.name, function () {
    it('has no tests yet');
  });

-  describe(Utils.setCustomUI.name, function() {
+  describe(Utils.setCustomUI.name, function () {
    it('has no tests yet');
  });

-  describe(Utils.setMatomo.name, function() {
+  describe(Utils.setMatomo.name, function () {
    it('has no tests yet');
  });

-  describe(Utils.manageMatomo.name, function() {
+  describe(Utils.manageMatomo.name, function () {
    it('has no tests yet');
  });

-  describe(Utils.getTriggerActionDesc.name, function() {
+  describe(Utils.getTriggerActionDesc.name, function () {
    it('has no tests yet');
  });
 });
@@ -40,7 +40,7 @@ Utils = {
    const ret = Cards.findOne(cardId);
    return ret;
  },
-  reload () {
+  reload() {
    // we move all window.location.reload calls into this function
    // so we can disable it when running tests.
    // This is because we are not allowed to override location.reload but
@@ -201,14 +201,14 @@ Utils = {
      image = document.createElement('img');
    const maxSize = options.maxSize || 1024;
    const ratio = options.ratio || 1.0;
-    const next = function(result) {
+    const next = function (result) {
      image = null;
      canvas = null;
      if (typeof callback === 'function') {
        callback(result);
      }
    };
-    image.onload = function() {
+    image.onload = function () {
      let width = this.width,
        height = this.height;
      let changed = false;
@@ -237,7 +237,7 @@ Utils = {
        next(changed);
      }
    };
-    image.onerror = function() {
+    image.onerror = function () {
      next(false);
    };
    image.src = dataurl;
@@ -256,43 +256,43 @@ Utils = {
    // OLD WINDOW WIDTH DETECTION:
    this.windowResizeDep.depend();
    return $(window).width() <= 800;
+  },
+
+  isTouchScreen() {

    // NEW TOUCH DEVICE DETECTION:
    // https://developer.mozilla.org/en-US/docs/Web/HTTP/Browser_detection_using_the_user_agent

-    /*
    var hasTouchScreen = false;
    if ("maxTouchPoints" in navigator) {
-        hasTouchScreen = navigator.maxTouchPoints > 0;
+      hasTouchScreen = navigator.maxTouchPoints > 0;
    } else if ("msMaxTouchPoints" in navigator) {
-        hasTouchScreen = navigator.msMaxTouchPoints > 0;
+      hasTouchScreen = navigator.msMaxTouchPoints > 0;
    } else {
-        var mQ = window.matchMedia && matchMedia("(pointer:coarse)");
-        if (mQ && mQ.media === "(pointer:coarse)") {
-            hasTouchScreen = !!mQ.matches;
-        } else if ('orientation' in window) {
-            hasTouchScreen = true; // deprecated, but good fallback
-        } else {
-            // Only as a last resort, fall back to user agent sniffing
-            var UA = navigator.userAgent;
-            hasTouchScreen = (
-                /\b(BlackBerry|webOS|iPhone|IEMobile)\b/i.test(UA) ||
-                /\b(Android|Windows Phone|iPad|iPod)\b/i.test(UA)
-            );
-        }
+      var mQ = window.matchMedia && matchMedia("(pointer:coarse)");
+      if (mQ && mQ.media === "(pointer:coarse)") {
+        hasTouchScreen = !!mQ.matches;
+      } else if ('orientation' in window) {
+        hasTouchScreen = true; // deprecated, but good fallback
+      } else {
+        // Only as a last resort, fall back to user agent sniffing
+        var UA = navigator.userAgent;
+        hasTouchScreen = (
+          /\b(BlackBerry|webOS|iPhone|IEMobile)\b/i.test(UA) ||
+          /\b(Android|Windows Phone|iPad|iPod)\b/i.test(UA)
+        );
+      }
    }
-    */
-    //if (hasTouchScreen)
-    //    document.getElementById("exampleButton").style.padding="1em";
-    //return false;
+    return hasTouchScreen;
  },

  // returns if desktop drag handles are enabled
  isShowDesktopDragHandles() {
-    const currentUser = Meteor.user();
-    if (currentUser) {
-      return (currentUser.profile || {}).showDesktopDragHandles;
-    } else if (window.localStorage.getItem('showDesktopDragHandles')) {
+    //const currentUser = Meteor.user();
+    //if (currentUser) {
+    //  return (currentUser.profile || {}).showDesktopDragHandles;
+    //} else if (window.localStorage.getItem('showDesktopDragHandles')) {
+    if (window.localStorage.getItem('showDesktopDragHandles')) {
      return true;
    } else {
      return false;
@@ -300,8 +300,9 @@ Utils = {
  },

  // returns if mini screen or desktop drag handles
-  isMiniScreenOrShowDesktopDragHandles() {
-    return this.isMiniScreen() || this.isShowDesktopDragHandles();
+  isTouchScreenOrShowDesktopDragHandles() {
+    //return this.isTouchScreen() || this.isShowDesktopDragHandles();
+    return this.isShowDesktopDragHandles();
  },

  calculateIndexData(prevData, nextData, nItems = 1) {
@@ -396,7 +397,7 @@ Utils = {
    window._paq.push(['trackPageView']);
    window._paq.push(['enableLinkTracking']);

-    (function() {
+    (function () {
      window._paq.push(['setTrackerUrl', `${data.address}piwik.php`]);
      window._paq.push(['setSiteId', data.siteId]);

@@ -500,8 +501,8 @@ Utils = {
  copyTextToClipboard(text) {
    let ret;
    if (navigator.clipboard) {
-      ret = navigator.clipboard.writeText(text).then(function() {
-      }, function(err) {
+      ret = navigator.clipboard.writeText(text).then(function () {
+      }, function (err) {
        console.error('Async: Could not copy text: ', err);
      });
    } else {
@@ -5,6 +5,16 @@ const emailField = AccountsTemplates.removeField('email');
 let disableRegistration = false;
 let disableForgotPassword = false;
 let passwordLoginDisabled = false;
+let oidcRedirectionEnabled = false;
+let oauthServerUrl = "home";
+let oauthDashboardUrl = "";
+
+Meteor.call('isOidcRedirectionEnabled', (_, result) => {
+  if(result)
+  {
+    oidcRedirectionEnabled = true;
+  }
+});

 Meteor.call('isPasswordLoginDisabled', (_, result) => {
  if (result) {
@@ -14,6 +24,18 @@ Meteor.call('isPasswordLoginDisabled', (_, result) => {
  }
 });

+Meteor.call('getOauthServerUrl', (_, result) => {
+  if (result) {
+    oauthServerUrl = result;
+  }
+});
+
+Meteor.call('getOauthDashboardUrl', (_, result) => {
+  if (result) {
+    oauthDashboardUrl = result;
+  }
+});
+
 Meteor.call('isDisableRegistration', (_, result) => {
  if (result) {
    disableRegistration = true;
@@ -59,11 +81,19 @@ AccountsTemplates.configure({
  showForgotPasswordLink: !disableForgotPassword,
  forbidClientAccountCreation: disableRegistration,
  onLogoutHook() {
-    const homePage = 'home';
-    if (FlowRouter.getRouteName() === homePage) {
-      FlowRouter.reload();
-    } else {
-      FlowRouter.go(homePage);
+    // here comeslogic for redirect
+    if(oidcRedirectionEnabled)
+    {
+      window.location = oauthServerUrl + oauthDashboardUrl;
+    }
+    else
+    {
+      const homePage = 'home';
+      if (FlowRouter.getRouteName() === homePage) {
+        FlowRouter.reload();
+      } else {
+        FlowRouter.go(homePage);
+      }
    }
  },
 });
@@ -127,6 +127,13 @@ services:
    # image: wekanteam/wekan
    #-------------------------------------------------------------------------------------
    container_name: wekan-app
+    # On CentOS 7 there is seccomp issue with glibc 6,
+    # so CentOS 7 users shoud use these security_opt seccomp:unconfined
+    # settings to get WeKan working. See:
+    #   - https://github.com/wekan/wekan/issues/4585
+    #   - https://github.com/wekan/wekan/issues/4587
+    #security_opt:
+    #  - seccomp:unconfined
    restart: always
    networks:
      - wekan-tier
@@ -148,6 +155,14 @@ services:
      # ==== WRITEABLE PATH FOR FILE UPLOADS ====
      - WRITABLE_PATH=/data
      #-----------------------------------------------------------------
+      # ==== AWS S3 FOR FILES ====
+      # Any region. For example:
+      #   us-standard,us-west-1,us-west-2,
+      #   eu-west-1,eu-central-1,
+      #   ap-southeast-1,ap-northeast-1,sa-east-1
+      #
+      #- S3='{"s3":{"key": "xxx", "secret": "xxx", "bucket": "xxx", "region": "xxx"}}'
+      #-----------------------------------------------------------------
      # ==== MONGO_URL ====
      - MONGO_URL=mongodb://wekandb:27017/wekan
      #---------------------------------------------------------------
@@ -260,10 +275,20 @@ services:
      # https://github.com/wekan/wekan/issues/2518
      - CARD_OPENED_WEBHOOK_ENABLED=false
      #---------------------------------------------------------------
+      # ==== Allow configuration to validate uploaded attachments ====
+      #-ATTACHMENTS_UPLOAD_EXTERNAL_PROGRAM=/usr/local/bin/avscan {file}
+      #-ATTACHMENTS_UPLOAD_MIME_TYPES=image/*,text/*
+      #-ATTACHMENTS_UPLOAD_MAX_SIZE=5000000
+      #---------------------------------------------------------------
+      # ==== Allow configuration to validate uploaded avatars ====
+      #-AVATARS_UPLOAD_EXTERNAL_PROGRAM=/usr/local/bin/avscan {file}
+      #-AVATARS_UPLOAD_MIME_TYPES=image/*
+      #-AVATARS_UPLOAD_MAX_SIZE=500000
+      #---------------------------------------------------------------
      # ==== Allow to shrink attached/pasted image ====
      # https://github.com/wekan/wekan/pull/2544
-      #-MAX_IMAGE_PIXEL=1024
-      #-IMAGE_COMPRESS_RATIO=80
+      #- MAX_IMAGE_PIXEL=1024
+      #- IMAGE_COMPRESS_RATIO=80
      #---------------------------------------------------------------
      # ==== NOTIFICATION TRAY AFTER READ DAYS BEFORE REMOVE =====
      # Number of days after a notification is read before we remove it.
@@ -330,12 +355,20 @@ services:
      # When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside.
      #- TRUSTED_URL=https://intra.example.com
      #-----------------------------------------------------------------
+      # ==== METRICS ALLOWED IP ADDRESSES ====
+      # https://github.com/wekan/wekan/wiki/Metrics
+      #- METRICS_ALLOWED_IP_ADDRESSES=192.168.0.100,192.168.0.200
+      #-----------------------------------------------------------------
      # ==== OUTGOING WEBHOOKS ====
      # What to send to Outgoing Webhook, or leave out. If commented out the default values will be: cardId,listId,oldListId,boardId,comment,user,card,commentId,swimlaneId,customerField,customFieldValue
      #- WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId
      #-----------------------------------------------------------------
      # ==== Debug OIDC OAuth2 etc ====
      #- DEBUG=true
+      #---------------------------------------------
+      # ==== AUTOLOGIN WITH OIDC/OAUTH2 ====
+      # https://github.com/wekan/wekan/wiki/autologin
+      #- OIDC_REDIRECTION_ENABLED=true
      #-----------------------------------------------------------------
      # ==== OAUTH2 ORACLE on premise identity manager OIM ====
      #- ORACLE_OIM_ENABLED=true
@@ -448,6 +481,7 @@ services:
      # Note: Do not add single quotes '' to variables. Having spaces still works without quotes where required.
      #
      # The default authentication method used if a user does not exist to create and authenticate. Can be set as ldap.
+      # (this is set properly in the Admin Panel, changing this item does not remove Password login option)
      #- DEFAULT_AUTHENTICATION_METHOD=ldap
      #
      # Enable or not the connection by the LDAP
@@ -535,7 +569,7 @@ services:
      # At which interval does the background task sync.
      # The format must be as specified in:
      # https://bunkat.github.io/later/parsers.html#text
-      #- LDAP_BACKGROUND_SYNC_INTERVAL='every 1 hour'
+      #- LDAP_BACKGROUND_SYNC_INTERVAL=every 1 hour
      #
      #- LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=false
      #
@@ -0,0 +1,25 @@
+# WeKan Helm Charts
+
+## Webpage
+
+https://wekan.github.io/charts/
+
+## ArtifactHub
+
+https://artifacthub.io/packages/helm/wekan/wekan
+
+## Code
+
+https://github.com/wekan/charts/tree/main/wekan
+
+## Issues
+
+https://github.com/wekan/charts/issues
+
+## Pull Requests
+
+https://github.com/wekan/charts/pulls
+
+## Releases
+
+https://github.com/wekan/charts/tree/gh-pages
@@ -1,22 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-OWNERS
@@ -1,6 +0,0 @@
-dependencies:
- name: mongodb
-  repository: https://charts.bitnami.com/bitnami
-  version: 10.0.5
-digest: sha256:f6520f39b687cb52574ec2fda514662ce913665c0fd2391b68fdb4d2eb059497
-generated: "2021-07-27T22:16:39.945592552+02:00"
@@ -1,24 +0,0 @@
-apiVersion: v2
-appVersion: "6.26"
-dependencies:
-  - condition: mongodb.enabled
-    name: mongodb
-    repository: https://charts.bitnami.com/bitnami
-    version: 10.0.x
-description: Open Source kanban
-home: https://wekan.github.io
-icon: https://wekan.github.io/wekan-logo.svg
-keywords:
-  - kanban
-maintainers:
-  - email: github@randall.cc
-    name: technotaff
-  - email: jiangyt.cn@gmail.com
-    name: jiangytcn
-  - email: varac@varac.net
-    name: varac
-name: wekan
-sources:
-  - https://github.com/wekan/wekan
-type: application
-version: 1.1.1
@@ -1,4 +0,0 @@
-approvers:
- technotaff
-reviewers:
- technotaff
@@ -1,102 +0,0 @@
-# WeKan ® - Open Source kanban
-
-## Installing the Chart
-
-To install the chart with the release name `my-release`:
-
-```bash
-helm repo add wekan https://wekan.github.io/charts
-helm install my-release wekan/wekan
-```
-
-These commands deploy Wekan on the Kubernetes cluster in the default configuration.
-
-Tip: List all releases using `helm list`
-
-For all available values see `helm show values wekan/wekan`.
-
-## Uninstalling the Chart
-
-To uninstall/delete the my-release deployment:
-
-```bash
-helm delete my-release
-```
-
-The command removes all the Kubernetes components associated with the chart and
-deletes the release.
-
-## Features
-
-* Uses a MongoDB replica set by default - this allows fault-tolerant
-  and scalable MongoDB deployment (or just set the replicas to 1 for
-  a single server install)
-
-* Optional Horizontal Pod Autoscaler (HPA), so that your Wekan pods
-  will scale automatically with increased CPU load.
-
-## The configurable values (values.yaml)
-
-Scaling Wekan:
-
-```yaml
-## Configuration for wekan component
-##
-
-replicaCount: 1
-```
-
-**replicaCount** will set the initial number of replicas for the Wekan pod
-(and container)
-
-```yaml
-## Configure an horizontal pod autoscaler
-##
-autoscaling:
-  enabled: true
-  config:
-    minReplicas: 1
-    maxReplicas: 16
-    ## Note: when setting this, a `resources.request.cpu` is required. You
-    ## likely want to set it to `1` or some lower value.
-    ##
-    targetCPUUtilizationPercentage: 80
-```
-
-This section (if *enabled* is set to **true**) will enable the Kubernetes
-Horizontal Pod Autoscaler (HPA).
-
-**minReplicas:** this is the minimum number of pods to scale down to
-(We recommend setting this to the same value as **replicaCount**).
-
-**maxReplicas:** this is the maximum number of pods to scale up to.
-
-**targetCPUUtilizationPercentage:** This is the CPU at which the HPA will
-scale-out the number of Wekan pods.
-
-```yaml
-mongodb-replicaset:
-  enabled: true
-  replicas: 3
-  replicaSetName: rs0
-  securityContext:
-    runAsUser: 1000
-    fsGroup: 1000
-    runAsNonRoot: true
-```
-
-This section controls the scale of the MongoDB redundant Replica Set.
-
-**replicas:** This is the number of MongoDB instances to include in the set.
-You can set this to 1 for a single server - this will still allow you to
-scale-up later with a helm upgrade.
-
-### Install OCP route
-
-If you use this chart to deploy Wekan on an OCP cluster, you can create route
-instead of ingress with following command:
-
-```bash
-helm template --set route.enabled=true,ingress.enabled=false values.yaml . | \
-  oc apply -f-
-```
@@ -1,19 +0,0 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range .Values.ingress.hosts }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "wekan.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ template "wekan.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "wekan.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "wekan.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl port-forward $POD_NAME 8080:8080
-{{- end }}
@@ -1,88 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "wekan.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "wekan.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified name for the wekan data app.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "wekan.localdata.fullname" -}}
-{{- if .Values.localdata.fullnameOverride -}}
-{{- .Values.localdata.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- printf "%s-localdata" .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s-localdata" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "wekan.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use for the api component
-*/}}
-{{- define "wekan.serviceAccountName" -}}
-{{- if .Values.serviceAccounts.create -}}
-    {{ default (include "wekan.fullname" .) .Values.serviceAccounts.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccounts.name }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified mongodb-replicaset name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "wekan.mongodb.svcname" -}}
-{{- $name := default "mongodb" (index .Values "mongodb" "nameOverride") -}}
-{{- if eq .Values.mongodb.architecture "replicaset" }}
-{{- printf "%s-%s-headless" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create the MongoDB URL. If MongoDB is installed as part of this chart, use k8s service discovery,
-else use user-provided URL.
-*/}}
-{{- define "mongodb.url" -}}
-{{- if (index .Values "mongodb" "enabled") -}}
-{{- $count := (int (index .Values "mongodb" "replicaCount")) -}}
-{{- $release := .Release.Name -}}
-{{- $replicaSetName := (index .Values "mongodb" "replicaSetName") -}}
-{{- $mongodbSvcName := include "wekan.mongodb.svcname" . -}}
-mongodb://{{- range $v := until $count }}{{ $release }}-mongodb-{{ $v }}.{{ $mongodbSvcName }}:27017{{ if ne $v (sub $count 1) }},{{- end -}}{{- end -}}/{{ .Values.dbname }}?replicaSet={{ $replicaSetName }}
-{{- else -}}
-{{- index .Values "mongodb" "url" -}}
-{{- end -}}
-{{- end -}}
@@ -1,79 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ template "wekan.fullname" . }}
-  labels:
-    app: {{ template "wekan.name" . }}
-    chart: {{ template "wekan.chart" . }}
-    component: wekan
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-    {{- if .Values.deploymentLabels }}
-    {{- toYaml .Values.deploymentLabels | nindent 4 }}
-    {{- end }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ template "wekan.name" . }}
-      component: wekan
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      annotations:
-      labels:
-        app: {{ template "wekan.name" . }}
-        component: wekan
-        release: {{ .Release.Name }}
-        {{- if .Values.podLabels }}
-        {{- toYaml .Values.podLabels | nindent 8 }}
-        {{- end }}
-    spec:
-      serviceAccountName: {{ template "wekan.serviceAccountName" . }}
-      containers:
-        - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          terminationMessagePolicy: FallbackToLogsOnError
-          ports:
-            - name: http
-              containerPort: 8080
-          env:
-            - name: ROOT_URL
-              value: {{ .Values.root_url | default "https://wekan.local" | quote }}
-            - name: MONGO_URL
-              value: "{{ template "mongodb.url" . }}"
-          {{- range $key := .Values.env }}
-          {{- if .value }}
-            - name: {{ .name }}
-              value: {{ .value | quote }}
-          {{- end }}
-          {{- end }}
-          {{- range $key := .Values.secretEnv }}
-          {{- if .value }}
-            - name: {{ .name }}
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "wekan.fullname" $ }}-secret
-                  key: {{ .name }}
-          {{- end }}
-          {{- end }}
-          livenessProbe:
-            httpGet:
-              path: /
-              port: 8080
-            initialDelaySeconds: 60
-          resources:
-{{ toYaml .Values.resources | indent 12 }}
-    {{- with .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-{{- if .Values.affinity }}
-      affinity:
-{{ toYaml .Values.affinity | indent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
-    {{- end }}
@@ -1,18 +0,0 @@
-{{- if .Values.autoscaling.enabled -}}
-apiVersion: autoscaling/v1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ template "wekan.fullname" . }}
-  labels:
-    app: {{ template "wekan.name" . }}
-    chart: {{ template "wekan.chart" . }}
-    component: wekan
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ template "wekan.fullname" . }}
-{{ toYaml .Values.autoscaling.config | indent 2 }}
-{{- end -}}
@@ -1,44 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "wekan.fullname" . -}}
-{{- $servicePort := .Values.service.port -}}
-{{- $ingressPath := .Values.ingress.path -}}
-{{- $ingressPathType := .Values.ingress.pathtype -}}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    app: {{ template "wekan.name" . }}
-    chart: {{ template "wekan.chart" . }}
-    component: wekan
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-{{- with .Values.ingress.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if .Values.ingress.tls }}
-  tls:
-  {{- range .Values.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range .Values.ingress.hosts }}
-    - host: {{ . }}
-      http:
-        paths:
-          - path: {{ $ingressPath }}
-            pathType: {{ $ingressPathType }}
-            backend:
-              service:
-                name: {{ $fullName }}
-                port:
-                  number: 8080
-  {{- end }}
-{{- end }}
@@ -1,23 +0,0 @@
-{{- if .Values.route.enabled -}}
-{{- $fullName := include "wekan.fullname" . -}}
-apiVersion: route.openshift.io/v1
-kind: Route
-metadata:
-  annotations:
-    haproxy.router.openshift.io/timeout: 4m
-    openshift.io/host.generated: "true"
-  labels:
-    app: {{ template "wekan.name" . }}
-    service: {{ template "wekan.name" . }}
-  name: {{ template "wekan.name" . }}
-spec:
-  port:
-    targetPort: http
-  tls:
-    termination: edge
-  to:
-    kind: Service
-    name: {{ template "wekan.name" . }}
-    weight: 100
-  wildcardPolicy: None
-  {{- end }}