fix: merge conflicts

Signed-off-by: Luka Trovic <luka@nextcloud.com>

.editorconfig

@@ -3,7 +3,10 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
+indent_size = tab
+indent_style = tab
 insert_final_newline = true
+trim_trailing_whitespace = true
 
 [*.{js,vue}]
 indent_style = tab

.eslintrc.js

@@ -1,4 +1,5 @@
 module.exports = {
+	root: true,
 	extends: [
 		'@nextcloud',
 	],
@@ -7,6 +8,7 @@ module.exports = {
 		'jsdoc/require-param-type': ['off'],
 		'jsdoc/check-param-names': ['off'],
 		'jsdoc/no-undefined-types': ['off'],
-		'jsdoc/require-property-description' : ['off']
+		'jsdoc/require-property-description': ['off'],
+		'import/no-named-as-default-member': ['off']
 	},
 }

.github/dependabot.yml

@@ -11,6 +11,58 @@ updates:
   open-pull-requests-limit: 10
   reviewers:
   - juliushaertl
+
+- package-ecosystem: npm
+  target-branch: stable25
+  versioning-strategy: lockfile-only
+  directory: "/"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  ignore:
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major"]
+  open-pull-requests-limit: 30
+  labels:
+  - 3. to review
+  - dependencies
+
+- package-ecosystem: npm
+  target-branch: stable24
+  versioning-strategy: lockfile-only
+  directory: "/"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  ignore:
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major"]
+  open-pull-requests-limit: 30
+  labels:
+  - 3. to review
+  - dependencies
+
+- package-ecosystem: npm
+  target-branch: stable23
+  versioning-strategy: lockfile-only
+  directory: "/"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  ignore:
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major"]
+  open-pull-requests-limit: 30
+  labels:
+  - 3. to review
+  - dependencies
+
 - package-ecosystem: composer
   directory: "/"
   schedule:

.github/workflows/appbuild.yml

@@ -1,7 +1,11 @@
 name: Package build
 
 on:
-  pull_request:
+  push:
+    branches:
+      - main
+      - master
+      - stable*
 
 jobs:
   build:
@@ -20,7 +24,7 @@ jobs:
     - name: Set up npm7
       run: npm i -g npm@7
     - name: Setup PHP
-      uses: shivammathur/setup-php@2.18.0
+      uses: shivammathur/setup-php@2.22.0
       with:
         php-version: '7.4'
         tools: composer

.github/workflows/appstore-build-publish.yml

@@ -44,7 +44,7 @@ jobs:
           expression: "//info//dependencies//nextcloud/@min-version"
 
       - name: Read package.json node and npm engines version
-        uses: skjnldsv/read-package-engines-version-actions@v1.2
+        uses: skjnldsv/read-package-engines-version-actions@v2.0
         id: versions
         # Continue if no package.json
         continue-on-error: true
@@ -66,14 +66,14 @@ jobs:
         run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
 
       - name: Set up php ${{ env.PHP_VERSION }}
-        uses: shivammathur/setup-php@2.18.0
+        uses: shivammathur/setup-php@2.22.0
         with:
           php-version: ${{ env.PHP_VERSION }}
           coverage: none
 
       - name: Check composer.json
         id: check_composer
-        uses: andstor/file-existence-action@v1
+        uses: andstor/file-existence-action@v2
         with:
           files: "${{ env.APP_NAME }}/composer.json"
 

.github/workflows/command-rebase.yml

@@ -9,9 +9,14 @@ on:
   issue_comment:
     types: created
 
+permissions:	
+  contents: read	
+
 jobs:
   rebase:
     runs-on: ubuntu-latest
+    permissions:
+      contents: none
 
     # On pull requests and if the comment starts with `/rebase`
     if: github.event.issue.pull_request != '' && startsWith(github.event.comment.body, '/rebase')
@@ -32,7 +37,7 @@ jobs:
           token: ${{ secrets.COMMAND_BOT_PAT }}
 
       - name: Automatic Rebase
-        uses: cirrus-actions/rebase@1.5
+        uses: cirrus-actions/rebase@1.8
         env:
           GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}
 

.github/workflows/cypress.yml

@@ -0,0 +1,112 @@
+name: Cypress
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - stable*
+
+env:
+  APP_NAME: deck
+  CYPRESS_baseUrl: http://localhost:8081/index.php
+
+jobs:
+  cypress:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        node-version: [14.x]
+        # containers: [1, 2, 3]
+        php-versions: [ '7.4' ]
+        databases: [ 'sqlite' ]
+        server-versions: [ 'master' ]
+
+    steps:
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Set up npm7
+        run: npm i -g npm@7
+
+      - name: Checkout server
+        uses: actions/checkout@v3
+        with:
+          repository: nextcloud/server
+          ref: ${{ matrix.server-versions }}
+
+      - name: Checkout submodules
+        shell: bash
+        run: |
+          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+          git submodule sync --recursive
+          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+
+      - name: Checkout ${{ env.APP_NAME }}
+        uses: actions/checkout@v3
+        with:
+          path: apps/${{ env.APP_NAME }}
+
+      - name: Set up php ${{ matrix.php-versions }}
+        uses: shivammathur/setup-php@2.22.0
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, zip, gd, apcu
+          ini-values:
+            apc.enable_cli=on
+          coverage: none
+
+      - name: Set up Nextcloud
+        env:
+          DB_PORT: 4444
+          PHP_CLI_SERVER_WORKERS: 10
+        run: |
+          mkdir data
+          php occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
+          php occ config:system:set memcache.local --value="\\OC\\Memcache\\APCu"
+          php occ config:system:set debug --value=true --type=boolean
+          php -f index.php
+          php -S 0.0.0.0:8081 &
+          export OC_PASS=1234561
+          php occ user:add --password-from-env user1
+          php occ user:add --password-from-env user2
+          php occ app:enable deck
+          php occ app:list
+          cd apps/deck
+          composer install --no-dev
+          npm ci
+          npm run build
+          cd ../../
+          curl -v http://localhost:8081/index.php/login
+
+      - name: Cypress run
+        uses: cypress-io/github-action@v5
+        with:
+          record: true
+          parallel: false
+          wait-on: '${{ env.CYPRESS_baseUrl }}'
+          working-directory: 'apps/${{ env.APP_NAME }}'
+          config: defaultCommandTimeout=10000,video=false
+        env:
+          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
+          npm_package_name: ${{ env.APP_NAME }}
+
+      - name: Upload test failure screenshots
+        uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: Upload screenshots
+          path: apps/${{ env.APP_NAME }}/cypress/screenshots/
+          retention-days: 5
+
+      - name: Upload nextcloud logs
+        uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: Upload nextcloud log
+          path: data/nextcloud.log
+          retention-days: 5

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

@@ -8,17 +8,24 @@ name: Dependabot
 on:
   pull_request_target:
     branches:
+      - main
       - master
       - stable*
 
+permissions:
+  contents: read
+
 jobs:
   auto-approve-merge:
     if: github.actor == 'dependabot[bot]'
     runs-on: ubuntu-latest
+    permissions:
+      # for hmarr/auto-approve-action to approve PRs
+      pull-requests: write 
 
     steps:
       # Github actions bot approve
-      - uses: hmarr/auto-approve-action@v2
+      - uses: hmarr/auto-approve-action@v3
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/integration.yml

@@ -2,6 +2,14 @@ name: Integration tests
 
 on:
   pull_request:
+    paths:
+      - '.github/workflows/integration.yml'
+      - 'appinfo/**'
+      - 'lib/**'
+      - 'templates/**'
+      - 'tests/**'
+      - 'composer.json'
+      - 'composer.lock'
   push:
     branches:
       - master
@@ -19,7 +27,7 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['stable24']
+        server-versions: ['master']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
@@ -54,7 +62,7 @@ jobs:
           auth_header="$(git config --local --get http.https://github.com/.extraheader)"
           git submodule sync --recursive
           git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-          cd build/integration && composer require --dev phpunit/phpunit:~8
+          cd build/integration && composer require --dev phpunit/phpunit:~9
 
       - name: Checkout app
         uses: actions/checkout@v3
@@ -62,7 +70,7 @@ jobs:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@2.18.0
+        uses: shivammathur/setup-php@2.22.0
         with:
           php-version: ${{ matrix.php-versions }}
           tools: phpunit
@@ -71,7 +79,7 @@ jobs:
 
       - name: Set up PHPUnit
         working-directory: apps/${{ env.APP_NAME }}
-        run: composer i
+        run: composer i --no-dev
 
       - name: Set up Nextcloud
         run: |

.github/workflows/lint.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up php${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@2.18.0
+        uses: shivammathur/setup-php@2.22.0
         with:
           php-version: ${{ matrix.php-versions }}
           coverage: none
@@ -33,7 +33,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Set up php
-      uses: shivammathur/setup-php@2.18.0
+      uses: shivammathur/setup-php@2.22.0
       with:
         php-version: 7.4
         coverage: none

.github/workflows/nightly.yml

@@ -25,7 +25,7 @@ jobs:
     - name: Set up npm7
       run: npm i -g npm@7
     - name: Setup PHP
-      uses: shivammathur/setup-php@2.18.0
+      uses: shivammathur/setup-php@2.22.0
       with:
         php-version: '7.4'
         tools: composer

.github/workflows/phpunit.yml

@@ -2,6 +2,14 @@ name: PHPUnit
 
 on:
   pull_request:
+    paths:
+      - '.github/workflows/phpunit.yml'
+      - 'appinfo/**'
+      - 'lib/**'
+      - 'templates/**'
+      - 'tests/**'
+      - 'composer.json'
+      - 'composer.lock'
   push:
     branches:
       - master
@@ -20,7 +28,7 @@ jobs:
       matrix:
         php-versions: ['7.4', '8.0', '8.1']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['stable24']
+        server-versions: ['master']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
@@ -62,7 +70,7 @@ jobs:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@2.18.0
+        uses: shivammathur/setup-php@2.22.0
         with:
           php-version: ${{ matrix.php-versions }}
           tools: phpunit

.github/workflows/psalm.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up php
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@2.22.0
         with:
           php-version: 7.4
           coverage: none

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

@@ -28,7 +28,7 @@ jobs:
           submodules: true
 
       - name: Set up php7.4
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@2.22.0
         with:
           php-version: 7.4
           extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
@@ -49,7 +49,7 @@ jobs:
         continue-on-error: true
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v4
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
           commit-message: Update psalm baseline

.gitignore

@@ -9,3 +9,4 @@ tests/.phpunit.result.cache
 vendor/
 .php_cs.cache
 \.idea/
+settings.json

.tx/config

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

CHANGELOG.md

@@ -1,40 +1,45 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## 1.7.3
+## 1.8.0-beta.1
+### Enhancements
+
+- Nextcloud 25 compatibility
+- Performance improvements
+  - Use capped memory cache for board permissions @juliushaertl [#3980](https://github.com/nextcloud/deck/pull/3980)
+  - Improve CalDAV integration performance @juliushaertl [#3982](https://github.com/nextcloud/deck/pull/3982)
+  - Simpify query for getting shared files @juliushaertl [#3983](https://github.com/nextcloud/deck/pull/3983)
+- Accessibility improvements
+  - Add a11y label for sidebar button @marcelklehr [#3986](https://github.com/nextcloud/deck/pull/3986)
+  - Improve filter popover accessibility @juliushaertl [#3820](https://github.com/nextcloud/deck/pull/3820)
+  - Set ids to skip to content/navigation @juliushaertl [#3924](https://github.com/nextcloud/deck/pull/3924)
+  - Invert icons properly in dark mode @juliushaertl [#3939](https://github.com/nextcloud/deck/pull/3939)
+- Bump dependencies
 
 ### Fixed
 
-- feat: add validators to check values in services @juliushaertl [#4176](https://github.com/nextcloud/deck/pull/4176)
-- Add integration test for attachment handling on cards [#4178](https://github.com/nextcloud/deck/pull/4178)
-- disables autocomplete on card creation @juliushaertl [#4182](https://github.com/nextcloud/deck/pull/4182)
-- minor style fixes [#4202](https://github.com/nextcloud/deck/pull/4202)
+- set last modified when the card was found. Fixes #3763 @ylebre [#3796](https://github.com/nextcloud/deck/pull/3796)
+- Increase file count after sharing @luka-nextcloud [#3682](https://github.com/nextcloud/deck/pull/3682)
+- Align Duedate-delete icon properly - fixes nextcloud/deck#3791 @Ben-Ro [#3811](https://github.com/nextcloud/deck/pull/3811)
+- Fix for issue #3637 @flummer [#3833](https://github.com/nextcloud/deck/pull/3833)
+- Switch to 'markdown-it-task-checkbox' for rendering of task lists @q-wertz [#3898](https://github.com/nextcloud/deck/pull/3898)
+- Make rename functions accessibly by keyboard navigation @juliushaertl [#3813](https://github.com/nextcloud/deck/pull/3813)
+- Prevent opening card and applyLabelFilter on card drag end @eneiluj [#3916](https://github.com/nextcloud/deck/pull/3916)
+- Inserted required property in the rename list field, to prevent the l… @mstolf [#3862](https://github.com/nextcloud/deck/pull/3862)
+- Fix share provider for master changes @nickvergessen [#3942](https://github.com/nextcloud/deck/pull/3942)
+- Fetch attachment folder for the correct user during cron job @juliushaertl [#3952](https://github.com/nextcloud/deck/pull/3952)
+- Fix z-index for deck sidebar @Raudius [#3884](https://github.com/nextcloud/deck/pull/3884)
 
+### Other
 
-## 1.7.2
-
-### Fixed
-
-- Cache user membership for circles [#4132](https://github.com/nextcloud/deck/pull/4132)
-- Set event link also for notifications that get emitted from activities [#4118](https://github.com/nextcloud/deck/pull/4118)
-- Fix Card menu not displaying when description is not set [#4103](https://github.com/nextcloud/deck/pull/4103)
-- disable Create card button while no stack is chosen [#4019](https://github.com/nextcloud/deck/pull/4019)
-- to nextcloud/OCP package in stable24 [#4093](https://github.com/nextcloud/deck/pull/4093)
-- Fix attachment creator name: show display name [#4037](https://github.com/nextcloud/deck/pull/4037)
-- Use capped memory cache for board permissions [#3997](https://github.com/nextcloud/deck/pull/3997)
-- Improve CalDAV integration performance [#3995](https://github.com/nextcloud/deck/pull/3995)
-- Fetch attachment folder for the correct user during cron job [#3959](https://github.com/nextcloud/deck/pull/3959)
-- Switch to 'markdown-it-task-checkbox' for rendering of task lists [#3925](https://github.com/nextcloud/deck/pull/3925)
-- Prevent opening card and applyLabelFilter on card drag end [#3917](https://github.com/nextcloud/deck/pull/3917)
-- Fix for issue #3637 [#3901](https://github.com/nextcloud/deck/pull/3901)
-- Fix z-index for deck sidebar [#3885](https://github.com/nextcloud/deck/pull/3885)
-
-## 1.7.1
-
-### Fixed
-- 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)
-- Fetch full board data after cloning [#3781](https://github.com/nextcloud/deck/pull/3781)
+- Switch from OC::$server->get to OCP\Server::get @CarlSchwan [#3801](https://github.com/nextcloud/deck/pull/3801)
+- Add performance section in README @eneiluj [#3830](https://github.com/nextcloud/deck/pull/3830)
+- Fix static analysis by stubbing more circle methods @juliushaertl [#3900](https://github.com/nextcloud/deck/pull/3900)
+- fix(docs): fix links to JSON schemas for Trello @wiktor2200 [#3872](https://github.com/nextcloud/deck/pull/3872)
+- Move to OCP\Collaboration\Resources\LoadAdditionalScriptsEvent @juliushaertl [#3818](https://github.com/nextcloud/deck/pull/3818)
+- Rename settings to deck settings @PVince81 [#3928](https://github.com/nextcloud/deck/pull/3928)
+- SCSS cleanup @juliushaertl [#3803](https://github.com/nextcloud/deck/pull/3803)
+- Hide deprecated projects in sidebar and card details by default @Pytal [#3984](https://github.com/nextcloud/deck/pull/3984)
 
 ## 1.7.0
 
@@ -86,7 +91,7 @@ All notable changes to this project will be documented in this file.
 - Adapt the card modal to upstream changes [#3764](https://github.com/nextcloud/deck/pull/3764)
 - Fix text selection in dark mode and modal view [#3765](https://github.com/nextcloud/deck/pull/3765)
 - Add missing indices [#3754](https://github.com/nextcloud/deck/pull/3754)
-- Handle qb mapper exception messages properly @juliushaertl [#3769](https://github.com/nextcloud/deck/pull/3769)
+
 
 ## 1.6.0-beta1
 

Makefile

@@ -30,6 +30,16 @@ build: clean-dist install-deps build-js
 
 release: clean-dist install-deps-nodev build-js
 
+lint: lint-js lint-php
+
+lint-js:
+	npm run lint
+	npm run stylelint
+
+lint-php:
+	composer run lint 1>/dev/null
+	composer run cs:check
+
 build-js: install-deps-js
 	npm run build
 

README.md

@@ -20,13 +20,14 @@ Deck is a kanban style organization tool aimed at personal planning and project
 ### Mobile apps
 
 - [Nextcloud Deck app for Android](https://github.com/stefan-niedermann/nextcloud-deck) - It is available in [F-Droid](https://f-droid.org/de/packages/it.niedermann.nextcloud.deck/) and the [Google Play Store](https://play.google.com/store/apps/details?id=it.niedermann.nextcloud.deck.play)
+- [deck NG for Android and iOS](https://github.com/meltzow/deck-ng) - It is available in [Google Play Store](https://play.google.com/store/apps/details?id=net.meltzow.deckng) and [Apple App Store](https://apps.apple.com/us/app/deck-ng/id6443334702)
 
 ### 3rd-Party Integrations
 
 - [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 
+- [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.
@@ -52,14 +53,32 @@ Please make sure you have installed the following dependencies: `make, which, ta
 
 Instead of setting everything up manually, you can just [download the nightly build](https://github.com/nextcloud/deck/releases/tag/nightly) instead. These builds are updated every 24 hours, and are pre-configured with all the needed dependencies.
 
+## Performance limitations
+
+Deck is not yet ready for intensive usage.
+A lot of database queries are generated when the number of boards, cards and attachments is high.
+For example, a user having access to 13 boards, with each board having on average 100 cards,
+and each card having on average 5 attachments,
+would generate 6500 database queries when doing the file related queries
+which would increase the page loading time significantly.
+
+Improvements on Nextcloud server and Deck itself will improve the situation.
+
 ## Developing
 
+### Nextcloud environment
+
+You need to setup a [development environment](https://docs.nextcloud.com/server/latest/developer_manual//getting_started/devenv.html) of the current nextcloud version. You can also alternatively install & run the [nextcloud docker container](https://github.com/juliushaertl/nextcloud-docker-dev).
+After the finished installation, you can clone the deck project directly in the `/[nextcloud-docker-dev-dir]/workspace/server/apps/` folder. 
+
 ### PHP
 
 Nothing to prepare, just dig into the code.
 
 ### JavaScript
 
+This requires at least Node 16 and npm 7 to be installed.
+
 Deck requires running a `make build-js` to install npm dependencies and build the JavaScript code using webpack. While developing you can also use `make watch` to rebuild everytime the code changes.
 
 #### Hot reloading

appinfo/info.xml

@@ -16,7 +16,7 @@
 - 🚀 Get your project organized
 
 </description>
-    <version>1.7.3</version>
+    <version>1.9.0-beta.1</version>
     <licence>agpl</licence>
     <author>Julius Härtl</author>
     <namespace>Deck</namespace>
@@ -34,13 +34,18 @@
         <database min-version="9.4">pgsql</database>
         <database>sqlite</database>
         <database min-version="8.0">mysql</database>
-        <nextcloud min-version="24" max-version="24"/>
+        <nextcloud min-version="26" max-version="26"/>
     </dependencies>
     <background-jobs>
         <job>OCA\Deck\Cron\DeleteCron</job>
         <job>OCA\Deck\Cron\ScheduledNotifications</job>
         <job>OCA\Deck\Cron\CardDescriptionActivity</job>
     </background-jobs>
+    <repair-steps>
+        <live-migration>
+            <step>OCA\Deck\Migration\DeletedCircleCleanup</step>
+        </live-migration>
+    </repair-steps>
     <commands>
         <command>OCA\Deck\Command\UserExport</command>
         <command>OCA\Deck\Command\BoardImport</command>

composer.json

@@ -19,7 +19,7 @@
 		"symfony/event-dispatcher": "^4.0",
 		"vimeo/psalm": "^4.3",
 		"php-parallel-lint/php-parallel-lint": "^1.2",
-		"nextcloud/ocp": "dev-stable24"
+		"nextcloud/ocp": "dev-master"
 	},
 	"config": {
 		"optimize-autoloader": true,
@@ -36,6 +36,7 @@
 		"cs:check": "php-cs-fixer fix --dry-run --diff",
 		"cs:fix": "php-cs-fixer fix",
 		"psalm": "psalm",
+		"psalm:update-baseline": "psalm --update-baseline",
 		"psalm:fix": "psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MismatchingDocblockParamType,MismatchingDocblockReturnType,MissingParamType,InvalidFalsableReturnType",
 		"test": [
 			"@test:unit",

css/deck.css

@@ -0,0 +1,9 @@
+.icon-deck {
+	background-image: url(../img/deck-dark.svg);
+	filter: var(--background-invert-if-dark);
+}
+
+.icon-deck-white, .icon-deck.icon-white {
+	background-image: url(../img/deck.svg);
+	filter: var(--background-invert-if-dark);
+}

css/deck.scss

@@ -1 +0,0 @@
-@include icon-black-white('deck', 'deck', 1);

css/icons.scss

@@ -1,41 +0,0 @@
-/**
- * Custom icons
- */
-@include icon-black-white('deck', 'deck', 1);
-@include icon-black-white('archive', 'deck', 1);
-@include icon-black-white('circles', 'deck', 1);
-@include icon-black-white('clone', 'deck', 1);
-@include icon-black-white('filter', 'deck', 1);
-@include icon-black-white('filter_set', 'deck', 1);
-@include icon-black-white('attach', 'deck', 1);
-@include icon-black-white('reply', 'deck', 1);
-@include icon-black-white('notifications-dark', 'deck', 1);
-@include icon-black-white('description', 'deck', 1);
-
-.icon-toggle-compact-collapsed {
-	@include icon-color('toggle-view-expand', 'deck', $color-black);
-}
-
-.icon-toggle-compact-expanded {
-	@include icon-color('toggle-view-collapse', 'deck', $color-black);
-}
-.icon-activity {
-	@include icon-color('activity-dark', 'activity', $color-black);
-}
-.icon-comment--unread {
-	@include icon-color('comment', 'actions', $color-primary, 1, true);
-}
-
-.avatardiv.circles {
-	background: var(--color-primary);
-}
-
-.icon-circles {
-	opacity: 1;
-	background-size: 20px;
-	background-position: center center;
-}
-
-.icon-colorpicker {
-	background-image: url('../img/color_picker.svg');
-}

cypress.config.js

@@ -0,0 +1,17 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+  projectId: '1s7wkc',
+  viewportWidth: 1280,
+  viewportHeight: 720,
+  e2e: {
+    // We've imported your old cypress plugins here.
+    // You may want to clean this up later by importing these.
+    setupNodeEvents(on, config) {
+      return require('./cypress/plugins/index.js')(on, config)
+    },
+    baseUrl: 'http://nextcloud.local/index.php',
+    experimentalSessionAndOrigin: true,
+    specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
+  },
+})

cypress/e2e/boardFeatures.js

@@ -0,0 +1,41 @@
+import { randHash } from '../utils'
+const randUser = randHash()
+
+describe('Board', function() {
+	const password = 'pass123'
+
+	before(function() {
+		cy.nextcloudCreateUser(randUser, password)
+	})
+
+	beforeEach(function() {
+		cy.login(randUser, password)
+	})
+
+	it('Can create a board', function() {
+		const board = 'TestBoard'
+
+		cy.intercept({
+			method: 'POST',
+			url: '/index.php/apps/deck/boards',
+		}).as('createBoardRequest')
+
+		// Click "Add board"
+		cy.openLeftSidebar()
+		cy.get('#app-navigation-vue .app-navigation__list .app-navigation-entry')
+			.eq(3).find('a').first().click({ force: true })
+
+		// Type the board title
+		cy.get('.board-create form input[type=text]')
+			.type(board, { force: true })
+
+		// Submit
+		cy.get('.board-create form input[type=submit]')
+			.first().click({ force: true })
+
+		cy.wait('@createBoardRequest').its('response.statusCode').should('equal', 200)
+
+		cy.get('.app-navigation__list .app-navigation-entry__children .app-navigation-entry')
+			.contains(board).should('be.visible')
+	})
+})

cypress/e2e/cardFeatures.js

@@ -0,0 +1,67 @@
+import { randHash } from '../utils'
+const randUser = randHash()
+
+const testBoardData = {
+	title: 'MyBoardTest',
+	color: '00ff00',
+	stacks: [
+		{
+			title: 'TestList',
+			cards: [
+				{
+					title: 'Hello world',
+				},
+			],
+		},
+	],
+}
+
+describe('Card', function() {
+	before(function() {
+		cy.nextcloudCreateUser(randUser, randUser)
+		cy.createExampleBoard({
+			user: randUser,
+			password: randUser,
+			board: testBoardData,
+		})
+	})
+
+	beforeEach(function() {
+		cy.login(randUser, randUser)
+	})
+
+	it('Can show card details modal', function() {
+		cy.openLeftSidebar()
+		cy.getNavigationEntry(testBoardData.title)
+			.first().click({ force: true })
+
+		cy.get('.board .stack').eq(0).within(() => {
+			cy.get('.card:contains("Hello world")').should('be.visible').click()
+		})
+
+		cy.get('.modal__card').should('be.visible')
+		cy.get('.app-sidebar-header__maintitle').contains('Hello world')
+	})
+
+	it('Can add a card', function() {
+		const newCardTitle = 'Write some cypress tests'
+
+		cy.openLeftSidebar()
+		cy.getNavigationEntry(testBoardData.title)
+			.first().click({ force: true })
+
+		cy.get('.board .stack').eq(0).within(() => {
+			cy.get('.card:contains("Hello world")').should('be.visible')
+
+			cy.get('.button-vue[aria-label*="Add card"]')
+				.first().click()
+
+			cy.get('.stack__card-add form input#new-stack-input-main')
+				.type(newCardTitle)
+			cy.get('.stack__card-add form input[type=submit]')
+				.first().click()
+			cy.get(`.card:contains("${newCardTitle}")`).should('be.visible')
+		})
+	})
+
+})

cypress/e2e/deckDashboard.js

@@ -0,0 +1,31 @@
+import { randHash } from '../utils'
+const randUser = randHash()
+
+describe('Deck dashboard', function() {
+	const password = 'pass123'
+
+	before(function() {
+		cy.nextcloudCreateUser(randUser, password)
+	})
+
+	beforeEach(function() {
+		cy.login(randUser, password)
+	})
+
+	it('Can show the right title on the dashboard', function() {
+		cy.get('.board-title h2')
+        	.should('have.length', 1).first()
+        	.should('have.text', 'Upcoming cards')
+	})
+
+	it('Can see the default "Personal Board" created for user by default', function() {
+		const defaultBoard = 'Personal'
+
+		cy.openLeftSidebar()
+		cy.get('.app-navigation-entry-wrapper[icon=icon-deck]')
+			.find('ul.app-navigation-entry__children .app-navigation-entry:contains(' + defaultBoard + ')')
+			.first()
+			.contains(defaultBoard)
+			.should('be.visible')
+	})
+})

cypress/e2e/stackFeatures.js

@@ -0,0 +1,30 @@
+import { randHash } from '../utils'
+const randUser = randHash()
+
+describe('Stack', function() {
+	const board = 'TestBoard'
+	const password = 'pass123'
+	const stack = 'List 1'
+
+	before(function() {
+		cy.nextcloudCreateUser(randUser, password)
+		cy.deckCreateBoard({ user: randUser, password }, board)
+	})
+
+	beforeEach(function() {
+		cy.logout()
+		cy.login(randUser, password)
+	})
+
+	it('Can create a stack', function() {
+		cy.openLeftSidebar()
+		cy.getNavigationEntry(board)
+			.click({ force: true })
+
+		cy.get('#stack-add button').first().click()
+		cy.get('#stack-add form input#new-stack-input-main').type(stack)
+		cy.get('#stack-add form input[type=submit]').first().click()
+
+		cy.get('.board .stack').eq(0).contains(stack).should('be.visible')
+	})
+})

cypress/fixtures/example.json

@@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "hello@cypress.io",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}

cypress/plugins/index.js

@@ -0,0 +1,22 @@
+/// <reference types="cypress" />
+// ***********************************************************
+// This example plugins/index.js can be used to load plugins
+//
+// You can change the location of this file or turn off loading
+// the plugins file with the 'pluginsFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/plugins-guide
+// ***********************************************************
+
+// This function is called when a project is opened or re-opened (e.g. due to
+// the project's config changing)
+
+/**
+ * @type {Cypress.PluginConfig}
+ */
+// eslint-disable-next-line no-unused-vars
+module.exports = (on, config) => {
+	// `on` is used to hook into various events Cypress emits
+	// `config` is the resolved Cypress config
+}

cypress/support/commands.js

@@ -0,0 +1,159 @@
+/**
+ * @copyright Copyright (c) 2019 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+const url = Cypress.config('baseUrl').replace(/\/index.php\/?$/g, '')
+Cypress.env('baseUrl', url)
+
+Cypress.Commands.add('login', (user, password, route = '/apps/deck/') => {
+	const session = `${user}-${Date.now()}`
+	cy.session(session, function() {
+		cy.visit(route)
+		cy.get('input[name=user]').type(user)
+		cy.get('input[name=password]').type(password)
+		cy.get('form[name=login] [type=submit]').click()
+		cy.url().should('include', route)
+	})
+	cy.visit(route)
+})
+
+Cypress.Commands.add('logout', (route = '/') => {
+	cy.session('_guest', function() {})
+})
+
+Cypress.Commands.add('nextcloudCreateUser', (user, password) => {
+	cy.clearCookies()
+	cy.request({
+		method: 'POST',
+		url: `${Cypress.env('baseUrl')}/ocs/v1.php/cloud/users?format=json`,
+		form: true,
+		body: {
+			userid: user,
+			password,
+		},
+		auth: { user: 'admin', pass: 'admin' },
+		headers: {
+			'OCS-ApiRequest': 'true',
+			'Content-Type': 'application/x-www-form-urlencoded',
+		},
+	}).then((response) => {
+		cy.log(`Created user ${user}`, response.status)
+	})
+})
+
+Cypress.Commands.add('nextcloudUpdateUser', (user, password, key, value) => {
+	cy.request({
+		method: 'PUT',
+		url: `${Cypress.env('baseUrl')}/ocs/v2.php/cloud/users/${user}`,
+		form: true,
+		body: { key, value },
+		auth: { user, pass: password },
+		headers: {
+			'OCS-ApiRequest': 'true',
+			'Content-Type': 'application/x-www-form-urlencoded',
+		},
+	}).then((response) => {
+		cy.log(`Updated user ${user} ${key} to ${value}`, response.status)
+	})
+})
+
+Cypress.Commands.add('openLeftSidebar', () => {
+	cy.get('.app-navigation button.app-navigation-toggle').click()
+})
+
+Cypress.Commands.add('deckCreateBoard', ({ user, password }, title) => {
+	cy.login(user, password)
+
+	cy.get('.app-navigation button.app-navigation-toggle').click()
+	cy.get('#app-navigation-vue .app-navigation__list .app-navigation-entry')
+		.eq(3)
+		.find('a')
+		.first()
+		.click({ force: true })
+
+	cy.get('.board-create form input[type=text]').type(title, { force: true })
+
+	cy.get('.board-create form input[type=submit]')
+		.first()
+		.click({ force: true })
+})
+
+Cypress.Commands.add('deckCreateList', ({ user, password }, title) => {
+	cy.login(user, password)
+
+	cy.get('.app-navigation button.app-navigation-toggle').click()
+	cy.get('#app-navigation-vue .app-navigation__list .app-navigation-entry')
+		.eq(3)
+		.find('a.app-navigation-entry-link')
+		.first()
+		.click({ force: true })
+
+	cy.get('#stack-add button').first().click()
+	cy.get('#stack-add form input#new-stack-input-main').type(title)
+	cy.get('#stack-add form input[type=submit]').first().click()
+})
+
+Cypress.Commands.add('createExampleBoard', ({ user, password, board }) => {
+	cy.request({
+		method: 'POST',
+		url: `${Cypress.env('baseUrl')}/index.php/apps/deck/api/v1.0/boards`,
+		auth: {
+			user,
+			password,
+		},
+		body: { title: board.title, color: board.color ?? 'ff0000' },
+	}).then((boardResponse) => {
+		expect(boardResponse.status).to.eq(200)
+		const boardData = boardResponse.body
+		for (const stackIndex in board.stacks) {
+			const stack = board.stacks[stackIndex]
+			cy.request({
+				method: 'POST',
+				url: `${Cypress.env('baseUrl')}/index.php/apps/deck/api/v1.0/boards/${boardData.id}/stacks`,
+				auth: {
+					user,
+					password,
+				},
+				body: { title: stack.title, order: 0 },
+			}).then((stackResponse) => {
+				const stackData = stackResponse.body
+				for (const cardIndex in stack.cards) {
+					const card = stack.cards[cardIndex]
+					cy.request({
+						method: 'POST',
+						url: `${Cypress.env('baseUrl')}/index.php/apps/deck/api/v1.0/boards/${boardData.id}/stacks/${stackData.id}/cards`,
+						auth: {
+							user,
+							password,
+						},
+						body: { title: card.title },
+					})
+				}
+			})
+		}
+	})
+})
+
+Cypress.Commands.add('getNavigationEntry', (boardTitle) => {
+	return cy.get('.app-navigation-entry-wrapper[icon=icon-deck]')
+		.find('ul.app-navigation-entry__children .app-navigation-entry:contains(' + boardTitle + ')')
+		.find('a.app-navigation-entry-link')
+})

cypress/support/e2e.js

@@ -0,0 +1,20 @@
+// ***********************************************************
+// This example support/index.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import './commands'
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')

cypress/utils/index.js

@@ -0,0 +1 @@
+export const randHash = () => Math.random().toString(36).replace(/[^a-z]+/g, '').slice(0, 10)

docs/API.md

@@ -1,7 +1,7 @@
 
 The REST API provides access for authenticated users to their data inside the Deck app. To get a better understanding of Decks data models and their relations, please have a look at the  [data structure](structure.md) documentation.
 
-# Prequisited
+# Prerequisites
 
 - All requests require a `OCS-APIRequest` HTTP header to be set to `true` and a `Content-Type` of `application/json`.
 - The API is located at https://nextcloud.local/index.php/apps/deck/api/v1.0
@@ -9,7 +9,7 @@ The REST API provides access for authenticated users to their data inside the De
 
 ## Naming
 
-- Board is the the project like grouping of tasks that can be shared to different users and groups
+- Board is the project like grouping of tasks that can be shared to different users and groups
 
 - Stack is the grouping of cards which is rendered in vertical columns in the UI
 
@@ -1066,6 +1066,7 @@ Deck stores user and app configuration values globally and per board. The GET en
 | --- | --- |
 | calendar | Determines if the calendar/tasks integration through the CalDAV backend is enabled for the user (boolean) | 
 | cardDetailsInModal | Determines if the bigger view is used (boolean) | 
+| cardIdBadge | Determines if the ID badges are displayed on cards (boolean) | 
 | groupLimit | Determines if creating new boards is limited to certain groups of the instance. The resulting output is an array of group objects with the id and the displayname (Admin only)|  
 
 ```
@@ -1079,6 +1080,7 @@ Deck stores user and app configuration values globally and per board. The GET en
     "data": {
       "calendar": true,
       "cardDetailsInModal": true,
+      "cardIdBadge": true,
       "groupLimit": [
         {
           "id": "admin",
@@ -1109,6 +1111,7 @@ Deck stores user and app configuration values globally and per board. The GET en
 | notify-due | `off`, `assigned` or `all` |
 | calendar | Boolean |
 | cardDetailsInModal | Boolean |
+| cardIdBadge | Boolean |
  
 #### Example request
 

docs/User_documentation_en.md

@@ -90,7 +90,7 @@ Steps:
 * Create the configuration file
 * Execute the import informing the import file path, data file and source as `Trello JSON`
 
-Create the configuration file respecting the [JSON Schema](https://github.com/nextcloud/deck/blob/master/lib/Service/fixtures/config-trelloJson-schema.json) for import `Trello JSON`
+Create the configuration file respecting the [JSON Schema](https://github.com/nextcloud/deck/blob/master/lib/Service/Importer/fixtures/config-trelloJson-schema.json) for import `Trello JSON`
 
 Example configuration file:
 ```json
@@ -120,7 +120,7 @@ https://api.trello.com/1/members/me/boards?key={yourKey}&token={yourToken}&field
   This ID you will use in the configuration file in the `board` property
 * Create the configuration file
 
-Create the configuration file respecting the [JSON Schema](https://github.com/nextcloud/deck/blob/master/lib/Service/fixtures/config-trelloApi-schema.json) for import `Trello JSON`
+Create the configuration file respecting the [JSON Schema](https://github.com/nextcloud/deck/blob/master/lib/Service/Importer/fixtures/config-trelloApi-schema.json) for import `Trello JSON`
 
 Example configuration file:
 ```json

img/activity-dark.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.0" viewbox="0 0 32 32">
+ <path d="m16 1-10 18h11l-1 12 10-18h-11z"/>
+</svg>

img/activity.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.0" viewBox="0 0 32 32">
+ <path d="m16 1-10 18h11l-1 12 10-18h-11z" fill="#FFF"/>
+</svg>

img/archive-white.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><g transform="translate(0 -1036.362)" fill="#fff"><path d="M1.93 1041.296c-.185 0-.336.138-.336.31v9.842c0 .172.15.313.336.313h12.517c.185 0 .333-.14.333-.313v-9.842c0-.172-.148-.31-.333-.31H1.93zm4.124 1.507h4.223c.39 0 .705.314.705.704v.43c0 .39-.315.705-.705.705H6.054a.703.703 0 0 1-.705-.705v-.43c0-.39.314-.704.705-.704z"/><rect width="15.742" height="2.296" x=".136" y="1037.543" ry="0"/></g></svg>

img/circles-dark.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 58 58" width="512" height="512"><g fill="#000"><path d="M54.319 37.839C54.762 35.918 55 33.96 55 32c0-9.095-4.631-17.377-12.389-22.153a1 1 0 1 0-1.049 1.703C48.724 15.96 53 23.604 53 32c0 1.726-.2 3.451-.573 5.147A6.992 6.992 0 0 0 51 37c-3.86 0-7 3.141-7 7s3.14 7 7 7 7-3.141 7-7a7.006 7.006 0 0 0-3.681-6.161zM38.171 54.182A23.867 23.867 0 0 1 29 56a24.047 24.047 0 0 1-17.017-7.092A6.974 6.974 0 0 0 14 44c0-3.859-3.14-7-7-7s-7 3.141-7 7 3.14 7 7 7a6.952 6.952 0 0 0 3.381-.875C15.26 55.136 21.994 58 29 58c3.435 0 6.778-.663 9.936-1.971.51-.211.753-.796.542-1.307a1.001 1.001 0 0 0-1.307-.54zM4 31.213a1 1 0 0 0 1.068-.927c.712-10.089 7.586-18.52 17.22-21.314C23.142 11.874 25.825 14 29 14c3.86 0 7-3.141 7-7s-3.14-7-7-7c-3.851 0-6.985 3.127-6.999 6.975C11.42 9.922 3.851 19.12 3.073 30.146A.999.999 0 0 0 4 31.213z"/></g></svg>

img/circles.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 58 58" width="512" height="512"><g fill="#000"><path d="M54.319 37.839C54.762 35.918 55 33.96 55 32c0-9.095-4.631-17.377-12.389-22.153a1 1 0 1 0-1.049 1.703C48.724 15.96 53 23.604 53 32c0 1.726-.2 3.451-.573 5.147A6.992 6.992 0 0 0 51 37c-3.86 0-7 3.141-7 7s3.14 7 7 7 7-3.141 7-7a7.006 7.006 0 0 0-3.681-6.161zM38.171 54.182A23.867 23.867 0 0 1 29 56a24.047 24.047 0 0 1-17.017-7.092A6.974 6.974 0 0 0 14 44c0-3.859-3.14-7-7-7s-7 3.141-7 7 3.14 7 7 7a6.952 6.952 0 0 0 3.381-.875C15.26 55.136 21.994 58 29 58c3.435 0 6.778-.663 9.936-1.971.51-.211.753-.796.542-1.307a1.001 1.001 0 0 0-1.307-.54zM4 31.213a1 1 0 0 0 1.068-.927c.712-10.089 7.586-18.52 17.22-21.314C23.142 11.874 25.825 14 29 14c3.86 0 7-3.141 7-7s-3.14-7-7-7c-3.851 0-6.985 3.127-6.999 6.975C11.42 9.922 3.851 19.12 3.073 30.146A.999.999 0 0 0 4 31.213z"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 58 58" width="512" height="512"><g fill="#fff"><path d="M54.319 37.839C54.762 35.918 55 33.96 55 32c0-9.095-4.631-17.377-12.389-22.153a1 1 0 1 0-1.049 1.703C48.724 15.96 53 23.604 53 32c0 1.726-.2 3.451-.573 5.147A6.992 6.992 0 0 0 51 37c-3.86 0-7 3.141-7 7s3.14 7 7 7 7-3.141 7-7a7.006 7.006 0 0 0-3.681-6.161zM38.171 54.182A23.867 23.867 0 0 1 29 56a24.047 24.047 0 0 1-17.017-7.092A6.974 6.974 0 0 0 14 44c0-3.859-3.14-7-7-7s-7 3.141-7 7 3.14 7 7 7a6.952 6.952 0 0 0 3.381-.875C15.26 55.136 21.994 58 29 58c3.435 0 6.778-.663 9.936-1.971.51-.211.753-.796.542-1.307a1.001 1.001 0 0 0-1.307-.54zM4 31.213a1 1 0 0 0 1.068-.927c.712-10.089 7.586-18.52 17.22-21.314C23.142 11.874 25.825 14 29 14c3.86 0 7-3.141 7-7s-3.14-7-7-7c-3.851 0-6.985 3.127-6.999 6.975C11.42 9.922 3.851 19.12 3.073 30.146A.999.999 0 0 0 4 31.213z"/></g></svg>

img/clone.svg

@@ -1 +0,0 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M11.8 13.8H2.2V4.2h9.6m1.2 0c0-.67-.53-1.2-1.2-1.2H2.2C1.53 3 1 3.53 1 4.2v9.6c0 .67.53 1.2 1.2 1.2h9.6c.67 0 1.2-.53 1.2-1.2"/><path d="m4.2 1c-0.67 0-1.2 0.54-1.2 1.2h10.8v10.8c0.67 0 1.2-0.53 1.2-1.2v-9.6c0-0.67-0.53-1.2-1.2-1.2z"/></svg>

img/reply.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M15 15s-.4-7.8-7-10V1L1 8l7 7v-4c5.1 0 7 4 7 4z"/></svg>

l10n/ca.js

@@ -29,7 +29,7 @@ OC.L10N.register(
     "{user} has deleted card {card} in list {stack} on board {board}" : "{user} ha suprimit la targeta {card} a la llista {stack} al tauler {board}",
     "You have renamed the card {before} to {card}" : "Heu reanomenat la targeta {before} a {card}",
     "{user} has renamed the card {before} to {card}" : "{user} ha reanomenat la targeta {before} a {card}",
-    "You have added a description to card {card} in list {stack} on board {board}" : "Heu afegit una descripció a la targeta {card} a la llista {stack} al tauler {board}",
+    "You have added a description to card {card} in list {stack} on board {board}" : "Heu afegit una descripció a la targeta {card} a la llista {stack} del tauler {board}",
     "{user} has added a description to card {card} in list {stack} on board {board}" : "{user} ha afegit una descripció a la targeta {card} a la llista {stack} al tauler {board}",
     "You have updated the description of card {card} in list {stack} on board {board}" : "Heu actualitzat la descripció de la targeta {card} a la llista {stack} al tauler {board}",
     "{user} has updated the description of the card {card} in list {stack} on board {board}" : "{user} ha actualitzat la descripció de la targeta {card} a la llista {stack} al tauler {board}",
@@ -37,12 +37,12 @@ OC.L10N.register(
     "{user} has archived card {card} in list {stack} on board {board}" : "{user} té la targeta arxivada {card} a la llista {stack} al tauler {board}",
     "You have unarchived card {card} in list {stack} on board {board}" : "Teniu una targeta no-arxchivada {card} a la llista {stack} al tauler {board}",
     "{user} has unarchived card {card} in list {stack} on board {board}" : "{user} té una targeta no-arxivada {card} a la llista {stack} al tauler {board}",
-    "You have removed the due date of card {card}" : "Heu suprimit la data de venciment de la targeta {targeta}",
-    "{user} has removed the due date of card {card}" : "{user} ha suprimit la data de venciment de la targeta {targeta}",
-    "You have set the due date of card {card} to {after}" : "Heu establert la data de venciment de la targeta {card} a {after}",
-    "{user} has set the due date of card {card} to {after}" : "{user} ha establert la data de venciment de la targeta {card} a {after}",
-    "You have updated the due date of card {card} to {after}" : "Heu actualitzat la data de venciment de la targeta {card} a {after}",
-    "{user} has updated the due date of card {card} to {after}" : "{user} ha actualitzat la data de venciment de la targeta {card} a {after}",
+    "You have removed the due date of card {card}" : "Heu suprimit la data de caducitat de la targeta {targeta}",
+    "{user} has removed the due date of card {card}" : "{user} ha suprimit la data de caducitat de la targeta {targeta}",
+    "You have set the due date of card {card} to {after}" : "Heu establert la data de caducitat de la targeta {card} a {after}",
+    "{user} has set the due date of card {card} to {after}" : "{user} ha establert la data de caducitat de la targeta {card} a {after}",
+    "You have updated the due date of card {card} to {after}" : "Heu actualitzat la data de caducitat de la targeta {card} a {after}",
+    "{user} has updated the due date of card {card} to {after}" : "{user} ha actualitzat la data de caducitat de la targeta {card} a {after}",
     "You have added the tag {label} to card {card} in list {stack} on board {board}" : "Heu afegit l'etiqueta {label} a la targeta {card} a la llista {stack} al tauler {board}",
     "{user} has added the tag {label} to card {card} in list {stack} on board {board}" : "{user} ha afegit l'etiqueta {label} a la targeta {card} a la llista {stack} al tauler {board}",
     "You have removed the tag {label} from card {card} in list {stack} on board {board}" : "Heu eliminat l'etiqueta {label} de la targeta {card} a la llista {stack} al tauler {board}",
@@ -66,13 +66,13 @@ OC.L10N.register(
     "A <strong>card description</strong> inside the Deck app has been changed" : "S'ha canviat una <strong>descripció de targeta</strong> a l'aplicació Tauler",
     "Deck" : "Targetes",
     "Changes in the <strong>Deck app</strong>" : "Canvis a l'<strong>aplicació Targetes</strong>",
-    "A <strong>comment</strong> was created on a card" : "S'ha afegit un <strong>comentari</strong> a una targeta",
+    "A <strong>comment</strong> was created on a card" : "S'ha creat un <strong>comentari</strong> a una targeta",
     "Upcoming cards" : "Pròximes targetes",
     "Load more" : "Carrega'n més",
     "Personal" : "Personal",
     "The card \"%s\" on \"%s\" has been assigned to you by %s." : "La targeta \"%s\" sobre \"%s\" se us ha assignat per %s.",
     "{user} has assigned the card {deck-card} on {deck-board} to you." : "{user} us ha assignat la targeta {deck-card} a {deck-board}.",
-    "The card \"%s\" on \"%s\" has reached its due date." : "La targeta \"%s\" sobre \"%s\" ha assolit la seva data de venciment.",
+    "The card \"%s\" on \"%s\" has reached its due date." : "La targeta \"%s\" sobre \"%s\" ha assolit la seva data de caducitat.",
     "The card {deck-card} on {deck-board} has reached its due date." : "La targeta {deck-card} a {deck-board} ha assolit la seva data de caducitat.",
     "%s has mentioned you in a comment on \"%s\"." : "%s us ha anomenat en un comentari sobre \"%s\".",
     "{user} has mentioned you in a comment on {deck-card}." : "{user} us ha mencionat en un comentari a {deck-card}.",
@@ -88,7 +88,7 @@ OC.L10N.register(
     "copy" : "còpia",
     "To do" : "Pendent",
     "Doing" : "En procés",
-    "Done" : "Finalitzat",
+    "Done" : "Fet",
     "Example Task 3" : "Tasca d'exemple 3",
     "Example Task 2" : "Tasca d'exemple 2",
     "Example Task 1" : "Tasca d'exemple 1",
@@ -99,7 +99,7 @@ OC.L10N.register(
     "No file was uploaded" : "No s'ha pujat cap fitxer",
     "Missing a temporary folder" : "Falta una carpeta temporal",
     "Could not write file to disk" : "No s’ha pogut escriure el fitxer al disc",
-    "A PHP extension stopped the file upload" : "Una extensió del PHP ha aturat la carregada del fitxer",
+    "A PHP extension stopped the file upload" : "Una extensió del PHP ha aturat la pujada del fitxer",
     "No file uploaded or file size exceeds maximum of %s" : "No s'ha carregat cap fitxer o la mida del fitxer sobrepassa el màxim de %s",
     "This comment has more than %s characters.\nAdded as an attachment to the card with name %s.\nAccessible on URL: %s." : "Aquest comentari té més de %s caràcters.\nS'ha afegit com a fitxer adjunt a la targeta amb el nom %s.\nAccessible a l'URL: %s.",
     "Card not found" : "No s'ha trobat la targeta",
@@ -131,7 +131,7 @@ OC.L10N.register(
     "Overwrite file" : "Sobreescriu el fitxer",
     "Keep existing file" : "Mantén el fitxer existent",
     "This board is read only" : "Aquest tauler és només de lectura",
-    "Drop your files to upload" : "Deixeu anar els fitxers per penjar-los",
+    "Drop your files to upload" : "Deixeu anar els fitxers per pujar-los",
     "Add card" : "Afegeix una targeta",
     "Archived cards" : "Targetes arxivades",
     "Add list" : "Afegeix una llista",
@@ -174,36 +174,38 @@ OC.L10N.register(
     "Can share" : "Pot compartir",
     "Can manage" : "Pot gestionar",
     "Owner" : "Propietari",
-    "Delete" : "Eliminar",
+    "Delete" : "Suprimeix",
     "Failed to create share with {displayName}" : "Ha fallat la creació de la compartició amb {displayName}",
     "Are you sure you want to transfer the board {title} to {user}?" : "Esteu segur que voleu transferir el tauler {title} a {user}?",
     "Transfer the board." : "Transfereix el tauler.",
     "Transfer" : "Transferència",
     "The board has been transferred to {user}" : "El tauler s'ha transferit a {user}",
     "Failed to transfer the board to {user}" : "No s'ha pogut transferir el tauler a {user}",
-    "Add a new list" : "Afegir una llista nova",
+    "Add a new list" : "Afegeix una llista nova",
     "Archive all cards" : "Arxiva totes les targetes",
+    "Unarchive all cards" : "Desarxivar totes les targetes",
     "Delete list" : "Suprimeix la llista",
     "Archive all cards in this list" : "Arxiva totes les targetes d'aquesta llista",
-    "Add a new card" : "Afegir una nova targeta",
+    "Unarchive all cards in this list" : "Desarxivar totes les targetes d'aquesta llista",
+    "Add a new card" : "Afegeix una nova targeta",
     "Card name" : "Nom de la targeta",
     "List deleted" : "Llista suprimida",
-    "Edit" : "Edita",
-    "Add a new tag" : "Afegir una etiqueta nova",
+    "Edit" : "Edició",
+    "Add a new tag" : "Afegeix una etiqueta nova",
     "title and color value must be provided" : "s’ha de proporcionar el valor del títol i del color",
     "Board name" : "Nom del taulell",
     "Members" : "Membres",
-    "Upload new files" : "Puja nous fitxers",
+    "Upload new files" : "Pujada de nous fitxers",
     "Share from Files" : "Comparteix des de Fitxers",
     "Pending share" : "Compartició pendent",
     "Add this attachment" : "Afegeix aquest adjunt",
     "Show in Files" : "Mostra a Fitxers",
-    "Download" : "Baixa",
+    "Download" : "Baixada",
     "Remove attachment" : "Treu l'adjunt",
     "Delete Attachment" : "Suprimeix l’adjunt",
     "Restore Attachment" : "Restaura l'adjunt",
     "File to share" : "Fitxer a compartir",
-    "Invalid path selected" : "S'ha seleccionat una ruta invàlida",
+    "Invalid path selected" : "S'ha seleccionat un camí no vàlid",
     "Open in sidebar view" : "Obre a la vista de la barra lateral",
     "Open in bigger view" : "Obre a la vista més gran",
     "Attachments" : "Adjunts",
@@ -213,13 +215,13 @@ OC.L10N.register(
     "The title cannot be empty." : "El títol no pot estar buit.",
     "No comments yet. Begin the discussion!" : "No hi ha comentaris encara. Començar la discussió!",
     "Failed to load comments" : "No s'han pogut carregar els comentaris",
-    "Assign a tag to this card…" : "Assigna una etiqueta a aquesta targeta…",
-    "Assign to users" : "Assigna als usuaris",
-    "Assign to users/groups/circles" : "Assigna a usuaris/grups/cercles",
-    "Assign a user to this card…" : "Assigneu un usuari a aquesta targeta…",
-    "Due date" : "Per la data",
-    "Set a due date" : "Definir una data de venciment",
-    "Remove due date" : "Elimina la data de venciment",
+    "Assign a tag to this card…" : "Assignació d'una etiqueta a aquesta targeta…",
+    "Assign to users" : "Assignació als usuaris",
+    "Assign to users/groups/circles" : "Assignació a usuaris/grups/cercles",
+    "Assign a user to this card…" : "Assignació d'un usuari a aquesta targeta…",
+    "Due date" : "Data de caducitat",
+    "Set a due date" : "Definir una data de caducitat",
+    "Remove due date" : "Suprimeix la data de caducitat",
     "Select Date" : "Selecciona la data",
     "Today" : "Avui",
     "Tomorrow" : "Demà",
@@ -236,15 +238,15 @@ OC.L10N.register(
     "(Unsaved)" : "(No desat)",
     "(Saving…)" : "(Desant…)",
     "Formatting help" : "Format d'ajuda",
-    "Edit description" : "Edita descripció",
+    "Edit description" : "Edició descripció",
     "View description" : "Veure descripció",
     "Add Attachment" : "Afegeix un adjunt",
     "Write a description …" : "Escriviu una descripció …",
     "Choose attachment" : "Triar adjunt",
     "(group)" : "(grup)",
-    "Todo items" : "Elements pendents",
+    "Todo items" : "Tasques pendents",
     "{count} comments, {unread} unread" : "{count} comentaris, {unread} no llegits",
-    "Edit card title" : "Edita el títol de la targeta",
+    "Edit card title" : "Edició del títol de la targeta",
     "Assign to me" : "Assigna'm a mi",
     "Unassign myself" : "Desasignar a mi mateix",
     "Move card" : "Mou la targeta",
@@ -258,8 +260,9 @@ OC.L10N.register(
     "All boards" : "Tots els taulers",
     "Archived boards" : "Taulers arxivats",
     "Shared with you" : "Us han compartit",
-    "Deck settings" : "Configuració del Tauler",
+    "Deck settings" : "Paràmetres del Tauler",
     "Use bigger card view" : "Utilitza la visualització de targetes més gran",
+    "Show card ID badge" : "Mostra el distintiu d’ID de la targeta",
     "Show boards in calendar/tasks" : "Mostra els taulers al calendari/tasques",
     "Limit deck usage of groups" : "Limitar l'ús del tauler de grups",
     "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." : "Limitant el Tauler bloquejarà la creació de taulers als usuaris que no són part d'aquests grups. Els usuaris podran seguir treballant en els taulers que hagin estat compartits amb ells.",

l10n/ca.json

@@ -27,7 +27,7 @@
     "{user} has deleted card {card} in list {stack} on board {board}" : "{user} ha suprimit la targeta {card} a la llista {stack} al tauler {board}",
     "You have renamed the card {before} to {card}" : "Heu reanomenat la targeta {before} a {card}",
     "{user} has renamed the card {before} to {card}" : "{user} ha reanomenat la targeta {before} a {card}",
-    "You have added a description to card {card} in list {stack} on board {board}" : "Heu afegit una descripció a la targeta {card} a la llista {stack} al tauler {board}",
+    "You have added a description to card {card} in list {stack} on board {board}" : "Heu afegit una descripció a la targeta {card} a la llista {stack} del tauler {board}",
     "{user} has added a description to card {card} in list {stack} on board {board}" : "{user} ha afegit una descripció a la targeta {card} a la llista {stack} al tauler {board}",
     "You have updated the description of card {card} in list {stack} on board {board}" : "Heu actualitzat la descripció de la targeta {card} a la llista {stack} al tauler {board}",
     "{user} has updated the description of the card {card} in list {stack} on board {board}" : "{user} ha actualitzat la descripció de la targeta {card} a la llista {stack} al tauler {board}",
@@ -35,12 +35,12 @@
     "{user} has archived card {card} in list {stack} on board {board}" : "{user} té la targeta arxivada {card} a la llista {stack} al tauler {board}",
     "You have unarchived card {card} in list {stack} on board {board}" : "Teniu una targeta no-arxchivada {card} a la llista {stack} al tauler {board}",
     "{user} has unarchived card {card} in list {stack} on board {board}" : "{user} té una targeta no-arxivada {card} a la llista {stack} al tauler {board}",
-    "You have removed the due date of card {card}" : "Heu suprimit la data de venciment de la targeta {targeta}",
-    "{user} has removed the due date of card {card}" : "{user} ha suprimit la data de venciment de la targeta {targeta}",
-    "You have set the due date of card {card} to {after}" : "Heu establert la data de venciment de la targeta {card} a {after}",
-    "{user} has set the due date of card {card} to {after}" : "{user} ha establert la data de venciment de la targeta {card} a {after}",
-    "You have updated the due date of card {card} to {after}" : "Heu actualitzat la data de venciment de la targeta {card} a {after}",
-    "{user} has updated the due date of card {card} to {after}" : "{user} ha actualitzat la data de venciment de la targeta {card} a {after}",
+    "You have removed the due date of card {card}" : "Heu suprimit la data de caducitat de la targeta {targeta}",
+    "{user} has removed the due date of card {card}" : "{user} ha suprimit la data de caducitat de la targeta {targeta}",
+    "You have set the due date of card {card} to {after}" : "Heu establert la data de caducitat de la targeta {card} a {after}",
+    "{user} has set the due date of card {card} to {after}" : "{user} ha establert la data de caducitat de la targeta {card} a {after}",
+    "You have updated the due date of card {card} to {after}" : "Heu actualitzat la data de caducitat de la targeta {card} a {after}",
+    "{user} has updated the due date of card {card} to {after}" : "{user} ha actualitzat la data de caducitat de la targeta {card} a {after}",
     "You have added the tag {label} to card {card} in list {stack} on board {board}" : "Heu afegit l'etiqueta {label} a la targeta {card} a la llista {stack} al tauler {board}",
     "{user} has added the tag {label} to card {card} in list {stack} on board {board}" : "{user} ha afegit l'etiqueta {label} a la targeta {card} a la llista {stack} al tauler {board}",
     "You have removed the tag {label} from card {card} in list {stack} on board {board}" : "Heu eliminat l'etiqueta {label} de la targeta {card} a la llista {stack} al tauler {board}",
@@ -64,13 +64,13 @@
     "A <strong>card description</strong> inside the Deck app has been changed" : "S'ha canviat una <strong>descripció de targeta</strong> a l'aplicació Tauler",
     "Deck" : "Targetes",
     "Changes in the <strong>Deck app</strong>" : "Canvis a l'<strong>aplicació Targetes</strong>",
-    "A <strong>comment</strong> was created on a card" : "S'ha afegit un <strong>comentari</strong> a una targeta",
+    "A <strong>comment</strong> was created on a card" : "S'ha creat un <strong>comentari</strong> a una targeta",
     "Upcoming cards" : "Pròximes targetes",
     "Load more" : "Carrega'n més",
     "Personal" : "Personal",
     "The card \"%s\" on \"%s\" has been assigned to you by %s." : "La targeta \"%s\" sobre \"%s\" se us ha assignat per %s.",
     "{user} has assigned the card {deck-card} on {deck-board} to you." : "{user} us ha assignat la targeta {deck-card} a {deck-board}.",
-    "The card \"%s\" on \"%s\" has reached its due date." : "La targeta \"%s\" sobre \"%s\" ha assolit la seva data de venciment.",
+    "The card \"%s\" on \"%s\" has reached its due date." : "La targeta \"%s\" sobre \"%s\" ha assolit la seva data de caducitat.",
     "The card {deck-card} on {deck-board} has reached its due date." : "La targeta {deck-card} a {deck-board} ha assolit la seva data de caducitat.",
     "%s has mentioned you in a comment on \"%s\"." : "%s us ha anomenat en un comentari sobre \"%s\".",
     "{user} has mentioned you in a comment on {deck-card}." : "{user} us ha mencionat en un comentari a {deck-card}.",
@@ -86,7 +86,7 @@
     "copy" : "còpia",
     "To do" : "Pendent",
     "Doing" : "En procés",
-    "Done" : "Finalitzat",
+    "Done" : "Fet",
     "Example Task 3" : "Tasca d'exemple 3",
     "Example Task 2" : "Tasca d'exemple 2",
     "Example Task 1" : "Tasca d'exemple 1",
@@ -97,7 +97,7 @@
     "No file was uploaded" : "No s'ha pujat cap fitxer",
     "Missing a temporary folder" : "Falta una carpeta temporal",
     "Could not write file to disk" : "No s’ha pogut escriure el fitxer al disc",
-    "A PHP extension stopped the file upload" : "Una extensió del PHP ha aturat la carregada del fitxer",
+    "A PHP extension stopped the file upload" : "Una extensió del PHP ha aturat la pujada del fitxer",
     "No file uploaded or file size exceeds maximum of %s" : "No s'ha carregat cap fitxer o la mida del fitxer sobrepassa el màxim de %s",
     "This comment has more than %s characters.\nAdded as an attachment to the card with name %s.\nAccessible on URL: %s." : "Aquest comentari té més de %s caràcters.\nS'ha afegit com a fitxer adjunt a la targeta amb el nom %s.\nAccessible a l'URL: %s.",
     "Card not found" : "No s'ha trobat la targeta",
@@ -129,7 +129,7 @@
     "Overwrite file" : "Sobreescriu el fitxer",
     "Keep existing file" : "Mantén el fitxer existent",
     "This board is read only" : "Aquest tauler és només de lectura",
-    "Drop your files to upload" : "Deixeu anar els fitxers per penjar-los",
+    "Drop your files to upload" : "Deixeu anar els fitxers per pujar-los",
     "Add card" : "Afegeix una targeta",
     "Archived cards" : "Targetes arxivades",
     "Add list" : "Afegeix una llista",
@@ -172,36 +172,38 @@
     "Can share" : "Pot compartir",
     "Can manage" : "Pot gestionar",
     "Owner" : "Propietari",
-    "Delete" : "Eliminar",
+    "Delete" : "Suprimeix",
     "Failed to create share with {displayName}" : "Ha fallat la creació de la compartició amb {displayName}",
     "Are you sure you want to transfer the board {title} to {user}?" : "Esteu segur que voleu transferir el tauler {title} a {user}?",
     "Transfer the board." : "Transfereix el tauler.",
     "Transfer" : "Transferència",
     "The board has been transferred to {user}" : "El tauler s'ha transferit a {user}",
     "Failed to transfer the board to {user}" : "No s'ha pogut transferir el tauler a {user}",
-    "Add a new list" : "Afegir una llista nova",
+    "Add a new list" : "Afegeix una llista nova",
     "Archive all cards" : "Arxiva totes les targetes",
+    "Unarchive all cards" : "Desarxivar totes les targetes",
     "Delete list" : "Suprimeix la llista",
     "Archive all cards in this list" : "Arxiva totes les targetes d'aquesta llista",
-    "Add a new card" : "Afegir una nova targeta",
+    "Unarchive all cards in this list" : "Desarxivar totes les targetes d'aquesta llista",
+    "Add a new card" : "Afegeix una nova targeta",
     "Card name" : "Nom de la targeta",
     "List deleted" : "Llista suprimida",
-    "Edit" : "Edita",
-    "Add a new tag" : "Afegir una etiqueta nova",
+    "Edit" : "Edició",
+    "Add a new tag" : "Afegeix una etiqueta nova",
     "title and color value must be provided" : "s’ha de proporcionar el valor del títol i del color",
     "Board name" : "Nom del taulell",
     "Members" : "Membres",
-    "Upload new files" : "Puja nous fitxers",
+    "Upload new files" : "Pujada de nous fitxers",
     "Share from Files" : "Comparteix des de Fitxers",
     "Pending share" : "Compartició pendent",
     "Add this attachment" : "Afegeix aquest adjunt",
     "Show in Files" : "Mostra a Fitxers",
-    "Download" : "Baixa",
+    "Download" : "Baixada",
     "Remove attachment" : "Treu l'adjunt",
     "Delete Attachment" : "Suprimeix l’adjunt",
     "Restore Attachment" : "Restaura l'adjunt",
     "File to share" : "Fitxer a compartir",
-    "Invalid path selected" : "S'ha seleccionat una ruta invàlida",
+    "Invalid path selected" : "S'ha seleccionat un camí no vàlid",
     "Open in sidebar view" : "Obre a la vista de la barra lateral",
     "Open in bigger view" : "Obre a la vista més gran",
     "Attachments" : "Adjunts",
@@ -211,13 +213,13 @@
     "The title cannot be empty." : "El títol no pot estar buit.",
     "No comments yet. Begin the discussion!" : "No hi ha comentaris encara. Començar la discussió!",
     "Failed to load comments" : "No s'han pogut carregar els comentaris",
-    "Assign a tag to this card…" : "Assigna una etiqueta a aquesta targeta…",
-    "Assign to users" : "Assigna als usuaris",
-    "Assign to users/groups/circles" : "Assigna a usuaris/grups/cercles",
-    "Assign a user to this card…" : "Assigneu un usuari a aquesta targeta…",
-    "Due date" : "Per la data",
-    "Set a due date" : "Definir una data de venciment",
-    "Remove due date" : "Elimina la data de venciment",
+    "Assign a tag to this card…" : "Assignació d'una etiqueta a aquesta targeta…",
+    "Assign to users" : "Assignació als usuaris",
+    "Assign to users/groups/circles" : "Assignació a usuaris/grups/cercles",
+    "Assign a user to this card…" : "Assignació d'un usuari a aquesta targeta…",
+    "Due date" : "Data de caducitat",
+    "Set a due date" : "Definir una data de caducitat",
+    "Remove due date" : "Suprimeix la data de caducitat",
     "Select Date" : "Selecciona la data",
     "Today" : "Avui",
     "Tomorrow" : "Demà",
@@ -234,15 +236,15 @@
     "(Unsaved)" : "(No desat)",
     "(Saving…)" : "(Desant…)",
     "Formatting help" : "Format d'ajuda",
-    "Edit description" : "Edita descripció",
+    "Edit description" : "Edició descripció",
     "View description" : "Veure descripció",
     "Add Attachment" : "Afegeix un adjunt",
     "Write a description …" : "Escriviu una descripció …",
     "Choose attachment" : "Triar adjunt",
     "(group)" : "(grup)",
-    "Todo items" : "Elements pendents",
+    "Todo items" : "Tasques pendents",
     "{count} comments, {unread} unread" : "{count} comentaris, {unread} no llegits",
-    "Edit card title" : "Edita el títol de la targeta",
+    "Edit card title" : "Edició del títol de la targeta",
     "Assign to me" : "Assigna'm a mi",
     "Unassign myself" : "Desasignar a mi mateix",
     "Move card" : "Mou la targeta",
@@ -256,8 +258,9 @@
     "All boards" : "Tots els taulers",
     "Archived boards" : "Taulers arxivats",
     "Shared with you" : "Us han compartit",
-    "Deck settings" : "Configuració del Tauler",
+    "Deck settings" : "Paràmetres del Tauler",
     "Use bigger card view" : "Utilitza la visualització de targetes més gran",
+    "Show card ID badge" : "Mostra el distintiu d’ID de la targeta",
     "Show boards in calendar/tasks" : "Mostra els taulers al calendari/tasques",
     "Limit deck usage of groups" : "Limitar l'ús del tauler de grups",
     "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." : "Limitant el Tauler bloquejarà la creació de taulers als usuaris que no són part d'aquests grups. Els usuaris podran seguir treballant en els taulers que hagin estat compartits amb ells.",

l10n/da.js

@@ -37,6 +37,7 @@ OC.L10N.register(
     "The card \"%s\" on \"%s\" has reached its due date." : "Kortet \"%s\" på \"%s\" har nået sin forfaldsdato.",
     "%s has mentioned you in a comment on \"%s\"." : " %s har nævnt dig i en kommentar på \"%s\".",
     "The board \"%s\" has been shared with you by %s." : "Tavlen \"%s\" er blevet delt med dig af %s.",
+    "%s on %s" : "%s på %s",
     "No data was provided to create an attachment." : "Ingen data blev givet som kunne vedhæftes",
     "Finished" : "Færdiggjort",
     "To review" : "Til gennemgang",

l10n/da.json

@@ -35,6 +35,7 @@
     "The card \"%s\" on \"%s\" has reached its due date." : "Kortet \"%s\" på \"%s\" har nået sin forfaldsdato.",
     "%s has mentioned you in a comment on \"%s\"." : " %s har nævnt dig i en kommentar på \"%s\".",
     "The board \"%s\" has been shared with you by %s." : "Tavlen \"%s\" er blevet delt med dig af %s.",
+    "%s on %s" : "%s på %s",
     "No data was provided to create an attachment." : "Ingen data blev givet som kunne vedhæftes",
     "Finished" : "Færdiggjort",
     "To review" : "Til gennemgang",

l10n/el.js

@@ -245,7 +245,7 @@ OC.L10N.register(
     "Archive card" : "Αρχειοθέτηση καρτέλας",
     "Delete card" : "Διαγραφή καρτέλας",
     "Move card to another board" : "Μετακίνηση καρτέλας σε άλλο πίνακα",
-    "List is empty" : "Η λίστα είναι άδεια.",
+    "List is empty" : "Η λίστα είναι κενή",
     "Card deleted" : "Η καρτέλα διαγράφηκε",
     "seconds ago" : " δευτερόλεπτα πριν ",
     "All boards" : "Όλοι οι πίνακες",

l10n/el.json

@@ -243,7 +243,7 @@
     "Archive card" : "Αρχειοθέτηση καρτέλας",
     "Delete card" : "Διαγραφή καρτέλας",
     "Move card to another board" : "Μετακίνηση καρτέλας σε άλλο πίνακα",
-    "List is empty" : "Η λίστα είναι άδεια.",
+    "List is empty" : "Η λίστα είναι κενή",
     "Card deleted" : "Η καρτέλα διαγράφηκε",
     "seconds ago" : " δευτερόλεπτα πριν ",
     "All boards" : "Όλοι οι πίνακες",

l10n/en_GB.js

@@ -1,17 +1,97 @@
 OC.L10N.register(
     "deck",
     {
+    "You have created a new board {board}" : "You have created a new board {board}",
+    "{user} has created a new board {board}" : "{user} has created a new board {board}",
+    "You have deleted the board {board}" : "You have deleted the board {board}",
+    "{user} has deleted the board {board}" : "{user} has deleted the board {board}",
+    "You have restored the board {board}" : "You have restored the board {board}",
+    "{user} has restored the board {board}" : "{user} has restored the board {board}",
+    "You have shared the board {board} with {acl}" : "You have shared the board {board} with {acl}",
+    "{user} has shared the board {board} with {acl}" : "{user} has shared the board {board} with {acl}",
+    "You have removed {acl} from the board {board}" : "You have removed {acl} from the board {board}",
+    "{user} has removed {acl} from the board {board}" : "{user} has removed {acl} from the board {board}",
+    "You have renamed the board {before} to {board}" : "You have renamed the board {before} to {board}",
+    "{user} has renamed the board {before} to {board}" : "{user} has renamed the board {before} to {board}",
+    "You have archived the board {board}" : "You have archived the board {board}",
+    "{user} has archived the board {before}" : "{user} has archived the board {before}",
+    "You have unarchived the board {board}" : "You have unarchived the board {board}",
+    "{user} has unarchived the board {before}" : "{user} has unarchived the board {before}",
+    "You have created a new list {stack} on board {board}" : "You have created a new list {stack} on board {board}",
+    "{user} has created a new list {stack} on board {board}" : "{user} has created a new list {stack} on board {board}",
+    "You have renamed list {before} to {stack} on board {board}" : "You have renamed list {before} to {stack} on board {board}",
+    "{user} has renamed list {before} to {stack} on board {board}" : "{user} has renamed list {before} to {stack} on board {board}",
+    "You have deleted list {stack} on board {board}" : "You have deleted list {stack} on board {board}",
+    "{user} has deleted list {stack} on board {board}" : "{user} has deleted list {stack} on board {board}",
+    "You have created card {card} in list {stack} on board {board}" : "You have created card {card} in list {stack} on board {board}",
+    "{user} has created card {card} in list {stack} on board {board}" : "{user} has created card {card} in list {stack} on board {board}",
+    "You have deleted card {card} in list {stack} on board {board}" : "You have deleted card {card} in list {stack} on board {board}",
+    "{user} has deleted card {card} in list {stack} on board {board}" : "{user} has deleted card {card} in list {stack} on board {board}",
+    "You have renamed the card {before} to {card}" : "You have renamed the card {before} to {card}",
+    "{user} has renamed the card {before} to {card}" : "{user} has renamed the card {before} to {card}",
+    "You have added a description to card {card} in list {stack} on board {board}" : "You have added a description to card {card} in list {stack} on board {board}",
+    "{user} has added a description to card {card} in list {stack} on board {board}" : "{user} has added a description to card {card} in list {stack} on board {board}",
+    "You have updated the description of card {card} in list {stack} on board {board}" : "You have updated the description of card {card} in list {stack} on board {board}",
+    "{user} has updated the description of the card {card} in list {stack} on board {board}" : "{user} has updated the description of the card {card} in list {stack} on board {board}",
+    "You have archived card {card} in list {stack} on board {board}" : "You have archived card {card} in list {stack} on board {board}",
+    "{user} has archived card {card} in list {stack} on board {board}" : "{user} has archived card {card} in list {stack} on board {board}",
+    "You have unarchived card {card} in list {stack} on board {board}" : "You have unarchived card {card} in list {stack} on board {board}",
+    "{user} has unarchived card {card} in list {stack} on board {board}" : "{user} has unarchived card {card} in list {stack} on board {board}",
+    "You have removed the due date of card {card}" : "You have removed the due date of card {card}",
+    "{user} has removed the due date of card {card}" : "{user} has removed the due date of card {card}",
+    "You have set the due date of card {card} to {after}" : "You have set the due date of card {card} to {after}",
+    "{user} has set the due date of card {card} to {after}" : "{user} has set the due date of card {card} to {after}",
+    "You have updated the due date of card {card} to {after}" : "You have updated the due date of card {card} to {after}",
+    "{user} has updated the due date of card {card} to {after}" : "{user} has updated the due date of card {card} to {after}",
+    "You have added the tag {label} to card {card} in list {stack} on board {board}" : "You have added the tag {label} to card {card} in list {stack} on board {board}",
+    "{user} has added the tag {label} to card {card} in list {stack} on board {board}" : "{user} has added the tag {label} to card {card} in list {stack} on board {board}",
+    "You have removed the tag {label} from card {card} in list {stack} on board {board}" : "You have removed the tag {label} from card {card} in list {stack} on board {board}",
+    "{user} has removed the tag {label} from card {card} in list {stack} on board {board}" : "{user} has removed the tag {label} from card {card} in list {stack} on board {board}",
+    "You have assigned {assigneduser} to card {card} on board {board}" : "You have assigned {assigneduser} to card {card} on board {board}",
+    "{user} has assigned {assigneduser} to card {card} on board {board}" : "{user} has assigned {assigneduser} to card {card} on board {board}",
+    "You have unassigned {assigneduser} from card {card} on board {board}" : "You have unassigned {assigneduser} from card {card} on board {board}",
+    "{user} has unassigned {assigneduser} from card {card} on board {board}" : "{user} has unassigned {assigneduser} from card {card} on board {board}",
+    "You have moved the card {card} from list {stackBefore} to {stack}" : "You have moved the card {card} from list {stackBefore} to {stack}",
+    "{user} has moved the card {card} from list {stackBefore} to {stack}" : "{user} has moved the card {card} from list {stackBefore} to {stack}",
+    "You have added the attachment {attachment} to card {card}" : "You have added the attachment {attachment} to card {card}",
+    "{user} has added the attachment {attachment} to card {card}" : "{user} has added the attachment {attachment} to card {card}",
+    "You have updated the attachment {attachment} on card {card}" : "You have updated the attachment {attachment} on card {card}",
+    "{user} has updated the attachment {attachment} on card {card}" : "{user} has updated the attachment {attachment} on card {card}",
+    "You have deleted the attachment {attachment} from card {card}" : "You have deleted the attachment {attachment} from card {card}",
+    "{user} has deleted the attachment {attachment} from card {card}" : "{user} has deleted the attachment {attachment} from card {card}",
+    "You have restored the attachment {attachment} to card {card}" : "You have restored the attachment {attachment} to card {card}",
+    "{user} has restored the attachment {attachment} to card {card}" : "{user} has restored the attachment {attachment} to card {card}",
+    "You have commented on card {card}" : "You have commented on card {card}",
+    "{user} has commented on card {card}" : "{user} has commented on card {card}",
+    "A <strong>card description</strong> inside the Deck app has been changed" : "A <strong>card description</strong> inside the Deck app has been changed",
     "Deck" : "Deck",
+    "Changes in the <strong>Deck app</strong>" : "Changes in the <strong>Deck app</strong>",
+    "A <strong>comment</strong> was created on a card" : "A <strong>comment</strong> was created on a card",
+    "Upcoming cards" : "Upcoming cards",
+    "Load more" : "Load more",
     "Personal" : "Personal",
+    "The card \"%s\" on \"%s\" has been assigned to you by %s." : "The card \"%s\" on \"%s\" has been assigned to you by %s.",
+    "{user} has assigned the card {deck-card} on {deck-board} to you." : "{user} has assigned the card {deck-card} on {deck-board} to you.",
     "The card \"%s\" on \"%s\" has reached its due date." : "The card \"%s\" on \"%s\" has reached its due date.",
+    "The card {deck-card} on {deck-board} has reached its due date." : "The card {deck-card} on {deck-board} has reached its due date.",
+    "%s has mentioned you in a comment on \"%s\"." : "%s has mentioned you in a comment on \"%s\".",
+    "{user} has mentioned you in a comment on {deck-card}." : "{user} has mentioned you in a comment on {deck-card}.",
     "The board \"%s\" has been shared with you by %s." : "The board \"%s\" has been shared with you by %s.",
+    "{user} has shared {deck-board} with you." : "{user} has shared {deck-board} with you.",
+    "Card comments" : "Card comments",
     "%s on %s" : "%s on %s",
+    "No data was provided to create an attachment." : "No data was provided to create an attachment.",
     "Finished" : "Finished",
     "To review" : "To review",
     "Action needed" : "Action needed",
     "Later" : "Later",
     "copy" : "copy",
+    "To do" : "To do",
+    "Doing" : "Doing",
     "Done" : "Done",
+    "Example Task 3" : "Example Task 3",
+    "Example Task 2" : "Example Task 2",
+    "Example Task 1" : "Example Task 1",
     "The file was uploaded" : "The file was uploaded",
     "The uploaded file exceeds the upload_max_filesize directive in php.ini" : "The uploaded file exceeds the upload_max_filesize directive in php.ini",
     "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form",
@@ -20,63 +100,218 @@ OC.L10N.register(
     "Missing a temporary folder" : "Missing a temporary folder",
     "Could not write file to disk" : "Could not write file to disk",
     "A PHP extension stopped the file upload" : "A PHP extension stopped the file upload",
+    "No file uploaded or file size exceeds maximum of %s" : "No file uploaded or file size exceeds maximum of %s",
+    "This comment has more than %s characters.\nAdded as an attachment to the card with name %s.\nAccessible on URL: %s." : "This comment has more than %s characters.\nAdded as an attachment to the card with name %s.\nAccessible on URL: %s.",
     "Card not found" : "Card not found",
+    "Path is already shared with this card" : "Path is already shared with this card",
     "Invalid date, date format must be YYYY-MM-DD" : "Invalid date, date format must be YYYY-MM-DD",
+    "Personal planning and team project organization" : "Personal planning and team project organization",
+    "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 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",
+    "Card details" : "Card details",
     "Add board" : "Add board",
+    "Select the board to link to a project" : "Select the board to link to a project",
+    "Search by board title" : "Search by board title",
+    "Select board" : "Select board",
+    "Create a new card" : "Create a new card",
+    "Select a board" : "Select a board",
+    "Select a list" : "Select a list",
+    "Card title" : "Card title",
     "Cancel" : "Cancel",
+    "Creating the new card …" : "Creating the new card …",
+    "Card \"{card}\" was added to \"{board}\"" : "Card \"{card}\" was added to \"{board}\"",
+    "Open card" : "Open card",
     "Close" : "Close",
     "Create card" : "Create card",
+    "Select a card" : "Select a card",
+    "Select the card to link to a project" : "Select the card to link to a project",
+    "Link to card" : "Link to card",
     "File already exists" : "File already exists",
+    "A file with the name {filename} already exists." : "A file with the name {filename} already exists.",
     "Do you want to overwrite it?" : "Do you want to overwrite it?",
+    "Overwrite file" : "Overwrite file",
+    "Keep existing file" : "Keep existing file",
+    "This board is read only" : "This board is read only",
+    "Drop your files to upload" : "Drop your files to upload",
     "Add card" : "Add card",
+    "Archived cards" : "Archived cards",
     "Add list" : "Add list",
+    "List name" : "List name",
+    "Active filters" : "Active filters",
+    "Apply filter" : "Apply filter",
     "Filter by tag" : "Filter by tag",
+    "Filter by assigned user" : "Filter by assigned user",
     "Unassigned" : "Unassigned",
+    "Filter by due date" : "Filter by due date",
     "Overdue" : "Overdue",
+    "Next 24 hours" : "Next 24 hours",
+    "Next 7 days" : "Next 7 days",
+    "Next 30 days" : "Next 30 days",
+    "No due date" : "No due date",
+    "Clear filter" : "Clear filter",
     "Hide archived cards" : "Hide archived cards",
     "Show archived cards" : "Show archived cards",
+    "Toggle compact mode" : "Toggle compact mode",
     "Open details" : "Open details",
     "Details" : "Details",
+    "Loading board" : "Loading board",
+    "No lists available" : "No lists available",
+    "Create a new list to add cards to this board" : "Create a new list to add cards to this board",
+    "Board not found" : "Board not found",
     "Sharing" : "Sharing",
     "Tags" : "Tags",
+    "Deleted items" : "Deleted items",
+    "Timeline" : "Timeline",
+    "Deleted lists" : "Deleted lists",
     "Undo" : "Undo",
+    "Deleted cards" : "Deleted cards",
+    "Share board with a user, group or circle …" : "Share board with a user, group or circle …",
+    "Searching for users, groups and circles …" : "Searching for users, groups and circles …",
+    "No participants found" : "No participants found",
+    "Board owner" : "Board owner",
+    "(Group)" : "(Group)",
+    "(Circle)" : "(Circle)",
     "Can edit" : "Can edit",
     "Can share" : "Can share",
+    "Can manage" : "Can manage",
     "Owner" : "Owner",
     "Delete" : "Delete",
+    "Failed to create share with {displayName}" : "Failed to create share with {displayName}",
+    "Are you sure you want to transfer the board {title} to {user}?" : "Are you sure you want to transfer the board {title} to {user}?",
+    "Transfer the board." : "Transfer the board.",
     "Transfer" : "Transfer",
+    "The board has been transferred to {user}" : "The board has been transferred to {user}",
+    "Failed to transfer the board to {user}" : "Failed to transfer the board to {user}",
+    "Add a new list" : "Add a new list",
+    "Archive all cards" : "Archive all cards",
+    "Unarchive all cards" : "Unarchive all cards",
     "Delete list" : "Delete list",
+    "Archive all cards in this list" : "Archive all cards in this list",
+    "Unarchive all cards in this list" : "Unarchive all cards in this list",
+    "Add a new card" : "Add a new card",
+    "Card name" : "Card name",
+    "List deleted" : "List deleted",
     "Edit" : "Edit",
+    "Add a new tag" : "Add a new tag",
+    "title and color value must be provided" : "title and colour value must be provided",
+    "Board name" : "Board name",
     "Members" : "Members",
+    "Upload new files" : "Upload new files",
+    "Share from Files" : "Share from Files",
+    "Pending share" : "Pending share",
+    "Add this attachment" : "Add this attachment",
+    "Show in Files" : "Show in Files",
     "Download" : "Download",
+    "Remove attachment" : "Remove attachment",
+    "Delete Attachment" : "Delete Attachment",
+    "Restore Attachment" : "Restore Attachment",
+    "File to share" : "File to share",
+    "Invalid path selected" : "Invalid path selected",
+    "Open in sidebar view" : "Open in sidebar view",
+    "Open in bigger view" : "Open in bigger view",
     "Attachments" : "Attachments",
     "Comments" : "Comments",
     "Modified" : "Modified",
     "Created" : "Created",
+    "The title cannot be empty." : "The title cannot be empty.",
+    "No comments yet. Begin the discussion!" : "No comments yet. Begin the discussion!",
+    "Failed to load comments" : "Failed to load comments",
+    "Assign a tag to this card…" : "Assign a tag to this card…",
+    "Assign to users" : "Assign to users",
+    "Assign to users/groups/circles" : "Assign to users/groups/circles",
+    "Assign a user to this card…" : "Assign a user to this card…",
     "Due date" : "Due date",
+    "Set a due date" : "Set a due date",
     "Remove due date" : "Remove due date",
+    "Select Date" : "Select Date",
     "Today" : "Today",
     "Tomorrow" : "Tomorrow",
     "Next week" : "Next week",
     "Next month" : "Next month",
     "Save" : "Save",
+    "The comment cannot be empty." : "The comment cannot be empty.",
+    "The comment cannot be longer than 1000 characters." : "The comment cannot be longer than 1000 characters.",
+    "In reply to" : "In reply to",
+    "Cancel reply" : "Cancel reply",
     "Reply" : "Reply",
     "Update" : "Update",
     "Description" : "Description",
+    "(Unsaved)" : "(Unsaved)",
+    "(Saving…)" : "(Saving…)",
     "Formatting help" : "Formatting help",
+    "Edit description" : "Edit description",
+    "View description" : "View description",
+    "Add Attachment" : "Add Attachment",
+    "Write a description …" : "Write a description …",
+    "Choose attachment" : "Choose attachment",
     "(group)" : "(group)",
+    "Todo items" : "Todo items",
+    "{count} comments, {unread} unread" : "{count} comments, {unread} unread",
+    "Edit card title" : "Edit card title",
+    "Assign to me" : "Assign to me",
+    "Unassign myself" : "Unassign myself",
+    "Move card" : "Move card",
+    "Unarchive card" : "Unarchive card",
     "Archive card" : "Archive card",
     "Delete card" : "Delete card",
+    "Move card to another board" : "Move card to another board",
+    "List is empty" : "List is empty",
+    "Card deleted" : "Card deleted",
     "seconds ago" : "seconds ago",
+    "All boards" : "All boards",
     "Archived boards" : "Archived boards",
     "Shared with you" : "Shared with you",
+    "Deck settings" : "Deck settings",
+    "Use bigger card view" : "Use bigger card view",
+    "Show card ID badge" : "Show card ID badge",
+    "Show boards in calendar/tasks" : "Show boards in calendar/tasks",
+    "Limit deck usage of groups" : "Limit deck usage of groups",
+    "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." : "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.",
     "Board details" : "Board details",
     "Edit board" : "Edit board",
+    "Clone board" : "Clone board",
     "Unarchive board" : "Unarchive board",
     "Archive board" : "Archive board",
+    "Turn on due date reminders" : "Turn on due date reminders",
+    "Turn off due date reminders" : "Turn off due date reminders",
+    "Due date reminders" : "Due date reminders",
+    "All cards" : "All cards",
+    "Assigned cards" : "Assigned cards",
     "No notifications" : "No notifications",
     "Delete board" : "Delete board",
+    "Board {0} deleted" : "Board {0} deleted",
+    "Only assigned cards" : "Only assigned cards",
+    "No reminder" : "No reminder",
+    "An error occurred" : "An error occurred",
+    "Are you sure you want to delete the board {title}? This will delete all the data of this board including archived cards." : "Are you sure you want to delete the board {title}? This will delete all the data of this board including archived cards.",
+    "Delete the board?" : "Delete the board?",
+    "Loading filtered view" : "Loading filtered view",
+    "No due" : "No due",
+    "Search for {searchQuery} in all boards" : "Search for {searchQuery} in all boards",
+    "No results found" : "No results found",
+    "{stack} in {board}" : "{stack} in {board}",
+    "Click to expand description" : "Click to expand description",
+    "* Created on {created}\n* Last modified on {lastMod}\n* {nbAttachments} attachments\n* {nbComments} comments" : "* Created on {created}\n* Last modified on {lastMod}\n* {nbAttachments} attachments\n* {nbComments} comments",
+    "{nbCards} cards" : "{nbCards} cards",
+    "No upcoming cards" : "No upcoming cards",
+    "upcoming cards" : "upcoming cards",
+    "Due on {date}" : "Due on {date}",
+    "Link to a board" : "Link to a board",
+    "Link to a card" : "Link to a card",
+    "Create a card" : "Create a card",
+    "Message from {author} in {conversationName}" : "Message from {author} in {conversationName}",
+    "Something went wrong" : "Something went wrong",
+    "Failed to upload {name}" : "Failed to upload {name}",
+    "Maximum file size of {size} exceeded" : "Maximum file size of {size} exceeded",
+    "Error creating the share" : "Error creating the share",
+    "Share with a Deck card" : "Share with a Deck card",
+    "Share {file} with a Deck card" : "Share {file} with a Deck card",
     "Share" : "Share",
-    "This week" : "This week"
+    "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 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",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "Are you sure you want to transfer the board {title} for {user} ?",
+    "Transfer the board for {user} successfully" : "Transfer the board for {user} successfully",
+    "Failed to transfer the board for {user}" : "Failed to transfer the board for {user}",
+    "Are you sure you want to delete the board {title}? This will delete all the data of this board." : "Are you sure you want to delete the board {title}? This will delete all the data of this board.",
+    "This week" : "This week",
+    "Are you sure you want to transfer the board {title} for {user}?" : "Are you sure you want to transfer the board {title} for {user}?"
 },
 "nplurals=2; plural=(n != 1);");

l10n/en_GB.json

@@ -1,15 +1,95 @@
 { "translations": {
+    "You have created a new board {board}" : "You have created a new board {board}",
+    "{user} has created a new board {board}" : "{user} has created a new board {board}",
+    "You have deleted the board {board}" : "You have deleted the board {board}",
+    "{user} has deleted the board {board}" : "{user} has deleted the board {board}",
+    "You have restored the board {board}" : "You have restored the board {board}",
+    "{user} has restored the board {board}" : "{user} has restored the board {board}",
+    "You have shared the board {board} with {acl}" : "You have shared the board {board} with {acl}",
+    "{user} has shared the board {board} with {acl}" : "{user} has shared the board {board} with {acl}",
+    "You have removed {acl} from the board {board}" : "You have removed {acl} from the board {board}",
+    "{user} has removed {acl} from the board {board}" : "{user} has removed {acl} from the board {board}",
+    "You have renamed the board {before} to {board}" : "You have renamed the board {before} to {board}",
+    "{user} has renamed the board {before} to {board}" : "{user} has renamed the board {before} to {board}",
+    "You have archived the board {board}" : "You have archived the board {board}",
+    "{user} has archived the board {before}" : "{user} has archived the board {before}",
+    "You have unarchived the board {board}" : "You have unarchived the board {board}",
+    "{user} has unarchived the board {before}" : "{user} has unarchived the board {before}",
+    "You have created a new list {stack} on board {board}" : "You have created a new list {stack} on board {board}",
+    "{user} has created a new list {stack} on board {board}" : "{user} has created a new list {stack} on board {board}",
+    "You have renamed list {before} to {stack} on board {board}" : "You have renamed list {before} to {stack} on board {board}",
+    "{user} has renamed list {before} to {stack} on board {board}" : "{user} has renamed list {before} to {stack} on board {board}",
+    "You have deleted list {stack} on board {board}" : "You have deleted list {stack} on board {board}",
+    "{user} has deleted list {stack} on board {board}" : "{user} has deleted list {stack} on board {board}",
+    "You have created card {card} in list {stack} on board {board}" : "You have created card {card} in list {stack} on board {board}",
+    "{user} has created card {card} in list {stack} on board {board}" : "{user} has created card {card} in list {stack} on board {board}",
+    "You have deleted card {card} in list {stack} on board {board}" : "You have deleted card {card} in list {stack} on board {board}",
+    "{user} has deleted card {card} in list {stack} on board {board}" : "{user} has deleted card {card} in list {stack} on board {board}",
+    "You have renamed the card {before} to {card}" : "You have renamed the card {before} to {card}",
+    "{user} has renamed the card {before} to {card}" : "{user} has renamed the card {before} to {card}",
+    "You have added a description to card {card} in list {stack} on board {board}" : "You have added a description to card {card} in list {stack} on board {board}",
+    "{user} has added a description to card {card} in list {stack} on board {board}" : "{user} has added a description to card {card} in list {stack} on board {board}",
+    "You have updated the description of card {card} in list {stack} on board {board}" : "You have updated the description of card {card} in list {stack} on board {board}",
+    "{user} has updated the description of the card {card} in list {stack} on board {board}" : "{user} has updated the description of the card {card} in list {stack} on board {board}",
+    "You have archived card {card} in list {stack} on board {board}" : "You have archived card {card} in list {stack} on board {board}",
+    "{user} has archived card {card} in list {stack} on board {board}" : "{user} has archived card {card} in list {stack} on board {board}",
+    "You have unarchived card {card} in list {stack} on board {board}" : "You have unarchived card {card} in list {stack} on board {board}",
+    "{user} has unarchived card {card} in list {stack} on board {board}" : "{user} has unarchived card {card} in list {stack} on board {board}",
+    "You have removed the due date of card {card}" : "You have removed the due date of card {card}",
+    "{user} has removed the due date of card {card}" : "{user} has removed the due date of card {card}",
+    "You have set the due date of card {card} to {after}" : "You have set the due date of card {card} to {after}",
+    "{user} has set the due date of card {card} to {after}" : "{user} has set the due date of card {card} to {after}",
+    "You have updated the due date of card {card} to {after}" : "You have updated the due date of card {card} to {after}",
+    "{user} has updated the due date of card {card} to {after}" : "{user} has updated the due date of card {card} to {after}",
+    "You have added the tag {label} to card {card} in list {stack} on board {board}" : "You have added the tag {label} to card {card} in list {stack} on board {board}",
+    "{user} has added the tag {label} to card {card} in list {stack} on board {board}" : "{user} has added the tag {label} to card {card} in list {stack} on board {board}",
+    "You have removed the tag {label} from card {card} in list {stack} on board {board}" : "You have removed the tag {label} from card {card} in list {stack} on board {board}",
+    "{user} has removed the tag {label} from card {card} in list {stack} on board {board}" : "{user} has removed the tag {label} from card {card} in list {stack} on board {board}",
+    "You have assigned {assigneduser} to card {card} on board {board}" : "You have assigned {assigneduser} to card {card} on board {board}",
+    "{user} has assigned {assigneduser} to card {card} on board {board}" : "{user} has assigned {assigneduser} to card {card} on board {board}",
+    "You have unassigned {assigneduser} from card {card} on board {board}" : "You have unassigned {assigneduser} from card {card} on board {board}",
+    "{user} has unassigned {assigneduser} from card {card} on board {board}" : "{user} has unassigned {assigneduser} from card {card} on board {board}",
+    "You have moved the card {card} from list {stackBefore} to {stack}" : "You have moved the card {card} from list {stackBefore} to {stack}",
+    "{user} has moved the card {card} from list {stackBefore} to {stack}" : "{user} has moved the card {card} from list {stackBefore} to {stack}",
+    "You have added the attachment {attachment} to card {card}" : "You have added the attachment {attachment} to card {card}",
+    "{user} has added the attachment {attachment} to card {card}" : "{user} has added the attachment {attachment} to card {card}",
+    "You have updated the attachment {attachment} on card {card}" : "You have updated the attachment {attachment} on card {card}",
+    "{user} has updated the attachment {attachment} on card {card}" : "{user} has updated the attachment {attachment} on card {card}",
+    "You have deleted the attachment {attachment} from card {card}" : "You have deleted the attachment {attachment} from card {card}",
+    "{user} has deleted the attachment {attachment} from card {card}" : "{user} has deleted the attachment {attachment} from card {card}",
+    "You have restored the attachment {attachment} to card {card}" : "You have restored the attachment {attachment} to card {card}",
+    "{user} has restored the attachment {attachment} to card {card}" : "{user} has restored the attachment {attachment} to card {card}",
+    "You have commented on card {card}" : "You have commented on card {card}",
+    "{user} has commented on card {card}" : "{user} has commented on card {card}",
+    "A <strong>card description</strong> inside the Deck app has been changed" : "A <strong>card description</strong> inside the Deck app has been changed",
     "Deck" : "Deck",
+    "Changes in the <strong>Deck app</strong>" : "Changes in the <strong>Deck app</strong>",
+    "A <strong>comment</strong> was created on a card" : "A <strong>comment</strong> was created on a card",
+    "Upcoming cards" : "Upcoming cards",
+    "Load more" : "Load more",
     "Personal" : "Personal",
+    "The card \"%s\" on \"%s\" has been assigned to you by %s." : "The card \"%s\" on \"%s\" has been assigned to you by %s.",
+    "{user} has assigned the card {deck-card} on {deck-board} to you." : "{user} has assigned the card {deck-card} on {deck-board} to you.",
     "The card \"%s\" on \"%s\" has reached its due date." : "The card \"%s\" on \"%s\" has reached its due date.",
+    "The card {deck-card} on {deck-board} has reached its due date." : "The card {deck-card} on {deck-board} has reached its due date.",
+    "%s has mentioned you in a comment on \"%s\"." : "%s has mentioned you in a comment on \"%s\".",
+    "{user} has mentioned you in a comment on {deck-card}." : "{user} has mentioned you in a comment on {deck-card}.",
     "The board \"%s\" has been shared with you by %s." : "The board \"%s\" has been shared with you by %s.",
+    "{user} has shared {deck-board} with you." : "{user} has shared {deck-board} with you.",
+    "Card comments" : "Card comments",
     "%s on %s" : "%s on %s",
+    "No data was provided to create an attachment." : "No data was provided to create an attachment.",
     "Finished" : "Finished",
     "To review" : "To review",
     "Action needed" : "Action needed",
     "Later" : "Later",
     "copy" : "copy",
+    "To do" : "To do",
+    "Doing" : "Doing",
     "Done" : "Done",
+    "Example Task 3" : "Example Task 3",
+    "Example Task 2" : "Example Task 2",
+    "Example Task 1" : "Example Task 1",
     "The file was uploaded" : "The file was uploaded",
     "The uploaded file exceeds the upload_max_filesize directive in php.ini" : "The uploaded file exceeds the upload_max_filesize directive in php.ini",
     "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form",
@@ -18,63 +98,218 @@
     "Missing a temporary folder" : "Missing a temporary folder",
     "Could not write file to disk" : "Could not write file to disk",
     "A PHP extension stopped the file upload" : "A PHP extension stopped the file upload",
+    "No file uploaded or file size exceeds maximum of %s" : "No file uploaded or file size exceeds maximum of %s",
+    "This comment has more than %s characters.\nAdded as an attachment to the card with name %s.\nAccessible on URL: %s." : "This comment has more than %s characters.\nAdded as an attachment to the card with name %s.\nAccessible on URL: %s.",
     "Card not found" : "Card not found",
+    "Path is already shared with this card" : "Path is already shared with this card",
     "Invalid date, date format must be YYYY-MM-DD" : "Invalid date, date format must be YYYY-MM-DD",
+    "Personal planning and team project organization" : "Personal planning and team project organization",
+    "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 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",
+    "Card details" : "Card details",
     "Add board" : "Add board",
+    "Select the board to link to a project" : "Select the board to link to a project",
+    "Search by board title" : "Search by board title",
+    "Select board" : "Select board",
+    "Create a new card" : "Create a new card",
+    "Select a board" : "Select a board",
+    "Select a list" : "Select a list",
+    "Card title" : "Card title",
     "Cancel" : "Cancel",
+    "Creating the new card …" : "Creating the new card …",
+    "Card \"{card}\" was added to \"{board}\"" : "Card \"{card}\" was added to \"{board}\"",
+    "Open card" : "Open card",
     "Close" : "Close",
     "Create card" : "Create card",
+    "Select a card" : "Select a card",
+    "Select the card to link to a project" : "Select the card to link to a project",
+    "Link to card" : "Link to card",
     "File already exists" : "File already exists",
+    "A file with the name {filename} already exists." : "A file with the name {filename} already exists.",
     "Do you want to overwrite it?" : "Do you want to overwrite it?",
+    "Overwrite file" : "Overwrite file",
+    "Keep existing file" : "Keep existing file",
+    "This board is read only" : "This board is read only",
+    "Drop your files to upload" : "Drop your files to upload",
     "Add card" : "Add card",
+    "Archived cards" : "Archived cards",
     "Add list" : "Add list",
+    "List name" : "List name",
+    "Active filters" : "Active filters",
+    "Apply filter" : "Apply filter",
     "Filter by tag" : "Filter by tag",
+    "Filter by assigned user" : "Filter by assigned user",
     "Unassigned" : "Unassigned",
+    "Filter by due date" : "Filter by due date",
     "Overdue" : "Overdue",
+    "Next 24 hours" : "Next 24 hours",
+    "Next 7 days" : "Next 7 days",
+    "Next 30 days" : "Next 30 days",
+    "No due date" : "No due date",
+    "Clear filter" : "Clear filter",
     "Hide archived cards" : "Hide archived cards",
     "Show archived cards" : "Show archived cards",
+    "Toggle compact mode" : "Toggle compact mode",
     "Open details" : "Open details",
     "Details" : "Details",
+    "Loading board" : "Loading board",
+    "No lists available" : "No lists available",
+    "Create a new list to add cards to this board" : "Create a new list to add cards to this board",
+    "Board not found" : "Board not found",
     "Sharing" : "Sharing",
     "Tags" : "Tags",
+    "Deleted items" : "Deleted items",
+    "Timeline" : "Timeline",
+    "Deleted lists" : "Deleted lists",
     "Undo" : "Undo",
+    "Deleted cards" : "Deleted cards",
+    "Share board with a user, group or circle …" : "Share board with a user, group or circle …",
+    "Searching for users, groups and circles …" : "Searching for users, groups and circles …",
+    "No participants found" : "No participants found",
+    "Board owner" : "Board owner",
+    "(Group)" : "(Group)",
+    "(Circle)" : "(Circle)",
     "Can edit" : "Can edit",
     "Can share" : "Can share",
+    "Can manage" : "Can manage",
     "Owner" : "Owner",
     "Delete" : "Delete",
+    "Failed to create share with {displayName}" : "Failed to create share with {displayName}",
+    "Are you sure you want to transfer the board {title} to {user}?" : "Are you sure you want to transfer the board {title} to {user}?",
+    "Transfer the board." : "Transfer the board.",
     "Transfer" : "Transfer",
+    "The board has been transferred to {user}" : "The board has been transferred to {user}",
+    "Failed to transfer the board to {user}" : "Failed to transfer the board to {user}",
+    "Add a new list" : "Add a new list",
+    "Archive all cards" : "Archive all cards",
+    "Unarchive all cards" : "Unarchive all cards",
     "Delete list" : "Delete list",
+    "Archive all cards in this list" : "Archive all cards in this list",
+    "Unarchive all cards in this list" : "Unarchive all cards in this list",
+    "Add a new card" : "Add a new card",
+    "Card name" : "Card name",
+    "List deleted" : "List deleted",
     "Edit" : "Edit",
+    "Add a new tag" : "Add a new tag",
+    "title and color value must be provided" : "title and colour value must be provided",
+    "Board name" : "Board name",
     "Members" : "Members",
+    "Upload new files" : "Upload new files",
+    "Share from Files" : "Share from Files",
+    "Pending share" : "Pending share",
+    "Add this attachment" : "Add this attachment",
+    "Show in Files" : "Show in Files",
     "Download" : "Download",
+    "Remove attachment" : "Remove attachment",
+    "Delete Attachment" : "Delete Attachment",
+    "Restore Attachment" : "Restore Attachment",
+    "File to share" : "File to share",
+    "Invalid path selected" : "Invalid path selected",
+    "Open in sidebar view" : "Open in sidebar view",
+    "Open in bigger view" : "Open in bigger view",
     "Attachments" : "Attachments",
     "Comments" : "Comments",
     "Modified" : "Modified",
     "Created" : "Created",
+    "The title cannot be empty." : "The title cannot be empty.",
+    "No comments yet. Begin the discussion!" : "No comments yet. Begin the discussion!",
+    "Failed to load comments" : "Failed to load comments",
+    "Assign a tag to this card…" : "Assign a tag to this card…",
+    "Assign to users" : "Assign to users",
+    "Assign to users/groups/circles" : "Assign to users/groups/circles",
+    "Assign a user to this card…" : "Assign a user to this card…",
     "Due date" : "Due date",
+    "Set a due date" : "Set a due date",
     "Remove due date" : "Remove due date",
+    "Select Date" : "Select Date",
     "Today" : "Today",
     "Tomorrow" : "Tomorrow",
     "Next week" : "Next week",
     "Next month" : "Next month",
     "Save" : "Save",
+    "The comment cannot be empty." : "The comment cannot be empty.",
+    "The comment cannot be longer than 1000 characters." : "The comment cannot be longer than 1000 characters.",
+    "In reply to" : "In reply to",
+    "Cancel reply" : "Cancel reply",
     "Reply" : "Reply",
     "Update" : "Update",
     "Description" : "Description",
+    "(Unsaved)" : "(Unsaved)",
+    "(Saving…)" : "(Saving…)",
     "Formatting help" : "Formatting help",
+    "Edit description" : "Edit description",
+    "View description" : "View description",
+    "Add Attachment" : "Add Attachment",
+    "Write a description …" : "Write a description …",
+    "Choose attachment" : "Choose attachment",
     "(group)" : "(group)",
+    "Todo items" : "Todo items",
+    "{count} comments, {unread} unread" : "{count} comments, {unread} unread",
+    "Edit card title" : "Edit card title",
+    "Assign to me" : "Assign to me",
+    "Unassign myself" : "Unassign myself",
+    "Move card" : "Move card",
+    "Unarchive card" : "Unarchive card",
     "Archive card" : "Archive card",
     "Delete card" : "Delete card",
+    "Move card to another board" : "Move card to another board",
+    "List is empty" : "List is empty",
+    "Card deleted" : "Card deleted",
     "seconds ago" : "seconds ago",
+    "All boards" : "All boards",
     "Archived boards" : "Archived boards",
     "Shared with you" : "Shared with you",
+    "Deck settings" : "Deck settings",
+    "Use bigger card view" : "Use bigger card view",
+    "Show card ID badge" : "Show card ID badge",
+    "Show boards in calendar/tasks" : "Show boards in calendar/tasks",
+    "Limit deck usage of groups" : "Limit deck usage of groups",
+    "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." : "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.",
     "Board details" : "Board details",
     "Edit board" : "Edit board",
+    "Clone board" : "Clone board",
     "Unarchive board" : "Unarchive board",
     "Archive board" : "Archive board",
+    "Turn on due date reminders" : "Turn on due date reminders",
+    "Turn off due date reminders" : "Turn off due date reminders",
+    "Due date reminders" : "Due date reminders",
+    "All cards" : "All cards",
+    "Assigned cards" : "Assigned cards",
     "No notifications" : "No notifications",
     "Delete board" : "Delete board",
+    "Board {0} deleted" : "Board {0} deleted",
+    "Only assigned cards" : "Only assigned cards",
+    "No reminder" : "No reminder",
+    "An error occurred" : "An error occurred",
+    "Are you sure you want to delete the board {title}? This will delete all the data of this board including archived cards." : "Are you sure you want to delete the board {title}? This will delete all the data of this board including archived cards.",
+    "Delete the board?" : "Delete the board?",
+    "Loading filtered view" : "Loading filtered view",
+    "No due" : "No due",
+    "Search for {searchQuery} in all boards" : "Search for {searchQuery} in all boards",
+    "No results found" : "No results found",
+    "{stack} in {board}" : "{stack} in {board}",
+    "Click to expand description" : "Click to expand description",
+    "* Created on {created}\n* Last modified on {lastMod}\n* {nbAttachments} attachments\n* {nbComments} comments" : "* Created on {created}\n* Last modified on {lastMod}\n* {nbAttachments} attachments\n* {nbComments} comments",
+    "{nbCards} cards" : "{nbCards} cards",
+    "No upcoming cards" : "No upcoming cards",
+    "upcoming cards" : "upcoming cards",
+    "Due on {date}" : "Due on {date}",
+    "Link to a board" : "Link to a board",
+    "Link to a card" : "Link to a card",
+    "Create a card" : "Create a card",
+    "Message from {author} in {conversationName}" : "Message from {author} in {conversationName}",
+    "Something went wrong" : "Something went wrong",
+    "Failed to upload {name}" : "Failed to upload {name}",
+    "Maximum file size of {size} exceeded" : "Maximum file size of {size} exceeded",
+    "Error creating the share" : "Error creating the share",
+    "Share with a Deck card" : "Share with a Deck card",
+    "Share {file} with a Deck card" : "Share {file} with a Deck card",
     "Share" : "Share",
-    "This week" : "This week"
+    "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 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",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "Are you sure you want to transfer the board {title} for {user} ?",
+    "Transfer the board for {user} successfully" : "Transfer the board for {user} successfully",
+    "Failed to transfer the board for {user}" : "Failed to transfer the board for {user}",
+    "Are you sure you want to delete the board {title}? This will delete all the data of this board." : "Are you sure you want to delete the board {title}? This will delete all the data of this board.",
+    "This week" : "This week",
+    "Are you sure you want to transfer the board {title} for {user}?" : "Are you sure you want to transfer the board {title} for {user}?"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

l10n/et_EE.js

@@ -18,6 +18,7 @@ OC.L10N.register(
     "Details" : "Üksikasjad",
     "Sharing" : "Jagamine",
     "Tags" : "Sildid",
+    "Undo" : "Tühista",
     "Can edit" : "Võib redigeerida",
     "Can share" : "Can share",
     "Owner" : "Omanik",
@@ -42,6 +43,7 @@ OC.L10N.register(
     "Shared with you" : "Sinuga jagatud",
     "No notifications" : "Märguandeid pole",
     "An error occurred" : "Tekkis tõrge",
-    "Share" : "Jaga"
+    "Share" : "Jaga",
+    "This week" : "Käesolev nädal"
 },
 "nplurals=2; plural=(n != 1);");

l10n/et_EE.json

@@ -16,6 +16,7 @@
     "Details" : "Üksikasjad",
     "Sharing" : "Jagamine",
     "Tags" : "Sildid",
+    "Undo" : "Tühista",
     "Can edit" : "Võib redigeerida",
     "Can share" : "Can share",
     "Owner" : "Omanik",
@@ -40,6 +41,7 @@
     "Shared with you" : "Sinuga jagatud",
     "No notifications" : "Märguandeid pole",
     "An error occurred" : "Tekkis tõrge",
-    "Share" : "Jaga"
+    "Share" : "Jaga",
+    "This week" : "Käesolev nädal"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

l10n/fr.js

@@ -131,7 +131,7 @@ OC.L10N.register(
     "Overwrite file" : "Remplacer le fichier",
     "Keep existing file" : "Conserver le fichier existant",
     "This board is read only" : "Ce tableau est en lecture seule",
-    "Drop your files to upload" : "Glissez vos fichiers pour les envoyer",
+    "Drop your files to upload" : "Glissez vos fichiers pour les téléverser",
     "Add card" : "Ajouter une carte",
     "Archived cards" : "Cartes archivées",
     "Add list" : "Ajouter une liste",

l10n/fr.json

@@ -129,7 +129,7 @@
     "Overwrite file" : "Remplacer le fichier",
     "Keep existing file" : "Conserver le fichier existant",
     "This board is read only" : "Ce tableau est en lecture seule",
-    "Drop your files to upload" : "Glissez vos fichiers pour les envoyer",
+    "Drop your files to upload" : "Glissez vos fichiers pour les téléverser",
     "Add card" : "Ajouter une carte",
     "Archived cards" : "Cartes archivées",
     "Add list" : "Ajouter une liste",

l10n/pt_BR.js

@@ -71,14 +71,14 @@ OC.L10N.register(
     "Load more" : "Carregar mais",
     "Personal" : "Pessoal",
     "The card \"%s\" on \"%s\" has been assigned to you by %s." : "O cartão \"%s\" em \"%s\" foi vinculado com você por %s.",
-    "{user} has assigned the card {deck-card} on {deck-board} to you." : "{usuário} atribuiu a carta {deck-card} no {deck-board} para você.",
+    "{user} has assigned the card {deck-card} on {deck-board} to you." : "{user} atribuiu o cartão {deck-card} no {deck-board} a você.",
     "The card \"%s\" on \"%s\" has reached its due date." : "O cartão \"%s\" em \"%s\" atingiu sua data de vencimento.",
-    "The card {deck-card} on {deck-board} has reached its due date." : "A carta {deck-card} em {deck-board} atingiu sua data de vencimento.",
+    "The card {deck-card} on {deck-board} has reached its due date." : "O cartão {deck-card} em {deck-board} atingiu sua data de vencimento.",
     "%s has mentioned you in a comment on \"%s\"." : "%s citou você num comentário em \"%s\".",
     "{user} has mentioned you in a comment on {deck-card}." : "{user} mencionou você em um comentário em {deck-card}.",
     "The board \"%s\" has been shared with you by %s." : "O painel \"%s\" foi compartilhado com você por %s.",
-    "{user} has shared {deck-board} with you." : "{user} compartilhou {deck-board} com você.",
-    "Card comments" : "Comentários nos Cards",
+    "{user} has shared {deck-board} with you." : "{user} compartilhou o {deck-board} com você.",
+    "Card comments" : "Comentários do cartão",
     "%s on %s" : "%s em %s",
     "No data was provided to create an attachment." : "Nenhum dado foi fornecido para criar um anexo.",
     "Finished" : "Terminado",
@@ -101,12 +101,12 @@ OC.L10N.register(
     "Could not write file to disk" : "Não foi possível escrever no disco",
     "A PHP extension stopped the file upload" : "Uma extensão PHP parou o envio do arquivo",
     "No file uploaded or file size exceeds maximum of %s" : "Nenhum arquivo enviado ou o tamanho excede o máximo de %s",
-    "This comment has more than %s characters.\nAdded as an attachment to the card with name %s.\nAccessible on URL: %s." : "Este comentário tem mais de %s caracteres.\nAdicionado como um anexo ao cartão com o nome %s.\nAcessível no URL: %s.",
+    "This comment has more than %s characters.\nAdded as an attachment to the card with name %s.\nAccessible on URL: %s." : "Este comentário tem mais de %s caracteres.\nEle foi adicionado como um anexo ao cartão de nome %s.\nAcessível na URL: %s.",
     "Card not found" : "Cartão não encontrado",
     "Path is already shared with this card" : "O caminho já é compartilhado com este cartão",
     "Invalid date, date format must be YYYY-MM-DD" : "Data inválida, o formato da data deve ser AAAA-MM-DD",
     "Personal planning and team project organization" : "Planejamento pessoal e organização de projetos em equipe",
-    "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 é uma ferramenta de organização do estilo kanban voltada para o planejamento pessoal e organização de projetos para equipes integradas ao Nextcloud.\n\n\n- 📥Adicione suas tarefas aos cartões e coloque-as em ordem\n- 📄 Escreva notas adicionais em Anotar \n- 🔖 Atribua rótulos para uma organização ainda melhor\n- 👥 Compartilhe com sua equipe, amigos ou família\n- 📎 Anexar arquivos e incorporá-los à descrição da Nota\n- 💬 Discuta com sua equipe usando comentários\n- ⚡ Acompanhe as mudanças no fluxo de atividades \n- 🚀 Organize seu projeto ",
+    "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" : "O Deck é uma ferramenta de organização ao estilo kanban voltada para o planejamento pessoal e para a organização de projetos para equipes, integrada ao Nextcloud.\n\n\n- 📥Adicione suas tarefas aos cartões e coloque-os em ordem\n- 📄 Escreva notas adicionais formatadas em Markdown \n- 🔖 Atribua rótulos para uma organização ainda melhor\n- 👥 Compartilhe com sua equipe, seus amigos ou sua família\n- 📎 Anexe arquivos e incorpore-os à sua descrição em Markdown\n- 💬 Discuta com sua equipe usando comentários\n- ⚡ Acompanhe as alterações no fluxo de atividades \n- 🚀 Organize seu projeto ",
     "Card details" : "Detalhes do cartão",
     "Add board" : "Adicionar painel",
     "Select the board to link to a project" : "Selecione o painel para vincular a um projeto",
@@ -117,7 +117,7 @@ OC.L10N.register(
     "Select a list" : "Selecione uma lista",
     "Card title" : "Título do cartão",
     "Cancel" : "Cancelar",
-    "Creating the new card …" : "Criando o novo cartão …",
+    "Creating the new card …" : "Criando o novo cartão…",
     "Card \"{card}\" was added to \"{board}\"" : "O cartão \"{card}\" foi adicionado a \"{board}\" ",
     "Open card" : "Abrir o cartão",
     "Close" : "Fechar",
@@ -150,7 +150,7 @@ OC.L10N.register(
     "Clear filter" : "Limpar filtro",
     "Hide archived cards" : "Ocultar cartões arquivados",
     "Show archived cards" : "Exibir cartões arquivados",
-    "Toggle compact mode" : "Alternar para modo compacto",
+    "Toggle compact mode" : "Alternar modo compacto",
     "Open details" : "Abrir detalhes",
     "Details" : "Detalhes",
     "Loading board" : "Carregando painel",
@@ -176,15 +176,17 @@ OC.L10N.register(
     "Owner" : "Proprietário",
     "Delete" : "Excluir",
     "Failed to create share with {displayName}" : "Falha ao criar compartilhamento com {displayName}",
-    "Are you sure you want to transfer the board {title} to {user}?" : "Tem certeza de que deseja transferir o quadro {title} para {user}?",
-    "Transfer the board." : "Transfira a reunião.",
+    "Are you sure you want to transfer the board {title} to {user}?" : "Deseja realmente transferir o painel {title} para {user}?",
+    "Transfer the board." : "Transferir o painel.",
     "Transfer" : "Transferir",
-    "The board has been transferred to {user}" : "A quadro foi transferida para {user}",
-    "Failed to transfer the board to {user}" : "Falha ao transferir o quadro para {user}",
+    "The board has been transferred to {user}" : "A painel foi transferida para {user}",
+    "Failed to transfer the board to {user}" : "Não foi possível transferir o painel para {user}",
     "Add a new list" : "Adicionar nova lista",
     "Archive all cards" : "Arquivar todos os cartões",
+    "Unarchive all cards" : "Desarquivar todos os cartões",
     "Delete list" : "Excluir lista",
     "Archive all cards in this list" : "Arquivar todos os cartões desta lista",
+    "Unarchive all cards in this list" : "Desarquivar todos os cartões desta lista",
     "Add a new card" : "Adicionar um novo cartão",
     "Card name" : "Nome do cartão",
     "List deleted" : "Lista excluída",
@@ -197,7 +199,7 @@ OC.L10N.register(
     "Share from Files" : "Compartilhar de Arquivos",
     "Pending share" : "Compartilhamento pendente",
     "Add this attachment" : "Adicionar este anexo",
-    "Show in Files" : "Mostrar em Arquivos",
+    "Show in Files" : "Exibir em Arquivos",
     "Download" : "Baixar",
     "Remove attachment" : "Remover anexo",
     "Delete Attachment" : "Excluir Anexo",
@@ -212,13 +214,13 @@ OC.L10N.register(
     "Created" : "Criado",
     "The title cannot be empty." : "O título não pode ficar em branco.",
     "No comments yet. Begin the discussion!" : "Nenhum comentário ainda. Inicie a conversa!",
-    "Failed to load comments" : "Falha ao carregar comentários",
+    "Failed to load comments" : "Não foi possível carregar os comentários",
     "Assign a tag to this card…" : "Atribuir uma etiqueta a este cartão...",
     "Assign to users" : "Atribuir a usuários",
     "Assign to users/groups/circles" : "Atribuir a usuários/grupos/círculos",
     "Assign a user to this card…" : "Atribuir um usuário a este cartão...",
     "Due date" : "Data de vencimento",
-    "Set a due date" : "Definir uma data de finalização",
+    "Set a due date" : "Definir uma data de vencimento",
     "Remove due date" : "Remover data de vencimento",
     "Select Date" : "Selecionar Data",
     "Today" : "Hoje",
@@ -242,7 +244,7 @@ OC.L10N.register(
     "Write a description …" : "Escreva uma descrição...",
     "Choose attachment" : "Escolher anexo",
     "(group)" : "(grupo)",
-    "Todo items" : "Itens para fazer",
+    "Todo items" : "Itens a fazer",
     "{count} comments, {unread} unread" : "{count} comentários, {unread} não lidos",
     "Edit card title" : "Editar título do cartão",
     "Assign to me" : "Atribuir a mim",
@@ -252,7 +254,7 @@ OC.L10N.register(
     "Archive card" : "Arquivar cartão",
     "Delete card" : "Excluir cartão",
     "Move card to another board" : "Mover o cartão para outro painel",
-    "List is empty" : "A Lista está vazia",
+    "List is empty" : "A lista está vazia",
     "Card deleted" : "Cartão excluído",
     "seconds ago" : "segundos atrás",
     "All boards" : "Todos os painéis",
@@ -260,7 +262,8 @@ OC.L10N.register(
     "Shared with you" : "Compartilhado com você",
     "Deck settings" : "Configurações do Deck",
     "Use bigger card view" : "Use uma exibição de cartão maior",
-    "Show boards in calendar/tasks" : "Mostrar painéis em calendários/tarefas",
+    "Show card ID badge" : "Exibir o distintivo de identificação do cartão",
+    "Show boards in calendar/tasks" : "Exibir os painéis em calendários/tarefas",
     "Limit deck usage of groups" : "Limitar o uso de grupos no 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." : "Limitar o Deck impedirá que usuários que não fazem parte desses grupos criem seus próprios painéis. Os usuários ainda poderão trabalhar em pastas que foram compartilhadas com eles.",
     "Board details" : "Detalhes do painel",
@@ -279,20 +282,20 @@ OC.L10N.register(
     "Only assigned cards" : "Apenas cartões atribuídos",
     "No reminder" : "Nenhum lembrete",
     "An error occurred" : "Ocorreu um erro",
-    "Are you sure you want to delete the board {title}? This will delete all the data of this board including archived cards." : "Tem certeza de que deseja excluir o quadro {title}? Isso excluirá todos os dados deste quadro, incluindo cartões arquivados.",
+    "Are you sure you want to delete the board {title}? This will delete all the data of this board including archived cards." : "Deseja realmente excluir o painel {title}? Isso excluirá todos os dados deste painel, inclusive os cartões arquivados.",
     "Delete the board?" : "Excluir o painel?",
     "Loading filtered view" : "Carregando exibição filtrada",
     "No due" : "Sem vencimento",
     "Search for {searchQuery} in all boards" : "Pesquisar por {searchQuery} em todos os painéis",
     "No results found" : "Nenhum resultado encontrado",
-    "{stack} in {board}" : "{stack} de {board}",
+    "{stack} in {board}" : "{stack} em {board}",
     "Click to expand description" : "Clique para expandir a descrição",
     "* Created on {created}\n* Last modified on {lastMod}\n* {nbAttachments} attachments\n* {nbComments} comments" : "* Criado em {created}\n* Última modificação em {lastMod}\n* {nbAttachments} anexos\n* {nbComments} comentários",
     "{nbCards} cards" : "{nbCards} cartões",
     "No upcoming cards" : "Não há mais cartões",
     "upcoming cards" : "próximos cartões",
     "Due on {date}" : "Vencimento em {date}",
-    "Link to a board" : "Linkar a um painel",
+    "Link to a board" : "Vincular a um painel",
     "Link to a card" : "Vincular a um cartão",
     "Create a card" : "Criar um cartão",
     "Message from {author} in {conversationName}" : "Mensagem de {author} em {conversationName}",
@@ -304,11 +307,11 @@ OC.L10N.register(
     "Share {file} with a Deck card" : "Compartilhar {file} com um cartão Deck",
     "Share" : "Compartilhar",
     "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 é uma ferramenta de organização de estilo kanban destinada ao planejamento pessoal e organização para equipes integradas com o Nextcloud.\n\n\n- 📥 Adicione suas tarefas aos cartões e coloque-os em ordem\n- 📄 Insira notas adicionais em markdown\n- 🔖 Atribua etiquetas para melhorar a organização\n- 👥 Compartilhe com sua equipe, amigos ou familiares\n- 📎 Anexe arquivos e incorpore-os em sua descrição no markdown\n- 💬 Discuta com sua equipe usando os comentários\n- ⚡ Acompanhe as alterações no fluxo de atividades\n- 🚀 Mantenha seu projeto organizado",
-    "Are you sure you want to transfer the board {title} for {user} ?" : "Tem certeza de que deseja transferir o quadro {title} para {user}?",
-    "Transfer the board for {user} successfully" : "Transferida a reunião para {user} com sucesso",
-    "Failed to transfer the board for {user}" : "Falha ao transferir a reunião para {user}",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "Deseja realmente transferir o painel {title} para {user}?",
+    "Transfer the board for {user} successfully" : "O painel foi transferido para {user} com sucesso",
+    "Failed to transfer the board for {user}" : "Não foi possível transferir o painel para {user}",
     "Are you sure you want to delete the board {title}? This will delete all the data of this board." : "Deseja realmente excluir o painel {title}? Isto excluirá todos os dados deste painel.",
     "This week" : "Esta semana",
-    "Are you sure you want to transfer the board {title} for {user}?" : "Tem certeza de que deseja transferir o quadro {title} para {user}?"
+    "Are you sure you want to transfer the board {title} for {user}?" : "Deseja realmente transferir o painel {title} para {user}?"
 },
 "nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");

l10n/pt_BR.json

@@ -69,14 +69,14 @@
     "Load more" : "Carregar mais",
     "Personal" : "Pessoal",
     "The card \"%s\" on \"%s\" has been assigned to you by %s." : "O cartão \"%s\" em \"%s\" foi vinculado com você por %s.",
-    "{user} has assigned the card {deck-card} on {deck-board} to you." : "{usuário} atribuiu a carta {deck-card} no {deck-board} para você.",
+    "{user} has assigned the card {deck-card} on {deck-board} to you." : "{user} atribuiu o cartão {deck-card} no {deck-board} a você.",
     "The card \"%s\" on \"%s\" has reached its due date." : "O cartão \"%s\" em \"%s\" atingiu sua data de vencimento.",
-    "The card {deck-card} on {deck-board} has reached its due date." : "A carta {deck-card} em {deck-board} atingiu sua data de vencimento.",
+    "The card {deck-card} on {deck-board} has reached its due date." : "O cartão {deck-card} em {deck-board} atingiu sua data de vencimento.",
     "%s has mentioned you in a comment on \"%s\"." : "%s citou você num comentário em \"%s\".",
     "{user} has mentioned you in a comment on {deck-card}." : "{user} mencionou você em um comentário em {deck-card}.",
     "The board \"%s\" has been shared with you by %s." : "O painel \"%s\" foi compartilhado com você por %s.",
-    "{user} has shared {deck-board} with you." : "{user} compartilhou {deck-board} com você.",
-    "Card comments" : "Comentários nos Cards",
+    "{user} has shared {deck-board} with you." : "{user} compartilhou o {deck-board} com você.",
+    "Card comments" : "Comentários do cartão",
     "%s on %s" : "%s em %s",
     "No data was provided to create an attachment." : "Nenhum dado foi fornecido para criar um anexo.",
     "Finished" : "Terminado",
@@ -99,12 +99,12 @@
     "Could not write file to disk" : "Não foi possível escrever no disco",
     "A PHP extension stopped the file upload" : "Uma extensão PHP parou o envio do arquivo",
     "No file uploaded or file size exceeds maximum of %s" : "Nenhum arquivo enviado ou o tamanho excede o máximo de %s",
-    "This comment has more than %s characters.\nAdded as an attachment to the card with name %s.\nAccessible on URL: %s." : "Este comentário tem mais de %s caracteres.\nAdicionado como um anexo ao cartão com o nome %s.\nAcessível no URL: %s.",
+    "This comment has more than %s characters.\nAdded as an attachment to the card with name %s.\nAccessible on URL: %s." : "Este comentário tem mais de %s caracteres.\nEle foi adicionado como um anexo ao cartão de nome %s.\nAcessível na URL: %s.",
     "Card not found" : "Cartão não encontrado",
     "Path is already shared with this card" : "O caminho já é compartilhado com este cartão",
     "Invalid date, date format must be YYYY-MM-DD" : "Data inválida, o formato da data deve ser AAAA-MM-DD",
     "Personal planning and team project organization" : "Planejamento pessoal e organização de projetos em equipe",
-    "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 é uma ferramenta de organização do estilo kanban voltada para o planejamento pessoal e organização de projetos para equipes integradas ao Nextcloud.\n\n\n- 📥Adicione suas tarefas aos cartões e coloque-as em ordem\n- 📄 Escreva notas adicionais em Anotar \n- 🔖 Atribua rótulos para uma organização ainda melhor\n- 👥 Compartilhe com sua equipe, amigos ou família\n- 📎 Anexar arquivos e incorporá-los à descrição da Nota\n- 💬 Discuta com sua equipe usando comentários\n- ⚡ Acompanhe as mudanças no fluxo de atividades \n- 🚀 Organize seu projeto ",
+    "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" : "O Deck é uma ferramenta de organização ao estilo kanban voltada para o planejamento pessoal e para a organização de projetos para equipes, integrada ao Nextcloud.\n\n\n- 📥Adicione suas tarefas aos cartões e coloque-os em ordem\n- 📄 Escreva notas adicionais formatadas em Markdown \n- 🔖 Atribua rótulos para uma organização ainda melhor\n- 👥 Compartilhe com sua equipe, seus amigos ou sua família\n- 📎 Anexe arquivos e incorpore-os à sua descrição em Markdown\n- 💬 Discuta com sua equipe usando comentários\n- ⚡ Acompanhe as alterações no fluxo de atividades \n- 🚀 Organize seu projeto ",
     "Card details" : "Detalhes do cartão",
     "Add board" : "Adicionar painel",
     "Select the board to link to a project" : "Selecione o painel para vincular a um projeto",
@@ -115,7 +115,7 @@
     "Select a list" : "Selecione uma lista",
     "Card title" : "Título do cartão",
     "Cancel" : "Cancelar",
-    "Creating the new card …" : "Criando o novo cartão …",
+    "Creating the new card …" : "Criando o novo cartão…",
     "Card \"{card}\" was added to \"{board}\"" : "O cartão \"{card}\" foi adicionado a \"{board}\" ",
     "Open card" : "Abrir o cartão",
     "Close" : "Fechar",
@@ -148,7 +148,7 @@
     "Clear filter" : "Limpar filtro",
     "Hide archived cards" : "Ocultar cartões arquivados",
     "Show archived cards" : "Exibir cartões arquivados",
-    "Toggle compact mode" : "Alternar para modo compacto",
+    "Toggle compact mode" : "Alternar modo compacto",
     "Open details" : "Abrir detalhes",
     "Details" : "Detalhes",
     "Loading board" : "Carregando painel",
@@ -174,15 +174,17 @@
     "Owner" : "Proprietário",
     "Delete" : "Excluir",
     "Failed to create share with {displayName}" : "Falha ao criar compartilhamento com {displayName}",
-    "Are you sure you want to transfer the board {title} to {user}?" : "Tem certeza de que deseja transferir o quadro {title} para {user}?",
-    "Transfer the board." : "Transfira a reunião.",
+    "Are you sure you want to transfer the board {title} to {user}?" : "Deseja realmente transferir o painel {title} para {user}?",
+    "Transfer the board." : "Transferir o painel.",
     "Transfer" : "Transferir",
-    "The board has been transferred to {user}" : "A quadro foi transferida para {user}",
-    "Failed to transfer the board to {user}" : "Falha ao transferir o quadro para {user}",
+    "The board has been transferred to {user}" : "A painel foi transferida para {user}",
+    "Failed to transfer the board to {user}" : "Não foi possível transferir o painel para {user}",
     "Add a new list" : "Adicionar nova lista",
     "Archive all cards" : "Arquivar todos os cartões",
+    "Unarchive all cards" : "Desarquivar todos os cartões",
     "Delete list" : "Excluir lista",
     "Archive all cards in this list" : "Arquivar todos os cartões desta lista",
+    "Unarchive all cards in this list" : "Desarquivar todos os cartões desta lista",
     "Add a new card" : "Adicionar um novo cartão",
     "Card name" : "Nome do cartão",
     "List deleted" : "Lista excluída",
@@ -195,7 +197,7 @@
     "Share from Files" : "Compartilhar de Arquivos",
     "Pending share" : "Compartilhamento pendente",
     "Add this attachment" : "Adicionar este anexo",
-    "Show in Files" : "Mostrar em Arquivos",
+    "Show in Files" : "Exibir em Arquivos",
     "Download" : "Baixar",
     "Remove attachment" : "Remover anexo",
     "Delete Attachment" : "Excluir Anexo",
@@ -210,13 +212,13 @@
     "Created" : "Criado",
     "The title cannot be empty." : "O título não pode ficar em branco.",
     "No comments yet. Begin the discussion!" : "Nenhum comentário ainda. Inicie a conversa!",
-    "Failed to load comments" : "Falha ao carregar comentários",
+    "Failed to load comments" : "Não foi possível carregar os comentários",
     "Assign a tag to this card…" : "Atribuir uma etiqueta a este cartão...",
     "Assign to users" : "Atribuir a usuários",
     "Assign to users/groups/circles" : "Atribuir a usuários/grupos/círculos",
     "Assign a user to this card…" : "Atribuir um usuário a este cartão...",
     "Due date" : "Data de vencimento",
-    "Set a due date" : "Definir uma data de finalização",
+    "Set a due date" : "Definir uma data de vencimento",
     "Remove due date" : "Remover data de vencimento",
     "Select Date" : "Selecionar Data",
     "Today" : "Hoje",
@@ -240,7 +242,7 @@
     "Write a description …" : "Escreva uma descrição...",
     "Choose attachment" : "Escolher anexo",
     "(group)" : "(grupo)",
-    "Todo items" : "Itens para fazer",
+    "Todo items" : "Itens a fazer",
     "{count} comments, {unread} unread" : "{count} comentários, {unread} não lidos",
     "Edit card title" : "Editar título do cartão",
     "Assign to me" : "Atribuir a mim",
@@ -250,7 +252,7 @@
     "Archive card" : "Arquivar cartão",
     "Delete card" : "Excluir cartão",
     "Move card to another board" : "Mover o cartão para outro painel",
-    "List is empty" : "A Lista está vazia",
+    "List is empty" : "A lista está vazia",
     "Card deleted" : "Cartão excluído",
     "seconds ago" : "segundos atrás",
     "All boards" : "Todos os painéis",
@@ -258,7 +260,8 @@
     "Shared with you" : "Compartilhado com você",
     "Deck settings" : "Configurações do Deck",
     "Use bigger card view" : "Use uma exibição de cartão maior",
-    "Show boards in calendar/tasks" : "Mostrar painéis em calendários/tarefas",
+    "Show card ID badge" : "Exibir o distintivo de identificação do cartão",
+    "Show boards in calendar/tasks" : "Exibir os painéis em calendários/tarefas",
     "Limit deck usage of groups" : "Limitar o uso de grupos no 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." : "Limitar o Deck impedirá que usuários que não fazem parte desses grupos criem seus próprios painéis. Os usuários ainda poderão trabalhar em pastas que foram compartilhadas com eles.",
     "Board details" : "Detalhes do painel",
@@ -277,20 +280,20 @@
     "Only assigned cards" : "Apenas cartões atribuídos",
     "No reminder" : "Nenhum lembrete",
     "An error occurred" : "Ocorreu um erro",
-    "Are you sure you want to delete the board {title}? This will delete all the data of this board including archived cards." : "Tem certeza de que deseja excluir o quadro {title}? Isso excluirá todos os dados deste quadro, incluindo cartões arquivados.",
+    "Are you sure you want to delete the board {title}? This will delete all the data of this board including archived cards." : "Deseja realmente excluir o painel {title}? Isso excluirá todos os dados deste painel, inclusive os cartões arquivados.",
     "Delete the board?" : "Excluir o painel?",
     "Loading filtered view" : "Carregando exibição filtrada",
     "No due" : "Sem vencimento",
     "Search for {searchQuery} in all boards" : "Pesquisar por {searchQuery} em todos os painéis",
     "No results found" : "Nenhum resultado encontrado",
-    "{stack} in {board}" : "{stack} de {board}",
+    "{stack} in {board}" : "{stack} em {board}",
     "Click to expand description" : "Clique para expandir a descrição",
     "* Created on {created}\n* Last modified on {lastMod}\n* {nbAttachments} attachments\n* {nbComments} comments" : "* Criado em {created}\n* Última modificação em {lastMod}\n* {nbAttachments} anexos\n* {nbComments} comentários",
     "{nbCards} cards" : "{nbCards} cartões",
     "No upcoming cards" : "Não há mais cartões",
     "upcoming cards" : "próximos cartões",
     "Due on {date}" : "Vencimento em {date}",
-    "Link to a board" : "Linkar a um painel",
+    "Link to a board" : "Vincular a um painel",
     "Link to a card" : "Vincular a um cartão",
     "Create a card" : "Criar um cartão",
     "Message from {author} in {conversationName}" : "Mensagem de {author} em {conversationName}",
@@ -302,11 +305,11 @@
     "Share {file} with a Deck card" : "Compartilhar {file} com um cartão Deck",
     "Share" : "Compartilhar",
     "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 é uma ferramenta de organização de estilo kanban destinada ao planejamento pessoal e organização para equipes integradas com o Nextcloud.\n\n\n- 📥 Adicione suas tarefas aos cartões e coloque-os em ordem\n- 📄 Insira notas adicionais em markdown\n- 🔖 Atribua etiquetas para melhorar a organização\n- 👥 Compartilhe com sua equipe, amigos ou familiares\n- 📎 Anexe arquivos e incorpore-os em sua descrição no markdown\n- 💬 Discuta com sua equipe usando os comentários\n- ⚡ Acompanhe as alterações no fluxo de atividades\n- 🚀 Mantenha seu projeto organizado",
-    "Are you sure you want to transfer the board {title} for {user} ?" : "Tem certeza de que deseja transferir o quadro {title} para {user}?",
-    "Transfer the board for {user} successfully" : "Transferida a reunião para {user} com sucesso",
-    "Failed to transfer the board for {user}" : "Falha ao transferir a reunião para {user}",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "Deseja realmente transferir o painel {title} para {user}?",
+    "Transfer the board for {user} successfully" : "O painel foi transferido para {user} com sucesso",
+    "Failed to transfer the board for {user}" : "Não foi possível transferir o painel para {user}",
     "Are you sure you want to delete the board {title}? This will delete all the data of this board." : "Deseja realmente excluir o painel {title}? Isto excluirá todos os dados deste painel.",
     "This week" : "Esta semana",
-    "Are you sure you want to transfer the board {title} for {user}?" : "Tem certeza de que deseja transferir o quadro {title} para {user}?"
+    "Are you sure you want to transfer the board {title} for {user}?" : "Deseja realmente transferir o painel {title} para {user}?"
 },"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }

l10n/ru.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" : "Список удалён",
@@ -242,7 +244,9 @@ OC.L10N.register(
     "Write a description …" : "Добавьте описание...",
     "Choose attachment" : "Выберите вложение",
     "(group)" : "(группа)",
+    "Todo items" : "Элементы списка задач",
     "{count} comments, {unread} unread" : "{count} комментариев, {unread} непрочитано",
+    "Edit card title" : "Изменить заголовок карточки",
     "Assign to me" : "Назначить себе",
     "Unassign myself" : "Отказаться от назначения",
     "Move card" : "Переместить карточку",
@@ -256,7 +260,9 @@ OC.L10N.register(
     "All boards" : "Все доски",
     "Archived boards" : "Архив досок",
     "Shared with you" : "Предоставленные вам",
+    "Deck settings" : "Параметры карточек",
     "Use bigger card view" : "Режим просмотра с увеличенными карточками",
+    "Show card ID badge" : "Показывать идентификатор карточки",
     "Show boards in calendar/tasks" : "Показывать карточки в календаре и задачах",
     "Limit deck usage of groups" : "Разрешить использовать приложение Карточки только участникам заданных групп",
     "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." : "Создание собственных рабочих досок пользователям, не входящим в заданные группы, будет заблокировано. Тем не менее, такие пользователи смогут продолжить работать с общими досками, к которым у них есть доступ.  ",
@@ -276,12 +282,15 @@ OC.L10N.register(
     "Only assigned cards" : "Только для назначенных карточек",
     "No reminder" : "Не напоминать",
     "An error occurred" : "Произошла ошибка",
+    "Are you sure you want to delete the board {title}? This will delete all the data of this board including archived cards." : "Подтвердите удаление доски «{title}»; это действие приведёт к удалению также все данных, принадлежащих этой доске, включая карточки в архиве.",
     "Delete the board?" : "Удалить доску?",
     "Loading filtered view" : "Выполняется отбор",
     "No due" : "Без назначенной даты",
     "Search for {searchQuery} in all boards" : "Искать {searchQuery} на всех досках",
     "No results found" : "Результаты отсутствуют",
     "{stack} in {board}" : "«{stack}» с доски «{board}»",
+    "Click to expand description" : "Нажмите, чтобы развернуть поле описания",
+    "{nbCards} cards" : "карточек: {nbCards}",
     "No upcoming cards" : "Отсутствуют карточки, ожидающие выполнения",
     "upcoming cards" : "карточки, ожидающие выполнения",
     "Link to a board" : "Ссылка на доску",

l10n/ru.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" : "Список удалён",
@@ -240,7 +242,9 @@
     "Write a description …" : "Добавьте описание...",
     "Choose attachment" : "Выберите вложение",
     "(group)" : "(группа)",
+    "Todo items" : "Элементы списка задач",
     "{count} comments, {unread} unread" : "{count} комментариев, {unread} непрочитано",
+    "Edit card title" : "Изменить заголовок карточки",
     "Assign to me" : "Назначить себе",
     "Unassign myself" : "Отказаться от назначения",
     "Move card" : "Переместить карточку",
@@ -254,7 +258,9 @@
     "All boards" : "Все доски",
     "Archived boards" : "Архив досок",
     "Shared with you" : "Предоставленные вам",
+    "Deck settings" : "Параметры карточек",
     "Use bigger card view" : "Режим просмотра с увеличенными карточками",
+    "Show card ID badge" : "Показывать идентификатор карточки",
     "Show boards in calendar/tasks" : "Показывать карточки в календаре и задачах",
     "Limit deck usage of groups" : "Разрешить использовать приложение Карточки только участникам заданных групп",
     "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." : "Создание собственных рабочих досок пользователям, не входящим в заданные группы, будет заблокировано. Тем не менее, такие пользователи смогут продолжить работать с общими досками, к которым у них есть доступ.  ",
@@ -274,12 +280,15 @@
     "Only assigned cards" : "Только для назначенных карточек",
     "No reminder" : "Не напоминать",
     "An error occurred" : "Произошла ошибка",
+    "Are you sure you want to delete the board {title}? This will delete all the data of this board including archived cards." : "Подтвердите удаление доски «{title}»; это действие приведёт к удалению также все данных, принадлежащих этой доске, включая карточки в архиве.",
     "Delete the board?" : "Удалить доску?",
     "Loading filtered view" : "Выполняется отбор",
     "No due" : "Без назначенной даты",
     "Search for {searchQuery} in all boards" : "Искать {searchQuery} на всех досках",
     "No results found" : "Результаты отсутствуют",
     "{stack} in {board}" : "«{stack}» с доски «{board}»",
+    "Click to expand description" : "Нажмите, чтобы развернуть поле описания",
+    "{nbCards} cards" : "карточек: {nbCards}",
     "No upcoming cards" : "Отсутствуют карточки, ожидающие выполнения",
     "upcoming cards" : "карточки, ожидающие выполнения",
     "Link to a board" : "Ссылка на доску",

l10n/uk.js

@@ -125,7 +125,7 @@ OC.L10N.register(
     "Upload new files" : "Додати файл",
     "Share from Files" : "Відкрити Файли",
     "Add this attachment" : "Долучити вкладення",
-    "Download" : "Завантажити",
+    "Download" : "Звантажити",
     "Delete Attachment" : "Забрати вкладення",
     "Restore Attachment" : "Відновити вкладення",
     "File to share" : "Виберіть файл для надання доступу",

l10n/uk.json

@@ -123,7 +123,7 @@
     "Upload new files" : "Додати файл",
     "Share from Files" : "Відкрити Файли",
     "Add this attachment" : "Долучити вкладення",
-    "Download" : "Завантажити",
+    "Download" : "Звантажити",
     "Delete Attachment" : "Забрати вкладення",
     "Restore Attachment" : "Відновити вкладення",
     "File to share" : "Виберіть файл для надання доступу",

l10n/zh_CN.js

@@ -134,6 +134,7 @@ OC.L10N.register(
     "Archived cards" : "已归档卡片",
     "Add list" : "添加列表",
     "List name" : "列表名称",
+    "Active filters" : "已开启的过滤器",
     "Apply filter" : "应用筛选",
     "Filter by tag" : "按标签筛选",
     "Filter by assigned user" : "按指派的用户筛选",
@@ -235,7 +236,9 @@ OC.L10N.register(
     "Write a description …" : "写一段描述",
     "Choose attachment" : "选择附件",
     "(group)" : "（组）",
+    "Todo items" : "待办事项",
     "{count} comments, {unread} unread" : "{count} 条评论，{unread} 未读",
+    "Edit card title" : "编辑卡片标题",
     "Assign to me" : "指派给我",
     "Unassign myself" : "不再指派给我",
     "Move card" : "移动卡片",

l10n/zh_CN.json

@@ -132,6 +132,7 @@
     "Archived cards" : "已归档卡片",
     "Add list" : "添加列表",
     "List name" : "列表名称",
+    "Active filters" : "已开启的过滤器",
     "Apply filter" : "应用筛选",
     "Filter by tag" : "按标签筛选",
     "Filter by assigned user" : "按指派的用户筛选",
@@ -233,7 +234,9 @@
     "Write a description …" : "写一段描述",
     "Choose attachment" : "选择附件",
     "(group)" : "（组）",
+    "Todo items" : "待办事项",
     "{count} comments, {unread} unread" : "{count} 条评论，{unread} 未读",
+    "Edit card title" : "编辑卡片标题",
     "Assign to me" : "指派给我",
     "Unassign myself" : "不再指派给我",
     "Move card" : "移动卡片",

lib/Activity/ActivityManager.php

@@ -45,7 +45,9 @@ use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\Comments\IComment;
 use OCP\IUser;
+use OCP\Server;
 use OCP\L10N\IFactory;
+use Psr\Log\LoggerInterface;
 
 class ActivityManager {
 	public const DECK_NOAUTHOR_COMMENT_SYSTEM_ENFORCED = 'DECK_NOAUTHOR_COMMENT_SYSTEM_ENFORCED';
@@ -53,14 +55,14 @@ class ActivityManager {
 	public const SUBJECT_PARAMS_MAX_LENGTH = 4000;
 	public const SHORTENED_DESCRIPTION_MAX_LENGTH = 2000;
 
-	private $manager;
-	private $userId;
-	private $permissionService;
-	private $boardMapper;
-	private $cardMapper;
-	private $aclMapper;
-	private $stackMapper;
-	private $l10nFactory;
+	private IManager $manager;
+	private ?string $userId;
+	private PermissionService $permissionService;
+	private BoardMapper $boardMapper;
+	private CardMapper $cardMapper;
+	private AclMapper $aclMapper;
+	private StackMapper $stackMapper;
+	private IFactory $l10nFactory;
 
 	public const DECK_OBJECT_BOARD = 'deck_board';
 	public const DECK_OBJECT_CARD = 'deck_card';
@@ -114,7 +116,7 @@ class ActivityManager {
 		StackMapper $stackMapper,
 		AclMapper $aclMapper,
 		IFactory $l10nFactory,
-		$userId
+		?string $userId
 	) {
 		$this->manager = $manager;
 		$this->permissionService = $permissionsService;
@@ -310,10 +312,10 @@ class ActivityManager {
 		try {
 			$object = $this->findObjectForEntity($objectType, $entity);
 		} catch (DoesNotExistException $e) {
-			\OC::$server->getLogger()->error('Could not create activity entry for ' . $subject . '. Entity not found.', (array)$entity);
+			Server::get(LoggerInterface::class)->error('Could not create activity entry for ' . $subject . '. Entity not found.', (array)$entity);
 			return null;
 		} catch (MultipleObjectsReturnedException $e) {
-			\OC::$server->getLogger()->error('Could not create activity entry for ' . $subject . '. Entity not found.', (array)$entity);
+			Server::get(LoggerInterface::class)->error('Could not create activity entry for ' . $subject . '. Entity not found.', (array)$entity);
 			return null;
 		}
 
@@ -365,7 +367,15 @@ class ActivityManager {
 			case self::SUBJECT_CARD_USER_ASSIGN:
 			case self::SUBJECT_CARD_USER_UNASSIGN:
 				$subjectParams = $this->findDetailsForCard($entity->getId(), $subject);
-				break;
+
+				if (isset($additionalParams['after']) && $additionalParams['after'] instanceof \DateTimeInterface) {
+					$additionalParams['after'] = $additionalParams['after']->format('c');
+				}
+				if (isset($additionalParams['before']) && $additionalParams['before'] instanceof \DateTimeInterface) {
+					$additionalParams['before'] = $additionalParams['before']->format('c');
+				}
+
+			break;
 			case self::SUBJECT_ATTACHMENT_CREATE:
 			case self::SUBJECT_ATTACHMENT_UPDATE:
 			case self::SUBJECT_ATTACHMENT_DELETE:

lib/Activity/DeckProvider.php

@@ -312,12 +312,19 @@ class DeckProvider implements IProvider {
 			$userLanguage = $this->config->getUserValue($event->getAuthor(), 'core', 'lang', $this->l10nFactory->findLanguage());
 			$userLocale = $this->config->getUserValue($event->getAuthor(), 'core', 'locale', $this->l10nFactory->findLocale());
 			$l10n = $this->l10nFactory->get('deck', $userLanguage, $userLocale);
-			$date = new \DateTime($subjectParams['after']);
-			$date->setTimezone(new \DateTimeZone(\date_default_timezone_get()));
+			if (is_array($subjectParams['after'])) {
+				// Unluckily there was a time when we stored jsonSerialized date objects in the database
+				// Broken in 1.8.0 and fixed again in 1.8.1
+				$date = new \DateTime($subjectParams['after']['date']);
+				$date->setTimezone(new \DateTimeZone(\date_default_timezone_get()));
+			} else {
+				$date = new \DateTime($subjectParams['after']);
+				$date->setTimezone(new \DateTimeZone(\date_default_timezone_get()));
+			}
 			$params['after'] = [
 				'type' => 'highlight',
 				'id' => 'dt:' . $subjectParams['after'],
-				'name' => $l10n->l('datetime', $date)
+				'name' => $l10n->l('datetime', $date),
 			];
 		}
 		return $params;

lib/AppInfo/Application.php

@@ -26,15 +26,13 @@ namespace OCA\Deck\AppInfo;
 use Closure;
 use Exception;
 use OC\EventDispatcher\SymfonyAdapter;
+use OCA\Circles\Events\CircleDestroyedEvent;
 use OCA\Deck\Activity\CommentEventHandler;
 use OCA\Deck\Capabilities;
 use OCA\Deck\Collaboration\Resources\ResourceProvider;
 use OCA\Deck\Collaboration\Resources\ResourceProviderCard;
 use OCA\Deck\Dashboard\DeckWidget;
 use OCA\Deck\Db\Acl;
-use OCA\Deck\Db\AclMapper;
-use OCA\Deck\Db\AssignmentMapper;
-use OCA\Deck\Db\BoardMapper;
 use OCA\Deck\Db\CardMapper;
 use OCA\Deck\Event\AclCreatedEvent;
 use OCA\Deck\Event\AclDeletedEvent;
@@ -43,10 +41,13 @@ use OCA\Deck\Event\CardCreatedEvent;
 use OCA\Deck\Event\CardDeletedEvent;
 use OCA\Deck\Event\CardUpdatedEvent;
 use OCA\Deck\Listeners\BeforeTemplateRenderedListener;
+use OCA\Deck\Listeners\ParticipantCleanupListener;
 use OCA\Deck\Listeners\FullTextSearchEventListener;
+use OCA\Deck\Listeners\ResourceListener;
 use OCA\Deck\Middleware\DefaultBoardMiddleware;
 use OCA\Deck\Middleware\ExceptionMiddleware;
 use OCA\Deck\Notification\Notifier;
+use OCA\Deck\Reference\CardReferenceProvider;
 use OCA\Deck\Search\CardCommentProvider;
 use OCA\Deck\Search\DeckProvider;
 use OCA\Deck\Service\PermissionService;
@@ -57,20 +58,19 @@ use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
+use OCP\Collaboration\Reference\RenderReferenceEvent;
 use OCP\Collaboration\Resources\IProviderManager;
 use OCP\Comments\CommentsEntityEvent;
 use OCP\Comments\ICommentsManager;
-use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Group\Events\GroupDeletedEvent;
 use OCP\IConfig;
 use OCP\IDBConnection;
-use OCP\IGroup;
-use OCP\IGroupManager;
-use OCP\IServerContainer;
-use OCP\IUser;
-use OCP\IUserManager;
+use OCP\IRequest;
+use OCP\Server;
 use OCP\Notification\IManager as NotificationManager;
 use OCP\Share\IManager;
+use OCP\User\Events\UserDeletedEvent;
 use OCP\Util;
 use Psr\Container\ContainerInterface;
 
@@ -79,17 +79,19 @@ class Application extends App implements IBootstrap {
 
 	public const COMMENT_ENTITY_TYPE = 'deckCard';
 
-	/** @var IServerContainer */
-	private $server;
-
 	public function __construct(array $urlParams = []) {
 		parent::__construct(self::APP_ID, $urlParams);
 
-		$this->server = \OC::$server;
+		// TODO move this back to ::register after fixing the autoload issue
+		// (and use a listener class)
+		$container = $this->getContainer();
+		$eventDispatcher = $container->get(IEventDispatcher::class);
+		$eventDispatcher->addListener(RenderReferenceEvent::class, function () {
+			Util::addScript(self::APP_ID, self::APP_ID . '-card-reference');
+		});
 	}
 
 	public function boot(IBootContext $context): void {
-		$context->injectFn(Closure::fromCallable([$this, 'registerUserGroupHooks']));
 		$context->injectFn(Closure::fromCallable([$this, 'registerCommentsEntity']));
 		$context->injectFn(Closure::fromCallable([$this, 'registerCommentsEventHandler']));
 		$context->injectFn(Closure::fromCallable([$this, 'registerNotifications']));
@@ -124,8 +126,12 @@ class Application extends App implements IBootstrap {
 		$context->registerSearchProvider(CardCommentProvider::class);
 		$context->registerDashboardWidget(DeckWidget::class);
 
+		// reference widget
+		$context->registerReferenceProvider(CardReferenceProvider::class);
+		// $context->registerEventListener(RenderReferenceEvent::class, CardReferenceListener::class);
+
 		$context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
-		
+
 		// Event listening for full text search indexing
 		$context->registerEventListener(CardCreatedEvent::class, FullTextSearchEventListener::class);
 		$context->registerEventListener(CardUpdatedEvent::class, FullTextSearchEventListener::class);
@@ -133,54 +139,26 @@ class Application extends App implements IBootstrap {
 		$context->registerEventListener(AclCreatedEvent::class, FullTextSearchEventListener::class);
 		$context->registerEventListener(AclUpdatedEvent::class, FullTextSearchEventListener::class);
 		$context->registerEventListener(AclDeletedEvent::class, FullTextSearchEventListener::class);
+
+		// Handling cache invalidation for collections
+		$context->registerEventListener(AclCreatedEvent::class, ResourceListener::class);
+		$context->registerEventListener(AclDeletedEvent::class, ResourceListener::class);
+
+		$context->registerEventListener(UserDeletedEvent::class, ParticipantCleanupListener::class);
+		$context->registerEventListener(GroupDeletedEvent::class, ParticipantCleanupListener::class);
+		$context->registerEventListener(CircleDestroyedEvent::class, ParticipantCleanupListener::class);
 	}
 
 	public function registerNotifications(NotificationManager $notificationManager): void {
 		$notificationManager->registerNotifierService(Notifier::class);
 	}
 
-	private function registerUserGroupHooks(IUserManager $userManager, IGroupManager $groupManager): void {
-		$container = $this->getContainer();
-		// Delete user/group acl entries when they get deleted
-		$userManager->listen('\OC\User', 'postDelete', static function (IUser $user) use ($container) {
-			// delete existing acl entries for deleted user
-			/** @var AclMapper $aclMapper */
-			$aclMapper = $container->query(AclMapper::class);
-			$acls = $aclMapper->findByParticipant(Acl::PERMISSION_TYPE_USER, $user->getUID());
-			foreach ($acls as $acl) {
-				$aclMapper->delete($acl);
-			}
-			// delete existing user assignments
-			$assignmentMapper = $container->query(AssignmentMapper::class);
-			$assignments = $assignmentMapper->findByParticipant($user->getUID());
-			foreach ($assignments as $assignment) {
-				$assignmentMapper->delete($assignment);
-			}
-
-			/** @var BoardMapper $boardMapper */
-			$boardMapper = $container->query(BoardMapper::class);
-			$boards = $boardMapper->findAllByOwner($user->getUID());
-			foreach ($boards as $board) {
-				$boardMapper->delete($board);
-			}
-		});
-
-		$groupManager->listen('\OC\Group', 'postDelete', static function (IGroup $group) use ($container) {
-			/** @var AclMapper $aclMapper */
-			$aclMapper = $container->query(AclMapper::class);
-			$aclMapper->findByParticipant(Acl::PERMISSION_TYPE_GROUP, $group->getGID());
-			$acls = $aclMapper->findByParticipant(Acl::PERMISSION_TYPE_GROUP, $group->getGID());
-			foreach ($acls as $acl) {
-				$aclMapper->delete($acl);
-			}
-		});
-	}
-
 	public function registerCommentsEntity(IEventDispatcher $eventDispatcher): void {
 		$eventDispatcher->addListener(CommentsEntityEvent::EVENT_ENTITY, function (CommentsEntityEvent $event) {
 			$event->addEntityCollection(self::COMMENT_ENTITY_TYPE, function ($name) {
 				/** @var CardMapper */
 				$cardMapper = $this->getContainer()->get(CardMapper::class);
+				/** @var PermissionService $permissionService */
 				$permissionService = $this->getContainer()->get(PermissionService::class);
 
 				try {
@@ -203,7 +181,7 @@ class Application extends App implements IBootstrap {
 		$resourceManager->registerResourceProvider(ResourceProviderCard::class);
 
 		$symfonyAdapter->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', static function () {
-			if (strpos(\OC::$server->getRequest()->getPathInfo(), '/call/') === 0) {
+			if (strpos(Server::get(IRequest::class)->getPathInfo(), '/call/') === 0) {
 				// Talk integration has its own entrypoint which already includes collections handling
 				return;
 			}

lib/Collaboration/Resources/ResourceProvider.php

@@ -32,20 +32,23 @@ use OCP\AppFramework\QueryException;
 use OCP\Collaboration\Resources\IManager;
 use OCP\Collaboration\Resources\IProvider;
 use OCP\Collaboration\Resources\IResource;
+use OCP\IURLGenerator;
 use OCP\IUser;
+use OCP\Server;
 
 class ResourceProvider implements IProvider {
 	public const RESOURCE_TYPE = 'deck';
 
-	private $boardMapper;
-	private $permissionService;
+	private BoardMapper $boardMapper;
+	private PermissionService $permissionService;
+	private IURLGenerator $urlGenerator;
 
-	/** @var array */
-	protected $nodes = [];
+	protected array $nodes = [];
 
-	public function __construct(BoardMapper $boardMapper, PermissionService $permissionService) {
+	public function __construct(BoardMapper $boardMapper, PermissionService $permissionService, IURLGenerator $urlGenerator) {
 		$this->boardMapper = $boardMapper;
 		$this->permissionService = $permissionService;
+		$this->urlGenerator = $urlGenerator;
 	}
 
 	/**
@@ -70,14 +73,14 @@ class ResourceProvider implements IProvider {
 	 */
 	public function getResourceRichObject(IResource $resource): array {
 		$board = $this->getBoard($resource);
-		$link = \OC::$server->getURLGenerator()->linkToRoute('deck.page.index') . '#/board/' . $resource->getId();
+		$link = $this->urlGenerator->linkToRoute('deck.page.index') . '#/board/' . $resource->getId();
 
 		return [
 			'type' => self::RESOURCE_TYPE,
 			'id' => $resource->getId(),
 			'name' => $board->getTitle(),
 			'link' => $link,
-			'iconUrl' => \OC::$server->getURLGenerator()->imagePath('deck', 'deck-dark.svg')
+			'iconUrl' => $this->urlGenerator->imagePath('deck', 'deck-dark.svg')
 		];
 	}
 
@@ -118,7 +121,7 @@ class ResourceProvider implements IProvider {
 	public function invalidateAccessCache($boardId = null) {
 		try {
 			/** @var IManager $resourceManager */
-			$resourceManager = \OC::$server->query(IManager::class);
+			$resourceManager = Server::get(IManager::class);
 		} catch (QueryException $e) {
 		}
 		if ($boardId !== null) {

lib/Collaboration/Resources/ResourceProviderCard.php

@@ -37,24 +37,16 @@ use OCP\Collaboration\Resources\IResource;
 use OCP\Collaboration\Resources\ResourceException;
 use OCP\IURLGenerator;
 use OCP\IUser;
+use OCP\Server;
 
 class ResourceProviderCard implements IProvider {
 	public const RESOURCE_TYPE = 'deck-card';
 
-	/** @var CardMapper */
-	private $cardMapper;
-
-	/** @var BoardMapper */
-	private $boardMapper;
-
-	/** @var PermissionService */
-	private $permissionService;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var array */
-	protected $nodes = [];
+	private CardMapper $cardMapper;
+	private BoardMapper $boardMapper;
+	private PermissionService $permissionService;
+	private IURLGenerator $urlGenerator;
+	protected array $nodes = [];
 
 	public function __construct(CardMapper $cardMapper, BoardMapper $boardMapper, PermissionService $permissionService, IURLGenerator $urlGenerator) {
 		$this->cardMapper = $cardMapper;
@@ -147,7 +139,7 @@ class ResourceProviderCard implements IProvider {
 	public function invalidateAccessCache($cardId = null) {
 		try {
 			/** @var IManager $resourceManager */
-			$resourceManager = \OC::$server->query(IManager::class);
+			$resourceManager = Server::get(IManager::class);
 		} catch (QueryException $e) {
 		}
 		if ($cardId !== null) {

lib/Command/BoardImport.php

@@ -30,8 +30,7 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class BoardImport extends Command {
-	/** @var BoardImportCommandService */
-	private $boardImportCommandService;
+	private BoardImportCommandService $boardImportCommandService;
 
 	public function __construct(
 		BoardImportCommandService $boardImportCommandService

lib/Command/UserExport.php

@@ -27,6 +27,7 @@ use OCA\Deck\Db\AssignmentMapper;
 use OCA\Deck\Db\BoardMapper;
 use OCA\Deck\Db\CardMapper;
 use OCA\Deck\Db\StackMapper;
+use OCA\Deck\Model\CardDetails;
 use OCA\Deck\Service\BoardService;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
@@ -101,7 +102,9 @@ class UserExport extends Command {
 					$fullCard = $this->cardMapper->find($card->getId());
 					$assignedUsers = $this->assignedUsersMapper->findAll($card->getId());
 					$fullCard->setAssignedUsers($assignedUsers);
-					$data[$board->getId()]['stacks'][$stack->getId()]['cards'][] = (array)$fullCard->jsonSerialize();
+
+					$cardDetails = new CardDetails($fullCard, $fullBoard);
+					$data[$board->getId()]['stacks'][$stack->getId()]['cards'][] = $cardDetails->jsonSerialize();
 				}
 			}
 		}

lib/Controller/PageController.php

@@ -29,7 +29,9 @@ use OCA\Deck\Service\PermissionService;
 use OCA\Files\Event\LoadSidebar;
 use OCA\Viewer\Event\LoadViewer;
 use OCP\AppFramework\Http\ContentSecurityPolicy;
+use OCP\Collaboration\Resources\LoadAdditionalScriptsEvent as CollaborationResourcesEvent;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\IConfig;
 use OCP\IInitialStateService;
 use OCP\IRequest;
 use OCP\AppFramework\Http\TemplateResponse;
@@ -41,16 +43,17 @@ use OCA\Deck\Db\Acl;
 use OCA\Deck\Service\CardService;
 
 class PageController extends Controller {
-	private $permissionService;
-	private $initialState;
-	private $configService;
-	private $eventDispatcher;
-	private $cardMapper;
-	private $urlGenerator;
-	private $cardService;
+	private PermissionService $permissionService;
+	private IInitialStateService $initialState;
+	private ConfigService $configService;
+	private IEventDispatcher $eventDispatcher;
+	private CardMapper $cardMapper;
+	private IURLGenerator $urlGenerator;
+	private CardService $cardService;
+	private IConfig $config;
 
 	public function __construct(
-		$AppName,
+		string $AppName,
 		IRequest $request,
 		PermissionService $permissionService,
 		IInitialStateService $initialStateService,
@@ -58,7 +61,8 @@ class PageController extends Controller {
 		IEventDispatcher $eventDispatcher,
 		CardMapper $cardMapper,
 		IURLGenerator $urlGenerator,
-		CardService $cardService
+		CardService $cardService,
+		IConfig $config
 		) {
 		parent::__construct($AppName, $request);
 
@@ -69,6 +73,7 @@ class PageController extends Controller {
 		$this->cardMapper = $cardMapper;
 		$this->urlGenerator = $urlGenerator;
 		$this->cardService = $cardService;
+		$this->config = $config;
 	}
 
 	/**
@@ -84,13 +89,17 @@ class PageController extends Controller {
 		$this->initialState->provideInitialState(Application::APP_ID, 'config', $this->configService->getAll());
 
 		$this->eventDispatcher->dispatchTyped(new LoadSidebar());
+		$this->eventDispatcher->dispatchTyped(new CollaborationResourcesEvent());
 		if (class_exists(LoadViewer::class)) {
 			$this->eventDispatcher->dispatchTyped(new LoadViewer());
 		}
 
-		$response = new TemplateResponse('deck', 'main');
+		$response = new TemplateResponse('deck', 'main', [
+			'id-app-content' => '#app-content-vue',
+			'id-app-navigation' => '#app-navigation-vue',
+		]);
 
-		if (\OC::$server->getConfig()->getSystemValueBool('debug', false)) {
+		if ($this->config->getSystemValueBool('debug', false)) {
 			$csp = new ContentSecurityPolicy();
 			$csp->addAllowedConnectDomain('*');
 			$csp->addAllowedScriptDomain('*');

lib/Controller/SearchController.php

@@ -27,6 +27,7 @@ declare(strict_types=1);
 namespace OCA\Deck\Controller;
 
 use OCA\Deck\Db\Card;
+use OCA\Deck\Model\CardDetails;
 use OCA\Deck\Service\SearchService;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
@@ -50,9 +51,12 @@ class SearchController extends OCSController {
 	public function search(string $term, ?int $limit = null, ?int $cursor = null): DataResponse {
 		$cards = $this->searchService->searchCards($term, $limit, $cursor);
 		return new DataResponse(array_map(function (Card $card) {
-			$json = $card->jsonSerialize();
+			$board = $card->getRelatedBoard();
+			$json = (new CardDetails($card, $board))->jsonSerialize();
+
+			$json['relatedBoard'] = $board;
 			$json['relatedStack'] = $card->getRelatedStack();
-			$json['relatedBoard'] = $card->getRelatedBoard();
+
 			return $json;
 		}, $cards));
 	}

lib/Cron/DeleteCron.php

@@ -28,6 +28,7 @@ use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\TimedJob;
 use OCA\Deck\Db\AttachmentMapper;
 use OCA\Deck\Db\BoardMapper;
+use OCA\Deck\Db\CardMapper;
 use OCA\Deck\InvalidAttachmentType;
 use OCA\Deck\Service\AttachmentService;
 use OCP\BackgroundJob\IJob;
@@ -36,14 +37,17 @@ class DeleteCron extends TimedJob {
 
 	/** @var BoardMapper */
 	private $boardMapper;
+	/** @var CardMapper */
+	private $cardMapper;
 	/** @var AttachmentService */
 	private $attachmentService;
 	/** @var AttachmentMapper */
 	private $attachmentMapper;
 
-	public function __construct(ITimeFactory $time, BoardMapper $boardMapper, AttachmentService $attachmentService, AttachmentMapper $attachmentMapper) {
+	public function __construct(ITimeFactory $time, BoardMapper $boardMapper, CardMapper $cardMapper, AttachmentService $attachmentService, AttachmentMapper $attachmentMapper) {
 		parent::__construct($time);
 		$this->boardMapper = $boardMapper;
+		$this->cardMapper = $cardMapper;
 		$this->attachmentService = $attachmentService;
 		$this->attachmentMapper = $attachmentMapper;
 
@@ -61,6 +65,12 @@ class DeleteCron extends TimedJob {
 			$this->boardMapper->delete($board);
 		}
 
+		$timeLimit = time() - (60 * 5); // 5 min buffer
+		$cards = $this->cardMapper->findToDelete($timeLimit, 500);
+		foreach ($cards as $card) {
+			$this->cardMapper->delete($card);
+		}
+
 		$attachments = $this->attachmentMapper->findToDelete();
 		foreach ($attachments as $attachment) {
 			try {

lib/Dashboard/DeckWidget.php

@@ -26,18 +26,34 @@ declare(strict_types=1);
 
 namespace OCA\Deck\Dashboard;
 
-use OCP\Dashboard\IWidget;
+use DateTime;
+use OCA\Deck\AppInfo\Application;
+use OCA\Deck\Db\Label;
+use OCA\Deck\Service\OverviewService;
+use OCP\Dashboard\IAPIWidget;
+use OCP\Dashboard\IButtonWidget;
+use OCP\Dashboard\IIconWidget;
+use OCP\Dashboard\Model\WidgetButton;
+use OCP\Dashboard\Model\WidgetItem;
+use OCP\IDateTimeFormatter;
 use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\Util;
 
-class DeckWidget implements IWidget {
+class DeckWidget implements IAPIWidget, IButtonWidget, IIconWidget {
+	private IL10N $l10n;
+	private OverviewService $dashboardService;
+	private IURLGenerator $urlGenerator;
+	private IDateTimeFormatter $dateTimeFormatter;
 
-	/**
-	 * @var IL10N
-	 */
-	private $l10n;
-
-	public function __construct(IL10N $l10n) {
+	public function __construct(IL10N $l10n,
+		OverviewService $dashboardService,
+		IDateTimeFormatter $dateTimeFormatter,
+		IURLGenerator $urlGenerator) {
 		$this->l10n = $l10n;
+		$this->dashboardService = $dashboardService;
+		$this->urlGenerator = $urlGenerator;
+		$this->dateTimeFormatter = $dateTimeFormatter;
 	}
 
 	/**
@@ -68,17 +84,88 @@ class DeckWidget implements IWidget {
 		return 'icon-deck';
 	}
 
+	/**
+	 * @inheritDoc
+	 */
+	public function getIconUrl(): string {
+		return $this->urlGenerator->getAbsoluteURL(
+			$this->urlGenerator->imagePath(Application::APP_ID, 'deck-dark.svg')
+		);
+	}
+
 	/**
 	 * @inheritDoc
 	 */
 	public function getUrl(): ?string {
-		return null;
+		return $this->urlGenerator->getAbsoluteURL(
+			$this->urlGenerator->linkToRoute(Application::APP_ID . '.page.index')
+		);
 	}
 
 	/**
 	 * @inheritDoc
 	 */
 	public function load(): void {
-		\OCP\Util::addScript('deck', 'deck-dashboard');
+		Util::addScript('deck', 'deck-dashboard');
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getItems(string $userId, ?string $since = null, int $limit = 7): array {
+		$upcomingCards = $this->dashboardService->findUpcomingCards($userId);
+		$nowTimestamp = (new Datetime())->getTimestamp();
+		$sinceTimestamp = $since !== null ? (new Datetime($since))->getTimestamp() : null;
+		$upcomingCards = array_filter($upcomingCards, static function (array $card) use ($nowTimestamp, $sinceTimestamp) {
+			if ($card['duedate']) {
+				$ts = (new Datetime($card['duedate']))->getTimestamp();
+				return $ts > $nowTimestamp && ($sinceTimestamp === null || $ts > $sinceTimestamp);
+			}
+			return false;
+		});
+		usort($upcomingCards, static function ($a, $b) {
+			$a = new Datetime($a['duedate']);
+			$ta = $a->getTimestamp();
+			$b = new Datetime($b['duedate']);
+			$tb = $b->getTimestamp();
+			return ($ta > $tb) ? 1 : -1;
+		});
+		$upcomingCards = array_slice($upcomingCards, 0, $limit);
+		$urlGenerator = $this->urlGenerator;
+		$dateTimeFormatter = $this->dateTimeFormatter;
+		return array_map(static function (array $card) use ($urlGenerator, $dateTimeFormatter) {
+			$formattedDueDate = $dateTimeFormatter->formatDateTime(new DateTime($card['duedate']));
+			return new WidgetItem(
+				$card['title'] . ' (' . $formattedDueDate . ')',
+				implode(
+					', ',
+					array_map(static function (Label $label) {
+						return $label->jsonSerialize()['title'];
+					}, $card['labels'])
+				),
+				$urlGenerator->getAbsoluteURL(
+					$urlGenerator->linkToRoute(Application::APP_ID . '.page.redirectToCard', ['cardId' => $card['id']])
+				),
+				$urlGenerator->getAbsoluteURL(
+					$urlGenerator->imagePath(Application::APP_ID, 'deck-dark.svg')
+				),
+				$card['duedate']
+			);
+		}, $upcomingCards);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getWidgetButtons(string $userId): array {
+		return [
+			new WidgetButton(
+				WidgetButton::TYPE_MORE,
+				$this->urlGenerator->getAbsoluteURL(
+					$this->urlGenerator->linkToRoute(Application::APP_ID . '.page.index')
+				),
+				$this->l10n->t('Load more')
+			),
+		];
 	}
 }

lib/Db/AclMapper.php

@@ -33,18 +33,46 @@ class AclMapper extends DeckMapper implements IPermissionMapper {
 		parent::__construct($db, 'deck_board_acl', Acl::class);
 	}
 
+	/**
+	 * @param numeric $boardId
+	 * @param int|null $limit
+	 * @param int|null $offset
+	 * @return Acl[]
+	 * @throws \OCP\DB\Exception
+	 */
 	public function findAll($boardId, $limit = null, $offset = null) {
-		$sql = 'SELECT id, board_id, type, participant, permission_edit, permission_share, permission_manage FROM `*PREFIX*deck_board_acl` WHERE `board_id` = ? ';
-		return $this->findEntities($sql, [$boardId], $limit, $offset);
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('id', 'board_id', 'type', 'participant', 'permission_edit', 'permission_share', 'permission_manage')
+			->from('deck_board_acl')
+			->where($qb->expr()->eq('board_id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
+			->setMaxResults($limit)
+			->setFirstResult($offset);
+
+		return $this->findEntities($qb);
 	}
 
-	public function isOwner($userId, $aclId): bool {
-		$sql = 'SELECT owner FROM `*PREFIX*deck_boards` WHERE `id` IN (SELECT board_id FROM `*PREFIX*deck_board_acl` WHERE id = ?)';
-		$stmt = $this->execute($sql, [$aclId]);
-		$row = $stmt->fetch();
-		return ($row['owner'] === $userId);
+	/**
+	 * @param numeric $userId
+	 * @param numeric $id
+	 * @return bool
+	 * @throws \OCP\DB\Exception
+	 */
+	public function isOwner($userId, $id): bool {
+		$aclId = $id;
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('acl.id')
+			->from($this->getTableName(), 'acl')
+			->innerJoin('acl', 'deck_boards', 'b', 'acl.board_id = b.id')
+			->where($qb->expr()->eq('owner', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)))
+			->andWhere($qb->expr()->eq('acl.id', $qb->createNamedParameter($aclId, IQueryBuilder::PARAM_INT)));
+
+		return count($qb->executeQuery()->fetchAll()) > 0;
 	}
 
+	/**
+	 * @param numeric $id
+	 * @return int|null
+	 */
 	public function findBoardId($id): ?int {
 		try {
 			$entity = $this->find($id);
@@ -54,9 +82,21 @@ class AclMapper extends DeckMapper implements IPermissionMapper {
 		return null;
 	}
 
+	/**
+	 * @param int $type
+	 * @param string $participant
+	 * @return Acl[]
+	 * @throws \OCP\DB\Exception
+	 */
 	public function findByParticipant($type, $participant): array {
-		$sql = 'SELECT * from *PREFIX*deck_board_acl WHERE type = ? AND participant = ?';
-		return $this->findEntities($sql, [$type, $participant]);
+		$qb = $this->db->getQueryBuilder();
+
+		$qb->select('*')
+			->from($this->getTableName())
+			->where($qb->expr()->eq('type', $qb->createNamedParameter($type, IQueryBuilder::PARAM_INT)))
+			->andWhere($qb->expr()->eq('participant', $qb->createNamedParameter($participant, IQueryBuilder::PARAM_STR)));
+
+		return $this->findEntities($qb);
 	}
 
 	/**
@@ -70,4 +110,12 @@ class AclMapper extends DeckMapper implements IPermissionMapper {
 			->andWhere($qb->expr()->eq('board_id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)));
 		$qb->executeStatement();
 	}
+
+	public function findByType(int $type): array {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+			->from('deck_board_acl')
+			->where($qb->expr()->eq('type', $qb->createNamedParameter($type, IQueryBuilder::PARAM_INT)));
+		return $this->findEntities($qb);
+	}
 }

lib/Db/AssignmentMapper.php

@@ -55,9 +55,6 @@ class AssignmentMapper extends QBMapper implements IPermissionMapper {
 		$this->circleService = $circleService;
 	}
 
-	/**
-	 * @return Assignment[]
-	 */
 	public function findAll(int $cardId): array {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
@@ -80,8 +77,8 @@ class AssignmentMapper extends QBMapper implements IPermissionMapper {
 	}
 
 
-	public function isOwner($userId, $cardId): bool {
-		return $this->cardMapper->isOwner($userId, $cardId);
+	public function isOwner($userId, $id): bool {
+		return $this->cardMapper->isOwner($userId, $id);
 	}
 
 	public function findBoardId($id): ?int {

lib/Db/AttachmentMapper.php

@@ -30,7 +30,6 @@ use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IUserManager;
-use PDO;
 
 class AttachmentMapper extends DeckMapper implements IPermissionMapper {
 	private $cardMapper;
@@ -52,70 +51,53 @@ class AttachmentMapper extends DeckMapper implements IPermissionMapper {
 	}
 
 	/**
-	 * @param $id
-	 * @return Entity|Attachment
-	 * @throws \OCP\AppFramework\Db\DoesNotExistException
-	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
+	 * @param int $id
+	 * @return Attachment
+	 * @throws DoesNotExistException
+	 * @throws MultipleObjectsReturnedException
+	 * @throws \OCP\DB\Exception
 	 */
 	public function find($id) {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
-			->from('deck_attachment')
+			->from($this->getTableName())
 			->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
 
-		$cursor = $qb->execute();
-		$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());
-		}
-
-		$row2 = $cursor->fetch();
-		$cursor->closeCursor();
-		if ($row2 !== false) {
-			throw new MultipleObjectsReturnedException('Did not expect more than one result when executing query: ' . $qb->getSQL());
-		}
-
-		return $this->mapRowToEntity($row);
-	}
-
-	public function findByData($cardId, $data) {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-				->from('deck_attachment')
-				->where($qb->expr()->eq('card_id', $qb->createNamedParameter($cardId, IQueryBuilder::PARAM_INT)))
-				->andWhere($qb->expr()->eq('data', $qb->createNamedParameter($data, IQueryBuilder::PARAM_STR)));
-		$cursor = $qb->execute();
-		$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());
-		}
-		$cursor->closeCursor();
-		return $this->mapRowToEntity($row);
+		return $this->findEntity($qb);
+	}
+
+	/**
+	 * @param int $cardId
+	 * @param string $data
+	 * @return Attachment
+	 * @throws DoesNotExistException
+	 * @throws MultipleObjectsReturnedException
+	 * @throws \OCP\DB\Exception
+	 */
+	public function findByData($cardId, $data) {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+				->from($this->getTableName())
+				->where($qb->expr()->eq('card_id', $qb->createNamedParameter($cardId, IQueryBuilder::PARAM_INT)))
+				->andWhere($qb->expr()->eq('data', $qb->createNamedParameter($data, IQueryBuilder::PARAM_STR)));
+
+		return $this->findEntity($qb);
 	}
 
 	/**
-	 * Find all attachments for a card
-	 *
 	 * @param $cardId
-	 * @return array
+	 * @return Entity[]
+	 * @throws \OCP\DB\Exception
 	 */
 	public function findAll($cardId) {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
-			->from('deck_attachment')
+			->from($this->getTableName())
 			->where($qb->expr()->eq('card_id', $qb->createNamedParameter($cardId, IQueryBuilder::PARAM_INT)))
 			->andWhere($qb->expr()->eq('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
 
 
-		$entities = [];
-		$cursor = $qb->execute();
-		while ($row = $cursor->fetch()) {
-			$entities[] = $this->mapRowToEntity($row);
-		}
-		$cursor->closeCursor();
-		return $entities;
+		return $this->findEntities($qb);
 	}
 
 	/**
@@ -128,7 +110,7 @@ class AttachmentMapper extends DeckMapper implements IPermissionMapper {
 		$timeLimit = time() - (60 * 5);
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
-			->from('deck_attachment')
+			->from($this->getTableName())
 			->where($qb->expr()->gt('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
 		if ($withOffset) {
 			$qb
@@ -139,13 +121,7 @@ class AttachmentMapper extends DeckMapper implements IPermissionMapper {
 				->andWhere($qb->expr()->eq('card_id', $qb->createNamedParameter($cardId, IQueryBuilder::PARAM_INT)));
 		}
 
-		$entities = [];
-		$cursor = $qb->execute();
-		while ($row = $cursor->fetch()) {
-			$entities[] = $this->mapRowToEntity($row);
-		}
-		$cursor->closeCursor();
-		return $entities;
+		return $this->findEntities($qb);
 	}
 
 

lib/Db/Board.php

@@ -23,6 +23,14 @@
 
 namespace OCA\Deck\Db;
 
+/**
+ * @method int getId()
+ * @method string getTitle()
+ * @method int getShared()
+ * @method bool getArchived()
+ * @method int getDeletedAt()
+ * @method int getLastModified()
+ */
 class Board extends RelationalEntity {
 	protected $title;
 	protected $owner;

lib/Db/BoardMapper.php

@@ -42,9 +42,9 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 	private $circlesService;
 	private $logger;
 
-	/** @var CappedMemoryCache */
+	/** @var CappedMemoryCache<Board[]> */
 	private $userBoardCache;
-	/** @var CappedMemoryCache */
+	/** @var CappedMemoryCache<Board> */
 	private $boardCache;
 
 	public function __construct(
@@ -107,6 +107,47 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 		return $this->boardCache[$id];
 	}
 
+	public function findBoardIds(string $userId): array {
+		$qb = $this->db->getQueryBuilder();
+		$qb->selectDistinct('b.id')
+			->from($this->getTableName(), 'b')
+			->leftJoin('b', 'deck_board_acl', 'acl', $qb->expr()->eq('b.id', 'acl.board_id'));
+
+		// Owned by the user
+		$qb->where($qb->expr()->andX(
+			$qb->expr()->eq('owner', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)),
+		));
+
+		// Shared to the user
+		$qb->orWhere($qb->expr()->andX(
+			$qb->expr()->eq('acl.participant', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)),
+			$qb->expr()->eq('acl.type', $qb->createNamedParameter(Acl::PERMISSION_TYPE_USER, IQueryBuilder::PARAM_INT)),
+		));
+
+		// Shared to user groups of the user
+		$groupIds = $this->groupManager->getUserGroupIds($this->userManager->get($userId));
+		if (count($groupIds) !== 0) {
+			$qb->orWhere($qb->expr()->andX(
+					$qb->expr()->in('acl.participant', $qb->createNamedParameter($groupIds, IQueryBuilder::PARAM_STR_ARRAY)),
+					$qb->expr()->eq('acl.type', $qb->createNamedParameter(Acl::PERMISSION_TYPE_GROUP, IQueryBuilder::PARAM_INT)),
+				));
+		}
+
+		// Shared to circles of the user
+		$circles = $this->circlesService->getUserCircles($userId);
+		if (count($circles) !== 0) {
+			$qb->orWhere($qb->expr()->andX(
+				$qb->expr()->in('acl.participant', $qb->createNamedParameter($circles, IQueryBuilder::PARAM_STR_ARRAY)),
+				$qb->expr()->eq('acl.type', $qb->createNamedParameter(Acl::PERMISSION_TYPE_CIRCLE, IQueryBuilder::PARAM_INT)),
+			));
+		}
+
+		$result = $qb->executeQuery();
+		return array_map(function (string $id) {
+			return (int)$id;
+		}, $result->fetchAll(\PDO::FETCH_COLUMN));
+	}
+
 	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);
@@ -131,14 +172,9 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 
 	/**
 	 * Find all boards for a given user
-	 *
-	 * @param $userId
-	 * @param null $limit
-	 * @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) {
+								  bool $includeArchived = true, ?int $before = null, ?string $term = null): array {
 		// 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();
@@ -247,15 +283,9 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 
 	/**
 	 * Find all boards for a given user
-	 *
-	 * @param $userId
-	 * @param $groups
-	 * @param null $limit
-	 * @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) {
+									bool $includeArchived = true, ?int $before = null, ?string $term = null): array {
 		if (count($groups) <= 0) {
 			return [];
 		}
@@ -414,8 +444,8 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 		return parent::delete($entity);
 	}
 
-	public function isOwner($userId, $boardId): bool {
-		$board = $this->find($boardId);
+	public function isOwner($userId, $id): bool {
+		$board = $this->find($id);
 		return ($board->getOwner() === $userId);
 	}
 

lib/Db/Card.php

@@ -27,6 +27,44 @@ use DateTime;
 use DateTimeZone;
 use Sabre\VObject\Component\VCalendar;
 
+/**
+ * @method string getTitle()
+ * @method string getDescription()
+ * @method string getDescriptionPrev()
+ * @method int getStackId()
+ * @method int getOrder()
+ * @method int getLastModified()
+ * @method int getCreatedAt()
+ * @method bool getArchived()
+ * @method bool getNotified()
+ *
+ * @method void setLabels(Label[] $labels)
+ * @method null|Label[] getLabels()
+ *
+ * @method void setAssignedUsers(Assignment[] $users)
+ * @method null|User[] getAssignedUsers()
+ *
+ * @method void setAttachments(Attachment[] $attachments)
+ * @method null|Attachment[] getAttachments()
+ *
+ * @method void setAttachmentCount(int $count)
+ * @method null|int getAttachmentCount()
+ *
+ * @method void setCommentsUnread(int $count)
+ * @method null|int getCommentsUnread()
+ *
+ * @method void setCommentsCount(int $count)
+ * @method null|int getCommentsCount()
+ *
+ * @method void setOwner(string $user)
+ * @method null|string getOwner()
+ *
+ * @method void setRelatedStack(Stack $stack)
+ * @method null|Stack getRelatedStack()
+ *
+ * @method void setRelatedBoard(Board $board)
+ * @method null|Board getRelatedBoard()
+ */
 class Card extends RelationalEntity {
 	public const TITLE_MAX_LENGTH = 255;
 
@@ -70,6 +108,7 @@ class Card extends RelationalEntity {
 		$this->addType('archived', 'boolean');
 		$this->addType('notified', 'boolean');
 		$this->addType('deletedAt', 'integer');
+		$this->addType('duedate', 'datetime');
 		$this->addRelation('labels');
 		$this->addRelation('assignedUsers');
 		$this->addRelation('attachments');
@@ -87,50 +126,6 @@ class Card extends RelationalEntity {
 		$this->databaseType = $type;
 	}
 
-	public function getDuedate($isoFormat = false) {
-		if ($this->duedate === null) {
-			return null;
-		}
-		$dt = new DateTime($this->duedate);
-		if (!$isoFormat && $this->databaseType === 'mysql') {
-			return $dt->format('Y-m-d H:i:s');
-		}
-		return $dt->format('c');
-	}
-
-	public function jsonSerialize(): array {
-		$json = parent::jsonSerialize();
-		$json['overdue'] = self::DUEDATE_FUTURE;
-		$due = $this->duedate ? strtotime($this->duedate) : false;
-		if ($due !== false) {
-			$today = new DateTime();
-			$today->setTime(0, 0);
-
-			$match_date = new DateTime($this->duedate);
-
-			$match_date->setTime(0, 0);
-
-			$diff = $today->diff($match_date);
-			$diffDays = (integer) $diff->format('%R%a'); // Extract days count in interval
-
-			if ($diffDays === 1) {
-				$json['overdue'] = self::DUEDATE_NEXT;
-			}
-			if ($diffDays === 0) {
-				$json['overdue'] = self::DUEDATE_NOW;
-			}
-			if ($diffDays < 0) {
-				$json['overdue'] = self::DUEDATE_OVERDUE;
-			}
-		}
-		$json['duedate'] = $this->getDuedate(true);
-		unset($json['notified']);
-		unset($json['descriptionPrev']);
-		unset($json['relatedStack']);
-		unset($json['relatedBoard']);
-		return $json;
-	}
-
 	public function getCalendarObject(): VCalendar {
 		$calendar = new VCalendar();
 		$event = $calendar->createComponent('VTODO');
@@ -139,7 +134,7 @@ class Card extends RelationalEntity {
 			$creationDate = new DateTime();
 			$creationDate->setTimestamp($this->createdAt);
 			$event->DTSTAMP = $creationDate;
-			$event->DUE = new DateTime($this->getDuedate(true), new DateTimeZone('UTC'));
+			$event->DUE = new DateTime($this->getDuedate()->format('c'), new DateTimeZone('UTC'));
 		}
 		$event->add('RELATED-TO', 'deck-stack-' . $this->getStackId());
 

lib/Db/CardMapper.php

@@ -177,6 +177,17 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		return $qb;
 	}
 
+	public function findToDelete($timeLimit, $limit = null) {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('id', 'title', 'owner', 'archived', 'deleted_at', 'last_modified')
+			->from('deck_cards')
+			->where($qb->expr()->gt('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)))
+			->andWhere($qb->expr()->lt('deleted_at', $qb->createNamedParameter($timeLimit, IQueryBuilder::PARAM_INT)))
+			->orderBy('deleted_at')
+			->setMaxResults($limit);
+		return $this->findEntities($qb);
+	}
+
 	public function findDeleted($boardId, $limit = null, $offset = null) {
 		$qb = $this->queryCardsByBoard($boardId);
 		$qb->andWhere($qb->expr()->neq('c.deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)))
@@ -227,6 +238,21 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		return $this->findEntities($qb);
 	}
 
+	public function findAllByBoardId(int $boardId, ?int $limit = null, ?int $offset = null): array {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('c.*')
+			->from('deck_cards', 'c')
+			->innerJoin('c', 'deck_stacks', 's', 's.id = c.stack_id')
+			->innerJoin('s', 'deck_boards', 'b', 'b.id = s.board_id')
+			->where($qb->expr()->eq('board_id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
+			->andWhere($qb->expr()->eq('archived', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)))
+			->setMaxResults($limit)
+			->setFirstResult($offset)
+			->orderBy('c.lastmodified')
+			->addOrderBy('c.id');
+		return $this->findEntities($qb);
+	}
+
 	public function findAllWithDue($boardId) {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('c.*')
@@ -549,10 +575,10 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		$qb->execute();
 	}
 
-	public function isOwner($userId, $cardId): bool {
+	public function isOwner($userId, $id): bool {
 		$sql = 'SELECT owner 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, $cardId, \PDO::PARAM_INT, 0);
+		$stmt->bindParam(1, $id, \PDO::PARAM_INT, 0);
 		$stmt->execute();
 		$row = $stmt->fetch();
 		return ($row['owner'] === $userId);

lib/Db/ChangeHelper.php

@@ -24,6 +24,7 @@
 namespace OCA\Deck\Db;
 
 use OCP\ICacheFactory;
+use OCP\ICache;
 use OCP\IDBConnection;
 use OCP\IRequest;
 
@@ -31,13 +32,16 @@ class ChangeHelper {
 	public const TYPE_BOARD = 'boardChanged';
 	public const TYPE_CARD = 'cardChanged';
 
-	private $db;
+	private IDBConnection $db;
+	private ICache $cache;
+	private IRequest $request;
+	private ?string $userId;
 
 	public function __construct(
 		IDBConnection $db,
 		ICacheFactory $cacheFactory,
 		IRequest $request,
-		$userId
+		?string $userId
 	) {
 		$this->db = $db;
 		$this->cache = $cacheFactory->createDistributed('deck_changes');

lib/Db/DeckMapper.php

@@ -23,17 +23,15 @@
 
 namespace OCA\Deck\Db;
 
-use OCP\AppFramework\Db\Mapper;
+use OCP\AppFramework\Db\QBMapper;
+use OCP\DB\QueryBuilder\IQueryBuilder;
 
 /**
  * Class DeckMapper
  *
  * @package OCA\Deck\Db
- * @deprecated use QBMapper
- *
- * TODO: Move to QBMapper once Nextcloud 14 is a minimum requirement
  */
-class DeckMapper extends Mapper {
+class DeckMapper extends QBMapper {
 
 	/**
 	 * @param $id
@@ -42,11 +40,11 @@ class DeckMapper extends Mapper {
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException
 	 */
 	public function find($id) {
-		$sql = 'SELECT * FROM `' . $this->tableName . '` ' . 'WHERE `id` = ?';
-		return $this->findEntity($sql, [$id]);
-	}
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+			->from($this->getTableName())
+			->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
 
-	protected function execute($sql, array $params = [], $limit = null, $offset = null) {
-		return parent::execute($sql, $params, $limit, $offset);
+		return $this->findEntity($qb);
 	}
 }

lib/Db/LabelMapper.php

@@ -26,6 +26,7 @@ namespace OCA\Deck\Db;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
+use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
 class LabelMapper extends DeckMapper implements IPermissionMapper {
@@ -33,41 +34,105 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 		parent::__construct($db, 'deck_labels', Label::class);
 	}
 
-	public function findAll($boardId, $limit = null, $offset = null) {
-		$sql = 'SELECT * FROM `*PREFIX*deck_labels` WHERE `board_id` = ? ORDER BY `id`';
-		return $this->findEntities($sql, [$boardId], $limit, $offset);
+	/**
+	 * @param numeric $boardId
+	 * @param int|null $limit
+	 * @param int|null $offset
+	 * @return Label[]
+	 * @throws \OCP\DB\Exception
+	 */
+	public function findAll($boardId, $limit = null, $offset = null): array {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+			->from($this->getTableName())
+			->where($qb->expr()->eq('board_id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
+			->setMaxResults($limit)
+			->setFirstResult($offset);
+		return $this->findEntities($qb);
 	}
 
-	public function delete(\OCP\AppFramework\Db\Entity $entity) {
+	/**
+	 * @param Entity $entity
+	 * @return Entity
+	 * @throws \OCP\DB\Exception
+	 */
+	public function delete(Entity $entity): Entity {
 		// delete assigned labels
 		$this->deleteLabelAssignments($entity->getId());
 		// delete label
 		return parent::delete($entity);
 	}
 
-	public function findAssignedLabelsForCard($cardId, $limit = null, $offset = null) {
-		$sql = 'SELECT l.*,card_id FROM `*PREFIX*deck_assigned_labels` as al INNER JOIN *PREFIX*deck_labels as l ON l.id = al.label_id WHERE `card_id` = ? ORDER BY l.id';
-		return $this->findEntities($sql, [$cardId], $limit, $offset);
-	}
-	public function findAssignedLabelsForBoard($boardId, $limit = null, $offset = null) {
-		$sql = 'SELECT c.id as card_id, l.id as id, l.title as title, l.color as color FROM `*PREFIX*deck_cards` as c ' .
-			' INNER JOIN `*PREFIX*deck_assigned_labels` as al ON al.card_id = c.id INNER JOIN `*PREFIX*deck_labels` as l ON  al.label_id = l.id WHERE board_id=? ORDER BY l.id';
-		return $this->findEntities($sql, [$boardId], $limit, $offset);
+	/**
+	 * @param numeric $cardId
+	 * @param int|null $limit
+	 * @param int|null $offset
+	 * @return Label[]
+	 * @throws \OCP\DB\Exception
+	 */
+	public function findAssignedLabelsForCard($cardId, $limit = null, $offset = null): array {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('l.*', 'card_id')
+			->from($this->getTableName(), 'l')
+			->innerJoin('l', 'deck_assigned_labels', 'al', 'l.id = al.label_id')
+			->where($qb->expr()->eq('card_id', $qb->createNamedParameter($cardId, IQueryBuilder::PARAM_INT)))
+			->orderBy('l.id')
+			->setMaxResults($limit)
+			->setFirstResult($offset);
+
+		return $this->findEntities($qb);
 	}
 
-	public function insert(Entity $entity) {
+	/**
+	 * @param numeric $boardId
+	 * @param int|null $limit
+	 * @param int|null $offset
+	 * @return Label[]
+	 * @throws \OCP\DB\Exception
+	 */
+	public function findAssignedLabelsForBoard($boardId, $limit = null, $offset = null): array {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('l.id as id', 'l.title as title', 'l.color as color')
+			->selectAlias('c.id', 'card_id')
+			->from($this->getTableName(), 'l')
+			->innerJoin('l', 'deck_assigned_labels', 'al', 'al.label_id = l.id')
+			->innerJoin('l', 'deck_cards', 'c', 'al.card_id = c.id')
+			->where($qb->expr()->eq('board_id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
+			->orderBy('l.id')
+			->setMaxResults($limit)
+			->setFirstResult($offset);
+
+		return $this->findEntities($qb);
+	}
+
+	/**
+	 * @param Entity $entity
+	 * @return Entity
+	 * @throws \OCP\DB\Exception
+	 */
+	public function insert(Entity $entity): Entity {
 		$entity->setLastModified(time());
 		return parent::insert($entity);
 	}
 
-	public function update(Entity $entity, $updateModified = true) {
+	/**
+	 * @param Entity $entity
+	 * @param bool $updateModified
+	 * @return Entity
+	 * @throws \OCP\DB\Exception
+	 */
+	public function update(Entity $entity, $updateModified = true): Entity {
 		if ($updateModified) {
 			$entity->setLastModified(time());
 		}
 		return parent::update($entity);
 	}
 
-
+	/**
+	 * @param numeric $boardId
+	 * @return array
+	 * @throws \OCP\DB\Exception
+	 */
 	public function getAssignedLabelsForBoard($boardId) {
 		$labels = $this->findAssignedLabelsForBoard($boardId);
 		$result = [];
@@ -80,27 +145,51 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 		return $result;
 	}
 
+	/**
+	 * @param numeric $labelId
+	 * @return void
+	 * @throws \OCP\DB\Exception
+	 */
 	public function deleteLabelAssignments($labelId) {
-		$sql = 'DELETE FROM `*PREFIX*deck_assigned_labels` WHERE label_id = ?';
-		$stmt = $this->db->prepare($sql);
-		$stmt->bindParam(1, $labelId, \PDO::PARAM_INT, 0);
-		$stmt->execute();
+		$qb = $this->db->getQueryBuilder();
+		$qb->delete('deck_assigned_labels')
+			->where($qb->expr()->eq('label_id', $qb->createNamedParameter($labelId, IQueryBuilder::PARAM_INT)));
+		$qb->executeStatement();
 	}
 
+	/**
+	 * @param numeric $cardId
+	 * @return void
+	 * @throws \OCP\DB\Exception
+	 */
 	public function deleteLabelAssignmentsForCard($cardId) {
-		$sql = 'DELETE FROM `*PREFIX*deck_assigned_labels` WHERE card_id = ?';
-		$stmt = $this->db->prepare($sql);
-		$stmt->bindParam(1, $cardId, \PDO::PARAM_INT, 0);
-		$stmt->execute();
+		$qb = $this->db->getQueryBuilder();
+		$qb->delete('deck_assigned_labels')
+			->where($qb->expr()->eq('card_id', $qb->createNamedParameter($cardId, IQueryBuilder::PARAM_INT)));
+		$qb->executeStatement();
 	}
 
+	/**
+	 * @param string $userId
+	 * @param numeric $labelId
+	 * @return bool
+	 * @throws \OCP\DB\Exception
+	 */
 	public function isOwner($userId, $labelId): bool {
-		$sql = 'SELECT owner FROM `*PREFIX*deck_boards` WHERE `id` IN (SELECT board_id FROM `*PREFIX*deck_labels` WHERE id = ?)';
-		$stmt = $this->execute($sql, [$labelId]);
-		$row = $stmt->fetch();
-		return ($row['owner'] === $userId);
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('l.id')
+			->from($this->getTableName(), 'l')
+			->innerJoin('l', 'deck_boards', 'b', 'l.board_id = b.id')
+			->where($qb->expr()->eq('l.id', $qb->createNamedParameter($labelId, IQueryBuilder::PARAM_INT)))
+			->andWhere($qb->expr()->eq('b.owner', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)));
+
+		return count($qb->executeQuery()->fetchAll()) > 0;
 	}
 
+	/**
+	 * @param numeric $id
+	 * @return int|null
+	 */
 	public function findBoardId($id): ?int {
 		try {
 			$entity = $this->find($id);

lib/Db/RelationalEntity.php

@@ -72,6 +72,9 @@ class RelationalEntity extends Entity implements \JsonSerializable {
 				$propertyReflection = $reflection->getProperty($property);
 				if (!$propertyReflection->isPrivate() && !in_array($property, $this->_resolvedProperties, true)) {
 					$json[$property] = $this->getter($property);
+					if ($json[$property] instanceof \DateTimeInterface) {
+						$json[$property] = $json[$property]->format('c');
+					}
 				}
 			}
 		}

lib/Db/StackMapper.php

@@ -26,6 +26,7 @@ namespace OCA\Deck\Db;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
+use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
 class StackMapper extends DeckMapper implements IPermissionMapper {
@@ -38,62 +39,112 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
 
 
 	/**
-	 * @param $id
-	 * @throws MultipleObjectsReturnedException
+	 * @param numeric $id
+	 * @return Stack
 	 * @throws DoesNotExistException
+	 * @throws MultipleObjectsReturnedException
+	 * @throws \OCP\DB\Exception
 	 */
 	public function find($id): Stack {
-		$sql = 'SELECT * FROM `*PREFIX*deck_stacks` ' .
-			'WHERE `id` = ?';
-		return $this->findEntity($sql, [$id]);
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+			->from($this->getTableName())
+			->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
+
+		return $this->findEntity($qb);
 	}
 
 	/**
 	 * @param $cardId
 	 * @return Stack|null
+	 * @throws \OCP\DB\Exception
 	 */
 	public function findStackFromCardId($cardId): ?Stack {
-		$sql = <<<SQL
-SELECT s.* 
-FROM `*PREFIX*deck_stacks` as `s`
-INNER JOIN `*PREFIX*deck_cards` as `c` ON s.id = c.stack_id
-WHERE c.id = ?
-SQL;
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('s.*')
+			->from($this->getTableName(), 's')
+			->innerJoin('s', 'deck_cards', 'c', 's.id = c.stack_id')
+			->where($qb->expr()->eq('c.id', $qb->createNamedParameter($cardId, IQueryBuilder::PARAM_INT)));
+
 		try {
-			return $this->findEntity($sql, [$cardId]);
+			return $this->findEntity($qb);
 		} catch (MultipleObjectsReturnedException|DoesNotExistException $e) {
 		}
 
 		return null;
 	}
 
+	/**
+	 * @param numeric $boardId
+	 * @param int|null $limit
+	 * @param int|null $offset
+	 * @return Stack[]
+	 * @throws \OCP\DB\Exception
+	 */
+	public function findAll($boardId, $limit = null, $offset = null): array {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+			->from($this->getTableName())
+			->where($qb->expr()->eq('board_id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
+			->andWhere($qb->expr()->eq('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)))
+			->setFirstResult($offset)
+			->setMaxResults($limit);
 
-	public function findAll($boardId, $limit = null, $offset = null) {
-		$sql = 'SELECT * FROM `*PREFIX*deck_stacks` WHERE `board_id` = ? AND deleted_at = 0 ORDER BY `order`, `id`';
-		return $this->findEntities($sql, [$boardId], $limit, $offset);
+		return $this->findEntities($qb);
 	}
 
-
+	/**
+	 * @param numeric $boardId
+	 * @param int|null $limit
+	 * @param int|null $offset
+	 * @return Stack[]
+	 * @throws \OCP\DB\Exception
+	 */
 	public function findDeleted($boardId, $limit = null, $offset = null) {
-		$sql = 'SELECT * FROM `*PREFIX*deck_stacks` s
-	  WHERE `s`.`board_id` = ? AND NOT s.deleted_at = 0';
-		return $this->findEntities($sql, [$boardId], $limit, $offset);
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+			->from($this->getTableName())
+			->where($qb->expr()->eq('board_id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
+			->andWhere($qb->expr()->neq('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)))
+			->setFirstResult($offset)
+			->setMaxResults($limit);
+
+		return $this->findEntities($qb);
 	}
 
-
-	public function delete(Entity $entity) {
+	/**
+	 * @param Entity $entity
+	 * @return Entity
+	 * @throws \OCP\DB\Exception
+	 */
+	public function delete(Entity $entity): Entity {
 		// delete cards on stack
 		$this->cardMapper->deleteByStack($entity->getId());
 		return parent::delete($entity);
 	}
 
-	public function isOwner($userId, $stackId): bool {
-		$sql = 'SELECT owner FROM `*PREFIX*deck_boards` WHERE `id` IN (SELECT board_id FROM `*PREFIX*deck_stacks` WHERE id = ?)';
-		$stmt = $this->execute($sql, [$stackId]);
-		$row = $stmt->fetch();
-		return ($row['owner'] === $userId);
+	/**
+	 * @param numeric $userId
+	 * @param numeric $stackId
+	 * @return bool
+	 * @throws \OCP\DB\Exception
+	 */
+	public function isOwner($userId, $id): bool {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('s.id')
+			->from($this->getTableName(), 's')
+			->innerJoin('s', 'deck_boards', 'b', 'b.id = s.board_id')
+			->where($qb->expr()->eq('s.id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)))
+			->andWhere($qb->expr()->eq('owner', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)));
+
+		return count($qb->executeQuery()->fetchAll()) > 0;
 	}
 
+	/**
+	 * @param numeric $id
+	 * @return int|null
+	 * @throws \OCP\DB\Exception
+	 */
 	public function findBoardId($id): ?int {
 		try {
 			$entity = $this->find($id);

lib/Listeners/ParticipantCleanupListener.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace OCA\Deck\Listeners;
+
+use OCA\Circles\Events\CircleDestroyedEvent;
+use OCA\Deck\Db\Acl;
+use OCA\Deck\Db\AclMapper;
+use OCA\Deck\Db\AssignmentMapper;
+use OCA\Deck\Db\BoardMapper;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\Group\Events\GroupDeletedEvent;
+use OCP\User\Events\UserDeletedEvent;
+
+class ParticipantCleanupListener implements IEventListener {
+	private AclMapper $aclMapper;
+	private AssignmentMapper $assignmentMapper;
+	private BoardMapper $boardMapper;
+
+	public function __construct(AclMapper $aclMapper, AssignmentMapper $assignmentMapper, BoardMapper $boardMapper) {
+		$this->aclMapper = $aclMapper;
+		$this->assignmentMapper = $assignmentMapper;
+		$this->boardMapper = $boardMapper;
+	}
+
+	public function handle(Event $event): void {
+		if ($event instanceof UserDeletedEvent) {
+			$boards = $this->boardMapper->findAllByOwner($event->getUser()->getUID());
+			foreach ($boards as $board) {
+				$this->boardMapper->delete($board);
+			}
+
+			$this->cleanupByParticipant(Acl::PERMISSION_TYPE_USER, $event->getUser()->getUID());
+		}
+
+		if ($event instanceof GroupDeletedEvent) {
+			$this->cleanupByParticipant(Acl::PERMISSION_TYPE_GROUP, $event->getGroup()->getGID());
+		}
+
+		if ($event instanceof CircleDestroyedEvent) {
+			$circleId = $event->getCircle()->getSingleId();
+			$this->cleanupByParticipant(Acl::PERMISSION_TYPE_CIRCLE, $circleId);
+		}
+	}
+
+	private function cleanupByParticipant(int $type, string $participant): void {
+		$acls = $this->aclMapper->findByParticipant($type, $participant);
+		foreach ($acls as $acl) {
+			$this->aclMapper->delete($acl);
+		}
+
+		$assignments = $this->assignmentMapper->findByParticipant($participant, $type);
+		foreach ($assignments as $assignment) {
+			$this->assignmentMapper->delete($assignment);
+		}
+	}
+}

lib/Listeners/ResourceListener.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace OCA\Deck\Listeners;
+
+use OCA\Deck\Collaboration\Resources\ResourceProvider;
+use OCA\Deck\Collaboration\Resources\ResourceProviderCard;
+use OCA\Deck\Event\AclCreatedEvent;
+use OCA\Deck\Event\AclDeletedEvent;
+use OCP\Collaboration\Resources\IManager;
+use OCP\Collaboration\Resources\ResourceException;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+
+class ResourceListener implements IEventListener {
+
+	/** @var IManager */
+	private $resourceManager;
+	/** @var ResourceProviderCard */
+	private $resourceProviderCard;
+
+	public function __construct(IManager $resourceManager, ResourceProviderCard $resourceProviderCard) {
+		$this->resourceManager = $resourceManager;
+		$this->resourceProviderCard = $resourceProviderCard;
+	}
+
+	public function handle(Event $event): void {
+		if (!$event instanceof AclDeletedEvent && !$event instanceof AclCreatedEvent) {
+			return;
+		}
+
+		$boardId = $event->getAcl()->getBoardId();
+
+		$this->resourceManager->invalidateAccessCacheForProvider($this->resourceProviderCard);
+
+		try {
+			$resource = $this->resourceManager->getResourceForUser(ResourceProvider::RESOURCE_TYPE, $boardId, null);
+			$this->resourceManager->invalidateAccessCacheForResource($resource);
+		} catch (ResourceException $e) {
+			// If there is no resource we don't need to invalidate anything, but this should not happen anyways
+		}
+	}
+}

lib/Middleware/ExceptionMiddleware.php

@@ -33,7 +33,6 @@ use OCP\AppFramework\OCS\OCSException;
 use OCP\AppFramework\OCSController;
 use OCP\ILogger;
 use OCP\IRequest;
-use OCP\Util;
 use OCP\IConfig;
 
 class ExceptionMiddleware extends Middleware {
@@ -85,9 +84,9 @@ class ExceptionMiddleware extends Middleware {
 				'message' => 'Permission denied'
 			], 403);
 		}
-		
+
 		if ($exception instanceof StatusException) {
-			if ($this->config->getSystemValue('loglevel', Util::WARN) === Util::DEBUG) {
+			if ($this->config->getSystemValue('loglevel', ILogger::WARN) === ILogger::DEBUG) {
 				$this->logger->logException($exception);
 			}
 

lib/Migration/DeletedCircleCleanup.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace OCA\Deck\Migration;
+
+use OCA\Deck\Db\Acl;
+use OCA\Deck\Db\AclMapper;
+use OCA\Deck\Service\CirclesService;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
+
+class DeletedCircleCleanup implements IRepairStep {
+	private AclMapper $aclMapper;
+	private CirclesService $circleService;
+
+	public function __construct(AclMapper $aclMapper, CirclesService $circlesService) {
+		$this->aclMapper = $aclMapper;
+		$this->circleService = $circlesService;
+	}
+
+	public function getName() {
+		return 'Cleanup Deck ACL entries for circles which have been already deleted';
+	}
+
+	public function run(IOutput $output) {
+		if (!$this->circleService->isCirclesEnabled()) {
+			return;
+		}
+
+		foreach ($this->aclMapper->findByType(Acl::PERMISSION_TYPE_CIRCLE) as $acl) {
+			if ($this->circleService->getCircle($acl->getParticipant()) === null) {
+				$this->aclMapper->delete($acl);
+				$output->info('Removed circle with id ' . $acl->getParticipant());
+			}
+		}
+	}
+}

lib/Model/BoardSummary.php

@@ -1,11 +1,8 @@
-/*
- * @copyright Copyright (c) 2016 Julius Härtl <jus@bitgrid.net>
+<?php
+/**
+ * @copyright Copyright (c) 2022 Raul Ferreira Fuentes <raul@nextcloud.com>
  *
- * @author Julius Härtl <jus@bitgrid.net>
- * @author Artem Anufrij <artem.anufrij@live.de>
- * @author Marin Treselj <marin@pixelipo.com>
- * @author Oskar Kurz <oskar.kurz@gmail.com>
- * @author Ryan Fletcher <ryan.fletcher@codepassion.ca>
+ * @author Raul Ferreira Fuentes <raul@nextcloud.com>
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,6 +20,26 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+namespace OCA\Deck\Model;
 
-@import 'icons';
-@import 'print';
+use OCA\Deck\Db\Board;
+
+class BoardSummary extends Board {
+	private Board $board;
+
+	public function __construct(Board $board) {
+		parent::__construct();
+		$this->board = $board;
+	}
+
+	public function jsonSerialize(): array {
+		return [
+			'id' => $this->getId(),
+			'title' => $this->getTitle()
+		];
+	}
+
+	public function __call($name, $arguments) {
+		return $this->board->__call($name, $arguments);
+	}
+}

lib/Model/CardDetails.php

@@ -0,0 +1,92 @@
+<?php
+/**
+ * @copyright Copyright (c) 2022 Raul Ferreira Fuentes <raul@nextcloud.com>
+ *
+ * @author Raul Ferreira Fuentes <raul@nextcloud.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\Deck\Model;
+
+use DateTime;
+use OCA\Deck\Db\Board;
+use OCA\Deck\Db\Card;
+
+class CardDetails extends Card {
+	private Card $card;
+	private ?Board $board;
+
+	public function __construct(Card $card, ?Board $board = null) {
+		parent::__construct();
+		$this->card = $card;
+		$this->board = $board;
+	}
+
+	public function setBoard(?Board $board): void {
+		$this->board = $board;
+	}
+
+	public function jsonSerialize(array $extras = []): array {
+		$array = $this->card->jsonSerialize();
+		unset($array['notified'], $array['descriptionPrev'], $array['relatedStack'], $array['relatedBoard']);
+
+		$array['overdue'] = $this->getDueStatus();
+		$this->appendBoardDetails($array);
+
+		return $array;
+	}
+
+	private function getDueStatus(): int {
+		$today = new DateTime();
+		$today->setTime(0, 0);
+
+		$match_date = $this->card->getDuedate();
+		if (!$match_date) {
+			return Card::DUEDATE_FUTURE;
+		}
+		$match_date->setTime(0, 0);
+
+		$diff = $today->diff($match_date);
+		$diffDays = (int) $diff->format('%R%a'); // Extract days count in interval
+
+
+		if ($diffDays === 1) {
+			return Card::DUEDATE_NEXT;
+		}
+		if ($diffDays === 0) {
+			return Card::DUEDATE_NOW;
+		}
+		if ($diffDays < 0) {
+			return Card::DUEDATE_OVERDUE;
+		}
+
+		return Card::DUEDATE_FUTURE;
+	}
+
+	private function appendBoardDetails(&$array): void {
+		if (!$this->board) {
+			return;
+		}
+
+		$array['boardId'] = $this->board->id;
+		$array['board'] = (new BoardSummary($this->board))->jsonSerialize();
+	}
+
+	public function __call($name, $arguments) {
+		return $this->card->__call($name, $arguments);
+	}
+}

lib/Notification/NotificationHelper.php

@@ -129,7 +129,7 @@ class NotificationHelper {
 					->setSubject('card-overdue', [
 						$card->getTitle(), $board->getTitle()
 					])
-					->setDateTime(new DateTime($card->getDuedate()));
+					->setDateTime($card->getDuedate());
 				$this->notificationManager->notify($notification);
 			}
 		}
@@ -242,7 +242,7 @@ class NotificationHelper {
 		}
 		return $this->boards[$boardId];
 	}
-	
+
 	private function generateBoardShared(Board $board, string $userId): INotification {
 		$notification = $this->notificationManager->createNotification();
 		$notification

lib/Notification/Notifier.php

@@ -114,7 +114,7 @@ class Notifier implements INotifier {
 					$dn = $params[2];
 				}
 				$notification->setParsedSubject(
-					(string) $l->t('The card "%s" on "%s" has been assigned to you by %s.', [$params[0], $params[1], $dn])
+					$l->t('The card "%s" on "%s" has been assigned to you by %s.', [$params[0], $params[1], $dn])
 				);
 				$notification->setRichSubject(
 					$l->t('{user} has assigned the card {deck-card} on {deck-board} to you.'),
@@ -151,7 +151,7 @@ class Notifier implements INotifier {
 				}
 
 				$notification->setParsedSubject(
-					(string) $l->t('The card "%s" on "%s" has reached its due date.', $params)
+					$l->t('The card "%s" on "%s" has reached its due date.', $params)
 				);
 				$notification->setRichSubject(
 					$l->t('The card {deck-card} on {deck-board} has reached its due date.'),
@@ -189,7 +189,7 @@ class Notifier implements INotifier {
 					$dn = $params[2];
 				}
 				$notification->setParsedSubject(
-					(string) $l->t('%s has mentioned you in a comment on "%s".', [$dn, $params[0]])
+					$l->t('%s has mentioned you in a comment on "%s".', [$dn, $params[0]])
 				);
 				$notification->setRichSubject(
 					$l->t('{user} has mentioned you in a comment on {deck-card}.'),
@@ -226,7 +226,7 @@ class Notifier implements INotifier {
 					$dn = $params[1];
 				}
 				$notification->setParsedSubject(
-					(string) $l->t('The board "%s" has been shared with you by %s.', [$params[0], $dn])
+					$l->t('The board "%s" has been shared with you by %s.', [$params[0], $dn])
 				);
 				$notification->setRichSubject(
 					$l->t('{user} has shared {deck-board} with you.'),

lib/Provider/DeckProvider.php

@@ -54,22 +54,11 @@ use OCP\IURLGenerator;
 class DeckProvider implements IFullTextSearchProvider {
 	public const DECK_PROVIDER_ID = 'deck';
 
-
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var IUrlGenerator */
-	private $urlGenerator;
-
-	/** @var FullTextSearchService */
-	private $fullTextSearchService;
-
-
-	/** @var IRunner */
-	private $runner;
-
-	/** @var IIndexOptions */
-	private $indexOptions = [];
+	private IL10N $l10n;
+	private IUrlGenerator $urlGenerator;
+	private FullTextSearchService $fullTextSearchService;
+	private ?IRunner $runner = null;
+	private ?IIndexOptions $indexOptions = null;
 
 
 	/**

lib/Reference/CardReferenceProvider.php

@@ -0,0 +1,169 @@
+<?php
+/**
+ * @copyright Copyright (c) 2022 Julien Veyssier <eneiluj@posteo.net>
+ *
+ * @author Julien Veyssier <eneiluj@posteo.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace OCA\Deck\Reference;
+
+use OCA\Deck\AppInfo\Application;
+use OCA\Deck\Db\Assignment;
+use OCA\Deck\Db\Attachment;
+use OCA\Deck\Db\Label;
+use OCA\Deck\Model\CardDetails;
+use OCA\Deck\Service\BoardService;
+use OCA\Deck\Service\CardService;
+use OCA\Deck\Service\StackService;
+use OCP\Collaboration\Reference\IReference;
+use OCP\Collaboration\Reference\IReferenceProvider;
+use OCP\Collaboration\Reference\Reference;
+use OCP\IURLGenerator;
+
+class CardReferenceProvider implements IReferenceProvider {
+	private CardService $cardService;
+	private IURLGenerator $urlGenerator;
+	private BoardService $boardService;
+	private StackService $stackService;
+	private ?string $userId;
+
+	public function __construct(CardService $cardService,
+								BoardService $boardService,
+								StackService $stackService,
+								IURLGenerator $urlGenerator,
+								?string $userId) {
+		$this->cardService = $cardService;
+		$this->urlGenerator = $urlGenerator;
+		$this->boardService = $boardService;
+		$this->stackService = $stackService;
+		$this->userId = $userId;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function matchReference(string $referenceText): bool {
+		$start = $this->urlGenerator->getAbsoluteURL('/apps/' . Application::APP_ID);
+		$startIndex = $this->urlGenerator->getAbsoluteURL('/index.php/apps/' . Application::APP_ID);
+
+		// link example: https://nextcloud.local/index.php/apps/deck/#/board/2/card/11
+		$noIndexMatch = preg_match('/^' . preg_quote($start, '/') . '\/#\/board\/[0-9]+\/card\/[0-9]+$/', $referenceText) === 1;
+		$indexMatch = preg_match('/^' . preg_quote($startIndex, '/') . '\/#\/board\/[0-9]+\/card\/[0-9]+$/', $referenceText) === 1;
+
+		return $noIndexMatch || $indexMatch;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function resolveReference(string $referenceText): ?IReference {
+		if ($this->matchReference($referenceText)) {
+			$ids = $this->getBoardCardId($referenceText);
+			if ($ids !== null) {
+				[$boardId, $cardId] = $ids;
+				$card = $this->cardService->find((int) $cardId)->jsonSerialize();
+				$board = $this->boardService->find((int) $boardId)->jsonSerialize();
+				$stack = $this->stackService->find((int) $card['stackId'])->jsonSerialize();
+
+				$card = $this->sanitizeSerializedCard($card);
+				$board = $this->sanitizeSerializedBoard($board);
+				$stack = $this->sanitizeSerializedStack($stack);
+				/** @var IReference $reference */
+				$reference = new Reference($referenceText);
+				$reference->setRichObject(Application::APP_ID . '-card', [
+					'id' => $boardId . '/' . $cardId,
+					'card' => $card,
+					'board' => $board,
+					'stack' => $stack,
+				]);
+				return $reference;
+			}
+		}
+
+		return null;
+	}
+
+	private function sanitizeSerializedStack(array $stack): array {
+		$stack['cards'] = array_map(function (CardDetails $cardDetails) {
+			$result = $cardDetails->jsonSerialize();
+			unset($result['assignedUsers']);
+			return $result;
+		}, $stack['cards']);
+
+		return $stack;
+	}
+
+	private function sanitizeSerializedBoard(array $board): array {
+		unset($board['labels']);
+		$board['owner'] = $board['owner']->jsonSerialize();
+		unset($board['acl']);
+		unset($board['users']);
+
+		return $board;
+	}
+
+	private function sanitizeSerializedCard(array $card): array {
+		$card['labels'] = array_map(function (Label $label) {
+			return $label->jsonSerialize();
+		}, $card['labels']);
+		$card['assignedUsers'] = array_map(function (Assignment $assignment) {
+			$result = $assignment->jsonSerialize();
+			$result['participant'] = $result['participant']->jsonSerialize();
+			return $result;
+		}, $card['assignedUsers']);
+		$card['owner'] = $card['owner']->jsonSerialize();
+		unset($card['relatedStack']);
+		unset($card['relatedBoard']);
+		$card['attachments'] = array_map(function (Attachment $attachment) {
+			return $attachment->jsonSerialize();
+		}, $card['attachments']);
+
+		return $card;
+	}
+
+	private function getBoardCardId(string $url): ?array {
+		$start = $this->urlGenerator->getAbsoluteURL('/apps/' . Application::APP_ID);
+		$startIndex = $this->urlGenerator->getAbsoluteURL('/index.php/apps/' . Application::APP_ID);
+
+		preg_match('/^' . preg_quote($start, '/') . '\/#\/board\/([0-9]+)\/card\/([0-9]+)$/', $url, $matches);
+		if ($matches && count($matches) > 2) {
+			return [$matches[1], $matches[2]];
+		}
+
+		preg_match('/^' . preg_quote($startIndex, '/') . '\/#\/board\/([0-9]+)\/card\/([0-9]+)$/', $url, $matches2);
+		if ($matches2 && count($matches2) > 2) {
+			return [$matches2[1], $matches2[2]];
+		}
+
+		return null;
+	}
+
+	public function getCachePrefix(string $referenceId): string {
+		$ids = $this->getBoardCardId($referenceId);
+		if ($ids !== null) {
+			[$boardId, $cardId] = $ids;
+			return $boardId . '/' . $cardId;
+		}
+
+		return $referenceId;
+	}
+
+	public function getCacheKey(string $referenceId): ?string {
+		return $this->userId ?? '';
+	}
+}

lib/Service/AttachmentService.php

@@ -61,21 +61,24 @@ class AttachmentService {
 	/** @var ChangeHelper */
 	private $changeHelper;
 	/** @var IUserManager */
-	private $userManager;
+	private IUserManager $userManager;
 	/** @var AttachmentServiceValidator */
-	private $attachmentServiceValidator;
+	private AttachmentServiceValidator $attachmentServiceValidator;
 
-	public function __construct(AttachmentMapper $attachmentMapper,
-								CardMapper $cardMapper,
-								IUserManager $userManager,
-								ChangeHelper $changeHelper,
-								PermissionService $permissionService,
-								Application $application,
-								AttachmentCacheHelper $attachmentCacheHelper,
-								$userId,
-								IL10N $l10n,
-								ActivityManager $activityManager,
-								AttachmentServiceValidator $attachmentServiceValidator) {
+	public function __construct(
+		AttachmentMapper $attachmentMapper,
+		CardMapper $cardMapper,
+		IUserManager $userManager,
+		ChangeHelper $changeHelper,
+		PermissionService $permissionService,
+		Application $application,
+		ICacheFactory $cacheFactory,
+		AttachmentCacheHelper $attachmentCacheHelper,
+		$userId,
+		IL10N $l10n,
+		ActivityManager $activityManager,
+		AttachmentServiceValidator $attachmentServiceValidator
+	) {
 		$this->attachmentMapper = $attachmentMapper;
 		$this->cardMapper = $cardMapper;
 		$this->permissionService = $permissionService;

lib/Service/BoardService.php

@@ -24,7 +24,6 @@
 
 namespace OCA\Deck\Service;
 
-use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use OCA\Deck\Activity\ActivityManager;
 use OCA\Deck\Activity\ChangeSet;
 use OCA\Deck\AppInfo\Application;
@@ -43,10 +42,13 @@ use OCA\Deck\Event\AclUpdatedEvent;
 use OCA\Deck\NoPermissionException;
 use OCA\Deck\Notification\NotificationHelper;
 use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IConfig;
+use OCP\IDBConnection;
 use OCP\IGroupManager;
 use OCP\IL10N;
+use OCP\DB\Exception as DbException;
 use OCA\Deck\Db\Board;
 use OCA\Deck\Db\BoardMapper;
 use OCA\Deck\Db\LabelMapper;
@@ -54,30 +56,31 @@ use OCP\IUserManager;
 use OCA\Deck\BadRequestException;
 use OCA\Deck\Validators\BoardServiceValidator;
 use OCP\IURLGenerator;
+use OCP\Server;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 class BoardService {
-	private $boardMapper;
-	private $stackMapper;
-	private $labelMapper;
-	private $aclMapper;
-	/** @var IConfig */
-	private $config;
-	private $l10n;
-	private $permissionService;
-	private $notificationHelper;
-	private $assignedUsersMapper;
-	private $userManager;
-	private $groupManager;
-	private $userId;
-	private $activityManager;
-	private $eventDispatcher;
-	private $changeHelper;
-	private $cardMapper;
-
-	private $boardsCache = null;
-	private $urlGenerator;
-	private $boardServiceValidator;
-
+	private BoardMapper $boardMapper;
+	private StackMapper $stackMapper;
+	private LabelMapper $labelMapper;
+	private AclMapper $aclMapper;
+	private IConfig $config;
+	private IL10N $l10n;
+	private PermissionService $permissionService;
+	private NotificationHelper $notificationHelper;
+	private AssignmentMapper $assignedUsersMapper;
+	private IUserManager $userManager;
+	private IGroupManager $groupManager;
+	private ?string $userId;
+	private ActivityManager $activityManager;
+	private IEventDispatcher $eventDispatcher;
+	private ChangeHelper $changeHelper;
+	private CardMapper $cardMapper;
+	private ?array $boardsCache = null;
+	private IURLGenerator $urlGenerator;
+	private IDBConnection $connection;
+	private BoardServiceValidator $boardServiceValidator;
 
 	public function __construct(
 		BoardMapper $boardMapper,
@@ -96,8 +99,9 @@ class BoardService {
 		IEventDispatcher $eventDispatcher,
 		ChangeHelper $changeHelper,
 		IURLGenerator $urlGenerator,
+		IDBConnection $connection,
 		BoardServiceValidator $boardServiceValidator,
-		$userId
+		?string $userId
 	) {
 		$this->boardMapper = $boardMapper;
 		$this->stackMapper = $stackMapper;
@@ -116,6 +120,7 @@ class BoardService {
 		$this->userId = $userId;
 		$this->urlGenerator = $urlGenerator;
 		$this->cardMapper = $cardMapper;
+		$this->connection = $connection;
 		$this->boardServiceValidator = $boardServiceValidator;
 	}
 
@@ -479,7 +484,7 @@ class BoardService {
 
 		// TODO: use the dispatched event for this
 		try {
-			$resourceProvider = \OC::$server->query(\OCA\Deck\Collaboration\Resources\ResourceProvider::class);
+			$resourceProvider = Server::get(\OCA\Deck\Collaboration\Resources\ResourceProvider::class);
 			$resourceProvider->invalidateAccessCache($boardId);
 		} catch (\Exception $e) {
 		}
@@ -521,18 +526,14 @@ class BoardService {
 	}
 
 	/**
-	 * @param $id
-	 * @return \OCP\AppFramework\Db\Entity
+	 * @throws DbException
 	 * @throws DoesNotExistException
-	 * @throws \OCA\Deck\NoPermissionException
-	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
-	 * @throws BadRequestException
+	 * @throws NoPermissionException
+	 * @throws MultipleObjectsReturnedException
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
 	 */
-	public function deleteAcl($id) {
-		if (is_numeric($id) === false) {
-			throw new BadRequestException('id must be a number');
-		}
-
+	public function deleteAcl(int $id): ?Acl {
 		$this->permissionService->checkPermission($this->aclMapper, $id, Acl::PERMISSION_SHARE);
 		/** @var Acl $acl */
 		$acl = $this->aclMapper->find($id);
@@ -551,16 +552,16 @@ class BoardService {
 		$version = \OCP\Util::getVersion()[0];
 		if ($version >= 16) {
 			try {
-				$resourceProvider = \OC::$server->query(\OCA\Deck\Collaboration\Resources\ResourceProvider::class);
+				$resourceProvider = Server::get(\OCA\Deck\Collaboration\Resources\ResourceProvider::class);
 				$resourceProvider->invalidateAccessCache($acl->getBoardId());
 			} catch (\Exception $e) {
 			}
 		}
-		$delete = $this->aclMapper->delete($acl);
 
+		$deletedAcl = $this->aclMapper->delete($acl);
 		$this->eventDispatcher->dispatchTyped(new AclDeletedEvent($acl));
 
-		return $delete;
+		return $deletedAcl;
 	}
 
 	/**
@@ -612,7 +613,7 @@ class BoardService {
 	}
 
 	public function transferBoardOwnership(int $boardId, string $newOwner, bool $changeContent = false): Board {
-		\OC::$server->getDatabaseConnection()->beginTransaction();
+		$this->connection->beginTransaction();
 		try {
 			$board = $this->boardMapper->find($boardId);
 			$previousOwner = $board->getOwner();
@@ -621,7 +622,10 @@ class BoardService {
 			if (!$changeContent) {
 				try {
 					$this->addAcl($boardId, Acl::PERMISSION_TYPE_USER, $previousOwner, true, true, true);
-				} catch (UniqueConstraintViolationException $e) {
+				} catch (DbException $e) {
+					if ($e->getReason() !== DbException::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+						throw $e;
+					}
 				}
 			}
 			$this->boardMapper->transferOwnership($previousOwner, $newOwner, $boardId);
@@ -631,10 +635,10 @@ class BoardService {
 				$this->assignedUsersMapper->remapAssignedUser($boardId, $previousOwner, $newOwner);
 				$this->cardMapper->remapCardOwner($boardId, $previousOwner, $newOwner);
 			}
-			\OC::$server->getDatabaseConnection()->commit();
+			$this->connection->commit();
 			return $this->boardMapper->find($boardId);
 		} catch (\Throwable $e) {
-			\OC::$server->getDatabaseConnection()->rollBack();
+			$this->connection->rollBack();
 			throw $e;
 		}
 	}

lib/Service/CardService.php

@@ -46,27 +46,31 @@ use OCA\Deck\BadRequestException;
 use OCA\Deck\Validators\CardServiceValidator;
 use OCP\Comments\ICommentsManager;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\IRequest;
 use OCP\IUserManager;
 use OCP\IURLGenerator;
+use Psr\Log\LoggerInterface;
 
 class CardService {
-	private $cardMapper;
-	private $stackMapper;
-	private $boardMapper;
-	private $labelMapper;
-	private $permissionService;
-	private $boardService;
-	private $notificationHelper;
-	private $assignedUsersMapper;
-	private $attachmentService;
-	private $currentUser;
-	private $activityManager;
-	private $commentsManager;
-	private $changeHelper;
-	private $eventDispatcher;
-	private $userManager;
-	private $urlGenerator;
-	private $cardServiceValidator;
+	private CardMapper $cardMapper;
+	private StackMapper $stackMapper;
+	private BoardMapper $boardMapper;
+	private LabelMapper $labelMapper;
+	private PermissionService $permissionService;
+	private BoardService $boardService;
+	private NotificationHelper $notificationHelper;
+	private AssignmentMapper $assignedUsersMapper;
+	private AttachmentService $attachmentService;
+	private ?string $currentUser;
+	private ActivityManager $activityManager;
+	private ICommentsManager $commentsManager;
+	private ChangeHelper $changeHelper;
+	private IEventDispatcher $eventDispatcher;
+	private IUserManager $userManager;
+	private IURLGenerator $urlGenerator;
+	private LoggerInterface $logger;
+	private IRequest $request;
+	private CardServiceValidator $cardServiceValidator;
 
 	public function __construct(
 		CardMapper $cardMapper,
@@ -84,8 +88,10 @@ class CardService {
 		ChangeHelper $changeHelper,
 		IEventDispatcher $eventDispatcher,
 		IURLGenerator $urlGenerator,
+		LoggerInterface $logger,
+		IRequest $request,
 		CardServiceValidator $cardServiceValidator,
-		$userId
+		?string $userId
 	) {
 		$this->cardMapper = $cardMapper;
 		$this->stackMapper = $stackMapper;
@@ -103,6 +109,8 @@ class CardService {
 		$this->eventDispatcher = $eventDispatcher;
 		$this->currentUser = $userId;
 		$this->urlGenerator = $urlGenerator;
+		$this->logger = $logger;
+		$this->request = $request;
 		$this->cardServiceValidator = $cardServiceValidator;
 	}
 
@@ -136,23 +144,18 @@ class CardService {
 	}
 
 	/**
-	 * @param $cardId
 	 * @return \OCA\Deck\Db\RelationalEntity
 	 * @throws \OCA\Deck\NoPermissionException
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws BadRequestException
 	 */
-	public function find($cardId) {
-		if (is_numeric($cardId) === false) {
-			throw new BadRequestException('card id must be a number');
-		}
-
+	public function find(int $cardId) {
 		$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_READ);
 		$card = $this->cardMapper->find($cardId);
 		$assignedUsers = $this->assignedUsersMapper->findAll($card->getId());
 		$attachments = $this->attachmentService->findAll($cardId, true);
-		if (\OC::$server->getRequest()->getParam('apiVersion') === '1.0') {
+		if ($this->request->getParam('apiVersion') === '1.0') {
 			$attachments = array_filter($attachments, function ($attachment) {
 				return $attachment->getType() === 'deck_file';
 			});
@@ -167,7 +170,7 @@ class CardService {
 		try {
 			$this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_READ);
 		} catch (NoPermissionException $e) {
-			\OC::$server->getLogger()->error('Unable to check permission for a previously obtained board ' . $boardId, ['exception' => $e]);
+			$this->logger->error('Unable to check permission for a previously obtained board ' . $boardId, ['exception' => $e]);
 			return [];
 		}
 		$cards = $this->cardMapper->findCalendarEntries($boardId);
@@ -295,11 +298,11 @@ class CardService {
 		$card->setType($type);
 		$card->setOrder($order);
 		$card->setOwner($owner);
-		$card->setDuedate($duedate);
+		$card->setDuedate($duedate ? new \DateTime($duedate) : null);
 		$resetDuedateNotification = false;
 		if (
 			$card->getDuedate() === null ||
-			(new \DateTime($card->getDuedate())) != (new \DateTime($changes->getBefore()->getDuedate() ?? ''))
+			($card->getDuedate()) != ($changes->getBefore()->getDuedate())
 		) {
 			$card->setNotified(false);
 			$resetDuedateNotification = true;
@@ -428,7 +431,7 @@ class CardService {
 	 * @throws StatusException
 	 * @throws \OCA\Deck\NoPermissionException
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException
-	 * @throws \OCP\AppFramework\Db\
+	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws BadRequestException
 	 */
 	public function archive($id) {