v7.09

Merge pull request #5095 from mfilser/attachments-display_images_full_width
Attachments, big images are now fully displayed
2023-08-21 00:44:23 +03:00 · 2023-08-21 00:34:57 +03:00 · 2023-08-20 23:30:28 +02:00 · 2023-08-20 23:58:47 +03:00 · 2023-08-20 23:01:09 +03:00 · 2023-08-20 21:37:25 +02:00
541 changed files with 173869 additions and 137611 deletions
@@ -10,8 +10,8 @@ ENV DEBIAN_FRONTEND=noninteractive

 ENV \
    DEBUG=false \
-    NODE_VERSION=v14.19.3 \
-    METEOR_RELEASE=1.10.2 \
+    NODE_VERSION=v14.21.4 \
+    METEOR_RELEASE=METEOR@2.13 \
    USE_EDGE=false \
    METEOR_EDGE=1.5-beta.17 \
    NPM_VERSION=latest \
@@ -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
@@ -154,14 +162,18 @@ RUN set -o xtrace \
  && apt-get install --assume-yes --no-install-recommends apt-utils apt-transport-https ca-certificates 2>&1 \
  && apt-get install --assume-yes --no-install-recommends ${BUILD_DEPS}

+# OLD:
+#  && curl -fsSLO --compressed "https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-$ARCHITECTURE.tar.xz" \
+#  && curl -fsSLO --compressed "https://nodejs.org/dist/$NODE_VERSION/SHASUMS256.txt.asc" \
+
 # Install NodeJS
 RUN set -o xtrace \
  && cd /tmp \
-  && curl -fsSLO --compressed "https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-$ARCHITECTURE.tar.xz" \
-  && curl -fsSLO --compressed "https://nodejs.org/dist/$NODE_VERSION/SHASUMS256.txt.asc" \
-  && grep " node-$NODE_VERSION-$ARCHITECTURE.tar.xz\$" SHASUMS256.txt.asc | sha256sum -c - \
+  && curl -fsSLO --compressed "https://github.com/wekan/node-v14-esm/releases/download/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.xz" \
+  && curl -fsSLO --compressed "https://github.com/wekan/node-v14-esm/releases/download/${NODE_VERSION}/SHASUMS256.txt" \
+  && grep " node-$NODE_VERSION-$ARCHITECTURE.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
  && tar -xJf "node-$NODE_VERSION-$ARCHITECTURE.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
-  && rm "node-$NODE_VERSION-$ARCHITECTURE.tar.xz" SHASUMS256.txt.asc \
+  && rm "node-$NODE_VERSION-$ARCHITECTURE.tar.xz" SHASUMS256.txt \
  && ln -s /usr/local/bin/node /usr/local/bin/nodejs \
  && mkdir -p /usr/local/lib/node_modules/fibers/.node-gyp /root/.node-gyp/${NODE_VERSION} /home/wekan/.config \
  && npm install -g npm@${NPM_VERSION} \
@@ -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@465a07811f14bebb1938fbed4728c6a1ff8901fc
        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@818d4b7b91585d195f67373fd9cb0332e31a7175
        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@2eb1c1961a95fc15694676618e422e8ba1d63825
        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.7
+standard-minifier-js@2.8.1
 mquandalle:jade
 coffeescript@2.4.1!

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

 # Account system
-#wekan-ldap
-#wekan-accounts-cas
-#wekan-accounts-oidc
+accounts-password@2.3.4
+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
-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
+check@1.3.2
+jquery@3.0.0!
+random@1.2.1
+reactive-dict@1.3.1
+session@1.2.1
+tracker@1.3.2
+underscore@1.0.13
 arillo:flow-router-helpers
 audit-argument-checks@1.0.7
-kadira:blaze-layout
 kadira:dochead
 mquandalle:autofocus
 ongoworks:speakingurl
 raix:handlebar-helpers
 http@2.0.0! # force new http package

+# Datepicker
+rajit:bootstrap3-datepicker
+rajit:bootstrap3-datepicker-de
+rajit:bootstrap3-datepicker-tr
+rajit:bootstrap3-datepicker-ja
+rajit:bootstrap3-datepicker-fr
+rajit:bootstrap3-datepicker-it
+rajit:bootstrap3-datepicker-th
+rajit:bootstrap3-datepicker-nl
+rajit:bootstrap3-datepicker-es
+rajit:bootstrap3-datepicker-lv
+rajit:bootstrap3-datepicker-sv
+rajit:bootstrap3-datepicker-gl
+rajit:bootstrap3-datepicker-eu
+rajit:bootstrap3-datepicker-vi
+rajit:bootstrap3-datepicker-no
+rajit:bootstrap3-datepicker-en-gb
+rajit:bootstrap3-datepicker-ro
+rajit:bootstrap3-datepicker-rs
+rajit:bootstrap3-datepicker-ru
+rajit:bootstrap3-datepicker-bs
+rajit:bootstrap3-datepicker-mn
+rajit:bootstrap3-datepicker-id
+rajit:bootstrap3-datepicker-fa
+rajit:bootstrap3-datepicker-ko
+rajit:bootstrap3-datepicker-pt
+rajit:bootstrap3-datepicker-sl
+rajit:bootstrap3-datepicker-sq
+rajit:bootstrap3-datepicker-cy
+rajit:bootstrap3-datepicker-ka
+rajit:bootstrap3-datepicker-sr
+rajit:bootstrap3-datepicker-az
+rajit:bootstrap3-datepicker-cs
+rajit:bootstrap3-datepicker-me
+rajit:bootstrap3-datepicker-ta
+rajit:bootstrap3-datepicker-eo
+rajit:bootstrap3-datepicker-oc
+rajit:bootstrap3-datepicker-he
+rajit:bootstrap3-datepicker-sw
+rajit:bootstrap3-datepicker-rs-latin
+rajit:bootstrap3-datepicker-da
+rajit:bootstrap3-datepicker-pt-br
+rajit:bootstrap3-datepicker-br
+rajit:bootstrap3-datepicker-it-ch
+rajit:bootstrap3-datepicker-en-za
+rajit:bootstrap3-datepicker-en-ie
+rajit:bootstrap3-datepicker-en-ca
+rajit:bootstrap3-datepicker-uz-latn
+rajit:bootstrap3-datepicker-ms
+rajit:bootstrap3-datepicker-uk
+rajit:bootstrap3-datepicker-hu
+rajit:bootstrap3-datepicker-fo
+rajit:bootstrap3-datepicker-kr
+rajit:bootstrap3-datepicker-hi
+rajit:bootstrap3-datepicker-km
+rajit:bootstrap3-datepicker-fi
+rajit:bootstrap3-datepicker-is
+rajit:bootstrap3-datepicker-kh
+rajit:bootstrap3-datepicker-bg
+rajit:bootstrap3-datepicker-bn
+rajit:bootstrap3-datepicker-pl
+rajit:bootstrap3-datepicker-et
+rajit:bootstrap3-datepicker-ar
+rajit:bootstrap3-datepicker-ca
+rajit:bootstrap3-datepicker-kk
+rajit:bootstrap3-datepicker-sk
+rajit:bootstrap3-datepicker-el
+rajit:bootstrap3-datepicker-hy
+rajit:bootstrap3-datepicker-hr
+rajit:bootstrap3-datepicker-tg
+rajit:bootstrap3-datepicker-nb
+rajit:bootstrap3-datepicker-mk
+rajit:bootstrap3-datepicker-nl-be
+rajit:bootstrap3-datepicker-zh-cn
+rajit:bootstrap3-datepicker-ar-tn
+rajit:bootstrap3-datepicker-en-au
+rajit:bootstrap3-datepicker-fr-ch
+rajit:bootstrap3-datepicker-zh-tw
+rajit:bootstrap3-datepicker-uz-cyrl
+rajit:bootstrap3-datepicker-sr-latin
+rajit:bootstrap3-datepicker-en-nz
+
 # UI components
-blaze
 ostrio:i18n
-reactive-var@1.0.11
+reactive-var@1.0.12
 fortawesome:fontawesome
 mousetrap:mousetrap
 mquandalle:jquery-textcomplete
 mquandalle:mousetrap-bindglobal
-peerlibrary:blaze-components
 templates:tabs
 meteor-autosize
-rajit:bootstrap3-datepicker
 shell-server@0.5.0
-email@2.2.1
-dynamic-import@0.7.2
-
+email@2.2.5
+dynamic-import@0.7.3
 cfs:gridfs
 rzymek:fullcalendar
 msavin:usercache
@@ -74,75 +158,19 @@ konecty:mongo-counter
 percolate:synced-cron
 cfs:filesystem
 ostrio:cookies
-ostrio:files@2.0.1
-rajit:bootstrap3-datepicker-fi
-rajit:bootstrap3-datepicker-ar
-rajit:bootstrap3-datepicker-bg
-rajit:bootstrap3-datepicker-br
-rajit:bootstrap3-datepicker-ca
-rajit:bootstrap3-datepicker-cs
-rajit:bootstrap3-datepicker-da
-rajit:bootstrap3-datepicker-de
-rajit:bootstrap3-datepicker-el
-rajit:bootstrap3-datepicker-en-gb
-rajit:bootstrap3-datepicker-eo
-rajit:bootstrap3-datepicker-es
-rajit:bootstrap3-datepicker-eu
-rajit:bootstrap3-datepicker-fa
-rajit:bootstrap3-datepicker-fr
-rajit:bootstrap3-datepicker-gl
-rajit:bootstrap3-datepicker-he
-rajit:bootstrap3-datepicker-hi
-rajit:bootstrap3-datepicker-hu
-rajit:bootstrap3-datepicker-hy
-rajit:bootstrap3-datepicker-id
-rajit:bootstrap3-datepicker-it
-rajit:bootstrap3-datepicker-ja
-rajit:bootstrap3-datepicker-ka
-rajit:bootstrap3-datepicker-km
-rajit:bootstrap3-datepicker-ko
-rajit:bootstrap3-datepicker-lv
-rajit:bootstrap3-datepicker-mk
-rajit:bootstrap3-datepicker-mn
-rajit:bootstrap3-datepicker-nb
-rajit:bootstrap3-datepicker-nl
-rajit:bootstrap3-datepicker-oc
-rajit:bootstrap3-datepicker-pl
-rajit:bootstrap3-datepicker-pt-br
-rajit:bootstrap3-datepicker-pt
-rajit:bootstrap3-datepicker-ro
-rajit:bootstrap3-datepicker-ru
-rajit:bootstrap3-datepicker-sl
-rajit:bootstrap3-datepicker-sr
-rajit:bootstrap3-datepicker-sv
-rajit:bootstrap3-datepicker-sw
-rajit:bootstrap3-datepicker-ta
-rajit:bootstrap3-datepicker-th
-rajit:bootstrap3-datepicker-tr
-rajit:bootstrap3-datepicker-uk
-rajit:bootstrap3-datepicker-vi
-rajit:bootstrap3-datepicker-zh-cn
-rajit:bootstrap3-datepicker-zh-tw
-easylogic:summernote
+ostrio:files@2.3.0
 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.4
+blaze
+kadira:blaze-layout
+peerlibrary:blaze-components
+ejson
@@ -1 +1 @@
-METEOR@2.7.2
+METEOR@2.13
@@ -1,6 +1,6 @@
-accounts-base@2.2.3
-accounts-oauth@1.4.1
-accounts-password@2.3.1
+accounts-base@2.2.8
+accounts-oauth@1.4.2
+accounts-password@2.3.4
 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.4
+babel-runtime@1.5.1
 base64@1.0.12
 binary-heap@1.0.11
-blaze@2.6.0
+blaze@2.7.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.1
 cfs:access-point@0.1.49
 cfs:base-package@0.0.30
 cfs:collection@0.5.5
@@ -38,33 +38,33 @@ 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
-coffeescript@2.4.1
+check@1.3.2
+coffeescript@2.7.0
 coffeescript-compiler@2.4.1
-communitypackages:picker@1.1.0
+communitypackages:picker@1.1.1
 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.2.0
+ddp-server@2.6.2
 deps@1.0.12
-diff-sequence@1.1.1
-dynamic-import@0.7.2
-easylogic:summernote@0.8.8
-ecmascript@0.16.2
-ecmascript-runtime@0.8.0
+diff-sequence@1.1.2
+dynamic-import@0.7.3
+easy:search@2.2.1
+easysearch:components@2.2.2
+easysearch:core@2.2.2
+ecmascript@0.16.7
+ecmascript-runtime@0.8.1
 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.5
 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
 hot-code-push@1.0.4
 html-tools@1.1.3
 htmljs@1.1.1
@@ -72,40 +72,36 @@ http@2.0.0
 id-map@1.1.1
 idmontie:migrations@1.0.3
 inter-process-messaging@0.1.1
-jquery@1.11.11
+jquery@3.0.0
 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
+logging@1.3.2
+matb33:collection-hooks@1.2.2
 mdg:validation-error@0.5.1
-meteor@1.10.0
+meteor@1.11.3
 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.1.0
 meteortesting:mocha-core@8.0.1
-minifier-css@1.6.0
-minifier-js@2.7.4
+minifier-css@1.6.4
+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.3
+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.7
 mongo-decimal@0.1.3
 mongo-dev-server@1.1.0
 mongo-id@1.0.8
@@ -118,16 +114,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
-observe-sequence@1.0.20
+npm-mongo@4.16.0
+oauth@2.2.0
+oauth2@1.3.2
+observe-sequence@1.0.21
 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.3
+ostrio:i18n@3.2.1
 pascoual:pdfkit@1.0.7
 peerlibrary:assert@0.3.0
 peerlibrary:base-component@0.17.1
@@ -136,96 +132,125 @@ 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
 rajit:bootstrap3-datepicker-ar@1.7.1
+rajit:bootstrap3-datepicker-ar-tn@1.7.1
+rajit:bootstrap3-datepicker-az@1.7.1
 rajit:bootstrap3-datepicker-bg@1.7.1
+rajit:bootstrap3-datepicker-bn@1.7.1
 rajit:bootstrap3-datepicker-br@1.7.1
+rajit:bootstrap3-datepicker-bs@1.7.1
 rajit:bootstrap3-datepicker-ca@1.7.1
 rajit:bootstrap3-datepicker-cs@1.7.1
+rajit:bootstrap3-datepicker-cy@1.7.1
 rajit:bootstrap3-datepicker-da@1.7.1
 rajit:bootstrap3-datepicker-de@1.7.1
 rajit:bootstrap3-datepicker-el@1.7.1
+rajit:bootstrap3-datepicker-en-au@1.7.1
+rajit:bootstrap3-datepicker-en-ca@1.7.1
 rajit:bootstrap3-datepicker-en-gb@1.7.1
+rajit:bootstrap3-datepicker-en-ie@1.7.1
+rajit:bootstrap3-datepicker-en-nz@1.7.1
+rajit:bootstrap3-datepicker-en-za@1.7.1
 rajit:bootstrap3-datepicker-eo@1.7.1
 rajit:bootstrap3-datepicker-es@1.7.1
+rajit:bootstrap3-datepicker-et@1.7.1
 rajit:bootstrap3-datepicker-eu@1.7.1
 rajit:bootstrap3-datepicker-fa@1.7.1
 rajit:bootstrap3-datepicker-fi@1.7.1
+rajit:bootstrap3-datepicker-fo@1.7.1
 rajit:bootstrap3-datepicker-fr@1.7.1
+rajit:bootstrap3-datepicker-fr-ch@1.7.1
 rajit:bootstrap3-datepicker-gl@1.7.1
 rajit:bootstrap3-datepicker-he@1.7.1
 rajit:bootstrap3-datepicker-hi@1.7.1
+rajit:bootstrap3-datepicker-hr@1.7.1
 rajit:bootstrap3-datepicker-hu@1.7.1
 rajit:bootstrap3-datepicker-hy@1.7.1
 rajit:bootstrap3-datepicker-id@1.7.1
+rajit:bootstrap3-datepicker-is@1.7.1
 rajit:bootstrap3-datepicker-it@1.7.1
+rajit:bootstrap3-datepicker-it-ch@1.7.1
 rajit:bootstrap3-datepicker-ja@1.7.1
 rajit:bootstrap3-datepicker-ka@1.7.1
+rajit:bootstrap3-datepicker-kh@1.7.1
+rajit:bootstrap3-datepicker-kk@1.7.1
 rajit:bootstrap3-datepicker-km@1.7.1
 rajit:bootstrap3-datepicker-ko@1.7.1
+rajit:bootstrap3-datepicker-kr@1.7.1
 rajit:bootstrap3-datepicker-lv@1.7.1
+rajit:bootstrap3-datepicker-me@1.7.1
 rajit:bootstrap3-datepicker-mk@1.7.1
 rajit:bootstrap3-datepicker-mn@1.7.1
+rajit:bootstrap3-datepicker-ms@1.7.1
 rajit:bootstrap3-datepicker-nb@1.7.1
 rajit:bootstrap3-datepicker-nl@1.7.1
+rajit:bootstrap3-datepicker-nl-be@1.7.1
+rajit:bootstrap3-datepicker-no@1.7.1
 rajit:bootstrap3-datepicker-oc@1.7.1
 rajit:bootstrap3-datepicker-pl@1.7.1
 rajit:bootstrap3-datepicker-pt@1.7.1
 rajit:bootstrap3-datepicker-pt-br@1.7.1
 rajit:bootstrap3-datepicker-ro@1.7.1
+rajit:bootstrap3-datepicker-rs@1.7.1
+rajit:bootstrap3-datepicker-rs-latin@1.7.1
 rajit:bootstrap3-datepicker-ru@1.7.1
+rajit:bootstrap3-datepicker-sk@1.7.1
 rajit:bootstrap3-datepicker-sl@1.7.1
+rajit:bootstrap3-datepicker-sq@1.7.1
 rajit:bootstrap3-datepicker-sr@1.7.1
+rajit:bootstrap3-datepicker-sr-latin@1.7.1
 rajit:bootstrap3-datepicker-sv@1.7.1
 rajit:bootstrap3-datepicker-sw@1.7.1
 rajit:bootstrap3-datepicker-ta@1.7.1
+rajit:bootstrap3-datepicker-tg@1.7.1
 rajit:bootstrap3-datepicker-th@1.7.1
 rajit:bootstrap3-datepicker-tr@1.7.1
 rajit:bootstrap3-datepicker-uk@1.7.1
+rajit:bootstrap3-datepicker-uz-cyrl@1.7.1
+rajit:bootstrap3-datepicker-uz-latn@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
-rate-limit@1.0.9
-react-fast-refresh@0.2.3
-reactive-dict@1.3.0
-reactive-var@1.0.11
+random@1.2.1
+rate-limit@1.1.1
+react-fast-refresh@0.2.7
+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
 simple:json-routes@2.3.1
-simple:rest-accounts-password@1.2.1
+simple:rest-accounts-password@1.2.2
 simple:rest-bearer-token-parser@1.1.1
 simple:rest-json-error-handler@1.1.1
-socket-stream-client@0.5.0
-spacebars@1.3.0
+socket-stream-client@0.5.1
+spacebars@1.4.1
 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
-twbs:bootstrap@3.3.6
+tracker@1.3.2
 ui@1.0.13
-underscore@1.0.10
+underscore@1.0.13
 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.5
+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 +260,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,9 @@
-# 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, zh_CN.GB2312: zh-GB

-[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
-
-# 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
+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:23.04 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.4 \
+    METEOR_RELEASE=METEOR@2.13 \
    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
@@ -173,47 +185,17 @@ RUN \
    ln -sf $(which bsdtar) $(which tar) && \
    \
    # Download nodejs
-    wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
-    wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \
+    wget https://github.com/wekan/node-v14-esm/releases/download/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
+    wget https://github.com/wekan/node-v14-esm/releases/download/${NODE_VERSION}/SHASUMS256.txt && \
+    #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 && \
+    grep node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz SHASUMS256.txt | shasum -a 256 -c - && \
+    rm -f SHASUMS256.txt && \
+    #grep ${NODE_VERSION}-${ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | shasum -a 256 -c - && \
+    #rm -f SHASUMS256.txt.asc && \
    \
    # Install Node
    tar xvzf node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
@@ -229,90 +211,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 +263,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 +275,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.4 \
    WEKAN_VERSION=latest  \
    WEKAN_ARCHITECTURE=arm64 \
    NODE_OPTIONS="--max_old_space_size=4096"
@@ -33,8 +33,10 @@ RUN apk update && apk add ca-certificates outils-sha1 && \
    unzip wekan-${WEKAN_VERSION}-${WEKAN_ARCHITECTURE}.zip && \
    \
    # Download node and shasums
-    wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${NODE_ARCHITECTURE}.tar.gz && \
-    wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \
+    #wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${NODE_ARCHITECTURE}.tar.gz && \
+    #wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \
+    #wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${NODE_ARCHITECTURE}.tar.gz && \
+    #wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \
    \
    # Verify nodejs authenticity
    grep node-${NODE_VERSION}-${NODE_ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | sha256sum -c - && \
@@ -49,7 +51,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 \
@@ -78,7 +80,13 @@ RUN \
    chown wekan --recursive /home/wekan/.config && \
    \
    # Install Node dependencies
-    npm install -g npm@${NPM_VERSION}
+    npm install -g npm@${NPM_VERSION} && \
+    \
+    # Install Health Check dependencies
+    apk add curl
+
+HEALTHCHECK --start-period=30s --interval=30s --timeout=10s --retries=3 \
+  CMD curl --fail "http://localhost:$PORT" || exit 1

 EXPOSE $PORT
 USER wekan
@@ -93,5 +101,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

-## [Translate WeKan ® at Transifex](https://transifex.com/wekan/wekan)
+- [Quay](https://quay.io/repository/wekan/wekan)
+- [Docker Hub](https://hub.docker.com/r/wekanteam/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 .
+Other platforms and compatible software versions at https://wekan.github.io Download section.

-## [Wekan feature requests and bugs](https://github.com/wekan/wekan/issues)
+## 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://app.transifex.com/wekan/)
+
+Translations to non-English languages are accepted only at [Transifex](https://app.transifex.com/wekan/) using webbrowser.
+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)

 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 30k users using WeKan ® in their company.
+- WeKan ® has been [translated](https://app.transifex.com/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/
+[translate_wekan]: https://app.transifex.com/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: "v7.09.0"
 files:
  userUploads:
    - README.md
@@ -21,31 +21,40 @@ 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 editcustomfield BOARDID LISTID CARDID CUSTOMFIELDID NEWCUSTOMFIELDVALUE
+    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 +70,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 +126,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 +136,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 +218,40 @@ if arguments == 6:
        print(data2)
        # ------- EDIT CARD END -----------

+    if sys.argv[1] == 'editcustomfield':
+
+        # ------- EDIT CUSTOMFIELD START -----------
+        boardid = sys.argv[2]
+        listid = sys.argv[3]
+        cardid = sys.argv[4]
+        customfieldid = sys.argv[5]
+        newcustomfieldvalue = sys.argv[6]
+        edfield = wekanurl + apiboards + boardid + s + l + s + listid + s + cs + s + cardid + s + 'customFields' + s + customfieldid
+        #print(edfield)
+        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
+        post_data = {'_id': '{}'.format(customfieldid), 'value': '{}'.format(newcustomfieldvalue)}
+        #print(post_data)
+        body = requests.post(edfield, data=post_data, headers=headers)
+        print("=== EDIT CUSTOMFIELD ===\n")
+        data2 = body.text.replace('}',"}\n")
+        print(data2)
+        # ------- EDIT CUSTOMFIELD 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 +377,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 -----------
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import DOMPurify from 'dompurify';
 import { TAPi18n } from '/imports/i18n';

@@ -24,7 +25,7 @@ BlazeComponent.extendComponent({
        searchId = Session.get(`current${capitalizedMode}`);
      }
      const limit = this.page.get() * activitiesPerPage;
-      const user = Meteor.user();
+      const user = ReactiveCache.getCurrentUser();
      const hideSystem = user ? user.hasHiddenSystemMessages() : false;
      if (searchId === null) return;

@@ -65,7 +66,7 @@ Template.activities.helpers({
 BlazeComponent.extendComponent({
  checkItem() {
    const checkItemId = this.currentData().activity.checklistItemId;
-    const checkItem = ChecklistItems.findOne({ _id: checkItemId });
+    const checkItem = ReactiveCache.getChecklistItem(checkItemId);
    return checkItem && checkItem.title;
  },

@@ -145,7 +146,7 @@ BlazeComponent.extendComponent({
  lastLabel() {
    const lastLabelId = this.currentData().activity.labelId;
    if (!lastLabelId) return null;
-    const lastLabel = Boards.findOne(
+    const lastLabel = ReactiveCache.getBoard(
      this.currentData().activity.boardId,
    ).getLabelById(lastLabelId);
    if (lastLabel && (lastLabel.name === undefined || lastLabel.name === '')) {
@@ -158,7 +159,7 @@ BlazeComponent.extendComponent({
  },

  lastCustomField() {
-    const lastCustomField = CustomFields.findOne(
+    const lastCustomField = ReactiveCache.getCustomField(
      this.currentData().activity.customFieldId,
    );
    if (!lastCustomField) return null;
@@ -166,7 +167,7 @@ BlazeComponent.extendComponent({
  },

  lastCustomFieldValue() {
-    const lastCustomField = CustomFields.findOne(
+    const lastCustomField = ReactiveCache.getCustomField(
      this.currentData().activity.customFieldId,
    );
    if (!lastCustomField) return null;
@@ -282,10 +283,10 @@ Template.activity.helpers({

 Template.commentReactions.events({
  'click .reaction'(event) {
-    if (Meteor.user().isBoardMember()) {
+    if (ReactiveCache.getCurrentUser().isBoardMember()) {
      const codepoint = event.currentTarget.dataset['codepoint'];
      const commentId = Template.instance().data.commentId;
-      const cardComment = CardComments.findOne({_id: commentId});
+      const cardComment = ReactiveCache.getCardComment(commentId);
      cardComment.toggleReaction(codepoint);
    }
  },
@@ -294,10 +295,10 @@ Template.commentReactions.events({

 Template.addReactionPopup.events({
  'click .add-comment-reaction'(event) {
-    if (Meteor.user().isBoardMember()) {
+    if (ReactiveCache.getCurrentUser().isBoardMember()) {
      const codepoint = event.currentTarget.dataset['codepoint'];
      const commentId = Template.instance().data.commentId;
-      const cardComment = CardComments.findOne({_id: commentId});
+      const cardComment = ReactiveCache.getCardComment(commentId);
      cardComment.toggleReaction(codepoint);
    }
    Popup.back();
@@ -325,12 +326,13 @@ Template.addReactionPopup.helpers({

 Template.commentReactions.helpers({
  isSelected(userIds) {
-    return userIds.includes(Meteor.user()._id);
+    return Meteor.userId() && userIds.includes(Meteor.userId());
  },
  userNames(userIds) {
-    return Users.find({_id: {$in: userIds}})
-                .map(user => user.profile.fullname)
-                .join(', ');
+    const ret = ReactiveCache.getUsers({_id: {$in: userIds}})
+      .map(user => user.profile.fullname)
+      .join(', ');
+    return ret;
  }
 })

@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 const commentFormIsOpen = new ReactiveVar(false);

 BlazeComponent.extendComponent({
@@ -24,7 +26,7 @@ BlazeComponent.extendComponent({
          let boardId = card.boardId;
          let cardId = card._id;
          if (card.isLinkedCard()) {
-            boardId = Cards.findOne(card.linkedId).boardId;
+            boardId = ReactiveCache.getCard(card.linkedId).boardId;
            cardId = card.linkedId;
          } else if (card.isLinkedBoard()) {
            boardId = card.linkedId;
@@ -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'}}

@@ -1,19 +1,22 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 BlazeComponent.extendComponent({
  onCreated() {
    this.subscribe('archivedBoards');
  },

  isBoardAdmin() {
-    return Meteor.user().isBoardAdmin();
+    return ReactiveCache.getCurrentUser().isBoardAdmin();
  },

  archivedBoards() {
-    return Boards.find(
+    const ret = ReactiveCache.getBoards(
      { archived: true },
      {
        sort: { archivedAt: -1, modifiedAt: -1 },
      },
    );
+    return ret;
  },

  events() {
@@ -25,8 +28,8 @@ BlazeComponent.extendComponent({
            Meteor.settings &&
            Meteor.settings.public &&
            Meteor.settings.public.sandstorm;
-          if (isSandstorm && Session.get('currentBoard')) {
-            const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          if (isSandstorm && Utils.getCurrentBoardId()) {
+            const currentBoard = Utils.getCurrentBoard();
            currentBoard.archive();
          }
          const board = this.currentData();
@@ -39,8 +42,8 @@ BlazeComponent.extendComponent({
            Meteor.settings &&
            Meteor.settings.public &&
            Meteor.settings.public.sandstorm;
-          if (isSandstorm && Session.get('currentBoard')) {
-            const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          if (isSandstorm && Utils.getCurrentBoardId()) {
+            const currentBoard = Utils.getCurrentBoard();
            Boards.remove(currentBoard._id);
          }
          Boards.remove(this._id);
@@ -19,6 +19,7 @@
 .board-wrapper .board-canvas.is-sibling-sidebar-open {
  margin-right: 248px;
 }
+.board-wrapper .board-canvas.overlayed {overflow:hidden}
 .board-wrapper .board-canvas .board-overlay {
  position: fixed;
  left: 0;
@@ -167,3 +168,58 @@
  border-color: #2b004d;
  color: #fff !important;
 }
+/* Modal Styles */
+.modal {
+  display: none;
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 9999;
+  background-color: rgba(0, 0, 0, 0.5);
+  width: 100%;
+  height: 100%;
+}
+.modal-dialog {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 25%; /* Adjust the height to make it smaller */
+  position: relative;
+  margin: 10% auto; /* This margin will help center the modal vertically */
+  max-width: 400px; /* Adjust the max-width to make it smaller */
+  background-color: #fff;
+  border-radius: 5px;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
+}
+.modal-header {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding-bottom: 1px;
+  border-bottom: 1px solid #ccc;
+}
+.modal-title {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin: 0;
+  font-size: 18px;
+}
+.modal-footer {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding-top: 4px;
+  border-top: 1px solid #ccc;
+}
+.close {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: absolute;
+  top: 5px;
+  right: 5px;
+  font-size: 25px;
+  cursor: pointer;
+}
@@ -21,7 +21,8 @@ template(name="boardBody")
      .board-canvas.js-swimlanes(
        class="{{#if Sidebar.isOpen}}is-sibling-sidebar-open{{/if}}"
        class="{{#if MultiSelection.isActive}}is-multiselection-active{{/if}}"
-        class="{{#if draggingActive.get}}is-dragging-active{{/if}}")
+        class="{{#if draggingActive.get}}is-dragging-active{{/if}}"
+        class="{{#if showOverlay.get}}overlayed{{/if}}")
        if showOverlay.get
          .board-overlay
        if currentBoard.isTemplatesBoard
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';

 const subManager = new SubsManager();
@@ -43,9 +44,9 @@ BlazeComponent.extendComponent({
    this.mouseHasEnterCardDetails = false;

    // fix swimlanes sort field if there are null values
-    const currentBoardData = Boards.findOne(Session.get('currentBoard'));
+    const currentBoardData = Utils.getCurrentBoard();
    const nullSortSwimlanes = currentBoardData.nullSortSwimlanes();
-    if (nullSortSwimlanes.count() > 0) {
+    if (nullSortSwimlanes.length > 0) {
      const swimlanes = currentBoardData.swimlanes();
      let count = 0;
      swimlanes.forEach(s => {
@@ -60,7 +61,7 @@ BlazeComponent.extendComponent({

    // fix lists sort field if there are null values
    const nullSortLists = currentBoardData.nullSortLists();
-    if (nullSortLists.count() > 0) {
+    if (nullSortLists.length > 0) {
      const lists = currentBoardData.lists();
      let count = 0;
      lists.forEach(l => {
@@ -193,7 +194,7 @@ BlazeComponent.extendComponent({
    });

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

      // Disable drag-dropping if the current user is not a board member
-      //$swimlanesDom.sortable('option', 'disabled', !userIsMember());
      $swimlanesDom.sortable(
        'option',
        'disabled',
-        !Meteor.user() || !Meteor.user().isBoardAdmin(),
+        !ReactiveCache.getCurrentUser()?.isBoardAdmin(),
      );
    });

-    function userIsMember() {
-      return (
-        Meteor.user() &&
-        Meteor.user().isBoardMember() &&
-        !Meteor.user().isCommentOnly()
-      );
-    }
-
    // If there is no data in the board (ie, no lists) we autofocus the list
    // creation form by clicking on the corresponding element.
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
-    if (userIsMember() && currentBoard.lists().count() === 0) {
+    const currentBoard = Utils.getCurrentBoard();
+    if (Utils.canModifyBoard() && currentBoard.lists().length === 0) {
      boardComponent.openNewListForm();
    }
+
+    Utils.setBackgroundImage();
  },

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

@@ -239,7 +233,7 @@ BlazeComponent.extendComponent({
  },

  isViewSwimlanes() {
-    currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) {
      return (currentUser.profile || {}).boardView === 'board-view-swimlanes';
    } else {
@@ -250,7 +244,7 @@ BlazeComponent.extendComponent({
  },

  isViewLists() {
-    currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) {
      return (currentUser.profile || {}).boardView === 'board-view-lists';
    } else {
@@ -259,7 +253,7 @@ BlazeComponent.extendComponent({
  },

  isViewCalendar() {
-    currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) {
      return (currentUser.profile || {}).boardView === 'board-view-cal';
    } else {
@@ -319,7 +313,7 @@ BlazeComponent.extendComponent({

 BlazeComponent.extendComponent({
  onRendered() {
-    this.autorun(function() {
+    this.autorun(function () {
      $('#calendar-view').fullCalendar('refetchEvents');
    });
  },
@@ -328,6 +322,7 @@ BlazeComponent.extendComponent({
      id: 'calendar-view',
      defaultView: 'agendaDay',
      editable: true,
+      selectable: true,
      timezone: 'local',
      weekNumbers: true,
      header: {
@@ -349,9 +344,9 @@ BlazeComponent.extendComponent({
      },
      locale: TAPi18n.getLanguage(),
      events(start, end, timezone, callback) {
-        const currentBoard = Boards.findOne(Session.get('currentBoard'));
+        const currentBoard = Utils.getCurrentBoard();
        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 +370,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,14 +383,14 @@ 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);
      },
      eventResize(event, delta, revertFunc) {
        let isOk = false;
-        const card = Cards.findOne(event.id);
+        const card = ReactiveCache.getCard(event.id);

        if (card) {
          card.setEnd(event.end.toDate());
@@ -407,12 +402,14 @@ BlazeComponent.extendComponent({
      },
      eventDrop(event, delta, revertFunc) {
        let isOk = false;
-        const card = Cards.findOne(event.id);
+        const card = ReactiveCache.getCard(event.id);
        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;
          }
        }
@@ -420,10 +417,62 @@ BlazeComponent.extendComponent({
          revertFunc();
        }
      },
+      select: function (startDate) {
+        const currentBoard = Utils.getCurrentBoard();
+        const currentUser = ReactiveCache.getCurrentUser();
+        const modalElement = document.createElement('div');
+        modalElement.classList.add('modal', 'fade');
+        modalElement.setAttribute('tabindex', '-1');
+        modalElement.setAttribute('role', 'dialog');
+        modalElement.innerHTML = `
+        <div class="modal-dialog justify-content-center align-items-center" role="document">
+          <div class="modal-content">
+            <div class="modal-header">
+              <h5 class="modal-title">${TAPi18n.__('r-create-card')}</h5>
+              <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+              </button>
+            </div>
+            <div class="modal-body text-center">
+              <input type="text" class="form-control" id="card-title-input" placeholder="">
+            </div>
+            <div class="modal-footer">
+              <button type="button" class="btn btn-primary" id="create-card-button">${TAPi18n.__('add-card')}</button>
+            </div>
+          </div>
+        </div>
+        `;
+        const createCardButton = modalElement.querySelector('#create-card-button');
+        createCardButton.addEventListener('click', function () {
+          const myTitle = modalElement.querySelector('#card-title-input').value;
+          if (myTitle) {
+            const firstList = currentBoard.draggableLists()[0];
+            const firstSwimlane = currentBoard.swimlanes()[0];
+            Meteor.call('createCardWithDueDate', currentBoard._id, firstList._id, myTitle, startDate.toDate(), firstSwimlane._id, function(error, result) {
+              if (error) {
+                console.log(error);
+              } else {
+                console.log("Card Created", result);
+              }
+            });
+            closeModal();
+          }
+        });
+        document.body.appendChild(modalElement);
+        const openModal = function() {
+          modalElement.style.display = 'flex';
+        };
+        const closeModal = function() {
+          modalElement.style.display = 'none';
+        };
+        const closeButton = modalElement.querySelector('[data-dismiss="modal"]');
+        closeButton.addEventListener('click', closeModal);
+        openModal();
+      }
    };
  },
  isViewCalendar() {
-    currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) {
      return (currentUser.profile || {}).boardView === 'board-view-cal';
    } else {
@@ -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;
@@ -1815,19 +1834,20 @@
  background-color: #4d4d4d !important;
 }
 .board-color-moderndark .minicard .minicard-labels {
-  margin-bottom: 4px;
+  margin: 8px 0 4px;
 }
 .board-color-moderndark .minicard .card-label {
  font-size: 11px;
  font-weight: 400;
  padding: 1px 6px 0;
  border-radius: 2px;
+  line-height: 18px;
 }
 .board-color-moderndark .minicard .badges {
  color: #bbb;
 }
 .board-color-moderndark .minicard .date {
-  margin-top: 10px;
+  margin-bottom: 10px;
  font-size: 11px;
 }
 .board-color-moderndark .card-date {
@@ -1856,6 +1876,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 {
@@ -1947,7 +1976,7 @@
  background-color: #ccc;
  color: #222;
 }
-.board-color-moderndark .attachments-galery .attachment-item {
+.board-color-moderndark .attachments-gallery .attachment-item {
  color: #222;
 }
 .board-color-moderndark .minicard-description {
@@ -1963,7 +1992,7 @@
  background-color: #333;
 }
 .pop-over.board-color-moderndark .header-title {
-  font-family: Poppins;
+  /* font-family: Poppins; */
  font-size: 16px;
  color: #ccc;
 }
@@ -2045,12 +2074,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;
@@ -2117,10 +2148,10 @@
 .board-color-exodark .sidebar-content {
  box-shadow: 0 0 7px 0 #00897b;
 }
-.board-color-exodark .attachments-galery .attachment-item {
+.board-color-exodark .attachments-gallery .attachment-item {
  background: #2b2b2b;
 }
-.board-color-exodark .attachments-galery .attachment-item:hover {
+.board-color-exodark .attachments-gallery .attachment-item:hover {
  border: 1px solid #00897b;
  background: #2b2b2b;
 }
@@ -2147,9 +2178,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 +2198,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;
@@ -39,9 +39,9 @@ template(name="boardHeaderBar")
            span {{_ watchLevel}}
          a.board-header-btn(title="{{_ 'sort-cards'}}" class="{{#if isSortActive }}emphasis{{else}} js-sort-cards {{/if}}")
            i.fa.fa-sort
-            span {{#if isSortActive }}{{_ 'Sort is on'}}{{else}}{{_ 'sort-cards'}}{{/if}}
+            span {{#if isSortActive }}{{_ 'sort-is-on'}}{{else}}{{_ 'sort-cards'}}{{/if}}
            if isSortActive
-              a.board-header-btn-close.js-sort-reset(title="Remove Sort")
+              a.board-header-btn-close.js-sort-reset(title="{{_ 'remove-sort'}}")
                i.fa.fa-times-thin

        else
@@ -82,9 +82,9 @@ template(name="boardHeaderBar")
            span {{_ watchLevel}}
          a.board-header-btn(title="{{_ 'sort-cards'}}" class="{{#if isSortActive }}emphasis{{else}} js-sort-cards {{/if}}")
            i.fa.fa-sort
-            span {{#if isSortActive }}{{_ 'Sort is on'}}{{else}}{{_ 'sort-cards'}}{{/if}}
+            span {{#if isSortActive }}{{_ 'sort-is-on'}}{{else}}{{_ 'sort-cards'}}{{/if}}
            if isSortActive
-              a.board-header-btn-close.js-sort-reset(title="Remove Sort")
+              a.board-header-btn-close.js-sort-reset(title="{{_ 'remove-sort'}}")
                i.fa.fa-times-thin

        else
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';

 /*
@@ -18,14 +19,14 @@ Template.boardMenuPopup.events({
  'click .js-change-board-color': Popup.open('boardChangeColor'),
  'click .js-change-language': Popup.open('changeLanguage'),
  'click .js-archive-board ': Popup.afterConfirm('archiveBoard', function() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    currentBoard.archive();
    // XXX We should have some kind of notification on top of the page to
    // confirm that the board was successfully archived.
    FlowRouter.go('home');
  }),
  'click .js-delete-board': Popup.afterConfirm('deleteBoard', function() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    Popup.back();
    Boards.remove(currentBoard._id);
    FlowRouter.go('home');
@@ -58,24 +59,24 @@ Template.boardChangeTitlePopup.events({

 BlazeComponent.extendComponent({
  watchLevel() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    return currentBoard && currentBoard.getWatchLevel(Meteor.userId());
  },

  isStarred() {
    const boardId = Session.get('currentBoard');
-    const user = Meteor.user();
+    const user = ReactiveCache.getCurrentUser();
    return user && user.hasStarred(boardId);
  },

  // Only show the star counter if the number of star is greater than 2
  showStarCounter() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    return currentBoard && currentBoard.stars >= 2;
  },
  /*
  showSort() {
-    return Meteor.user().hasSortBy();
+    return ReactiveCache.getCurrentUser().hasSortBy();
  },
  directionClass() {
    return this.currentDirection() === -1 ? DOWNCLS : UPCLS;
@@ -85,10 +86,10 @@ BlazeComponent.extendComponent({
    Meteor.call('setListSortBy', direction + this.currentListSortBy());
  },
  currentDirection() {
-    return Meteor.user().getListSortByDirection();
+    return ReactiveCache.getCurrentUser().getListSortByDirection();
  },
  currentListSortBy() {
-    return Meteor.user().getListSortBy();
+    return ReactiveCache.getCurrentUser().getListSortBy();
  },
  listSortShortDesc() {
    return `list-label-short-${this.currentListSortBy()}`;
@@ -99,7 +100,7 @@ BlazeComponent.extendComponent({
      {
        'click .js-edit-board-title': Popup.open('boardChangeTitle'),
        'click .js-star-board'() {
-          Meteor.user().toggleBoardStar(Session.get('currentBoard'));
+          ReactiveCache.getCurrentUser().toggleBoardStar(Session.get('currentBoard'));
        },
        'click .js-open-board-menu': Popup.open('boardMenu'),
        'click .js-change-visibility': Popup.open('boardChangeVisibility'),
@@ -158,13 +159,6 @@ BlazeComponent.extendComponent({
 }).register('boardHeaderBar');

 Template.boardHeaderBar.helpers({
-  canModifyBoard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly()
-    );
-  },
  boardView() {
    return Utils.boardView();
  },
@@ -313,7 +307,7 @@ const CreateBoard = BlazeComponent.extendComponent({
  onSubmit(event) {
    super.onSubmit(event);
    // Immediately star boards crated with the headerbar popup.
-    Meteor.user().toggleBoardStar(this.boardId.get());
+    ReactiveCache.getCurrentUser().toggleBoardStar(this.boardId.get());
  }
 }.register('headerBarCreateBoardPopup'));

@@ -322,12 +316,12 @@ BlazeComponent.extendComponent({
    return !TableVisibilityModeSettings.findOne('tableVisibilityMode-allowPrivateOnly').booleanValue;
  },
  visibilityCheck() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    return this.currentData() === currentBoard.permission;
  },

  selectBoardVisibility() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    const visibility = this.currentData();
    currentBoard.setVisibility(visibility);
    Popup.back();
@@ -344,7 +338,7 @@ BlazeComponent.extendComponent({

 BlazeComponent.extendComponent({
  watchLevel() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    return currentBoard.getWatchLevel(Meteor.userId());
  },

@@ -384,7 +378,7 @@ BlazeComponent.extendComponent({
  allowedSortValues() {
    const types = [];
    const pushed = {};
-    Meteor.user()
+    ReactiveCache.getCurrentUser()
      .getListSortTypes()
      .forEach(type => {
        const key = type.replace(/^-/, '');
@@ -400,16 +394,16 @@ BlazeComponent.extendComponent({
    return types;
  },
  Direction() {
-    return Meteor.user().getListSortByDirection() === -1
+    return ReactiveCache.getCurrentUser().getListSortByDirection() === -1
      ? this.downClass
      : this.upClass;
  },
  sortby() {
-    return Meteor.user().getListSortBy();
+    return ReactiveCache.getCurrentUser().getListSortBy();
  },

  setSortBy(type = null) {
-    const user = Meteor.user();
+    const user = ReactiveCache.getCurrentUser();
    if (type === null) {
      type = user._getListSortBy();
    } else {
@@ -1,4 +1,4 @@
-@import url("css/reset.css") print, screen;
+@import url("../../../css/reset.css") print, screen;

 .board-list {
  margin: 0 8px;
@@ -62,10 +62,10 @@ 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'}}")
+                        title="{{_ 'drag-board'}}")
                  else
                    if isSandstorm
                      i.fa.js-clone-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,10 +116,10 @@ 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'}}")
+                        title="{{_ 'drag-board'}}")
                  else
                    if isSandstorm
                      i.fa.js-clone-board(
@@ -1,7 +1,21 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';

 const subManager = new SubsManager();

+Template.boardList.helpers({
+  hideCardCounterList() {
+    /* Bug Board icons random dance https://github.com/wekan/wekan/issues/4214
+       return Utils.isMiniScreen() && Session.get('currentBoard'); */
+    return true;
+  },
+  hideBoardMemberList() {
+    /* Bug Board icons random dance https://github.com/wekan/wekan/issues/4214
+       return Utils.isMiniScreen() && Session.get('currentBoard'); */
+    return true;
+  },
+})
+
 Template.boardListHeaderBar.events({
  'click .js-open-archived-board'() {
    Modal.open('archivedBoards');
@@ -17,10 +31,10 @@ Template.boardListHeaderBar.helpers({
    //}
  },
  templatesBoardId() {
-    return Meteor.user() && Meteor.user().getTemplatesBoardId();
+    return ReactiveCache.getCurrentUser()?.getTemplatesBoardId();
  },
  templatesBoardSlug() {
-    return Meteor.user() && Meteor.user().getTemplatesBoardSlug();
+    return ReactiveCache.getCurrentUser()?.getTemplatesBoardSlug();
  },
 });

@@ -28,9 +42,9 @@ BlazeComponent.extendComponent({
  onCreated() {
    Meteor.subscribe('setting');
    Meteor.subscribe('tableVisibilityModeSettings');
-    let currUser = Meteor.user();
+    let currUser = ReactiveCache.getCurrentUser();
    let userLanguage;
-    if(currUser && currUser.profile){
+    if (currUser && currUser.profile) {
      userLanguage = currUser.profile.language
    }
    if (userLanguage) {
@@ -72,66 +86,48 @@ BlazeComponent.extendComponent({
        // DOM in its initial state. The card move is then handled reactively by
        // Blaze with the below query.
        $boards.sortable('cancel');
-
        board.move(sortIndex.base);
      },
    });

    // 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 (ReactiveCache.getCurrentUser()?.teams?.length > 0)
      return true;
    else
      return false;
  },
  teamsDatas() {
-    if(Meteor.user().teams)
-      return Meteor.user().teams.sort((a, b) => a.teamDisplayName.localeCompare(b.teamDisplayName));
+    const teams = ReactiveCache.getCurrentUser()?.teams
+    if (teams)
+      return 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 (ReactiveCache.getCurrentUser()?.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)
-      return Meteor.user().orgs.sort((a, b) => a.orgDisplayName.localeCompare(b.orgDisplayName));
+    const orgs = ReactiveCache.getCurrentUser()?.orgs;
+    if (orgs)
+      return orgs.sort((a, b) => a.orgDisplayName.localeCompare(b.orgDisplayName));
    else
      return [];
  },
-  userHasOrgsOrTeams(){
-    let boolUserHasOrgs;
-    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)
-      boolUserHasTeams = true;
-    else
-      boolUserHasTeams = false;
-
-    return (boolUserHasOrgs || boolUserHasTeams);
+  userHasOrgsOrTeams() {
+    const ret = this.userHasOrgs() || this.userHasTeams();
+    return ret;
  },
  boards() {
    let query = {
@@ -139,50 +135,44 @@ 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());
-
-      // const currUser = Users.findOne(Meteor.userId(), {
-      //   fields: {
-      //     orgs: 1,
-      //     teams: 1,
-      //   },
-      // });
+      const currUser = ReactiveCache.getCurrentUser();

      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'] },
@@ -191,51 +181,54 @@ BlazeComponent.extendComponent({
      };
    }

-    return Boards.find(query, {
+    const ret = ReactiveCache.getBoards(query, {
      sort: { sort: 1 /* boards default sorting */ },
    });
+    return ret;
  },
  boardLists(boardId) {
-    let boardLists = [];
-    const lists = Lists.find({'boardId' : boardId})
-    lists.forEach(list => {
-      let cardCount = Cards.find({'boardId':boardId, 'listId':list._id}).count()
-      boardLists.push(`${list.title}: ${cardCount}`);
+    /* Bug Board icons random dance https://github.com/wekan/wekan/issues/4214
+    const lists = ReactiveCache.getLists({ 'boardId': boardId, 'archived': false },{sort: ['sort','asc']});
+    const ret = lists.map(list => {
+      let cardCount = ReactiveCache.getCards({ 'boardId': boardId, 'listId': list._id }).length;
+      return `${list.title}: ${cardCount}`;
    });
-    return boardLists
+    return ret;
+    */
+    return [];
  },

  boardMembers(boardId) {
    let boardMembers = [];
-    const lists = Boards.findOne({'_id' : boardId})
+    /* Bug Board icons random dance https://github.com/wekan/wekan/issues/4214
+    const lists = ReactiveCache.getBoard(boardId)
    let members = lists.members
    members.forEach(member => {
      boardMembers.push(member.userId);
    });
-    return boardMembers
+    */
+    return boardMembers;
  },

  isStarred() {
-    const user = Meteor.user();
+    const user = ReactiveCache.getCurrentUser();
    return user && user.hasStarred(this.currentData()._id);
  },
  isAdministrable() {
-    const user = Meteor.user();
+    const user = ReactiveCache.getCurrentUser();
    return user && user.isBoardAdmin(this.currentData()._id);
  },

  hasOvertimeCards() {
-    subManager.subscribe('board', this.currentData()._id, false);
    return this.currentData().hasOvertimeCards();
  },

  hasSpentTimeCards() {
-    subManager.subscribe('board', this.currentData()._id, false);
    return this.currentData().hasSpentTimeCards();
  },

  isInvited() {
-    const user = Meteor.user();
+    const user = ReactiveCache.getCurrentUser();
    return user && user.isInvitedTo(this.currentData()._id);
  },

@@ -245,18 +238,18 @@ BlazeComponent.extendComponent({
        'click .js-add-board': Popup.open('createBoard'),
        'click .js-star-board'(evt) {
          const boardId = this.currentData()._id;
-          Meteor.user().toggleBoardStar(boardId);
+          ReactiveCache.getCurrentUser().toggleBoardStar(boardId);
          evt.preventDefault();
        },
        'click .js-clone-board'(evt) {
-          let title = getSlug(Boards.findOne(this.currentData()._id).title) || 'cloned-board';
+          let title = getSlug(ReactiveCache.getBoard(this.currentData()._id).title) || 'cloned-board';
          Meteor.call(
            'copyBoard',
            this.currentData()._id,
            {
-              sort: Boards.find({ archived: false }).count(),
+              sort: ReactiveCache.getBoards({ archived: false }).length,
              type: 'board',
-              title: Boards.findOne(this.currentData()._id).title,
+              title: ReactiveCache.getBoard(this.currentData()._id).title,
            },
            (err, res) => {
              if (err) {
@@ -291,10 +284,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 +295,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 filteredBoards = ReactiveCache.getBoards(query, {});
            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,81 +1,191 @@
-.attachments-galery {
-  display: flex;
-  flex-wrap: wrap;
+.hidden {
+  display: none;
 }
-.attachments-galery .attachment-item {
-  width: 31.33%;
-  margin: 10px 1% 0;
+.attachment-upload {
  text-align: center;
-  border-radius: 3px;
-  overflow: auto;
-  background: #ededed;
-  min-height: 120px;
+  font-weight: bold;
 }
-.attachments-galery .attachment-item:hover {
+.attachment-gallery {
+  display: flex;
+  flex-direction: column;
+}
+.attachment-item {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  margin-top: 16px;
+}
+.attachment-item:hover {
  background: #e0e0e0;
 }
-.attachments-galery .attachment-item.add-attachment {
-  display: flex;
-  align-items: center;
-}
-.attachments-galery .attachment-item.add-attachment a {
+.attachment-thumbnail-container {
  display: block;
-  margin: auto;
+  width: 150px;
+  min-width: 150px;
+  max-height: 150px;
+  padding-right: 16px;
+
 }
-.attachments-galery .attachment-item .attachment-thumbnail {
-  height: 80px;
+.attachment-thumbnail {
+  max-width: 150px;
+  max-height: 150px;
+  min-height: 2em;
+  cursor: pointer;
+}
+.attachment-thumbnail-text {
+  min-height: 2em;
  display: flex;
  align-items: center;
  justify-content: center;
-  position: relative;
+  font-size: 2em;
+  cursor: pointer;
+  border: 1px solid #ccc;
+  border-radius: 5px;
 }
-.attachments-galery .attachment-item .attachment-thumbnail .attachment-thumbnail-img {
+.attachment-details-container {
+  display: block;
+  flex-grow: 1;
+}
+.attachment-details {
+  display: flex;
+  justify-content: space-between;
+  margin-right: 25px; /* Make sure the icons are not to far to the right */
+}
+.attachment-actions {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+.add-attachment {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border: 1px dashed #555;
+  border-radius: 5px;
+  padding: 10px;
+  cursor: pointer;
+  margin-top: 16px;
+}
+.icon {
+  font-size: 1.5em;
+  cursor: pointer;
+  margin-left: 10px;
+}
+.icon:hover {
+  color: #666;
+}
+#viewer-overlay {
+  width: 100%;
+  height: 100vh;
+  position: fixed;
+  top: 48px;  /* height of the navbar */
+  left: 0;
+  z-index: 9999 !important;
+  background: rgba(13,13,13,0.95);
+}
+#viewer-container {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  height: 100%;
+}
+#viewer-top-bar {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  width: 100%;
+  padding: 16px;
+}
+#attachment-name {
+  color: white;
+  font-size: 1.5em;
+  max-width: calc(100% - 50px); /* Make sure the name does not overlap the close button */
+}
+#viewer-close {
+  color:white;
+  cursor: pointer;
+  font-size: 4em;
+  top: 0;
+  right: 8px;
+  position: absolute;
+}
+.attachment-arrow {
+  font-size: 4em;
+  color:white;
+  cursor: pointer;
+  align-self: center;
+  margin: 0 20px;
+}
+#image-viewer {
+  background:
+    repeating-conic-gradient(#808080 0% 25%, transparent 0% 50%)
+      50% / 20px 20px; /* Checkerboard background for transparent images */
+  max-width: 100%;
  max-height: 100%;
-  max-width: 100%;
 }
-.attachments-galery .attachment-item .attachment-thumbnail .attachment-thumbnail-ext {
-  text-transform: uppercase;
-  font-size: 1.6em;
+#pdf-viewer {
+  width: 40vw;
+  height: 100vh;
 }
-.attachments-galery .attachment-item .attachment-details {
-  font-size: 0.75em;
-  margin: 3px;
+#txt-viewer{
+  background-color: white;
+  width: 40vw;
+  height: 100vh;
 }
-.attachments-galery .attachment-item .attachment-details .attachment-details-actions a {
+.pdf-preview-error {
+  margin-top: 20vh;
  display: block;
+  font-size: 2em;
+  color: white;
 }
-.attachments-galery .attachment-item .attachment-details .attachment-details-actions a.attachment-details-menu {
-  padding-top: 10px;
-}
-.attachment-image-preview {
-  max-width: 100px;
-  display: block;
-  box-shadow: 0 1px 2px rgba(0,0,0,0.2);
-}
-.preview-clipboard-image {
-  width: 280px;
-  max-width: 100%;
-  height: 200px;
-  display: block;
-  border: 1px solid #000;
-  box-shadow: 0 1px 2px rgba(0,0,0,0.2);
+
+@media screen and (max-width: 1600px) {
+  #pdf-viewer {
+    width: 60vw;
+  }
 }
+
@media screen and (max-width: 800px) {
-  .attachments-galery .attachment-item {
-    width: 48%;
+  #viewer-container {
+    display: block;
  }
-  .attachments-galery .attachment-item .attachment-thumbnail {
-    height: 130px;
+  .attachment-arrow{
+    position: absolute;
+    bottom: 2.2em;
+    font-size: 1.6em;
+    padding: 16px;
  }
-  .attachments-galery .attachment-item .attachment-details {
-    font-size: 1.1em;
+  #prev-attachment{
+    left: 0;
  }
-}
-@media screen and (max-width: 360px) {
-  .attachments-galery .attachment-item {
+  #next-attachment{
+    right: 0;
+  }
+  #pdf-viewer {
+    width: 100%;
+    height: calc(100vh - 155px);  /* Full height - height of top and bottom bars */
+  }
+  #txt-viewer {
+    width: 100%;
+    height: calc(100vh - 155px);  /* Full height - height of top and bottom bars */
+  }
+  #audio-viewer {
+    margin-top: 20%;
    width: 100%;
  }
-  .attachments-galery .attachment-item .attachment-thumbnail {
-    height: 200px;
+  .attachment-thumbnail-container {
+    width: 100px;
+    min-width: 100px;
+  }
+  .attachment-thumbnail {
+    max-width: 100px;
+  }
+  .attachment-details {
+    flex-direction: column;
+    margin-right: 0px;
+  }
+  .attachment-actions {
+    flex-direction: row;
+    margin-top: 10px;
  }
 }
@@ -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"}}
@@ -15,66 +30,92 @@ template(name="attachmentDeletePopup")
  p {{_ "attachment-delete-pop"}}
  button.js-confirm.negate.full(type="submit") {{_ 'delete'}}

-template(name="attachmentsGalery")
-  .attachments-galery
-    each attachments
-      .attachment-item
-        a.attachment-thumbnail(href="{{link}}" title="{{name}}" data-lightbox="{{name}}")
-          if link
-            if isImage
-              img.attachment-thumbnail-img(src="{{link}}")
-            else if($eq extension 'mp3')
-                video(width="100%" height="100%" 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")
-            else if($eq extension 'webm')
-                video(width="100%" height="100%" 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")
-            else
-              span.attachment-thumbnail-ext= extension
-          else
-            +spinner
-        p.attachment-details
-          = name
-          span.file-size ({{fileSize size}} KB)
-          span.attachment-details-actions
-            a.js-download(href="{{link}}?download=true", download="{{name}}")
-              i.fa.fa-download
-              | {{_ 'download'}}
-            if currentUser.isBoardMember
-              unless currentUser.isCommentOnly
-                unless currentUser.isWorker
-                  a.fa.fa-navicon.attachment-details-menu.js-open-attachment-menu(title="{{_ 'attachmentActionsPopup-title'}}")
+template(name="attachmentViewer")
+  #viewer-overlay.hidden
+    #viewer-top-bar
+      span#attachment-name
+      a#viewer-close.fa.fa-times-thin
+
+    #viewer-container
+      i.fa.fa-chevron-left.attachment-arrow#prev-attachment
+      #viewer-content
+        img#image-viewer.hidden
+        video#video-viewer.hidden(controls="true")
+        audio#audio-viewer.hidden(controls="true")
+        object#pdf-viewer.hidden(type="application/pdf")
+          span.pdf-preview-error {{_ 'preview-pdf-not-supported' }}
+        object#txt-viewer.hidden(type="text/plain")
+      i.fa.fa-chevron-right.attachment-arrow#next-attachment
+
+template(name="attachmentGallery")
+
+  .attachment-gallery
+
+    a.attachment-item.add-attachment.js-add-attachment
+      i.fa.fa-plus.icon
+
+    each attachments
+
+      .attachment-item
+        .attachment-thumbnail-container.open-preview(data-attachment-id="{{_id}}" data-card-id="{{ meta.cardId }}")
+          if link
+            if(isImage)
+              img.attachment-thumbnail(src="{{link}}" title="{{sanitize name}}")
+            else if($eq extension 'svg')
+              img.attachment-thumbnail(src="{{link}}" title="{{sanitize name}}" type="image/svg+xml")
+            else if($eq extension 'mp3')
+              video.attachment-thumbnail(title="{{sanitize name}}")
+                source(src="{{link}}" type="audio/mpeg")
+            else if($eq extension 'ogg')
+              video.attachment-thumbnail(title="{{sanitize name}}")
+                source(src="{{link}}" type="video/ogg")
+            else if($eq extension 'webm')
+              video.attachment-thumbnail(title="{{sanitize name}}")
+                source(src="{{link}}" type="video/webm")
+            else if($eq extension 'mp4')
+              video.attachment-thumbnail(title="{{sanitize name}}")
+                source(src="{{link}}" type="video/mp4")
+            else
+              span.attachment-thumbnail-text= extension
+
+        .attachment-details-container
+          .attachment-details
+            div
+              b
+                = name
+              span.file-size ({{fileSize size}})
+            .attachment-actions
+              a.js-download(href="{{link}}?download=true", download="{{name}}")
+                i.fa.fa-download.icon(title="{{_ 'download'}}")
+              if currentUser.isBoardMember
+                unless currentUser.isCommentOnly
+                  unless currentUser.isWorker
+                    a.js-rename
+                      i.fa.fa-pencil-square-o.icon(title="{{_ 'rename'}}")
+                    a.js-confirm-delete
+                      i.fa.fa-trash.icon(title="{{_ 'delete'}}")
+                    a.fa.fa-navicon.icon.js-open-attachment-menu(data-attachment-link="{{link}}" title="{{_ 'attachmentActionsPopup-title'}}")

-    if currentUser.isBoardMember
-      unless currentUser.isCommentOnly
-        unless currentUser.isWorker
-          //li.attachment-item.add-attachment
-          a.js-add-attachment(title="{{_ 'add-attachment' }}")
-            i.fa.fa-plus

 template(name="attachmentActionsPopup")
  ul.pop-over-list
    li
      if isImage
        a(class="{{#if isCover}}js-remove-cover{{else}}js-add-cover{{/if}}")
-          i.fa.fa-thumb-tack
+          i.fa.fa-book
+          i.fa.fa-picture-o
          if isCover
            | {{_ 'remove-cover'}}
          else
            | {{_ 'add-cover'}}
      if currentUser.isBoardAdmin
-        a.js-rename
-          i.fa.fa-pencil-square-o
-          | {{_ 'rename'}}
-        a.js-confirm-delete
-          i.fa.fa-close
-          | {{_ 'delete'}}
+        if isImage
+          a(class="{{#if isBackgroundImage}}js-remove-background-image{{else}}js-add-background-image{{/if}}")
+            i.fa.fa-picture-o
+            if isBackgroundImage
+              | {{_ 'remove-background-image'}}
+            else
+              | {{_ 'add-background-image'}}
        p.attachment-storage
          | {{versions.original.storage}}

@@ -89,6 +130,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,4 +1,31 @@
-Template.attachmentsGalery.events({
+import { ReactiveCache } from '/imports/reactiveCache';
+import { ObjectID } from 'bson';
+import DOMPurify from 'dompurify';
+
+const filesize = require('filesize');
+const prettyMilliseconds = require('pretty-ms');
+
+// We store current card ID and the ID of currently opened attachment in a
+// global var. This is used so that we know what's the next attachment to open
+// when the user clicks on the prev/next button in the attachment viewer.
+let cardId = null;
+let openAttachmentId = null;
+
+// Used to store the start and end coordinates of a touch event for attachment swiping
+let touchStartCoords = null;
+let touchEndCoords = null;
+
+// Stores link to the attachment for which attachment actions popup was opened
+attachmentActionsLink = null;
+
+Template.attachmentGallery.events({
+  'click .open-preview'(event) {
+
+    openAttachmentId = $(event.currentTarget).attr("data-attachment-id");
+    cardId = $(event.currentTarget).attr("data-card-id");
+
+    openAttachmentViewer(openAttachmentId);
+  },
  'click .js-add-attachment': Popup.open('cardAttachments'),
  // If we let this event bubble, FlowRouter will handle it and empty the page
  // content, see #101.
@@ -6,44 +33,316 @@ Template.attachmentsGalery.events({
    event.stopPropagation();
  },
  'click .js-open-attachment-menu': Popup.open('attachmentActions'),
+  'mouseover .js-open-attachment-menu'(event) { // For some reason I cannot combine handlers for "click .js-open-attachment-menu" and "mouseover .js-open-attachment-menu" events so this is a quick workaround.
+    attachmentActionsLink = event.currentTarget.getAttribute("data-attachment-link");
+  },
+  'click .js-rename': Popup.open('attachmentRename'),
+  'click .js-confirm-delete': Popup.afterConfirm('attachmentDelete', function() {
+      Attachments.remove(this._id);
+      Popup.back(2);
+  }),
 });

-Template.attachmentsGalery.helpers({
+function getNextAttachmentId(currentAttachmentId, offset = 0) {
+    const attachments = ReactiveCache.getAttachments({'meta.cardId': cardId});
+
+  let i = 0;
+  for (; i < attachments.length; i++) {
+    if (attachments[i]._id === currentAttachmentId) {
+      break;
+    }
+  }
+  return attachments[(i + offset + 1 + attachments.length) % attachments.length]._id;
+}
+
+function getPrevAttachmentId(currentAttachmentId, offset = 0) {
+  const attachments = ReactiveCache.getAttachments({'meta.cardId': cardId});
+
+  let i = 0;
+  for (; i < attachments.length; i++) {
+    if (attachments[i]._id === currentAttachmentId) {
+      break;
+    }
+  }
+  return attachments[(i + offset - 1 + attachments.length) % attachments.length]._id;
+}
+
+function attachmentCanBeOpened(attachment) {
+  return (
+    attachment.isImage ||
+    attachment.isPDF ||
+    attachment.isText ||
+    attachment.isJSON ||
+    attachment.isVideo ||
+    attachment.isAudio
+  );
+}
+
+function openAttachmentViewer(attachmentId) {
+  const attachment = ReactiveCache.getAttachment(attachmentId);
+
+  // Check if we can open the attachment (if we have a viewer for it) and exit if not
+  if (!attachmentCanBeOpened(attachment)) {
+    return;
+  }
+
+  /*
+  Instructions for adding a new viewer:
+    - add a new case to the switch statement below
+    - implement cleanup in the closeAttachmentViewer() function, if necessary
+    - mark attachment type as openable by adding a new condition to the attachmentCanBeOpened function
+  */
+  switch(true){
+    case (attachment.isImage):
+      $("#image-viewer").attr("src", attachment.link());
+      $("#image-viewer").removeClass("hidden");
+      break;
+    case (attachment.isPDF):
+      $("#pdf-viewer").attr("data", attachment.link());
+      $("#pdf-viewer").removeClass("hidden");
+      break;
+    case (attachment.isVideo):
+      // We have to create a new <source> DOM element and append it to the video
+      // element, otherwise the video won't load
+      let videoSource = document.createElement('source');
+      videoSource.setAttribute('src', attachment.link());
+      $("#video-viewer").append(videoSource);
+
+      $("#video-viewer").removeClass("hidden");
+      break;
+    case (attachment.isAudio):
+      // We have to create a new <source> DOM element and append it to the audio
+      // element, otherwise the audio won't load
+      let audioSource = document.createElement('source');
+      audioSource.setAttribute('src', attachment.link());
+      $("#audio-viewer").append(audioSource);
+
+      $("#audio-viewer").removeClass("hidden");
+      break;
+    case (attachment.isText):
+    case (attachment.isJSON):
+      $("#txt-viewer").attr("data", attachment.link());
+      $("#txt-viewer").removeClass("hidden");
+      break;
+  }
+
+  $('#attachment-name').text(attachment.name);
+  $('#viewer-overlay').removeClass('hidden');
+}
+
+function closeAttachmentViewer() {
+  $("#viewer-overlay").addClass("hidden");
+
+  // We need to reset the viewers to avoid showing previous attachments
+  $("#image-viewer").attr("src", "");
+  $("#image-viewer").addClass("hidden");
+
+  $("#pdf-viewer").attr("data", "");
+  $("#pdf-viewer").addClass("hidden");
+
+  $("#txt-viewer").attr("data", "");
+  $("#txt-viewer").addClass("hidden");
+
+  $("#video-viewer").get(0).pause(); // Stop playback
+  $("#video-viewer").get(0).currentTime = 0;
+  $("#video-viewer").empty();
+  $("#video-viewer").addClass("hidden");
+
+  $("#audio-viewer").get(0).pause(); // Stop playback
+  $("#audio-viewer").get(0).currentTime = 0;
+  $("#audio-viewer").empty();
+  $("#audio-viewer").addClass("hidden");
+}
+
+function openNextAttachment() {
+  closeAttachmentViewer();
+
+    let i = 0;
+    // Find an attachment that can be opened
+    while (true) {
+      const id = getNextAttachmentId(openAttachmentId, i);
+      const attachment = ReactiveCache.getAttachment(id);
+      if (attachmentCanBeOpened(attachment)) {
+        openAttachmentId = id;
+        openAttachmentViewer(id);
+        break;
+      }
+      i++;
+    }
+}
+
+function openPrevAttachment() {
+  closeAttachmentViewer();
+
+    let i = 0;
+    // Find an attachment that can be opened
+    while (true) {
+      const id = getPrevAttachmentId(openAttachmentId, i);
+      const attachment = ReactiveCache.getAttachment(id);
+      if (attachmentCanBeOpened(attachment)) {
+        openAttachmentId = id;
+        openAttachmentViewer(id);
+        break;
+      }
+      i--;
+    }
+}
+
+function processTouch(){
+
+  xDist = touchEndCoords.x - touchStartCoords.x;
+  yDist = touchEndCoords.y - touchStartCoords.y;
+
+  console.log("xDist: " + xDist);
+
+  // Left swipe
+  if (Math.abs(xDist) > Math.abs(yDist) && xDist < 0) {
+    openNextAttachment();
+  }
+
+  // Right swipe
+  if (Math.abs(xDist) > Math.abs(yDist) && xDist > 0) {
+    openPrevAttachment();
+  }
+
+  // Up swipe
+  if (Math.abs(yDist) > Math.abs(xDist) && yDist < 0) {
+    closeAttachmentViewer();
+  }
+
+}
+
+Template.attachmentViewer.events({
+  'touchstart #viewer-container'(event) {
+    console.log("touchstart")
+    touchStartCoords = {
+      x: event.changedTouches[0].screenX,
+      y: event.changedTouches[0].screenY
+    }
+  },
+  'touchend #viewer-container'(event) {
+    console.log("touchend")
+    touchEndCoords = {
+      x: event.changedTouches[0].screenX,
+      y: event.changedTouches[0].screenY
+    }
+    processTouch();
+  },
+  'click #viewer-container'(event) {
+
+    // Make sure the click was on #viewer-container and not on any of its children
+    if(event.target !== event.currentTarget) {
+      event.stopPropagation();
+      return;
+    }
+
+    closeAttachmentViewer();
+  },
+  'click #viewer-content'(event) {
+
+    // Make sure the click was on #viewer-content and not on any of its children
+    if(event.target !== event.currentTarget) {
+      event.stopPropagation();
+      return;
+    }
+
+    closeAttachmentViewer();
+  },
+  'click #viewer-close'() {
+    closeAttachmentViewer();
+  },
+  'click #next-attachment'() {
+    openNextAttachment();
+  },
+  'click #prev-attachment'() {
+    openPrevAttachment();
+  },
+});
+
+Template.attachmentGallery.helpers({
  isBoardAdmin() {
-    return Meteor.user().isBoardAdmin();
+    return ReactiveCache.getCurrentUser().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();
+        let fileName = DOMPurify.sanitize(file.name);
+
+        // If sanitized filename is not same as original filename,
+        // it could be XSS that is already fixed with sanitize,
+        // or just normal mistake, so it is not a problem.
+        // That is why here is no warning.
+        if (fileName !== file.name) {
+          // If filename is empty, only in that case add some filename
+          if (fileName.length === 0) {
+            fileName = 'Empty-filename-after-sanitize.txt';
          }
        }
-      });
-      uploader.on('end', (error, fileRef) => {
-        Popup.back();
-      });
-      uploader.start();
+
+        const config = {
+          file: file,
+          fileId: fileId,
+          fileName: fileName,
+          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 +395,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,
@@ -128,25 +427,40 @@ Template.previewClipboardImagePopup.events({

 BlazeComponent.extendComponent({
  isCover() {
-    const ret = Cards.findOne(this.data().meta.cardId).coverId == this.data()._id;
+    const ret = ReactiveCache.getCard(this.data().meta.cardId).coverId == this.data()._id;
    return ret;
  },
+  isBackgroundImage() {
+    //const currentBoard = Utils.getCurrentBoard();
+    //return currentBoard.backgroundImageURL === $(".attachment-thumbnail-img").attr("src");
+    return false;
+  },
  events() {
    return [
      {
-        'click .js-rename': Popup.open('attachmentRename'),
-        'click .js-confirm-delete': Popup.afterConfirm('attachmentDelete', function() {
-          Attachments.remove(this._id);
-          Popup.back(2);
-        }),
        'click .js-add-cover'() {
-          Cards.findOne(this.data().meta.cardId).setCover(this.data()._id);
+          ReactiveCache.getCard(this.data().meta.cardId).setCover(this.data()._id);
          Popup.back();
        },
        'click .js-remove-cover'() {
-          Cards.findOne(this.data().meta.cardId).unsetCover();
+          ReactiveCache.getCard(this.data().meta.cardId).unsetCover();
          Popup.back();
        },
+        'click .js-add-background-image'() {
+          const currentBoard = Utils.getCurrentBoard();
+          currentBoard.setBackgroundImageURL(attachmentActionsLink);
+          Utils.setBackgroundImage(attachmentActionsLink);
+          Popup.back();
+          event.preventDefault();
+        },
+        'click .js-remove-background-image'() {
+          const currentBoard = Utils.getCurrentBoard();
+          currentBoard.setBackgroundImageURL("");
+          Utils.setBackgroundImage("");
+          Popup.back();
+          Utils.reload();
+          event.preventDefault();
+        },
        'click .js-move-storage-fs'() {
          Meteor.call('moveAttachmentToStorage', this.data()._id, "fs");
          Popup.back();
@@ -155,6 +469,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 +498,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() {
@@ -36,14 +37,6 @@ const CardCustomField = BlazeComponent.extendComponent({
    self.card = Utils.getCurrentCard();
    self.customFieldId = this.data()._id;
  },
-
-  canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly()
-    );
-  },
 });
 CardCustomField.register('cardCustomField');

@@ -245,21 +238,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 +320,5 @@ CardCustomField.register('cardCustomField');
      },
    ];
  }
-}.register('cardCustomField-stringtemplate'));
+}
+CardCustomFieldStringTemplate.register('cardCustomField-stringtemplate');
@@ -2,17 +2,6 @@ import moment from 'moment/min/moment-with-locales';
 import { TAPi18n } from '/imports/i18n';
 import { DatePicker } from '/client/lib/datepicker';

-Template.dateBadge.helpers({
-  canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly() &&
-      !Meteor.user().isWorker()
-    );
-  },
-});
-
 // editCardReceivedDatePopup
 (class extends DatePicker {
  onCreated() {
@@ -84,7 +84,7 @@
  overflow-x: hidden;
  background: #f7f7f7;
  border-radius: bottom 3px;
-  z-index: 20;
+  z-index: 30;
  animation: flexGrowIn 0.1s;
  box-shadow: 0 0 7px 0 #b3b3b3;
  transition: flex-basis 0.1s;
@@ -245,6 +245,14 @@
  padding-top: 10px;
 }
@media screen and (min-width: 801px) {
+  .card-details-maximized {
+    top: 97px;
+    left: 0;
+    right:0;
+    bottom: 0;
+    position: fixed;
+    resize: both;
+  }
  .card-details-maximized {
    padding: 0;
    flex-shrink: 0;
@@ -259,11 +267,6 @@
    box-shadow: 0 0 7px 0 #b3b3b3;
    transition: flex-basis 0.1s;
    box-sizing: border-box;
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: calc(100% - 20px);
-    width: calc(100% - 20px);
    float: left;
  }
  .card-details-maximized .card-details-left {
@@ -337,7 +340,7 @@ input[type="submit"].attachment-add-link-submit {
  }
 }
 .card-details-white {
-  background: unset !important;
+  background: #fff !important;
  color: #000 !important;
  border: 1px solid #eee;
 }
@@ -2,6 +2,9 @@ template(name="cardDetailsPopup")
  +cardDetails(popupCard)

 template(name="cardDetails")
+
+  +attachmentViewer
+
  section.card-details.js-card-details(class='{{#if cardMaximized}}card-details-maximized{{/if}}' class='{{#if isPopup}}card-details-popup{{/if}}'): .card-details-canvas
    .card-details-header(class='{{#if colorClass}}card-details-{{colorClass}}{{/if}}')
      +inlinedForm(classNames="js-card-details-title")
@@ -266,12 +269,14 @@ template(name="cardDetails")
                i.fa.fa-list-alt
                = definition.name
              +cardCustomField
-          .material-toggle-switch(title="{{_ 'change'}} {{_ 'custom-fields'}} {{_ 'layout'}}")
-            if customFieldsGrid
-              input.toggle-switch(type="checkbox" id="toggleCustomFieldsGridButton" checked="checked")
-            else
-              input.toggle-switch(type="checkbox" id="toggleCustomFieldsGridButton")
-            label.toggle-label(for="toggleCustomFieldsGridButton")
+
+          if $gt customFieldsWD.length 1
+            .material-toggle-switch(title="{{_ 'change'}} {{_ 'custom-fields'}} {{_ 'layout'}}")
+              if customFieldsGrid
+                input.toggle-switch(type="checkbox" id="toggleCustomFieldsGridButton" checked="checked")
+              else
+                input.toggle-switch(type="checkbox" id="toggleCustomFieldsGridButton")
+              label.toggle-label(for="toggleCustomFieldsGridButton")
          a.fa.fa-plus.js-custom-fields.card-details-item.custom-fields(title="{{_ 'custom-fields'}}")

      if getVoteQuestion
@@ -539,8 +544,8 @@ template(name="cardDetails")
          +viewer
            = getDescription

-      .card-checklist-attachmentGalerys
-        .card-checklist-attachmentGalery.card-checklists
+      .card-checklist-attachmentGalleries
+        .card-checklist-attachmentGallery.card-checklists
          if currentBoard.allowsChecklists
            hr
            +checklists(cardId = _id)
@@ -552,8 +557,15 @@ template(name="cardDetails")
          h3.card-details-item-title
            i.fa.fa-paperclip
            | {{_ 'attachments'}}
-          .card-checklist-attachmentGalery.card-attachmentGalery
-            +attachmentsGalery
+          if Meteor.settings.public.attachmentsUploadMaxSize
+            | {{_ 'max-upload-filesize'}} {{Meteor.settings.public.attachmentsUploadMaxSize}}
+            br
+          if Meteor.settings.public.attachmentsUploadMimeTypes
+            | {{_ 'allowed-upload-filetypes'}} {{Meteor.settings.public.attachmentsUploadMimeTypes}}
+            br
+          | {{_ 'invalid-file'}}
+          .card-checklist-attachmentGallery.card-attachmentGallery
+            +attachmentGallery
      hr

    .card-details-right
@@ -682,13 +694,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 +723,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'}}
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import moment from 'moment/min/moment-with-locales';
 import { TAPi18n } from '/imports/i18n';
 import { DatePicker } from '/client/lib/datepicker';
@@ -10,6 +11,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;
@@ -62,41 +64,48 @@ BlazeComponent.extendComponent({
  },

  hiddenSystemMessages() {
-    return Meteor.user().hasHiddenSystemMessages();
+    return ReactiveCache.getCurrentUser().hasHiddenSystemMessages();
  },

  customFieldsGrid() {
-    return Meteor.user().hasCustomFieldsGrid();
+    return ReactiveCache.getCurrentUser().hasCustomFieldsGrid();
  },


  cardMaximized() {
-    return !Utils.getPopupCardId() && Meteor.user().hasCardMaximized();
-  },
-
-  canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly() &&
-      !Meteor.user().isWorker()
-    );
+    return !Utils.getPopupCardId() && ReactiveCache.getCurrentUser().hasCardMaximized();
  },

  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?!
+        //
+	// uncommented again by chrisi51
+        // only with that, the autoscroll feature is working properly
+        // after my fixes, all scrollings where correct
+    */
+	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();

@@ -139,7 +148,7 @@ BlazeComponent.extendComponent({
    const card = this.currentData();
    let result = '#';
    if (card) {
-      const board = Boards.findOne(card.boardId);
+      const board = ReactiveCache.getBoard(card.boardId);
      if (board) {
        result = FlowRouter.path('card', {
          boardId: card.boardId,
@@ -188,15 +197,15 @@ BlazeComponent.extendComponent({
        cardId: card._id,
        boardId: card.boardId,
        listId: card.listId,
-        user: Meteor.user().username,
+        user: ReactiveCache.getCurrentUser().username,
        url: '',
      };

-      const integrations = Integrations.find({
+      const integrations = ReactiveCache.getIntegrations({
        boardId: { $in: [card.boardId, Integrations.Const.GLOBAL_WEBHOOK_ID] },
        enabled: true,
        activities: { $in: ['CardDetailsRendered', 'all'] },
-      }).fetch();
+      });

      if (integrations.length > 0) {
        integrations.forEach((integration) => {
@@ -217,6 +226,7 @@ BlazeComponent.extendComponent({
        this.scrollParentContainer();
      }, 500);
    }
+
    const $checklistsDom = this.$('.card-checklist-items');

    $checklistsDom.sortable({
@@ -288,7 +298,7 @@ BlazeComponent.extendComponent({
    });

    function userIsMember() {
-      return Meteor.user() && Meteor.user().isBoardMember();
+      return ReactiveCache.getCurrentUser()?.isBoardMember();
    }

    // Disable sorting if the current user is not a board member
@@ -299,7 +309,7 @@ BlazeComponent.extendComponent({
        $checklistsDom.data('sortable')
      ) {
        $checklistsDom.sortable('option', 'disabled', disabled);
-        if (Utils.isMiniScreenOrShowDesktopDragHandles()) {
+        if (Utils.isTouchScreenOrShowDesktopDragHandles()) {
          $checklistsDom.sortable({ handle: '.checklist-handle' });
        }
      }
@@ -393,7 +403,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 +452,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');
@@ -640,15 +662,7 @@ Template.cardDetailsActionsPopup.helpers({
  },

  isBoardAdmin() {
-    return Meteor.user().isBoardAdmin();
-  },
-
-  canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly()
-    );
+    return ReactiveCache.getCurrentUser().isBoardAdmin();
  },
 });

@@ -668,25 +682,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();
  },
@@ -732,19 +738,8 @@ BlazeComponent.extendComponent({
 }).register('editCardTitleForm');

 Template.cardMembersPopup.onCreated(function () {
-  let currBoard = Boards.findOne(Session.get('currentBoard'));
+  let currBoard = Utils.getCurrentBoard();
  let members = currBoard.activeMembers();
-
-  // let query = {
-  //   "teams.teamId": { $in: currBoard.teams.map(t => t.teamId) },
-  // };
-
-  // let boardTeamUsers = Users.find(query, {
-  //   sort: { sort: 1 },
-  // });
-
-  // members = currBoard.activeMembers2(members, boardTeamUsers);
-
  this.members = new ReactiveVar(members);
 });

@@ -757,33 +752,23 @@ Template.cardMembersPopup.events({

 Template.cardMembersPopup.helpers({
  members() {
-    return Template.instance().members.get();
+    return _.sortBy(Template.instance().members.get(),'fullname');
  },
 });

 const filterMembers = (filterTerm) => {
-  let currBoard = Boards.findOne(Session.get('currentBoard'));
+  let currBoard = Utils.getCurrentBoard();
  let members = currBoard.activeMembers();

-  // let query = {
-  //   "teams.teamId": { $in: currBoard.teams.map(t => t.teamId) },
-  // };
-
-  // let boardTeamUsers = Users.find(query, {
-  //   sort: { sort: 1 },
-  // });
-
-  // members = currBoard.activeMembers2(members, boardTeamUsers);
-
  if (filterTerm) {
    members = members
      .map(member => ({
        member,
-        user: Users.findOne(member.userId)
+        user: ReactiveCache.getUser(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 +800,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 = ReactiveCache.getCurrentUser().getMoveAndCopyDialogOptions();
    return ret;
-  },
+  }
+  setDone(boardId, swimlaneId, listId, options) {
+    ReactiveCache.getCurrentUser().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 = ReactiveCache.getCurrentUser().getMoveAndCopyDialogOptions();
    return ret;
-  },
+  }
+  setDone(boardId, swimlaneId, listId, options) {
+    ReactiveCache.getCurrentUser().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 = ReactiveCache.getCurrentUser().getMoveAndCopyDialogOptions();
+    return ret;
+  }
+  setDone(boardId, swimlaneId, listId, options) {
+    ReactiveCache.getCurrentUser().setMoveAndCopyDialogOption(this.currentBoardId, options);
+    const card = this.data();
+
+    const textarea = this.$('#copy-card-title');
    const title = textarea.val().trim();

    if (title) {
@@ -997,68 +862,42 @@ Template.convertChecklistItemToCardPopup.events({
        swimlaneId: swimlaneId,
        sort: 0,
      });
+      const card = ReactiveCache.getCard(_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 = ReactiveCache.getCurrentUser().getMoveAndCopyDialogOptions();
+    return ret;
+  }
+  setDone(boardId, swimlaneId, listId, options) {
+    ReactiveCache.getCurrentUser().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() {
@@ -1111,27 +950,27 @@ BlazeComponent.extendComponent({
  },

  boards() {
-    return Boards.find(
+    const ret = ReactiveCache.getBoards(
      {
        archived: false,
        'members.userId': Meteor.userId(),
-        _id: {
-          $ne: Meteor.user().getTemplatesBoardId(),
-        },
+        _id: { $ne: ReactiveCache.getCurrentUser().getTemplatesBoardId() },
      },
      {
        sort: { sort: 1 /* boards default sorting */ },
      },
    );
+    return ret;
  },

  cards() {
    const currentId = Utils.getCurrentCardId();
    if (this.parentBoard.get()) {
-      return Cards.find({
+      const ret = ReactiveCache.getCards({
        boardId: this.parentBoard.get(),
        _id: { $ne: currentId },
      });
+      return ret;
    } else {
      return [];
    }
@@ -1155,7 +994,7 @@ BlazeComponent.extendComponent({

  setParentCardId(cardId) {
    if (cardId) {
-      this.parentCard = Cards.findOne(cardId);
+      this.parentCard = ReactiveCache.getCard(cardId);
    } else {
      this.parentCard = null;
    }
@@ -1174,7 +1013,7 @@ BlazeComponent.extendComponent({
        'click .js-delete': Popup.afterConfirm('cardDelete', function () {
          Popup.close();
          // verify that there are no linked cards
-          if (Cards.find({ linkedId: this._id }).count() === 0) {
+          if (ReactiveCache.getCards({ linkedId: this._id }).length === 0) {
            Cards.remove(this._id);
          } else {
            // TODO: Maybe later we can list where the linked cards are.
@@ -1711,10 +1550,29 @@ BlazeComponent.extendComponent({
 EscapeActions.register(
  'detailsPane',
  () => {
+    // if card description diverges from database due to editing
+    // ask user whether changes should be applied
+    if (ReactiveCache.getCurrentUser()) {
+      if (ReactiveCache.getCurrentUser().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'));
@@ -1729,19 +1587,8 @@ EscapeActions.register(
 );

 Template.cardAssigneesPopup.onCreated(function () {
-  let currBoard = Boards.findOne(Session.get('currentBoard'));
+  let currBoard = Utils.getCurrentBoard();
  let members = currBoard.activeMembers();
-
-  // let query = {
-  //   "teams.teamId": { $in: currBoard.teams.map(t => t.teamId) },
-  // };
-
-  // let boardTeamUsers = Users.find(query, {
-  //   sort: { sort: 1 },
-  // });
-
-  // members = currBoard.activeMembers2(members, boardTeamUsers);
-
  this.members = new ReactiveVar(members);
 });

@@ -1767,23 +1614,17 @@ Template.cardAssigneesPopup.helpers({
  },

  members() {
-    return Template.instance().members.get();
+    return _.sortBy(Template.instance().members.get(),'fullname');
  },

  user() {
-    return Users.findOne(this.userId);
+    return ReactiveCache.getUser(this.userId);
  },
 });

 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 ReactiveCache.getUser(this.userId, {
      fields: {
        profile: 1,
        username: 1,
@@ -1792,21 +1633,10 @@ Template.cardAssigneePopup.helpers({
  },

  memberType() {
-    const user = Users.findOne(this.userId);
+    const user = ReactiveCache.getUser(this.userId);
    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';
-  },
-*/
  isCardAssignee() {
    const card = Template.parentData();
    const cardAssignees = card.getAssignees();
@@ -1815,13 +1645,13 @@ Template.cardAssigneePopup.helpers({
  },

  user() {
-    return Users.findOne(this.userId);
+    return ReactiveCache.getUser(this.userId);
  },
 });

 Template.cardAssigneePopup.events({
  'click .js-remove-assignee'() {
-    Cards.findOne(this.cardId).unassignAssignee(this.userId);
+    ReactiveCache.getCard(this.cardId).unassignAssignee(this.userId);
    Popup.back();
  },
  'click .js-edit-profile': Popup.open('editProfile'),
@@ -83,13 +83,3 @@ BlazeComponent.extendComponent({
    ];
  },
 }).register('cardSpentTime');
-
-Template.timeBadge.helpers({
-  canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly()
-    );
-  },
-});
@@ -164,6 +164,21 @@ textarea.js-edit-checklist-item {
  color: #222;
  box-shadow: 0 1px 2px rgba(0,0,0,0.2);
 }
+.add-checklist-top {
+  /* more space to checklists title */
+  padding-left: 20px;
+  /* + is easier clickable */
+  padding-right: 20px;
+}
+.add-checklist-top.js-open-inlined-form:hover {
+  background: #dbdbdb;
+  color: #222;
+  box-shadow: 0 1px 2px rgba(0,0,0,.2);
+}
+.card-details-item-title {
+  /* max width for adding checklist at top */
+  width: 100%;
+}
 .checklist-details-menu {
  float: right;
  padding: 6px 10px 6px 10px;
@@ -3,6 +3,12 @@ template(name="checklists")
    h3.card-details-item-title
      i.fa.fa-check
      | {{_ 'checklists'}}
+      if canModifyCard
+        +inlinedForm(autoclose=false classNames="js-add-checklist" cardId = cardId  position="top")
+          +addChecklistItemForm
+        else
+          a.add-checklist-top.js-open-inlined-form(title="{{_ 'add-checklist'}}")
+            i.fa.fa-plus
    if currentUser.isBoardMember
      .material-toggle-switch(title="{{_ 'hide-checked-items'}}")
        //span.toggle-switch-title
@@ -34,13 +40,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 +67,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 +83,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"}}...
@@ -86,6 +92,13 @@ template(name="editChecklistItemForm")
        | {{_ 'convertChecklistItemToCardPopup-title'}}

 template(name="checklistItems")
+  if checklist.items.length
+    if canModifyCard
+      +inlinedForm(autoclose=false classNames="js-add-checklist-item" checklist = checklist position="top")
+        +addChecklistItemForm(checklist=checklist showNewlineBecomesNewChecklistItem=true)
+      else
+        a.add-checklist-item.js-open-inlined-form(title="{{_ 'add-checklist-item'}}")
+          i.fa.fa-plus
  .checklist-items.js-checklist-items
    each item in checklist.items
      +inlinedForm(classNames="js-edit-checklist-item" item = item checklist = checklist)
@@ -100,11 +113,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 +129,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
@@ -168,25 +153,22 @@ template(name="copyAndMoveChecklist")
    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 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,8 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 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,12 +50,12 @@ 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();
    });

    function userIsMember() {
-      return Meteor.user() && Meteor.user().isBoardMember();
+      return ReactiveCache.getCurrentUser()?.isBoardMember();
    }

    // Disable sorting if the current user is not a board member
@@ -61,7 +63,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',
          });
@@ -70,15 +72,6 @@ BlazeComponent.extendComponent({
    });
  },

-  canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly() &&
-      !Meteor.user().isWorker()
-    );
-  },
-
  /** returns the finished percent of the checklist */
  finishedPercent() {
    const ret = this.data().checklist.finishedPercent();
@@ -92,20 +85,32 @@ BlazeComponent.extendComponent({
    const textarea = this.find('textarea.js-add-checklist-item');
    const title = textarea.value.trim();
    let cardId = this.currentData().cardId;
-    const card = Cards.findOne(cardId);
+    const card = ReactiveCache.getCard(cardId);
    //if (card.isLinked()) cardId = card.linkedId;
-    if (card.isLinkedCard()) cardId = card.linkedId;
+    if (card.isLinkedCard()) {
+      cardId = card.linkedId;
+    }
+
+    let sortIndex;
+    let checklistItemIndex;
+    if (this.currentData().position === 'top') {
+      sortIndex = Utils.calculateIndexData(null, card.firstChecklist()).base;
+      checklistItemIndex = 0;
+    } else {
+      sortIndex = Utils.calculateIndexData(card.lastChecklist(), null).base;
+      checklistItemIndex = -1;
+    }

    if (title) {
      Checklists.insert({
        cardId,
        title,
-        sort: card.checklists().count(),
+        sort: sortIndex,
      });
      this.closeAllInlinedForms();
      setTimeout(() => {
        this.$('.add-checklist-item')
-          .last()
+          .eq(checklistItemIndex)
          .click();
      }, 100);
    }
@@ -121,13 +126,22 @@ BlazeComponent.extendComponent({
      let checklistItems = [title];
      if (newlineBecomesNewChecklistItem.checked) {
        checklistItems = title.split('\n').map(_value => _value.trim());
+        if (this.currentData().position === 'top') {
+          checklistItems = checklistItems.reverse();
+        }
      }
      for (let checklistItem of checklistItems) {
+        let sortIndex;
+        if (this.currentData().position === 'top') {
+          sortIndex = Utils.calculateIndexData(null, checklist.firstItem()).base;
+        } else {
+          sortIndex = Utils.calculateIndexData(checklist.lastItem(), null).base;
+        }
        ChecklistItems.insert({
          title: checklistItem,
          checklistId: checklist._id,
          cardId: checklist.cardId,
-          sort: Utils.calculateIndexData(checklist.lastItem()).base,
+          sort: sortIndex,
        });
      }
    }
@@ -136,15 +150,6 @@ BlazeComponent.extendComponent({
    textarea.focus();
  },

-  canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly() &&
-      !Meteor.user().isWorker()
-    );
-  },
-
  deleteItem() {
    const checklist = this.currentData().checklist;
    const item = this.currentData().item;
@@ -228,25 +233,26 @@ BlazeComponent.extendComponent({
  },

  boards() {
-    return Boards.find(
+    const ret = ReactiveCache.getBoards(
      {
        archived: false,
        'members.userId': Meteor.userId(),
-        _id: { $ne: Meteor.user().getTemplatesBoardId() },
+        _id: { $ne: ReactiveCache.getCurrentUser().getTemplatesBoardId() },
      },
      {
        sort: { sort: 1 /* boards default sorting */ },
      },
    );
+    return ret;
  },

  swimlanes() {
-    const board = Boards.findOne(this.selectedBoardId.get());
+    const board = ReactiveCache.getBoard(this.selectedBoardId.get());
    return board.swimlanes();
  },

  aBoardLists() {
-    const board = Boards.findOne(this.selectedBoardId.get());
+    const board = ReactiveCache.getBoard(this.selectedBoardId.get());
    return board.lists();
  },

@@ -264,12 +270,12 @@ BlazeComponent.extendComponent({

 Template.checklists.helpers({
  checklists() {
-    const card = Cards.findOne(this.cardId);
+    const card = ReactiveCache.getCard(this.cardId);
    const ret = card.checklists();
    return ret;
  },
  hideCheckedItems() {
-    const currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) return currentUser.hasHideCheckedItems();
    return false;
  },
@@ -279,14 +285,6 @@ BlazeComponent.extendComponent({
  onRendered() {
    autosize(this.$('textarea.js-add-checklist-item'));
  },
-  canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly() &&
-      !Meteor.user().isWorker()
-    );
-  },
  events() {
    return [
      {
@@ -306,15 +304,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'),
      }
    ]
  }
@@ -324,14 +322,6 @@ BlazeComponent.extendComponent({
  onRendered() {
    autosize(this.$('textarea.js-edit-checklist-item'));
  },
-  canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly() &&
-      !Meteor.user().isWorker()
-    );
-  },
  events() {
    return [
      {
@@ -348,16 +338,8 @@ BlazeComponent.extendComponent({
 }).register('editChecklistItemForm');

 Template.checklistItemDetail.helpers({
-  canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly() &&
-      !Meteor.user().isWorker()
-    );
-  },
  hideCheckedItems() {
-    const user = Meteor.user();
+    const user = ReactiveCache.getCurrentUser();
    if (user) return user.hasHideCheckedItems();
    return false;
  },
@@ -380,230 +362,26 @@ 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() {
-    const ret = Meteor.user().getMoveChecklistDialogOptions();
+(class extends DialogWithBoardSwimlaneListCard {
+  getDialogOptions() {
+    const ret = ReactiveCache.getCurrentUser().getMoveChecklistDialogOptions();
    return ret;
  }
  setDone(cardId, options) {
-    Meteor.user().setMoveChecklistDialogOption(this.currentBoardId, options);
+    ReactiveCache.getCurrentUser().setMoveChecklistDialogOption(this.currentBoardId, options);
    this.data().checklist.move(cardId);
  }
 }).register('moveChecklistPopup');

 /** Copy Checklist Dialog */
-(class extends DialogWithBoardSwimlaneListAndCard {
-  getChecklistDialogOptions() {
-    const ret = Meteor.user().getCopyChecklistDialogOptions();
+(class extends DialogWithBoardSwimlaneListCard {
+  getDialogOptions() {
+    const ret = ReactiveCache.getCurrentUser().getCopyChecklistDialogOptions();
    return ret;
  }
  setDone(cardId, options) {
-    Meteor.user().setCopyChecklistDialogOption(this.currentBoardId, options);
+    ReactiveCache.getCurrentUser().setCopyChecklistDialogOption(this.currentBoardId, options);
    this.data().checklist.copy(cardId);
  }
 }).register('copyChecklistPopup');
@@ -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}}")
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 let labelColors;
 Meteor.startup(() => {
  labelColors = Boards.simpleSchema()._schema['labels.$.color'].allowedValues;
@@ -32,7 +34,7 @@ Template.createLabelPopup.helpers({
  // is not already used in the board (although it's not a problem if two
  // labels have the same color).
  defaultColor() {
-    const labels = Boards.findOne(Session.get('currentBoard')).labels;
+    const labels = Utils.getCurrentBoard().labels;
    const usedColors = _.pluck(labels, 'color');
    const availableColors = _.difference(labelColors, usedColors);
    return availableColors.length > 1 ? availableColors[0] : labelColors[0];
@@ -50,7 +52,7 @@ BlazeComponent.extendComponent({
      appendTo: '.edit-labels-pop-over',
      helper(element, currentItem) {
        let ret = currentItem.clone();
-        if (currentItem.closest('.popup-container-depth-0').size() == 0)
+        if (currentItem.closest('.popup-container-depth-0').length == 0)
        { // only set css transform at every sub-popup, not at the main popup
          const content = currentItem.closest('.content')[0]
          const offsetLeft = content.offsetLeft;
@@ -76,7 +78,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',
        });
@@ -118,7 +120,7 @@ Template.createLabelPopup.events({
  // Create the new label
  'submit .create-label'(event, templateInstance) {
    event.preventDefault();
-    const board = Boards.findOne(Session.get('currentBoard'));
+    const board = Utils.getCurrentBoard();
    const name = templateInstance
      .$('#labelName')
      .val()
@@ -130,14 +132,14 @@ Template.createLabelPopup.events({
 });

 Template.editLabelPopup.events({
-  'click .js-delete-label': Popup.afterConfirm('deleteLabel', function() {
-    const board = Boards.findOne(Session.get('currentBoard'));
+  'click .js-delete-label': Popup.afterConfirm('deleteLabel', function () {
+    const board = Utils.getCurrentBoard();
    board.removeLabel(this._id);
    Popup.back(2);
  }),
  'submit .edit-label'(event, templateInstance) {
    event.preventDefault();
-    const board = Boards.findOne(Session.get('currentBoard'));
+    const board = Utils.getCurrentBoard();
    const name = templateInstance
      .$('#labelName')
      .val()
@@ -150,6 +152,6 @@ Template.editLabelPopup.events({

 Template.cardLabelsPopup.helpers({
  isLabelSelected(cardId) {
-    return _.contains(Cards.findOne(cardId).labelIds, this._id);
+    return _.contains(ReactiveCache.getCard(cardId).labelIds, this._id);
  },
 });
@@ -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 {
@@ -103,6 +120,13 @@
  max-width: 100px;
  margin-right: 4px;
 }
+.minicard .minicard-custom-field-item-fullwidth {
+  flex-grow: 1;
+  display: block;
+  word-wrap: break-word;
+  max-width: 100%;
+  margin-right: 4px;
+}
 .minicard .handle {
  width: 20px;
  height: 20px;
@@ -125,13 +149,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 +247,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,20 +3,33 @@ 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'}}")
+    .dates
+      if getReceived
+        unless getStart
+          unless getDue
+            unless getEnd
+              .date
+                +minicardReceivedDate
+      if getStart
+        .date
+          +minicardStartDate
+      if getDue
+        .date
+          +minicardDueDate
+      if getEnd
+         +minicardEndDate
+      if getSpentTime
+        .date
+          +cardSpentTime
    if cover
-      .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
-          unless hiddenMinicardLabelText
-            span.js-card-label.card-label(class="card-label-{{color}}" title=name)
-              +viewer
-                = name
-          if hiddenMinicardLabelText
-            .minicard-label(class="card-label-{{color}}" title="{{name}}")
+      if currentBoard.allowsCoverAttachmentOnMinicard
+        .minicard-cover(style="background-image: url('{{cover.link 'original'}}?dummyReloadAfterSessionEstablished={{sess}}');")
    .minicard-title
      if $eq 'prefix-with-full-path' currentBoard.presentParentTask
        .parent-prefix
@@ -43,50 +56,60 @@ template(name="minicard")
      if $eq 'subtext-with-parent' currentBoard.presentParentTask
        .parent-subtext
          | {{ parentCardName }}
-
-    .dates
-      if getReceived
-        unless getStart
-          unless getDue
-            unless getEnd
-              .date
-                +minicardReceivedDate
-      if getStart
-        .date
-          +minicardStartDate
-      if getDue
-        .date
-          +minicardDueDate
-      if getEnd
-         +minicardEndDate
-      if getSpentTime
-        .date
-          +cardSpentTime
+    if labels
+      .minicard-labels(class="{{#if hiddenMinicardLabelText}}minicard-labels-no-text{{/if}}")
+        each labels
+          unless hiddenMinicardLabelText
+            span.js-card-label.card-label(class="card-label-{{color}}" title=name)
+              +viewer
+                = name
+          if hiddenMinicardLabelText
+            .minicard-label(class="card-label-{{color}}" title="{{name}}")

    .minicard-custom-fields
      each customFieldsWD
        if definition.showOnCard
          if trueValue
            .minicard-custom-field
+              // If there is custom field label, show label at left,
+              // and value at right
              if definition.showLabelOnMiniCard
                .minicard-custom-field-item
                  +viewer
                    = definition.name
-              .minicard-custom-field-item
-                if $eq definition.type "currency"
-                  +viewer
-                    = formattedCurrencyCustomFieldValue(definition)
-                else if $eq definition.type "date"
-                  .date
-                    +minicardCustomFieldDate
-                else if $eq definition.type "checkbox"
-                  .materialCheckBox(class="{{#if value }}is-checked{{/if}}")
-                else if $eq definition.type "stringtemplate"
-                  +viewer
-                    = formattedStringtemplateCustomFieldValue(definition)
-                else
-                  +viewer
-                    = trueValue
+                .minicard-custom-field-item
+                  if $eq definition.type "currency"
+                    +viewer
+                      = formattedCurrencyCustomFieldValue(definition)
+                  else if $eq definition.type "date"
+                    .date
+                      +minicardCustomFieldDate
+                  else if $eq definition.type "checkbox"
+                    .materialCheckBox(class="{{#if value }}is-checked{{/if}}")
+                  else if $eq definition.type "stringtemplate"
+                    +viewer
+                      = formattedStringtemplateCustomFieldValue(definition)
+                  else
+                    +viewer
+                      = trueValue
+              else
+                // If there is no custom field label,
+                // show value full width
+                .minicard-custom-field-item-fullwidth
+                  if $eq definition.type "currency"
+                    +viewer
+                      = formattedCurrencyCustomFieldValue(definition)
+                  else if $eq definition.type "date"
+                    .date
+                      +minicardCustomFieldDate
+                  else if $eq definition.type "checkbox"
+                    .materialCheckBox(class="{{#if value }}is-checked{{/if}}")
+                  else if $eq definition.type "stringtemplate"
+                    +viewer
+                      = formattedStringtemplateCustomFieldValue(definition)
+                  else
+                    +viewer
+                      = trueValue

    if showAssignee
      if getAssignees
@@ -106,11 +129,11 @@ template(name="minicard")

    .badges
      unless currentUser.isNoComments
-        if comments.count
-          .badge(title="{{_ 'card-comments-title' comments.count }}")
+        if comments.length
+          .badge(title="{{_ 'card-comments-title' comments.length }}")
            span.badge-icon.fa.fa-comment-o.badge-comment
              = ' '
-              = comments.count
+              = comments.length
            //span.badge-comment.badge-text
            //|  {{_ 'comment'}}
      if getDescription
@@ -129,10 +152,11 @@ template(name="minicard")
          if expiredPoker
            span.badge-text {{ getPokerEstimation }}
      if attachments.length
-        .badge
-          span.badge-icon.fa.fa-paperclip
-          span.badge-text= attachments.length
-      if checklists.count
+        if currentBoard.allowsBadgeAttachmentOnMinicard
+          .badge
+            span.badge-icon.fa.fa-paperclip
+            span.badge-text= attachments.length
+      if checklists.length
        .badge(class="{{#if checklistFinished}}is-finished{{/if}}")
          span.badge-icon.fa.fa-check-square-o
          span.badge-text.check-list-text {{checklistFinishedCount}}/{{checklistItemCount}}
@@ -142,9 +166,10 @@ template(name="minicard")
          span.badge-text.check-list-text {{subtasksFinishedCount}}/{{allSubtasksCount}}
          //{{subtasksFinishedCount}}/{{subtasksCount}} does not work because when a subtaks is archived, the count goes down
      if currentBoard.allowsCardSortingByNumber
-        .badge
-          span.badge-icon.fa.fa-sort
-          span.badge-text.check-list-sort {{ sort }}
+        if currentBoard.allowsCardSortingByNumberOnMinicard
+          .badge
+            span.badge-icon.fa.fa-sort
+            span.badge-text.check-list-sort {{ sort }}
    if currentBoard.allowsDescriptionTextOnMinicard
      if getDescription
        .minicard-description
@@ -155,3 +180,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,6 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
+import { CustomFieldStringTemplate } from '/client/lib/customFields'

 // Template.cards.events({
 //   'click .member': Popup.open('cardMember')
@@ -31,46 +33,50 @@ 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() {
-    if (this.data().board()) {
-      return (
-        this.data().board.allowsCreator === null ||
-        this.data().board().allowsCreator === undefined ||
-        this.data().board().allowsCreator
-      );
-      // return this.data().board().allowsCreator;
+    // cache "board" to reduce the mini-mongodb access
+    const board = this.data().board();
+    let ret = false;
+    if (board) {
+      ret =
+        board.allowsCreator === null ||
+        board.allowsCreator === undefined ||
+        board.allowsCreator
+      ;
    }
-    return false;
+    return ret;
  },

  showMembers() {
-    if (this.data().board()) {
-      return (
-        this.data().board.allowsMembers === null ||
-        this.data().board().allowsMembers === undefined ||
-        this.data().board().allowsMembers
-      );
+    // cache "board" to reduce the mini-mongodb access
+    const board = this.data().board();
+    let ret = false;
+    if (board) {
+      ret =
+        board.allowsMembers === null ||
+        board.allowsMembers === undefined ||
+        board.allowsMembers
+      ;
    }
-    return false;
+    return ret;
  },

  showAssignee() {
-    if (this.data().board()) {
-      return (
-        this.data().board.allowsAssignee === null ||
-        this.data().board().allowsAssignee === undefined ||
-        this.data().board().allowsAssignee
-      );
+    // cache "board" to reduce the mini-mongodb access
+    const board = this.data().board();
+    let ret = false;
+    if (board) {
+      ret =
+        board.allowsAssignee === null ||
+        board.allowsAssignee === undefined ||
+        board.allowsAssignee
+      ;
    }
-    return false;
+    return ret;
  },

  /** opens the card label popup only if clicked onto a label
@@ -100,6 +106,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'),
      }
    ];
  },
@@ -107,7 +114,7 @@ BlazeComponent.extendComponent({

 Template.minicard.helpers({
  hiddenMinicardLabelText() {
-    currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) {
      return (currentUser.profile || {}).hiddenMinicardLabelText;
    } else if (window.localStorage.getItem('hiddenMinicardLabelText')) {
@@ -150,3 +157,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);
+  }),
+});
@@ -1,13 +1,4 @@
-BlazeComponent.extendComponent({
-  canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly() &&
-      !Meteor.user().isWorker()
-    );
-  },
-}).register('subtaskDetail');
+import { ReactiveCache } from '/imports/reactiveCache';

 BlazeComponent.extendComponent({
  addSubtask(event) {
@@ -15,19 +6,19 @@ BlazeComponent.extendComponent({
    const textarea = this.find('textarea.js-add-subtask-item');
    const title = textarea.value.trim();
    const cardId = this.currentData().cardId;
-    const card = Cards.findOne(cardId);
+    const card = ReactiveCache.getCard(cardId);
    const sortIndex = -1;
-    const crtBoard = Boards.findOne(card.boardId);
+    const crtBoard = ReactiveCache.getBoard(card.boardId);
    const targetBoard = crtBoard.getDefaultSubtasksBoard();
    const listId = targetBoard.getDefaultSubtasksListId();

    //Get the full swimlane data for the parent task.
-    const parentSwimlane = Swimlanes.findOne({
+    const parentSwimlane = ReactiveCache.getSwimlane({
      boardId: crtBoard._id,
      _id: card.swimlaneId,
    });
    //find the swimlane of the same name in the target board.
-    const targetSwimlane = Swimlanes.findOne({
+    const targetSwimlane = ReactiveCache.getSwimlane({
      boardId: targetBoard._id,
      title: parentSwimlane.title,
    });
@@ -70,15 +61,6 @@ BlazeComponent.extendComponent({
    textarea.focus();
  },

-  canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly() &&
-      !Meteor.user().isWorker()
-    );
-  },
-
  deleteSubtask() {
    const subtask = this.currentData().subtask;
    if (subtask && subtask._id) {
@@ -117,17 +99,6 @@ BlazeComponent.extendComponent({
  },
 }).register('subtasks');

-Template.subtaskItemDetail.helpers({
-  canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly() &&
-      !Meteor.user().isWorker()
-    );
-  },
-});
-
 BlazeComponent.extendComponent({
  // ...
 }).register('subtaskItemDetail');
@@ -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],
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 export function csvGetMembersToMap(data) {
  // we will work on the list itself (an ordered array of objects) when a
  // mapping is done, we add a 'wekan' field to the object representing the
@@ -28,7 +30,7 @@ export function csvGetMembersToMap(data) {
      username: importedMember,
      id: importedMember,
    };
-    const wekanUser = Users.findOne({ username: importedMember.username });
+    const wekanUser = ReactiveCache.getUser({ username: importedMember.username });
    if (wekanUser) importedMember.wekanId = wekanUser._id;
    membersToMap.push(importedMember);
  }
@@ -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'}}
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { trelloGetMembersToMap } from './trelloMembersMapper';
 import { wekanGetMembersToMap } from './wekanMembersMapper';
 import { csvGetMembersToMap } from './csvMembersMapper';
@@ -174,9 +175,9 @@ BlazeComponent.extendComponent({
            this._refreshMembers(
              this.members().map(member => {
                if (!member.wekanId) {
-                  let user = Users.findOne({ username: member.username });
+                  let user = ReactiveCache.getUser({ username: member.username });
                  if (!user) {
-                    user = Users.findOne({ importUsernames: member.username });
+                    user = ReactiveCache.getUser({ importUsernames: member.username });
                  }
                  if (user) {
                    // eslint-disable-next-line no-console
@@ -297,7 +298,7 @@ BlazeComponent.extendComponent({
  },

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

@@ -309,3 +310,7 @@ BlazeComponent.extendComponent({
    ];
  },
 }).register('importMapMembersAddPopup');
+
+Template.importMapMembersAddPopup.helpers({
+  searchIndex: () => UserSearchIndex,
+})
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 export function trelloGetMembersToMap(data) {
  // we will work on the list itself (an ordered array of objects) when a
  // mapping is done, we add a 'wekan' field to the object representing the
@@ -5,7 +7,7 @@ export function trelloGetMembersToMap(data) {
  const membersToMap = data.members;
  // auto-map based on username
  membersToMap.forEach(importedMember => {
-    const wekanUser = Users.findOne({ username: importedMember.username });
+    const wekanUser = ReactiveCache.getUser({ username: importedMember.username });
    if (wekanUser) {
      importedMember.wekanId = wekanUser._id;
    }
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 export function wekanGetMembersToMap(data) {
  // we will work on the list itself (an ordered array of objects) when a
  // mapping is done, we add a 'wekan' field to the object representing the
@@ -15,7 +17,7 @@ export function wekanGetMembersToMap(data) {
      importedMember.fullName = user.profile.fullname;
    }
    importedMember.username = user.username;
-    const wekanUser = Users.findOne({ username: importedMember.username });
+    const wekanUser = ReactiveCache.getUser({ username: importedMember.username });
    if (wekanUser) {
      importedMember.wekanId = wekanUser._id;
    }
@@ -7,10 +7,16 @@
  border-left: 1px solid #ccc;
  padding: 0;
  float: left;
-  min-width: 270px;
-  max-width: 270px;
+  min-width: 100px; /* TODO(mark-i-m): hardcoded? */
+  /*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 {
+  min-width: 20px;
  margin-left: 5px;
  border-left: none;
 }
@@ -83,6 +89,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 +113,9 @@
  color: #4d4d4d;
  padding-left: 4px;
 }
+.js-open-list-menu {
+  font-size: 18px;
+}
 .list-body {
  flex: 1 1 auto;
  flex-direction: column;
@@ -111,10 +126,15 @@
 .list-body .minicards {
  flex-grow: 1;
  flex-shrink: 0;
+  /** get card drag/drop working for empty swimlanes */
+  min-height: 32px;
 }
 .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 +144,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;
 }
@@ -154,6 +179,9 @@
 #js-wip-limit-edit div {
  float: left;
 }
+#js-list-width-edit .list-width-error {
+  display: none;
+}
@media screen and (max-width: 800px) {
  .mini-list {
    flex: 0 0 60px;
@@ -1,5 +1,6 @@
 template(name='list')
-  .list.js-list(id="js-list-{{_id}}")
+  .list.js-list(id="js-list-{{_id}}"
+                style="width:{{listWidth}}px;")
    +listHeader
    +listBody

@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
 require('/client/lib/jquery-ui.js')

@@ -23,14 +24,6 @@ BlazeComponent.extendComponent({
  onRendered() {
    const boardComponent = this.parentComponent().parentComponent();

-    function userIsMember() {
-      return (
-        Meteor.user() &&
-        Meteor.user().isBoardMember() &&
-        !Meteor.user().isCommentOnly()
-      );
-    }
-
    const itemsSelector = '.js-minicard:not(.placeholder, .js-card-composer)';
    const $cards = this.$('.js-minicards');

@@ -60,6 +53,7 @@ BlazeComponent.extendComponent({
      distance: 7,
      items: itemsSelector,
      placeholder: 'minicard-wrapper placeholder',
+      scrollSpeed: 10,
      start(evt, ui) {
        ui.helper.css('z-index', 1000);
        ui.placeholder.height(ui.helper.height());
@@ -74,7 +68,7 @@ BlazeComponent.extendComponent({
        const nCards = MultiSelection.isActive() ? MultiSelection.count() : 1;
        const sortIndex = calculateIndex(prevCardDom, nextCardDom, nCards);
        const listId = Blaze.getData(ui.item.parents('.list').get(0))._id;
-        const currentBoard = Boards.findOne(Session.get('currentBoard'));
+        const currentBoard = Utils.getCurrentBoard();
        const defaultSwimlaneId = currentBoard.getDefaultSwimline()._id;
        let targetSwimlaneId = null;

@@ -96,7 +90,7 @@ BlazeComponent.extendComponent({
        $cards.sortable('cancel');

        if (MultiSelection.isActive()) {
-          Cards.find(MultiSelection.getMongoSelector(), {sort: ['sort']}).forEach((card, i) => {
+          ReactiveCache.getCards(MultiSelection.getMongoSelector(), { sort: ['sort'] }).forEach((card, i) => {
            const newSwimlaneId = targetSwimlaneId
              ? targetSwimlaneId
              : card.swimlaneId || defaultSwimlaneId;
@@ -119,35 +113,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 +147,7 @@ BlazeComponent.extendComponent({
    });

    this.autorun(() => {
-      if (Utils.isMiniScreenOrShowDesktopDragHandles()) {
+      if (Utils.isTouchScreenOrShowDesktopDragHandles()) {
        $cards.sortable({
          handle: '.handle',
        });
@@ -172,9 +162,9 @@ BlazeComponent.extendComponent({
          'option',
          'disabled',
          // Disable drag-dropping when user is not member
-          !userIsMember(),
+          !Utils.canModifyBoard(),
          // Not disable drag-dropping while in multi-selection mode
-          // MultiSelection.isActive() || !userIsMember(),
+          // MultiSelection.isActive() || !Utils.canModifyBoard(),
        );
      }
    });
@@ -184,14 +174,13 @@ BlazeComponent.extendComponent({
      const currentBoardId = Tracker.nonreactive(() => {
        return Session.get('currentBoard');
      });
-      Cards.find({ boardId: currentBoardId }).fetch();
      Tracker.afterFlush(() => {
        $cards.find(itemsSelector).droppable({
          hoverClass: 'draggable-hover-card',
          accept: '.js-member,.js-label',
          drop(event, ui) {
            const cardId = Blaze.getData(this)._id;
-            const card = Cards.findOne(cardId);
+            const card = ReactiveCache.getCard(cardId);

            if (ui.draggable.hasClass('js-member')) {
              const memberId = Blaze.getData(ui.draggable.get(0)).userId;
@@ -205,6 +194,12 @@ BlazeComponent.extendComponent({
      });
    });
  },
+
+  listWidth() {
+    const user = Meteor.user();
+    const list = Template.currentData();
+    return user.getListWidth(list.boardId, list._id);
+  },
 }).register('list');

 Template.miniList.events({
@@ -1,7 +1,7 @@
 template(name="listBody")
  .list-body
    .minicards.clearfix.js-minicards(class="{{#if reachedWipLimit}}js-list-full{{/if}}")
-      if cards.count
+      if cards.length
        +inlinedForm(autoclose=false position="top")
          +addCardForm(listId=_id position="top")
      ul.sidebar-list
@@ -54,6 +54,7 @@ template(name="addCardForm")
  .add-controls.clearfix
    button.primary.confirm(type="submit") {{_ 'add'}}
    a.fa.fa-times-thin.js-close-inlined-form
+  .add-controls.clearfix
    unless currentBoard.isTemplatesBoard
      unless currentBoard.isTemplateBoard
        span.quiet
@@ -94,7 +95,7 @@ template(name="linkCardPopup")
  label {{_ 'cards'}}:
  select.js-select-cards
    each cards
-      option(value="{{getId}}") {{getTitle}}
+      option(value="{{getRealId}}") {{getTitle}}

  .edit-controls.clearfix
    input.primary.confirm.js-done(type="button" value="{{_ 'link'}}")
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
 import { Spinner } from '/client/lib/spinner';

@@ -15,10 +16,11 @@ BlazeComponent.extendComponent({
  },

  customFieldsSum() {
-    return CustomFields.find({
+    const ret = ReactiveCache.getCustomFields({
      boardIds: { $in: [Session.get('currentBoard')] },
      showSumAtTopOfList: true,
    });
+    return ret;
  },

  openForm(options) {
@@ -64,7 +66,7 @@ BlazeComponent.extendComponent({
        swimlaneId = this.parentComponent()
          .parentComponent()
          .data()._id; // Always swimlanes view
-        const swimlane = Swimlanes.findOne(swimlaneId);
+        const swimlane = ReactiveCache.getSwimlane(swimlaneId);
        // If this is the card templates swimlane, insert a card template
        if (swimlane.isCardTemplatesSwimlane()) cardType = 'template-card';
        // If this is the board templates swimlane, insert a board template and a linked card
@@ -112,7 +114,7 @@ BlazeComponent.extendComponent({
      // to appear
      const cardCount = this.data()
        .cards(this.idOrNull(swimlaneId))
-        .count();
+        .length;
      if (this.cardlimit.get() < cardCount) {
        this.cardlimit.set(this.cardlimit.get() + InfiniteScrollIter);
      }
@@ -200,25 +202,23 @@ BlazeComponent.extendComponent({
      archived: false,
    };
    if (swimlaneId) selector.swimlaneId = swimlaneId;
-    return Cards.find(Filter.mongoSelector(selector), {
+    const ret = ReactiveCache.getCards(Filter.mongoSelector(selector), {
      // sort: ['sort'],
      sort: sortBy,
      limit,
-    });
+    }, true);
+    return ret;
  },

  showSpinner(swimlaneId) {
    const list = Template.currentData();
-    return list.cards(swimlaneId).count() > this.cardlimit.get();
+    return list.cards(swimlaneId).length > this.cardlimit.get();
  },

  canSeeAddCard() {
    return (
      !this.reachedWipLimit() &&
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly() &&
-      !Meteor.user().isWorker()
+      Utils.canModifyCard()
    );
  },

@@ -227,7 +227,7 @@ BlazeComponent.extendComponent({
    return (
      !list.getWipLimit('soft') &&
      list.getWipLimit('enabled') &&
-      list.getWipLimit('value') <= list.cards().count()
+      list.getWipLimit('value') <= list.cards().length
    );
  },

@@ -269,9 +269,8 @@ BlazeComponent.extendComponent({
    const currentBoardId = Session.get('currentBoard');
    arr = [];
    _.forEach(
-      Boards.findOne(currentBoardId)
-        .customFields()
-        .fetch(),
+      ReactiveCache.getBoard(currentBoardId)
+        .customFields(),
      function (field) {
        if (field.automaticallyOnCard || field.alwaysOnCard)
          arr.push({ _id: field._id, value: null });
@@ -288,8 +287,8 @@ BlazeComponent.extendComponent({

  getLabels() {
    const currentBoardId = Session.get('currentBoard');
-    if (Boards.findOne(currentBoardId).labels) {
-      return Boards.findOne(currentBoardId).labels.filter(label => {
+    if (ReactiveCache.getBoard(currentBoardId).labels) {
+      return ReactiveCache.getBoard(currentBoardId).labels.filter(label => {
        return this.labels.get().indexOf(label._id) > -1;
      });
    }
@@ -349,10 +348,10 @@ BlazeComponent.extendComponent({
        {
          match: /\B@([\w.-]*)$/,
          search(term, callback) {
-            const currentBoard = Boards.findOne(Session.get('currentBoard'));
+            const currentBoard = Utils.getCurrentBoard();
            callback(
              $.map(currentBoard.activeMembers(), member => {
-                const user = Users.findOne(member.userId);
+                const user = ReactiveCache.getUser(member.userId);
                return user.username.indexOf(term) === 0 ? user : null;
              }),
            );
@@ -374,7 +373,7 @@ BlazeComponent.extendComponent({
        {
          match: /\B#(\w*)$/,
          search(term, callback) {
-            const currentBoard = Boards.findOne(Session.get('currentBoard'));
+            const currentBoard = Utils.getCurrentBoard();
            callback(
              $.map(currentBoard.labels, label => {
                if (label.name == undefined) {
@@ -430,10 +429,10 @@ BlazeComponent.extendComponent({
    this.boardId = Session.get('currentBoard');
    // In order to get current board info
    subManager.subscribe('board', this.boardId, false);
-    this.board = Boards.findOne(this.boardId);
+    this.board = ReactiveCache.getBoard(this.boardId);
    // List where to insert card
-    const list = $(Popup._getTopStack().openerElement).closest('.js-list');
-    this.listId = Blaze.getData(list[0])._id;
+    this.list = $(Popup._getTopStack().openerElement).closest('.js-list');
+    this.listId = Blaze.getData(this.list[0])._id;
    // Swimlane where to insert card
    const swimlane = $(Popup._getTopStack().openerElement).closest(
      '.js-swimlane',
@@ -442,11 +441,11 @@ BlazeComponent.extendComponent({
    if (Utils.boardView() === 'board-view-swimlanes')
      this.swimlaneId = Blaze.getData(swimlane[0])._id;
    else if (Utils.boardView() === 'board-view-lists' || !Utils.boardView)
-      this.swimlaneId = Swimlanes.findOne({ boardId: this.boardId })._id;
+      this.swimlaneId = ReactiveCache.getSwimlane({ boardId: this.boardId })._id;
  },

  boards() {
-    const boards = Boards.find(
+    const ret = ReactiveCache.getBoards(
      {
        archived: false,
        'members.userId': Meteor.userId(),
@@ -457,16 +456,22 @@ BlazeComponent.extendComponent({
        sort: { sort: 1 /* boards default sorting */ },
      },
    );
-    return boards;
+    return ret;
  },

  swimlanes() {
    if (!this.selectedBoardId.get()) {
      return [];
    }
-    const swimlanes = Swimlanes.find({ boardId: this.selectedBoardId.get() });
-    if (swimlanes.count())
-      this.selectedSwimlaneId.set(swimlanes.fetch()[0]._id);
+    const swimlanes = ReactiveCache.getSwimlanes(
+    {
+      boardId: this.selectedBoardId.get()
+    },
+    {
+      sort: { sort: 1 },
+    });
+    if (swimlanes.length)
+      this.selectedSwimlaneId.set(swimlanes[0]._id);
    return swimlanes;
  },

@@ -474,8 +479,14 @@ BlazeComponent.extendComponent({
    if (!this.selectedBoardId.get()) {
      return [];
    }
-    const lists = Lists.find({ boardId: this.selectedBoardId.get() });
-    if (lists.count()) this.selectedListId.set(lists.fetch()[0]._id);
+    const lists = ReactiveCache.getLists(
+    {
+      boardId: this.selectedBoardId.get()
+    },
+    {
+      sort: { sort: 1 },
+    });
+    if (lists.length) this.selectedListId.set(lists[0]._id);
    return lists;
  },

@@ -483,10 +494,9 @@ BlazeComponent.extendComponent({
    if (!this.board) {
      return [];
    }
-    const ownCardsIds = this.board.cards().map(card => {
-      return card.linkedId || card._id;
-    });
-    return Cards.find({
+    const ownCardsIds = this.board.cards().map(card => card.getRealId());
+    const ret = ReactiveCache.getCards(
+    {
      boardId: this.selectedBoardId.get(),
      swimlaneId: this.selectedSwimlaneId.get(),
      listId: this.selectedListId.get(),
@@ -494,7 +504,24 @@ BlazeComponent.extendComponent({
      linkedId: { $nin: ownCardsIds },
      _id: { $nin: ownCardsIds },
      type: { $nin: ['template-card'] },
+    },
+    {
+      sort: { sort: 1 },
    });
+    return ret;
+  },
+
+  getSortIndex() {
+    const position = this.currentData().position;
+    let ret;
+    if (position === 'top') {
+      const firstCardDom = this.list.find('.js-minicard:first')[0];
+      ret = Utils.calculateIndex(null, firstCardDom).base;
+    } else if (position === 'bottom') {
+      const lastCardDom = this.list.find('.js-minicard:last')[0];
+      ret = Utils.calculateIndex(lastCardDom, null).base;
+    }
+    return ret;
  },

  events() {
@@ -519,16 +546,17 @@ BlazeComponent.extendComponent({
            Popup.back();
            return;
          }
+          const nextCardNumber = this.board.getNextCardNumber();
+          const sortIndex = this.getSortIndex();
          const _id = Cards.insert({
            title: $('.js-select-cards option:selected').text(), //dummy
            listId: this.listId,
            swimlaneId: this.swimlaneId,
            boardId: this.boardId,
-            sort: Lists.findOne(this.listId)
-              .cards()
-              .count(),
+            sort: sortIndex,
            type: 'cardType-linkedCard',
            linkedId,
+            cardNumber: nextCardNumber,
          });
          Filter.addException(_id);
          Popup.back();
@@ -540,21 +568,22 @@ BlazeComponent.extendComponent({
          const impBoardId = $('.js-select-boards option:selected').val();
          if (
            !impBoardId ||
-            Cards.findOne({ linkedId: impBoardId, archived: false })
+            ReactiveCache.getCard({ linkedId: impBoardId, archived: false })
          ) {
            Popup.back();
            return;
          }
+          const nextCardNumber = this.board.getNextCardNumber();
+          const sortIndex = this.getSortIndex();
          const _id = Cards.insert({
            title: $('.js-select-boards option:selected').text(), //dummy
            listId: this.listId,
            swimlaneId: this.swimlaneId,
            boardId: this.boardId,
-            sort: Lists.findOne(this.listId)
-              .cards()
-              .count(),
+            sort: sortIndex,
            type: 'cardType-linkedBoard',
            linkedId: impBoardId,
+            cardNumber: nextCardNumber,
          });
          Filter.addException(_id);
          Popup.back();
@@ -587,36 +616,27 @@ BlazeComponent.extendComponent({
      this.isListTemplateSearch ||
      this.isSwimlaneTemplateSearch ||
      this.isBoardTemplateSearch;
-    let board = {};
+
+    this.board = {};
    if (this.isTemplateSearch) {
-      //board = Boards.findOne((Meteor.user().profile || {}).templatesBoardId);
-      board._id = (Meteor.user().profile || {}).templatesBoardId;
+      const boardId = (ReactiveCache.getCurrentUser().profile || {}).templatesBoardId;
+      if (boardId) {
+        this.board = ReactiveCache.getBoard(boardId);
+      }
    } else {
-      // Prefetch first non-current board id
-      board = Boards.find({
-        archived: false,
-        'members.userId': Meteor.userId(),
-        _id: {
-          $nin: [
-            Session.get('currentBoard'),
-            (Meteor.user().profile || {}).templatesBoardId,
-          ],
-        },
-      });
+      this.board = Utils.getCurrentBoard();
    }
-    if (!board) {
+    if (!this.board) {
      Popup.back();
      return;
    }
-    const boardId = board._id;
+    this.boardId = this.board._id;
    // Subscribe to this board
-    subManager.subscribe('board', boardId, false);
-    this.selectedBoardId = new ReactiveVar(boardId);
+    subManager.subscribe('board', this.boardId, false);
+    this.selectedBoardId = new ReactiveVar(this.boardId);
+    this.list = $(Popup._getTopStack().openerElement).closest('.js-list');

    if (!this.isBoardTemplateSearch) {
-      this.boardId = Session.get('currentBoard');
-      // In order to get current board info
-      subManager.subscribe('board', this.boardId, false);
      this.swimlaneId = '';
      // Swimlane where to insert card
      const swimlane = $(Popup._getTopStack().openerElement).parents(
@@ -624,16 +644,15 @@ BlazeComponent.extendComponent({
      );
      if (Utils.boardView() === 'board-view-swimlanes')
        this.swimlaneId = Blaze.getData(swimlane[0])._id;
-      else this.swimlaneId = Swimlanes.findOne({ boardId: this.boardId })._id;
+      else this.swimlaneId = ReactiveCache.getSwimlane({ boardId: this.boardId })._id;
      // List where to insert card
-      const list = $(Popup._getTopStack().openerElement).closest('.js-list');
-      this.listId = Blaze.getData(list[0])._id;
+      this.listId = Blaze.getData(this.list[0])._id;
    }
    this.term = new ReactiveVar('');
  },

  boards() {
-    const boards = Boards.find(
+    const ret = ReactiveCache.getBoards(
      {
        archived: false,
        'members.userId': Meteor.userId(),
@@ -644,14 +663,14 @@ BlazeComponent.extendComponent({
        sort: { sort: 1 /* boards default sorting */ },
      },
    );
-    return boards;
+    return ret;
  },

  results() {
    if (!this.selectedBoardId) {
      return [];
    }
-    const board = Boards.findOne(this.selectedBoardId.get());
+    const board = ReactiveCache.getBoard(this.selectedBoardId.get());
    if (!this.isTemplateSearch || this.isCardTemplateSearch) {
      return board.searchCards(this.term.get(), false);
    } else if (this.isListTemplateSearch) {
@@ -669,6 +688,19 @@ BlazeComponent.extendComponent({
    }
  },

+  getSortIndex() {
+    const position = this.data().position;
+    let ret;
+    if (position === 'top') {
+      const firstCardDom = this.list.find('.js-minicard:first')[0];
+      ret = Utils.calculateIndex(null, firstCardDom).base;
+    } else if (position === 'bottom') {
+      const lastCardDom = this.list.find('.js-minicard:last')[0];
+      ret = Utils.calculateIndex(lastCardDom, null).base;
+    }
+    return ret;
+  },
+
  events() {
    return [
      {
@@ -692,9 +724,8 @@ BlazeComponent.extendComponent({
          if (!this.isTemplateSearch || this.isCardTemplateSearch) {
            // Card insertion
            // 1. Common
-            element.sort = Lists.findOne(this.listId)
-              .cards()
-              .count();
+            element.cardNumber = this.board.getNextCardNumber();
+            element.sort = this.getSortIndex();
            // 1.A From template
            if (this.isTemplateSearch) {
              element.type = 'cardType-card';
@@ -707,15 +738,15 @@ BlazeComponent.extendComponent({
            Filter.addException(_id);
            // List insertion
          } else if (this.isListTemplateSearch) {
-            element.sort = Swimlanes.findOne(this.swimlaneId)
+            element.sort = ReactiveCache.getSwimlane(this.swimlaneId)
              .lists()
-              .count();
+              .length;
            element.type = 'list';
            _id = element.copy(this.boardId, this.swimlaneId);
          } else if (this.isSwimlaneTemplateSearch) {
-            element.sort = Boards.findOne(this.boardId)
+            element.sort = ReactiveCache.getBoard(this.boardId)
              .swimlanes()
-              .count();
+              .length;
            element.type = 'swimlane';
            _id = element.copy(this.boardId);
          } else if (this.isBoardTemplateSearch) {
@@ -723,7 +754,7 @@ BlazeComponent.extendComponent({
              'copyBoard',
              element.linkedId,
              {
-                sort: Boards.find({ archived: false }).count(),
+                sort: ReactiveCache.getBoards({ archived: false }).length,
                type: 'board',
                title: element.title,
              },
@@ -757,7 +788,7 @@ BlazeComponent.extendComponent({
      Meteor.settings.public.sandstorm;

    if (isSandstorm) {
-      const user = Meteor.user();
+      const user = ReactiveCache.getCurrentUser();
      if (user) {
        if (Utils.boardView() === 'board-view-swimlanes') {
          this.swimlaneId = this.parentComponent()
@@ -15,11 +15,11 @@ template(name="listHeader")
          = title
        if wipLimit.enabled
         |&nbsp;(
-         span(class="{{#if exceededWipLimit}}highlight{{/if}}") {{cards.count}}
+         span(class="{{#if exceededWipLimit}}highlight{{/if}}") {{cards.length}}
         |/#{wipLimit.value})

-      if showCardsCountForList cards.count
-        span.cardCount {{cardsCount}} {{cardsCountForListIsOne cards.count}}
+      if showCardsCountForList cards.length
+        span.cardCount {{cardsCount}} {{cardsCountForListIsOne cards.length}}

      if isMiniScreen
        if currentList
@@ -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")
@@ -62,6 +62,11 @@ template(name="listActionPopup")
        i.fa.fa-arrow-down
        | {{_ 'add-card-to-bottom-of-list'}}
  hr
+  ul.pop-over-list
+    li
+      a.js-set-list-width
+        i.fa.fa-arrows-h
+        |  {{_ 'set-list-width'}}
  ul.pop-over-list
    li
      a.js-toggle-watch-list
@@ -79,7 +84,7 @@ template(name="listActionPopup")
            i.fa.fa-paint-brush
            | {{_ 'set-color-list'}}
    ul.pop-over-list
-      if cards.count
+      if cards.length
        li
          a.js-select-cards
            i.fa.fa-check-square
@@ -156,6 +161,19 @@ template(name="wipLimitErrorPopup")
    p {{_ 'wipLimitErrorPopup-dialog-pt2'}}
    button.full.js-back-view(type="submit") {{_ 'cancel'}}

+template(name="setListWidthPopup")
+  #js-list-width-edit
+    label {{_ 'set-list-width-value'}}
+      p
+        input.list-width-value(type="number" value="{{ listWidthValue }}" min="100")
+        input.list-width-apply(type="submit" value="{{_ 'apply'}}")
+        input.list-width-error
+
+template(name="listWidthErrorPopup")
+  .list-width-invalid
+    p {{_ 'list-width-error-message'}} '&gt;=100'
+    button.full.js-back-view(type="submit") {{_ 'cancel'}}
+
 template(name="setListColorPopup")
  form.edit-label
    .palette-colors: each colors
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';

 let listsColors;
@@ -12,12 +13,12 @@ BlazeComponent.extendComponent({
      (!list.getWipLimit('enabled') ||
        list.getWipLimit('soft') ||
        !this.reachedWipLimit()) &&
-      !Meteor.user().isWorker()
+      !ReactiveCache.getCurrentUser().isWorker()
    );
  },

  isBoardAdmin() {
-    return Meteor.user().isBoardAdmin();
+    return ReactiveCache.getCurrentUser().isBoardAdmin();
  },
  starred(check = undefined) {
    const list = Template.currentData();
@@ -47,9 +48,9 @@ BlazeComponent.extendComponent({
  },

  limitToShowCardsCount() {
-    const currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) {
-      return Meteor.user().getLimitToShowCardsCount();
+      return currentUser.getLimitToShowCardsCount();
    } else {
      return false;
    }
@@ -63,14 +64,15 @@ BlazeComponent.extendComponent({
        .parentComponent()
        .data()._id;

-    return list.cards(swimlaneId).count();
+    const ret = list.cards(swimlaneId).length;
+    return ret;
  },

  reachedWipLimit() {
    const list = Template.currentData();
    return (
      list.getWipLimit('enabled') &&
-      list.getWipLimit('value') <= list.cards().count()
+      list.getWipLimit('value') <= list.cards().length
    );
  },

@@ -78,7 +80,7 @@ BlazeComponent.extendComponent({
    const list = Template.currentData();
    return (
      list.getWipLimit('enabled') &&
-      list.getWipLimit('value') < list.cards().count()
+      list.getWipLimit('value') < list.cards().length
    );
  },

@@ -123,13 +125,13 @@ BlazeComponent.extendComponent({

 Template.listHeader.helpers({
  isBoardAdmin() {
-    return Meteor.user().isBoardAdmin();
+    return ReactiveCache.getCurrentUser().isBoardAdmin();
  }
 });

 Template.listActionPopup.helpers({
  isBoardAdmin() {
-    return Meteor.user().isBoardAdmin();
+    return ReactiveCache.getCurrentUser().isBoardAdmin();
  },

  isWipLimitEnabled() {
@@ -151,6 +153,7 @@ Template.listActionPopup.events({
    });
    Popup.back();
  },
+  'click .js-set-list-width': Popup.open('setListWidth'),
  'click .js-set-color-list': Popup.open('setListColor'),
  'click .js-select-cards'() {
    const cardIds = this.allCards().map(card => card._id);
@@ -183,7 +186,7 @@ BlazeComponent.extendComponent({
      10,
    );

-    if (limit < list.cards().count() && !list.getWipLimit('soft')) {
+    if (limit < list.cards().length && !list.getWipLimit('soft')) {
      Template.instance()
        .$('.wip-limit-error')
        .click();
@@ -198,9 +201,9 @@ BlazeComponent.extendComponent({

    if (
      list.getWipLimit('soft') &&
-      list.getWipLimit('value') < list.cards().count()
+      list.getWipLimit('value') < list.cards().length
    ) {
-      list.setWipLimit(list.cards().count());
+      list.setWipLimit(list.cards().length);
    }
    Meteor.call('enableSoftLimit', Template.currentData()._id);
  },
@@ -210,9 +213,9 @@ BlazeComponent.extendComponent({
    // Prevent user from using previously stored wipLimit.value if it is less than the current number of cards in the list
    if (
      !list.getWipLimit('enabled') &&
-      list.getWipLimit('value') < list.cards().count()
+      list.getWipLimit('value') < list.cards().length
    ) {
-      list.setWipLimit(list.cards().count());
+      list.setWipLimit(list.cards().length);
    }
    Meteor.call('enableWipLimit', list._id);
  },
@@ -244,17 +247,16 @@ BlazeComponent.extendComponent({
 Template.listMorePopup.events({
  'click .js-delete': Popup.afterConfirm('listDelete', function() {
    Popup.back();
-    // TODO how can we avoid the fetch call?
-    const allCards = this.allCards().fetch();
+    const allCards = this.allCards();
    const allCardIds = _.pluck(allCards, '_id');
    // it's okay if the linked cards are on the same list
    if (
-      Cards.find({
+      ReactiveCache.getCards({
        $and: [
          { listId: { $ne: this._id } },
          { linkedId: { $in: allCardIds } },
        ],
-      }).count() === 0
+      }).length === 0
    ) {
      allCardIds.map(_id => Cards.remove(_id));
      Lists.remove(this._id);
@@ -279,7 +281,7 @@ Template.listMorePopup.events({

 Template.listHeader.helpers({
  isBoardAdmin() {
-    return Meteor.user().isBoardAdmin();
+    return ReactiveCache.getCurrentUser().isBoardAdmin();
  },
 });

@@ -309,13 +311,51 @@ 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();
        },
      },
    ];
  },
 }).register('setListColorPopup');
+
+BlazeComponent.extendComponent({
+  applyListWidth() {
+    const list = Template.currentData();
+    const board = list.boardId;
+    const width = parseInt(
+      Template.instance()
+        .$('.list-width-value')
+        .val(),
+      10,
+    );
+
+    // FIXME(mark-i-m): where do we put constants?
+    if (width < 100 || !width) {
+      Template.instance()
+        .$('.list-width-error')
+        .click();
+    } else {
+      Meteor.call('applyListWidth', board, list._id, width);
+      Popup.back();
+    }
+  },
+
+  listWidthValue() {
+    const list = Template.currentData();
+    const board = list.boardId;
+    return Meteor.user().getListWidth(board, list._id);
+  },
+
+  events() {
+    return [
+      {
+        'click .list-width-apply': this.applyListWidth,
+        'click .list-width-error': Popup.open('listWidthError'),
+      },
+    ];
+  },
+}).register('setListWidthPopup');
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { CardSearchPagedComponent } from '../../lib/cardSearch';
 import {
  OPERATOR_HAS,
@@ -66,7 +67,7 @@ class DueCardsComponent extends CardSearchPagedComponent {
    });

    if (Utils.dueCardsView() !== 'all') {
-      queryParams.addPredicate(OPERATOR_USER, Meteor.user().username);
+      queryParams.addPredicate(OPERATOR_USER, ReactiveCache.getCurrentUser().username);
    }

    this.runGlobalSearch(queryParams);
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 const specialHandles = [
  {userId: 'board_members', username: 'board_members'},
  {userId: 'card_members', username: 'card_members'}
@@ -13,13 +15,13 @@ BlazeComponent.extendComponent({
      {
        match: /\B@([\w.-]*)$/,
        search(term, callback) {
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          const currentBoard = Utils.getCurrentBoard();
          callback(
            _.union(
            currentBoard
              .activeMembers()
              .map(member => {
-                const user = Users.findOne(member.userId);
+                const user = ReactiveCache.getUser(member.userId);
                const username = user.username;
                const fullName = user.profile && user.profile !== undefined && user.profile.fullname ? user.profile.fullname : "";
                return username.includes(term) || fullName.includes(term) ? user : null;
@@ -328,13 +330,13 @@ Blaze.Template.registerHelper(
  new Template('mentions', function() {
    const view = this;
    let content = Blaze.toHTML(view.templateContentBlock);
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    if (!currentBoard)
      return HTML.Raw(
        DOMPurify.sanitize(content, { ALLOW_UNKNOWN_PROTOCOLS: true }),
      );
    const knowedUsers = _.union(currentBoard.members.map(member => {
-      const u = Users.findOne(member.userId);
+      const u = ReactiveCache.getUser(member.userId);
      if (u) {
        member.username = u.username;
      }
@@ -394,6 +396,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)
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 Meteor.subscribe('user-admin');
 Meteor.subscribe('boards');
 Meteor.subscribe('setting');
@@ -9,7 +11,7 @@ Template.header.onCreated(function(){

  Meteor.subscribe('setting', {
    onReady() {
-      templateInstance.currentSetting.set(Settings.findOne());
+      templateInstance.currentSetting.set(ReactiveCache.getCurrentSetting());
      let currSetting = templateInstance.currentSetting.curValue;
      if(currSetting && currSetting !== undefined && currSetting.customLoginLogoImageUrl !== undefined && document.getElementById("headerIsSettingDatabaseCallDone") != null)
        document.getElementById("headerIsSettingDatabaseCallDone").style.display = 'none';
@@ -24,10 +26,6 @@ Template.header.helpers({
    return !Session.get('currentBoard');
  },

-  currentSetting() {
-    return Settings.findOne();
-  },
-
  hideLogo() {
    return Utils.isMiniScreen() && Session.get('currentBoard');
  },
@@ -57,6 +55,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;
@@ -601,14 +559,14 @@ a:not(.disabled).is-active i.fa {
  top: 45px;
  left: 10px;
 }
-#isSettingDatabaseCallDone {
-  display: none;
-}
 .at-link {
  color: #17683a;
  text-decoration: underline;
  text-decoration-color: #17683a;
 }
+.at-pwd-form, .at-sep, .at-oauth {
+  display: none;
+}
@-moz-keyframes fadeIn {
  from {
    opacity: 0;
@@ -10,12 +10,13 @@ head
  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="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
@@ -33,10 +34,9 @@ template(name="userFormsLayout")
        unless currentSetting.customLoginLogoLinkUrl
          img(src="{{currentSetting.customLoginLogoImageUrl}}" width="300" height="auto")
          br
-      unless currentSetting.customLoginLogoImageUrl
-        div#isSettingDatabaseCallDone
-          img(src="{{pathFor '/wekan-logo.svg'}}" alt="" width="300" height="auto")
-          br
+      else
+        img(src="{{pathFor '/wekan-logo.svg'}}" alt="" width="300" height="auto")
+        br
      if currentSetting.textBelowCustomLoginLogo
        +viewer
          | {{currentSetting.textBelowCustomLoginLogo}}
@@ -1,10 +1,11 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';

 BlazeLayout.setRoot('body');

 let alreadyCheck = 1;
 let isCheckDone = false;
-
+let counter = 0;
 const validator = {
  set(obj, prop, value) {
    if (prop === 'state' && value !== 'signIn') {
@@ -19,84 +20,92 @@ 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);

-  Meteor.subscribe('setting', {
-    onReady() {
-      templateInstance.currentSetting.set(Settings.findOne());
-      let currSetting = templateInstance.currentSetting.curValue;
-      let oidcBtnElt = $("#at-oidc");
-      if(currSetting && currSetting !== undefined && currSetting.oidcBtnText !== undefined && oidcBtnElt != null && oidcBtnElt != undefined){
-        let htmlvalue = "<i class='fa fa-oidc'></i>" + currSetting.oidcBtnText;
-        oidcBtnElt.html(htmlvalue);
+  if (!ReactiveCache.getCurrentUser()?.profile) {
+    Meteor.call('isOidcRedirectionEnabled', (_, result) => {
+      if (result) {
+        AccountsTemplates.options.socialLoginStyle = 'redirect';
+        options = {
+          loginStyle: AccountsTemplates.options.socialLoginStyle,
+        };
+        Meteor.loginWithOidc(options);
      }
+    });

-      // isSettingDatabaseFctCallDone = true;
-      if(currSetting && currSetting !== undefined && currSetting.customLoginLogoImageUrl !== undefined)
-        document.getElementById("isSettingDatabaseCallDone").style.display = 'none';
-      else
-        document.getElementById("isSettingDatabaseCallDone").style.display = 'block';
-      return this.stop();
-    },
-  });
-  Meteor.call('isPasswordLoginDisabled', (_, result) => {
-    if (result) {
-      $('.at-pwd-form').hide();
-    }
-  });
-
-  Meteor.call('isDisableRegistration', (_, result) => {
-    if (result) {
-      $('.at-signup-link').hide();
-    }
-  });
-
-  Meteor.call('isDisableForgotPassword', (_, result) => {
-    if (result) {
-      $('.at-pwd-link').hide();
-    }
-  });
-
+    Meteor.subscribe('setting', {
+      onReady() {
+        templateInstance.currentSetting.set(ReactiveCache.getCurrentSetting());
+        return this.stop();
+      },
+    });
+  }
 });

 Template.userFormsLayout.onRendered(() => {
-  AccountsTemplates.state.form.keys = new Proxy(
-    AccountsTemplates.state.form.keys,
-    validator,
-  );
-  EscapeActions.executeAll();
+  Meteor.call('getAuthenticationsEnabled', (_, result) => {
+    let enabledAuthenticationMethods = [ 'password' ]; // we show/hide this based on isPasswordLoginEnabled
+
+    if (result) {
+      Object.keys(result).forEach((m) => {
+        if (result[m]) enabledAuthenticationMethods.push(m);
+      });
+    }
+
+    Meteor.call('isPasswordLoginEnabled', (_, result) => {
+      if (result) {
+        $('.at-pwd-form').show();
+      }
+    });
+
+    Meteor.call('isDisableRegistration', (_, result) => {
+      if (result) {
+        $('.at-signup-link').hide();
+      }
+    });
+
+    Meteor.call('isDisableForgotPassword', (_, result) => {
+      if (result) {
+        $('.at-pwd-link').hide();
+      }
+    });
+
+    if (enabledAuthenticationMethods.indexOf('oauth2') !== -1) {
+      // TODO find better way to run this code once the oauth2 UI is injected in the DOM
+      (function waitForElementAndShow() {
+        if (!$('.at-oauth')[0]) return setTimeout(waitForElementAndShow, 100);
+        $('.at-oauth').show();
+      })();
+    }
+
+    AccountsTemplates.state.form.keys = new Proxy(
+      AccountsTemplates.state.form.keys,
+      validator,
+    );
+    EscapeActions.executeAll();
+  });
 });

 Template.userFormsLayout.helpers({
-  currentSetting() {
-    return Template.instance().currentSetting.get();
-  },
-
-  // isSettingDatabaseCallDone(){
-  //   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 +156,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){
-      let currSetting = Settings.findOne();
+  'DOMSubtreeModified #at-oidc'(event) {
+    if (alreadyCheck <= 2) {
+      let currSetting = ReactiveCache.getCurrentSetting();
      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){
-        let currSetting = Settings.findOne();
+  'DOMSubtreeModified .at-form'(event) {
+    if (alreadyCheck <= 2 && !isCheckDone) {
+      if (document.getElementById("at-oidc") != null) {
+        let currSetting = ReactiveCache.getCurrentSetting();
        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 +198,7 @@ Template.userFormsLayout.events({
        }
      }
    }
-    else{
+    else {
      alreadyCheck = 1;
    }
  },
@@ -221,7 +230,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 +242,7 @@ async function authentication(event, templateInstance) {
          {
            provider,
          },
-          function() {
+          function () {
            resolve(FlowRouter.go('/'));
          },
        );
@@ -241,7 +250,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 +276,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;
@@ -88,7 +88,7 @@
  height: 20px;
 }
 .pop-over .quiet {
-  padding: 6px 6px 4px;
+/*  padding: 6px 6px 4px;*/
 }
 .pop-over.search-over {
  background: #f0f0f0;
@@ -152,6 +152,14 @@
  text-decoration: none;
  overflow: hidden;
  line-height: 33px;
+  display:flex;
+/*  flex-wrap:wrap;*/
+  gap:5px;
+  align-items: center;
+}
+.pop-over-list li > a > .member{
+  align-self: flex-start;
+  flex:0 0 auto;
 }
 .pop-over-list li > a .item-name {
  display: block;
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 Template.notification.events({
  'click .read-status .materialCheckBox'() {
    const update = {};
@@ -7,22 +9,22 @@ Template.notification.events({
    Users.update(Meteor.userId(), { $set: update });
  },
  'click .remove a'() {
-    Meteor.user().removeNotification(this.activityData._id);
+    ReactiveCache.getCurrentUser().removeNotification(this.activityData._id);
  },
 });

 Template.notification.helpers({
  mode: 'board',
  isOfActivityType(activityId, type) {
-    const activity = Activities.findOne(activityId);
+    const activity = ReactiveCache.getActivity(activityId);
    return activity && activity.activityType === type;
  },
  activityType(activityId) {
-    const activity = Activities.findOne(activityId);
+    const activity = ReactiveCache.getActivity(activityId);
    return activity ? activity.activityType : '';
  },
  activityUser(activityId) {
-    const activity = Activities.findOne(activityId);
+    const activity = ReactiveCache.getActivity(activityId);
    return activity && activity.userId;
  },
 });
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 // this hides the notifications drawer if anyone clicks off of the panel
 Template.body.events({
  click(event) {
@@ -12,7 +14,7 @@ Template.body.events({

 Template.notifications.helpers({
  unreadNotifications() {
-    const notifications = Users.findOne(Meteor.userId()).notifications();
+    const notifications = ReactiveCache.getCurrentUser().notifications();
    const unreadNotifications = _.filter(notifications, v => !v.read);
    return unreadNotifications.length;
  },
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { toggleNotificationsDrawer } from './notifications.js';

 Template.notificationsDrawer.onCreated(function() {
@@ -14,11 +15,11 @@ Template.notificationsDrawer.onCreated(function() {

 Template.notificationsDrawer.helpers({
  transformedProfile() {
-    return Users.findOne(Meteor.userId());
+    return ReactiveCache.getCurrentUser();
  },
  readNotifications() {
    const readNotifications = _.filter(
-      Meteor.user().profile.notifications,
+      ReactiveCache.getCurrentUser().profile.notifications,
      v => !!v.read,
    );
    return readNotifications.length;
@@ -27,7 +28,7 @@ Template.notificationsDrawer.helpers({

 Template.notificationsDrawer.events({
  'click .all-read'() {
-    const notifications = Meteor.user().profile.notifications;
+    const notifications = ReactiveCache.getCurrentUser().profile.notifications;
    for (const index in notifications) {
      if (notifications.hasOwnProperty(index) && !notifications[index].read) {
        const update = {};
@@ -43,7 +44,7 @@ Template.notificationsDrawer.events({
    Session.set('showReadNotifications', !Session.get('showReadNotifications'));
  },
  'click .remove-read'() {
-    const user = Meteor.user();
+    const user = ReactiveCache.getCurrentUser();
    for (const notification of user.profile.notifications) {
      if (notification.read) {
        user.removeNotification(notification.activity);
@@ -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



@@ -1,20 +1,22 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 BlazeComponent.extendComponent({
  onCreated() {},

  boards() {
-    const boards = Boards.find(
+    const ret = ReactiveCache.getBoards(
      {
        archived: false,
        'members.userId': Meteor.userId(),
        _id: {
-          $ne: Meteor.user().getTemplatesBoardId(),
+          $ne: ReactiveCache.getCurrentUser().getTemplatesBoardId(),
        },
      },
      {
        sort: { sort: 1 /* boards default sorting */ },
      },
    );
-    return boards;
+    return ret;
  },

  events() {
@@ -178,6 +180,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,
+          });
+        },
      },
    ];
  },
@@ -18,7 +18,7 @@ BlazeComponent.extendComponent({
  },

  labels() {
-    const labels = Boards.findOne(Session.get('currentBoard')).labels;
+    const labels = Utils.getCurrentBoard().labels;
    for (let i = 0; i < labels.length; i++) {
      if (labels[i].name === '' || labels[i].name === undefined) {
        labels[i].name = labels[i].color.toUpperCase();
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 BlazeComponent.extendComponent({
  onCreated() {
    this.subscribe('allRules');
@@ -7,24 +9,16 @@ BlazeComponent.extendComponent({

  trigger() {
    const ruleId = this.data().ruleId;
-    const rule = Rules.findOne({
-      _id: ruleId.get(),
-    });
-    const trigger = Triggers.findOne({
-      _id: rule.triggerId,
-    });
+    const rule = ReactiveCache.getRule(ruleId.get());
+    const trigger = ReactiveCache.getTrigger(rule.triggerId);
    const desc = trigger.description();
    const upperdesc = desc.charAt(0).toUpperCase() + desc.substr(1);
    return upperdesc;
  },
  action() {
    const ruleId = this.data().ruleId;
-    const rule = Rules.findOne({
-      _id: ruleId.get(),
-    });
-    const action = Actions.findOne({
-      _id: rule.actionId,
-    });
+    const rule = ReactiveCache.getRule(ruleId.get());
+    const action = ReactiveCache.getAction(rule.actionId);
    const desc = action.description();
    const upperdesc = desc.charAt(0).toUpperCase() + desc.substr(1);
    return upperdesc;
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 BlazeComponent.extendComponent({
  onCreated() {
    this.currentActions = new ReactiveVar('board');
@@ -33,7 +35,8 @@ BlazeComponent.extendComponent({
  },

  rules() {
-    return Rules.find({});
+    const ret = ReactiveCache.getRules({});
+    return ret;
  },

  name() {
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 BlazeComponent.extendComponent({
  onCreated() {
    this.subscribe('allRules');
@@ -5,9 +7,10 @@ BlazeComponent.extendComponent({

  rules() {
    const boardId = Session.get('currentBoard');
-    return Rules.find({
+    const ret = ReactiveCache.getRules({
      boardId,
    });
+    return ret;
  },
  events() {
    return [{}];
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 BlazeComponent.extendComponent({
  onCreated() {
    this.rulesCurrentTab = new ReactiveVar('rulesList');
@@ -55,7 +57,7 @@ BlazeComponent.extendComponent({
          let trigger = this.triggerVar.get();
          trigger.userId = '*';
          if (username !== undefined) {
-            const userFound = Users.findOne({ username });
+            const userFound = ReactiveCache.getUser({ username });
            if (userFound !== undefined) {
              trigger.userId = userFound._id;
              this.triggerVar.set(trigger);
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 BlazeComponent.extendComponent({
  onCreated() {
    this.showBoardTrigger = new ReactiveVar(true);
@@ -31,7 +33,8 @@ BlazeComponent.extendComponent({
  },

  rules() {
-    return Rules.find({});
+    const ret = ReactiveCache.getRules({});
+    return ret;
  },

  name() {
@@ -5,7 +5,7 @@ BlazeComponent.extendComponent({
    this.subscribe('allRules');
  },
  labels() {
-    const labels = Boards.findOne(Session.get('currentBoard')).labels;
+    const labels = Utils.getCurrentBoard().labels;
    for (let i = 0; i < labels.length; i++) {
      if (labels[i].name === '' || labels[i].name === undefined) {
        labels[i].name = labels[i].color;
@@ -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 }}
@@ -1,9 +1,11 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
 import { AttachmentStorage } from '/models/attachments';
 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,11 +116,15 @@ class AdminReport extends BlazeComponent {
  }

  fileSize(size) {
-    return Math.round(size / 1024);
+    let ret = "";
+    if (_.isNumber(size)) {
+      ret = filesize(size);
+    }
+    return ret;
  }

  abbreviate(text) {
-    if (text.length > 30) {
+    if (text?.length > 30) {
      return `${text.substr(0, 29)}...`;
    }
    return text;
@@ -135,7 +141,7 @@ class AdminReport extends BlazeComponent {
  results() {
    const rules = [];

-    Rules.find().forEach(rule => {
+    ReactiveCache.getRules().forEach(rule => {
      rules.push({
        _id: rule._id,
        title: rule.title,
@@ -156,17 +162,13 @@ class AdminReport extends BlazeComponent {
  collection = Boards;

  userNames(members) {
-    let text = '';
-    members.forEach(member => {
-      const user = Users.findOne(member.userId);
-      text += text ? ', ' : '';
-      if (user) {
-        text += user.username;
-      } else {
-        text += member.userId
-      }
-    });
-    return text;
+    const ret = (members || [])
+      .map(_member => {
+        const _ret = ReactiveCache.getUser(_member.userId)?.username || _member.userId;
+        return _ret;
+      })
+      .join(", ");
+    return ret;
  }
 }.register('boardsReport'));

@@ -174,13 +176,13 @@ class AdminReport extends BlazeComponent {
  collection = Cards;

  userNames(userIds) {
-    let text = '';
-    userIds.forEach(userId => {
-      const user = Users.findOne(userId);
-      text += text ? ', ' : '';
-      text += user.username;
-    });
-    return text;
+    const ret = (userIds || [])
+      .map(_userId => {
+        const _ret = ReactiveCache.getUser(_userId)?.username;
+        return _ret;
+      })
+      .join(", ");
+    return ret
  }
 }.register('cardsReport'));

@@ -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,8 +56,9 @@ template(name="moveBoardAttachments")
        th {{_ 'name'}}
        th {{_ 'path'}}
        th {{_ 'version-name'}}
-        th {{_ 'size'}} (B)
+        th {{_ 'size'}}
        th GridFsFileId
+        th S3FileId
        th {{_ 'storage'}}
        th {{_ 'action'}}

@@ -68,8 +73,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 +88,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,6 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import Attachments, { fileStoreStrategyFactory } from '/models/attachments';
+const filesize = require('filesize');

 BlazeComponent.extendComponent({
  subscription: null,
@@ -43,7 +45,7 @@ BlazeComponent.extendComponent({

 BlazeComponent.extendComponent({
  getBoardsWithAttachments() {
-    this.attachments = Attachments.find().get();
+    this.attachments = ReactiveCache.getAttachments();
    this.attachmentsByBoardId = _.chain(this.attachments)
      .groupBy(fileObj => fileObj.meta.boardId)
      .value();
@@ -60,14 +62,14 @@ BlazeComponent.extendComponent({
              return _version;
            });
        });
-        const board = Boards.findOne(boardId);
+        const board = ReactiveCache.getBoard(boardId);
        board.attachments = boardAttachments;
        return board;
      })
    return ret;
  },
  getBoardData(boardid) {
-    const ret = Boards.findOne(boardId);
+    const ret = ReactiveCache.getBoard(boardId);
    return ret;
  },
  events() {
@@ -83,6 +85,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 +109,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 +133,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");
+        },
      }
    ]
  },
@@ -3,23 +3,21 @@ Template.connectionMethod.onCreated(function() {

  Meteor.call('getAuthenticationsEnabled', (_, result) => {
    if (result) {
+      // Only enabled auth methods without OAuth2/OpenID which is a separate button
+      const tmp = Object.keys(result).filter((k) => result[k]).filter((k) => k !== 'oauth2');
+
      // TODO : add a management of different languages
      // (ex {value: ldap, text: TAPi18n.__('ldap', {}, T9n.getLanguage() || 'en')})
-      this.authenticationMethods.set([
-        { value: 'password' },
-        // Gets only the authentication methods availables
-        ...Object.entries(result)
-          .filter(e => e[1])
-          .map(e => ({ value: e[0] })),
-      ]);
+      this.authenticationMethods.set([{ value: 'password' }].concat(tmp.map((k) => { return { value: k }; })));
    }

    // If only the default authentication available, hides the select boxe
    const content = $('.at-form-authentication');
-    if (!(this.authenticationMethods.get().length > 1)) {
-      content.hide();
-    } else {
+
+    if (this.authenticationMethods.get().length > 1) {
      content.show();
+    } else {
+      content.hide();
    }
  });
 });
@@ -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,11 @@ BlazeComponent.extendComponent({
    return parseFloat(number).toFixed(2);
  },

-  bytesToSize(bytes) {
-    const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
-    if (bytes === 0) {
-      return '0 Byte';
+  fileSize(size) {
+    let ret = "";
+    if (_.isNumber(size)) {
+      ret = filesize(size);
    }
-    const i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)), 10);
-    return `${Math.round(bytes / Math.pow(1024, i), 2)}  ${sizes[i]}`;
+    return ret;
  },
 }).register('statistics');
@@ -1,7 +1,9 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 Template.invitationCode.onRendered(function() {
  Meteor.subscribe('setting', {
    onReady() {
-      const setting = Settings.findOne();
+      const setting = ReactiveCache.getCurrentSetting();

      if (!setting || !setting.disableRegistration) {
        $('#invitationcode').hide();
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 const orgsPerPage = 25;
 const teamsPerPage = 25;
 const usersPerPage = 25;
@@ -143,27 +145,27 @@ BlazeComponent.extendComponent({
    this.loading.set(w);
  },
  orgList() {
-    const orgs = Org.find(this.findOrgsOptions.get(), {
+    const orgs = ReactiveCache.getOrgs(this.findOrgsOptions.get(), {
      sort: { orgDisplayName: 1 },
      fields: { _id: true },
    });
-    this.numberOrgs.set(orgs.count(false));
+    this.numberOrgs.set(orgs.length);
    return orgs;
  },
  teamList() {
-    const teams = Team.find(this.findTeamsOptions.get(), {
+    const teams = ReactiveCache.getTeams(this.findTeamsOptions.get(), {
      sort: { teamDisplayName: 1 },
      fields: { _id: true },
    });
-    this.numberTeams.set(teams.count(false));
+    this.numberTeams.set(teams.length);
    return teams;
  },
  peopleList() {
-    const users = Users.find(this.findUsersOptions.get(), {
+    const users = ReactiveCache.getUsers(this.findUsersOptions.get(), {
      sort: { username: 1 },
      fields: { _id: true },
    });
-    this.numberPeople.set(users.count(false));
+    this.numberPeople.set(users.length);
    return users;
  },
  orgNumber() {
@@ -190,22 +192,19 @@ BlazeComponent.extendComponent({

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

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

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

@@ -230,7 +229,7 @@ Template.editUserPopup.onCreated(function () {

 Template.editOrgPopup.helpers({
  org() {
-    return Org.findOne(this.orgId);
+    return ReactiveCache.getOrg(this.orgId);
  },
  errorMessage() {
    return Template.instance().errorMessage.get();
@@ -239,7 +238,7 @@ Template.editOrgPopup.helpers({

 Template.editTeamPopup.helpers({
  team() {
-    return Team.findOne(this.teamId);
+    return ReactiveCache.getTeam(this.teamId);
  },
  errorMessage() {
    return Template.instance().errorMessage.get();
@@ -248,25 +247,27 @@ Template.editTeamPopup.helpers({

 Template.editUserPopup.helpers({
  user() {
-    return Users.findOne(this.userId);
+    return ReactiveCache.getUser(this.userId);
  },
  authentications() {
    return Template.instance().authenticationMethods.get();
  },
  orgsDatas() {
-    return Org.find({}, {sort: { orgDisplayName: 1 }});
+    const ret = ReactiveCache.getOrgs({}, {sort: { orgDisplayName: 1 }});
+    return ret;
  },
  teamsDatas() {
-    return Team.find({}, {sort: { teamDisplayName: 1 }});
+    const ret = ReactiveCache.getTeams({}, {sort: { teamDisplayName: 1 }});
+    return ret;
  },
  isSelected(match) {
    const userId = Template.instance().data.userId;
-    const selected = Users.findOne(userId).authenticationMethod;
+    const selected = ReactiveCache.getUser(userId).authenticationMethod;
    return selected === match;
  },
  isLdap() {
    const userId = Template.instance().data.userId;
-    const selected = Users.findOne(userId).authenticationMethod;
+    const selected = ReactiveCache.getUser(userId).authenticationMethod;
    return selected === 'ldap';
  },
  errorMessage() {
@@ -303,7 +304,7 @@ Template.newUserPopup.onCreated(function () {

 Template.newOrgPopup.helpers({
  org() {
-    return Org.findOne(this.orgId);
+    return ReactiveCache.getOrg(this.orgId);
  },
  errorMessage() {
    return Template.instance().errorMessage.get();
@@ -312,7 +313,7 @@ Template.newOrgPopup.helpers({

 Template.newTeamPopup.helpers({
  team() {
-    return Team.findOne(this.teamId);
+    return ReactiveCache.getTeam(this.teamId);
  },
  errorMessage() {
    return Template.instance().errorMessage.get();
@@ -321,21 +322,23 @@ Template.newTeamPopup.helpers({

 Template.newUserPopup.helpers({
  user() {
-    return Users.findOne(this.userId);
+    return ReactiveCache.getUser(this.userId);
  },
  authentications() {
    return Template.instance().authenticationMethods.get();
  },
  orgsDatas() {
-    return Org.find({}, {sort: { orgDisplayName: 1 }});
+    const ret = ReactiveCache.getOrgs({}, {sort: { orgDisplayName: 1 }});
+    return ret;
  },
  teamsDatas() {
-    return Team.find({}, {sort: { teamDisplayName: 1 }});
+    const ret = ReactiveCache.getTeams({}, {sort: { teamDisplayName: 1 }});
+    return ret;
  },
  isSelected(match) {
    const userId = Template.instance().data.userId;
    if(userId){
-      const selected = Users.findOne(userId).authenticationMethod;
+      const selected = ReactiveCache.getUser(userId).authenticationMethod;
      return selected === match;
    }
    else{
@@ -344,7 +347,7 @@ Template.newUserPopup.helpers({
  },
  isLdap() {
    const userId = Template.instance().data.userId;
-    const selected = Users.findOne(userId).authenticationMethod;
+    const selected = ReactiveCache.getUser(userId).authenticationMethod;
    return selected === 'ldap';
  },
  errorMessage() {
@@ -355,7 +358,7 @@ Template.newUserPopup.helpers({
 BlazeComponent.extendComponent({
  onCreated() {},
  org() {
-    return Org.findOne(this.orgId);
+    return ReactiveCache.getOrg(this.orgId);
  },
  events() {
    return [
@@ -370,7 +373,7 @@ BlazeComponent.extendComponent({
 BlazeComponent.extendComponent({
  onCreated() {},
  team() {
-    return Team.findOne(this.teamId);
+    return ReactiveCache.getTeam(this.teamId);
  },
  events() {
    return [
@@ -385,7 +388,7 @@ BlazeComponent.extendComponent({
 BlazeComponent.extendComponent({
  onCreated() {},
  user() {
-    return Users.findOne(this.userId);
+    return ReactiveCache.getUser(this.userId);
  },
  events() {
    return [
@@ -420,7 +423,8 @@ BlazeComponent.extendComponent({
 BlazeComponent.extendComponent({
  onCreated() {},
  teamsDatas() {
-    return Team.find({}, {sort: { teamDisplayName: 1 }});
+    const ret = ReactiveCache.getTeams({}, {sort: { teamDisplayName: 1 }});
+    return ret;
  },
  events() {
    return [
@@ -443,7 +447,7 @@ BlazeComponent.extendComponent({

          if(document.getElementById('addAction').checked){
            for(let i = 0; i < selectedUserChkBoxUserIds.length; i++){
-              currentUser = Users.findOne(selectedUserChkBoxUserIds[i]);
+              currentUser = ReactiveCache.getUser(selectedUserChkBoxUserIds[i]);
              userTms = currentUser.teams;
              if(userTms == undefined || userTms.length == 0){
                userTms = [];
@@ -472,7 +476,7 @@ BlazeComponent.extendComponent({
          }
          else{
            for(let i = 0; i < selectedUserChkBoxUserIds.length; i++){
-              currentUser = Users.findOne(selectedUserChkBoxUserIds[i]);
+              currentUser = ReactiveCache.getUser(selectedUserChkBoxUserIds[i]);
              userTms = currentUser.teams;
              if(userTms !== undefined || userTms.length > 0)
              {
@@ -565,7 +569,7 @@ BlazeComponent.extendComponent({
 Template.editOrgPopup.events({
  submit(event, templateInstance) {
    event.preventDefault();
-    const org = Org.findOne(this.orgId);
+    const org = ReactiveCache.getOrg(this.orgId);

    const orgDisplayName = templateInstance
      .find('.js-orgDisplayName')
@@ -606,7 +610,7 @@ Template.editOrgPopup.events({
 Template.editTeamPopup.events({
  submit(event, templateInstance) {
    event.preventDefault();
-    const team = Team.findOne(this.teamId);
+    const team = ReactiveCache.getTeam(this.teamId);

    const teamDisplayName = templateInstance
      .find('.js-teamDisplayName')
@@ -650,7 +654,7 @@ Template.editTeamPopup.events({
 Template.editUserPopup.events({
  submit(event, templateInstance) {
    event.preventDefault();
-    const user = Users.findOne(this.userId);
+    const user = ReactiveCache.getUser(this.userId);
    const username = templateInstance.find('.js-profile-username').value.trim();
    const fullname = templateInstance.find('.js-profile-fullname').value.trim();
    const initials = templateInstance.find('.js-profile-initials').value.trim();
@@ -1074,7 +1078,7 @@ Template.newUserPopup.events({
 Template.settingsOrgPopup.events({
  'click #deleteButton'(event) {
    event.preventDefault();
-    if(Users.find({"orgs.orgId": this.orgId}).count() > 0)
+    if (ReactiveCache.getUsers({"orgs.orgId": this.orgId}).length > 0)
    {
      let orgClassList = document.getElementById("deleteOrgWarningMessage").classList;
      if(orgClassList.contains('hide'))
@@ -1092,7 +1096,7 @@ Template.settingsOrgPopup.events({
 Template.settingsTeamPopup.events({
  'click #deleteButton'(event) {
    event.preventDefault();
-    if(Users.find({"teams.teamId": this.teamId}).count() > 0)
+    if (ReactiveCache.getUsers({"teams.teamId": this.teamId}).length > 0)
    {
      let teamClassList = document.getElementById("deleteTeamWarningMessage").classList;
      if(teamClassList.contains('hide'))
@@ -1142,19 +1146,19 @@ Template.settingsUserPopup.events({

 Template.settingsUserPopup.helpers({
  user() {
-    return Users.findOne(this.userId);
+    return ReactiveCache.getUser(this.userId);
  },
  authentications() {
    return Template.instance().authenticationMethods.get();
  },
  isSelected(match) {
    const userId = Template.instance().data.userId;
-    const selected = Users.findOne(userId).authenticationMethod;
+    const selected = ReactiveCache.getUser(userId).authenticationMethod;
    return selected === match;
  },
  isLdap() {
    const userId = Template.instance().data.userId;
-    const selected = Users.findOne(userId).authenticationMethod;
+    const selected = ReactiveCache.getUser(userId).authenticationMethod;
    return selected === 'ldap';
  },
  errorMessage() {
@@ -171,15 +171,15 @@ template(name='announcementSettings')
  ul#announcement-setting.setting-detail
    li
      a.flex.js-toggle-activemessage
-        .materialCheckBox(class="{{#if currentSetting.enabled}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if currentAnnouncements.enabled}}is-checked{{/if}}")

        span {{_ 'admin-announcement-active'}}
    li
-      .admin-announcement(class="{{#if currentSetting.enabled}}{{else}}hide{{/if}}")
+      .admin-announcement(class="{{#if currentAnnouncements.enabled}}{{else}}hide{{/if}}")
        ul
          li
            .title {{_ 'admin-announcement-title'}}
-            textarea#admin-announcement.wekan-form-control= currentSetting.body
+            textarea#admin-announcement.wekan-form-control= currentAnnouncements.body
          li
            button.js-announcement-save.primary {{_ 'save'}}

@@ -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'}}