Merge pull request #4571 from nextcloud/backport/4566/stable22

[stable22] Gracefully handle not found card for a share

.eslintrc.js

@@ -3,10 +3,6 @@ module.exports = {
 		'@nextcloud',
 	],
 	rules: {
-		'jsdoc/require-param-description': ['off'],
-		'jsdoc/require-param-type': ['off'],
-		'jsdoc/check-param-names': ['off'],
-		'jsdoc/no-undefined-types': ['off'],
-		'jsdoc/require-property-description' : ['off']
+		'valid-jsdoc': ['off'],
 	},
 }

.github/dependabot.yml

@@ -39,13 +39,3 @@ updates:
     versions:
     - "< 16"
     - ">= 15.a"
-- package-ecosystem: github-actions
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  open-pull-requests-limit: 10
-  reviewers:
-  - juliushaertl

.github/stale.yml

@@ -0,0 +1,25 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - "1. to develop"
+  - "2. developing"
+  - "3. to review"
+  - "discussion"
+  - "bounty"
+  - "bug"
+  - "enhancement"
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+# Label to use when marking an issue as stale
+staleLabel: stale
+
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.

.github/workflows/appbuild.yml

@@ -12,15 +12,15 @@ jobs:
         node-version: [14.x]
 
     steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v1
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2.4.1
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
     - name: Set up npm7
       run: npm i -g npm@7
     - name: Setup PHP
-      uses: shivammathur/setup-php@2.15.0
+      uses: shivammathur/setup-php@v1
       with:
         php-version: '7.4'
         tools: composer

.github/workflows/command-rebase.yml

@@ -1,46 +0,0 @@
-# This workflow is provided via the organization template repository
-#
-# https://github.com/nextcloud/.github
-# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
-
-name: Rebase command
-
-on:
-  issue_comment:
-    types: created
-
-jobs:
-  rebase:
-    runs-on: ubuntu-latest
-
-    # On pull requests and if the comment starts with `/rebase`
-    if: github.event.issue.pull_request != '' && startsWith(github.event.comment.body, '/rebase')
-
-    steps:
-      - name: Add reaction on start
-        uses: peter-evans/create-or-update-comment@v1
-        with:
-          token: ${{ secrets.COMMAND_BOT_PAT }}
-          repository: ${{ github.event.repository.full_name }}
-          comment-id: ${{ github.event.comment.id }}
-          reaction-type: "+1"
-
-      - name: Checkout the latest code
-        uses: actions/checkout@v2.4.0
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.COMMAND_BOT_PAT }}
-
-      - name: Automatic Rebase
-        uses: cirrus-actions/rebase@1.5
-        env:
-          GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}
-
-      - name: Add reaction on failure
-        uses: peter-evans/create-or-update-comment@v1
-        if: failure()
-        with:
-          token: ${{ secrets.COMMAND_BOT_PAT }}
-          repository: ${{ github.event.repository.full_name }}
-          comment-id: ${{ github.event.comment.id }}
-          reaction-type: "-1"

.github/workflows/dependabot-approve-merge.yml

@@ -1,29 +0,0 @@
-# This workflow is provided via the organization template repository
-#
-# https://github.com/nextcloud/.github
-# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
-
-name: Dependabot
-
-on:
-  pull_request_target:
-    branches:
-      - master
-      - stable*
-
-jobs:
-  auto-approve-merge:
-    if: github.actor == 'dependabot[bot]'
-    runs-on: ubuntu-latest
-
-    steps:
-      # Github actions bot approve
-      - uses: hmarr/auto-approve-action@v2
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      # Nextcloud bot approve and merge request
-      - uses: ahmadnassri/action-dependabot-auto-merge@v2
-        with:
-          target: patch
-          github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}

.github/workflows/fixup.yml

@@ -1,20 +0,0 @@
-# This workflow is provided via the organization template repository
-#
-# https://github.com/nextcloud/.github
-# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
-
-name: Pull request checks
-
-on: pull_request
-
-jobs:
-  commit-message-check:
-    name: Block fixup and squash commits
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Run check
-        uses: xt0rted/block-autosquash-commits-action@v2
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/integration.yml

@@ -19,13 +19,13 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['stable23']
+        server-versions: ['stable22']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
     services:
       postgres:
-        image: postgres:14
+        image: postgres
         ports:
           - 4445:5432/tcp
         env:
@@ -43,7 +43,7 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v2
         with:
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
@@ -56,12 +56,12 @@ jobs:
           git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
 
       - name: Checkout app
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v2
         with:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@2.15.0
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
           tools: phpunit

.github/workflows/lint.yml

@@ -17,9 +17,9 @@ jobs:
 
     name: php${{ matrix.php-versions }} lint
     steps:
-      - uses: actions/checkout@v2.4.0
+      - uses: actions/checkout@v2
       - name: Set up php${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@2.15.0
+        uses: shivammathur/setup-php@v1
         with:
           php-version: ${{ matrix.php-versions }}
           coverage: none
@@ -31,9 +31,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2.4.0
+      uses: actions/checkout@master
     - name: Set up php
-      uses: shivammathur/setup-php@2.15.0
+      uses: shivammathur/setup-php@master
       with:
         php-version: 7.4
         coverage: none
@@ -50,9 +50,9 @@ jobs:
         node-version: [14.x]
 
     steps:
-      - uses: actions/checkout@v2.4.0
+      - uses: actions/checkout@v2
       - name: Use node ${{ matrix.node-version }}
-        uses: actions/setup-node@v2.4.1
+        uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
       - name: Set up npm7
@@ -67,16 +67,16 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-versions: [14.x]
 
-    name: stylelint node${{ matrix.node-version }}
+    name: stylelint node${{ matrix.node-versions }}
     steps:
-      - uses: actions/checkout@v2.4.0
+      - uses: actions/checkout@v2
 
-      - name: Set up node ${{ matrix.node-version }}
-        uses: actions/setup-node@v2.4.1
+      - name: Set up node ${{ matrix.node-versions }}
+        uses: actions/setup-node@v1
         with:
-          node-version: ${{ matrix.node-version }}
+          node-versions: ${{ matrix.node-versions }}
 
       - name: Set up npm7
         run: npm i -g npm@7

.github/workflows/nightly.yml

@@ -17,15 +17,15 @@ jobs:
         node-version: [14.x]
 
     steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v1
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2.4.1
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
     - name: Set up npm7
       run: npm i -g npm@7
     - name: Setup PHP
-      uses: shivammathur/setup-php@2.15.0
+      uses: shivammathur/setup-php@v1
       with:
         php-version: '7.4'
         tools: composer

.github/workflows/nodejs.yml

@@ -12,9 +12,9 @@ jobs:
         node-version: [14.x]
 
     steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v1
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2.4.1
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
     - name: Set up npm7

.github/workflows/phpunit.yml

@@ -20,13 +20,13 @@ jobs:
       matrix:
         php-versions: ['7.3', '7.4']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['stable23']
+        server-versions: ['stable22']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
     services:
       postgres:
-        image: postgres:14
+        image: postgres
         ports:
           - 4445:5432/tcp
         env:
@@ -44,7 +44,7 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v2
         with:
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
@@ -57,12 +57,12 @@ jobs:
           git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
 
       - name: Checkout app
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v2
         with:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@2.15.0
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
           tools: phpunit

.github/workflows/psalm.yml

@@ -1,35 +0,0 @@
-# This workflow is provided via the organization template repository
-#
-# https://github.com/nextcloud/.github
-# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
-
-name: Static analysis
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - main
-      - stable*
-
-jobs:
-  static-analysis:
-    runs-on: ubuntu-latest
-
-    name: Nextcloud
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Set up php
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 7.4
-          coverage: none
-
-      - name: Install dependencies
-        run: composer i
-
-      - name: Run coding standards check
-        run: composer run psalm

.github/workflows/static-analysis.yml

@@ -0,0 +1,31 @@
+name: Static analysis
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - stable*
+
+jobs:
+  static-psalm-analysis:
+      runs-on: ubuntu-latest
+      strategy:
+          matrix:
+              ocp-version: [ 'dev-stable22' ]
+      name: Nextcloud ${{ matrix.ocp-version }}
+      steps:
+          - name: Checkout
+            uses: actions/checkout@master
+          - name: Set up php
+            uses: shivammathur/setup-php@master
+            with:
+                php-version: 7.4
+                tools: composer:v1
+                coverage: none
+          - name: Install dependencies
+            run: composer i
+          - name: Install dependencies
+            run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }}
+          - name: Run coding standards check
+            run: composer run psalm

.github/workflows/update-nextcloud-ocp.yml

@@ -1,65 +0,0 @@
-# This workflow is provided via the organization template repository
-#
-# https://github.com/nextcloud/.github
-# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
-
-name: Update nextcloud/ocp
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "5 2 * * 0"
-
-jobs:
-  update-nextcloud-ocp:
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        branches: ["master", "stable25", "stable24", "stable23"]
-
-    name: update-nextcloud-ocp-${{ matrix.branches }}
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ matrix.branches }}
-          submodules: true
-
-      - name: Set up php7.4
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 7.4
-          extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
-          coverage: none
-
-      - name: Composer install
-        run: composer install
-
-      - name: Composer update nextcloud/ocp
-        run: composer require --dev nextcloud/ocp:dev-${{ matrix.branches }}
-        continue-on-error: true
-
-      - name: Reset checkout dirs
-        run: |
-          git clean -f 3rdparty
-          git clean -f vendor
-          git checkout 3rdparty vendor
-        continue-on-error: true
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
-        with:
-          token: ${{ secrets.COMMAND_BOT_PAT }}
-          commit-message: Update psalm baseline
-          committer: GitHub <noreply@github.com>
-          author: nextcloud-command <nextcloud-command@users.noreply.github.com>
-          signoff: true
-          branch: automated/noid/${{ matrix.branches }}-update-nextcloud-ocp
-          title: "[${{ matrix.branches }}] Update nextcloud/ocp dependency"
-          body: |
-            Auto-generated update of [nextcloud/ocp](https://github.com/nextcloud-deps/ocp/) dependency
-          labels: |
-            dependencies
-            3. to review

.tx/config

@@ -1,6 +1,6 @@
 [main]
 host     = https://www.transifex.com
-lang_map = sk_SK: sk, th_TH: th, ja_JP: ja, bg_BG: bg, cs_CZ: cs, fi_FI: fi, hu_HU: hu, nb_NO: nb
+lang_map = bg_BG: bg, cs_CZ: cs, fi_FI: fi, hu_HU: hu, nb_NO: nb, sk_SK: sk, th_TH: th, ja_JP: ja
 
 [o:nextcloud:p:nextcloud:r:deck]
 file_filter = translationfiles/<lang>/deck.po

CHANGELOG.md

@@ -1,107 +1,124 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## 1.6.4
+## 1.5.8
 
 ### Fixed
-
-- Cache user membership for circles [#4133](https://github.com/nextcloud/deck/pull/4133)
-- Set event link also for notifications that get emitted from activities [#4119](https://github.com/nextcloud/deck/pull/4119)
-- disable Create card button while no stack is chosen [#4020](https://github.com/nextcloud/deck/pull/4020)
-- to nextcloud/OCP package in stable23 [#4094](https://github.com/nextcloud/deck/pull/4094)
-- Use capped memory cache for board permissions [#3998](https://github.com/nextcloud/deck/pull/3998)
-- Improve CalDAV integration performance [#3996](https://github.com/nextcloud/deck/pull/3996)
-- Fetch attachment folder for the correct user during cron job [#3960](https://github.com/nextcloud/deck/pull/3960)
-- Switch to 'markdown-it-task-checkbox' for rendering of task lists [#3926](https://github.com/nextcloud/deck/pull/3926)
-- Prevent opening card and applyLabelFilter on card drag end [#3918](https://github.com/nextcloud/deck/pull/3918)
-- Fix z-index for deck sidebar [#3886](https://github.com/nextcloud/deck/pull/3886)
+- Align Duedate-delete icon properly - fixes nextcloud/deck#3791 [#3817](https://github.com/nextcloud/deck/pull/3817)
+- Increase file count after sharing [#3806](https://github.com/nextcloud/deck/pull/3806)
+- Show cards after moving into another list [#3794](https://github.com/nextcloud/deck/pull/3794)
+- Fetch full board data after cloning [#3781](https://github.com/nextcloud/deck/pull/3781)
 
 
-## 1.6.3
-
-### Fixed
-
-- Align Duedate-delete icon properly - fixes nextcloud/deck#3791 [#3816](https://github.com/nextcloud/deck/pull/3816)
-- Increase file count after sharing [#3805](https://github.com/nextcloud/deck/pull/3805)
-- Show cards after moving into another list [#3795](https://github.com/nextcloud/deck/pull/3795)
-- Fetch full board data after cloning [#3780](https://github.com/nextcloud/deck/pull/3780)
-- Handle qb mapper exception messages properly [#3770](https://github.com/nextcloud/deck/pull/3770)
-
-## 1.6.2
+## 1.5.7
 
 ### Added
 
-- Transfer ownership @juliushaertl [#3664](https://github.com/nextcloud/deck/pull/3664)
+- Transfer ownership @juliushaertl [#3665](https://github.com/nextcloud/deck/pull/3665)
 
 ### Fixed
 
-- 🐛 Fix missing files sidebar [#3641](https://github.com/nextcloud/deck/pull/3641)
-- Add a missing translation - not found in transifex [#3706](https://github.com/nextcloud/deck/pull/3706)
-- Fix: Check all circle shares for permissions [#3717](https://github.com/nextcloud/deck/pull/3717)
-- Sort boards non case sensitive [#3663](https://github.com/nextcloud/deck/pull/3663)
-- Use explicit cast to make use of index @juliushaertl [#3497](https://github.com/nextcloud/deck/pull/3497)
-- Fix paramter replacements when creating deck cards from talk messages @juliushaertl [#3741](https://github.com/nextcloud/deck/pull/3741)
-- Fix hidden attachment icon on archived cards [#3734](https://github.com/nextcloud/deck/pull/3734)
-- Fix text selection in dark mode and modal view [#3766](https://github.com/nextcloud/deck/pull/3766)
+- Fix: Check all circle shares for permissions [#3721](https://github.com/nextcloud/deck/pull/3721)
+- Add a missing translation - not found in transifex [#3707](https://github.com/nextcloud/deck/pull/3707)
+- 🐛 Fix missing files sidebar [#3642](https://github.com/nextcloud/deck/pull/3642)
+- [stable23] Use explicit cast to make use of index [#3731](https://github.com/nextcloud/deck/pull/3731)
+- Fix hidden attachment icon on archived cards [#3735](https://github.com/nextcloud/deck/pull/3735)
+- [stable23] Sort boards non case sensitive [#3739](https://github.com/nextcloud/deck/pull/3739)
+- add autofocus on board edit #3326 @juliushaertl [#3743](https://github.com/nextcloud/deck/pull/3743)
+- Fix paramter replacements when creating deck cards from talk messages @juliushaertl [#3742](https://github.com/nextcloud/deck/pull/3742)
+- Fix text selection in dark mode and modal view [#3767](https://github.com/nextcloud/deck/pull/3767)
 
 ### Other
 
-- Properly check for the stack AND setting board permissions [#3713](https://github.com/nextcloud/deck/pull/3713)
-- Add missing indices [#3755](https://github.com/nextcloud/deck/pull/3755)
+- Properly check for the stack AND setting board permissions [#3714](https://github.com/nextcloud/deck/pull/3714)
+- Add missing indices [#3756](https://github.com/nextcloud/deck/pull/3756)
 
-## 1.6.1
+
+## 1.5.6
 
 ### Fixed
 
-- Exclude deleted boards in the selection for target [#3523](https://api.github.com/repos/nextcloud/deck/pulls/3523)
-- CardApiController: Fix order of optional parameters [#3520](https://api.github.com/repos/nextcloud/deck/pulls/3520)
-- Fix cursor generation if no results are found [#3462](https://api.github.com/repos/nextcloud/deck/pulls/3462)
-- Fix CalDAV blocking and modernize circles API usage [#3526](https://api.github.com/repos/nextcloud/deck/pulls/3526)
-- Fix overview card listing [#3463](https://api.github.com/repos/nextcloud/deck/pulls/3463)
-- Generate fixed link for activity emails [#3626](https://api.github.com/repos/nextcloud/deck/pulls/3626)
-- return the selector for collections [#3618](https://api.github.com/repos/nextcloud/deck/pulls/3618)
-- Fix confusion between stackId and boardId in StackService [#3543](https://api.github.com/repos/nextcloud/deck/pulls/3543)
-- Fix talk integration [#3537](https://api.github.com/repos/nextcloud/deck/pulls/3537)
-- Make insert attachment buttom easy to click [#3614](https://api.github.com/repos/nextcloud/deck/pulls/3614)
+- Allow to download an attachment without navigating to the files app [#3441](https://api.github.com/repos/nextcloud/deck/pulls/3441)
+- Fix CalDAV blocking and modernize circles API usage [#3527](https://api.github.com/repos/nextcloud/deck/pulls/3527)
+- CardApiController: Fix order of optional parameters [#3521](https://api.github.com/repos/nextcloud/deck/pulls/3521)
+- Fix cursor generation if no results are found [#3460](https://api.github.com/repos/nextcloud/deck/pulls/3460)
+- Exclude deleted boards in the selection for target [#3524](https://api.github.com/repos/nextcloud/deck/pulls/3524)
+- Generate fixed link for activity emails [#3627](https://api.github.com/repos/nextcloud/deck/pulls/3627)
+- Make insert attachment buttom easy to click [#3615](https://api.github.com/repos/nextcloud/deck/pulls/3615)
+- Fix confusion between stackId and boardId in StackService [#3544](https://api.github.com/repos/nextcloud/deck/pulls/3544)
 
-## 1.6.0
+## 1.5.5
+
+- Fix release asset build
+
+## 1.5.4
+
+### Fixed
+
+- #3378 Fix menu button position in card modal
+- #3392 Use displayname instead of uid for mentions (reopened against master)
+- #3361 Improve combined search @eneiluj
+- #3381 Extend drag-and-drop zone in card sidebar @Artem4590
+- #3366 Fix optional parameter order
+- #3407 Keep exceptions http response generic
+
+
+## 1.5.3
+
+### Fied
+
+- #3317 Additional check for stacks
+
+
+## 1.5.2
+
+### Fixed
+
+- #3300 Fix print style issues
+- #3303 Delete file shares through attachments API
+- #3306 Return false instead of throwing when getting calendar setting
+
+## 1.5.1 - 2021-09-03
+
+### Fixed
+
+- #3224 Move circle checks to a unified service and improve member checks
+- #3231 Check for null value to avoid TypeError in the group manager
+- #3264 Defer obtaining the user session in the config service
+
+
+## 1.5.0 - 2021-07-09
 
 ### Added
 
-- #3449 Cache most frequent queries
-- #3177 Use async import for vue component on collections entrypoint @juliushaertl
-- #2791 Open description links in new tab @fm-sys
-- #3344 Improve combined search @eneiluj
-- #3362 Improve search performance @eneiluj
-- #2710 Due date shortcuts in the datepicker @jakobroehrl
+* Nextcloud 22 compatibility
+* [#3105](https://github.com/nextcloud/deck/pull/3105) Compatibility with Cirlces changes in 22
+* [#3147](https://github.com/nextcloud/deck/pull/3147) Add card button to the dashboard widget @jakobroehrl
+* [#2854](https://github.com/nextcloud/deck/pull/2854) Add card button in card overview @jakobroehrl
+* [#3078](https://github.com/nextcloud/deck/pull/3078) Show on shared boards unassigned cards to all users @jakobroehrl
 
 ### Fixed
 
-- #3446 Switch to QBMapper in BoardMapper
-- #3433 Fix event name for updating the description
-- #3463 Fix overview card listing
-- #3440 Allow to download an attachment without navigating to the files app
-- #3462 Fix cursor generation if no results are found
-- #3161 Reduce duplicate queries when fetching user boards an permissions @juliushaertl
-- #3151 Always log generic exceptions @juliushaertl
-- #3217 Move circle checks to a unified service and improve member checks @juliushaertl
-- #3225 Check for null value to avoid TypeError in the group manager @juliushaertl
-- #3263 Defer obtaining the user session in the config service  @juliushaertl
-- #3294 Fix print style issues @weeman1337
-- #3299 Return false instead of throwing when getting calendar setting @juliushaertl
-- #3298 Delete file shares through attachments API @juliushaertl
-- #3343 Fix search pagination cursor @eneiluj
-- #3326 add autofocus on board edit @weeman1337
-- #3323 Extend drag-and-drop zone in card sidebar @old-green-frog
-- #3364 Fix optional parameter order @juliushaertl
-- #3324 Fix menu button position in card modal @valerydmitrieva
-- #3391 Use displayname instead of uid for mentions (reopened against master) @kffl
-- #3316 Additional check for stacks @juliushaertl
-- #3357 Revert "Fix search pagination cursor" @juliushaertl
-- #3327 Do not show both bullets and checkboxes for checklists @Themanwhosmellslikesugar
-- #3375 Show absolute dates when printing @weeman1337
-- #3376 Print assignee names @weeman1337
-- #3384 Keep exceptions http response generic @juliushaertl
+* [#2935](https://github.com/nextcloud/deck/pull/2935) Rich object string parameters for notifications @nickvergessen
+* [#2950](https://github.com/nextcloud/deck/pull/2950) Remove notification on unshare and add type hints
+* [#2983](https://github.com/nextcloud/deck/pull/2983) Fix codemirror description width
+* [#2989](https://github.com/nextcloud/deck/pull/2989) Fix unified comments search with postgres
+* [#3005](https://github.com/nextcloud/deck/pull/3005) Do not query the lookupserver when looking for sharees
+* [#3011](https://github.com/nextcloud/deck/pull/3011) L10n: Spelling unification @Valdnet
+* [#3014](https://github.com/nextcloud/deck/pull/3014) Proper error handling when fetching comments fails
+* [#3016](https://github.com/nextcloud/deck/pull/3016) Allow searching for filters without a query to match all that have a given filter set
+* [#3021](https://github.com/nextcloud/deck/pull/3021) L10n: Add word "Card" @Valdnet
+* [#3025](https://github.com/nextcloud/deck/pull/3025) Show comment counter and highlight if unread comments are available
+* [#3036](https://github.com/nextcloud/deck/pull/3036) Add link to migration tool for Trello @maxammann
+* [#3037](https://github.com/nextcloud/deck/pull/3037) Catch any error during circle detail fetching
+* [#3038](https://github.com/nextcloud/deck/pull/3038) Get attachment from the user node instead of the share source
+* [#3092](https://github.com/nextcloud/deck/pull/3092) Refactor update to have proper order of optional parameters
+* [#3113](https://github.com/nextcloud/deck/pull/3113) Use new viewer syntax with destructuring object @azul
+* [#3142](https://github.com/nextcloud/deck/pull/3142) Always pass user id in share provider
+* [#3152](https://github.com/nextcloud/deck/pull/3152) Only offer stack creation in emptycontent with proper permissions
+* [#3165](https://github.com/nextcloud/deck/pull/3165) Always log generic exceptions
+* [#3168](https://github.com/nextcloud/deck/pull/3168) Reduce duplicate queries when fetching user boards an permissions
+
 
 
 ## 1.4.0 - 2021-04-13
@@ -138,15 +155,15 @@ All notable changes to this project will be documented in this file.
 ## 1.3.0-beta2
 
 ### Fixed
-* [#2700](https://github.com/nextcloud/deck/pull/2700) Attempt to copy file on dropping it to deck @juliushaertl
-* [#2701](https://github.com/nextcloud/deck/pull/2701) Fix uploading files by drag and drop @juliushaertl
+* [#2700](https://github.com/nextcloud/deck/pull/2700) Attempt to copy file on dropping it to deck
+* [#2701](https://github.com/nextcloud/deck/pull/2701) Fix uploading files by drag and drop
 * [#2707](https://github.com/nextcloud/deck/pull/2707) L10n: Change to a capital letter @Valdnet
 * [#2712](https://github.com/nextcloud/deck/pull/2712) Docs: Fix table in section "GET /api/v1.0/config" @das-g
-* [#2716](https://github.com/nextcloud/deck/pull/2716) Remove repair step which is no longer needed as we cleanup properly @juliushaertl
+* [#2716](https://github.com/nextcloud/deck/pull/2716) Remove repair step which is no longer needed as we cleanup properly
 * [#2723](https://github.com/nextcloud/deck/pull/2723) Pad random color with leading zeroes @PVince81
 * [#2729](https://github.com/nextcloud/deck/pull/2729) Remove invalid activity parameters @nickvergessen
 * [#2750](https://github.com/nextcloud/deck/pull/2750) Fix deck activity emails not being translated @nickvergessen
-* [#2751](https://github.com/nextcloud/deck/pull/2751) Properly set author for activity events that are triggered by cron @juliushaertl
+* [#2751](https://github.com/nextcloud/deck/pull/2751) Properly set author for activity events that are triggered by cron
 
 
 ## 1.2.2 - 2020-11-24
@@ -255,31 +272,31 @@ All notable changes to this project will be documented in this file.
 ### Fixed
 
 
-* [#2116](https://github.com/nextcloud/deck/pull/2116) Fix navigation layout issues @juliushaertl
-* [#2118](https://github.com/nextcloud/deck/pull/2118) Use proper parameter when handling attachments @juliushaertl
+* [#2116](https://github.com/nextcloud/deck/pull/2116) Fix navigation layout issues
+* [#2118](https://github.com/nextcloud/deck/pull/2118) Use proper parameter when handling attachments
 
 ## 1.0.4 - 2020-06-26
 
 ### Fixed
 
-* [#2062](https://github.com/nextcloud/deck/pull/2062) Fix saving card description after toggling checkboxes @juliushaertl
+* [#2062](https://github.com/nextcloud/deck/pull/2062) Fix saving card description after toggling checkboxes
 * [#2065](https://github.com/nextcloud/deck/pull/2065) Adding CSS rule for Markdown Blockquotes @reox
-* [#2059](https://github.com/nextcloud/deck/pull/2059) Fix fetching attachments on card change @juliushaertl
-* [#2060](https://github.com/nextcloud/deck/pull/2060) Use mixing for relative date in card sidebar @juliushaertl
+* [#2059](https://github.com/nextcloud/deck/pull/2059) Fix fetching attachments on card change
+* [#2060](https://github.com/nextcloud/deck/pull/2060) Use mixing for relative date in card sidebar
 
 
 ## 1.0.3 - 2020-06-19
 
 ### Fixed
 
-* [#2019](https://github.com/nextcloud/deck/pull/2019) Remove old global css rule @juliushaertl
-* [#2020](https://github.com/nextcloud/deck/pull/2020) Fix navigation issue with leftover nodes @juliushaertl
-* [#2021](https://github.com/nextcloud/deck/pull/2021) Fix description issues @juliushaertl
-* [#2022](https://github.com/nextcloud/deck/pull/2022) Fix replyto issues with the comments API @juliushaertl
-* [#2027](https://github.com/nextcloud/deck/pull/2027) Allow to unassign current user from card @juliushaertl
+* [#2019](https://github.com/nextcloud/deck/pull/2019) Remove old global css rule
+* [#2020](https://github.com/nextcloud/deck/pull/2020) Fix navigation issue with leftover nodes
+* [#2021](https://github.com/nextcloud/deck/pull/2021) Fix description issues
+* [#2022](https://github.com/nextcloud/deck/pull/2022) Fix replyto issues with the comments API
+* [#2027](https://github.com/nextcloud/deck/pull/2027) Allow to unassign current user from card
 * [#2029](https://github.com/nextcloud/deck/pull/2029) Fix wording : stack -> list @cloud2018
-* [#2032](https://github.com/nextcloud/deck/pull/2032) Force order by id as second sorting key @juliushaertl
-* [#2045](https://github.com/nextcloud/deck/pull/2045) Improve label styling @juliushaertl
+* [#2032](https://github.com/nextcloud/deck/pull/2032) Force order by id as second sorting key
+* [#2045](https://github.com/nextcloud/deck/pull/2045) Improve label styling
 * [#2010](https://github.com/nextcloud/deck/pull/2010) User documentation fixes @Nyco
 * [#1998](https://github.com/nextcloud/deck/pull/1998) Add Checklist explaination to the doc @4rnoP
 

README.md

@@ -25,8 +25,7 @@ Deck is a kanban style organization tool aimed at personal planning and project
 
 - [trello-to-deck](https://github.com/maxammann/trello-to-deck) - Migrates cards from Trello
 - [mail2deck](https://github.com/newroco/mail2deck) - Provides an "email in" solution 
-- [A-deck](https://github.com/leoossa/A-deck) - Chrome Extension that allows to create new card in selected stack based on current tab
-- 
+
 ## Installation/Update
 
 This app is supposed to work on the two latest Nextcloud versions.

appinfo/info.xml

@@ -16,7 +16,7 @@
 - 🚀 Get your project organized
 
 </description>
-    <version>1.6.4</version>
+    <version>1.5.8</version>
     <licence>agpl</licence>
     <author>Julius Härtl</author>
     <namespace>Deck</namespace>
@@ -35,7 +35,7 @@
         <database min-version="9.4">pgsql</database>
         <database>sqlite</database>
         <database min-version="5.5">mysql</database>
-        <nextcloud min-version="23" max-version="23"/>
+        <nextcloud min-version="22" max-version="22"/>
     </dependencies>
     <background-jobs>
         <job>OCA\Deck\Cron\DeleteCron</job>

composer.json

@@ -8,22 +8,24 @@
 			"email": "jus@bitgrid.net"
 		}
 	],
+	"config": {
+		"platform": {
+			"php": "7.3"
+		}
+	},
 	"require": {
 		"cogpowered/finediff": "0.3.*"
 	},
 	"require-dev": {
 		"roave/security-advisories": "dev-master",
+		"christophwurst/nextcloud": "^22@dev",
 		"phpunit/phpunit": "^8",
 		"nextcloud/coding-standard": "^0.5.0",
 		"symfony/event-dispatcher": "^4.0",
 		"vimeo/psalm": "^4.3",
-		"php-parallel-lint/php-parallel-lint": "^1.2",
-		"nextcloud/ocp": "dev-stable23"
+		"php-parallel-lint/php-parallel-lint": "^1.2"
 	},
 	"config": {
-		"platform": {
-			"php": "7.3"
-		},
 		"optimize-autoloader": true,
 		"classmap-authoritative": true
 	},
@@ -39,10 +41,5 @@
 		],
 		"test:unit": "phpunit -c tests/phpunit.xml",
 		"test:integration": "phpunit -c tests/phpunit.integration.xml && cd tests/integration && ./run.sh"
-	},
-	"autoload-dev": {
-		"psr-4": {
-			"OCP\\": "vendor/nextcloud/ocp/OCP"
-		}
 	}
 }

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "388de1616aef9f3496ad3432af301215",
+    "content-hash": "a984e9e37aadc6504b0f9ddbd6604835",
     "packages": [
         {
             "name": "cogpowered/finediff",
@@ -230,6 +230,49 @@
             ],
             "time": "2021-03-30T17:13:30+00:00"
         },
+        {
+            "name": "christophwurst/nextcloud",
+            "version": "v22.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ChristophWurst/nextcloud_composer.git",
+                "reference": "8bb086cd016128b5ef8353662fd1852db3248d1e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/8bb086cd016128b5ef8353662fd1852db3248d1e",
+                "reference": "8bb086cd016128b5ef8353662fd1852db3248d1e",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3 || ~8.0.0",
+                "psr/container": "^1.0",
+                "psr/event-dispatcher": "^1.0",
+                "psr/log": "^1.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "23.0.0-dev"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "AGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Christoph Wurst",
+                    "email": "christoph@winzerhof-wurst.at"
+                }
+            ],
+            "description": "Composer package containing Nextcloud's public API (classes, interfaces)",
+            "support": {
+                "issues": "https://github.com/ChristophWurst/nextcloud_composer/issues",
+                "source": "https://github.com/ChristophWurst/nextcloud_composer/tree/v22.1.1"
+            },
+            "time": "2021-11-11T14:01:42+00:00"
+        },
         {
             "name": "composer/package-versions-deprecated",
             "version": "1.11.99.5",
@@ -1137,48 +1180,6 @@
             },
             "time": "2021-01-11T14:15:58+00:00"
         },
-        {
-            "name": "nextcloud/ocp",
-            "version": "dev-stable23",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nextcloud-deps/ocp.git",
-                "reference": "f9c2024f8c87a4dc51c17e3eaf3ee267cfe66e12"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/f9c2024f8c87a4dc51c17e3eaf3ee267cfe66e12",
-                "reference": "f9c2024f8c87a4dc51c17e3eaf3ee267cfe66e12",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3 || ~8.0.0",
-                "psr/container": "^1.1.1",
-                "psr/event-dispatcher": "^1.0",
-                "psr/log": "^1.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "23.0.0-dev"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "AGPL-3.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Christoph Wurst",
-                    "email": "christoph@winzerhof-wurst.at"
-                }
-            ],
-            "description": "Composer package containing Nextcloud's public API (classes, interfaces)",
-            "support": {
-                "source": "https://github.com/nextcloud-deps/ocp/tree/stable23"
-            },
-            "time": "2022-09-27T08:15:32+00:00"
-        },
         {
             "name": "nikic/php-parser",
             "version": "v4.13.2",
@@ -5246,14 +5247,11 @@
     "minimum-stability": "stable",
     "stability-flags": {
         "roave/security-advisories": 20,
-        "nextcloud/ocp": 20
+        "christophwurst/nextcloud": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "platform-overrides": {
-        "php": "7.3"
-    },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }

l10n/cs.js

@@ -183,8 +183,10 @@ OC.L10N.register(
     "Failed to transfer the board to {user}" : "Nepodařilo se předat vlastnictví tabule uživateli {user}",
     "Add a new list" : "Přidat nový sloupec",
     "Archive all cards" : "Archivovat všechny karty",
+    "Unarchive all cards" : "Zrušit archivaci všech karet",
     "Delete list" : "Smazat seznam",
     "Archive all cards in this list" : "Archivovat všechny karty v tomto seznamu",
+    "Unarchive all cards in this list" : "Zrušit archivaci všech karet v tomto seznamu",
     "Add a new card" : "Přidat novou kartu",
     "Card name" : "Název karty",
     "List deleted" : "Seznam smazán",
@@ -260,6 +262,7 @@ OC.L10N.register(
     "Shared with you" : "Sdíleno s vámi",
     "Deck settings" : "Nastavení pro Deck",
     "Use bigger card view" : "Použít větší zobrazení karet",
+    "Show card ID badge" : "Zobrazit odznáček s identifikátorem karty",
     "Show boards in calendar/tasks" : "Zobrazit tabule v kalendáři/úkolech",
     "Limit deck usage of groups" : "Omezit využití deck na skupiny",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Omezení nastavené pro Deck brání uživatelům, kteří nejsou součástí těchto skupin, ve vytváření vlastních tabulí. Nicméně i tak ale pořád budou moci pracovat na tabulích, které jsou jim nasdíleny.",

l10n/cs.json

@@ -181,8 +181,10 @@
     "Failed to transfer the board to {user}" : "Nepodařilo se předat vlastnictví tabule uživateli {user}",
     "Add a new list" : "Přidat nový sloupec",
     "Archive all cards" : "Archivovat všechny karty",
+    "Unarchive all cards" : "Zrušit archivaci všech karet",
     "Delete list" : "Smazat seznam",
     "Archive all cards in this list" : "Archivovat všechny karty v tomto seznamu",
+    "Unarchive all cards in this list" : "Zrušit archivaci všech karet v tomto seznamu",
     "Add a new card" : "Přidat novou kartu",
     "Card name" : "Název karty",
     "List deleted" : "Seznam smazán",
@@ -258,6 +260,7 @@
     "Shared with you" : "Sdíleno s vámi",
     "Deck settings" : "Nastavení pro Deck",
     "Use bigger card view" : "Použít větší zobrazení karet",
+    "Show card ID badge" : "Zobrazit odznáček s identifikátorem karty",
     "Show boards in calendar/tasks" : "Zobrazit tabule v kalendáři/úkolech",
     "Limit deck usage of groups" : "Omezit využití deck na skupiny",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Omezení nastavené pro Deck brání uživatelům, kteří nejsou součástí těchto skupin, ve vytváření vlastních tabulí. Nicméně i tak ale pořád budou moci pracovat na tabulích, které jsou jim nasdíleny.",

l10n/de.js

@@ -183,8 +183,10 @@ OC.L10N.register(
     "Failed to transfer the board to {user}" : "Das Board konnte nicht an {user} übertragen werden",
     "Add a new list" : "Eine neue Liste hinzufügen",
     "Archive all cards" : "Alle Karten archivieren",
+    "Unarchive all cards" : "Alle Karten dearchivieren",
     "Delete list" : "Liste löschen",
     "Archive all cards in this list" : "Alle Karten in dieser Liste archivieren",
+    "Unarchive all cards in this list" : "Alle Karten dieser Liste dearchivieren",
     "Add a new card" : "Neue Karte hinzufügen",
     "Card name" : "Kartenname",
     "List deleted" : "Liste gelöscht",
@@ -213,10 +215,10 @@ OC.L10N.register(
     "The title cannot be empty." : "Der Titel darf nicht leer sein.",
     "No comments yet. Begin the discussion!" : "Bislang keine Kommentare. Beginne die Diskussion!",
     "Failed to load comments" : "Das Laden der Kommentare ist fehlgeschlagen",
-    "Assign a tag to this card…" : "Dieser Karte ein Schlagwort zuweisen…",
+    "Assign a tag to this card…" : "Dieser Karte ein Schlagwort zuweisen …",
     "Assign to users" : "Benutzern zuweisen",
     "Assign to users/groups/circles" : "An Benutzer, Gruppen oder Kreise zuweisen",
-    "Assign a user to this card…" : "Diese Karte einem Benutzer zuweisen…",
+    "Assign a user to this card…" : "Diese Karte einem Benutzer zuweisen …",
     "Due date" : "Fälligkeitsdatum",
     "Set a due date" : "Ein Ablaufdatum setzen",
     "Remove due date" : "Fälligkeitsdatum löschen",
@@ -235,7 +237,7 @@ OC.L10N.register(
     "Description" : "Beschreibung",
     "(Unsaved)" : "(nicht gespeichert)",
     "(Saving…)" : "(Speichere…)",
-    "Formatting help" : "Formatierungshilfe",
+    "Formatting help" : "Hilfe zur Formatierung",
     "Edit description" : "Beschreibung bearbeiten",
     "View description" : "Beschreibung anzeigen",
     "Add Attachment" : "Anhang anhängen",

l10n/de.json

@@ -181,8 +181,10 @@
     "Failed to transfer the board to {user}" : "Das Board konnte nicht an {user} übertragen werden",
     "Add a new list" : "Eine neue Liste hinzufügen",
     "Archive all cards" : "Alle Karten archivieren",
+    "Unarchive all cards" : "Alle Karten dearchivieren",
     "Delete list" : "Liste löschen",
     "Archive all cards in this list" : "Alle Karten in dieser Liste archivieren",
+    "Unarchive all cards in this list" : "Alle Karten dieser Liste dearchivieren",
     "Add a new card" : "Neue Karte hinzufügen",
     "Card name" : "Kartenname",
     "List deleted" : "Liste gelöscht",
@@ -211,10 +213,10 @@
     "The title cannot be empty." : "Der Titel darf nicht leer sein.",
     "No comments yet. Begin the discussion!" : "Bislang keine Kommentare. Beginne die Diskussion!",
     "Failed to load comments" : "Das Laden der Kommentare ist fehlgeschlagen",
-    "Assign a tag to this card…" : "Dieser Karte ein Schlagwort zuweisen…",
+    "Assign a tag to this card…" : "Dieser Karte ein Schlagwort zuweisen …",
     "Assign to users" : "Benutzern zuweisen",
     "Assign to users/groups/circles" : "An Benutzer, Gruppen oder Kreise zuweisen",
-    "Assign a user to this card…" : "Diese Karte einem Benutzer zuweisen…",
+    "Assign a user to this card…" : "Diese Karte einem Benutzer zuweisen …",
     "Due date" : "Fälligkeitsdatum",
     "Set a due date" : "Ein Ablaufdatum setzen",
     "Remove due date" : "Fälligkeitsdatum löschen",
@@ -233,7 +235,7 @@
     "Description" : "Beschreibung",
     "(Unsaved)" : "(nicht gespeichert)",
     "(Saving…)" : "(Speichere…)",
-    "Formatting help" : "Formatierungshilfe",
+    "Formatting help" : "Hilfe zur Formatierung",
     "Edit description" : "Beschreibung bearbeiten",
     "View description" : "Beschreibung anzeigen",
     "Add Attachment" : "Anhang anhängen",

l10n/de_DE.js

@@ -183,8 +183,10 @@ OC.L10N.register(
     "Failed to transfer the board to {user}" : "Das Board konnte nicht auf {user} übertragen werden",
     "Add a new list" : "Eine neue Liste hinzufügen",
     "Archive all cards" : "Alle Karten archivieren",
+    "Unarchive all cards" : "Alle Karten dearchivieren",
     "Delete list" : "Liste löschen",
     "Archive all cards in this list" : "Alle Karten in dieser Liste archivieren",
+    "Unarchive all cards in this list" : "Alle Karten in dieser Liste dearchivieren",
     "Add a new card" : "Neue Karte hinzufügen",
     "Card name" : "Kartenname",
     "List deleted" : "Liste gelöscht",
@@ -260,6 +262,7 @@ OC.L10N.register(
     "Shared with you" : "Mit Ihnen geteilt",
     "Deck settings" : "Deck-Einstellungen",
     "Use bigger card view" : "Größere Kartenansicht verwenden",
+    "Show card ID badge" : "Abzeichen mit Karten-ID zeigen",
     "Show boards in calendar/tasks" : "Board in Kalender/Aufgaben anzeigen",
     "Limit deck usage of groups" : "Nutzung auf Gruppen einschränken",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Wenn Sie Deck einschränken, können Benutzer, die nicht zu diesen Gruppen gehören, keine eigenen Boards erstellen. Die Benutzer können weiterhin an Boards arbeiten, die für sie freigegeben wurden.",

l10n/de_DE.json

@@ -181,8 +181,10 @@
     "Failed to transfer the board to {user}" : "Das Board konnte nicht auf {user} übertragen werden",
     "Add a new list" : "Eine neue Liste hinzufügen",
     "Archive all cards" : "Alle Karten archivieren",
+    "Unarchive all cards" : "Alle Karten dearchivieren",
     "Delete list" : "Liste löschen",
     "Archive all cards in this list" : "Alle Karten in dieser Liste archivieren",
+    "Unarchive all cards in this list" : "Alle Karten in dieser Liste dearchivieren",
     "Add a new card" : "Neue Karte hinzufügen",
     "Card name" : "Kartenname",
     "List deleted" : "Liste gelöscht",
@@ -258,6 +260,7 @@
     "Shared with you" : "Mit Ihnen geteilt",
     "Deck settings" : "Deck-Einstellungen",
     "Use bigger card view" : "Größere Kartenansicht verwenden",
+    "Show card ID badge" : "Abzeichen mit Karten-ID zeigen",
     "Show boards in calendar/tasks" : "Board in Kalender/Aufgaben anzeigen",
     "Limit deck usage of groups" : "Nutzung auf Gruppen einschränken",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Wenn Sie Deck einschränken, können Benutzer, die nicht zu diesen Gruppen gehören, keine eigenen Boards erstellen. Die Benutzer können weiterhin an Boards arbeiten, die für sie freigegeben wurden.",

l10n/es.js

@@ -183,8 +183,10 @@ OC.L10N.register(
     "Failed to transfer the board to {user}" : "Failed to transfer the board to {user}",
     "Add a new list" : "Añadir una lista nueva",
     "Archive all cards" : "Archivar todas las tarjetas",
+    "Unarchive all cards" : "Desarchivar todas las tarjetas",
     "Delete list" : "Eliminar lista",
     "Archive all cards in this list" : "Archivar todas las tarjetas en esta lista",
+    "Unarchive all cards in this list" : "Desarchivar todas las tarjetas en esta lista",
     "Add a new card" : "Añadir una nueva tarjeta",
     "Card name" : "Nombre de la tarjeta",
     "List deleted" : "Lista borrada",
@@ -260,6 +262,7 @@ OC.L10N.register(
     "Shared with you" : "Compartido contigo",
     "Deck settings" : "Configuración del tablero",
     "Use bigger card view" : "Usar vista de tarjeta mayor",
+    "Show card ID badge" : "Mostrar insignia de la ID de tarjeta",
     "Show boards in calendar/tasks" : "Mostrar tableros en calendario/tareas",
     "Limit deck usage of groups" : "Limitar el uso de Deck a grupos",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Limitar Deck impedirá que usuarios que no formen parte de esos grupos creen sus propios tableros. Los usuarios todavía podrán trabajar en tableros que hayan sido compartidos con ellos.",

l10n/es.json

@@ -181,8 +181,10 @@
     "Failed to transfer the board to {user}" : "Failed to transfer the board to {user}",
     "Add a new list" : "Añadir una lista nueva",
     "Archive all cards" : "Archivar todas las tarjetas",
+    "Unarchive all cards" : "Desarchivar todas las tarjetas",
     "Delete list" : "Eliminar lista",
     "Archive all cards in this list" : "Archivar todas las tarjetas en esta lista",
+    "Unarchive all cards in this list" : "Desarchivar todas las tarjetas en esta lista",
     "Add a new card" : "Añadir una nueva tarjeta",
     "Card name" : "Nombre de la tarjeta",
     "List deleted" : "Lista borrada",
@@ -258,6 +260,7 @@
     "Shared with you" : "Compartido contigo",
     "Deck settings" : "Configuración del tablero",
     "Use bigger card view" : "Usar vista de tarjeta mayor",
+    "Show card ID badge" : "Mostrar insignia de la ID de tarjeta",
     "Show boards in calendar/tasks" : "Mostrar tableros en calendario/tareas",
     "Limit deck usage of groups" : "Limitar el uso de Deck a grupos",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Limitar Deck impedirá que usuarios que no formen parte de esos grupos creen sus propios tableros. Los usuarios todavía podrán trabajar en tableros que hayan sido compartidos con ellos.",

l10n/fr.js

@@ -260,6 +260,7 @@ OC.L10N.register(
     "Shared with you" : "Partagés avec vous",
     "Deck settings" : "Paramètres de Deck",
     "Use bigger card view" : "Utiliser la vue large des cartes",
+    "Show card ID badge" : "Afficher la carte d'identité du badge",
     "Show boards in calendar/tasks" : "Afficher les tableaux dans les agendas/tâches",
     "Limit deck usage of groups" : "Limiter l'utilisation du tableau aux groupes",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Limiter Deck empêchera les utilisateurs ne faisant pas partie de ces groupes de créer leurs propres tableaux. Ces utilisateurs pourront toujours travailler sur les tableaux qui ont été partagés avec eux.",

l10n/fr.json

@@ -258,6 +258,7 @@
     "Shared with you" : "Partagés avec vous",
     "Deck settings" : "Paramètres de Deck",
     "Use bigger card view" : "Utiliser la vue large des cartes",
+    "Show card ID badge" : "Afficher la carte d'identité du badge",
     "Show boards in calendar/tasks" : "Afficher les tableaux dans les agendas/tâches",
     "Limit deck usage of groups" : "Limiter l'utilisation du tableau aux groupes",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Limiter Deck empêchera les utilisateurs ne faisant pas partie de ces groupes de créer leurs propres tableaux. Ces utilisateurs pourront toujours travailler sur les tableaux qui ont été partagés avec eux.",

l10n/lt_LT.js

@@ -70,6 +70,7 @@ OC.L10N.register(
     "Personal" : "Asmeniniai",
     "The card \"%s\" on \"%s\" has been assigned to you by %s." : "Kortelę \"%s\" ties \"%s\" priskyrė jums %s.",
     "The card \"%s\" on \"%s\" has reached its due date." : "Kortelė „%s“, esanti lentoje „%s“, pasiekė savo galutinį terminą.",
+    "The card {deck-card} on {deck-board} has reached its due date." : "Kortelė {deck-card}, esanti lentoje {deck-board} pasiekė savo galutinio termino datą.",
     "%s has mentioned you in a comment on \"%s\"." : "%s paminėjo jus komentare ties \"%s\".",
     "The board \"%s\" has been shared with you by %s." : "Lentą \"%s\" su jumis bendrina %s.",
     "%s on %s" : "%s ant %s",
@@ -200,9 +201,9 @@ OC.L10N.register(
     "Assign to users" : "Priskirti naudotojams",
     "Assign to users/groups/circles" : "Priskirti naudotojams/grupėms/ratams",
     "Assign a user to this card…" : "Priskirti šiai kortelei naudotoją…",
-    "Due date" : "Terminas",
+    "Due date" : "Galutinio termino data",
     "Set a due date" : "Nustatyti galutinį terminą",
-    "Remove due date" : "Pašalinti terminą",
+    "Remove due date" : "Šalinti galutinio termino datą",
     "Select Date" : "Pasirinkti datą",
     "Today" : "Šiandien",
     "Tomorrow" : "Rytoj",
@@ -243,9 +244,9 @@ OC.L10N.register(
     "Clone board" : "Dubliuoti lentą",
     "Unarchive board" : "Išarchyvuoti lentą",
     "Archive board" : "Archyvuoti lentą",
-    "Turn on due date reminders" : "Įjungti priminimus apie galutinį terminą",
-    "Turn off due date reminders" : "Išjungti priminimus apie galutinį terminą",
-    "Due date reminders" : "Priminimai apie galutinį terminą",
+    "Turn on due date reminders" : "Įjungti priminimus apie galutinio termino datą",
+    "Turn off due date reminders" : "Išjungti priminimus apie galutinio termino datą",
+    "Due date reminders" : "Priminimai apie galutinio termino datą",
     "All cards" : "Visos kortelės",
     "Assigned cards" : "Priskirtos kortelės",
     "No notifications" : "Pranešimų nėra",
@@ -257,6 +258,7 @@ OC.L10N.register(
     "Delete the board?" : "Ištrinti lentą?",
     "No due" : "Be galutinio termino",
     "No results found" : "Nerasta jokių rezultatų",
+    "Due on {date}" : "Galutinis terminas {date}",
     "Link to a board" : "Susieti su lenta",
     "Link to a card" : "Susieti su kortele",
     "Create a card" : "Sukurti kortelę",

l10n/lt_LT.json

@@ -68,6 +68,7 @@
     "Personal" : "Asmeniniai",
     "The card \"%s\" on \"%s\" has been assigned to you by %s." : "Kortelę \"%s\" ties \"%s\" priskyrė jums %s.",
     "The card \"%s\" on \"%s\" has reached its due date." : "Kortelė „%s“, esanti lentoje „%s“, pasiekė savo galutinį terminą.",
+    "The card {deck-card} on {deck-board} has reached its due date." : "Kortelė {deck-card}, esanti lentoje {deck-board} pasiekė savo galutinio termino datą.",
     "%s has mentioned you in a comment on \"%s\"." : "%s paminėjo jus komentare ties \"%s\".",
     "The board \"%s\" has been shared with you by %s." : "Lentą \"%s\" su jumis bendrina %s.",
     "%s on %s" : "%s ant %s",
@@ -198,9 +199,9 @@
     "Assign to users" : "Priskirti naudotojams",
     "Assign to users/groups/circles" : "Priskirti naudotojams/grupėms/ratams",
     "Assign a user to this card…" : "Priskirti šiai kortelei naudotoją…",
-    "Due date" : "Terminas",
+    "Due date" : "Galutinio termino data",
     "Set a due date" : "Nustatyti galutinį terminą",
-    "Remove due date" : "Pašalinti terminą",
+    "Remove due date" : "Šalinti galutinio termino datą",
     "Select Date" : "Pasirinkti datą",
     "Today" : "Šiandien",
     "Tomorrow" : "Rytoj",
@@ -241,9 +242,9 @@
     "Clone board" : "Dubliuoti lentą",
     "Unarchive board" : "Išarchyvuoti lentą",
     "Archive board" : "Archyvuoti lentą",
-    "Turn on due date reminders" : "Įjungti priminimus apie galutinį terminą",
-    "Turn off due date reminders" : "Išjungti priminimus apie galutinį terminą",
-    "Due date reminders" : "Priminimai apie galutinį terminą",
+    "Turn on due date reminders" : "Įjungti priminimus apie galutinio termino datą",
+    "Turn off due date reminders" : "Išjungti priminimus apie galutinio termino datą",
+    "Due date reminders" : "Priminimai apie galutinio termino datą",
     "All cards" : "Visos kortelės",
     "Assigned cards" : "Priskirtos kortelės",
     "No notifications" : "Pranešimų nėra",
@@ -255,6 +256,7 @@
     "Delete the board?" : "Ištrinti lentą?",
     "No due" : "Be galutinio termino",
     "No results found" : "Nerasta jokių rezultatų",
+    "Due on {date}" : "Galutinis terminas {date}",
     "Link to a board" : "Susieti su lenta",
     "Link to a card" : "Susieti su kortele",
     "Create a card" : "Sukurti kortelę",

l10n/pl.js

@@ -183,8 +183,10 @@ OC.L10N.register(
     "Failed to transfer the board to {user}" : "Nie udało się przenieść tablicy do {user}",
     "Add a new list" : "Dodaj nową listę",
     "Archive all cards" : "Zarchiwizuj wszystkie karty",
+    "Unarchive all cards" : "Przywróć wszystkie karty z archiwum",
     "Delete list" : "Usuń listę",
     "Archive all cards in this list" : "Zarchiwizuj wszystkie karty na tej liście",
+    "Unarchive all cards in this list" : "Cofnij archiwizację wszystkich kart z tej listy",
     "Add a new card" : "Dodaj nową kartę",
     "Card name" : "Nazwa karty",
     "List deleted" : "Lista usunięta",
@@ -260,6 +262,7 @@ OC.L10N.register(
     "Shared with you" : "Udostępnione Tobie",
     "Deck settings" : "Ustawienia Tablicy",
     "Use bigger card view" : "Użyj większego widoku karty",
+    "Show card ID badge" : "Pokaż ID karty",
     "Show boards in calendar/tasks" : "Pokaż tablice w kalendarzu/zadaniach",
     "Limit deck usage of groups" : "Ogranicz użycie tablic dla grup",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Ograniczenie Tablicy zablokuje użytkownikom z tych grup możliwość tworzenia własnych tablic. Użytkownicy nadal będą mogli pracować na tablicach, które zostały im udostępnione.",

l10n/pl.json

@@ -181,8 +181,10 @@
     "Failed to transfer the board to {user}" : "Nie udało się przenieść tablicy do {user}",
     "Add a new list" : "Dodaj nową listę",
     "Archive all cards" : "Zarchiwizuj wszystkie karty",
+    "Unarchive all cards" : "Przywróć wszystkie karty z archiwum",
     "Delete list" : "Usuń listę",
     "Archive all cards in this list" : "Zarchiwizuj wszystkie karty na tej liście",
+    "Unarchive all cards in this list" : "Cofnij archiwizację wszystkich kart z tej listy",
     "Add a new card" : "Dodaj nową kartę",
     "Card name" : "Nazwa karty",
     "List deleted" : "Lista usunięta",
@@ -258,6 +260,7 @@
     "Shared with you" : "Udostępnione Tobie",
     "Deck settings" : "Ustawienia Tablicy",
     "Use bigger card view" : "Użyj większego widoku karty",
+    "Show card ID badge" : "Pokaż ID karty",
     "Show boards in calendar/tasks" : "Pokaż tablice w kalendarzu/zadaniach",
     "Limit deck usage of groups" : "Ogranicz użycie tablic dla grup",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Ograniczenie Tablicy zablokuje użytkownikom z tych grup możliwość tworzenia własnych tablic. Użytkownicy nadal będą mogli pracować na tablicach, które zostały im udostępnione.",

l10n/sv.js

@@ -136,6 +136,7 @@ OC.L10N.register(
     "Archived cards" : "Arkiverade kort",
     "Add list" : "Lägg till lista...",
     "List name" : "Namn på lista",
+    "Active filters" : "Aktiva filter",
     "Apply filter" : "Tillämpa filter",
     "Filter by tag" : "Filtrera efter tagg",
     "Filter by assigned user" : "Filtrera efter tilldelad användare",
@@ -175,11 +176,17 @@ OC.L10N.register(
     "Owner" : "Ägare",
     "Delete" : "Ta bort",
     "Failed to create share with {displayName}" : "Kunde inte skapa delning med {displayName}",
+    "Are you sure you want to transfer the board {title} to {user}?" : "Är du säker att du vill överföra tavlan {title} till {user}?",
+    "Transfer the board." : "Överför tavlan.",
     "Transfer" : "Överför",
+    "The board has been transferred to {user}" : "Tavlan har överförts till {user}",
+    "Failed to transfer the board to {user}" : "Kunde inte överföra tavlan till {user}",
     "Add a new list" : "Lägg till en ny lista",
     "Archive all cards" : "Arkivera alla kort",
+    "Unarchive all cards" : "Ta ut alla kort ur arkivet",
     "Delete list" : "Ta bort lista",
     "Archive all cards in this list" : "Arkivera alla kort i denna lista",
+    "Unarchive all cards in this list" : "Ta ut alla kort i denna lista ur arkivet",
     "Add a new card" : "Lägg till ett nytt kort",
     "Card name" : "Kortets namn",
     "List deleted" : "Listan har raderats",
@@ -237,7 +244,9 @@ OC.L10N.register(
     "Write a description …" : "Ange en beskrivning ...",
     "Choose attachment" : "Välj bilaga",
     "(group)" : " (grupp)",
+    "Todo items" : "Todo saker",
     "{count} comments, {unread} unread" : "{count} kommentarer, {unread} olästa",
+    "Edit card title" : "Ändra korttitel",
     "Assign to me" : "Tilldela till mig",
     "Unassign myself" : "Ta bort från mig själv",
     "Move card" : "Flytta kort",
@@ -251,7 +260,9 @@ OC.L10N.register(
     "All boards" : "Alla tavlor",
     "Archived boards" : "Arkiverade tavlor",
     "Shared with you" : "Delad med dig",
+    "Deck settings" : "Deckinställningar",
     "Use bigger card view" : "Visa större kort",
+    "Show card ID badge" : "Visa kortets ID-märke",
     "Show boards in calendar/tasks" : "Visa tavlor i kalender / uppgifter",
     "Limit deck usage of groups" : "Begränsa användningen av grupper",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Begränsning av Deck blockerar användare som inte ingår i dessa grupper från att skapa egna tavlor. Användare kan dock fortfarande integrera med tavlor som har delats med dem.",
@@ -271,13 +282,19 @@ OC.L10N.register(
     "Only assigned cards" : "Bara tilldelade kort",
     "No reminder" : "Ingen påminnelse",
     "An error occurred" : "Ett fel uppstod",
+    "Are you sure you want to delete the board {title}? This will delete all the data of this board including archived cards." : "Är du säker på att du vill radera brädet {title}? Detta kommer radera all data som tillhör brädet inklusive arkiverade kort.",
     "Delete the board?" : "Ta bort tavlan?",
     "Loading filtered view" : "Laddar filtrerad vy",
     "No due" : "Inget slut",
     "Search for {searchQuery} in all boards" : "Sök efter {searchQuery} i alla tavlor",
     "No results found" : "Inga resultat funna",
+    "{stack} in {board}" : "{stack} i {board}",
+    "Click to expand description" : "Klicka för att utöka beskrivningen",
+    "* Created on {created}\n* Last modified on {lastMod}\n* {nbAttachments} attachments\n* {nbComments} comments" : "* Skapades {created}\n* Ändrades senast {lastMod}\n* {nbAttachments} bilagor\n* {nbComments} kommentarer",
+    "{nbCards} cards" : "{nbCards} kort",
     "No upcoming cards" : "Inga kommande kort",
     "upcoming cards" : "kommande kort",
+    "Due on {date}" : "Går ut {date}",
     "Link to a board" : "Länka till en tavla",
     "Link to a card" : "Länka till ett kort",
     "Create a card" : "Skapa ett kort",
@@ -290,7 +307,11 @@ OC.L10N.register(
     "Share {file} with a Deck card" : "Dela {file} med ett Deck-kort",
     "Share" : "Dela",
     "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized" : "Deck är en kanban-liknande projekt- och organiseringsapp för arbetsgrupper i Nextcloud.\n\n\n- 📥 Lägg till uppgifter på kort och ordna dem\n- 📄 Skriv anteckningar i markdown\n- 🔖 Tilldela etiketter för organisering\n- 👥 Dela med arbetsgruppen, vänner eller familj\n- 📎 Bifoga filer och bädda in dem i markdown-anteckningarna\n- 💬 Diskutera i arbetsgruppen genom kommentarer\n- ⚡ Håll koll på ändringar i aktivitetsflödet\n- 🚀 Börja organisera din arbetsgrupp nu!",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "Är du säker på att du vill överföra brädet {title} för {user}?",
+    "Transfer the board for {user} successfully" : "Överförde brädet för {user}",
+    "Failed to transfer the board for {user}" : "Misslyckades med att överföra brädet för {user}",
     "Are you sure you want to delete the board {title}? This will delete all the data of this board." : "Är du säker på att du vill radera tavla {title}? Detta kommer att radera all information från denna tavla.",
-    "This week" : "Denna vecka"
+    "This week" : "Denna vecka",
+    "Are you sure you want to transfer the board {title} for {user}?" : "Är du säker på att du vill överföra brädet {title} för {user}?"
 },
 "nplurals=2; plural=(n != 1);");

l10n/sv.json

@@ -134,6 +134,7 @@
     "Archived cards" : "Arkiverade kort",
     "Add list" : "Lägg till lista...",
     "List name" : "Namn på lista",
+    "Active filters" : "Aktiva filter",
     "Apply filter" : "Tillämpa filter",
     "Filter by tag" : "Filtrera efter tagg",
     "Filter by assigned user" : "Filtrera efter tilldelad användare",
@@ -173,11 +174,17 @@
     "Owner" : "Ägare",
     "Delete" : "Ta bort",
     "Failed to create share with {displayName}" : "Kunde inte skapa delning med {displayName}",
+    "Are you sure you want to transfer the board {title} to {user}?" : "Är du säker att du vill överföra tavlan {title} till {user}?",
+    "Transfer the board." : "Överför tavlan.",
     "Transfer" : "Överför",
+    "The board has been transferred to {user}" : "Tavlan har överförts till {user}",
+    "Failed to transfer the board to {user}" : "Kunde inte överföra tavlan till {user}",
     "Add a new list" : "Lägg till en ny lista",
     "Archive all cards" : "Arkivera alla kort",
+    "Unarchive all cards" : "Ta ut alla kort ur arkivet",
     "Delete list" : "Ta bort lista",
     "Archive all cards in this list" : "Arkivera alla kort i denna lista",
+    "Unarchive all cards in this list" : "Ta ut alla kort i denna lista ur arkivet",
     "Add a new card" : "Lägg till ett nytt kort",
     "Card name" : "Kortets namn",
     "List deleted" : "Listan har raderats",
@@ -235,7 +242,9 @@
     "Write a description …" : "Ange en beskrivning ...",
     "Choose attachment" : "Välj bilaga",
     "(group)" : " (grupp)",
+    "Todo items" : "Todo saker",
     "{count} comments, {unread} unread" : "{count} kommentarer, {unread} olästa",
+    "Edit card title" : "Ändra korttitel",
     "Assign to me" : "Tilldela till mig",
     "Unassign myself" : "Ta bort från mig själv",
     "Move card" : "Flytta kort",
@@ -249,7 +258,9 @@
     "All boards" : "Alla tavlor",
     "Archived boards" : "Arkiverade tavlor",
     "Shared with you" : "Delad med dig",
+    "Deck settings" : "Deckinställningar",
     "Use bigger card view" : "Visa större kort",
+    "Show card ID badge" : "Visa kortets ID-märke",
     "Show boards in calendar/tasks" : "Visa tavlor i kalender / uppgifter",
     "Limit deck usage of groups" : "Begränsa användningen av grupper",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Begränsning av Deck blockerar användare som inte ingår i dessa grupper från att skapa egna tavlor. Användare kan dock fortfarande integrera med tavlor som har delats med dem.",
@@ -269,13 +280,19 @@
     "Only assigned cards" : "Bara tilldelade kort",
     "No reminder" : "Ingen påminnelse",
     "An error occurred" : "Ett fel uppstod",
+    "Are you sure you want to delete the board {title}? This will delete all the data of this board including archived cards." : "Är du säker på att du vill radera brädet {title}? Detta kommer radera all data som tillhör brädet inklusive arkiverade kort.",
     "Delete the board?" : "Ta bort tavlan?",
     "Loading filtered view" : "Laddar filtrerad vy",
     "No due" : "Inget slut",
     "Search for {searchQuery} in all boards" : "Sök efter {searchQuery} i alla tavlor",
     "No results found" : "Inga resultat funna",
+    "{stack} in {board}" : "{stack} i {board}",
+    "Click to expand description" : "Klicka för att utöka beskrivningen",
+    "* Created on {created}\n* Last modified on {lastMod}\n* {nbAttachments} attachments\n* {nbComments} comments" : "* Skapades {created}\n* Ändrades senast {lastMod}\n* {nbAttachments} bilagor\n* {nbComments} kommentarer",
+    "{nbCards} cards" : "{nbCards} kort",
     "No upcoming cards" : "Inga kommande kort",
     "upcoming cards" : "kommande kort",
+    "Due on {date}" : "Går ut {date}",
     "Link to a board" : "Länka till en tavla",
     "Link to a card" : "Länka till ett kort",
     "Create a card" : "Skapa ett kort",
@@ -288,7 +305,11 @@
     "Share {file} with a Deck card" : "Dela {file} med ett Deck-kort",
     "Share" : "Dela",
     "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized" : "Deck är en kanban-liknande projekt- och organiseringsapp för arbetsgrupper i Nextcloud.\n\n\n- 📥 Lägg till uppgifter på kort och ordna dem\n- 📄 Skriv anteckningar i markdown\n- 🔖 Tilldela etiketter för organisering\n- 👥 Dela med arbetsgruppen, vänner eller familj\n- 📎 Bifoga filer och bädda in dem i markdown-anteckningarna\n- 💬 Diskutera i arbetsgruppen genom kommentarer\n- ⚡ Håll koll på ändringar i aktivitetsflödet\n- 🚀 Börja organisera din arbetsgrupp nu!",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "Är du säker på att du vill överföra brädet {title} för {user}?",
+    "Transfer the board for {user} successfully" : "Överförde brädet för {user}",
+    "Failed to transfer the board for {user}" : "Misslyckades med att överföra brädet för {user}",
     "Are you sure you want to delete the board {title}? This will delete all the data of this board." : "Är du säker på att du vill radera tavla {title}? Detta kommer att radera all information från denna tavla.",
-    "This week" : "Denna vecka"
+    "This week" : "Denna vecka",
+    "Are you sure you want to transfer the board {title} for {user}?" : "Är du säker på att du vill överföra brädet {title} för {user}?"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

l10n/tr.js

@@ -183,8 +183,10 @@ OC.L10N.register(
     "Failed to transfer the board to {user}" : "Pano {user} kullanıcısına aktarılamadı",
     "Add a new list" : "Yeni liste ekle",
     "Archive all cards" : "Tüm kartları arşivle",
+    "Unarchive all cards" : "Tüm kartları arşivden çıkar",
     "Delete list" : "Listeyi sil",
     "Archive all cards in this list" : "Bu listedeki tüm kartları arşivle",
+    "Unarchive all cards in this list" : "Bu listedeki tüm kartları arşivden çıkar",
     "Add a new card" : "Yeni kart ekle",
     "Card name" : "Kart adı",
     "List deleted" : "Liste silindi",
@@ -260,6 +262,7 @@ OC.L10N.register(
     "Shared with you" : "Sizinle paylaşıldı",
     "Deck settings" : "Tahta ayarları",
     "Use bigger card view" : "Daha büyük kart görünümü kullanılsın",
+    "Show card ID badge" : "Kart kodu etiketi görüntülensin",
     "Show boards in calendar/tasks" : "Takvimler ve görevlerde panolar görüntülensin",
     "Limit deck usage of groups" : "Tahtayı şu gruplar kullanabilsin",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Tahta kullanımı gruplar ile sınırlandığında belirtilen grupların üyesi olmayan kişiler kendi tahtalarını oluşturamaz. Bu kullanıcılar ancak kendileri ile paylaşılan tahtalar üzerinde çalışabilir.",

l10n/tr.json

@@ -181,8 +181,10 @@
     "Failed to transfer the board to {user}" : "Pano {user} kullanıcısına aktarılamadı",
     "Add a new list" : "Yeni liste ekle",
     "Archive all cards" : "Tüm kartları arşivle",
+    "Unarchive all cards" : "Tüm kartları arşivden çıkar",
     "Delete list" : "Listeyi sil",
     "Archive all cards in this list" : "Bu listedeki tüm kartları arşivle",
+    "Unarchive all cards in this list" : "Bu listedeki tüm kartları arşivden çıkar",
     "Add a new card" : "Yeni kart ekle",
     "Card name" : "Kart adı",
     "List deleted" : "Liste silindi",
@@ -258,6 +260,7 @@
     "Shared with you" : "Sizinle paylaşıldı",
     "Deck settings" : "Tahta ayarları",
     "Use bigger card view" : "Daha büyük kart görünümü kullanılsın",
+    "Show card ID badge" : "Kart kodu etiketi görüntülensin",
     "Show boards in calendar/tasks" : "Takvimler ve görevlerde panolar görüntülensin",
     "Limit deck usage of groups" : "Tahtayı şu gruplar kullanabilsin",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Tahta kullanımı gruplar ile sınırlandığında belirtilen grupların üyesi olmayan kişiler kendi tahtalarını oluşturamaz. Bu kullanıcılar ancak kendileri ile paylaşılan tahtalar üzerinde çalışabilir.",

l10n/zh_HK.js

@@ -183,8 +183,10 @@ OC.L10N.register(
     "Failed to transfer the board to {user}" : "未能將面板轉移給 {user}",
     "Add a new list" : "添加一張新清單",
     "Archive all cards" : "封存所有卡片",
+    "Unarchive all cards" : "解除封存所有卡片",
     "Delete list" : "刪除清單",
     "Archive all cards in this list" : "封存此清單內的所有卡片",
+    "Unarchive all cards in this list" : "解除封存所有此列表中的卡片",
     "Add a new card" : "添加一張新卡片",
     "Card name" : "卡片名稱",
     "List deleted" : "清單已被刪除",
@@ -260,6 +262,7 @@ OC.L10N.register(
     "Shared with you" : "收到的分享",
     "Deck settings" : "看板設定",
     "Use bigger card view" : "使用較大的卡片視圖",
+    "Show card ID badge" : "顯示卡片 ID 徽章",
     "Show boards in calendar/tasks" : "在日曆/任務中顯示面板",
     "Limit deck usage of groups" : "限制群組使用 Deck",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "限制 Deck 將阻止不屬於這些群組的用戶創建自己的面板。用戶仍然可以在與他們的面板上工作。",

l10n/zh_HK.json

@@ -181,8 +181,10 @@
     "Failed to transfer the board to {user}" : "未能將面板轉移給 {user}",
     "Add a new list" : "添加一張新清單",
     "Archive all cards" : "封存所有卡片",
+    "Unarchive all cards" : "解除封存所有卡片",
     "Delete list" : "刪除清單",
     "Archive all cards in this list" : "封存此清單內的所有卡片",
+    "Unarchive all cards in this list" : "解除封存所有此列表中的卡片",
     "Add a new card" : "添加一張新卡片",
     "Card name" : "卡片名稱",
     "List deleted" : "清單已被刪除",
@@ -258,6 +260,7 @@
     "Shared with you" : "收到的分享",
     "Deck settings" : "看板設定",
     "Use bigger card view" : "使用較大的卡片視圖",
+    "Show card ID badge" : "顯示卡片 ID 徽章",
     "Show boards in calendar/tasks" : "在日曆/任務中顯示面板",
     "Limit deck usage of groups" : "限制群組使用 Deck",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "限制 Deck 將阻止不屬於這些群組的用戶創建自己的面板。用戶仍然可以在與他們的面板上工作。",

l10n/zh_TW.js

@@ -183,8 +183,10 @@ OC.L10N.register(
     "Failed to transfer the board to {user}" : "轉移看板給 {user} 失敗",
     "Add a new list" : "新增列表",
     "Archive all cards" : "封存所有卡片",
+    "Unarchive all cards" : "解除封存所有卡片",
     "Delete list" : "刪除列表",
     "Archive all cards in this list" : "封存此列表中的所有卡片",
+    "Unarchive all cards in this list" : "解除封存所有此列表中的卡片",
     "Add a new card" : "新增卡片",
     "Card name" : "卡片名稱",
     "List deleted" : "列表已刪除",
@@ -260,6 +262,7 @@ OC.L10N.register(
     "Shared with you" : "與您分享",
     "Deck settings" : "Deck 設定",
     "Use bigger card view" : "使用較大的卡片檢視",
+    "Show card ID badge" : "顯示卡片 ID 徽章",
     "Show boards in calendar/tasks" : "在日曆／工作項目中顯示佈告欄",
     "Limit deck usage of groups" : "限制群組的 Deck 使用",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "限制 Deck 將會阻止不屬於這些群組的使用者建立自己的佈告欄。使用者仍然可以在與他們分享的佈告欄上工作。",

l10n/zh_TW.json

@@ -181,8 +181,10 @@
     "Failed to transfer the board to {user}" : "轉移看板給 {user} 失敗",
     "Add a new list" : "新增列表",
     "Archive all cards" : "封存所有卡片",
+    "Unarchive all cards" : "解除封存所有卡片",
     "Delete list" : "刪除列表",
     "Archive all cards in this list" : "封存此列表中的所有卡片",
+    "Unarchive all cards in this list" : "解除封存所有此列表中的卡片",
     "Add a new card" : "新增卡片",
     "Card name" : "卡片名稱",
     "List deleted" : "列表已刪除",
@@ -258,6 +260,7 @@
     "Shared with you" : "與您分享",
     "Deck settings" : "Deck 設定",
     "Use bigger card view" : "使用較大的卡片檢視",
+    "Show card ID badge" : "顯示卡片 ID 徽章",
     "Show boards in calendar/tasks" : "在日曆／工作項目中顯示佈告欄",
     "Limit deck usage of groups" : "限制群組的 Deck 使用",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "限制 Deck 將會阻止不屬於這些群組的使用者建立自己的佈告欄。使用者仍然可以在與他們分享的佈告欄上工作。",

lib/Activity/DeckProvider.php

@@ -121,7 +121,6 @@ class DeckProvider implements IProvider {
 				'link' => $this->deckUrl('/board/' . $event->getObjectId()),
 			];
 			$params['board'] = $board;
-			$event->setLink($this->deckUrl('/board/' . $event->getObjectId()));
 		}
 
 		if (isset($subjectParams['card']) && $event->getObjectType() === ActivityManager::DECK_OBJECT_CARD) {
@@ -135,8 +134,8 @@ class DeckProvider implements IProvider {
 			];
 
 			if (array_key_exists('board', $subjectParams)) {
+				$archivedParam = $subjectParams['card']['archived'] ? 'archived/' : '';
 				$card['link'] = $this->cardService->getRedirectUrlForCard($event->getObjectId());
-				$event->setLink($card['link']);
 			}
 			$params['card'] = $card;
 		}

lib/Collaboration/Resources/ResourceProvider.php

@@ -100,9 +100,6 @@ class ResourceProvider implements IProvider {
 		if ($board->getOwner() === $user->getUID()) {
 			return true;
 		}
-		if ($board->getAcl() === null) {
-			return false;
-		}
 		return $this->permissionService->userCan($board->getAcl(), Acl::PERMISSION_READ, $user->getUID());
 	}
 

lib/Collaboration/Resources/ResourceProviderCard.php

@@ -127,9 +127,6 @@ class ResourceProviderCard implements IProvider {
 		if ($board->getOwner() === $user->getUID()) {
 			return true;
 		}
-		if ($board->getAcl() === null) {
-			return false;
-		}
 		return $this->permissionService->userCan($board->getAcl(), Acl::PERMISSION_READ, $user->getUID());
 	}
 

lib/DAV/Calendar.php

@@ -52,6 +52,12 @@ class Calendar extends ExternalCalendar {
 		$this->board = $board;
 
 		$this->principalUri = $principalUri;
+
+		if ($board) {
+			$this->children = $this->backend->getChildren($board->getId());
+		} else {
+			$this->children = [];
+		}
 	}
 
 	public function getOwner() {
@@ -116,7 +122,7 @@ class Calendar extends ExternalCalendar {
 	public function getChild($name) {
 		if ($this->childExists($name)) {
 			$card = array_values(array_filter(
-				$this->getBackendChildren(),
+				$this->children,
 				function ($card) use (&$name) {
 					return $card->getCalendarPrefix() . '-' . $card->getId() . '.ics' === $name;
 				}
@@ -131,7 +137,7 @@ class Calendar extends ExternalCalendar {
 	public function getChildren() {
 		$childNames = array_map(function ($card) {
 			return $card->getCalendarPrefix() . '-' . $card->getId() . '.ics';
-		}, $this->getBackendChildren());
+		}, $this->children);
 
 		$children = [];
 
@@ -142,23 +148,9 @@ class Calendar extends ExternalCalendar {
 		return $children;
 	}
 
-	private function getBackendChildren() {
-		if ($this->children) {
-			return $this->children;
-		}
-
-		if ($this->board) {
-			$this->children = $this->backend->getChildren($this->board->getId());
-		} else {
-			$this->children = [];
-		}
-
-		return $this->children;
-	}
-
 	public function childExists($name) {
 		return count(array_filter(
-			$this->getBackendChildren(),
+			$this->children,
 			function ($card) use (&$name) {
 				return $card->getCalendarPrefix() . '-' . $card->getId() . '.ics' === $name;
 			}

lib/Db/AttachmentMapper.php

@@ -67,13 +67,13 @@ class AttachmentMapper extends DeckMapper implements IPermissionMapper {
 		$row = $cursor->fetch(PDO::FETCH_ASSOC);
 		if ($row === false) {
 			$cursor->closeCursor();
-			throw new DoesNotExistException('Did expect one result but found none when executing query: ' . $qb->getSQL());
+			throw new DoesNotExistException('Did expect one result but found none when executing' . $qb);
 		}
 
 		$row2 = $cursor->fetch();
 		$cursor->closeCursor();
 		if ($row2 !== false) {
-			throw new MultipleObjectsReturnedException('Did not expect more than one result when executing query: ' . $qb->getSQL());
+			throw new MultipleObjectsReturnedException('Did not expect more than one result when executing' . $qb);
 		}
 
 		return $this->mapRowToEntity($row);
@@ -89,7 +89,7 @@ class AttachmentMapper extends DeckMapper implements IPermissionMapper {
 		$row = $cursor->fetch(PDO::FETCH_ASSOC);
 		if ($row === false) {
 			$cursor->closeCursor();
-			throw new DoesNotExistException('Did expect one result but found none when executing query: ' . $qb->getSQL());
+			throw new DoesNotExistException('Did expect one result but found none when executing' . $qb);
 		}
 		$cursor->closeCursor();
 		return $this->mapRowToEntity($row);

lib/Db/Board.php

@@ -28,10 +28,8 @@ class Board extends RelationalEntity {
 	protected $owner;
 	protected $color;
 	protected $archived = false;
-	/** @var Label[]|null */
-	protected $labels = null;
-	/** @var Acl[]|null */
-	protected $acl = null;
+	protected $labels = [];
+	protected $acl = [];
 	protected $permissions = [];
 	protected $users = [];
 	protected $shared;
@@ -63,10 +61,6 @@ class Board extends RelationalEntity {
 		if ($this->shared === -1) {
 			unset($json['shared']);
 		}
-		// FIXME: Ideally the API responses should follow the internal data structure and return null if the labels/acls have not been fetched from the db
-		// however this would be a breaking change for consumers of the API
-		$json['acl'] = $this->acl ?? [];
-		$json['labels'] = $this->labels ?? [];
 		return $json;
 	}
 
@@ -74,27 +68,21 @@ class Board extends RelationalEntity {
 	 * @param Label[] $labels
 	 */
 	public function setLabels($labels) {
-		$this->labels = $labels;
+		foreach ($labels as $l) {
+			$this->labels[] = $l;
+		}
 	}
 
 	/**
 	 * @param Acl[] $acl
 	 */
 	public function setAcl($acl) {
-		$this->acl = $acl;
+		foreach ($acl as $a) {
+			$this->acl[] = $a;
+		}
 	}
 
 	public function getETag() {
 		return md5((string)$this->getLastModified());
 	}
-
-	/** @returns Acl[]|null */
-	public function getAcl(): ?array {
-		return $this->acl;
-	}
-
-	/** @returns Label[]|null */
-	public function getLabels(): ?array {
-		return $this->labels;
-	}
 }

lib/Db/BoardMapper.php

@@ -26,14 +26,13 @@ namespace OCA\Deck\Db;
 use OC\Cache\CappedMemoryCache;
 use OCA\Deck\Service\CirclesService;
 use OCP\AppFramework\Db\DoesNotExistException;
-use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IUserManager;
 use OCP\IGroupManager;
 use Psr\Log\LoggerInterface;
 
-class BoardMapper extends QBMapper implements IPermissionMapper {
+class BoardMapper extends DeckMapper implements IPermissionMapper {
 	private $labelMapper;
 	private $aclMapper;
 	private $stackMapper;
@@ -44,8 +43,6 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 
 	/** @var CappedMemoryCache */
 	private $userBoardCache;
-	/** @var CappedMemoryCache */
-	private $boardCache;
 
 	public function __construct(
 		IDBConnection $db,
@@ -67,7 +64,6 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 		$this->logger = $logger;
 
 		$this->userBoardCache = new CappedMemoryCache();
-		$this->boardCache = new CappedMemoryCache();
 	}
 
 
@@ -75,52 +71,40 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 	 * @param $id
 	 * @param bool $withLabels
 	 * @param bool $withAcl
-	 * @return Board
+	 * @return \OCP\AppFramework\Db\Entity
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws DoesNotExistException
 	 */
-	public function find($id, $withLabels = false, $withAcl = false): Board {
-		if (!isset($this->boardCache[$id])) {
-			$qb = $this->db->getQueryBuilder();
-			$qb->select('*')
-				->from('deck_boards')
-				->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)))
-				->orderBy('id');
-			$this->boardCache[$id] = $this->findEntity($qb);
-		}
-
-		// FIXME is this necessary? it was NOT done with the old mapper
-		// $this->mapOwner($board);
+	public function find($id, $withLabels = false, $withAcl = false) {
+		$sql = 'SELECT id, title, owner, color, archived, deleted_at, last_modified FROM `*PREFIX*deck_boards` ' .
+			'WHERE `id` = ?';
+		$board = $this->findEntity($sql, [$id]);
 
 		// Add labels
-		if ($withLabels && $this->boardCache[$id]->getLabels() === null) {
+		if ($withLabels) {
 			$labels = $this->labelMapper->findAll($id);
-			$this->boardCache[$id]->setLabels($labels);
+			$board->setLabels($labels);
 		}
 
 		// Add acl
-		if ($withAcl && $this->boardCache[$id]->getAcl() === null) {
+		if ($withAcl) {
 			$acl = $this->aclMapper->findAll($id);
-			$this->boardCache[$id]->setAcl($acl);
+			$board->setAcl($acl);
 		}
 
-		return $this->boardCache[$id];
+		return $board;
 	}
 
-	public function findAllForUser(string $userId, ?int $since = null, bool $includeArchived = true, ?int $before = null,
-								   ?string $term = null): array {
-		$useCache = ($since === -1 && $includeArchived === true && $before === null && $term === null);
+	public function findAllForUser(string $userId, int $since = -1, $includeArchived = true): array {
+		$useCache = ($since === -1 && $includeArchived === true);
 		if (!isset($this->userBoardCache[$userId]) || !$useCache) {
 			$groups = $this->groupManager->getUserGroupIds(
 				$this->userManager->get($userId)
 			);
-			$userBoards = $this->findAllByUser($userId, null, null, $since, $includeArchived, $before, $term);
-			$groupBoards = $this->findAllByGroups($userId, $groups, null, null, $since, $includeArchived, $before, $term);
-			$circleBoards = $this->findAllByCircles($userId, null, null, $since, $includeArchived, $before, $term);
+			$userBoards = $this->findAllByUser($userId, null, null, $since, $includeArchived);
+			$groupBoards = $this->findAllByGroups($userId, $groups, null, null, $since, $includeArchived);
+			$circleBoards = $this->findAllByCircles($userId, null, null, $since, $includeArchived);
 			$allBoards = array_unique(array_merge($userBoards, $groupBoards, $circleBoards));
-			foreach ($allBoards as $board) {
-				$this->boardCache[$board->getId()] = $board;
-			}
 			if ($useCache) {
 				$this->userBoardCache[$userId] = $allBoards;
 			}
@@ -137,91 +121,19 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 	 * @param null $offset
 	 * @return array
 	 */
-	public function findAllByUser(string $userId, ?int $limit = null, ?int $offset = null, ?int $since = null,
-								  bool $includeArchived = true, ?int $before = null, ?string $term = null) {
-		// FIXME this used to be a UNION to get boards owned by $userId and the user shares in one single query
-		// Is it possible with the query builder?
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('id', 'title', 'owner', 'color', 'archived', 'deleted_at', 'last_modified')
-			// this does not work in MySQL/PostgreSQL
-			//->selectAlias('0', 'shared')
-			->from('deck_boards', 'b')
-			->where($qb->expr()->eq('owner', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)));
+	public function findAllByUser($userId, $limit = null, $offset = null, $since = -1, $includeArchived = true) {
+		// FIXME: One moving to QBMapper we should allow filtering the boards probably by method chaining for additional where clauses
+		$sql = 'SELECT id, title, owner, color, archived, deleted_at, 0 as shared, last_modified FROM `*PREFIX*deck_boards` WHERE owner = ? AND last_modified > ?';
 		if (!$includeArchived) {
-			$qb->andWhere($qb->expr()->eq('archived', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)))
-				->andWhere($qb->expr()->eq('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
+			$sql .= ' AND NOT archived AND deleted_at = 0';
 		}
-		if ($since !== null) {
-			$qb->andWhere($qb->expr()->gt('last_modified', $qb->createNamedParameter($since, IQueryBuilder::PARAM_INT)));
-		}
-		if ($before !== null) {
-			$qb->andWhere($qb->expr()->lt('last_modified', $qb->createNamedParameter($before, IQueryBuilder::PARAM_INT)));
-		}
-		if ($term !== null) {
-			$qb->andWhere(
-				$qb->expr()->iLike(
-					'title',
-					$qb->createNamedParameter(
-						'%' . $this->db->escapeLikeParameter($term) . '%',
-						IQueryBuilder::PARAM_STR
-					)
-				)
-			);
-		}
-		$qb->orderBy('b.id');
-		if ($limit !== null) {
-			$qb->setMaxResults($limit);
-		}
-		if ($offset !== null) {
-			$qb->setFirstResult($offset);
-		}
-		$entries = $this->findEntities($qb);
-		foreach ($entries as $entry) {
-			$entry->setShared(0);
-		}
-
-		// shared with user
-		$qb->resetQueryParts();
-		$qb->select('b.id', 'title', 'owner', 'color', 'archived', 'deleted_at', 'last_modified')
-			//->selectAlias('1', 'shared')
-			->from('deck_boards', 'b')
-			->innerJoin('b', 'deck_board_acl', 'acl', $qb->expr()->eq('b.id', 'acl.board_id'))
-			->where($qb->expr()->eq('acl.participant', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)))
-			->andWhere($qb->expr()->eq('acl.type', $qb->createNamedParameter(Acl::PERMISSION_TYPE_USER, IQueryBuilder::PARAM_INT)))
-			->andWhere($qb->expr()->neq('b.owner', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)));
+		$sql .= ' UNION ' .
+			'SELECT boards.id, title, owner, color, archived, deleted_at, 1 as shared, last_modified FROM `*PREFIX*deck_boards` as boards ' .
+			'JOIN `*PREFIX*deck_board_acl` as acl ON boards.id=acl.board_id WHERE acl.participant=? AND acl.type=? AND boards.owner != ? AND last_modified > ?';
 		if (!$includeArchived) {
-			$qb->andWhere($qb->expr()->eq('archived', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)))
-				->andWhere($qb->expr()->eq('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
+			$sql .= ' AND NOT archived AND deleted_at = 0';
 		}
-		if ($since !== null) {
-			$qb->andWhere($qb->expr()->gt('last_modified', $qb->createNamedParameter($since, IQueryBuilder::PARAM_INT)));
-		}
-		if ($before !== null) {
-			$qb->andWhere($qb->expr()->lt('last_modified', $qb->createNamedParameter($before, IQueryBuilder::PARAM_INT)));
-		}
-		if ($term !== null) {
-			$qb->andWhere(
-				$qb->expr()->iLike(
-					'title',
-					$qb->createNamedParameter(
-						'%' . $this->db->escapeLikeParameter($term) . '%',
-						IQueryBuilder::PARAM_STR
-					)
-				)
-			);
-		}
-		$qb->orderBy('b.id');
-		if ($limit !== null) {
-			$qb->setMaxResults($limit);
-		}
-		if ($offset !== null) {
-			$qb->setFirstResult($offset);
-		}
-		$sharedEntries = $this->findEntities($qb);
-		foreach ($sharedEntries as $entry) {
-			$entry->setShared(1);
-		}
-		$entries = array_merge($entries, $sharedEntries);
+		$entries = $this->findEntities($sql, [$userId, $since, $userId, Acl::PERMISSION_TYPE_USER, $userId, $since], $limit, $offset);
 		/* @var Board $entry */
 		foreach ($entries as $entry) {
 			$acl = $this->aclMapper->findAll($entry->id);
@@ -230,19 +142,9 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 		return $entries;
 	}
 
-	public function findAllByOwner(string $userId, ?int $limit = null, ?int $offset = null) {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from('deck_boards')
-			->where($qb->expr()->eq('owner', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)))
-			->orderBy('id');
-		if ($limit !== null) {
-			$qb->setMaxResults($limit);
-		}
-		if ($offset !== null) {
-			$qb->setFirstResult($offset);
-		}
-		return $this->findEntities($qb);
+	public function findAllByOwner(string $userId, int $limit = null, int $offset = null) {
+		$sql = 'SELECT * FROM `*PREFIX*deck_boards` WHERE owner = ?';
+		return $this->findEntities($sql, [$userId], $limit, $offset);
 	}
 
 	/**
@@ -254,57 +156,23 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 	 * @param null $offset
 	 * @return array
 	 */
-	public function findAllByGroups(string $userId, array $groups, ?int $limit = null, ?int $offset = null, ?int $since = null,
-									bool $includeArchived = true, ?int $before = null, ?string $term = null) {
+	public function findAllByGroups($userId, $groups, $limit = null, $offset = null, $since = -1,$includeArchived = true) {
 		if (count($groups) <= 0) {
 			return [];
 		}
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('b.id', 'title', 'owner', 'color', 'archived', 'deleted_at', 'last_modified')
-			//->selectAlias('2', 'shared')
-			->from('deck_boards', 'b')
-			->innerJoin('b', 'deck_board_acl', 'acl', $qb->expr()->eq('b.id', 'acl.board_id'))
-			->where($qb->expr()->eq('acl.type', $qb->createNamedParameter(Acl::PERMISSION_TYPE_GROUP, IQueryBuilder::PARAM_INT)))
-			->andWhere($qb->expr()->neq('b.owner', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)));
-		$or = $qb->expr()->orx();
+		$sql = 'SELECT boards.id, title, owner, color, archived, deleted_at, 2 as shared, last_modified FROM `*PREFIX*deck_boards` as boards ' .
+			'INNER JOIN `*PREFIX*deck_board_acl` as acl ON boards.id=acl.board_id WHERE owner != ? AND type=? AND (';
 		for ($i = 0, $iMax = count($groups); $i < $iMax; $i++) {
-			$or->add(
-				$qb->expr()->eq('acl.participant', $qb->createNamedParameter($groups[$i], IQueryBuilder::PARAM_STR))
-			);
+			$sql .= 'acl.participant = ? ';
+			if (count($groups) > 1 && $i < count($groups) - 1) {
+				$sql .= ' OR ';
+			}
 		}
-		$qb->andWhere($or);
+		$sql .= ')';
 		if (!$includeArchived) {
-			$qb->andWhere($qb->expr()->eq('archived', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)))
-				->andWhere($qb->expr()->eq('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
-		}
-		if ($since !== null) {
-			$qb->andWhere($qb->expr()->gt('last_modified', $qb->createNamedParameter($since, IQueryBuilder::PARAM_INT)));
-		}
-		if ($before !== null) {
-			$qb->andWhere($qb->expr()->lt('last_modified', $qb->createNamedParameter($before, IQueryBuilder::PARAM_INT)));
-		}
-		if ($term !== null) {
-			$qb->andWhere(
-				$qb->expr()->iLike(
-					'title',
-					$qb->createNamedParameter(
-						'%' . $this->db->escapeLikeParameter($term) . '%',
-						IQueryBuilder::PARAM_STR
-					)
-				)
-			);
-		}
-		$qb->orderBy('b.id');
-		if ($limit !== null) {
-			$qb->setMaxResults($limit);
-		}
-		if ($offset !== null) {
-			$qb->setFirstResult($offset);
-		}
-		$entries = $this->findEntities($qb);
-		foreach ($entries as $entry) {
-			$entry->setShared(2);
+			$sql .= ' AND NOT archived AND deleted_at = 0';
 		}
+		$entries = $this->findEntities($sql, array_merge([$userId, Acl::PERMISSION_TYPE_GROUP], $groups), $limit, $offset);
 		/* @var Board $entry */
 		foreach ($entries as $entry) {
 			$acl = $this->aclMapper->findAll($entry->id);
@@ -313,59 +181,25 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 		return $entries;
 	}
 
-	public function findAllByCircles(string $userId, ?int $limit = null, ?int $offset = null, ?int $since = null,
-									 bool $includeArchived = true, ?int $before = null, ?string $term = null) {
+	public function findAllByCircles($userId, $limit = null, $offset = null, $since = -1,$includeArchived = true) {
 		$circles = $this->circlesService->getUserCircles($userId);
 		if (count($circles) === 0) {
 			return [];
 		}
 
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('b.id', 'title', 'owner', 'color', 'archived', 'deleted_at', 'last_modified')
-			//->selectAlias('2', 'shared')
-			->from('deck_boards', 'b')
-			->innerJoin('b', 'deck_board_acl', 'acl', $qb->expr()->eq('b.id', 'acl.board_id'))
-			->where($qb->expr()->eq('acl.type', $qb->createNamedParameter(Acl::PERMISSION_TYPE_CIRCLE, IQueryBuilder::PARAM_INT)))
-			->andWhere($qb->expr()->neq('b.owner', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)));
-		$or = $qb->expr()->orx();
+		$sql = 'SELECT boards.id, title, owner, color, archived, deleted_at, 2 as shared, last_modified FROM `*PREFIX*deck_boards` as boards ' .
+			'INNER JOIN `*PREFIX*deck_board_acl` as acl ON boards.id=acl.board_id WHERE owner != ? AND type=? AND (';
 		for ($i = 0, $iMax = count($circles); $i < $iMax; $i++) {
-			$or->add(
-				$qb->expr()->eq('acl.participant', $qb->createNamedParameter($circles[$i], IQueryBuilder::PARAM_STR))
-			);
+			$sql .= 'acl.participant = ? ';
+			if (count($circles) > 1 && $i < count($circles) - 1) {
+				$sql .= ' OR ';
+			}
 		}
-		$qb->andWhere($or);
+		$sql .= ')';
 		if (!$includeArchived) {
-			$qb->andWhere($qb->expr()->eq('archived', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)))
-				->andWhere($qb->expr()->eq('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
-		}
-		if ($since !== null) {
-			$qb->andWhere($qb->expr()->gt('last_modified', $qb->createNamedParameter($since, IQueryBuilder::PARAM_INT)));
-		}
-		if ($before !== null) {
-			$qb->andWhere($qb->expr()->lt('last_modified', $qb->createNamedParameter($before, IQueryBuilder::PARAM_INT)));
-		}
-		if ($term !== null) {
-			$qb->andWhere(
-				$qb->expr()->iLike(
-					'title',
-					$qb->createNamedParameter(
-						'%' . $this->db->escapeLikeParameter($term) . '%',
-						IQueryBuilder::PARAM_STR
-					)
-				)
-			);
-		}
-		$qb->orderBy('b.id');
-		if ($limit !== null) {
-			$qb->setMaxResults($limit);
-		}
-		if ($offset !== null) {
-			$qb->setFirstResult($offset);
-		}
-		$entries = $this->findEntities($qb);
-		foreach ($entries as $entry) {
-			$entry->setShared(2);
+			$sql .= ' AND NOT archived AND deleted_at = 0';
 		}
+		$entries = $this->findEntities($sql, array_merge([$userId, Acl::PERMISSION_TYPE_CIRCLE], $circles), $limit, $offset);
 		/* @var Board $entry */
 		foreach ($entries as $entry) {
 			$acl = $this->aclMapper->findAll($entry->id);
@@ -374,26 +208,21 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 		return $entries;
 	}
 
-	public function findAll(): array {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('id')
-			->from('deck_boards');
-		return $this->findEntities($qb);
+	public function findAll() {
+		$sql = 'SELECT id from *PREFIX*deck_boards;';
+		return $this->findEntities($sql);
 	}
 
 	public function findToDelete() {
 		// add buffer of 5 min
 		$timeLimit = time() - (60 * 5);
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('id', 'title', 'owner', 'color', 'archived', 'deleted_at', 'last_modified')
-			->from('deck_boards')
-			->where($qb->expr()->gt('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)))
-			->andWhere($qb->expr()->lt('deleted_at', $qb->createNamedParameter($timeLimit, IQueryBuilder::PARAM_INT)));
-		return $this->findEntities($qb);
+		$sql = 'SELECT id, title, owner, color, archived, deleted_at, last_modified FROM `*PREFIX*deck_boards` ' .
+			'WHERE `deleted_at` > 0 AND `deleted_at` < ?';
+		return $this->findEntities($sql, [$timeLimit]);
 	}
 
 	public function delete(/** @noinspection PhpUnnecessaryFullyQualifiedNameInspection */
-		\OCP\AppFramework\Db\Entity $entity): \OCP\AppFramework\Db\Entity {
+		\OCP\AppFramework\Db\Entity $entity) {
 		// delete acl
 		$acl = $this->aclMapper->findAll($entity->getId());
 		foreach ($acl as $item) {
@@ -494,11 +323,6 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 	 * Reset cache for a given board or a given user
 	 */
 	public function flushCache(?int $boardId = null, ?string $userId = null) {
-		if ($boardId) {
-			unset($this->boardCache[$boardId]);
-		} else {
-			$this->boardCache = null;
-		}
 		if ($userId) {
 			unset($this->userBoardCache[$userId]);
 		} else {

lib/Db/CardMapper.php

@@ -30,8 +30,6 @@ use OCA\Deck\Search\Query\SearchQuery;
 use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
-use OCP\ICache;
-use OCP\ICacheFactory;
 use OCP\IDBConnection;
 use OCP\IGroupManager;
 use OCP\IUser;
@@ -48,8 +46,6 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 	private $groupManager;
 	/** @var IManager */
 	private $notificationManager;
-	/** @var ICache */
-	private $cache;
 	private $databaseType;
 	private $database4ByteSupport;
 
@@ -59,7 +55,6 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		IUserManager $userManager,
 		IGroupManager $groupManager,
 		IManager $notificationManager,
-		ICacheFactory $cacheFactory,
 		$databaseType = 'sqlite3',
 		$database4ByteSupport = true
 	) {
@@ -68,7 +63,6 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		$this->userManager = $userManager;
 		$this->groupManager = $groupManager;
 		$this->notificationManager = $notificationManager;
-		$this->cache = $cacheFactory->createDistributed('deck-cardMapper');
 		$this->databaseType = $databaseType;
 		$this->database4ByteSupport = $database4ByteSupport;
 	}
@@ -81,9 +75,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 			$description = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $entity->getDescription());
 			$entity->setDescription($description);
 		}
-		$entity = parent::insert($entity);
-		$this->cache->remove('findBoardId:' . $entity->getId());
-		return $entity;
+		return parent::insert($entity);
 	}
 
 	public function update(Entity $entity, $updateModified = true): Entity {
@@ -115,10 +107,6 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 			} catch (Exception $e) {
 			}
 		}
-		// Invalidate cache when the card may be moved to a different board
-		if (isset($updatedFields['stackId'])) {
-			$this->cache->remove('findBoardId:' . $entity->getId());
-		}
 		return parent::update($entity);
 	}
 
@@ -193,7 +181,6 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 			->from('deck_cards', 'c')
 			->join('c', 'deck_stacks', 's', 's.id = c.stack_id')
 			->where($qb->expr()->eq('s.board_id', $qb->createNamedParameter($boardId)))
-			->andWhere($qb->expr()->eq('c.archived', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)))
 			->andWhere($qb->expr()->eq('c.deleted_at', $qb->createNamedParameter('0')))
 			->orderBy('c.duedate')
 			->setMaxResults($limit)
@@ -492,8 +479,8 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		}
 		return $qb->createNamedParameter($dateTime, IQueryBuilder::PARAM_DATE);
 	}
-
-
+	
+	
 
 	public function searchRaw($boardIds, $term, $limit = null, $offset = null) {
 		$qb = $this->queryCardsByBoards($boardIds)
@@ -519,8 +506,9 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 	}
 
 	public function delete(Entity $entity): Entity {
+		// delete assigned labels
 		$this->labelMapper->deleteLabelAssignmentsForCard($entity->getId());
-		$this->cache->remove('findBoardId:' . $entity->getId());
+		// delete card
 		return parent::delete($entity);
 	}
 
@@ -559,22 +547,11 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 	}
 
 	public function findBoardId($id): ?int {
-		$result = $this->cache->get('findBoardId:' . $id);
-		if ($result === null) {
-			try {
-				$qb = $this->db->getQueryBuilder();
-				$qb->select('board_id')
-					->from('deck_stacks', 's')
-					->innerJoin('s', 'deck_cards', 'c', 'c.stack_id = s.id')
-					->where($qb->expr()->eq('c.id', $qb->createNamedParameter($id)));
-				$queryResult = $qb->executeQuery();
-				$result = $queryResult->fetchOne();
-			} catch (\Exception $e) {
-				$result = false;
-			}
-			$this->cache->set('findBoardId:' . $id, $result);
-		}
-		return $result !== false ? $result : null;
+		$sql = 'SELECT id FROM `*PREFIX*deck_boards` WHERE `id` IN (SELECT board_id FROM `*PREFIX*deck_stacks` WHERE id IN (SELECT stack_id FROM `*PREFIX*deck_cards` WHERE id = ?))';
+		$stmt = $this->db->prepare($sql);
+		$stmt->bindParam(1, $id, \PDO::PARAM_INT);
+		$stmt->execute();
+		return $stmt->fetchColumn() ?? null;
 	}
 
 	public function mapOwner(Card &$card) {

lib/Service/BoardService.php

@@ -127,9 +127,8 @@ class BoardService {
 	/**
 	 * Get all boards that are shared with a user, their groups or circles
 	 */
-	public function getUserBoards(?int $since = null, bool $includeArchived = true, ?int $before = null,
-								  ?string $term = null): array {
-		return $this->boardMapper->findAllForUser($this->userId, $since, $includeArchived, $before, $term);
+	public function getUserBoards(int $since = -1, bool $includeArchived = true): array {
+		return $this->boardMapper->findAllForUser($this->userId, $since, $includeArchived);
 	}
 
 	/**
@@ -188,11 +187,9 @@ class BoardService {
 		/** @var Board $board */
 		$board = $this->boardMapper->find($boardId, true, true);
 		$this->boardMapper->mapOwner($board);
-		if ($board->getAcl() !== null) {
-			foreach ($board->getAcl() as $acl) {
-				if ($acl !== null) {
-					$this->boardMapper->mapAcl($acl);
-				}
+		foreach ($board->getAcl() as &$acl) {
+			if ($acl !== null) {
+				$this->boardMapper->mapAcl($acl);
 			}
 		}
 		$permissions = $this->permissionService->matchPermissions($board);

lib/Service/CirclesService.php

@@ -40,8 +40,6 @@ use Throwable;
 class CirclesService {
 	private $circlesEnabled;
 
-	private $userCircleCache = [];
-
 	public function __construct(IAppManager $appManager) {
 		$this->circlesEnabled = $appManager->isEnabledForUser('circles');
 	}
@@ -72,10 +70,6 @@ class CirclesService {
 			return false;
 		}
 
-		if (isset($this->userCircleCache[$circleId][$userId])) {
-			return $this->userCircleCache[$circleId][$userId];
-		}
-
 		try {
 			/** @var CirclesManager $circlesManager */
 			$circlesManager = \OC::$server->get(CirclesManager::class);
@@ -83,14 +77,7 @@ class CirclesService {
 			$circlesManager->startSession($federatedUser);
 			$circle = $circlesManager->getCircle($circleId);
 			$member = $circle->getInitiator();
-			$isUserInCircle = $member !== null && $member->getLevel() >= Member::LEVEL_MEMBER;
-
-			if (!isset($this->userCircleCache[$circleId])) {
-				$this->userCircleCache[$circleId] = [];
-			}
-			$this->userCircleCache[$circleId][$userId] = $isUserInCircle;
-
-			return $isUserInCircle;
+			return $member !== null && $member->getLevel() >= Member::LEVEL_MEMBER;
 		} catch (Throwable $e) {
 		}
 		return false;

lib/Service/FullTextSearchService.php

@@ -59,7 +59,7 @@ class FullTextSearchService {
 
 	/** @var CardMapper */
 	private $cardMapper;
-
+	
 	public function __construct(
 		BoardMapper $boardMapper, StackMapper $stackMapper, CardMapper $cardMapper
 	) {
@@ -187,6 +187,6 @@ class FullTextSearchService {
 	 * @return Board[]
 	 */
 	private function getBoardsFromUser(string $userId): array {
-		return $this->boardMapper->findAllByUser($userId, null, null, null);
+		return $this->boardMapper->findAllByUser($userId, null, null, -1);
 	}
 }

lib/Service/PermissionService.php

@@ -33,6 +33,7 @@ use OCA\Deck\Db\IPermissionMapper;
 use OCA\Deck\Db\User;
 use OCA\Deck\NoPermissionException;
 use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\IConfig;
 use OCP\IGroupManager;
@@ -64,7 +65,6 @@ class PermissionService {
 	private $users = [];
 
 	private $boardCache;
-	private $permissionCache;
 
 	public function __construct(
 		ILogger $logger,
@@ -88,7 +88,6 @@ class PermissionService {
 		$this->userId = $userId;
 
 		$this->boardCache = new CappedMemoryCache();
-		$this->permissionCache = new CappedMemoryCache();
 	}
 
 	/**
@@ -98,21 +97,15 @@ class PermissionService {
 	 * @return bool|array
 	 */
 	public function getPermissions($boardId) {
-		if ($cached = $this->permissionCache->get($boardId)) {
-			return $cached;
-		}
-
 		$owner = $this->userIsBoardOwner($boardId);
 		$acls = $this->aclMapper->findAll($boardId);
-		$permissions = [
+		return [
 			Acl::PERMISSION_READ => $owner || $this->userCan($acls, Acl::PERMISSION_READ),
 			Acl::PERMISSION_EDIT => $owner || $this->userCan($acls, Acl::PERMISSION_EDIT),
 			Acl::PERMISSION_MANAGE => $owner || $this->userCan($acls, Acl::PERMISSION_MANAGE),
 			Acl::PERMISSION_SHARE => ($owner || $this->userCan($acls, Acl::PERMISSION_SHARE))
 				&& (!$this->shareManager->sharingDisabledForUser($this->userId))
 		];
-		$this->permissionCache->set($boardId, $permissions);
-		return $permissions;
 	}
 
 	/**
@@ -124,7 +117,7 @@ class PermissionService {
 	 */
 	public function matchPermissions(Board $board) {
 		$owner = $this->userIsBoardOwner($board->getId());
-		$acls = $board->getAcl() ?? [];
+		$acls = $board->getAcl();
 		return [
 			Acl::PERMISSION_READ => $owner || $this->userCan($acls, Acl::PERMISSION_READ),
 			Acl::PERMISSION_EDIT => $owner || $this->userCan($acls, Acl::PERMISSION_EDIT),
@@ -162,7 +155,7 @@ class PermissionService {
 		}
 
 		try {
-			$acls = $this->getBoard($boardId)->getAcl() ?? [];
+			$acls = $this->getBoard($boardId)->getAcl();
 			$result = $this->userCan($acls, $permission, $userId);
 			if ($result) {
 				return true;
@@ -350,6 +343,5 @@ class PermissionService {
 	 */
 	public function setUserId(string $userId): void {
 		$this->userId = $userId;
-		$this->permissionCache->clear();
 	}
 }

lib/Service/SearchService.php

@@ -90,19 +90,25 @@ class SearchService {
 	}
 
 	public function searchBoards(string $term, ?int $limit, ?int $cursor): array {
-		$boards = $this->boardService->getUserBoards(null, true, $cursor, mb_strtolower($term));
-
+		$boards = $this->boardService->getUserBoards();
+		// get boards that have a lastmodified date which is lower than the cursor
+		// and which match the search term
+		$filteredBoards = array_filter($boards, static function (Board $board) use ($term, $cursor) {
+			return (
+				($cursor === null || $board->getLastModified() < $cursor)
+				&& mb_stripos(mb_strtolower($board->getTitle()), mb_strtolower($term)) > -1
+			);
+		});
 		// sort the boards, recently modified first
-		usort($boards, function ($boardA, $boardB) {
+		usort($filteredBoards, function ($boardA, $boardB) {
 			$ta = $boardA->getLastModified();
 			$tb = $boardB->getLastModified();
 			return $ta === $tb
 				? 0
 				: ($ta > $tb ? -1 : 1);
 		});
-
 		// limit the number of results
-		return array_slice($boards, 0, $limit);
+		return array_slice($filteredBoards, 0, $limit);
 	}
 
 	public function searchComments(string $term, ?int $limit = null, ?int $cursor = null): array {

lib/Sharing/ShareAPIHelper.php

@@ -30,8 +30,10 @@ use OCA\Deck\Db\Acl;
 use OCA\Deck\Db\CardMapper;
 use OCA\Deck\NoPermissionException;
 use OCA\Deck\Service\PermissionService;
+use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\OCS\OCSNotFoundException;
 use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\Files\NotFoundException;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\Share\IShare;
@@ -53,7 +55,11 @@ class ShareAPIHelper {
 
 	public function formatShare(IShare $share): array {
 		$result = [];
-		$card = $this->cardMapper->find($share->getSharedWith());
+		try {
+			$card = $this->cardMapper->find($share->getSharedWith());
+		} catch (DoesNotExistException $e) {
+			throw new NotFoundException($e->getMessage());
+		}
 		$boardId = $this->cardMapper->findBoardId($card->getId());
 		$result['share_with'] = $share->getSharedWith();
 		$result['share_with_displayname'] = $card->getTitle();

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "deck",
 	"description": "",
-	"version": "1.6.4",
+	"version": "1.5.8",
 	"authors": [
 		{
 			"name": "Julius Härtl",
@@ -29,25 +29,24 @@
 	},
 	"dependencies": {
 		"@babel/polyfill": "^7.12.1",
-		"@babel/runtime": "^7.16.0",
+		"@babel/runtime": "^7.14.6",
 		"@juliushaertl/vue-richtext": "^1.0.1",
 		"@nextcloud/auth": "^1.3.0",
-		"@nextcloud/axios": "^1.7.0",
+		"@nextcloud/axios": "^1.6.0",
 		"@nextcloud/dialogs": "^3.1.2",
-		"@nextcloud/event-bus": "^2.1.1",
-		"@nextcloud/files": "^2.1.0",
-		"@nextcloud/initial-state": "^1.2.1",
+		"@nextcloud/event-bus": "^2.0.0",
+		"@nextcloud/files": "^2.0.0",
+		"@nextcloud/initial-state": "^1.2.0",
 		"@nextcloud/l10n": "^1.4.1",
 		"@nextcloud/moment": "^1.1.1",
 		"@nextcloud/router": "^2.0.0",
-		"@nextcloud/vue": "^4.2.0",
+		"@nextcloud/vue": "^3.10.1",
 		"@nextcloud/vue-dashboard": "^2.0.1",
-		"blueimp-md5": "^2.19.0",
-		"dompurify": "^2.3.3",
+		"blueimp-md5": "^2.18.0",
+		"dompurify": "^2.2.9",
 		"lodash": "^4.17.21",
-		"markdown-it": "^12.2.0",
-		"markdown-it-link-attributes": "^3.0.0",
-		"markdown-it-task-checkbox": "^1.0.6",
+		"markdown-it": "^12.0.6",
+		"markdown-it-task-lists": "^2.1.1",
 		"moment": "^2.29.1",
 		"nextcloud-vue-collections": "^0.9.0",
 		"p-queue": "^6.6.2",
@@ -55,9 +54,9 @@
 		"vue": "^2.6.14",
 		"vue-at": "^2.5.0-beta.2",
 		"vue-click-outside": "^1.1.0",
-		"vue-easymde": "^2.0.0",
+		"vue-easymde": "^1.4.0",
 		"vue-infinite-loading": "^2.4.5",
-		"vue-router": "^3.5.3",
+		"vue-router": "^3.5.1",
 		"vue-smooth-dnd": "^0.8.1",
 		"vuex": "^3.6.2",
 		"vuex-router-sync": "^5.0.0"
@@ -70,14 +69,14 @@
 		"npm": "^7.0.0"
 	},
 	"devDependencies": {
-		"@nextcloud/babel-config": "^1.0.0",
-		"@nextcloud/browserslist-config": "^2.2.0",
-		"@nextcloud/eslint-config": "^6.1.0",
+		"@nextcloud/babel-config": "^1.0.0-beta.1",
+		"@nextcloud/browserslist-config": "^2.1.0",
+		"@nextcloud/eslint-config": "^5.1.0",
 		"@nextcloud/stylelint-config": "^1.0.0-beta.0",
-		"@nextcloud/webpack-vue-config": "^4.1.2",
-		"@relative-ci/agent": "^3.0.0",
-		"@vue/test-utils": "^1.2.2",
-		"jest": "^27.3.1",
+		"@nextcloud/webpack-vue-config": "^4.0.3",
+		"@relative-ci/agent": "^2.0.0",
+		"@vue/test-utils": "^1.2.1",
+		"jest": "^27.0.4",
 		"jest-serializer-vue": "^2.0.2",
 		"vue-jest": "^3.0.7"
 	},

src/App.vue

@@ -59,11 +59,6 @@ export default {
 		Content,
 		AppContent,
 	},
-	provide() {
-		return {
-			boardApi,
-		}
-	},
 	data() {
 		return {
 			addButton: {
@@ -117,6 +112,11 @@ export default {
 			this.$router.push({ name: 'board' })
 		},
 	},
+	provide() {
+		return {
+			boardApi,
+		}
+	},
 }
 </script>
 

src/CardCreateDialog.vue

@@ -137,7 +137,7 @@ export default {
 	},
 	computed: {
 		isBoardAndStackChoosen() {
-			return !(this.selectedBoard === '' || this.selectedStack === '')
+			return !(this.selectedBoard === '')
 		},
 	},
 	beforeMount() {

src/components/Controls.vue

@@ -76,108 +76,110 @@
 						<ActionButton v-else icon="icon-filter" />
 					</Actions>
 
-					<div v-if="filterVisible" class="filter">
-						<h3>{{ t('deck', 'Filter by tag') }}</h3>
-						<div v-for="label in labelsSorted" :key="label.id" class="filter--item">
-							<input
-								:id="label.id"
-								v-model="filter.tags"
-								type="checkbox"
-								class="checkbox"
-								:value="label.id"
-								@change="setFilter">
-							<label :for="label.id"><span class="label" :style="labelStyle(label)">{{ label.title }}</span></label>
-						</div>
+					<template>
+						<div v-if="filterVisible" class="filter">
+							<h3>{{ t('deck', 'Filter by tag') }}</h3>
+							<div v-for="label in labelsSorted" :key="label.id" class="filter--item">
+								<input
+									:id="label.id"
+									v-model="filter.tags"
+									type="checkbox"
+									class="checkbox"
+									:value="label.id"
+									@change="setFilter">
+								<label :for="label.id"><span class="label" :style="labelStyle(label)">{{ label.title }}</span></label>
+							</div>
 
-						<h3>{{ t('deck', 'Filter by assigned user') }}</h3>
-						<div class="filter--item">
-							<input
-								id="unassigned"
-								v-model="filter.unassigned"
-								type="checkbox"
-								class="checkbox"
-								value="unassigned"
-								@change="setFilter"
-								@click="beforeSetFilter">
-							<label for="unassigned">{{ t('deck', 'Unassigned') }}</label>
-						</div>
-						<div v-for="user in board.users" :key="user.uid" class="filter--item">
-							<input
-								:id="user.uid"
-								v-model="filter.users"
-								type="checkbox"
-								class="checkbox"
-								:value="user.uid"
-								@change="setFilter">
-							<label :for="user.uid"><Avatar :user="user.uid" :size="24" :disable-menu="true" /> {{ user.displayname }}</label>
-						</div>
+							<h3>{{ t('deck', 'Filter by assigned user') }}</h3>
+							<div class="filter--item">
+								<input
+									id="unassigned"
+									v-model="filter.unassigned"
+									type="checkbox"
+									class="checkbox"
+									value="unassigned"
+									@change="setFilter"
+									@click="beforeSetFilter">
+								<label for="unassigned">{{ t('deck', 'Unassigned') }}</label>
+							</div>
+							<div v-for="user in board.users" :key="user.uid" class="filter--item">
+								<input
+									:id="user.uid"
+									v-model="filter.users"
+									type="checkbox"
+									class="checkbox"
+									:value="user.uid"
+									@change="setFilter">
+								<label :for="user.uid"><Avatar :user="user.uid" :size="24" :disable-menu="true" /> {{ user.displayname }}</label>
+							</div>
 
-						<h3>{{ t('deck', 'Filter by due date') }}</h3>
+							<h3>{{ t('deck', 'Filter by due date') }}</h3>
 
-						<div class="filter--item">
-							<input
-								id="overdue"
-								v-model="filter.due"
-								type="radio"
-								class="radio"
-								value="overdue"
-								@change="setFilter"
-								@click="beforeSetFilter">
-							<label for="overdue">{{ t('deck', 'Overdue') }}</label>
+							<div class="filter--item">
+								<input
+									id="overdue"
+									v-model="filter.due"
+									type="radio"
+									class="radio"
+									value="overdue"
+									@change="setFilter"
+									@click="beforeSetFilter">
+								<label for="overdue">{{ t('deck', 'Overdue') }}</label>
+							</div>
+
+							<div class="filter--item">
+								<input
+									id="dueToday"
+									v-model="filter.due"
+									type="radio"
+									class="radio"
+									value="dueToday"
+									@change="setFilter"
+									@click="beforeSetFilter">
+								<label for="dueToday">{{ t('deck', 'Next 24 hours') }}</label>
+							</div>
+
+							<div class="filter--item">
+								<input
+									id="dueWeek"
+									v-model="filter.due"
+									type="radio"
+									class="radio"
+									value="dueWeek"
+									@change="setFilter"
+									@click="beforeSetFilter">
+								<label for="dueWeek">{{ t('deck', 'Next 7 days') }}</label>
+							</div>
+
+							<div class="filter--item">
+								<input
+									id="dueMonth"
+									v-model="filter.due"
+									type="radio"
+									class="radio"
+									value="dueMonth"
+									@change="setFilter"
+									@click="beforeSetFilter">
+								<label for="dueMonth">{{ t('deck', 'Next 30 days') }}</label>
+							</div>
+
+							<div class="filter--item">
+								<input
+									id="noDue"
+									v-model="filter.due"
+									type="radio"
+									class="radio"
+									value="noDue"
+									@change="setFilter"
+									@click="beforeSetFilter">
+								<label for="noDue">{{ t('deck', 'No due date') }}</label>
+							</div>
+
+							<Button :disabled="!isFilterActive" @click="clearFilter">
+								{{ t('deck', 'Clear filter') }}
+							</Button>
 						</div>
-
-						<div class="filter--item">
-							<input
-								id="dueToday"
-								v-model="filter.due"
-								type="radio"
-								class="radio"
-								value="dueToday"
-								@change="setFilter"
-								@click="beforeSetFilter">
-							<label for="dueToday">{{ t('deck', 'Next 24 hours') }}</label>
-						</div>
-
-						<div class="filter--item">
-							<input
-								id="dueWeek"
-								v-model="filter.due"
-								type="radio"
-								class="radio"
-								value="dueWeek"
-								@change="setFilter"
-								@click="beforeSetFilter">
-							<label for="dueWeek">{{ t('deck', 'Next 7 days') }}</label>
-						</div>
-
-						<div class="filter--item">
-							<input
-								id="dueMonth"
-								v-model="filter.due"
-								type="radio"
-								class="radio"
-								value="dueMonth"
-								@change="setFilter"
-								@click="beforeSetFilter">
-							<label for="dueMonth">{{ t('deck', 'Next 30 days') }}</label>
-						</div>
-
-						<div class="filter--item">
-							<input
-								id="noDue"
-								v-model="filter.due"
-								type="radio"
-								class="radio"
-								value="noDue"
-								@change="setFilter"
-								@click="beforeSetFilter">
-							<label for="noDue">{{ t('deck', 'No due date') }}</label>
-						</div>
-
-						<Button :disabled="!isFilterActive" @click="clearFilter">
-							{{ t('deck', 'Clear filter') }}
-						</Button>
-					</div>
+					</template>
 				</Popover>
 
 				<Actions>

src/components/board/SharingTabSidebar.vue

@@ -208,7 +208,7 @@ export default {
 					confirmClasses: 'error',
 					cancel: t('deck', 'Cancel'),
 				},
-				async (result) => {
+				async(result) => {
 					if (result) {
 						try {
 							this.isLoading = true

src/components/board/TagsTabSidebar.vue

@@ -43,22 +43,24 @@
 
 			<li v-if="addLabel" class="editing">
 				<!-- New Tag -->
-				<form class="label-form" @submit.prevent="clickAddLabel">
-					<ColorPicker class="color-picker-wrapper" :value="'#' + addLabelObj.color" @input="updateColor">
-						<div :style="{ backgroundColor: '#' + addLabelObj.color }" class="color0 icon-colorpicker" />
-					</ColorPicker>
-					<input v-model="addLabelObj.title" type="text">
-					<input v-tooltip="{content: missingDataLabel, show: !addLabelObjValidated, trigger: 'manual' }"
-						:disabled="!addLabelObjValidated"
-						type="submit"
-						value=""
-						class="icon-confirm">
-					<Actions>
-						<ActionButton icon="icon-close" @click="addLabel=false">
-							{{ t('deck', 'Cancel') }}
-						</ActionButton>
-					</Actions>
-				</form>
+				<template>
+					<form class="label-form" @submit.prevent="clickAddLabel">
+						<ColorPicker class="color-picker-wrapper" :value="'#' + addLabelObj.color" @input="updateColor">
+							<div :style="{ backgroundColor: '#' + addLabelObj.color }" class="color0 icon-colorpicker" />
+						</ColorPicker>
+						<input v-model="addLabelObj.title" type="text">
+						<input v-tooltip="{content: missingDataLabel, show: !addLabelObjValidated, trigger: 'manual' }"
+							:disabled="!addLabelObjValidated"
+							type="submit"
+							value=""
+							class="icon-confirm">
+						<Actions>
+							<ActionButton icon="icon-close" @click="addLabel=false">
+								{{ t('deck', 'Cancel') }}
+							</ActionButton>
+						</Actions>
+					</form>
+				</template>
 			</li>
 			<button v-if="canManage && !isArchived" @click="clickShowAddLabel()">
 				<span class="icon-add" />{{ t('deck', 'Add a new tag') }}

src/components/card/AttachmentList.vue

@@ -71,7 +71,7 @@
 					</a>
 				</div>
 				<Actions v-if="selectable">
-					<ActionButton icon="icon-confirm" @click="$emit('select-attachment', attachment)">
+					<ActionButton icon="icon-confirm" @click="$emit('selectAttachment', attachment)">
 						{{ t('deck', 'Add this attachment') }}
 					</ActionButton>
 				</Actions>
@@ -89,10 +89,10 @@
 						{{ t('deck', 'Remove attachment') }}
 					</ActionButton>
 
-					<ActionButton v-if="!attachment.extendedData.fileid && attachment.deletedAt === 0" icon="icon-delete" @click="$emit('delete-attachment', attachment)">
+					<ActionButton v-if="!attachment.extendedData.fileid && attachment.deletedAt === 0" icon="icon-delete" @click="$emit('deleteAttachment', attachment)">
 						{{ t('deck', 'Delete Attachment') }}
 					</ActionButton>
-					<ActionButton v-else-if="!attachment.extendedData.fileid" icon="icon-history" @click="$emit('restore-attachment', attachment)">
+					<ActionButton v-else-if="!attachment.extendedData.fileid" icon="icon-history" @click="$emit('restoreAttachment', attachment)">
 						{{ t('deck', 'Restore Attachment') }}
 					</ActionButton>
 				</Actions>
@@ -225,7 +225,7 @@ export default {
 		},
 		shareFromFiles() {
 			picker.pick()
-				.then(async (path) => {
+				.then(async(path) => {
 					console.debug(`path ${path} selected for sharing`)
 					if (!path.startsWith('/')) {
 						throw new Error(t('files', 'Invalid path selected'))

src/components/card/CardSidebarTabAttachments.vue

@@ -24,8 +24,8 @@
 	<AttachmentList
 		:card-id="card.id"
 		:removable="true"
-		@delete-attachment="deleteAttachment"
-		@restore-attachment="restoreAttachment" />
+		@deleteAttachment="deleteAttachment"
+		@restoreAttachment="restoreAttachment" />
 </template>
 
 <script>

src/components/card/CardSidebarTabDetails.vue

@@ -101,7 +101,6 @@
 					:lang="lang"
 					:formatter="format"
 					:disabled="saving || !canEdit"
-					:shortcuts="shortcuts"
 					confirm />
 				<Actions v-if="canEdit">
 					<ActionButton v-if="copiedCard.duedate" icon="icon-delete" @click="removeDue()">
@@ -177,48 +176,6 @@ export default {
 				stringify: this.stringify,
 				parse: this.parse,
 			},
-			shortcuts: [
-				{
-					text: t('deck', 'Today'),
-					onClick() {
-						const date = new Date()
-						date.setDate(date.getDate())
-						date.setHours(23)
-						date.setMinutes(59)
-						return date
-					},
-				},
-				{
-					text: t('deck', 'Tomorrow'),
-					onClick() {
-						const date = new Date()
-						date.setDate(date.getDate() + 1)
-						date.setHours(23)
-						date.setMinutes(59)
-						return date
-					},
-				},
-				{
-					text: t('deck', 'Next week'),
-					onClick() {
-						const date = new Date()
-						date.setDate(date.getDate() + 7)
-						date.setHours(23)
-						date.setMinutes(59)
-						return date
-					},
-				},
-				{
-					text: t('deck', 'Next month'),
-					onClick() {
-						const date = new Date()
-						date.setDate(date.getDate() + 30)
-						date.setHours(23)
-						date.setMinutes(59)
-						return date
-					},
-				},
-			],
 		}
 	},
 	computed: {
@@ -359,14 +316,6 @@ export default {
 </script>
 <style lang="scss" scoped>
 
-.section-wrapper::v-deep .mx-datepicker-main.mx-datepicker-popup {
-	left: 0 !important;
-}
-
-.section-wrapper::v-deep .mx-datepicker-main.mx-datepicker-popup.mx-datepicker-sidebar {
-	padding: 0 !important;
-}
-
 .section-wrapper {
 	display: flex;
 	max-width: 100%;

src/components/card/CommentItem.vue

@@ -19,45 +19,47 @@
 		</div>
 	</div>
 	<li v-else class="comment">
-		<div class="comment--header">
-			<Avatar :user="comment.actorId" />
-			<span class="has-tooltip username">
-				{{ comment.actorDisplayName }}
-			</span>
-			<Actions v-show="!edit" :force-menu="true">
-				<ActionButton icon="icon-reply" :close-after-click="true" @click="replyTo()">
-					{{ t('deck', 'Reply') }}
-				</ActionButton>
-				<ActionButton v-if="canEdit"
-					icon="icon-rename"
-					:close-after-click="true"
-					@click="showUpdateForm()">
-					{{ t('deck', 'Update') }}
-				</ActionButton>
-				<ActionButton v-if="canEdit"
-					icon="icon-delete"
-					:close-after-click="true"
-					@click="deleteComment()">
-					{{ t('deck', 'Delete') }}
-				</ActionButton>
-			</Actions>
-			<Actions v-if="edit">
-				<ActionButton icon="icon-close" @click="hideUpdateForm" />
-			</Actions>
-			<div class="spacer" />
-			<div class="timestamp">
-				{{ relativeDate(comment.creationDateTime) }}
+		<template>
+			<div class="comment--header">
+				<Avatar :user="comment.actorId" />
+				<span class="has-tooltip username">
+					{{ comment.actorDisplayName }}
+				</span>
+				<Actions v-show="!edit" :force-menu="true">
+					<ActionButton icon="icon-reply" :close-after-click="true" @click="replyTo()">
+						{{ t('deck', 'Reply') }}
+					</ActionButton>
+					<ActionButton v-if="canEdit"
+						icon="icon-rename"
+						:close-after-click="true"
+						@click="showUpdateForm()">
+						{{ t('deck', 'Update') }}
+					</ActionButton>
+					<ActionButton v-if="canEdit"
+						icon="icon-delete"
+						:close-after-click="true"
+						@click="deleteComment()">
+						{{ t('deck', 'Delete') }}
+					</ActionButton>
+				</Actions>
+				<Actions v-if="edit">
+					<ActionButton icon="icon-close" @click="hideUpdateForm" />
+				</Actions>
+				<div class="spacer" />
+				<div class="timestamp">
+					{{ relativeDate(comment.creationDateTime) }}
+				</div>
 			</div>
-		</div>
-		<CommentItem v-if="comment.replyTo" :reply="true" :comment="comment.replyTo" />
-		<div v-show="!edit" ref="richTextElement">
-			<RichText
-				class="comment--content"
-				:text="richText(comment)"
-				:arguments="richArgs(comment)"
-				:autolink="true" />
-		</div>
-		<CommentForm v-if="edit" v-model="commentMsg" @submit="updateComment" />
+			<CommentItem v-if="comment.replyTo" :reply="true" :comment="comment.replyTo" />
+			<div v-show="!edit" ref="richTextElement">
+				<RichText
+					class="comment--content"
+					:text="richText(comment)"
+					:arguments="richArgs(comment)"
+					:autolink="true" />
+			</div>
+			<CommentForm v-if="edit" v-model="commentMsg" @submit="updateComment" />
+		</template>
 	</li>
 </template>
 

src/components/card/Description.vue

@@ -57,7 +57,7 @@
 			ref="markdownEditor"
 			v-model="description"
 			:configs="mdeConfig"
-			@update:modelValue="updateDescription"
+			@input="updateDescription"
 			@blur="saveDescription" />
 
 		<Modal v-if="modalShow" :title="t('deck', 'Choose attachment')" @close="modalShow=false">
@@ -66,7 +66,7 @@
 				<AttachmentList
 					:card-id="card.id"
 					:selectable="true"
-					@select-attachment="addAttachment" />
+					@selectAttachment="addAttachment" />
 			</div>
 		</Modal>
 	</div>
@@ -74,8 +74,7 @@
 
 <script>
 import MarkdownIt from 'markdown-it'
-import MarkdownItTaskCheckbox from 'markdown-it-task-checkbox'
-import MarkdownItLinkAttributes from 'markdown-it-link-attributes'
+import MarkdownItTaskLists from 'markdown-it-task-lists'
 import AttachmentList from './AttachmentList'
 import { Actions, ActionButton, Modal } from '@nextcloud/vue'
 import { formatFileSize } from '@nextcloud/files'
@@ -85,14 +84,7 @@ import { mapState, mapGetters } from 'vuex'
 const markdownIt = new MarkdownIt({
 	linkify: true,
 })
-markdownIt.use(MarkdownItTaskCheckbox, { disabled: false, idPrefix: 'task-item-', ulClass: 'contains-task-list' })
-
-markdownIt.use(MarkdownItLinkAttributes, {
-	attrs: {
-		target: '_blank',
-		rel: 'noreferrer noopener',
-	},
-})
+markdownIt.use(MarkdownItTaskLists, { enabled: true, label: true, labelAfter: true })
 
 export default {
 	name: 'Description',
@@ -231,7 +223,7 @@ export default {
 		updateDescription() {
 			this.descriptionLastEdit = Date.now()
 			clearTimeout(this.descriptionSaveTimeout)
-			this.descriptionSaveTimeout = setTimeout(async () => {
+			this.descriptionSaveTimeout = setTimeout(async() => {
 				await this.saveDescription()
 			}, 2500)
 		},

src/components/cards/AvatarList.vue

@@ -53,19 +53,6 @@
 			<PopoverMenu :menu="popover" />
 			<slot />
 		</div>
-
-		<div class="avatar-print-list">
-			<div v-for="user in avatarUsers" :key="user.id" class="avatar-print-list-item">
-				<Avatar
-					class="avatar-print-list-avatar"
-					:user="user.participant.uid"
-					:display-name="user.participant.displayname"
-					:disable-menu="true"
-					:is-no-user="user.type !== 0"
-					:size="24" />
-				{{ user.participant.displayname }}
-			</div>
-		</div>
 	</div>
 </template>
 
@@ -129,15 +116,6 @@ export default {
 				}),
 			]
 		},
-		avatarUsers() {
-			if (!this.users) {
-				return []
-			}
-
-			return this.users.filter((user) => {
-				return [0, 1, 7].includes(user.type)
-			})
-		},
 	},
 	methods: {
 		togglePopover() {
@@ -198,26 +176,4 @@ export default {
 		display: block;
 		margin: 40px -6px;
 	}
-
-	.avatar-print-list {
-		display: none;
-	}
-
-	@media print {
-		.avatar-list {
-			display: none;
-		}
-
-		.avatar-print-list-item {
-			align-items: center;
-			display: flex;
-			gap: 10px;
-			margin-bottom: 10px;
-		}
-
-		.avatar-print-list {
-			display: block;
-			padding-top: 5px;
-		}
-	}
 </style>

src/components/cards/CardBadges.vue

@@ -41,7 +41,7 @@
 
 		<AvatarList :users="card.assignedUsers" />
 
-		<CardMenu class="card-menu" :card="card" />
+		<CardMenu :card="card" />
 	</div>
 </template>
 <script>
@@ -150,15 +150,4 @@ export default {
 	.fade-enter, .fade-leave-to {
 		opacity: 0;
 	}
-
-	@media print {
-		.badges {
-			align-items: flex-start;
-			max-height: none !important;
-		}
-
-		.card-menu {
-			display: none;
-		}
-	}
 </style>

src/components/cards/badges/DueDate.vue

@@ -23,7 +23,7 @@
 <template>
 	<div v-if="card" class="duedate">
 		<transition name="zoom">
-			<div v-if="card.duedate" :class="dueIcon" :title="absoluteDate">
+			<div v-if="card.duedate" :class="dueIcon">
 				<span>{{ relativeDate }}</span>
 			</div>
 		</transition>
@@ -62,14 +62,14 @@ export default {
 			}
 			return moment(this.card.duedate).fromNow()
 		},
-		absoluteDate() {
-			return moment(this.card.duedate).format('L')
+		dueDateTooltip() {
+			return moment(this.card.duedate).format('LLLL')
 		},
 	},
 }
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" coped>
 	.icon.due {
 		background-position: 4px center;
 		border-radius: 3px;
@@ -105,7 +105,6 @@ export default {
 			padding: 3px 4px;
 		}
 
-		&::before,
 		span {
 			margin-left: 20px;
 			white-space: nowrap;
@@ -113,18 +112,4 @@ export default {
 			overflow: hidden;
 		}
 	}
-
-	@media print {
-		.icon.due {
-			background-color: transparent !important;
-
-			span {
-				display: none;
-			}
-
-			&::before {
-				content: attr(title);
-			}
-		}
-	}
 </style>

src/components/navigation/AppNavigationAddBoard.vue

@@ -39,9 +39,6 @@
 <script>
 import { ColorPicker, ActionButton, Actions, AppNavigationItem } from '@nextcloud/vue'
 
-/**
- *
- */
 function randomColor() {
 	let randomHexColor = ((1 << 24) * Math.random() | 0).toString(16)
 	while (randomHexColor.length < 6) {

src/components/search/GlobalSearchResults.vue

@@ -63,15 +63,10 @@ import { Actions, ActionButton } from '@nextcloud/vue'
 
 const createCancelToken = () => axios.CancelToken.source()
 
-/**
- * @param root0
- * @param root0.query
- * @param root0.cursor
- */
 function search({ query, cursor }) {
 	const cancelToken = createCancelToken()
 
-	const request = async () => axios.get(generateOcsUrl('apps/deck/api/v1.0/search'), {
+	const request = async() => axios.get(generateOcsUrl('apps/deck/api/v1.0/search'), {
 		cancelToken: cancelToken.token,
 		params: {
 			term: query,

src/css/markdown.scss

@@ -21,11 +21,6 @@ ul {
 
 ul {
 	list-style-type: disc;
-
-	.task-list-item {
-		margin-left: -20px;
-		list-style-type: none;
-	}
 }
 
 h1 {
@@ -72,7 +67,7 @@ img {
 }
 
 input[type=checkbox] {
-	margin: 0px 3px 0px 0px;
+	margin: 0px 10px 0px 0px;
 	line-height: 10px;
 	font-size: 10px;
 	display: inline-block;

src/helpers/selector.js

@@ -25,8 +25,9 @@ const buildSelector = (selector, propsData = {}) => {
 	return new Promise((resolve, reject) => {
 		const container = document.createElement('div')
 		document.getElementById('body-user').append(container)
-		const ComponentVM = new Vue({
-			render: (h) => h(selector, propsData),
+		const View = Vue.extend(selector)
+		const ComponentVM = new View({
+			propsData,
 		}).$mount(container)
 		ComponentVM.$root.$on('close', () => {
 			ComponentVM.$el.remove()

src/init-collections.js

@@ -22,6 +22,8 @@
 
 import Vue from 'vue'
 
+import BoardSelector from './BoardSelector'
+import CardSelector from './CardSelector'
 import './../css/collections.css'
 import FileSharingPicker from './views/FileSharingPicker'
 import { buildSelector } from './helpers/selector'
@@ -43,19 +45,13 @@ window.addEventListener('DOMContentLoaded', () => {
 	}
 
 	window.OCP.Collaboration.registerType('deck', {
-		action: () => {
-			const BoardSelector = () => import('./BoardSelector')
-			return buildSelector(BoardSelector)
-		},
+		action: () => buildSelector(BoardSelector),
 		typeString: t('deck', 'Link to a board'),
 		typeIconClass: 'icon-deck',
 	})
 
 	window.OCP.Collaboration.registerType('deck-card', {
-		action: () => {
-			const CardSelector = () => import('./CardSelector')
-			return buildSelector(CardSelector)
-		},
+		action: () => buildSelector(CardSelector),
 		typeString: t('deck', 'Link to a card'),
 		typeIconClass: 'icon-deck',
 	})

src/init-talk.js

@@ -68,15 +68,13 @@ window.addEventListener('DOMContentLoaded', () => {
 			const shortenedMessage = shortenedMessageCandidate === '' ? parsedMessage.substr(0, 255) : shortenedMessageCandidate
 			try {
 				await buildSelector(CardCreateDialog, {
-					props: {
-						title: shortenedMessage,
-						description: parsedMessage + '\n\n' + '['
+					title: shortenedMessage,
+					description: parsedMessage + '\n\n' + '['
 							+ t('deck', 'Message from {author} in {conversationName}', {
 								author: actorDisplayName,
 								conversationName,
 							})
 							+ '](' + window.location.protocol + '//' + window.location.host + generateUrl('/call/' + conversationToken) + ')',
-					},
 				})
 			} catch (e) {
 				console.debug('Card creation dialog was canceled')

src/main.js

@@ -120,7 +120,7 @@ if (!window.OCA.Deck) {
 }
 
 /**
- * @typedef {object} CardRichObject
+ * @typedef {Object} CardRichObject
  * @property {string} id
  * @property {string} name
  * @property {string} boardname
@@ -135,14 +135,13 @@ if (!window.OCA.Deck) {
 
 /**
  * Frontend message API for adding actions to talk messages.
- *
  * @param {*} Object the wrapping object.
- * @param {string} label the action label.
+ * @param {String} label the action label.
  * @param {registerActionCallback} callback the callback function. This function will receive
  * the card as a parameter and be triggered by a click on the
  * action. The card parameter will be of the format of a rich object string
  * type "deck-card"
- * @param {string} icon the action label. E.g. "icon-reply"
+ * @param {String} icon the action label. E.g. "icon-reply"
  */
 window.OCA.Deck.registerCardAction = ({ label, callback, icon }) => {
 	const cardAction = {

src/mixins/attachmentUpload.js

@@ -47,7 +47,7 @@ export default {
 			bodyFormData.append('cardId', this.cardId)
 			bodyFormData.append('type', type)
 			bodyFormData.append('file', file)
-			await queue.add(async () => {
+			await queue.add(async() => {
 				try {
 					await this.$store.dispatch('createAttachment', {
 						cardId: this.cardId,

src/mixins/color.js

@@ -1,4 +1,4 @@
-/*
+/**
  * @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
  *
  * @author Julius Härtl <jus@bitgrid.net>

src/models/index.js

@@ -23,8 +23,8 @@
 /**
  * Board model
  *
- * @typedef {object} Board
- * @property {string} title
+ * @typedef {Object} Board
+ * @property {String} title
  * @property {boolean} archived
  * @property {number} shared 1 (shared) or 0 (not shared)
  */
@@ -32,8 +32,8 @@
 /**
  * Stack model
  *
- * @typedef {object} Stack
- * @property {string} title
+ * @typedef {Object} Stack
+ * @property {String} title
  * @property {number} boardId
  * @property {number} order
  */
@@ -41,15 +41,15 @@
 /**
  * Card model
  *
- * @typedef {object} Card
- * @property {string} title
+ * @typedef {Object} Card
+ * @property {String} title
  * @property {boolean} archived
  * @property {number} order
  */
 /**
  * Label model
  *
- * @typedef {object} Label
- * @property {string} title
- * @property {string} color
+ * @typedef {Object} Label
+ * @property {String} title
+ * @property {String} color
  */

src/services/BoardApi.js

@@ -38,7 +38,7 @@ export class BoardApi {
 	 * Updates a board.
 	 *
 	 * @param {Board} board the board object to update
-	 * @return {Promise}
+	 * @returns {Promise}
 	 */
 	updateBoard(board) {
 		return axios.put(this.url(`/boards/${board.id}`), board)
@@ -57,13 +57,13 @@ export class BoardApi {
 
 	/**
 	 * Creates a new board.
-	 *
-	 * @typedef {object} BoardCreateObject
+	 * @typedef {Object} BoardCreateObject
 	 * @property {string} title
 	 * @property {string} color
+	 *
 	 * @param {BoardCreateObject} boardData The board data to send.
 	 *        color the hexadecimal color value formated /[0-9A-F]{6}/i
-	 * @return {Promise}
+	 * @returns {Promise}
 	 */
 	createBoard(boardData) {
 		return axios.post(this.url('/boards'), boardData)

src/services/StackApi.js

@@ -78,7 +78,7 @@ export class StackApi {
 
 	/**
 	 * @param {Stack} stack stack object to create
-	 * @return {Promise}
+	 * @returns {Promise}
 	 */
 	createStack(stack) {
 		return axios.post(this.url('/stacks'), stack)

src/store/main.js

@@ -353,7 +353,6 @@ export default new Vuex.Store({
 		},
 
 		/**
-		 * @param commit.commit
 		 * @param commit
 		 * @param state
 		 * @param {Board} board
@@ -367,7 +366,6 @@ export default new Vuex.Store({
 				})
 		},
 		/**
-		 * @param commit.commit
 		 * @param commit
 		 * @param state
 		 * @param {Board} board
@@ -383,10 +381,9 @@ export default new Vuex.Store({
 		/**
 		 * Updates a board API side.
 		 *
-		 * @param commit.commit
 		 * @param commit
 		 * @param board The board to update.
-		 * @return {Promise<void>}
+		 * @returns {Promise<void>}
 		 */
 		async updateBoard({ commit }, board) {
 			const storedBoard = await apiClient.updateBoard(board)

src/views/FileSharingPicker.js

@@ -21,6 +21,7 @@
  */
 
 import Vue from 'vue'
+import CardSelector from '../CardSelector'
 import { createShare } from '../services/SharingApi'
 
 export default {
@@ -33,12 +34,12 @@ export default {
 			container.id = 'deck-board-select'
 			const body = document.getElementById('body-user')
 			body.append(container)
-			const CardSelector = () => import('./../CardSelector')
-			const ComponentVM = new Vue({
-				render: (h) => h(CardSelector, {
+			const SelectorView = Vue.extend(CardSelector)
+			const ComponentVM = new SelectorView({
+				propsData: {
 					title: t('deck', 'Share {file} with a Deck card', { file: decodeURIComponent(self.fileInfo.name) }),
 					action: t('deck', 'Share'),
-				}),
+				},
 			})
 			ComponentVM.$mount(container)
 			ComponentVM.$root.$on('close', () => {
@@ -46,7 +47,7 @@ export default {
 				ComponentVM.$destroy()
 				reject(new Error('Canceled'))
 			})
-			ComponentVM.$root.$on('select', async (id) => {
+			ComponentVM.$root.$on('select', async(id) => {
 				const result = await createShare({
 					path: self.fileInfo.path + '/' + self.fileInfo.name,
 					shareType: 12,

tests/psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.22.0@fc2c6ab4d5fa5d644d8617089f012f3bb84b8703">
+<files psalm-version="4.7.3@38c452ae584467e939d55377aaf83b5a26f19dd1">
   <file src="lib/Activity/ActivityManager.php">
     <TypeDoesNotContainType occurrences="1">
       <code>$message !== null</code>
@@ -95,14 +95,6 @@
     <ParamNameMismatch occurrences="1">
       <code>$boardId</code>
     </ParamNameMismatch>
-    <TypeDoesNotContainType occurrences="6">
-      <code>$limit !== null</code>
-      <code>$limit !== null</code>
-      <code>$limit !== null</code>
-      <code>$offset !== null</code>
-      <code>$offset !== null</code>
-      <code>$offset !== null</code>
-    </TypeDoesNotContainType>
   </file>
   <file src="lib/Db/Card.php">
     <UndefinedClass occurrences="2">
@@ -111,6 +103,7 @@
     </UndefinedClass>
   </file>
   <file src="lib/Db/CardMapper.php">
+    <InvalidArgument occurrences="1"/>
     <InvalidScalarArgument occurrences="1">
       <code>$entity-&gt;getId()</code>
     </InvalidScalarArgument>
@@ -253,10 +246,11 @@
     </RedundantCondition>
   </file>
   <file src="lib/Service/FilesAppService.php">
-    <MissingDependency occurrences="3">
+    <MissingDependency occurrences="4">
       <code>$this-&gt;rootFolder</code>
       <code>$this-&gt;rootFolder</code>
       <code>IRootFolder</code>
+      <code>ShareNotFound</code>
     </MissingDependency>
   </file>
   <file src="lib/Service/PermissionService.php">
@@ -270,6 +264,27 @@
       <code>BadRquestException</code>
     </UndefinedClass>
   </file>
+  <file src="lib/Sharing/DeckShareProvider.php">
+    <InvalidReturnStatement occurrences="1">
+      <code>$shares</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="1">
+      <code>getSharesInFolder</code>
+    </InvalidReturnType>
+    <InvalidThrow occurrences="1">
+      <code>throw new GenericShareException('Already shared', $this-&gt;l-&gt;t('Path is already shared with this card'), 403);</code>
+    </InvalidThrow>
+    <MissingDependency occurrences="8">
+      <code>GenericShareException</code>
+      <code>GenericShareException</code>
+      <code>ShareNotFound</code>
+      <code>ShareNotFound</code>
+      <code>ShareNotFound</code>
+      <code>ShareNotFound</code>
+      <code>ShareNotFound</code>
+      <code>ShareNotFound</code>
+    </MissingDependency>
+  </file>
   <file src="lib/Sharing/Listener.php">
     <InvalidArgument occurrences="1">
       <code>[self::class, 'listenPreShare']</code>

tests/unit/Db/BoardMapperTest.php

@@ -163,7 +163,6 @@ class BoardMapperTest extends MapperTestUtility {
 		$actual = $this->boardMapper->find($this->boards[0]->getId(), true, false);
 		/** @var Board $expected */
 		$expected = $this->boards[0];
-		$expected->setLabels([]);
 		$this->assertEquals($expected->getLabels(), $actual->getLabels());
 	}
 

tests/unit/Db/BoardTest.php

@@ -36,29 +36,6 @@ class BoardTest extends TestCase {
 		], $board->jsonSerialize());
 	}
 
-	public function testUnfetchedValues() {
-		$board = $this->createBoard();
-		$board->setUsers(['user1', 'user2']);
-		self::assertNull($board->getAcl());
-		self::assertNull($board->getLabels());
-		$this->assertEquals([
-			'id' => 1,
-			'title' => "My Board",
-			'owner' => "admin",
-			'color' => "000000",
-			'labels' => [],
-			'permissions' => [],
-			'stacks' => [],
-			'deletedAt' => 0,
-			'lastModified' => 0,
-			'acl' => [],
-			'archived' => false,
-			'users' => ['user1', 'user2'],
-			'settings' => [],
-			'ETag' => $board->getETag(),
-		], $board->jsonSerialize());
-	}
-
 	public function testSetLabels() {
 		$board = $this->createBoard();
 		$board->setLabels(["foo", "bar"]);

tests/unit/Notification/NotificationHelperTest.php

@@ -124,7 +124,7 @@ class NotificationHelperTest extends \Test\TestCase {
 			->withConsecutive(
 				[$param1[0], $param2, $param3, $DUE_ASSIGNED],
 				[$param1[1], $param2, $param3, $DUE_ASSIGNED],
-				[$param1[2], $param2, $param3, $DUE_ASSIGNED]
+				[$param1[2], $param2, $param3, $DUE_ASSIGNED],
 			)
 			->willReturn(ConfigService::SETTING_BOARD_NOTIFICATION_DUE_ALL);
 

tests/unit/Service/AttachmentServiceTest.php

@@ -223,11 +223,11 @@ class AttachmentServiceTest extends TestCase {
 			->method('extendData')
 			->withConsecutive(
 				[$attachments[0]],
-				[$attachments[1]]
+				[$attachments[1]],
 			)
 			->willReturnOnConsecutiveCalls(
 				$attachments[0],
-				$attachments[1]
+				$attachments[1],
 			);
 
 		$this->assertEquals($attachments, $this->attachmentService->findAll(123, false));