fix: update comment input ui

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

.eslintrc.js

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

.github/dependabot.yml

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

.github/stale.yml

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

.github/workflows/appbuild.yml

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

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

@@ -66,7 +66,7 @@ jobs:
         run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
 
       - name: Set up php ${{ env.PHP_VERSION }}
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@2.17.1
         with:
           php-version: ${{ env.PHP_VERSION }}
           coverage: none

.github/workflows/command-rebase.yml

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

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

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

.github/workflows/fixup.yml

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

.github/workflows/integration.yml

@@ -19,7 +19,7 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['stable21']
+        server-versions: ['master']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
@@ -43,7 +43,7 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
@@ -56,12 +56,12 @@ jobs:
           git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
 
       - name: Checkout app
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@2.17.1
         with:
           php-version: ${{ matrix.php-versions }}
           tools: phpunit

.github/workflows/lint.yml

@@ -13,13 +13,13 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['7.2', '7.3', '7.4']
+        php-versions: ['7.4', '8.0']
 
     name: php${{ matrix.php-versions }} lint
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up php${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@v1
+        uses: shivammathur/setup-php@2.17.1
         with:
           php-version: ${{ matrix.php-versions }}
           coverage: none
@@ -31,9 +31,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@master
+      uses: actions/checkout@v3
     - name: Set up php
-      uses: shivammathur/setup-php@master
+      uses: shivammathur/setup-php@2.17.1
       with:
         php-version: 7.4
         coverage: none
@@ -47,14 +47,16 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [14.x]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Use node ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
+      - name: Set up npm7
+        run: npm i -g npm@7
       - name: Install dependencies
         run: npm ci
       - name: ESLint
@@ -65,16 +67,19 @@ jobs:
 
     strategy:
       matrix:
-        node-versions: [12.x]
+        node-version: [14.x]
 
-    name: stylelint node${{ matrix.node-versions }}
+    name: stylelint node${{ matrix.node-version }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Set up node ${{ matrix.node-versions }}
-        uses: actions/setup-node@v1
+      - name: Set up node ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
         with:
-          node-versions: ${{ matrix.node-versions }}
+          node-version: ${{ matrix.node-version }}
+
+      - name: Set up npm7
+        run: npm i -g npm@7
 
       - name: Install dependencies
         run: npm ci

.github/workflows/nightly.yml

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

.github/workflows/nodejs.yml

@@ -9,14 +9,16 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [14.x]
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
+    - name: Set up npm7
+      run: npm i -g npm@7
     - name: install dependencies
       run: |
         npm ci

.github/workflows/phpunit.yml

@@ -18,9 +18,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.3', '7.4']
+        php-versions: ['7.4', '8.0']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['stable21']
+        server-versions: ['master']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
@@ -44,7 +44,7 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
@@ -57,12 +57,12 @@ jobs:
           git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
 
       - name: Checkout app
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@2.17.1
         with:
           php-version: ${{ matrix.php-versions }}
           tools: phpunit

.github/workflows/static-analysis.yml

@@ -12,13 +12,13 @@ jobs:
       runs-on: ubuntu-latest
       strategy:
           matrix:
-              ocp-version: [ 'dev-stable21' ]
+              ocp-version: [ 'dev-master' ]
       name: Nextcloud ${{ matrix.ocp-version }}
       steps:
           - name: Checkout
-            uses: actions/checkout@master
+            uses: actions/checkout@v3
           - name: Set up php
-            uses: shivammathur/setup-php@master
+            uses: shivammathur/setup-php@2.17.1
             with:
                 php-version: 7.4
                 tools: composer:v1

CHANGELOG.md

@@ -1,79 +1,38 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## 1.4.8
+## 1.6.0-beta1
+
+### Added
+
+- #3177 Use async import for vue component on collections entrypoint @juliushaertl
+- #2791 Open description links in new tab @fm-sys
+- #3344 Improve combined search @eneiluj
+- #3362 Improve search performance @eneiluj
+- #2710 Due date shortcuts in the datepicker @jakobroehrl
 
 ### Fixed
 
-- Fix cursor generation if no results are found [#3461](https://api.github.com/repos/nextcloud/deck/pulls/3461)
-- Allow to download an attachment without navigating to the files app [#3442](https://api.github.com/repos/nextcloud/deck/pulls/3442)
-- Exclude deleted boards in the selection for target [#3525](https://api.github.com/repos/nextcloud/deck/pulls/3525)
-- Make insert attachment buttom easy to click [#3616](https://api.github.com/repos/nextcloud/deck/pulls/3616)
-- Fix confusion between stackId and boardId in StackService [#3545](https://api.github.com/repos/nextcloud/deck/pulls/3545)
-
-## 1.4.7
-
-### Fixed
-
-- Fix release asset build
-
-## 1.4.6
-
-### Fixed
-
-- #3379 Fix menu button position in card modal
-- #3360 Improve combined search @eneiluj
-- #3367 Fix optional parameter order
-- #3393 Use displayname instead of uid for mentions
-- #3359 Rich object string parameters for notifications @juliushaertl
-- #3385 Extend drag-and-drop zone in card sidebar @Artem4590
-- #3408 Keep exceptions http response generic
-
-
-## 1.4.5
-
-### Fixed
-
-- #3318 Additional check for stacks
-
-
-## 1.4.4
-
-### Fixed
-
-- #3301 Fix print style issues
-- #3307 Return false instead of throwing when getting calendar setting
-- #3227 Additional circle level check
-- #3304 Delete file shares through attachments API
-
-## 1.4.3 - 2021-07-09
-
-### Fixed
-
-* [#3143](https://github.com/nextcloud/deck/pull/3143) Always pass user id in share provider
-* [#3153](https://github.com/nextcloud/deck/pull/3153) Only offer stack creation in emptycontent with proper permissions
-* [#3164](https://github.com/nextcloud/deck/pull/3164) Always log generic exceptions
-* [#3169](https://github.com/nextcloud/deck/pull/3169) Reduce duplicate queries when fetching user boards an permissions
-
-
-## 1.4.2 - 2021-05-03
-
-### Fixed
-
-* [#3030](https://github.com/nextcloud/deck/pull/3030) Proper error handling when fetching comments fails
-* [#3031](https://github.com/nextcloud/deck/pull/3031) Allow searching for filters without a query to match all that have a given filter set
-* [#3039](https://github.com/nextcloud/deck/pull/3039) Catch any error during circle detail fetching
-* [#3040](https://github.com/nextcloud/deck/pull/3040) Get attachment from the user node instead of the share source
-
-## 1.4.1 - 2021-04-20
-
-### Fixed
-
-* [#2984](https://github.com/nextcloud/deck/pull/2984) Fix codemirror description width
-* [#2990](https://github.com/nextcloud/deck/pull/2990) Fix unified comments search with postgres
-* [#2994](https://github.com/nextcloud/deck/pull/2994) Remove notification on unshare and add type hints
-* [#3006](https://github.com/nextcloud/deck/pull/3006) Only import debounce
-* [#3008](https://github.com/nextcloud/deck/pull/3008) Do not query the lookupserver when looking for sharees
+- #3161 Reduce duplicate queries when fetching user boards an permissions @juliushaertl
+- #3151 Always log generic exceptions @juliushaertl
+- #3217 Move circle checks to a unified service and improve member checks @juliushaertl
+- #3225 Check for null value to avoid TypeError in the group manager @juliushaertl
+- #3263 Defer obtaining the user session in the config service  @juliushaertl
+- #3294 Fix print style issues @weeman1337
+- #3299 Return false instead of throwing when getting calendar setting @juliushaertl
+- #3298 Delete file shares through attachments API @juliushaertl
+- #3343 Fix search pagination cursor @eneiluj
+- #3326 add autofocus on board edit @weeman1337
+- #3323 Extend drag-and-drop zone in card sidebar @old-green-frog
+- #3364 Fix optional parameter order @juliushaertl
+- #3324 Fix menu button position in card modal @valerydmitrieva
+- #3391 Use displayname instead of uid for mentions (reopened against master) @kffl
+- #3316 Additional check for stacks @juliushaertl
+- #3357 Revert "Fix search pagination cursor" @juliushaertl
+- #3327 Do not show both bullets and checkboxes for checklists @Themanwhosmellslikesugar
+- #3375 Show absolute dates when printing @weeman1337
+- #3376 Print assignee names @weeman1337
+- #3384 Keep exceptions http response generic @juliushaertl
 
 
 ## 1.4.0 - 2021-04-13

Makefile

@@ -50,8 +50,7 @@ ifeq (, $(shell which phpunit 2> /dev/null))
 	php $(build_tools_directory)/phpunit.phar -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
 	php $(build_tools_directory)/phpunit.phar -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
 else
-	phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
-	phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
+	phpunit -c tests/phpunit.integration.xml --testsuite=integration-database --coverage-clover build/php-integration.coverage.xml
 endif
 
 test-integration:

README.md

@@ -15,12 +15,18 @@ Deck is a kanban style organization tool aimed at personal planning and project
 - Keep track of changes in the activity stream
 - Get your project organized
 
-### Mobile apps
-
-- The [Nextcloud Deck app for Android](https://github.com/stefan-niedermann/nextcloud-deck) is available in the [Google Play Store](https://play.google.com/store/apps/details?id=it.niedermann.nextcloud.deck.play) 
-
 ![Deck - Manage cards on your board](http://download.bitgrid.net/nextcloud/deck/screenshots/1.0/Deck-2.png)
 
+### 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)
+
+### 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 
+- [A-deck](https://github.com/leoossa/A-deck) - Chrome Extension that allows to create new card in selected stack based on current tab
+ 
 ## Installation/Update
 
 This app is supposed to work on the two latest Nextcloud versions.

appinfo/info.xml

@@ -7,16 +7,16 @@
 
 
 - 📥 Add your tasks to cards and put them in order
-- 📄 Write down additional notes in markdown
+- 📄 Write down additional notes in Markdown
 - 🔖 Assign labels for even better organization
 - 👥 Share with your team, friends or family
-- 📎 Attach files and embed them in your markdown description
+- 📎 Attach files and embed them in your Markdown description
 - 💬 Discuss with your team using comments
 - ⚡ Keep track of changes in the activity stream
 - 🚀 Get your project organized
 
 </description>
-    <version>1.4.8</version>
+    <version>1.7.0-alpha1</version>
     <licence>agpl</licence>
     <author>Julius Härtl</author>
     <namespace>Deck</namespace>
@@ -31,11 +31,10 @@
     <screenshot>https://download.bitgrid.net/nextcloud/deck/screenshots/1.0/Deck-1.png</screenshot>
     <screenshot>https://download.bitgrid.net/nextcloud/deck/screenshots/1.0/Deck-2.png</screenshot>
     <dependencies>
-        <php min-version="7.3"/>
         <database min-version="9.4">pgsql</database>
         <database>sqlite</database>
-        <database min-version="5.5">mysql</database>
-        <nextcloud min-version="21" max-version="21"/>
+        <database min-version="8.0">mysql</database>
+        <nextcloud min-version="24" max-version="24"/>
     </dependencies>
     <background-jobs>
         <job>OCA\Deck\Cron\DeleteCron</job>
@@ -44,6 +43,8 @@
     </background-jobs>
     <commands>
         <command>OCA\Deck\Command\UserExport</command>
+        <command>OCA\Deck\Command\BoardImport</command>
+        <command>OCA\Deck\Command\TransferOwnership</command>
     </commands>
     <activity>
         <settings>

appinfo/routes.php

@@ -25,6 +25,7 @@
 return [
 	'routes' => [
 		['name' => 'page#index', 'url' => '/', 'verb' => 'GET'],
+		['name' => 'page#redirectToCard', 'url' => '/card/{cardId}', 'verb' => 'GET'],
 
 		// boards
 		['name' => 'board#index', 'url' => '/boards', 'verb' => 'GET'],
@@ -38,6 +39,7 @@ return [
 		['name' => 'board#updateAcl', 'url' => '/boards/{boardId}/acl/{aclId}', 'verb' => 'PUT'],
 		['name' => 'board#deleteAcl', 'url' => '/boards/{boardId}/acl/{aclId}', 'verb' => 'DELETE'],
 		['name' => 'board#clone', 'url' => '/boards/{boardId}/clone', 'verb' => 'POST'],
+		['name' => 'board#transferOwner', 'url' => '/boards/{boardId}/transferOwner', 'verb' => 'PUT'],
 
 		// stacks
 		['name' => 'stack#index', 'url' => '/stacks/{boardId}', 'verb' => 'GET'],
@@ -90,6 +92,10 @@ return [
 		['name' => 'board_api#deleteAcl', 'url' => '/api/v{apiVersion}/boards/{boardId}/acl/{aclId}', 'verb' => 'DELETE'],
 		['name' => 'board_api#updateAcl', 'url' => '/api/v{apiVersion}/boards/{boardId}/acl/{aclId}', 'verb' => 'PUT'],
 
+		['name' => 'board_import_api#getAllowedSystems', 'url' => '/api/v{apiVersion}/boards/import/getSystems','verb' => 'GET'],
+		['name' => 'board_import_api#getConfigSchema', 'url' => '/api/v{apiVersion}/boards/import/config/schema/{name}','verb' => 'GET'],
+		['name' => 'board_import_api#import', 'url' => '/api/v{apiVersion}/boards/import','verb' => 'POST'],
+
 
 		['name' => 'stack_api#index', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks', 'verb' => 'GET'],
 		['name' => 'stack_api#getArchived', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/archived', 'verb' => 'GET'],

babel.config.js

@@ -1,11 +1,3 @@
-module.exports = {
-	plugins: ['@babel/plugin-syntax-dynamic-import'],
-	presets: [
-		[
-			'@babel/preset-env',
-			{
-				modules: false
-			}
-		]
-	]
-}
+const babelConfig = require('@nextcloud/babel-config')
+
+module.exports = babelConfig

composer.json

@@ -9,20 +9,27 @@
 		}
 	],
 	"require": {
-		"cogpowered/finediff": "0.3.*"
+		"cogpowered/finediff": "0.3.*",
+		"justinrainbow/json-schema": "^5.2"
 	},
 	"require-dev": {
 		"roave/security-advisories": "dev-master",
-		"christophwurst/nextcloud": "^21@dev",
-		"phpunit/phpunit": "^8",
-		"nextcloud/coding-standard": "^0.5.0",
+		"christophwurst/nextcloud": "dev-master",
+		"phpunit/phpunit": "^9",
+		"nextcloud/coding-standard": "^1.0.0",
 		"symfony/event-dispatcher": "^4.0",
 		"vimeo/psalm": "^4.3",
 		"php-parallel-lint/php-parallel-lint": "^1.2"
 	},
 	"config": {
 		"optimize-autoloader": true,
-		"classmap-authoritative": true
+		"classmap-authoritative": true,
+		"allow-plugins": {
+			"composer/package-versions-deprecated": true
+		},
+		"platform": {
+			"php": "7.4"
+		}
 	},
 	"scripts": {
 		"lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",

docs/API.md

@@ -96,10 +96,27 @@ If available the ETag will also be part of JSON response objects as shown below
 
 # Changelog
 
-## 1.0.0 (unreleased)
+## API version 1.0
+
+- Deck >=1.0.0: The maximum length of the card title has been extended from 100 to 255 characters
+- Deck >=1.0.0: The API will now return a 400 Bad request response if the length limitation of a board, stack or card title is exceeded
+
+## API version 1.1
+
+This API version has become available with **Deck 1.3.0**.
 
 - The maximum length of the card title has been extended from 100 to 255 characters
 - The API will now return a 400 Bad request response if the length limitation of a board, stack or card title is exceeded
+- The attachments API endpoints will return other attachment types than deck_file
+  - Prior to Deck version v1.3.0 (API v1.0), attachments were stored within deck. For this type of attachments `deck_file` was used as the default type of attachments
+  - Starting with Deck version 1.3.0 (API v1.1) files are stored within the users regular Nextcloud files and the type `file` has been introduced for that
+
+## API version 1.2 (unreleased)
+
+- Endpoints for the new import functionality have been added:
+  - [GET /boards/import/getSystems - Import a board](#get-boardsimportgetsystems-import-a-board)
+  - [GET /boards/import/config/system/{schema} - Import a board](#get-boardsimportconfigsystemschema-import-a-board)
+  - [POST /boards/import - Import a board](#post-boardsimport-import-a-board)
 
 # Endpoints
 
@@ -927,7 +944,8 @@ The request can fail with a bad request response for the following reasons:
 | type      | String  | The type of the attachement                   |
 | file      | Binary  | File data to add as an attachment             |
 
-For now only `deck_file` is supported as an attachment type.
+- Prior to Deck version v1.3.0 (API v1.0), attachments were stored within deck. For this type of attachments `deck_file` was used as the default type of attachments
+- Starting with Deck version 1.3.0 (API v1.1) files are stored within the users regular Nextcloud files and the type `file` has been introduced for that
 
 #### Response
 
@@ -988,6 +1006,49 @@ For now only `deck_file` is supported as an attachment type.
 
 ##### 200 Success
 
+### GET /boards/import/getSystems - Import a board
+
+#### Request parameters
+
+| Parameter    | Type    | Description                                   |
+| ------------ | ------- | --------------------------------------------- |
+| system       | Integer | The system name. Example: trello              |
+
+#### Response
+
+Make a request to see the json schema of system
+
+```json
+{
+}
+```
+
+### GET /boards/import/config/system/{schema} - Import a board
+
+#### Request parameters
+
+#### Response
+
+```json
+[
+  "trello"
+]
+```
+
+### POST /boards/import - Import a board
+
+#### Request parameters
+
+| Parameter    | Type    | Description                                   |
+| ------------ | ------- | --------------------------------------------- |
+| system       | string  | The allowed name of system to import from     |
+| config       | Object  | The config object  (JSON)                     |
+| data         | Object  | The data object to import (JSON)              |
+
+#### Response
+
+##### 200 Success
+
 # OCS API
 
 The following endpoints are available through the Nextcloud OCS endpoint, which is available at `/ocs/v2.php/apps/deck/api/v1.0/`. 
@@ -1004,6 +1065,7 @@ Deck stores user and app configuration values globally and per board. The GET en
 | Config key | Description |
 | --- | --- |
 | 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) | 
 | 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)|  
 
 ```
@@ -1016,6 +1078,7 @@ Deck stores user and app configuration values globally and per board. The GET en
     },
     "data": {
       "calendar": true,
+      "cardDetailsInModal": true,
       "groupLimit": [
         {
           "id": "admin",
@@ -1045,6 +1108,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 |
  
 #### Example request
 

docs/User_documentation_en.md

@@ -14,6 +14,9 @@ Overall, Deck is easy to use. You can create boards, add users, share the Deck,
 3. [Handle cards options](#3-handle-cards-options)
 4. [Archive old tasks](#4-archive-old-tasks)
 5. [Manage your board](#5-manage-your-board)
+6. [Import boards](#6-import-boards)
+7. [Search](#7-search)
+8. [New owner for the deck entities](#8-new-owner-for-the-deck-entities)
 
 ### 1. Create my first board
 In this example, we're going to create a board and share it with an other nextcloud user.
@@ -69,14 +72,80 @@ The **sharing tab** allows you to add users or even groups to your boards.
 **Deleted objects** allows you to return previously deleted stacks or cards.  
 The **Timeline** allows you to see everything that happened in your boards. Everything!
 
-## Search
+### 6. Import boards
+
+Importing can be done using the API or the `occ` `deck:import` command.
+
+Comments with more than 1000 characters are placed as attached files to the card.
+
+It is possible to import from the following sources:
+
+#### Trello JSON
+
+Steps:
+* Create the data file
+  * Access Trello
+  * go to the board you want to export
+  * Follow the steps in [Trello documentation](https://help.trello.com/article/747-exporting-data-from-trello-1) and export as JSON
+* 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`
+
+Example configuration file:
+```json
+{
+    "owner": "admin",
+    "color": "0800fd",
+    "uidRelation": {
+        "johndoe": "johndoe"
+    }
+}
+```
+
+**Limitations**:
+
+Importing from a JSON file imports up to 1000 actions. To find out how many actions the board to be imported has, identify how many actions the JSON has.
+
+#### Trello API
+
+Import using API is recommended for boards with more than 1000 actions.
+
+Trello makes it possible to attach links to a card. Deck does not have this feature. Attachments and attachment links are added in a markdown table at the end of the description for every imported card that has attachments in Trello.
+
+* Get the API Key and API Token [here](https://developer.atlassian.com/cloud/trello/guides/rest-api/api-introduction/#authentication-and-authorization)
+* Get the ID of the board you want to import by making a request to:
+https://api.trello.com/1/members/me/boards?key={yourKey}&token={yourToken}&fields=id,name
+
+  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`
+
+Example configuration file:
+```json
+{
+    "owner": "admin",
+    "color": "0800fd",
+    "api": {
+        "key": "0cc175b9c0f1b6a831c399e269772661",
+        "token": "92eb5ffee6ae2fec3ad71c777531578f4a8a08f09d37b73795649038408b5f33"
+    },
+    "board": "8277e0910d750195b4487976",
+    "uidRelation": {
+        "johndoe": "johndoe"
+    }
+}
+```
+
+### 7. Search
 
 Deck provides a global search either through the unified search in the Nextcloud header or with the inline search next to the board controls.
 This search allows advanced filtering of cards across all board of the logged in user.
 
 For example the search `project tag:ToDo assigned:alice assigned:bob` will return all cards where the card title or description contains project **and** the tag ToDo is set **and** the user alice is assigned **and** the user bob is assigned.
 
-### Supported search filters
+#### Supported search filters
 
 | Filter      | Operators         | Query                                                        |
 | ----------- | ----------------- | ------------------------------------------------------------ |
@@ -90,4 +159,22 @@ For example the search `project tag:ToDo assigned:alice assigned:bob` will retur
 
 Other text tokens will be used to perform a case-insensitive search on the card title and description
 
-In addition wuotes can be used to pass a query with spaces, e.g. `"Exact match with spaces"` or `title:"My card"`.
+In addition, quotes can be used to pass a query with spaces, e.g. `"Exact match with spaces"` or `title:"My card"`.
+
+### 8. New owner for the deck entities
+You can transfer ownership of boards, cards, etc to a new user, using `occ` command `deck:transfer-ownership`
+
+```bash
+php occ deck:transfer-ownership previousOwner newOwner
+```
+
+The transfer will preserve card details linked to the old owner, which can also be remapped by using the `--remap` option on the occ command.
+```bash
+php occ deck:transfer-ownership --remap previousOwner newOwner
+```
+
+Individual boards can be transferred by adding the id of the board to the command:
+
+```bash
+php occ deck:transfer-ownership previousOwner newOwner 123
+```

docs/implement-import.md

@@ -0,0 +1,32 @@
+## Implement import
+
+* Create a new importer class extending `ABoardImportService`
+* Create a listener for event `BoardImportGetAllowedEvent` to enable your importer.
+  > You can read more about listeners on [Nextcloud](https://docs.nextcloud.com/server/latest/developer_manual/basics/events.html?highlight=event#writing-a-listener) doc.
+
+  Example:
+
+```php
+class YourCustomImporterListener {
+    public function handle(Event $event): void {
+        if (!($event instanceof BoardImportGetAllowedEvent)) {
+            return;
+        }
+
+        $event->getService()->addAllowedImportSystem([
+            'name' => YourCustomImporterService::$name,
+            'class' => YourCustomImporterService::class,
+            'internalName' => 'YourCustomImporter'
+        ]);
+    }
+}
+```
+  * Register your listener on your `Application` class like this:
+```php
+$dispatcher = $this->getContainer()->query(IEventDispatcher::class);
+$dispatcher->registerEventListener(
+    BoardImportGetAllowedEvent::class,
+    YourCustomImporterListener::class
+);
+```
+* Use the `lib/Service/Importer/Systems/TrelloJsonService.php` class as inspiration

docs/import-class-diagram.md

@@ -0,0 +1,7 @@
+## Import class diagram
+
+Importing boards to the Deck implements the class diagram below.
+
+> **NOTE**: When making any changes to the structure of the classes or implementing import from other sources, edit the `BoardImport.yuml` file
+
+![Screenshot](resources/BoardImport.svg)

docs/resources/BoardImport.svg

@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 2.40.1 (20161225.0304)
+ -->
+<!-- Title: G Pages: 1 -->
+<svg width="417pt" height="830pt"
+ viewBox="0.00 0.00 417.01 830.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 826)">
+<title>G</title>
+<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-826 413.012,-826 413.012,4 -4,4"/>
+<!-- A0 -->
+<g id="node1" class="node">
+<title>A0</title>
+<polygon fill="#fff8dc" stroke="#000000" points="165.909,-822 70.091,-822 70.091,-766 171.909,-766 171.909,-816 165.909,-822"/>
+<polyline fill="none" stroke="#000000" points="165.909,-822 165.909,-816 "/>
+<polyline fill="none" stroke="#000000" points="171.909,-816 165.909,-816 "/>
+<text text-anchor="middle" x="121" y="-809" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Classes used on</text>
+<text text-anchor="middle" x="121" y="-797" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">board import.</text>
+<text text-anchor="middle" x="121" y="-785" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Methods just to</text>
+<text text-anchor="middle" x="121" y="-773" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">illustrate.</text>
+</g>
+<!-- A1 -->
+<g id="node2" class="node">
+<title>A1</title>
+<polygon fill="none" stroke="#000000" points="108.7773,-680 23.2227,-680 23.2227,-644 108.7773,-644 108.7773,-680"/>
+<text text-anchor="middle" x="66" y="-659" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ApiController</text>
+</g>
+<!-- A2 -->
+<g id="node3" class="node">
+<title>A2</title>
+<polygon fill="none" stroke="#000000" points="0,-514 0,-546 132,-546 132,-514 0,-514"/>
+<text text-anchor="start" x="9.607" y="-527" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">BoardImportApiController</text>
+<polygon fill="none" stroke="#000000" points="0,-458 0,-514 132,-514 132,-458 0,-458"/>
+<text text-anchor="start" x="45.8645" y="-495" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">+import()</text>
+<text text-anchor="start" x="16.1335" y="-483" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">+getAllowedSystems()</text>
+<text text-anchor="start" x="20.0185" y="-471" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">+getConfigSchema()</text>
+</g>
+<!-- A1&#45;&gt;A2 -->
+<g id="edge1" class="edge">
+<title>A1&#45;&gt;A2</title>
+<path fill="none" stroke="#000000" d="M66,-633.6693C66,-609.4424 66,-574.1663 66,-546.2238"/>
+<polygon fill="#000000" stroke="#000000" points="66,-643.957 61.5001,-633.9569 66,-638.957 66.0001,-633.957 66.0001,-633.957 66.0001,-633.957 66,-638.957 70.5001,-633.957 66,-643.957 66,-643.957"/>
+</g>
+<!-- A3 -->
+<g id="node4" class="node">
+<title>A3</title>
+<polygon fill="none" stroke="#000000" points="92,-364 92,-396 200,-396 200,-364 92,-364"/>
+<text text-anchor="start" x="101.828" y="-377" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">BoardImportService</text>
+<polygon fill="none" stroke="#000000" points="92,-284 92,-364 200,-364 200,-284 92,-284"/>
+<text text-anchor="start" x="125.8645" y="-345" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">+import()</text>
+<text text-anchor="start" x="118.9105" y="-333" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">+bootstrap()</text>
+<text text-anchor="start" x="105.857" y="-321" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">+validateSystem()</text>
+<text text-anchor="start" x="108.218" y="-309" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">#validateConfig()</text>
+<text text-anchor="start" x="112.107" y="-297" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">#validateData()</text>
+</g>
+<!-- A2&#45;&gt;A3 -->
+<g id="edge2" class="edge">
+<title>A2&#45;&gt;A3</title>
+<path fill="none" stroke="#000000" stroke-dasharray="5,2" d="M87.8604,-457.7328C95.8577,-441.5382 105.0823,-422.8583 113.7939,-405.2174"/>
+<polygon fill="#000000" stroke="#000000" points="118.2935,-396.1057 117.9004,-407.0646 116.0795,-400.5889 113.8656,-405.072 113.8656,-405.072 113.8656,-405.072 116.0795,-400.5889 109.8308,-403.0795 118.2935,-396.1057 118.2935,-396.1057"/>
+<text text-anchor="middle" x="88.3076" y="-434.7378" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">uses</text>
+</g>
+<!-- A7 -->
+<g id="node8" class="node">
+<title>A7</title>
+<polygon fill="none" stroke="#000000" points="37,-196 37,-228 129,-228 129,-196 37,-196"/>
+<text text-anchor="start" x="46.612" y="-209" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">TrelloApiService</text>
+<polygon fill="none" stroke="#000000" points="37,-164 37,-196 129,-196 129,-164 37,-164"/>
+<text text-anchor="start" x="53.9655" y="-177" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">+name:string</text>
+</g>
+<!-- A3&#45;&gt;A7 -->
+<g id="edge6" class="edge">
+<title>A3&#45;&gt;A7</title>
+<path fill="none" stroke="#000000" stroke-dasharray="5,2" d="M114.8609,-283.9135C107.8316,-268.5143 100.7854,-252.0928 95.0404,-237.6613"/>
+<polygon fill="#000000" stroke="#000000" points="91.2872,-228.0253 99.1098,-235.7102 93.1019,-232.6844 94.9167,-237.3434 94.9167,-237.3434 94.9167,-237.3434 93.1019,-232.6844 90.7235,-238.9767 91.2872,-228.0253 91.2872,-228.0253"/>
+<text text-anchor="middle" x="99.6759" y="-267.8975" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">uses</text>
+</g>
+<!-- A9 -->
+<g id="node10" class="node">
+<title>A9</title>
+<polygon fill="none" stroke="#000000" points="148,-202 148,-234 273,-234 273,-202 148,-202"/>
+<text text-anchor="start" x="170.7765" y="-215" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">TrelloJsonService</text>
+<polygon fill="none" stroke="#000000" points="148,-158 148,-202 273,-202 273,-158 148,-158"/>
+<text text-anchor="start" x="181.4655" y="-183" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">+name:string</text>
+<text text-anchor="start" x="157.981" y="-171" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">#needValidateData:true</text>
+</g>
+<!-- A3&#45;&gt;A9 -->
+<g id="edge9" class="edge">
+<title>A3&#45;&gt;A9</title>
+<path fill="none" stroke="#000000" stroke-dasharray="5,2" d="M164.3261,-283.9135C170.0039,-270.5688 176.3462,-256.4563 182.4816,-243.5365"/>
+<polygon fill="#000000" stroke="#000000" points="186.9002,-234.3677 186.6126,-245.3298 184.7295,-238.872 182.5588,-243.3762 182.5588,-243.3762 182.5588,-243.3762 184.7295,-238.872 178.505,-241.4226 186.9002,-234.3677 186.9002,-234.3677"/>
+<text text-anchor="middle" x="163.6874" y="-260.9237" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">uses</text>
+</g>
+<!-- A10 -->
+<g id="node11" class="node">
+<title>A10</title>
+<polygon fill="#fff8dc" stroke="#000000" points="317.7872,-362 218.2128,-362 218.2128,-318 323.7872,-318 323.7872,-356 317.7872,-362"/>
+<polyline fill="none" stroke="#000000" points="317.7872,-362 317.7872,-356 "/>
+<polyline fill="none" stroke="#000000" points="323.7872,-356 317.7872,-356 "/>
+<text text-anchor="middle" x="271" y="-349" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">validateSystem is</text>
+<text text-anchor="middle" x="271" y="-337" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">public because is</text>
+<text text-anchor="middle" x="271" y="-325" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">used on Api.</text>
+</g>
+<!-- A3&#45;&gt;A10 -->
+<g id="edge11" class="edge">
+<title>A3&#45;&gt;A10</title>
+<path fill="none" stroke="#000000" stroke-dasharray="5,2" d="M200.1992,-340C206.1915,-340 212.1837,-340 218.176,-340"/>
+</g>
+<!-- A4 -->
+<g id="node5" class="node">
+<title>A4</title>
+<polygon fill="none" stroke="#000000" points="264.1131,-812 189.8869,-812 189.8869,-776 264.1131,-776 264.1131,-812"/>
+<text text-anchor="middle" x="227" y="-791" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Command</text>
+</g>
+<!-- A5 -->
+<g id="node6" class="node">
+<title>A5</title>
+<polygon fill="none" stroke="#000000" points="148,-684 148,-716 307,-716 307,-684 148,-684"/>
+<text text-anchor="start" x="199.9955" y="-697" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">BoardImport</text>
+<polygon fill="none" stroke="#000000" points="148,-652 148,-684 307,-684 307,-652 148,-652"/>
+<text text-anchor="start" x="157.907" y="-665" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">+boardImportCommandService</text>
+<polygon fill="none" stroke="#000000" points="148,-608 148,-652 307,-652 307,-608 148,-608"/>
+<text text-anchor="start" x="200.8305" y="-633" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">#configure()</text>
+<text text-anchor="start" x="177.76" y="-621" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">#execute(input,output)</text>
+</g>
+<!-- A4&#45;&gt;A5 -->
+<g id="edge3" class="edge">
+<title>A4&#45;&gt;A5</title>
+<path fill="none" stroke="#000000" d="M227,-765.6356C227,-751.1554 227,-733.0451 227,-716.0324"/>
+<polygon fill="#000000" stroke="#000000" points="227,-775.9227 222.5001,-765.9227 227,-770.9227 227.0001,-765.9227 227.0001,-765.9227 227.0001,-765.9227 227,-770.9227 231.5001,-765.9228 227,-775.9227 227,-775.9227"/>
+</g>
+<!-- A6 -->
+<g id="node7" class="node">
+<title>A6</title>
+<polygon fill="none" stroke="#000000" points="150,-526 150,-558 304,-558 304,-526 150,-526"/>
+<text text-anchor="start" x="159.7715" y="-539" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">BoardImportCommandService</text>
+<polygon fill="none" stroke="#000000" points="150,-446 150,-526 304,-526 304,-446 150,-446"/>
+<text text-anchor="start" x="199.9105" y="-507" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">+bootstrap()</text>
+<text text-anchor="start" x="206.8645" y="-495" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">+import()</text>
+<text text-anchor="start" x="186.857" y="-483" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">+validateSystem()</text>
+<text text-anchor="start" x="189.218" y="-471" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">#validateConfig()</text>
+<text text-anchor="start" x="193.107" y="-459" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">#validateData()</text>
+</g>
+<!-- A5&#45;&gt;A6 -->
+<g id="edge4" class="edge">
+<title>A5&#45;&gt;A6</title>
+<path fill="none" stroke="#000000" stroke-dasharray="5,2" d="M227,-607.8313C227,-595.0442 227,-581.2707 227,-568.0248"/>
+<polygon fill="#000000" stroke="#000000" points="227,-558.0234 231.5001,-568.0234 227,-563.0234 227.0001,-568.0234 227.0001,-568.0234 227.0001,-568.0234 227,-563.0234 222.5001,-568.0235 227,-558.0234 227,-558.0234"/>
+<text text-anchor="middle" x="218.5476" y="-586.7051" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">uses</text>
+</g>
+<!-- A6&#45;&gt;A3 -->
+<g id="edge5" class="edge">
+<title>A6&#45;&gt;A3</title>
+<path fill="none" stroke="#000000" d="M198.8975,-445.7949C192.3634,-432.7268 185.3528,-418.7057 178.6417,-405.2834"/>
+<polygon fill="#000000" stroke="#000000" points="174.0529,-396.1057 182.55,-403.0375 176.289,-400.5779 178.5251,-405.05 178.5251,-405.05 178.5251,-405.05 176.289,-400.5779 174.5001,-407.0625 174.0529,-396.1057 174.0529,-396.1057"/>
+</g>
+<!-- A7&#45;&gt;A3 -->
+<g id="edge7" class="edge">
+<title>A7&#45;&gt;A3</title>
+<path fill="none" stroke="#000000" stroke-dasharray="5,2" d="M102.735,-228.0253C109.5347,-241.763 117.1224,-258.3431 124.0627,-274.4849"/>
+<polygon fill="#000000" stroke="#000000" points="128.0634,-283.9135 120.0148,-276.4657 126.1104,-279.3107 124.1573,-274.7079 124.1573,-274.7079 124.1573,-274.7079 126.1104,-279.3107 128.2998,-272.9502 128.0634,-283.9135 128.0634,-283.9135"/>
+<text text-anchor="middle" x="118.307" y="-237.5757" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">uses</text>
+</g>
+<!-- A8 -->
+<g id="node9" class="node">
+<title>A8</title>
+<polygon fill="none" stroke="#000000" points="80,-64 80,-108 213,-108 213,-64 80,-64"/>
+<text text-anchor="start" x="117.04" y="-89" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;&lt;abstract&gt;&gt;</text>
+<text text-anchor="start" x="98.9935" y="-77" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ABoardImportService</text>
+<polygon fill="none" stroke="#000000" points="80,-32 80,-64 213,-64 213,-32 80,-32"/>
+<text text-anchor="start" x="92.036" y="-45" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">#needValidateData:false</text>
+<polygon fill="none" stroke="#000000" points="80,0 80,-32 213,-32 213,0 80,0"/>
+<text text-anchor="start" x="89.677" y="-13" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">+needValidateData():bool</text>
+</g>
+<!-- A7&#45;&gt;A8 -->
+<g id="edge8" class="edge">
+<title>A7&#45;&gt;A8</title>
+<path fill="none" stroke="#000000" stroke-dasharray="5,2" d="M97.2957,-163.778C103.3956,-150.029 110.7371,-133.4813 117.8485,-117.4527"/>
+<polygon fill="none" stroke="#000000" points="121.1416,-118.6605 121.9978,-108.1003 114.743,-115.8216 121.1416,-118.6605"/>
+<text text-anchor="middle" x="96.9205" y="-140.7815" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">implements</text>
+</g>
+<!-- A9&#45;&gt;A3 -->
+<g id="edge10" class="edge">
+<title>A9&#45;&gt;A3</title>
+<path fill="none" stroke="#000000" stroke-dasharray="5,2" d="M198.9952,-234.3677C194.0646,-246.7117 188.0483,-260.7568 181.8434,-274.4849"/>
+<polygon fill="#000000" stroke="#000000" points="177.5286,-283.9135 177.598,-272.9478 179.6093,-279.367 181.6899,-274.8204 181.6899,-274.8204 181.6899,-274.8204 179.6093,-279.367 185.7818,-276.693 177.5286,-283.9135 177.5286,-283.9135"/>
+<text text-anchor="middle" x="200.0654" y="-251.3391" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">uses</text>
+</g>
+<!-- A9&#45;&gt;A8 -->
+<g id="edge13" class="edge">
+<title>A9&#45;&gt;A8</title>
+<path fill="none" stroke="#000000" stroke-dasharray="5,2" d="M192.8492,-157.9466C187.2535,-145.5313 180.8796,-131.389 174.6742,-117.6209"/>
+<polygon fill="none" stroke="#000000" points="177.7167,-115.8534 170.4168,-108.1747 171.3349,-118.7297 177.7167,-115.8534"/>
+<text text-anchor="middle" x="177.6953" y="-141.8944" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">implements</text>
+</g>
+<!-- A11 -->
+<g id="node12" class="node">
+<title>A11</title>
+<polygon fill="#fff8dc" stroke="#000000" points="403.024,-224 290.976,-224 290.976,-168 409.024,-168 409.024,-218 403.024,-224"/>
+<polyline fill="none" stroke="#000000" points="403.024,-224 403.024,-218 "/>
+<polyline fill="none" stroke="#000000" points="409.024,-218 403.024,-218 "/>
+<text text-anchor="middle" x="350" y="-211" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">To create an import</text>
+<text text-anchor="middle" x="350" y="-199" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">to another system,</text>
+<text text-anchor="middle" x="350" y="-187" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">create another class</text>
+<text text-anchor="middle" x="350" y="-175" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">similar to this.</text>
+</g>
+<!-- A9&#45;&gt;A11 -->
+<g id="edge12" class="edge">
+<title>A9&#45;&gt;A11</title>
+<path fill="none" stroke="#000000" stroke-dasharray="5,2" d="M272.6172,-196C278.6627,-196 284.7083,-196 290.7538,-196"/>
+</g>
+</g>
+</svg>

docs/resources/BoardImport.yuml

@@ -0,0 +1,24 @@
+// Created using [yUML](https://github.com/jaime-olivares/vscode-yuml)
+
+// {type:class}
+// {direction:topDown}
+// {generate:true}
+
+[note: Classes used on board import. Methods just to illustrate. {bg:cornsilk}]
+
+[ApiController]<-[BoardImportApiController|+import();+getAllowedSystems();+getConfigSchema()]
+[BoardImportApiController]uses-.->[BoardImportService|+import();+bootstrap();+validateSystem();#validateConfig();#validateData();]
+
+[Command]<-[BoardImport|+boardImportCommandService|#configure();#execute(input,output)]
+[BoardImport]uses-.->[BoardImportCommandService|+bootstrap();+import();+validateSystem();#validateConfig();#validateData()]
+[BoardImportCommandService]->[BoardImportService]
+
+[BoardImportService]uses-.->[TrelloApiService|+name:string]
+[TrelloApiService]uses-.->[BoardImportService]
+[TrelloApiService]implements-.-^[<<abstract>> ABoardImportService|#needValidateData:false|+needValidateData():bool]
+
+[BoardImportService]uses-.->[TrelloJsonService|+name:string;#needValidateData:true]
+[TrelloJsonService]uses-.->[BoardImportService]
+[BoardImportService]-[note: validateSystem is public because is used on Api. {bg:cornsilk}]
+[TrelloJsonService]-[note: To create an import to another system, create another class similar to this. {bg:cornsilk}]
+[TrelloJsonService]implements-.-^[<<abstract>> ABoardImportService]

img/flash-black.svg

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"><g><g><polygon points="426.667,213.333 288.36,213.333 333.706,0 148.817,0 85.333,298.667 227.556,298.667 227.556,512 		" /></g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g></svg>

img/plus.svg

@@ -0,0 +1 @@
+<svg fill="#26e07f" xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 24 24" width="24px" height="24px"><path fill-rule="evenodd" d="M 11 2 L 11 11 L 2 11 L 2 13 L 11 13 L 11 22 L 13 22 L 13 13 L 22 13 L 22 11 L 13 11 L 13 2 Z"/></svg>

l10n/el.js

@@ -2,135 +2,145 @@ OC.L10N.register(
     "deck",
     {
     "You have created a new board {board}" : "Δημιουργήσατε νέο πίνακα {board}",
-    "{user} has created a new board {board}" : "Ο {user} δημιούργησε νέο πίνακα {board}",
+    "{user} has created a new board {board}" : "Ο/η {user} δημιούργησε νέο πίνακα {board}",
     "You have deleted the board {board}" : "Έχετε διαγράψει τον πίνακα {board}",
-    "{user} has deleted the board {board}" : "Ο {user} διέγραψε τον πίνακα {board}",
+    "{user} has deleted the board {board}" : "Ο/η {user} διέγραψε τον πίνακα {board}",
     "You have restored the board {board}" : "Εχετε επαναφέρει τον πίνακα {board}",
-    "{user} has restored the board {board}" : "Ο {user} επανέφερε τον πίνακα {board}",
+    "{user} has restored the board {board}" : "Ο/η {user} επανέφερε τον πίνακα {board}",
     "You have shared the board {board} with {acl}" : "Εχετε διαμοιράσει τον πίνακα {board} με {acl}",
-    "{user} has shared the board {board} with {acl}" : "Ο {user} διαμοίρασε τον πίνακα {board} με {acl}",
+    "{user} has shared the board {board} with {acl}" : "Ο/η {user} διαμοίρασε τον πίνακα {board} με {acl}",
     "You have removed {acl} from the board {board}" : "Αφαιρέθηκε η {acl} από τον πίνακα {board}",
-    "{user} has removed {acl} from the board {board}" : "Ο {user} αφαίρεσε την {acl} από τον πίνακα {board}",
+    "{user} has removed {acl} from the board {board}" : "Ο/η {user} αφαίρεσε την {acl} από τον πίνακα {board}",
     "You have renamed the board {before} to {board}" : "Μετονομάσατε τον πίνακα {before} σε {board}",
-    "{user} has renamed the board {before} to {board}" : "Ο {user} μετονόμασε τον πίνακα {before} σε {board}",
+    "{user} has renamed the board {before} to {board}" : "Ο/η {user} μετονόμασε τον πίνακα {before} σε {board}",
     "You have archived the board {board}" : "Αρχειοθετήσατε τον πίνακα {board}",
-    "{user} has archived the board {before}" : "Ο {user} αρχειοθέτησε τον πίνακα {before}",
-    "You have unarchived the board {board}" : "Επαναφέρατε τον πίνακα {board} από αρχείο",
-    "{user} has unarchived the board {before}" : "Ο {user} επανέφερε τον πίνακα {before} από αρχείο",
+    "{user} has archived the board {before}" : "Ο/η {user} αρχειοθέτησε τον πίνακα {before}",
+    "You have unarchived the board {board}" : "Επαναφέρατε τον πίνακα {board} από το αρχείο",
+    "{user} has unarchived the board {before}" : "Ο/η {user} επανέφερε τον πίνακα {before} από αρχείο",
     "You have created a new list {stack} on board {board}" : "Έχετε δημιουργήσει μια νέα λίστα {stack} στον πίνακα {board}",
-    "{user} has created a new list {stack} on board {board}" : "Ο {user} δημιούργησε μια νέα λίστα {stack} στον πίνακα {board}",
+    "{user} has created a new list {stack} on board {board}" : "Ο/η {user} δημιούργησε μια νέα λίστα {stack} στον πίνακα {board}",
     "You have renamed list {before} to {stack} on board {board}" : "Μετονομάσατε την λίστα {before} σε {stack} στον πίνακα {board}",
-    "{user} has renamed list {before} to {stack} on board {board}" : "Ο {user} μετονόμασε την λίστα {before} σε {stack} στον πίνακα {board}",
+    "{user} has renamed list {before} to {stack} on board {board}" : "Ο/η {user} μετονόμασε την λίστα {before} σε {stack} στον πίνακα {board}",
     "You have deleted list {stack} on board {board}" : "Διαγράψατε την λίστα {stack} στον πίνακα {board}",
-    "{user} has deleted list {stack} on board {board}" : "Ο {user} διέγραψε την λίστα {stack} στον πίνακα {board}",
+    "{user} has deleted list {stack} on board {board}" : "Ο/η {user} διέγραψε την λίστα {stack} στον πίνακα {board}",
     "You have created card {card} in list {stack} on board {board}" : "Δημιουργήσατε την καρτέλα {card} στην λίστα {stack} του πίνακα {board}",
-    "{user} has created card {card} in list {stack} on board {board}" : "Ο {user} δημιούργησε την καρτέλα {card} στην λίστα {stack} του πίνακα {board}",
+    "{user} has created card {card} in list {stack} on board {board}" : "Ο/η {user} δημιούργησε την καρτέλα {card} στην λίστα {stack} του πίνακα {board}",
     "You have deleted card {card} in list {stack} on board {board}" : "Διαγράψατε την καρτέλα {card} στην λίστα {stack} του πίνακα {board}",
-    "{user} has deleted card {card} in list {stack} on board {board}" : "Ο {user} διέγραψε την καρτέλα {card} στην λίστα {stack} του πίνακα {board}",
+    "{user} has deleted card {card} in list {stack} on board {board}" : "Ο/η {user} διέγραψε την καρτέλα {card} στην λίστα {stack} του πίνακα {board}",
     "You have renamed the card {before} to {card}" : "Μετονομάσατε την καρτέλα {before} σε {card}",
-    "{user} has renamed the card {before} to {card}" : "Ο {user} μετονόμασε την καρτέλα {before} σε {card}",
+    "{user} has renamed the card {before} to {card}" : "Ο/η {user} μετονόμασε την καρτέλα {before} σε {card}",
     "You have added a description to card {card} in list {stack} on board {board}" : "Προσθέσατε μια περιγραφή στην καρτέλα {card} της λίστας {stack} του πίνακα {board}",
-    "{user} has added a description to card {card} in list {stack} on board {board}" : "Ο {user} πρόσθεσε μια περιγραφή στην καρτέλα {card} της λίστας {stack} του πίνακα {board} ",
+    "{user} has added a description to card {card} in list {stack} on board {board}" : "Ο/η {user} πρόσθεσε μια περιγραφή στην καρτέλα {card} της λίστας {stack} του πίνακα {board} ",
     "You have updated the description of card {card} in list {stack} on board {board}" : "Ενημερώσατε την περιγραφή στην καρτέλα {card} της λίστας {stack} του πίνακα {board}",
-    "{user} has updated the description of the card {card} in list {stack} on board {board}" : "Ο {user} ενημέρωσε την περιγραφή της καρτέλας {card} στη λίστα {stack} του πίνακα {board}",
+    "{user} has updated the description of the card {card} in list {stack} on board {board}" : "Ο/η {user} ενημέρωσε την περιγραφή της καρτέλας {card} στη λίστα {stack} του πίνακα {board}",
     "You have archived card {card} in list {stack} on board {board}" : "Αρχειοθετήσατε την κάρτα {card} στην λίστα {stack} του πίνακα {board} ",
-    "{user} has archived card {card} in list {stack} on board {board}" : "Ο {user} αρχειοθέτησε την κάρτα {card} στην λίστα {stack} του πίνακα {board} ",
+    "{user} has archived card {card} in list {stack} on board {board}" : "Ο/η {user} αρχειοθέτησε την κάρτα {card} στην λίστα {stack} του πίνακα {board} ",
     "You have unarchived card {card} in list {stack} on board {board}" : "Επαναφέρατε από το αρχείο την καρτέλα {card} της λίστας {stack} του πίνακα {board}",
-    "{user} has unarchived card {card} in list {stack} on board {board}" : "Ο {user} επανέφερε από το αρχείο την κάρτα {card} της λίστας {stack} του πίνακα {board}",
+    "{user} has unarchived card {card} in list {stack} on board {board}" : "Ο/η {user} επανέφερε από το αρχείο την κάρτα {card} της λίστας {stack} του πίνακα {board}",
     "You have removed the due date of card {card}" : "Καταργήσατε την ημερομηνία λήξης της καρτέλας {card}",
-    "{user} has removed the due date of card {card}" : "Ο {user} κατήργησε την ημερομηνία λήξης της καρτέλας {card}",
+    "{user} has removed the due date of card {card}" : "Ο/η {user} κατάργησε την ημερομηνία λήξης της καρτέλας {card}",
     "You have set the due date of card {card} to {after}" : "Ορίσατε την ημερομηνία λήξης της καρτέλας {card} σε {after}",
-    "{user} has set the due date of card {card} to {after}" : "Ο {user} όρισε την ημερομηνία λήξης της καρτέλας {card} σε {after} ",
+    "{user} has set the due date of card {card} to {after}" : "Ο/η {user} όρισε την ημερομηνία λήξης της καρτέλας {card} σε {after} ",
     "You have updated the due date of card {card} to {after}" : "Ενημερώσατε την ημερομηνία λήξης της καρτέλας {card} σε {after}",
-    "{user} has updated the due date of card {card} to {after}" : "Ο {user} ενημέρωσε την ημερομηνία λήξης της καρτέλας {card} σε {after}",
-    "You have added the tag {label} to card {card} in list {stack} on board {board}" : "Προσθέσατε ετικέτα στην καρτέλα {card} της λίστας {stack} του πίνακα {board}",
-    "{user} has added the tag {label} to card {card} in list {stack} on board {board}" : "Ο {user} πρόσθεσε ετικέτα στην καρτέλα {card} της λίστας {stack} του πίνακα {board}",
-    "You have removed the tag {label} from card {card} in list {stack} on board {board}" : "Αφαιρέσατε την ετικέτα από την καρτέλα {card} της λίστας {stack} του πίνακα {board}",
-    "{user} has removed the tag {label} from card {card} in list {stack} on board {board}" : "Ο {user} αφαίρεσε την ετικέτα της καρτέλα {card} της λίστας {stack} του πίνακα {board} ",
+    "{user} has updated the due date of card {card} to {after}" : "Ο/η {user} ενημέρωσε την ημερομηνία λήξης της καρτέλας {card} σε {after}",
+    "You have added the tag {label} to card {card} in list {stack} on board {board}" : "Προσθέσατε ετικέτα {label}  στην καρτέλα {card} της λίστας {stack} του πίνακα {board}",
+    "{user} has added the tag {label} to card {card} in list {stack} on board {board}" : "Ο/η {user} πρόσθεσε ετικέτα {label} στην καρτέλα {card} της λίστας {stack} του πίνακα {board}",
+    "You have removed the tag {label} from card {card} in list {stack} on board {board}" : "Αφαιρέσατε την ετικέτα {label} από την καρτέλα {card} της λίστας {stack} του πίνακα {board}",
+    "{user} has removed the tag {label} from card {card} in list {stack} on board {board}" : "Ο/η {user} αφαίρεσε την ετικέτα {label}  της καρτέλας {card} της λίστας {stack} του πίνακα {board} ",
     "You have assigned {assigneduser} to card {card} on board {board}" : "Έχετε ορίσει τον {assigneduser} στην καρτέλα {card} στον πίνακα {board}",
-    "{user} has assigned {assigneduser} to card {card} on board {board}" : "Ο {user} έχει ορισθεί {assigneduser} στην καρτέλα {card} του πίνακα {board}",
-    "You have unassigned {assigneduser} from card {card} on board {board}" : "Έχετε αφαιρεθεί {assigneduser} από την καρτέλα {card}  του πίνακα {board}",
-    "{user} has unassigned {assigneduser} from card {card} on board {board}" : "Ο {user} έχει αφαιρεθεί {assigneduser} από την καρτέλα {card} του  πίνακα {board}",
+    "{user} has assigned {assigneduser} to card {card} on board {board}" : "Ο/η {user} έχει ορισθεί {assigneduser} στην καρτέλα {card} του πίνακα {board}",
+    "You have unassigned {assigneduser} from card {card} on board {board}" : "Έχετε αφαιρέσει {assigneduser} από την καρτέλα {card}  του πίνακα {board}",
+    "{user} has unassigned {assigneduser} from card {card} on board {board}" : "Ο/η {user} έχει αφαιρεθεί {assigneduser} από την καρτέλα {card} του  πίνακα {board}",
     "You have moved the card {card} from list {stackBefore} to {stack}" : "Μετακινήσατε την καρτέλα {card} από την λίστα {stackBefore} στη {stack}",
-    "{user} has moved the card {card} from list {stackBefore} to {stack}" : "Ο {user} μετακίνησε την καρτέλα {card} από την λίστα {stackBefore} στην {stack}",
+    "{user} has moved the card {card} from list {stackBefore} to {stack}" : "Ο/η {user} μετακίνησε την καρτέλα {card} από την λίστα {stackBefore} στην {stack}",
     "You have added the attachment {attachment} to card {card}" : "Προσθέσατε το συνημμένο {attachment} στην καρτέλα {card}",
-    "{user} has added the attachment {attachment} to card {card}" : "Ο {user} πρόσθεσε το συνημμένο {attachment} στην καρτέλα {card}",
+    "{user} has added the attachment {attachment} to card {card}" : "Ο/η {user} πρόσθεσε το συνημμένο {attachment} στην καρτέλα {card}",
     "You have updated the attachment {attachment} on card {card}" : "Ενημερώσατε το συνημμένο {attachment} της καρτέλας {card}",
-    "{user} has updated the attachment {attachment} on card {card}" : "Ο {user} ενημέρωσε το συνημμένο {attachment} της καρτέλας {card}",
+    "{user} has updated the attachment {attachment} on card {card}" : "Ο/η {user} ενημέρωσε το συνημμένο {attachment} της καρτέλας {card}",
     "You have deleted the attachment {attachment} from card {card}" : "Διαγράψατε το συνημμένο {attachment} της καρτέλας {card}",
-    "{user} has deleted the attachment {attachment} from card {card}" : "Ο {user} διέγραψε το συνημμένο {attachment} της καρτέλας {card}",
+    "{user} has deleted the attachment {attachment} from card {card}" : "Ο/η {user} διέγραψε το συνημμένο {attachment} της καρτέλας {card}",
     "You have restored the attachment {attachment} to card {card}" : "Επαναφέρατε το συνημμένο {attachment} στην καρτέλα {card}",
-    "{user} has restored the attachment {attachment} to card {card}" : "Ο {user} επανέφερε το συνημμένο {attachment} στην καρτέλα {card}",
+    "{user} has restored the attachment {attachment} to card {card}" : "Ο/η {user} επανέφερε το συνημμένο {attachment} στην καρτέλα {card}",
     "You have commented on card {card}" : "Σχολιάσατε την καρτέλα {card}",
-    "{user} has commented on card {card}" : "Ο {user} σχολίασε την καρτέλα {card}",
+    "{user} has commented on card {card}" : "Ο/η {user} σχολίασε την καρτέλα {card}",
     "A <strong>card description</strong> inside the Deck app has been changed" : "Η <strong>περιγραφή καρτέλας </strong>στην εφαρμογή Deck άλλαξε",
     "Deck" : "Deck",
     "Changes in the <strong>Deck app</strong>" : "Αλλαγές στην <strong>εφαρμογή Deck</strong>",
     "A <strong>comment</strong> was created on a card" : "Ένα <strong>σχόλιο</strong> δημιουργήθηκε σε μια καρτέλα",
-    "Upcoming cards" : "Επερχόμενες κάρτες",
+    "Upcoming cards" : "Επερχόμενες καρτέλες",
     "Personal" : "Προσωπικά",
     "The card \"%s\" on \"%s\" has been assigned to you by %s." : "Η καρτέλα \"%s\" του \"%s\" ανατέθηκε σε εσάς από τον %s.",
-    "The card \"%s\" on \"%s\" has reached its due date." : "Η κάρτα \"1%s\" στο \"1%s\" έχει λήξει.",
-    "%s has mentioned you in a comment on \"%s\"." : "%s σας ανέφερε σε σχόλιο στο \"%s\".",
-    "The board \"%s\" has been shared with you by %s." : "Ο πίνακας \"%s\" είναι σε κοινή χρήση μαζί σας %s.",
+    "{user} has assigned the card {deck-card} on {deck-board} to you." : "Ο/Η {user} έχει αναθέσει την καρτέλα {deck-card} του πίνακα {deck-board} σε εσάς.",
+    "The card \"%s\" on \"%s\" has reached its due date." : "Η καρτέλα \"%s\" στο \"%s\" έχει λήξει.",
+    "The card {deck-card} on {deck-board} has reached its due date." : "Η καρτέλα {deck-card} στο {deck-board} έχει λήξει.",
+    "%s has mentioned you in a comment on \"%s\"." : "Ο/η%s σας ανέφερε σε σχόλιο στο \"%s\".",
+    "{user} has mentioned you in a comment on {deck-card}." : "Ο/Η {user} σας ανέφερε σε ένα σχόλιο στο {deck-card}.",
+    "The board \"%s\" has been shared with you by %s." : "Ο πίνακας \"%s\" είναι σε κοινή χρήση μαζί σας από %s.",
+    "{user} has shared {deck-board} with you." : "Ο/Η διαμοιράστηκε μαζί σας το {deck-board}",
+    "Card comments" : "Σχόλια καρτέλας",
+    "%s on %s" : "%s στο %s",
     "No data was provided to create an attachment." : "Δεν δόθηκαν στοιχεία για δημιουργία συνημμένου.",
     "Finished" : "Ολοκληρώθηκε",
     "To review" : "Προς επισκόπηση",
     "Action needed" : "Απαιτείται ενέργεια",
     "Later" : "Αργότερα",
     "copy" : "Αντιγραφή",
-    "To do" : "Να κάνω",
+    "To do" : "Προς Ενέργεια",
     "Doing" : "Σε εξέλιξη",
     "Done" : "Ολοκληρώθηκε",
     "Example Task 3" : "Παράδειγμα Εργασίας 3",
     "Example Task 2" : "Παράδειγμα Εργασίας 2",
     "Example Task 1" : "Παράδειγμα Εργασίας 1",
     "The file was uploaded" : "Το αρχείο μεταφορτώθηκε",
-    "The uploaded file exceeds the upload_max_filesize directive in php.ini" : "Το μεταφορτωμένο αρχείο υπερβαίνει την οδηγία upload_max_filesize στο php.ini",
-    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Το μεταφορτωμένο αρχείο υπερβαίνει την οδηγία MAX_FILE_SIZE που καθορίστηκε στην φόρμα HTML.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini" : "Το αρχείο που εστάλη υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"upload_max_filesize\" του php.ini",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Το ανεβασμένο αρχείο υπερβαίνει το MAX_FILE_SIZE που ορίζεται στην  HTML φόρμα",
     "The file was only partially uploaded" : "Το αρχείο μεταφορτώθηκε εν μέρει",
     "No file was uploaded" : "Δεν μεταφορτώθηκε κάποιο αρχείο",
     "Missing a temporary folder" : "Λείπει κάποιος προσωρινός φάκελος",
     "Could not write file to disk" : "Αδυναμία εγγραφής αρχείου στον δίσκο",
     "A PHP extension stopped the file upload" : "Ένα πρόσθετο PHP διέκοψε την μεταφόρτωση του αρχείου",
     "No file uploaded or file size exceeds maximum of %s" : "Δεν μεταφορτώθηκε αρχείο ή το μέγεθος αρχείου υπερβαίνει το μέγιστο %s",
-    "Card not found" : "Η κάρτα δεν βρέθηκε",
-    "Path is already shared with this card" : "Η διαδρομή κοινοποιείται ήδη σε αυτήν την κάρτα",
+    "This comment has more than %s characters.\nAdded as an attachment to the card with name %s.\nAccessible on URL: %s." : "Αυτό το σχόλιο έχει περισσότερους από %s χαρακτήρες.\nΠροστέθηκε ως συνημμένο στην καρτέλα με όνομα %s .\nΠροσβάσιμο στη διεύθυνση URL: %s.",
+    "Card not found" : "Η καρτέλα δεν βρέθηκε",
+    "Path is already shared with this card" : "Η διαδρομή κοινοποιείται ήδη σε αυτήν την καρτέλα",
     "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 είναι ένα εργαλείο οργάνωσης τύπου kanban με στόχο τον προσωπικό προγραμματισμό και την  οργάνωση έργων για ομάδες που έχουν ενσωματωθεί στο Nextcloud.\n\n\n- 📥 Προσθέστε τις εργασίες σας στις καρτέλες και βάλτε τες στη σειρά\n- 📄 Γράψτε τις πρόσθετες σημειώσεις\n- 🔖 Αντιστοιχίστε τις ετικέτες για ακόμη καλύτερη οργάνωση\n- 👥 Μοιραστείτε με την ομάδα, φίλους ή την οικογένειά σας\n- 📎 Επισυνάψτε αρχεία και ενσωματώστε τα στην περιγραφή\n- 💬 Συζητήστε με την ομάδα σας χρησιμοποιώντας σχόλια\n- ⚡ Παρακολουθήστε τις αλλαγές στη ροή δραστηριοτήτων\n- 🚀 Έχετε τα όλα οργανωμένα",
     "Card details" : "Λεπτομέρειες καρτέλας",
     "Add board" : "Προσθήκη πίνακα",
-    "Select the board to link to a project" : "Επιλέξτε πίνακα και συνδέστε τον σε έργο",
+    "Select the board to link to a project" : "Επιλέξτε πίνακα και συνδέστε τον σε ένα έργο",
     "Search by board title" : "Αναζήτηση με το όνομα πίνακα",
     "Select board" : "Επιλογή πίνακα",
-    "Create a new card" : "Δημιουργία νέας κάρτας",
+    "Create a new card" : "Δημιουργία νέας καρτέλας",
     "Select a board" : "Επιλογή ενός πίνακα",
     "Select a list" : "Επιλέξτε μια λίστα",
-    "Card title" : "Τίτλος κάρτας",
+    "Card title" : "Τίτλος καρτέλας",
     "Cancel" : "Aκύρωση",
-    "Open card" : "Άνοιγμα κάρτας",
+    "Creating the new card …" : "Γίνεται δημιουργία της νέας καρτέλας...",
+    "Card \"{card}\" was added to \"{board}\"" : "Η καρτέλα \"{card}\" προστέθηκε στο \"{board}\"",
+    "Open card" : "Άνοιγμα καρτέλας",
     "Close" : "Κλείσιμο",
-    "Create card" : "Δημιουργία κάρτας",
-    "Select a card" : "Επίλογή μιας καρτέλας",
+    "Create card" : "Δημιουργία καρτέλας",
+    "Select a card" : "Επιλογή μιας καρτέλας",
     "Select the card to link to a project" : "Επιλογή καρτέλας για σύνδεση στο έργο",
     "Link to card" : "Σύνδεσμος σε καρτέλα",
     "File already exists" : "Το αρχείο υπάρχει ήδη",
     "A file with the name {filename} already exists." : "Το αρχείο με όνομα {filename} υπάρχει ήδη.",
     "Do you want to overwrite it?" : "Επιθυμείτε να γίνει αντικατάσταση του?",
     "Overwrite file" : "Αντικατάσταση αρχείου",
-    "Keep existing file" : "Διατήρηση υπάρχων αρχείου",
+    "Keep existing file" : "Διατήρηση υπάρχοντος αρχείου",
     "This board is read only" : "Ο πίνακας είναι μόνο για ανάγνωση",
     "Drop your files to upload" : "Αποθέστε τα αρχεία σας για ανέβασμα",
-    "Add card" : "Προσθήκη κάρτας",
-    "Archived cards" : "Αρχειοθετημένες κάρτες",
+    "Add card" : "Προσθήκη καρτέλας",
+    "Archived cards" : "Αρχειοθετημένες καρτέλες",
     "Add list" : "Προσθήκη λίστας",
-    "List name" : "Λίστα ονομάτων",
+    "List name" : "Όνομα λίστας",
     "Apply filter" : "Εφαρμογή φίλτρου",
     "Filter by tag" : "Φίλτρο ανά ετικέτα",
     "Filter by assigned user" : "Φίλτρο ανά χρήστη",
     "Unassigned" : "Χωρίς ανάθεση",
     "Filter by due date" : "Φίλτρο ανά ημερομηνία λήξης",
-    "Overdue" : "Εκπρόθεσμος",
+    "Overdue" : "Εκπρόθεσμες",
     "Next 24 hours" : "Επόμενες 24 ώρες",
     "Next 7 days" : "Επόμενες 7 ημέρες",
     "Next 30 days" : "Επόμενες 30 ημέρες",
@@ -147,7 +157,7 @@ OC.L10N.register(
     "Sharing" : "Διαμοιρασμός",
     "Tags" : "Ετικέτες",
     "Deleted items" : "Διαγραμμένα αντικείμενα",
-    "Timeline" : "Χρονοδιάγραμμα",
+    "Timeline" : "Χρονολόγιο",
     "Deleted lists" : "Διαγραμμένες λίστες",
     "Undo" : "Αναίρεση",
     "Deleted cards" : "Διαγραμμένες καρτέλες",
@@ -167,7 +177,7 @@ OC.L10N.register(
     "Delete list" : "Διαγραφή λίστας",
     "Archive all cards in this list" : "Αρχειοθέτηση όλων των καρτελών σε αυτή τη λίστα.",
     "Add a new card" : "Προσθήκη νέας καρτέλας",
-    "Card name" : "Όνομα κάρτας",
+    "Card name" : "Όνομα καρτέλας",
     "List deleted" : "Η λίστα διαγράφηκε",
     "Edit" : "Επεξεργασία",
     "Add a new tag" : "Προσθήκη νέας ετικέτας",
@@ -175,14 +185,17 @@ OC.L10N.register(
     "Board name" : "Όνομα πίνακα",
     "Members" : "Μέλη",
     "Upload new files" : "Ανεβάστε νέα αρχεία",
-    "Share from Files" : "Κοινή χρήση από αρχεία",
+    "Share from Files" : "Κοινή χρήση από Αρχεία",
+    "Pending share" : "Κοινή χρήση σε εκκρεμότητα",
     "Add this attachment" : "Προσθήκη αυτού του συνημμένου",
-    "Show in Files" : "Εμφάνιση σε αρχεία",
-    "Delete Attachment" : "Διαγραφή Συνημμένου",
-    "Restore Attachment" : "Επαναφορά Συνημμένου",
+    "Show in Files" : "Εμφάνιση σε Αρχεία",
+    "Download" : "Λήψη",
+    "Remove attachment" : "Αφαίρεση συνημμένου",
+    "Delete Attachment" : "Διαγραφή συνημμένου",
+    "Restore Attachment" : "Επαναφορά συνημμένου",
     "File to share" : "Αρχείο για κοινή χρήση",
     "Invalid path selected" : "Επιλέχθηκε μη έγκυρη διαδρομή",
-    "Open in sidebar view" : "Άνοιγμα σε προβολή πλευρικής γραμμής",
+    "Open in sidebar view" : "Άνοιγμα σε προβολή πλευρικής στήλης",
     "Open in bigger view" : "Άνοιγμα σε μεγαλύτερη προβολή",
     "Attachments" : "Συνημμένα",
     "Comments" : "Σχόλια",
@@ -190,20 +203,24 @@ OC.L10N.register(
     "Created" : "Δημιουργήθηκε",
     "The title cannot be empty." : "Ο τίτλος δεν μπορεί να είναι κενός.",
     "No comments yet. Begin the discussion!" : "Χωρίς σχόλια ακόμη. Ξεκινήστε την συζήτηση!",
+    "Failed to load comments" : "Αποτυχία φόρτωσης σχολίων",
     "Assign a tag to this card…" : "Ορίστε μια ετικέτα σε αυτήν την καρτέλα...",
-    "Assign to users" : "Αναθέστε στους χρήστες",
+    "Assign to users" : "Ανάθεση σε χρήστες",
     "Assign to users/groups/circles" : "Ανάθεση σε χρήστες/ομάδες/κύκλους",
-    "Assign a user to this card…" : "Αναθέστε χρήστη στην καρτέλα...",
+    "Assign a user to this card…" : "Ανάθεση χρήστη στην καρτέλα...",
     "Due date" : "Ημερομηνία λήξης",
     "Set a due date" : "Καθορίστε ημερομηνίας λήξης",
     "Remove due date" : "Αφαίρεση ημερομηνίας λήξης",
-    "Select Date" : "Επέλεξε Ημέρα",
+    "Select Date" : "Επιλέξτε ημερομηνία",
     "Today" : "Σήμερα",
     "Tomorrow" : "Αύριο",
+    "Next week" : "Επόμενη εβδομάδα",
+    "Next month" : "Επόμενος μήνας",
     "Save" : "Αποθήκευση",
     "The comment cannot be empty." : "Το σχόλιο δεν μπορεί να είναι κενό.",
     "The comment cannot be longer than 1000 characters." : "Το σχόλιο δεν μπορεί να έχι περισσότερους από 1000 χαρακτήρες.",
-    "In reply to" : "Ως απάντηση σε",
+    "In reply to" : "Σε απάντηση σε",
+    "Cancel reply" : "Ακύρωση απάντησης",
     "Reply" : "Απάντηση",
     "Update" : "Ενημέρωση",
     "Description" : "Περιγραφή",
@@ -216,21 +233,23 @@ OC.L10N.register(
     "Write a description …" : "Γράψτε μια περιγραφή…",
     "Choose attachment" : "Επιλογή συνημμένου",
     "(group)" : "(ομάδα)",
+    "{count} comments, {unread} unread" : "{count} σχόλια, {unread} μη αναγνωσμένα",
     "Assign to me" : "Ανάθεση σε εμένα",
     "Unassign myself" : "Αποδέσμευσή μου",
-    "Move card" : "Μετακίνηση κάρτας",
-    "Unarchive card" : "Αναίρεση αρχειοθέτησης κάρτας",
-    "Archive card" : "Αρχειοθέτηση κάρτας",
-    "Delete card" : "Διαγραφή κάρτας",
+    "Move card" : "Μετακίνηση καρτέλας",
+    "Unarchive card" : "Αναίρεση αρχειοθέτησης καρτέλας",
+    "Archive card" : "Αρχειοθέτηση καρτέλας",
+    "Delete card" : "Διαγραφή καρτέλας",
     "Move card to another board" : "Μετακίνηση καρτέλας σε άλλο πίνακα",
-    "Card deleted" : "Η κάρτα διαγράφηκε",
+    "List is empty" : "Η λίστα είναι άδεια.",
+    "Card deleted" : "Η καρτέλα διαγράφηκε",
     "seconds ago" : " δευτερόλεπτα πριν ",
     "All boards" : "Όλοι οι πίνακες",
     "Archived boards" : "Αρχειοθέτηση πινάκων ",
     "Shared with you" : "Διαμοιρασμένα μαζί σας",
-    "Use bigger card view" : "Χρησιμοποιήστε μεγαλύτερη προβολή κάρτας",
+    "Use bigger card view" : "Χρησιμοποιήστε μεγαλύτερη προβολή καρτέλας",
     "Show boards in calendar/tasks" : "Εμφάνιση πινάκων στο ημερολόγιο / εργασίες",
-    "Limit deck usage of groups" : "Περιορίστε τη χρήση της εφαρμογής σε ομάδες",
+    "Limit deck usage of groups" : "Περιορίστε τη χρήση της εφαρμογής deck σε ομάδες",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Ο περιορισμός του Deck θα εμποδίσει τους χρήστες που δεν είναι μέρος αυτών των ομάδων να δημιουργούν δικούς τους πίνακες. Οι χρήστες θα εξακολουθήσουν να εργάζονται σε πίνακες που έχουν διαμοιραστεί μαζί τους.",
     "Board details" : "Λεπτομέριες πίνακα",
     "Edit board" : "Επεξεργασία πίνακα",
@@ -240,31 +259,37 @@ OC.L10N.register(
     "Turn on due date reminders" : "Ενεργοποιήστε τις υπενθυμίσεις ημερομηνίας προθεσμίας",
     "Turn off due date reminders" : "Απενεργοποιήστε τις υπενθυμίσεις ημερομηνίας προθεσμίας",
     "Due date reminders" : "Υπενθυμίσεις ημερομηνίας προθεσμίας",
-    "All cards" : "Όλες οι κάρτες",
-    "Assigned cards" : "Ανατεθείς κάρτες",
+    "All cards" : "Όλες οι καρτέλες",
+    "Assigned cards" : "Ανατεθειμένες καρτέλες",
     "No notifications" : "Δεν υπάρχουν ειδοποιήσεις",
     "Delete board" : "Διαγραφή πίνακα",
-    "Board {0} deleted" : "Διαγράφηκε {0} πίνακας",
-    "Only assigned cards" : "Μόνο κάρτες που έχουν ανατεθεί",
+    "Board {0} deleted" : "Διαγράφηκε {0} πίνακας ",
+    "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." : "Είστε βέβαιοι ότι θέλετε να διαγράψετε τον πίνακα {title}; Θα διαγραφούν όλα τα δεδομένα.",
-    "Delete the board?" : "Διαγραφή πίνακα;",
+    "Delete the board?" : "Διαγραφή του πίνακα;",
     "Loading filtered view" : "Φόρτωση εμφάνισης με βάση το φίλτρο",
     "This week" : "Αυτή την εβδομάδα",
     "No due" : "Χωρίς λήξη",
-    "No upcoming cards" : "Δεν υπάρχουν επερχόμενες κάρτες",
-    "upcoming cards" : "Επερχόμενες κάρτες",
+    "Search for {searchQuery} in all boards" : "Αναζήτηση για {searchQuery} σε όλους τους πίνακες",
+    "No results found" : "Δεν βρέθηκαν αποτελέσματα",
+    "No upcoming cards" : "Δεν υπάρχουν επερχόμενες καρτέλες",
+    "upcoming cards" : "επερχόμενες καρτέλες",
     "Link to a board" : "Σύνδεσμος στον πίνακα",
     "Link to a card" : "Σύνδεσμος σε καρτέλα",
-    "Create a card" : "Δημιουργία κάρτας",
+    "Create a card" : "Δημιουργία καρτέλας",
+    "Message from {author} in {conversationName}" : "Μήνυμα από {author} σε {conversationName}",
     "Something went wrong" : "Κάτι πήγε στραβά",
-    "Failed to upload {name}" : "Αποτυχία μεταφόρτωσης {όνομα}",
+    "Failed to upload {name}" : "Αποτυχία μεταφόρτωσης {name}",
     "Maximum file size of {size} exceeded" : "Υπέρβαση επιτρεπόμενου μεγέθους αρχείου {size}",
     "Error creating the share" : "Σφάλμα κατά τη δημιουργία της κοινοποίησης",
-    "Share with a Deck card" : "Μοιραστείτε με μια κάρτα Deck",
-    "Share {file} with a Deck card" : "Μοιραστείτε {αρχείο} με μια κάρτα Deck",
+    "Share with a Deck card" : "Μοιραστείτε με μια καρτέλα Deck",
+    "Share {file} with a Deck card" : "Μοιραστείτε το {file} με μια καρτέλα Deck",
     "Share" : "Μοιραστείτε",
-    "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 είναι ένα εργαλείο οργάνωσης τύπου kanban με στόχο τον προσωπικό προγραμματισμό και την ομαδική  οργάνωση για ομάδες που έχουν ενσωματωθεί στο Nextcloud.\n\n\n- 📥 Προσθέστε τις εργασίες σας στις καρτέλες και βάλτε τες στη σειρά\n- 📄 Γράψτε τις πρόσθετες σημειώσεις\n- 🔖 Αντιστοιχίστε τις ετικέτες για ακόμη καλύτερη οργάνωση\n- 👥 Μοιραστείτε με την ομάδα, φίλους ή την οικογένειά σας\n- 📎 Συνδέστε αρχεία και ενσωματώστε τα στην περιγραφή\n- 💬 Συζητήστε με την ομάδα σας χρησιμοποιώντας σχόλια\n- ⚡ Παρακολουθήστε τις αλλαγές στη ροή δραστηριοτήτων\n- 🚀 Έχετε τα όλα οργανωμένα"
+    "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 είναι ένα εργαλείο οργάνωσης τύπου kanban με στόχο τον προσωπικό προγραμματισμό και την  οργάνωση έργων για ομάδες που έχουν ενσωματωθεί στο Nextcloud.\n\n\n- 📥 Προσθέστε τις εργασίες σας στις καρτέλες και βάλτε τες στη σειρά\n- 📄 Γράψτε τις πρόσθετες σημειώσεις\n- 🔖 Αντιστοιχίστε τις ετικέτες για ακόμη καλύτερη οργάνωση\n- 👥 Μοιραστείτε με την ομάδα, φίλους ή την οικογένειά σας\n- 📎 Συνδέστε αρχεία και ενσωματώστε τα στην περιγραφή\n- 💬 Συζητήστε με την ομάδα σας χρησιμοποιώντας σχόλια\n- ⚡ Παρακολουθήστε τις αλλαγές στη ροή δραστηριοτήτων\n- 🚀 Έχετε τα όλα οργανωμένα",
+    "Creating the new card…" : "Δημιουργία νέας καρτέλας...",
+    "\"{card}\" was added to \"{board}\"" : "\"{card}\" προστέθηκε στο \"{board}\"",
+    "(circle)" : "(κύκλος)"
 },
 "nplurals=2; plural=(n != 1);");

l10n/el.json

@@ -1,134 +1,144 @@
 { "translations": {
     "You have created a new board {board}" : "Δημιουργήσατε νέο πίνακα {board}",
-    "{user} has created a new board {board}" : "Ο {user} δημιούργησε νέο πίνακα {board}",
+    "{user} has created a new board {board}" : "Ο/η {user} δημιούργησε νέο πίνακα {board}",
     "You have deleted the board {board}" : "Έχετε διαγράψει τον πίνακα {board}",
-    "{user} has deleted the board {board}" : "Ο {user} διέγραψε τον πίνακα {board}",
+    "{user} has deleted the board {board}" : "Ο/η {user} διέγραψε τον πίνακα {board}",
     "You have restored the board {board}" : "Εχετε επαναφέρει τον πίνακα {board}",
-    "{user} has restored the board {board}" : "Ο {user} επανέφερε τον πίνακα {board}",
+    "{user} has restored the board {board}" : "Ο/η {user} επανέφερε τον πίνακα {board}",
     "You have shared the board {board} with {acl}" : "Εχετε διαμοιράσει τον πίνακα {board} με {acl}",
-    "{user} has shared the board {board} with {acl}" : "Ο {user} διαμοίρασε τον πίνακα {board} με {acl}",
+    "{user} has shared the board {board} with {acl}" : "Ο/η {user} διαμοίρασε τον πίνακα {board} με {acl}",
     "You have removed {acl} from the board {board}" : "Αφαιρέθηκε η {acl} από τον πίνακα {board}",
-    "{user} has removed {acl} from the board {board}" : "Ο {user} αφαίρεσε την {acl} από τον πίνακα {board}",
+    "{user} has removed {acl} from the board {board}" : "Ο/η {user} αφαίρεσε την {acl} από τον πίνακα {board}",
     "You have renamed the board {before} to {board}" : "Μετονομάσατε τον πίνακα {before} σε {board}",
-    "{user} has renamed the board {before} to {board}" : "Ο {user} μετονόμασε τον πίνακα {before} σε {board}",
+    "{user} has renamed the board {before} to {board}" : "Ο/η {user} μετονόμασε τον πίνακα {before} σε {board}",
     "You have archived the board {board}" : "Αρχειοθετήσατε τον πίνακα {board}",
-    "{user} has archived the board {before}" : "Ο {user} αρχειοθέτησε τον πίνακα {before}",
-    "You have unarchived the board {board}" : "Επαναφέρατε τον πίνακα {board} από αρχείο",
-    "{user} has unarchived the board {before}" : "Ο {user} επανέφερε τον πίνακα {before} από αρχείο",
+    "{user} has archived the board {before}" : "Ο/η {user} αρχειοθέτησε τον πίνακα {before}",
+    "You have unarchived the board {board}" : "Επαναφέρατε τον πίνακα {board} από το αρχείο",
+    "{user} has unarchived the board {before}" : "Ο/η {user} επανέφερε τον πίνακα {before} από αρχείο",
     "You have created a new list {stack} on board {board}" : "Έχετε δημιουργήσει μια νέα λίστα {stack} στον πίνακα {board}",
-    "{user} has created a new list {stack} on board {board}" : "Ο {user} δημιούργησε μια νέα λίστα {stack} στον πίνακα {board}",
+    "{user} has created a new list {stack} on board {board}" : "Ο/η {user} δημιούργησε μια νέα λίστα {stack} στον πίνακα {board}",
     "You have renamed list {before} to {stack} on board {board}" : "Μετονομάσατε την λίστα {before} σε {stack} στον πίνακα {board}",
-    "{user} has renamed list {before} to {stack} on board {board}" : "Ο {user} μετονόμασε την λίστα {before} σε {stack} στον πίνακα {board}",
+    "{user} has renamed list {before} to {stack} on board {board}" : "Ο/η {user} μετονόμασε την λίστα {before} σε {stack} στον πίνακα {board}",
     "You have deleted list {stack} on board {board}" : "Διαγράψατε την λίστα {stack} στον πίνακα {board}",
-    "{user} has deleted list {stack} on board {board}" : "Ο {user} διέγραψε την λίστα {stack} στον πίνακα {board}",
+    "{user} has deleted list {stack} on board {board}" : "Ο/η {user} διέγραψε την λίστα {stack} στον πίνακα {board}",
     "You have created card {card} in list {stack} on board {board}" : "Δημιουργήσατε την καρτέλα {card} στην λίστα {stack} του πίνακα {board}",
-    "{user} has created card {card} in list {stack} on board {board}" : "Ο {user} δημιούργησε την καρτέλα {card} στην λίστα {stack} του πίνακα {board}",
+    "{user} has created card {card} in list {stack} on board {board}" : "Ο/η {user} δημιούργησε την καρτέλα {card} στην λίστα {stack} του πίνακα {board}",
     "You have deleted card {card} in list {stack} on board {board}" : "Διαγράψατε την καρτέλα {card} στην λίστα {stack} του πίνακα {board}",
-    "{user} has deleted card {card} in list {stack} on board {board}" : "Ο {user} διέγραψε την καρτέλα {card} στην λίστα {stack} του πίνακα {board}",
+    "{user} has deleted card {card} in list {stack} on board {board}" : "Ο/η {user} διέγραψε την καρτέλα {card} στην λίστα {stack} του πίνακα {board}",
     "You have renamed the card {before} to {card}" : "Μετονομάσατε την καρτέλα {before} σε {card}",
-    "{user} has renamed the card {before} to {card}" : "Ο {user} μετονόμασε την καρτέλα {before} σε {card}",
+    "{user} has renamed the card {before} to {card}" : "Ο/η {user} μετονόμασε την καρτέλα {before} σε {card}",
     "You have added a description to card {card} in list {stack} on board {board}" : "Προσθέσατε μια περιγραφή στην καρτέλα {card} της λίστας {stack} του πίνακα {board}",
-    "{user} has added a description to card {card} in list {stack} on board {board}" : "Ο {user} πρόσθεσε μια περιγραφή στην καρτέλα {card} της λίστας {stack} του πίνακα {board} ",
+    "{user} has added a description to card {card} in list {stack} on board {board}" : "Ο/η {user} πρόσθεσε μια περιγραφή στην καρτέλα {card} της λίστας {stack} του πίνακα {board} ",
     "You have updated the description of card {card} in list {stack} on board {board}" : "Ενημερώσατε την περιγραφή στην καρτέλα {card} της λίστας {stack} του πίνακα {board}",
-    "{user} has updated the description of the card {card} in list {stack} on board {board}" : "Ο {user} ενημέρωσε την περιγραφή της καρτέλας {card} στη λίστα {stack} του πίνακα {board}",
+    "{user} has updated the description of the card {card} in list {stack} on board {board}" : "Ο/η {user} ενημέρωσε την περιγραφή της καρτέλας {card} στη λίστα {stack} του πίνακα {board}",
     "You have archived card {card} in list {stack} on board {board}" : "Αρχειοθετήσατε την κάρτα {card} στην λίστα {stack} του πίνακα {board} ",
-    "{user} has archived card {card} in list {stack} on board {board}" : "Ο {user} αρχειοθέτησε την κάρτα {card} στην λίστα {stack} του πίνακα {board} ",
+    "{user} has archived card {card} in list {stack} on board {board}" : "Ο/η {user} αρχειοθέτησε την κάρτα {card} στην λίστα {stack} του πίνακα {board} ",
     "You have unarchived card {card} in list {stack} on board {board}" : "Επαναφέρατε από το αρχείο την καρτέλα {card} της λίστας {stack} του πίνακα {board}",
-    "{user} has unarchived card {card} in list {stack} on board {board}" : "Ο {user} επανέφερε από το αρχείο την κάρτα {card} της λίστας {stack} του πίνακα {board}",
+    "{user} has unarchived card {card} in list {stack} on board {board}" : "Ο/η {user} επανέφερε από το αρχείο την κάρτα {card} της λίστας {stack} του πίνακα {board}",
     "You have removed the due date of card {card}" : "Καταργήσατε την ημερομηνία λήξης της καρτέλας {card}",
-    "{user} has removed the due date of card {card}" : "Ο {user} κατήργησε την ημερομηνία λήξης της καρτέλας {card}",
+    "{user} has removed the due date of card {card}" : "Ο/η {user} κατάργησε την ημερομηνία λήξης της καρτέλας {card}",
     "You have set the due date of card {card} to {after}" : "Ορίσατε την ημερομηνία λήξης της καρτέλας {card} σε {after}",
-    "{user} has set the due date of card {card} to {after}" : "Ο {user} όρισε την ημερομηνία λήξης της καρτέλας {card} σε {after} ",
+    "{user} has set the due date of card {card} to {after}" : "Ο/η {user} όρισε την ημερομηνία λήξης της καρτέλας {card} σε {after} ",
     "You have updated the due date of card {card} to {after}" : "Ενημερώσατε την ημερομηνία λήξης της καρτέλας {card} σε {after}",
-    "{user} has updated the due date of card {card} to {after}" : "Ο {user} ενημέρωσε την ημερομηνία λήξης της καρτέλας {card} σε {after}",
-    "You have added the tag {label} to card {card} in list {stack} on board {board}" : "Προσθέσατε ετικέτα στην καρτέλα {card} της λίστας {stack} του πίνακα {board}",
-    "{user} has added the tag {label} to card {card} in list {stack} on board {board}" : "Ο {user} πρόσθεσε ετικέτα στην καρτέλα {card} της λίστας {stack} του πίνακα {board}",
-    "You have removed the tag {label} from card {card} in list {stack} on board {board}" : "Αφαιρέσατε την ετικέτα από την καρτέλα {card} της λίστας {stack} του πίνακα {board}",
-    "{user} has removed the tag {label} from card {card} in list {stack} on board {board}" : "Ο {user} αφαίρεσε την ετικέτα της καρτέλα {card} της λίστας {stack} του πίνακα {board} ",
+    "{user} has updated the due date of card {card} to {after}" : "Ο/η {user} ενημέρωσε την ημερομηνία λήξης της καρτέλας {card} σε {after}",
+    "You have added the tag {label} to card {card} in list {stack} on board {board}" : "Προσθέσατε ετικέτα {label}  στην καρτέλα {card} της λίστας {stack} του πίνακα {board}",
+    "{user} has added the tag {label} to card {card} in list {stack} on board {board}" : "Ο/η {user} πρόσθεσε ετικέτα {label} στην καρτέλα {card} της λίστας {stack} του πίνακα {board}",
+    "You have removed the tag {label} from card {card} in list {stack} on board {board}" : "Αφαιρέσατε την ετικέτα {label} από την καρτέλα {card} της λίστας {stack} του πίνακα {board}",
+    "{user} has removed the tag {label} from card {card} in list {stack} on board {board}" : "Ο/η {user} αφαίρεσε την ετικέτα {label}  της καρτέλας {card} της λίστας {stack} του πίνακα {board} ",
     "You have assigned {assigneduser} to card {card} on board {board}" : "Έχετε ορίσει τον {assigneduser} στην καρτέλα {card} στον πίνακα {board}",
-    "{user} has assigned {assigneduser} to card {card} on board {board}" : "Ο {user} έχει ορισθεί {assigneduser} στην καρτέλα {card} του πίνακα {board}",
-    "You have unassigned {assigneduser} from card {card} on board {board}" : "Έχετε αφαιρεθεί {assigneduser} από την καρτέλα {card}  του πίνακα {board}",
-    "{user} has unassigned {assigneduser} from card {card} on board {board}" : "Ο {user} έχει αφαιρεθεί {assigneduser} από την καρτέλα {card} του  πίνακα {board}",
+    "{user} has assigned {assigneduser} to card {card} on board {board}" : "Ο/η {user} έχει ορισθεί {assigneduser} στην καρτέλα {card} του πίνακα {board}",
+    "You have unassigned {assigneduser} from card {card} on board {board}" : "Έχετε αφαιρέσει {assigneduser} από την καρτέλα {card}  του πίνακα {board}",
+    "{user} has unassigned {assigneduser} from card {card} on board {board}" : "Ο/η {user} έχει αφαιρεθεί {assigneduser} από την καρτέλα {card} του  πίνακα {board}",
     "You have moved the card {card} from list {stackBefore} to {stack}" : "Μετακινήσατε την καρτέλα {card} από την λίστα {stackBefore} στη {stack}",
-    "{user} has moved the card {card} from list {stackBefore} to {stack}" : "Ο {user} μετακίνησε την καρτέλα {card} από την λίστα {stackBefore} στην {stack}",
+    "{user} has moved the card {card} from list {stackBefore} to {stack}" : "Ο/η {user} μετακίνησε την καρτέλα {card} από την λίστα {stackBefore} στην {stack}",
     "You have added the attachment {attachment} to card {card}" : "Προσθέσατε το συνημμένο {attachment} στην καρτέλα {card}",
-    "{user} has added the attachment {attachment} to card {card}" : "Ο {user} πρόσθεσε το συνημμένο {attachment} στην καρτέλα {card}",
+    "{user} has added the attachment {attachment} to card {card}" : "Ο/η {user} πρόσθεσε το συνημμένο {attachment} στην καρτέλα {card}",
     "You have updated the attachment {attachment} on card {card}" : "Ενημερώσατε το συνημμένο {attachment} της καρτέλας {card}",
-    "{user} has updated the attachment {attachment} on card {card}" : "Ο {user} ενημέρωσε το συνημμένο {attachment} της καρτέλας {card}",
+    "{user} has updated the attachment {attachment} on card {card}" : "Ο/η {user} ενημέρωσε το συνημμένο {attachment} της καρτέλας {card}",
     "You have deleted the attachment {attachment} from card {card}" : "Διαγράψατε το συνημμένο {attachment} της καρτέλας {card}",
-    "{user} has deleted the attachment {attachment} from card {card}" : "Ο {user} διέγραψε το συνημμένο {attachment} της καρτέλας {card}",
+    "{user} has deleted the attachment {attachment} from card {card}" : "Ο/η {user} διέγραψε το συνημμένο {attachment} της καρτέλας {card}",
     "You have restored the attachment {attachment} to card {card}" : "Επαναφέρατε το συνημμένο {attachment} στην καρτέλα {card}",
-    "{user} has restored the attachment {attachment} to card {card}" : "Ο {user} επανέφερε το συνημμένο {attachment} στην καρτέλα {card}",
+    "{user} has restored the attachment {attachment} to card {card}" : "Ο/η {user} επανέφερε το συνημμένο {attachment} στην καρτέλα {card}",
     "You have commented on card {card}" : "Σχολιάσατε την καρτέλα {card}",
-    "{user} has commented on card {card}" : "Ο {user} σχολίασε την καρτέλα {card}",
+    "{user} has commented on card {card}" : "Ο/η {user} σχολίασε την καρτέλα {card}",
     "A <strong>card description</strong> inside the Deck app has been changed" : "Η <strong>περιγραφή καρτέλας </strong>στην εφαρμογή Deck άλλαξε",
     "Deck" : "Deck",
     "Changes in the <strong>Deck app</strong>" : "Αλλαγές στην <strong>εφαρμογή Deck</strong>",
     "A <strong>comment</strong> was created on a card" : "Ένα <strong>σχόλιο</strong> δημιουργήθηκε σε μια καρτέλα",
-    "Upcoming cards" : "Επερχόμενες κάρτες",
+    "Upcoming cards" : "Επερχόμενες καρτέλες",
     "Personal" : "Προσωπικά",
     "The card \"%s\" on \"%s\" has been assigned to you by %s." : "Η καρτέλα \"%s\" του \"%s\" ανατέθηκε σε εσάς από τον %s.",
-    "The card \"%s\" on \"%s\" has reached its due date." : "Η κάρτα \"1%s\" στο \"1%s\" έχει λήξει.",
-    "%s has mentioned you in a comment on \"%s\"." : "%s σας ανέφερε σε σχόλιο στο \"%s\".",
-    "The board \"%s\" has been shared with you by %s." : "Ο πίνακας \"%s\" είναι σε κοινή χρήση μαζί σας %s.",
+    "{user} has assigned the card {deck-card} on {deck-board} to you." : "Ο/Η {user} έχει αναθέσει την καρτέλα {deck-card} του πίνακα {deck-board} σε εσάς.",
+    "The card \"%s\" on \"%s\" has reached its due date." : "Η καρτέλα \"%s\" στο \"%s\" έχει λήξει.",
+    "The card {deck-card} on {deck-board} has reached its due date." : "Η καρτέλα {deck-card} στο {deck-board} έχει λήξει.",
+    "%s has mentioned you in a comment on \"%s\"." : "Ο/η%s σας ανέφερε σε σχόλιο στο \"%s\".",
+    "{user} has mentioned you in a comment on {deck-card}." : "Ο/Η {user} σας ανέφερε σε ένα σχόλιο στο {deck-card}.",
+    "The board \"%s\" has been shared with you by %s." : "Ο πίνακας \"%s\" είναι σε κοινή χρήση μαζί σας από %s.",
+    "{user} has shared {deck-board} with you." : "Ο/Η διαμοιράστηκε μαζί σας το {deck-board}",
+    "Card comments" : "Σχόλια καρτέλας",
+    "%s on %s" : "%s στο %s",
     "No data was provided to create an attachment." : "Δεν δόθηκαν στοιχεία για δημιουργία συνημμένου.",
     "Finished" : "Ολοκληρώθηκε",
     "To review" : "Προς επισκόπηση",
     "Action needed" : "Απαιτείται ενέργεια",
     "Later" : "Αργότερα",
     "copy" : "Αντιγραφή",
-    "To do" : "Να κάνω",
+    "To do" : "Προς Ενέργεια",
     "Doing" : "Σε εξέλιξη",
     "Done" : "Ολοκληρώθηκε",
     "Example Task 3" : "Παράδειγμα Εργασίας 3",
     "Example Task 2" : "Παράδειγμα Εργασίας 2",
     "Example Task 1" : "Παράδειγμα Εργασίας 1",
     "The file was uploaded" : "Το αρχείο μεταφορτώθηκε",
-    "The uploaded file exceeds the upload_max_filesize directive in php.ini" : "Το μεταφορτωμένο αρχείο υπερβαίνει την οδηγία upload_max_filesize στο php.ini",
-    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Το μεταφορτωμένο αρχείο υπερβαίνει την οδηγία MAX_FILE_SIZE που καθορίστηκε στην φόρμα HTML.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini" : "Το αρχείο που εστάλη υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"upload_max_filesize\" του php.ini",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Το ανεβασμένο αρχείο υπερβαίνει το MAX_FILE_SIZE που ορίζεται στην  HTML φόρμα",
     "The file was only partially uploaded" : "Το αρχείο μεταφορτώθηκε εν μέρει",
     "No file was uploaded" : "Δεν μεταφορτώθηκε κάποιο αρχείο",
     "Missing a temporary folder" : "Λείπει κάποιος προσωρινός φάκελος",
     "Could not write file to disk" : "Αδυναμία εγγραφής αρχείου στον δίσκο",
     "A PHP extension stopped the file upload" : "Ένα πρόσθετο PHP διέκοψε την μεταφόρτωση του αρχείου",
     "No file uploaded or file size exceeds maximum of %s" : "Δεν μεταφορτώθηκε αρχείο ή το μέγεθος αρχείου υπερβαίνει το μέγιστο %s",
-    "Card not found" : "Η κάρτα δεν βρέθηκε",
-    "Path is already shared with this card" : "Η διαδρομή κοινοποιείται ήδη σε αυτήν την κάρτα",
+    "This comment has more than %s characters.\nAdded as an attachment to the card with name %s.\nAccessible on URL: %s." : "Αυτό το σχόλιο έχει περισσότερους από %s χαρακτήρες.\nΠροστέθηκε ως συνημμένο στην καρτέλα με όνομα %s .\nΠροσβάσιμο στη διεύθυνση URL: %s.",
+    "Card not found" : "Η καρτέλα δεν βρέθηκε",
+    "Path is already shared with this card" : "Η διαδρομή κοινοποιείται ήδη σε αυτήν την καρτέλα",
     "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 είναι ένα εργαλείο οργάνωσης τύπου kanban με στόχο τον προσωπικό προγραμματισμό και την  οργάνωση έργων για ομάδες που έχουν ενσωματωθεί στο Nextcloud.\n\n\n- 📥 Προσθέστε τις εργασίες σας στις καρτέλες και βάλτε τες στη σειρά\n- 📄 Γράψτε τις πρόσθετες σημειώσεις\n- 🔖 Αντιστοιχίστε τις ετικέτες για ακόμη καλύτερη οργάνωση\n- 👥 Μοιραστείτε με την ομάδα, φίλους ή την οικογένειά σας\n- 📎 Επισυνάψτε αρχεία και ενσωματώστε τα στην περιγραφή\n- 💬 Συζητήστε με την ομάδα σας χρησιμοποιώντας σχόλια\n- ⚡ Παρακολουθήστε τις αλλαγές στη ροή δραστηριοτήτων\n- 🚀 Έχετε τα όλα οργανωμένα",
     "Card details" : "Λεπτομέρειες καρτέλας",
     "Add board" : "Προσθήκη πίνακα",
-    "Select the board to link to a project" : "Επιλέξτε πίνακα και συνδέστε τον σε έργο",
+    "Select the board to link to a project" : "Επιλέξτε πίνακα και συνδέστε τον σε ένα έργο",
     "Search by board title" : "Αναζήτηση με το όνομα πίνακα",
     "Select board" : "Επιλογή πίνακα",
-    "Create a new card" : "Δημιουργία νέας κάρτας",
+    "Create a new card" : "Δημιουργία νέας καρτέλας",
     "Select a board" : "Επιλογή ενός πίνακα",
     "Select a list" : "Επιλέξτε μια λίστα",
-    "Card title" : "Τίτλος κάρτας",
+    "Card title" : "Τίτλος καρτέλας",
     "Cancel" : "Aκύρωση",
-    "Open card" : "Άνοιγμα κάρτας",
+    "Creating the new card …" : "Γίνεται δημιουργία της νέας καρτέλας...",
+    "Card \"{card}\" was added to \"{board}\"" : "Η καρτέλα \"{card}\" προστέθηκε στο \"{board}\"",
+    "Open card" : "Άνοιγμα καρτέλας",
     "Close" : "Κλείσιμο",
-    "Create card" : "Δημιουργία κάρτας",
-    "Select a card" : "Επίλογή μιας καρτέλας",
+    "Create card" : "Δημιουργία καρτέλας",
+    "Select a card" : "Επιλογή μιας καρτέλας",
     "Select the card to link to a project" : "Επιλογή καρτέλας για σύνδεση στο έργο",
     "Link to card" : "Σύνδεσμος σε καρτέλα",
     "File already exists" : "Το αρχείο υπάρχει ήδη",
     "A file with the name {filename} already exists." : "Το αρχείο με όνομα {filename} υπάρχει ήδη.",
     "Do you want to overwrite it?" : "Επιθυμείτε να γίνει αντικατάσταση του?",
     "Overwrite file" : "Αντικατάσταση αρχείου",
-    "Keep existing file" : "Διατήρηση υπάρχων αρχείου",
+    "Keep existing file" : "Διατήρηση υπάρχοντος αρχείου",
     "This board is read only" : "Ο πίνακας είναι μόνο για ανάγνωση",
     "Drop your files to upload" : "Αποθέστε τα αρχεία σας για ανέβασμα",
-    "Add card" : "Προσθήκη κάρτας",
-    "Archived cards" : "Αρχειοθετημένες κάρτες",
+    "Add card" : "Προσθήκη καρτέλας",
+    "Archived cards" : "Αρχειοθετημένες καρτέλες",
     "Add list" : "Προσθήκη λίστας",
-    "List name" : "Λίστα ονομάτων",
+    "List name" : "Όνομα λίστας",
     "Apply filter" : "Εφαρμογή φίλτρου",
     "Filter by tag" : "Φίλτρο ανά ετικέτα",
     "Filter by assigned user" : "Φίλτρο ανά χρήστη",
     "Unassigned" : "Χωρίς ανάθεση",
     "Filter by due date" : "Φίλτρο ανά ημερομηνία λήξης",
-    "Overdue" : "Εκπρόθεσμος",
+    "Overdue" : "Εκπρόθεσμες",
     "Next 24 hours" : "Επόμενες 24 ώρες",
     "Next 7 days" : "Επόμενες 7 ημέρες",
     "Next 30 days" : "Επόμενες 30 ημέρες",
@@ -145,7 +155,7 @@
     "Sharing" : "Διαμοιρασμός",
     "Tags" : "Ετικέτες",
     "Deleted items" : "Διαγραμμένα αντικείμενα",
-    "Timeline" : "Χρονοδιάγραμμα",
+    "Timeline" : "Χρονολόγιο",
     "Deleted lists" : "Διαγραμμένες λίστες",
     "Undo" : "Αναίρεση",
     "Deleted cards" : "Διαγραμμένες καρτέλες",
@@ -165,7 +175,7 @@
     "Delete list" : "Διαγραφή λίστας",
     "Archive all cards in this list" : "Αρχειοθέτηση όλων των καρτελών σε αυτή τη λίστα.",
     "Add a new card" : "Προσθήκη νέας καρτέλας",
-    "Card name" : "Όνομα κάρτας",
+    "Card name" : "Όνομα καρτέλας",
     "List deleted" : "Η λίστα διαγράφηκε",
     "Edit" : "Επεξεργασία",
     "Add a new tag" : "Προσθήκη νέας ετικέτας",
@@ -173,14 +183,17 @@
     "Board name" : "Όνομα πίνακα",
     "Members" : "Μέλη",
     "Upload new files" : "Ανεβάστε νέα αρχεία",
-    "Share from Files" : "Κοινή χρήση από αρχεία",
+    "Share from Files" : "Κοινή χρήση από Αρχεία",
+    "Pending share" : "Κοινή χρήση σε εκκρεμότητα",
     "Add this attachment" : "Προσθήκη αυτού του συνημμένου",
-    "Show in Files" : "Εμφάνιση σε αρχεία",
-    "Delete Attachment" : "Διαγραφή Συνημμένου",
-    "Restore Attachment" : "Επαναφορά Συνημμένου",
+    "Show in Files" : "Εμφάνιση σε Αρχεία",
+    "Download" : "Λήψη",
+    "Remove attachment" : "Αφαίρεση συνημμένου",
+    "Delete Attachment" : "Διαγραφή συνημμένου",
+    "Restore Attachment" : "Επαναφορά συνημμένου",
     "File to share" : "Αρχείο για κοινή χρήση",
     "Invalid path selected" : "Επιλέχθηκε μη έγκυρη διαδρομή",
-    "Open in sidebar view" : "Άνοιγμα σε προβολή πλευρικής γραμμής",
+    "Open in sidebar view" : "Άνοιγμα σε προβολή πλευρικής στήλης",
     "Open in bigger view" : "Άνοιγμα σε μεγαλύτερη προβολή",
     "Attachments" : "Συνημμένα",
     "Comments" : "Σχόλια",
@@ -188,20 +201,24 @@
     "Created" : "Δημιουργήθηκε",
     "The title cannot be empty." : "Ο τίτλος δεν μπορεί να είναι κενός.",
     "No comments yet. Begin the discussion!" : "Χωρίς σχόλια ακόμη. Ξεκινήστε την συζήτηση!",
+    "Failed to load comments" : "Αποτυχία φόρτωσης σχολίων",
     "Assign a tag to this card…" : "Ορίστε μια ετικέτα σε αυτήν την καρτέλα...",
-    "Assign to users" : "Αναθέστε στους χρήστες",
+    "Assign to users" : "Ανάθεση σε χρήστες",
     "Assign to users/groups/circles" : "Ανάθεση σε χρήστες/ομάδες/κύκλους",
-    "Assign a user to this card…" : "Αναθέστε χρήστη στην καρτέλα...",
+    "Assign a user to this card…" : "Ανάθεση χρήστη στην καρτέλα...",
     "Due date" : "Ημερομηνία λήξης",
     "Set a due date" : "Καθορίστε ημερομηνίας λήξης",
     "Remove due date" : "Αφαίρεση ημερομηνίας λήξης",
-    "Select Date" : "Επέλεξε Ημέρα",
+    "Select Date" : "Επιλέξτε ημερομηνία",
     "Today" : "Σήμερα",
     "Tomorrow" : "Αύριο",
+    "Next week" : "Επόμενη εβδομάδα",
+    "Next month" : "Επόμενος μήνας",
     "Save" : "Αποθήκευση",
     "The comment cannot be empty." : "Το σχόλιο δεν μπορεί να είναι κενό.",
     "The comment cannot be longer than 1000 characters." : "Το σχόλιο δεν μπορεί να έχι περισσότερους από 1000 χαρακτήρες.",
-    "In reply to" : "Ως απάντηση σε",
+    "In reply to" : "Σε απάντηση σε",
+    "Cancel reply" : "Ακύρωση απάντησης",
     "Reply" : "Απάντηση",
     "Update" : "Ενημέρωση",
     "Description" : "Περιγραφή",
@@ -214,21 +231,23 @@
     "Write a description …" : "Γράψτε μια περιγραφή…",
     "Choose attachment" : "Επιλογή συνημμένου",
     "(group)" : "(ομάδα)",
+    "{count} comments, {unread} unread" : "{count} σχόλια, {unread} μη αναγνωσμένα",
     "Assign to me" : "Ανάθεση σε εμένα",
     "Unassign myself" : "Αποδέσμευσή μου",
-    "Move card" : "Μετακίνηση κάρτας",
-    "Unarchive card" : "Αναίρεση αρχειοθέτησης κάρτας",
-    "Archive card" : "Αρχειοθέτηση κάρτας",
-    "Delete card" : "Διαγραφή κάρτας",
+    "Move card" : "Μετακίνηση καρτέλας",
+    "Unarchive card" : "Αναίρεση αρχειοθέτησης καρτέλας",
+    "Archive card" : "Αρχειοθέτηση καρτέλας",
+    "Delete card" : "Διαγραφή καρτέλας",
     "Move card to another board" : "Μετακίνηση καρτέλας σε άλλο πίνακα",
-    "Card deleted" : "Η κάρτα διαγράφηκε",
+    "List is empty" : "Η λίστα είναι άδεια.",
+    "Card deleted" : "Η καρτέλα διαγράφηκε",
     "seconds ago" : " δευτερόλεπτα πριν ",
     "All boards" : "Όλοι οι πίνακες",
     "Archived boards" : "Αρχειοθέτηση πινάκων ",
     "Shared with you" : "Διαμοιρασμένα μαζί σας",
-    "Use bigger card view" : "Χρησιμοποιήστε μεγαλύτερη προβολή κάρτας",
+    "Use bigger card view" : "Χρησιμοποιήστε μεγαλύτερη προβολή καρτέλας",
     "Show boards in calendar/tasks" : "Εμφάνιση πινάκων στο ημερολόγιο / εργασίες",
-    "Limit deck usage of groups" : "Περιορίστε τη χρήση της εφαρμογής σε ομάδες",
+    "Limit deck usage of groups" : "Περιορίστε τη χρήση της εφαρμογής deck σε ομάδες",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Ο περιορισμός του Deck θα εμποδίσει τους χρήστες που δεν είναι μέρος αυτών των ομάδων να δημιουργούν δικούς τους πίνακες. Οι χρήστες θα εξακολουθήσουν να εργάζονται σε πίνακες που έχουν διαμοιραστεί μαζί τους.",
     "Board details" : "Λεπτομέριες πίνακα",
     "Edit board" : "Επεξεργασία πίνακα",
@@ -238,31 +257,37 @@
     "Turn on due date reminders" : "Ενεργοποιήστε τις υπενθυμίσεις ημερομηνίας προθεσμίας",
     "Turn off due date reminders" : "Απενεργοποιήστε τις υπενθυμίσεις ημερομηνίας προθεσμίας",
     "Due date reminders" : "Υπενθυμίσεις ημερομηνίας προθεσμίας",
-    "All cards" : "Όλες οι κάρτες",
-    "Assigned cards" : "Ανατεθείς κάρτες",
+    "All cards" : "Όλες οι καρτέλες",
+    "Assigned cards" : "Ανατεθειμένες καρτέλες",
     "No notifications" : "Δεν υπάρχουν ειδοποιήσεις",
     "Delete board" : "Διαγραφή πίνακα",
-    "Board {0} deleted" : "Διαγράφηκε {0} πίνακας",
-    "Only assigned cards" : "Μόνο κάρτες που έχουν ανατεθεί",
+    "Board {0} deleted" : "Διαγράφηκε {0} πίνακας ",
+    "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." : "Είστε βέβαιοι ότι θέλετε να διαγράψετε τον πίνακα {title}; Θα διαγραφούν όλα τα δεδομένα.",
-    "Delete the board?" : "Διαγραφή πίνακα;",
+    "Delete the board?" : "Διαγραφή του πίνακα;",
     "Loading filtered view" : "Φόρτωση εμφάνισης με βάση το φίλτρο",
     "This week" : "Αυτή την εβδομάδα",
     "No due" : "Χωρίς λήξη",
-    "No upcoming cards" : "Δεν υπάρχουν επερχόμενες κάρτες",
-    "upcoming cards" : "Επερχόμενες κάρτες",
+    "Search for {searchQuery} in all boards" : "Αναζήτηση για {searchQuery} σε όλους τους πίνακες",
+    "No results found" : "Δεν βρέθηκαν αποτελέσματα",
+    "No upcoming cards" : "Δεν υπάρχουν επερχόμενες καρτέλες",
+    "upcoming cards" : "επερχόμενες καρτέλες",
     "Link to a board" : "Σύνδεσμος στον πίνακα",
     "Link to a card" : "Σύνδεσμος σε καρτέλα",
-    "Create a card" : "Δημιουργία κάρτας",
+    "Create a card" : "Δημιουργία καρτέλας",
+    "Message from {author} in {conversationName}" : "Μήνυμα από {author} σε {conversationName}",
     "Something went wrong" : "Κάτι πήγε στραβά",
-    "Failed to upload {name}" : "Αποτυχία μεταφόρτωσης {όνομα}",
+    "Failed to upload {name}" : "Αποτυχία μεταφόρτωσης {name}",
     "Maximum file size of {size} exceeded" : "Υπέρβαση επιτρεπόμενου μεγέθους αρχείου {size}",
     "Error creating the share" : "Σφάλμα κατά τη δημιουργία της κοινοποίησης",
-    "Share with a Deck card" : "Μοιραστείτε με μια κάρτα Deck",
-    "Share {file} with a Deck card" : "Μοιραστείτε {αρχείο} με μια κάρτα Deck",
+    "Share with a Deck card" : "Μοιραστείτε με μια καρτέλα Deck",
+    "Share {file} with a Deck card" : "Μοιραστείτε το {file} με μια καρτέλα Deck",
     "Share" : "Μοιραστείτε",
-    "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 είναι ένα εργαλείο οργάνωσης τύπου kanban με στόχο τον προσωπικό προγραμματισμό και την ομαδική  οργάνωση για ομάδες που έχουν ενσωματωθεί στο Nextcloud.\n\n\n- 📥 Προσθέστε τις εργασίες σας στις καρτέλες και βάλτε τες στη σειρά\n- 📄 Γράψτε τις πρόσθετες σημειώσεις\n- 🔖 Αντιστοιχίστε τις ετικέτες για ακόμη καλύτερη οργάνωση\n- 👥 Μοιραστείτε με την ομάδα, φίλους ή την οικογένειά σας\n- 📎 Συνδέστε αρχεία και ενσωματώστε τα στην περιγραφή\n- 💬 Συζητήστε με την ομάδα σας χρησιμοποιώντας σχόλια\n- ⚡ Παρακολουθήστε τις αλλαγές στη ροή δραστηριοτήτων\n- 🚀 Έχετε τα όλα οργανωμένα"
+    "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 είναι ένα εργαλείο οργάνωσης τύπου kanban με στόχο τον προσωπικό προγραμματισμό και την  οργάνωση έργων για ομάδες που έχουν ενσωματωθεί στο Nextcloud.\n\n\n- 📥 Προσθέστε τις εργασίες σας στις καρτέλες και βάλτε τες στη σειρά\n- 📄 Γράψτε τις πρόσθετες σημειώσεις\n- 🔖 Αντιστοιχίστε τις ετικέτες για ακόμη καλύτερη οργάνωση\n- 👥 Μοιραστείτε με την ομάδα, φίλους ή την οικογένειά σας\n- 📎 Συνδέστε αρχεία και ενσωματώστε τα στην περιγραφή\n- 💬 Συζητήστε με την ομάδα σας χρησιμοποιώντας σχόλια\n- ⚡ Παρακολουθήστε τις αλλαγές στη ροή δραστηριοτήτων\n- 🚀 Έχετε τα όλα οργανωμένα",
+    "Creating the new card…" : "Δημιουργία νέας καρτέλας...",
+    "\"{card}\" was added to \"{board}\"" : "\"{card}\" προστέθηκε στο \"{board}\"",
+    "(circle)" : "(κύκλος)"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

l10n/es.js

@@ -239,6 +239,7 @@ OC.L10N.register(
     "Archive card" : "Archivar tarjeta",
     "Delete card" : "Eliminar tarjeta",
     "Move card to another board" : "Mover la tarjeta a otro tablero",
+    "List is empty" : "La lista está vacía",
     "Card deleted" : "Tarjeta borrada",
     "seconds ago" : "hace unos segundos",
     "All boards" : "Todos los tableros",

l10n/es.json

@@ -237,6 +237,7 @@
     "Archive card" : "Archivar tarjeta",
     "Delete card" : "Eliminar tarjeta",
     "Move card to another board" : "Mover la tarjeta a otro tablero",
+    "List is empty" : "La lista está vacía",
     "Card deleted" : "Tarjeta borrada",
     "seconds ago" : "hace unos segundos",
     "All boards" : "Todos los tableros",

lib/Activity/ActivityManager.php

@@ -31,7 +31,6 @@ use OCA\Deck\Db\Acl;
 use OCA\Deck\Db\AclMapper;
 use OCA\Deck\Db\Assignment;
 use OCA\Deck\Db\Attachment;
-use OCA\Deck\Db\AttachmentMapper;
 use OCA\Deck\Db\Board;
 use OCA\Deck\Db\BoardMapper;
 use OCA\Deck\Db\Card;
@@ -50,12 +49,15 @@ use OCP\L10N\IFactory;
 
 class ActivityManager {
 	public const DECK_NOAUTHOR_COMMENT_SYSTEM_ENFORCED = 'DECK_NOAUTHOR_COMMENT_SYSTEM_ENFORCED';
+
+	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 $attachmentMapper;
 	private $aclMapper;
 	private $stackMapper;
 	private $l10nFactory;
@@ -110,7 +112,6 @@ class ActivityManager {
 		BoardMapper $boardMapper,
 		CardMapper $cardMapper,
 		StackMapper $stackMapper,
-		AttachmentMapper $attachmentMapper,
 		AclMapper $aclMapper,
 		IFactory $l10nFactory,
 		$userId
@@ -120,7 +121,6 @@ class ActivityManager {
 		$this->boardMapper = $boardMapper;
 		$this->cardMapper = $cardMapper;
 		$this->stackMapper = $stackMapper;
-		$this->attachmentMapper = $attachmentMapper;
 		$this->aclMapper = $aclMapper;
 		$this->l10nFactory = $l10nFactory;
 		$this->userId = $userId;
@@ -249,19 +249,6 @@ class ActivityManager {
 		try {
 			$event = $this->createEvent($objectType, $entity, $subject, $additionalParams, $author);
 			if ($event !== null) {
-				$json = json_encode($event->getSubjectParameters());
-				if (mb_strlen($json) > 4000) {
-					$params = json_decode(json_encode($event->getSubjectParameters()), true);
-
-					$newContent = $params['after'];
-					unset($params['before'], $params['after'], $params['card']['description']);
-
-					$params['after'] = mb_substr($newContent, 0, 2000);
-					if (mb_strlen($newContent) > 2000) {
-						$params['after'] .= '...';
-					}
-					$event->setSubject($event->getSubject(), $params);
-				}
 				$this->sendToUsers($event);
 			}
 		} catch (\Exception $e) {
@@ -410,12 +397,31 @@ class ActivityManager {
 
 		$subjectParams['author'] = $author === null ? $this->userId : $author;
 
+		$subjectParams = array_merge($subjectParams, $additionalParams);
+		$json = json_encode($subjectParams);
+		if (mb_strlen($json) > self::SUBJECT_PARAMS_MAX_LENGTH) {
+			$params = json_decode(json_encode($subjectParams), true);
+
+			if ($subject === self::SUBJECT_CARD_UPDATE_DESCRIPTION && isset($params['after'])) {
+				$newContent = $params['after'];
+				unset($params['before'], $params['after'], $params['card']['description']);
+
+				$params['after'] = mb_substr($newContent, 0, self::SHORTENED_DESCRIPTION_MAX_LENGTH);
+				if (mb_strlen($newContent) > self::SHORTENED_DESCRIPTION_MAX_LENGTH) {
+					$params['after'] .= '...';
+				}
+				$subjectParams = $params;
+			} else {
+				throw new \Exception('Subject parameters too long');
+			}
+		}
+
 		$event = $this->manager->generateEvent();
 		$event->setApp('deck')
 			->setType($eventType)
 			->setAuthor($subjectParams['author'])
 			->setObject($objectType, (int)$object->getId(), $object->getTitle())
-			->setSubject($subject, array_merge($subjectParams, $additionalParams))
+			->setSubject($subject, $subjectParams)
 			->setTimestamp(time());
 
 		if ($message !== null) {

lib/Activity/DeckProvider.php

@@ -35,6 +35,7 @@ use OCP\IConfig;
 use OCP\IURLGenerator;
 use OCP\IUserManager;
 use OCP\L10N\IFactory;
+use OCA\Deck\Service\CardService;
 
 class DeckProvider implements IProvider {
 
@@ -52,8 +53,10 @@ class DeckProvider implements IProvider {
 	private $l10nFactory;
 	/** @var IConfig */
 	private $config;
+	/** @var CardService */
+	private $cardService;
 
-	public function __construct(IURLGenerator $urlGenerator, ActivityManager $activityManager, IUserManager $userManager, ICommentsManager $commentsManager, IFactory $l10n, IConfig $config, $userId) {
+	public function __construct(IURLGenerator $urlGenerator, ActivityManager $activityManager, IUserManager $userManager, ICommentsManager $commentsManager, IFactory $l10n, IConfig $config, $userId, CardService $cardService) {
 		$this->userId = $userId;
 		$this->urlGenerator = $urlGenerator;
 		$this->activityManager = $activityManager;
@@ -61,6 +64,7 @@ class DeckProvider implements IProvider {
 		$this->userManager = $userManager;
 		$this->l10nFactory = $l10n;
 		$this->config = $config;
+		$this->cardService = $cardService;
 	}
 
 	/**
@@ -131,7 +135,7 @@ class DeckProvider implements IProvider {
 
 			if (array_key_exists('board', $subjectParams)) {
 				$archivedParam = $subjectParams['card']['archived'] ? 'archived/' : '';
-				$card['link'] = $this->deckUrl('/board/' . $subjectParams['board']['id'] . '/' . $archivedParam . 'card/' . $event->getObjectId());
+				$card['link'] = $this->cardService->getRedirectUrlForCard($event->getObjectId());
 			}
 			$params['card'] = $card;
 		}

lib/AppInfo/Application.php

@@ -207,7 +207,7 @@ class Application extends App implements IBootstrap {
 				// Talk integration has its own entrypoint which already includes collections handling
 				return;
 			}
-			Util::addScript('deck', 'collections');
+			Util::addScript('deck', 'deck-collections');
 		});
 	}
 }

lib/Collaboration/Resources/ResourceProvider.php

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

lib/Collaboration/Resources/ResourceProviderCard.php

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

lib/Command/BoardImport.php

@@ -0,0 +1,92 @@
+<?php
+/**
+ * @copyright Copyright (c) 2021 Vitor Mattos <vitor@php.rio>
+ *
+ * @author Vitor Mattos <vitor@php.rio>
+ *
+ * @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\Command;
+
+use OCA\Deck\Service\Importer\BoardImportCommandService;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class BoardImport extends Command {
+	/** @var BoardImportCommandService */
+	private $boardImportCommandService;
+
+	public function __construct(
+		BoardImportCommandService $boardImportCommandService
+	) {
+		$this->boardImportCommandService = $boardImportCommandService;
+		parent::__construct();
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function configure() {
+		$allowedSystems = $this->boardImportCommandService->getAllowedImportSystems();
+		$names = array_column($allowedSystems, 'name');
+		$this
+			->setName('deck:import')
+			->setDescription('Import data')
+			->addOption(
+				'system',
+				null,
+				InputOption::VALUE_REQUIRED,
+				'Source system for import. Available options: ' . implode(', ', $names) . '.',
+				null
+			)
+			->addOption(
+				'config',
+				null,
+				InputOption::VALUE_REQUIRED,
+				'Configuration json file.',
+				'config.json'
+			)
+			->addOption(
+				'data',
+				null,
+				InputOption::VALUE_OPTIONAL,
+				'Data file to import.',
+				'data.json'
+			)
+		;
+	}
+
+	/**
+	 * @param InputInterface $input
+	 * @param OutputInterface $output
+	 *
+	 * @return int
+	 */
+	protected function execute(InputInterface $input, OutputInterface $output): int {
+		$this
+			->boardImportCommandService
+			->setInput($input)
+			->setOutput($output)
+			->setCommand($this)
+			->import();
+		$output->writeln('Done!');
+		return 0;
+	}
+}

lib/Command/TransferOwnership.php

@@ -0,0 +1,105 @@
+<?php
+
+namespace OCA\Deck\Command;
+
+use OCA\Deck\Db\BoardMapper;
+use OCA\Deck\Service\BoardService;
+use OCA\Deck\Service\PermissionService;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
+
+final class TransferOwnership extends Command {
+	protected $boardService;
+	protected $boardMapper;
+	protected $permissionService;
+	protected $questionHelper;
+
+	public function __construct(BoardService $boardService, BoardMapper $boardMapper, PermissionService $permissionService, QuestionHelper $questionHelper) {
+		parent::__construct();
+
+		$this->boardService = $boardService;
+		$this->boardMapper = $boardMapper;
+		$this->permissionService = $permissionService;
+		$this->questionHelper = $questionHelper;
+	}
+
+	protected function configure() {
+		$this
+			->setName('deck:transfer-ownership')
+			->setDescription('Change owner of deck boards')
+			->addArgument(
+				'owner',
+				InputArgument::REQUIRED,
+				'Owner uid'
+			)
+			->addArgument(
+				'newOwner',
+				InputArgument::REQUIRED,
+				'New owner uid'
+			)
+			->addArgument(
+				'boardId',
+				InputArgument::OPTIONAL,
+				'Single board ID'
+			)
+			->addOption(
+				'remap',
+				'r',
+				InputOption::VALUE_NONE,
+				'Reassign card details of the old owner to the new one'
+			)
+		;
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output): int {
+		$owner = $input->getArgument('owner');
+		$newOwner = $input->getArgument('newOwner');
+		$boardId = $input->getArgument('boardId');
+
+		$remapAssignment = $input->getOption('remap');
+
+		$this->boardService->setUserId($owner);
+		$this->permissionService->setUserId($owner);
+
+		try {
+			$board = $boardId ? $this->boardMapper->find($boardId) : null;
+		} catch (\Exception $e) {
+			$output->writeln("Could not find a board for the provided id.");
+			return 1;
+		}
+
+		if ($boardId !== null && $board->getOwner() !== $owner) {
+			$output->writeln("$owner is not the owner of the board $boardId (" . $board->getTitle() . ")");
+			return 1;
+		}
+
+		if ($boardId) {
+			$output->writeln("Transfer board " . $board->getTitle() . " from ". $board->getOwner() ." to $newOwner");
+		} else {
+			$output->writeln("Transfer all boards from $owner to $newOwner");
+		}
+
+		$question = new ConfirmationQuestion('Do you really want to continue? (y/n) ', false);
+		if (!$this->questionHelper->ask($input, $output, $question)) {
+			return 1;
+		}
+
+		if ($boardId) {
+			$this->boardService->transferBoardOwnership($boardId, $newOwner, $remapAssignment);
+			$output->writeln("<info>Board " . $board->getTitle() . " from ". $board->getOwner() ." transferred to $newOwner completed</info>");
+			return 0;
+		}
+
+		foreach ($this->boardService->transferOwnership($owner, $newOwner, $remapAssignment) as $board) {
+			$output->writeln(" - " . $board->getTitle() . " transferred");
+		}
+		$output->writeln("<info>All boards from $owner to $newOwner transferred</info>");
+
+		return 0;
+	}
+}

lib/Controller/BoardController.php

@@ -24,9 +24,12 @@
 namespace OCA\Deck\Controller;
 
 use OCA\Deck\Db\Acl;
+use OCA\Deck\Db\Board;
 use OCA\Deck\Service\BoardService;
 use OCA\Deck\Service\PermissionService;
 use OCP\AppFramework\ApiController;
+use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\DataResponse;
 use OCP\IRequest;
 
 class BoardController extends ApiController {
@@ -150,9 +153,20 @@ class BoardController extends ApiController {
 	/**
 	 * @NoAdminRequired
 	 * @param $boardId
-	 * @return \OCP\Deck\DB\Board
+	 * @return Board
 	 */
 	public function clone($boardId) {
 		return $this->boardService->clone($boardId, $this->userId);
 	}
+
+	/**
+	 * @NoAdminRequired
+	 */
+	public function transferOwner(int $boardId, string $newOwner): DataResponse {
+		if ($this->permissionService->userIsBoardOwner($boardId, $this->userId)) {
+			return new DataResponse($this->boardService->transferBoardOwnership($boardId, $newOwner), HTTP::STATUS_OK);
+		}
+
+		return new DataResponse([], HTTP::STATUS_UNAUTHORIZED);
+	}
 }

lib/Controller/BoardImportApiController.php

@@ -0,0 +1,85 @@
+<?php
+/**
+ * @copyright Copyright (c) 2021 Vitor Mattos <vitor@php.rio>
+ *
+ * @author Vitor Mattos <vitor@php.rio>
+ *
+ * @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\Controller;
+
+use OCA\Deck\Service\Importer\BoardImportService;
+use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\OCSController;
+use OCP\IRequest;
+
+class BoardImportApiController extends OCSController {
+	/** @var BoardImportService */
+	private $boardImportService;
+	/** @var string */
+	private $userId;
+
+	public function __construct(
+		string $appName,
+		IRequest $request,
+		BoardImportService $boardImportService,
+		string $userId
+	) {
+		parent::__construct($appName, $request);
+		$this->boardImportService = $boardImportService;
+		$this->userId = $userId;
+	}
+
+	/**
+	 * @NoAdminRequired
+	 * @CORS
+	 * @NoCSRFRequired
+	 */
+	public function import(string $system, array $config, array $data): DataResponse {
+		$this->boardImportService->setSystem($system);
+		$config = json_decode(json_encode($config));
+		$config->owner = $this->userId;
+		$this->boardImportService->setConfigInstance($config);
+		$this->boardImportService->setData(json_decode(json_encode($data)));
+		$this->boardImportService->import();
+		return new DataResponse($this->boardImportService->getBoard(), Http::STATUS_OK);
+	}
+
+	/**
+	 * @NoAdminRequired
+	 * @CORS
+	 * @NoCSRFRequired
+	 */
+	public function getAllowedSystems(): DataResponse {
+		$allowedSystems = $this->boardImportService->getAllowedImportSystems();
+		return new DataResponse($allowedSystems, Http::STATUS_OK);
+	}
+
+	/**
+	 * @NoAdminRequired
+	 * @CORS
+	 * @NoCSRFRequired
+	 */
+	public function getConfigSchema(string $name): DataResponse {
+		$this->boardImportService->setSystem($name);
+		$this->boardImportService->validateSystem();
+		$jsonSchemaPath = json_decode(file_get_contents($this->boardImportService->getJsonSchemaPath()));
+		return new DataResponse($jsonSchemaPath, Http::STATUS_OK);
+	}
+}

lib/Controller/CardApiController.php

@@ -94,8 +94,8 @@ class CardApiController extends ApiController {
 	 *
 	 * Update a card
 	 */
-	public function update($title, $type, $order = 0, $description = '', $owner, $duedate = null, $archived = null) {
-		$card = $this->cardService->update($this->request->getParam('cardId'), $title, $this->request->getParam('stackId'), $type, $order, $description, $owner, $duedate, 0, $archived);
+	public function update($title, $type, $owner, $description = '', $order = 0, $duedate = null, $archived = null) {
+		$card = $this->cardService->update($this->request->getParam('cardId'), $title, $this->request->getParam('stackId'), $type, $owner, $description, $order, $duedate, 0, $archived);
 		return new DataResponse($card, HTTP::STATUS_OK);
 	}
 

lib/Controller/CardController.php

@@ -95,7 +95,7 @@ class CardController extends Controller {
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
 	public function update($id, $title, $stackId, $type, $order, $description, $duedate, $deletedAt) {
-		return $this->cardService->update($id, $title, $stackId, $type, $order, $description, $this->userId, $duedate, $deletedAt);
+		return $this->cardService->update($id, $title, $stackId, $type, $this->userId, $description, $order, $duedate, $deletedAt);
 	}
 
 	/**

lib/Controller/PageController.php

@@ -34,12 +34,20 @@ use OCP\IInitialStateService;
 use OCP\IRequest;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Controller;
+use OCA\Deck\Db\CardMapper;
+use OCP\IURLGenerator;
+use \OCP\AppFramework\Http\RedirectResponse;
+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;
 
 	public function __construct(
 		$AppName,
@@ -47,7 +55,10 @@ class PageController extends Controller {
 		PermissionService $permissionService,
 		IInitialStateService $initialStateService,
 		ConfigService $configService,
-		IEventDispatcher $eventDispatcher
+		IEventDispatcher $eventDispatcher,
+		CardMapper $cardMapper,
+		IURLGenerator $urlGenerator,
+		CardService $cardService
 		) {
 		parent::__construct($AppName, $request);
 
@@ -55,6 +66,9 @@ class PageController extends Controller {
 		$this->initialState = $initialStateService;
 		$this->configService = $configService;
 		$this->eventDispatcher = $eventDispatcher;
+		$this->cardMapper = $cardMapper;
+		$this->urlGenerator = $urlGenerator;
+		$this->cardService = $cardService;
 	}
 
 	/**
@@ -85,4 +99,17 @@ class PageController extends Controller {
 
 		return $response;
 	}
+
+	/**
+	 * @NoAdminRequired
+	 * @NoCSRFRequired
+	 */
+	public function redirectToCard($cardId): RedirectResponse {
+		try {
+			$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_READ);
+			return new RedirectResponse($this->cardService->getCardUrl($cardId));
+		} catch (\Exception $e) {
+			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('deck.page.index'));
+		}
+	}
 }

lib/Cron/CardDescriptionActivity.php

@@ -24,7 +24,7 @@
 
 namespace OCA\Deck\Cron;
 
-use OC\BackgroundJob\Job;
+use OCP\BackgroundJob\Job;
 use OCA\Deck\Activity\ActivityManager;
 use OCA\Deck\Db\CardMapper;
 

lib/Cron/DeleteCron.php

@@ -24,13 +24,14 @@
 
 namespace OCA\Deck\Cron;
 
-use OC\BackgroundJob\Job;
+use OCP\BackgroundJob\TimedJob;
 use OCA\Deck\Db\AttachmentMapper;
 use OCA\Deck\Db\BoardMapper;
 use OCA\Deck\InvalidAttachmentType;
 use OCA\Deck\Service\AttachmentService;
+use OCP\BackgroundJob\IJob;
 
-class DeleteCron extends Job {
+class DeleteCron extends TimedJob {
 
 	/** @var BoardMapper */
 	private $boardMapper;
@@ -43,6 +44,9 @@ class DeleteCron extends Job {
 		$this->boardMapper = $boardMapper;
 		$this->attachmentService = $attachmentService;
 		$this->attachmentMapper = $attachmentMapper;
+
+		$this->setInterval(60 * 60 * 24);
+		$this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
 	}
 
 	/**

lib/Cron/ScheduledNotifications.php

@@ -23,7 +23,7 @@
 
 namespace OCA\Deck\Cron;
 
-use OC\BackgroundJob\Job;
+use OCP\BackgroundJob\Job;
 use OCA\Deck\Db\Card;
 use OCA\Deck\Db\CardMapper;
 use OCA\Deck\Notification\NotificationHelper;

lib/Dashboard/DeckWidget.php

@@ -79,6 +79,6 @@ class DeckWidget implements IWidget {
 	 * @inheritDoc
 	 */
 	public function load(): void {
-		\OCP\Util::addScript('deck', 'dashboard');
+		\OCP\Util::addScript('deck', 'deck-dashboard');
 	}
 }

lib/Db/AclMapper.php

@@ -25,6 +25,7 @@ namespace OCA\Deck\Db;
 
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
+use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
 class AclMapper extends DeckMapper implements IPermissionMapper {
@@ -44,9 +45,9 @@ class AclMapper extends DeckMapper implements IPermissionMapper {
 		return ($row['owner'] === $userId);
 	}
 
-	public function findBoardId($aclId): ?int {
+	public function findBoardId($id): ?int {
 		try {
-			$entity = $this->find($aclId);
+			$entity = $this->find($id);
 			return $entity->getBoardId();
 		} catch (DoesNotExistException | MultipleObjectsReturnedException $e) {
 		}
@@ -57,4 +58,16 @@ class AclMapper extends DeckMapper implements IPermissionMapper {
 		$sql = 'SELECT * from *PREFIX*deck_board_acl WHERE type = ? AND participant = ?';
 		return $this->findEntities($sql, [$type, $participant]);
 	}
+
+	/**
+	 * @throws \OCP\DB\Exception
+	 */
+	public function deleteParticipantFromBoard(int $boardId, int $type, string $participant): void {
+		$qb = $this->db->getQueryBuilder();
+		$qb->delete('deck_board_acl')
+			->where($qb->expr()->eq('type', $qb->createNamedParameter($type, IQueryBuilder::PARAM_INT)))
+			->andWhere($qb->expr()->eq('participant', $qb->createNamedParameter($participant, IQueryBuilder::PARAM_STR)))
+			->andWhere($qb->expr()->eq('board_id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)));
+		$qb->executeStatement();
+	}
 }

lib/Db/AssignmentMapper.php

@@ -29,6 +29,7 @@ use OCA\Deck\NotFoundException;
 use OCA\Deck\Service\CirclesService;
 use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\QBMapper;
+use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IGroupManager;
 use OCP\IUserManager;
@@ -83,8 +84,8 @@ class AssignmentMapper extends QBMapper implements IPermissionMapper {
 		return $this->cardMapper->isOwner($userId, $cardId);
 	}
 
-	public function findBoardId($cardId): ?int {
-		return $this->cardMapper->findBoardId($cardId);
+	public function findBoardId($id): ?int {
+		return $this->cardMapper->findBoardId($id);
 	}
 
 	/**
@@ -146,4 +147,39 @@ class AssignmentMapper extends QBMapper implements IPermissionMapper {
 		}
 		return null;
 	}
+
+	public function remapAssignedUser(int $boardId, string $userId, string $newUserId): void {
+		$subQuery = $this->db->getQueryBuilder();
+		$subQuery->selectAlias('a.id', 'id')
+			->from('deck_assigned_users', 'a')
+			->innerJoin('a', 'deck_cards', 'c', 'c.id = a.card_id')
+			->innerJoin('c', 'deck_stacks', 's', 's.id = c.stack_id')
+			->where($subQuery->expr()->eq('a.type', $subQuery->createNamedParameter(Assignment::TYPE_USER, IQueryBuilder::PARAM_INT)))
+			->andWhere($subQuery->expr()->eq('a.participant', $subQuery->createNamedParameter($userId, IQueryBuilder::PARAM_STR)))
+			->andWhere($subQuery->expr()->eq('s.board_id', $subQuery->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
+			->setMaxResults(1000);
+
+		$qb = $this->db->getQueryBuilder();
+		$qb->update('deck_assigned_users')
+			->set('participant', $qb->createParameter('participant'))
+			->where($qb->expr()->in('id', $qb->createParameter('ids')));
+
+		$moreResults = true;
+		do {
+			$result = $subQuery->executeQuery();
+			$ids = array_map(function ($item) {
+				return $item['id'];
+			}, $result->fetchAll());
+
+			if (count($ids) === 0 || $result->rowCount() === 0) {
+				$moreResults = false;
+			}
+
+			$qb->setParameter('participant', $newUserId, IQueryBuilder::PARAM_STR);
+			$qb->setParameter('ids', $ids, IQueryBuilder::PARAM_INT_ARRAY);
+			$qb->executeStatement();
+		} while ($moreResults === true);
+
+		$result->closeCursor();
+	}
 }

lib/Db/Board.php

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

lib/Db/BoardMapper.php

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

lib/Db/CardMapper.php

@@ -30,6 +30,8 @@ use OCA\Deck\Search\Query\SearchQuery;
 use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\ICache;
+use OCP\ICacheFactory;
 use OCP\IDBConnection;
 use OCP\IGroupManager;
 use OCP\IUser;
@@ -46,6 +48,8 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 	private $groupManager;
 	/** @var IManager */
 	private $notificationManager;
+	/** @var ICache */
+	private $cache;
 	private $databaseType;
 	private $database4ByteSupport;
 
@@ -55,6 +59,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		IUserManager $userManager,
 		IGroupManager $groupManager,
 		IManager $notificationManager,
+		ICacheFactory $cacheFactory,
 		$databaseType = 'sqlite3',
 		$database4ByteSupport = true
 	) {
@@ -63,6 +68,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		$this->userManager = $userManager;
 		$this->groupManager = $groupManager;
 		$this->notificationManager = $notificationManager;
+		$this->cache = $cacheFactory->createDistributed('deck-cardMapper');
 		$this->databaseType = $databaseType;
 		$this->database4ByteSupport = $database4ByteSupport;
 	}
@@ -75,7 +81,9 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 			$description = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $entity->getDescription());
 			$entity->setDescription($description);
 		}
-		return parent::insert($entity);
+		$entity = parent::insert($entity);
+		$this->cache->remove('findBoardId:' . $entity->getId());
+		return $entity;
 	}
 
 	public function update(Entity $entity, $updateModified = true): Entity {
@@ -107,6 +115,10 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 			} catch (Exception $e) {
 			}
 		}
+		// Invalidate cache when the card may be moved to a different board
+		if (isset($updatedFields['stackId'])) {
+			$this->cache->remove('findBoardId:' . $entity->getId());
+		}
 		return parent::update($entity);
 	}
 
@@ -230,16 +242,18 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		return $this->findEntities($qb);
 	}
 
-	public function findAssignedCards($boardId, $username) {
+	public function findToMeOrNotAssignedCards($boardId, $username) {
 		$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')
-			->innerJoin('c', 'deck_assigned_users', 'u', 'c.id = u.card_id')
+			->leftJoin('c', 'deck_assigned_users', 'u', 'c.id = u.card_id')
 			->where($qb->expr()->eq('s.board_id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
-			->andWhere($qb->expr()->eq('u.participant', $qb->createNamedParameter($username, IQueryBuilder::PARAM_STR)))
-			->andWhere($qb->expr()->eq('u.type', $qb->createNamedParameter(Acl::PERMISSION_TYPE_USER, IQueryBuilder::PARAM_INT)))
+			->andWhere($qb->expr()->orX(
+				$qb->expr()->eq('u.participant', $qb->createNamedParameter($username, IQueryBuilder::PARAM_STR)),
+				$qb->expr()->isNull('u.participant'))
+			)
 			// Filter out archived/deleted cards and board
 			->andWhere($qb->expr()->eq('c.archived', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)))
 			->andWhere($qb->expr()->eq('c.deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)))
@@ -251,7 +265,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 
 	public function findOverdue() {
 		$qb = $this->db->getQueryBuilder();
-		$qb->select('id','title','duedate','notified')
+		$qb->select('id', 'title', 'duedate', 'notified')
 			->from('deck_cards')
 			->where($qb->expr()->lt('duedate', $qb->createFunction('NOW()')))
 			->andWhere($qb->expr()->eq('notified', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)))
@@ -262,7 +276,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 
 	public function findUnexposedDescriptionChances() {
 		$qb = $this->db->getQueryBuilder();
-		$qb->select('id','title','duedate','notified','description_prev','last_editor','description')
+		$qb->select('id', 'title', 'duedate', 'notified', 'description_prev', 'last_editor', 'description')
 			->from('deck_cards')
 			->where($qb->expr()->isNotNull('last_editor'))
 			->andWhere($qb->expr()->isNotNull('description_prev'));
@@ -477,8 +491,8 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		}
 		return $qb->createNamedParameter($dateTime, IQueryBuilder::PARAM_DATE);
 	}
-	
-	
+
+
 
 	public function searchRaw($boardIds, $term, $limit = null, $offset = null) {
 		$qb = $this->queryCardsByBoards($boardIds)
@@ -504,9 +518,8 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 	}
 
 	public function delete(Entity $entity): Entity {
-		// delete assigned labels
 		$this->labelMapper->deleteLabelAssignmentsForCard($entity->getId());
-		// delete card
+		$this->cache->remove('findBoardId:' . $entity->getId());
 		return parent::delete($entity);
 	}
 
@@ -544,12 +557,23 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		return ($row['owner'] === $userId);
 	}
 
-	public function findBoardId($cardId): ?int {
-		$sql = 'SELECT id FROM `*PREFIX*deck_boards` WHERE `id` IN (SELECT board_id FROM `*PREFIX*deck_stacks` WHERE id IN (SELECT stack_id FROM `*PREFIX*deck_cards` WHERE id = ?))';
-		$stmt = $this->db->prepare($sql);
-		$stmt->bindParam(1, $cardId, \PDO::PARAM_INT);
-		$stmt->execute();
-		return $stmt->fetchColumn() ?? null;
+	public function findBoardId($id): ?int {
+		$result = $this->cache->get('findBoardId:' . $id);
+		if ($result === null) {
+			try {
+				$qb = $this->db->getQueryBuilder();
+				$qb->select('board_id')
+					->from('deck_stacks', 's')
+					->innerJoin('s', 'deck_cards', 'c', 'c.stack_id = s.id')
+					->where($qb->expr()->eq('c.id', $qb->createNamedParameter($id)));
+				$queryResult = $qb->executeQuery();
+				$result = $queryResult->fetchOne();
+			} catch (\Exception $e) {
+				$result = false;
+			}
+			$this->cache->set('findBoardId:' . $id, $result);
+		}
+		return $result !== false ? $result : null;
 	}
 
 	public function mapOwner(Card &$card) {
@@ -562,4 +586,47 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 			return null;
 		});
 	}
+
+	public function transferOwnership(string $ownerId, string $newOwnerId, int $boardId = null): void {
+		$params = [
+			'owner' => $ownerId,
+			'newOwner' => $newOwnerId
+		];
+		$sql = "UPDATE `*PREFIX*{$this->tableName}`  SET `owner` = :newOwner WHERE `owner` = :owner";
+		$stmt = $this->db->executeQuery($sql, $params);
+		$stmt->closeCursor();
+	}
+
+	public function remapCardOwner(int $boardId, string $userId, string $newUserId): void {
+		$subQuery = $this->db->getQueryBuilder();
+		$subQuery->selectAlias('c.id', 'id')
+			->from('deck_cards', 'c')
+			->innerJoin('c', 'deck_stacks', 's', 's.id = c.stack_id')
+			->where($subQuery->expr()->eq('c.owner', $subQuery->createNamedParameter($userId, IQueryBuilder::PARAM_STR)))
+			->andWhere($subQuery->expr()->eq('s.board_id', $subQuery->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
+			->setMaxResults(1000);
+
+		$qb = $this->db->getQueryBuilder();
+		$qb->update('deck_cards')
+			->set('owner', $qb->createParameter('owner'))
+			->where($qb->expr()->in('id', $qb->createParameter('ids')));
+
+		$moreResults = true;
+		do {
+			$result = $subQuery->executeQuery();
+			$ids = array_map(function ($item) {
+				return $item['id'];
+			}, $result->fetchAll());
+
+			if (count($ids) === 0 || $result->rowCount() === 0) {
+				$moreResults = false;
+			}
+
+			$qb->setParameter('owner', $newUserId, IQueryBuilder::PARAM_STR);
+			$qb->setParameter('ids', $ids, IQueryBuilder::PARAM_INT_ARRAY);
+			$qb->executeStatement();
+		} while ($moreResults === true);
+
+		$result->closeCursor();
+	}
 }

lib/Db/Circle.php

@@ -36,8 +36,8 @@ class Circle extends RelationalObject {
 	public function getObjectSerialization() {
 		return [
 			'uid' => $this->object->getUniqueId(),
-			'displayname' => $this->object->getName(),
-			'typeString' => $this->object->getTypeString(),
+			'displayname' => $this->object->getDisplayName(),
+			'typeString' => '',
 			'circleOwner' => $this->object->getOwner(),
 			'type' => 7
 		];

lib/Db/LabelMapper.php

@@ -101,9 +101,9 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 		return ($row['owner'] === $userId);
 	}
 
-	public function findBoardId($labelId): ?int {
+	public function findBoardId($id): ?int {
 		try {
-			$entity = $this->find($labelId);
+			$entity = $this->find($id);
 			return $entity->getBoardId();
 		} catch (DoesNotExistException $e) {
 		} catch (MultipleObjectsReturnedException $e) {

lib/Db/StackMapper.php

@@ -75,9 +75,9 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
 		return ($row['owner'] === $userId);
 	}
 
-	public function findBoardId($stackId): ?int {
+	public function findBoardId($id): ?int {
 		try {
-			$entity = $this->find($stackId);
+			$entity = $this->find($id);
 			return $entity->getBoardId();
 		} catch (DoesNotExistException $e) {
 		} catch (MultipleObjectsReturnedException $e) {

lib/Event/ABoardImportGetAllowedEvent.php

@@ -0,0 +1,44 @@
+<?php
+/*
+ * @copyright Copyright (c) 2021 Vitor Mattos <vitor@php.rio>
+ *
+ * @author Vitor Mattos <vitor@php.rio>
+ *
+ * @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/>.
+ *
+ */
+
+declare(strict_types=1);
+
+
+namespace OCA\Deck\Event;
+
+use OCA\Deck\Service\Importer\BoardImportService;
+use OCP\EventDispatcher\Event;
+
+abstract class ABoardImportGetAllowedEvent extends Event {
+	private $service;
+
+	public function __construct(BoardImportService $service) {
+		parent::__construct();
+
+		$this->service = $service;
+	}
+
+	public function getService(): BoardImportService {
+		return $this->service;
+	}
+}

lib/Event/BoardImportGetAllowedEvent.php

@@ -0,0 +1,29 @@
+<?php
+/*
+ * @copyright Copyright (c) 2021 Vitor Mattos <vitor@php.rio>
+ *
+ * @author Vitor Mattos <vitor@php.rio>
+ *
+ * @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/>.
+ *
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Deck\Event;
+
+class BoardImportGetAllowedEvent extends ABoardImportGetAllowedEvent {
+}

lib/Listeners/BeforeTemplateRenderedListener.php

@@ -51,11 +51,11 @@ class BeforeTemplateRenderedListener implements IEventListener {
 
 		$pathInfo = $this->request->getPathInfo();
 		if (strpos($pathInfo, '/apps/calendar') === 0) {
-			Util::addScript('deck', 'calendar');
+			Util::addScript('deck', 'deck-calendar');
 		}
 
 		if (strpos($pathInfo, '/call/') === 0 || strpos($pathInfo, '/apps/spreed') === 0) {
-			Util::addScript('deck', 'talk');
+			Util::addScript('deck', 'deck-talk');
 		}
 	}
 }

lib/Provider/DeckProvider.php

@@ -238,7 +238,7 @@ class DeckProvider implements IFullTextSearchProvider {
 	 *
 	 * @param ISearchRequest $request
 	 */
-	public function improveSearchRequest(ISearchRequest $request) {
+	public function improveSearchRequest(ISearchRequest $searchRequest) {
 	}
 
 

lib/Search/CardSearchResultEntry.php

@@ -33,6 +33,6 @@ use OCP\Search\SearchResultEntry;
 
 class CardSearchResultEntry extends SearchResultEntry {
 	public function __construct(Board $board, Stack $stack, Card $card, $urlGenerator) {
-		parent::__construct('', $card->getTitle(), $board->getTitle() . ' » ' . $stack->getTitle() , $urlGenerator->linkToRouteAbsolute('deck.page.index') . '#/board/' . $board->getId() . '/card/' . $card->getId(), 'icon-deck');
+		parent::__construct('', $card->getTitle(), $board->getTitle() . ' » ' . $stack->getTitle(), $urlGenerator->linkToRouteAbsolute('deck.page.index') . '#/board/' . $board->getId() . '/card/' . $card->getId(), 'icon-deck');
 	}
 }

lib/Service/BoardService.php

@@ -24,12 +24,14 @@
 
 namespace OCA\Deck\Service;
 
+use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use OCA\Deck\Activity\ActivityManager;
 use OCA\Deck\Activity\ChangeSet;
 use OCA\Deck\AppInfo\Application;
 use OCA\Deck\Db\Acl;
 use OCA\Deck\Db\AclMapper;
 use OCA\Deck\Db\AssignmentMapper;
+use OCA\Deck\Db\CardMapper;
 use OCA\Deck\Db\ChangeHelper;
 use OCA\Deck\Db\IPermissionMapper;
 use OCA\Deck\Db\Label;
@@ -50,6 +52,7 @@ use OCA\Deck\Db\BoardMapper;
 use OCA\Deck\Db\LabelMapper;
 use OCP\IUserManager;
 use OCA\Deck\BadRequestException;
+use OCP\IURLGenerator;
 
 class BoardService {
 	private $boardMapper;
@@ -68,8 +71,10 @@ class BoardService {
 	private $activityManager;
 	private $eventDispatcher;
 	private $changeHelper;
+	private $cardMapper;
 
 	private $boardsCache = null;
+	private $urlGenerator;
 
 
 	public function __construct(
@@ -82,11 +87,13 @@ class BoardService {
 		PermissionService $permissionService,
 		NotificationHelper $notificationHelper,
 		AssignmentMapper $assignedUsersMapper,
+		CardMapper $cardMapper,
 		IUserManager $userManager,
 		IGroupManager $groupManager,
 		ActivityManager $activityManager,
 		IEventDispatcher $eventDispatcher,
 		ChangeHelper $changeHelper,
+		IURLGenerator $urlGenerator,
 		$userId
 	) {
 		$this->boardMapper = $boardMapper;
@@ -104,6 +111,8 @@ class BoardService {
 		$this->eventDispatcher = $eventDispatcher;
 		$this->changeHelper = $changeHelper;
 		$this->userId = $userId;
+		$this->urlGenerator = $urlGenerator;
+		$this->cardMapper = $cardMapper;
 	}
 
 	/**
@@ -118,8 +127,9 @@ class BoardService {
 	/**
 	 * Get all boards that are shared with a user, their groups or circles
 	 */
-	public function getUserBoards(int $since = -1, bool $includeArchived = true): array {
-		return $this->boardMapper->findAllForUser($this->userId, $since, $includeArchived);
+	public function getUserBoards(?int $since = null, bool $includeArchived = true, ?int $before = null,
+								  ?string $term = null): array {
+		return $this->boardMapper->findAllForUser($this->userId, $since, $includeArchived, $before, $term);
 	}
 
 	/**
@@ -178,9 +188,11 @@ class BoardService {
 		/** @var Board $board */
 		$board = $this->boardMapper->find($boardId, true, true);
 		$this->boardMapper->mapOwner($board);
-		foreach ($board->getAcl() as &$acl) {
-			if ($acl !== null) {
-				$this->boardMapper->mapAcl($acl);
+		if ($board->getAcl() !== null) {
+			foreach ($board->getAcl() as $acl) {
+				if ($acl !== null) {
+					$this->boardMapper->mapAcl($acl);
+				}
 			}
 		}
 		$permissions = $this->permissionService->matchPermissions($board);
@@ -512,11 +524,14 @@ class BoardService {
 		$acl->setPermissionManage($manage);
 		$newAcl = $this->aclMapper->insert($acl);
 
-		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $newAcl, ActivityManager::SUBJECT_BOARD_SHARE);
+		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $newAcl, ActivityManager::SUBJECT_BOARD_SHARE, [], $this->userId);
 		$this->notificationHelper->sendBoardShared((int)$boardId, $acl);
 		$this->boardMapper->mapAcl($newAcl);
 		$this->changeHelper->boardChanged($boardId);
 
+		$board = $this->boardMapper->find($boardId);
+		$this->clearBoardFromCache($board);
+
 		// TODO: use the dispatched event for this
 		try {
 			$resourceProvider = \OC::$server->query(\OCA\Deck\Collaboration\Resources\ResourceProvider::class);
@@ -667,6 +682,43 @@ class BoardService {
 		return $newBoard;
 	}
 
+	public function transferBoardOwnership(int $boardId, string $newOwner, bool $changeContent = false): Board {
+		\OC::$server->getDatabaseConnection()->beginTransaction();
+		try {
+			$board = $this->boardMapper->find($boardId);
+			$previousOwner = $board->getOwner();
+			$this->clearBoardFromCache($board);
+			$this->aclMapper->deleteParticipantFromBoard($boardId, Acl::PERMISSION_TYPE_USER, $newOwner);
+			if (!$changeContent) {
+				try {
+					$this->addAcl($boardId, Acl::PERMISSION_TYPE_USER, $previousOwner, true, true, true);
+				} catch (UniqueConstraintViolationException $e) {
+				}
+			}
+			$this->boardMapper->transferOwnership($previousOwner, $newOwner, $boardId);
+
+			// Optionally also change user assignments and card owner information
+			if ($changeContent) {
+				$this->assignedUsersMapper->remapAssignedUser($boardId, $previousOwner, $newOwner);
+				$this->cardMapper->remapCardOwner($boardId, $previousOwner, $newOwner);
+			}
+			\OC::$server->getDatabaseConnection()->commit();
+			return $this->boardMapper->find($boardId);
+		} catch (\Throwable $e) {
+			\OC::$server->getDatabaseConnection()->rollBack();
+			throw $e;
+		}
+	}
+
+	public function transferOwnership(string $owner, string $newOwner, bool $changeContent = false): \Generator {
+		$boards = $this->boardMapper->findAllByUser($owner);
+		foreach ($boards as $board) {
+			if ($board->getOwner() === $owner) {
+				yield $this->transferBoardOwnership($board->getId(), $newOwner, $changeContent);
+			}
+		}
+	}
+
 	private function enrichWithStacks($board, $since = -1) {
 		$stacks = $this->stackMapper->findAll($board->getId(), null, null, $since);
 
@@ -694,4 +746,23 @@ class BoardService {
 		}
 		$board->setUsers(array_values($boardUsers));
 	}
+
+	public function getBoardUrl($endpoint) {
+		return $this->urlGenerator->linkToRouteAbsolute('deck.page.index') . '#' . $endpoint;
+	}
+
+	private function clearBoardsCache() {
+		$this->boardsCache = null;
+	}
+
+	/**
+	 * Clean a given board data from the Cache
+	 */
+	private function clearBoardFromCache(Board $board) {
+		$boardId = $board->getId();
+		$boardOwnerId = $board->getOwner();
+
+		$this->boardMapper->flushCache($boardId, $boardOwnerId);
+		unset($this->boardsCache[$boardId]);
+	}
 }

lib/Service/CardService.php

@@ -37,6 +37,7 @@ use OCA\Deck\Db\StackMapper;
 use OCA\Deck\Event\CardCreatedEvent;
 use OCA\Deck\Event\CardDeletedEvent;
 use OCA\Deck\Event\CardUpdatedEvent;
+use OCA\Deck\NoPermissionException;
 use OCA\Deck\Notification\NotificationHelper;
 use OCA\Deck\Db\BoardMapper;
 use OCA\Deck\Db\LabelMapper;
@@ -45,6 +46,7 @@ use OCA\Deck\BadRequestException;
 use OCP\Comments\ICommentsManager;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IUserManager;
+use OCP\IURLGenerator;
 
 class CardService {
 	private $cardMapper;
@@ -62,6 +64,7 @@ class CardService {
 	private $changeHelper;
 	private $eventDispatcher;
 	private $userManager;
+	private $urlGenerator;
 
 	public function __construct(
 		CardMapper $cardMapper,
@@ -78,6 +81,7 @@ class CardService {
 		IUserManager $userManager,
 		ChangeHelper $changeHelper,
 		IEventDispatcher $eventDispatcher,
+		IURLGenerator $urlGenerator,
 		$userId
 	) {
 		$this->cardMapper = $cardMapper;
@@ -95,6 +99,7 @@ class CardService {
 		$this->changeHelper = $changeHelper;
 		$this->eventDispatcher = $eventDispatcher;
 		$this->currentUser = $userId;
+		$this->urlGenerator = $urlGenerator;
 	}
 
 	public function enrich($card) {
@@ -154,7 +159,12 @@ class CardService {
 	}
 
 	public function findCalendarEntries($boardId) {
-		$this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_READ);
+		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]);
+			return [];
+		}
 		$cards = $this->cardMapper->findCalendarEntries($boardId);
 		foreach ($cards as $card) {
 			$this->enrich($card);
@@ -257,9 +267,9 @@ class CardService {
 	 * @param $title
 	 * @param $stackId
 	 * @param $type
-	 * @param $order
-	 * @param $description
 	 * @param $owner
+	 * @param $description
+	 * @param $order
 	 * @param $duedate
 	 * @return \OCP\AppFramework\Db\Entity
 	 * @throws StatusException
@@ -268,7 +278,7 @@ class CardService {
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws BadRequestException
 	 */
-	public function update($id, $title, $stackId, $type, $order = 0, $description = '', $owner, $duedate = null, $deletedAt = null, $archived = null) {
+	public function update($id, $title, $stackId, $type, $owner, $description = '', $order = 0, $duedate = null, $deletedAt = null, $archived = null) {
 		if (is_numeric($id) === false) {
 			throw new BadRequestException('card id must be a number');
 		}
@@ -597,27 +607,13 @@ class CardService {
 		$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card));
 	}
 
-	/**
-	 *
-	 * @return array
-	 * @throws \OCA\Deck\NoPermissionException
-	 * @throws BadRequestException
-	 */
-	public function findAllWithDue($userId) {
-		$cards = $this->cardMapper->findAllWithDue($userId);
+	public function getCardUrl($cardId) {
+		$boardId = $this->cardMapper->findBoardId($cardId);
 
-		return $cards;
+		return $this->urlGenerator->linkToRouteAbsolute('deck.page.index') . "#/board/$boardId/card/$cardId";
 	}
 
-	/**
-	 *
-	 * @return array
-	 * @throws \OCA\Deck\NoPermissionException
-	 * @throws BadRequestException
-	 */
-	public function findAssignedCards($userId) {
-		$cards = $this->cardMapper->findAssignedCards($userId);
-
-		return $cards;
+	public function getRedirectUrlForCard($cardId) {
+		return $this->urlGenerator->linkToRouteAbsolute('deck.page.index') . "card/$cardId";
 	}
 }

lib/Service/CirclesService.php

@@ -26,8 +26,12 @@ declare(strict_types=1);
 
 namespace OCA\Deck\Service;
 
-use OCA\Circles\Api\v1\Circles;
+use OCA\Circles\CirclesManager;
+use OCA\Circles\Model\Circle;
+use OCA\Circles\Model\Member;
+use OCA\Circles\Model\Probes\CircleProbe;
 use OCP\App\IAppManager;
+use Throwable;
 
 /**
  * Wrapper around circles app API since it is not in a public namespace so we need to make sure that
@@ -40,24 +44,66 @@ class CirclesService {
 		$this->circlesEnabled = $appManager->isEnabledForUser('circles');
 	}
 
-	public function getCircle($circleId) {
+	public function isCirclesEnabled(): bool {
+		return $this->circlesEnabled;
+	}
+
+	public function getCircle(string $circleId): ?Circle {
 		if (!$this->circlesEnabled) {
 			return null;
 		}
 
-		return \OCA\Circles\Api\v1\Circles::detailsCircle($circleId, true);
+		try {
+
+			// Enforce current user condition since we always want the full list of members
+			/** @var CirclesManager $circlesManager */
+			$circlesManager = \OC::$server->get(CirclesManager::class);
+			$circlesManager->startSuperSession();
+			return $circlesManager->getCircle($circleId);
+		} catch (Throwable $e) {
+		}
+		return null;
 	}
 
-	public function isUserInCircle($circleId, $userId): bool {
+	public function isUserInCircle(string $circleId, string $userId): bool {
 		if (!$this->circlesEnabled) {
 			return false;
 		}
 
 		try {
-			$member = \OCA\Circles\Api\v1\Circles::getMember($circleId, $userId, 1, true);
-			return $member->getLevel() >= Circles::LEVEL_MEMBER;
-		} catch (\Exception $e) {
+			/** @var CirclesManager $circlesManager */
+			$circlesManager = \OC::$server->get(CirclesManager::class);
+			$federatedUser = $circlesManager->getFederatedUser($userId, Member::TYPE_USER);
+			$circlesManager->startSession($federatedUser);
+			$circle = $circlesManager->getCircle($circleId);
+			$member = $circle->getInitiator();
+			return $member !== null && $member->getLevel() >= Member::LEVEL_MEMBER;
+		} catch (Throwable $e) {
 		}
 		return false;
 	}
+
+	/**
+	 * @param string $userId
+	 * @return string[] circle single ids
+	 */
+	public function getUserCircles(string $userId): array {
+		if (!$this->circlesEnabled) {
+			return [];
+		}
+
+		try {
+			/** @var CirclesManager $circlesManager */
+			$circlesManager = \OC::$server->get(CirclesManager::class);
+			$federatedUser = $circlesManager->getFederatedUser($userId, Member::TYPE_USER);
+			$circlesManager->startSession($federatedUser);
+			$probe = new CircleProbe();
+			$probe->mustBeMember();
+			return array_map(function (Circle $circle) {
+				return $circle->getSingleId();
+			}, $circlesManager->getCircles($probe));
+		} catch (Throwable $e) {
+		}
+		return [];
+	}
 }

lib/Service/ConfigService.php

@@ -46,20 +46,30 @@ class ConfigService {
 
 	public function __construct(
 		IConfig $config,
-		IGroupManager $groupManager,
-		IUserSession $userSession
+		IGroupManager $groupManager
 	) {
-		// Session is required here in order to make the tests properly inject the userId later on
-		$this->userId = $userSession->getUser() ? $userSession->getUser()->getUID() : null;
 		$this->groupManager = $groupManager;
 		$this->config = $config;
 	}
 
+	public function getUserId() {
+		if (!$this->userId) {
+			$user = \OC::$server->get(IUserSession::class)->getUser();
+			$this->userId = $user ? $user->getUID() : null;
+		}
+		return $this->userId;
+	}
+
 	public function getAll(): array {
+		if ($this->getUserId() === null) {
+			return [];
+		}
+
 		$data = [
-			'calendar' => $this->isCalendarEnabled()
+			'calendar' => $this->isCalendarEnabled(),
+			'cardDetailsInModal' => $this->isCardDetailsInModal(),
 		];
-		if ($this->groupManager->isAdmin($this->userId)) {
+		if ($this->groupManager->isAdmin($this->getUserId())) {
 			$data['groupLimit'] = $this->get('groupLimit');
 		}
 		return $data;
@@ -70,43 +80,70 @@ class ConfigService {
 		[$scope] = explode(':', $key, 2);
 		switch ($scope) {
 			case 'groupLimit':
-				if (!$this->groupManager->isAdmin($this->userId)) {
+				if ($this->getUserId() === null || !$this->groupManager->isAdmin($this->getUserId())) {
 					throw new NoPermissionException('You must be admin to get the group limit');
 				}
 				return $this->getGroupLimit();
 			case 'calendar':
-				if ($this->userId === null) {
+				if ($this->getUserId() === null) {
 					return false;
 				}
-				return (bool)$this->config->getUserValue($this->userId, Application::APP_ID, 'calendar', true);
+				return (bool)$this->config->getUserValue($this->getUserId(), Application::APP_ID, 'calendar', true);
+			case 'cardDetailsInModal':
+			  if ($this->getUserId() === null) {
+			  	return false;
+			  }
+				return (bool)$this->config->getUserValue($this->getUserId(), Application::APP_ID, 'cardDetailsInModal', true);
 		}
 	}
 
 	public function isCalendarEnabled(int $boardId = null): bool {
-		if ($this->userId === null) {
+		if ($this->getUserId() === null) {
 			return false;
 		}
 
-		$defaultState = (bool)$this->config->getUserValue($this->userId, Application::APP_ID, 'calendar', true);
+		$appConfigState = $this->config->getAppValue(Application::APP_ID, 'calendar', 'yes') === 'yes';
+		$defaultState = (bool)$this->config->getUserValue($this->getUserId(), Application::APP_ID, 'calendar', $appConfigState);
 		if ($boardId === null) {
 			return $defaultState;
 		}
 
-		return (bool)$this->config->getUserValue($this->userId, Application::APP_ID, 'board:' . $boardId . ':calendar', $defaultState);
+		return (bool)$this->config->getUserValue($this->getUserId(), Application::APP_ID, 'board:' . $boardId . ':calendar', $defaultState);
+	}
+
+	public function isCardDetailsInModal(int $boardId = null): bool {
+		if ($this->getUserId() === null) {
+			return false;
+		}
+
+		$defaultState = (bool)$this->config->getUserValue($this->getUserId(), Application::APP_ID, 'cardDetailsInModal', true);
+		if ($boardId === null) {
+			return $defaultState;
+		}
+
+		return (bool)$this->config->getUserValue($this->getUserId(), Application::APP_ID, 'board:' . $boardId . ':cardDetailsInModal', $defaultState);
 	}
 
 	public function set($key, $value) {
+		if ($this->getUserId() === null) {
+			throw new NoPermissionException('Must be logged in to set user config');
+		}
+
 		$result = null;
 		[$scope] = explode(':', $key, 2);
 		switch ($scope) {
 			case 'groupLimit':
-				if (!$this->groupManager->isAdmin($this->userId)) {
+				if (!$this->groupManager->isAdmin($this->getUserId())) {
 					throw new NoPermissionException('You must be admin to set the group limit');
 				}
 				$result = $this->setGroupLimit($value);
 				break;
 			case 'calendar':
-				$this->config->setUserValue($this->userId, Application::APP_ID, 'calendar', (int)$value);
+				$this->config->setUserValue($this->getUserId(), Application::APP_ID, 'calendar', (string)$value);
+				$result = $value;
+				break;
+			case 'cardDetailsInModal':
+				$this->config->setUserValue($this->getUserId(), Application::APP_ID, 'cardDetailsInModal', (string)$value);
 				$result = $value;
 				break;
 			case 'board':
@@ -114,7 +151,7 @@ class ConfigService {
 				if ($boardConfigKey === 'notify-due' && !in_array($value, [self::SETTING_BOARD_NOTIFICATION_DUE_ALL, self::SETTING_BOARD_NOTIFICATION_DUE_ASSIGNED, self::SETTING_BOARD_NOTIFICATION_DUE_OFF], true)) {
 					throw new BadRequestException('Board notification option must be one of: off, assigned, all');
 				}
-				$this->config->setUserValue($this->userId, Application::APP_ID, $key, $value);
+				$this->config->setUserValue($this->getUserId(), Application::APP_ID, $key, (string)$value);
 				$result = $value;
 		}
 		return $result;
@@ -156,6 +193,10 @@ class ConfigService {
 	}
 
 	public function getAttachmentFolder(): string {
-		return $this->config->getUserValue($this->userId, 'deck', 'attachment_folder', '/Deck');
+		if ($this->getUserId() === null) {
+			throw new NoPermissionException('Must be logged in get the attachment folder');
+		}
+
+		return $this->config->getUserValue($this->getUserId(), 'deck', 'attachment_folder', '/Deck');
 	}
 }

lib/Service/FileService.php

@@ -86,7 +86,7 @@ class FileService implements IAttachmentService {
 	 * @return ISimpleFolder
 	 * @throws NotPermittedException
 	 */
-	private function getFolder(Attachment $attachment) {
+	public function getFolder(Attachment $attachment) {
 		$folderName = 'file-card-' . (int)$attachment->getCardId();
 		try {
 			$folder = $this->appData->getFolder($folderName);

lib/Service/FullTextSearchService.php

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

lib/Service/Importer/ABoardImportService.php

@@ -0,0 +1,136 @@
+<?php
+/**
+ * @copyright Copyright (c) 2021 Vitor Mattos <vitor@php.rio>
+ *
+ * @author Vitor Mattos <vitor@php.rio>
+ *
+ * @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\Service\Importer;
+
+use OCA\Deck\Db\Acl;
+use OCA\Deck\Db\Assignment;
+use OCA\Deck\Db\Board;
+use OCA\Deck\Db\Card;
+use OCA\Deck\Db\Label;
+use OCA\Deck\Db\Stack;
+use OCP\AppFramework\Db\Entity;
+use OCP\Comments\IComment;
+
+abstract class ABoardImportService {
+	/** @var string */
+	public static $name = '';
+	/** @var BoardImportService */
+	private $boardImportService;
+	/** @var bool */
+	protected $needValidateData = true;
+	/** @var Stack[] */
+	protected $stacks = [];
+	/** @var Label[] */
+	protected $labels = [];
+	/** @var Card[] */
+	protected $cards = [];
+	/** @var Acl[] */
+	protected $acls = [];
+	/** @var IComment[][] */
+	protected $comments = [];
+	/** @var Assignment[] */
+	protected $assignments = [];
+	/** @var string[][] */
+	protected $labelCardAssignments = [];
+
+	/**
+	 * Configure import service
+	 *
+	 * @return void
+	 */
+	abstract public function bootstrap(): void;
+
+	abstract public function getBoard(): ?Board;
+
+	/**
+	 * @return Acl[]
+	 */
+	abstract public function getAclList(): array;
+
+	/**
+	 * @return Stack[]
+	 */
+	abstract public function getStacks(): array;
+
+	/**
+	 * @return Card[]
+	 */
+	abstract public function getCards(): array;
+
+	abstract public function getCardAssignments(): array;
+
+	abstract public function getCardLabelAssignment(): array;
+
+	/**
+	 * @return IComment[][]|array
+	 */
+	abstract public function getComments(): array;
+
+	/** @return Label[] */
+	abstract public function getLabels(): array;
+
+	abstract public function validateUsers(): void;
+
+	abstract public function getJsonSchemaPath(): string;
+
+	public function updateStack(string $id, Stack $stack): void {
+		$this->stacks[$id] = $stack;
+	}
+
+	public function updateCard(string $id, Card $card): void {
+		$this->cards[$id] = $card;
+	}
+
+	public function updateLabel(string $code, Label $label): void {
+		$this->labels[$code] = $label;
+	}
+
+	public function updateAcl(string $code, Acl $acl): void {
+		$this->acls[$code] = $acl;
+	}
+
+	public function updateComment(string $cardId, string $commentId, IComment $comment): void {
+		$this->comments[$cardId][$commentId] = $comment;
+	}
+
+	public function updateCardAssignment(string $cardId, string $assignmentId, Entity $assignment): void {
+		$this->assignments[$cardId][$assignmentId] = $assignment;
+	}
+
+	public function updateCardLabelsAssignment(string $cardId, string $assignmentId, string $assignment): void {
+		$this->labelCardAssignments[$cardId][$assignmentId] = $assignment;
+	}
+
+	public function setImportService(BoardImportService $service): void {
+		$this->boardImportService = $service;
+	}
+
+	public function getImportService(): BoardImportService {
+		return $this->boardImportService;
+	}
+
+	public function needValidateData(): bool {
+		return $this->needValidateData;
+	}
+}

lib/Service/Importer/BoardImportCommandService.php

@@ -0,0 +1,199 @@
+<?php
+/**
+ * @copyright Copyright (c) 2021 Vitor Mattos <vitor@php.rio>
+ *
+ * @author Vitor Mattos <vitor@php.rio>
+ *
+ * @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\Service\Importer;
+
+use OCA\Deck\Exceptions\ConflictException;
+use OCA\Deck\NotFoundException;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ChoiceQuestion;
+use Symfony\Component\Console\Question\Question;
+
+class BoardImportCommandService extends BoardImportService {
+	/**
+	 * @var Command
+	 * @psalm-suppress PropertyNotSetInConstructor
+	 */
+	private $command;
+	/**
+	 * @var InputInterface
+	 * @psalm-suppress PropertyNotSetInConstructor
+	 */
+	private $input;
+	/**
+	 * @var OutputInterface
+	 * @psalm-suppress PropertyNotSetInConstructor
+	 */
+	private $output;
+
+	public function setCommand(Command $command): self {
+		$this->command = $command;
+		return $this;
+	}
+
+	public function getCommand(): Command {
+		return $this->command;
+	}
+
+	public function setInput(InputInterface $input): self {
+		$this->input = $input;
+		return $this;
+	}
+
+	public function getInput(): InputInterface {
+		return $this->input;
+	}
+
+	public function setOutput(OutputInterface $output): self {
+		$this->output = $output;
+		return $this;
+	}
+
+	public function getOutput(): OutputInterface {
+		return $this->output;
+	}
+
+	protected function validateConfig(): void {
+		try {
+			$config = $this->getInput()->getOption('config');
+			if (is_string($config)) {
+				if (!is_file($config)) {
+					throw new NotFoundException('It\'s not a valid config file.');
+				}
+				$config = json_decode(file_get_contents($config));
+				if (!$config instanceof \stdClass) {
+					throw new NotFoundException('Failed to parse JSON.');
+				}
+				$this->setConfigInstance($config);
+			}
+			parent::validateConfig();
+			return;
+		} catch (NotFoundException $e) {
+			$this->getOutput()->writeln('<error>' . $e->getMessage() . '</error>');
+			$helper = $this->getCommand()->getHelper('question');
+			$question = new Question(
+				"<info>You can get more info on https://deck.readthedocs.io/en/latest/User_documentation_en/#6-import-boards</info>\n" .
+				'Please inform a valid config json file: ',
+				'config.json'
+			);
+			$question->setValidator(function (string $answer) {
+				if (!is_file($answer)) {
+					throw new \RuntimeException(
+						'config file not found'
+					);
+				}
+				return $answer;
+			});
+			$configFile = $helper->ask($this->getInput(), $this->getOutput(), $question);
+			$this->getInput()->setOption('config', $configFile);
+		} catch (ConflictException $e) {
+			$this->getOutput()->writeln('<error>Invalid config file</error>');
+			$this->getOutput()->writeln(array_map(function (array $v): string {
+				return $v['message'];
+			}, $e->getData()));
+			$this->getOutput()->writeln('Valid schema:');
+			$this->getOutput()->writeln(print_r(file_get_contents($this->getJsonSchemaPath()), true));
+			$this->getInput()->setOption('config', '');
+		}
+		$this->validateConfig();
+	}
+
+	public function validateSystem(): void {
+		try {
+			parent::validateSystem();
+			return;
+		} catch (\Throwable $th) {
+		}
+		$helper = $this->getCommand()->getHelper('question');
+		$allowedSystems = $this->getAllowedImportSystems();
+		$names = array_column($allowedSystems, 'name');
+		$question = new ChoiceQuestion(
+			'Please inform a source system',
+			$names,
+			0
+		);
+		$question->setErrorMessage('System %s is invalid.');
+		$selectedName = $helper->ask($this->getInput(), $this->getOutput(), $question);
+		$className = $allowedSystems[array_flip($names)[$selectedName]]['internalName'];
+		$this->setSystem($className);
+		return;
+	}
+
+	protected function validateData(): void {
+		if (!$this->getImportSystem()->needValidateData()) {
+			return;
+		}
+		$data = $this->getInput()->getOption('data');
+		if (is_string($data)) {
+			$data = json_decode(file_get_contents($data));
+			if ($data instanceof \stdClass) {
+				$this->setData($data);
+				return;
+			}
+		}
+		$helper = $this->getCommand()->getHelper('question');
+		$question = new Question(
+			'Please provide a valid data json file: ',
+			'data.json'
+		);
+		$question->setValidator(function (string $answer) {
+			if (!is_file($answer)) {
+				throw new \RuntimeException(
+					'Data file not found'
+				);
+			}
+			return $answer;
+		});
+		$data = $helper->ask($this->getInput(), $this->getOutput(), $question);
+		$this->getInput()->setOption('data', $data);
+		$this->validateData();
+	}
+
+	public function bootstrap(): void {
+		$this->setSystem($this->getInput()->getOption('system'));
+		parent::bootstrap();
+	}
+
+	public function import(): void {
+		$this->getOutput()->writeln('Starting import...');
+		$this->bootstrap();
+		$this->getOutput()->writeln('Importing board...');
+		$this->importBoard();
+		$this->getOutput()->writeln('Assign users to board...');
+		$this->importAcl();
+		$this->getOutput()->writeln('Importing labels...');
+		$this->importLabels();
+		$this->getOutput()->writeln('Importing stacks...');
+		$this->importStacks();
+		$this->getOutput()->writeln('Importing cards...');
+		$this->importCards();
+		$this->getOutput()->writeln('Assign cards to labels...');
+		$this->assignCardsToLabels();
+		$this->getOutput()->writeln('Importing comments...');
+		$this->importComments();
+		$this->getOutput()->writeln('Importing participants...');
+		$this->importCardAssignments();
+	}
+}

lib/Service/Importer/BoardImportService.php

@@ -0,0 +1,449 @@
+<?php
+/**
+ * @copyright Copyright (c) 2021 Vitor Mattos <vitor@php.rio>
+ *
+ * @author Vitor Mattos <vitor@php.rio>
+ *
+ * @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\Service\Importer;
+
+use JsonSchema\Constraints\Constraint;
+use JsonSchema\Validator;
+use OCA\Deck\AppInfo\Application;
+use OCA\Deck\BadRequestException;
+use OCA\Deck\Db\AclMapper;
+use OCA\Deck\Db\AssignmentMapper;
+use OCA\Deck\Db\Attachment;
+use OCA\Deck\Db\AttachmentMapper;
+use OCA\Deck\Db\Board;
+use OCA\Deck\Db\BoardMapper;
+use OCA\Deck\Db\CardMapper;
+use OCA\Deck\Db\LabelMapper;
+use OCA\Deck\Db\StackMapper;
+use OCA\Deck\Event\BoardImportGetAllowedEvent;
+use OCA\Deck\Exceptions\ConflictException;
+use OCA\Deck\NotFoundException;
+use OCA\Deck\Service\FileService;
+use OCA\Deck\Service\Importer\Systems\TrelloApiService;
+use OCA\Deck\Service\Importer\Systems\TrelloJsonService;
+use OCP\Comments\IComment;
+use OCP\Comments\ICommentsManager;
+use OCP\Comments\NotFoundException as CommentNotFoundException;
+use OCP\EventDispatcher\IEventDispatcher;
+use OCP\IUserManager;
+
+class BoardImportService {
+	/** @var IUserManager */
+	private $userManager;
+	/** @var BoardMapper */
+	private $boardMapper;
+	/** @var AclMapper */
+	private $aclMapper;
+	/** @var LabelMapper */
+	private $labelMapper;
+	/** @var StackMapper */
+	private $stackMapper;
+	/** @var CardMapper */
+	private $cardMapper;
+	/** @var AssignmentMapper */
+	private $assignmentMapper;
+	/** @var AttachmentMapper */
+	private $attachmentMapper;
+	/** @var ICommentsManager */
+	private $commentsManager;
+	/** @var IEventDispatcher */
+	private $eventDispatcher;
+	/** @var string */
+	private $system = '';
+	/** @var null|ABoardImportService */
+	private $systemInstance;
+	/** @var array */
+	private $allowedSystems = [];
+	/**
+	 * Data object created from config JSON
+	 *
+	 * @var \stdClass
+	 * @psalm-suppress PropertyNotSetInConstructor
+	 */
+	public $config;
+	/**
+	 * Data object created from JSON of origin system
+	 *
+	 * @var \stdClass
+	 * @psalm-suppress PropertyNotSetInConstructor
+	 */
+	private $data;
+	/**
+	 * @var Board
+	 */
+	private $board;
+
+	public function __construct(
+		IUserManager $userManager,
+		BoardMapper $boardMapper,
+		AclMapper $aclMapper,
+		LabelMapper $labelMapper,
+		StackMapper $stackMapper,
+		AssignmentMapper $assignmentMapper,
+		AttachmentMapper $attachmentMapper,
+		CardMapper $cardMapper,
+		ICommentsManager $commentsManager,
+		IEventDispatcher $eventDispatcher
+	) {
+		$this->userManager = $userManager;
+		$this->boardMapper = $boardMapper;
+		$this->aclMapper = $aclMapper;
+		$this->labelMapper = $labelMapper;
+		$this->stackMapper = $stackMapper;
+		$this->cardMapper = $cardMapper;
+		$this->assignmentMapper = $assignmentMapper;
+		$this->attachmentMapper = $attachmentMapper;
+		$this->commentsManager = $commentsManager;
+		$this->eventDispatcher = $eventDispatcher;
+		$this->board = new Board();
+		$this->disableCommentsEvents();
+	}
+
+	private function disableCommentsEvents(): void {
+		if (defined('PHPUNIT_RUN')) {
+			return;
+		}
+		$propertyEventHandlers = new \ReflectionProperty($this->commentsManager, 'eventHandlers');
+		$propertyEventHandlers->setAccessible(true);
+		$propertyEventHandlers->setValue($this->commentsManager, []);
+
+		$propertyEventHandlerClosures = new \ReflectionProperty($this->commentsManager, 'eventHandlerClosures');
+		$propertyEventHandlerClosures->setAccessible(true);
+		$propertyEventHandlerClosures->setValue($this->commentsManager, []);
+	}
+
+	public function import(): void {
+		$this->bootstrap();
+		try {
+			$this->importBoard();
+			$this->importAcl();
+			$this->importLabels();
+			$this->importStacks();
+			$this->importCards();
+			$this->assignCardsToLabels();
+			$this->importComments();
+			$this->importCardAssignments();
+		} catch (\Throwable $th) {
+			throw new BadRequestException($th->getMessage());
+		}
+	}
+
+	public function validateSystem(): void {
+		$allowedSystems = $this->getAllowedImportSystems();
+		$allowedSystems = array_column($allowedSystems, 'internalName');
+		if (!in_array($this->getSystem(), $allowedSystems)) {
+			throw new NotFoundException('Invalid system');
+		}
+	}
+
+	/**
+	 * @param mixed $system
+	 * @return self
+	 */
+	public function setSystem($system): self {
+		$this->system = $system;
+		return $this;
+	}
+
+	public function getSystem(): string {
+		return $this->system;
+	}
+
+	public function addAllowedImportSystem($system): self {
+		$this->allowedSystems[] = $system;
+		return $this;
+	}
+
+	public function getAllowedImportSystems(): array {
+		if (!$this->allowedSystems) {
+			$this->addAllowedImportSystem([
+				'name' => TrelloApiService::$name,
+				'class' => TrelloApiService::class,
+				'internalName' => 'TrelloApi'
+			]);
+			$this->addAllowedImportSystem([
+				'name' => TrelloJsonService::$name,
+				'class' => TrelloJsonService::class,
+				'internalName' => 'TrelloJson'
+			]);
+		}
+		$this->eventDispatcher->dispatchTyped(new BoardImportGetAllowedEvent($this));
+		return $this->allowedSystems;
+	}
+
+	public function getImportSystem(): ABoardImportService {
+		if (!$this->getSystem()) {
+			throw new NotFoundException('System to import not found');
+		}
+		if (!is_object($this->systemInstance)) {
+			$systemClass = 'OCA\\Deck\\Service\\Importer\\Systems\\' . ucfirst($this->getSystem()) . 'Service';
+			$this->systemInstance = \OC::$server->get($systemClass);
+			$this->systemInstance->setImportService($this);
+		}
+		return $this->systemInstance;
+	}
+
+	public function setImportSystem(ABoardImportService $instance): void {
+		$this->systemInstance = $instance;
+	}
+
+	public function importBoard(): void {
+		$board = $this->getImportSystem()->getBoard();
+		if ($board) {
+			$this->boardMapper->insert($board);
+			$this->board = $board;
+		}
+	}
+
+	public function getBoard(bool $reset = false): Board {
+		if ($reset) {
+			$this->board = new Board();
+		}
+		return $this->board;
+	}
+
+	public function importAcl(): void {
+		$aclList = $this->getImportSystem()->getAclList();
+		foreach ($aclList as $code => $acl) {
+			$this->aclMapper->insert($acl);
+			$this->getImportSystem()->updateAcl($code, $acl);
+		}
+		$this->getBoard()->setAcl($aclList);
+	}
+
+	public function importLabels(): void {
+		$labels = $this->getImportSystem()->getLabels();
+		foreach ($labels as $code => $label) {
+			$this->labelMapper->insert($label);
+			$this->getImportSystem()->updateLabel($code, $label);
+		}
+		$this->getBoard()->setLabels($labels);
+	}
+
+	public function importStacks(): void {
+		$stacks = $this->getImportSystem()->getStacks();
+		foreach ($stacks as $code => $stack) {
+			$this->stackMapper->insert($stack);
+			$this->getImportSystem()->updateStack($code, $stack);
+		}
+		$this->getBoard()->setStacks(array_values($stacks));
+	}
+
+	public function importCards(): void {
+		$cards = $this->getImportSystem()->getCards();
+		foreach ($cards as $code => $card) {
+			$createdAt = $card->getCreatedAt();
+			$lastModified = $card->getLastModified();
+			$this->cardMapper->insert($card);
+			$updateDate = false;
+			if ($createdAt && $createdAt !== $card->getCreatedAt()) {
+				$card->setCreatedAt($createdAt);
+				$updateDate = true;
+			}
+			if ($lastModified && $lastModified !== $card->getLastModified()) {
+				$card->setLastModified($lastModified);
+				$updateDate = true;
+			}
+			if ($updateDate) {
+				$this->cardMapper->update($card, false);
+			}
+			$this->getImportSystem()->updateCard($code, $card);
+		}
+	}
+
+	/**
+	 * @param mixed $cardId
+	 * @param mixed $labelId
+	 * @return self
+	 */
+	public function assignCardToLabel($cardId, $labelId): self {
+		$this->cardMapper->assignLabel(
+			$cardId,
+			$labelId
+		);
+		return $this;
+	}
+
+	public function assignCardsToLabels(): void {
+		$data = $this->getImportSystem()->getCardLabelAssignment();
+		foreach ($data as $cardId => $assignemnt) {
+			foreach ($assignemnt as $assignmentId => $labelId) {
+				$this->assignCardToLabel(
+					$cardId,
+					$labelId
+				);
+				$this->getImportSystem()->updateCardLabelsAssignment($cardId, $assignmentId, $labelId);
+			}
+		}
+	}
+
+	public function importComments(): void {
+		$allComments = $this->getImportSystem()->getComments();
+		foreach ($allComments as $cardId => $comments) {
+			foreach ($comments as $commentId => $comment) {
+				$this->insertComment($cardId, $comment);
+				$this->getImportSystem()->updateComment($cardId, $commentId, $comment);
+			}
+		}
+	}
+
+	private function insertComment(string $cardId, IComment $comment): void {
+		$comment->setObject('deckCard', $cardId);
+		$comment->setVerb('comment');
+		// Check if parent is a comment on the same card
+		if ($comment->getParentId() !== '0') {
+			try {
+				$parent = $this->commentsManager->get($comment->getParentId());
+				if ($parent->getObjectType() !== Application::COMMENT_ENTITY_TYPE || $parent->getObjectId() !== $cardId) {
+					throw new CommentNotFoundException();
+				}
+			} catch (CommentNotFoundException $e) {
+				throw new BadRequestException('Invalid parent id: The parent comment was not found or belongs to a different card');
+			}
+		}
+
+		try {
+			$this->commentsManager->save($comment);
+		} catch (\InvalidArgumentException $e) {
+			throw new BadRequestException('Invalid input values');
+		} catch (CommentNotFoundException $e) {
+			throw new NotFoundException('Could not create comment.');
+		}
+	}
+
+	public function importCardAssignments(): void {
+		$allAssignments = $this->getImportSystem()->getCardAssignments();
+		foreach ($allAssignments as $cardId => $assignments) {
+			foreach ($assignments as $assignmentId => $assignment) {
+				$this->assignmentMapper->insert($assignment);
+				$this->getImportSystem()->updateCardAssignment($cardId, $assignmentId, $assignment);
+			}
+		}
+	}
+
+	public function insertAttachment(Attachment $attachment, string $content): Attachment {
+		$service = \OC::$server->get(FileService::class);
+		$folder = $service->getFolder($attachment);
+
+		if ($folder->fileExists($attachment->getData())) {
+			$attachment = $this->attachmentMapper->findByData($attachment->getCardId(), $attachment->getData());
+			throw new ConflictException('File already exists.', $attachment);
+		}
+
+		$target = $folder->newFile($attachment->getData());
+		$target->putContent($content);
+
+		$attachment = $this->attachmentMapper->insert($attachment);
+
+		$service->extendData($attachment);
+		return $attachment;
+	}
+
+	public function setData(\stdClass $data): void {
+		$this->data = $data;
+	}
+
+	public function getData(): \stdClass {
+		return $this->data;
+	}
+
+	/**
+	 * Define a config
+	 *
+	 * @param string $configName
+	 * @param mixed $value
+	 * @return void
+	 */
+	public function setConfig(string $configName, $value): void {
+		if (empty((array) $this->config)) {
+			$this->setConfigInstance(new \stdClass);
+		}
+		$this->config->$configName = $value;
+	}
+
+	/**
+	 * Get a config
+	 *
+	 * @param string $configName config name
+	 * @return mixed
+	 */
+	public function getConfig(string $configName) {
+		if (!property_exists($this->config, $configName)) {
+			return;
+		}
+		return $this->config->$configName;
+	}
+
+	/**
+	 * @param \stdClass $config
+	 * @return self
+	 */
+	public function setConfigInstance($config): self {
+		$this->config = $config;
+		return $this;
+	}
+
+	public function getConfigInstance(): \stdClass {
+		return $this->config;
+	}
+
+	protected function validateConfig(): void {
+		$config = $this->getConfigInstance();
+		$schemaPath = $this->getJsonSchemaPath();
+		$validator = new Validator();
+		$newConfig = clone $config;
+		$validator->validate(
+			$newConfig,
+			(object)['$ref' => 'file://' . realpath($schemaPath)],
+			Constraint::CHECK_MODE_APPLY_DEFAULTS
+		);
+		if (!$validator->isValid()) {
+			throw new ConflictException('Invalid config file', $validator->getErrors());
+		}
+		$this->setConfigInstance($newConfig);
+		$this->validateOwner();
+	}
+
+	public function getJsonSchemaPath(): string {
+		return $this->getImportSystem()->getJsonSchemaPath();
+	}
+
+	public function validateOwner(): void {
+		$owner = $this->userManager->get($this->getConfig('owner'));
+		if (!$owner) {
+			throw new \LogicException('Owner "' . $this->getConfig('owner')->getUID() . '" not found on Nextcloud. Check setting json.');
+		}
+		$this->setConfig('owner', $owner);
+	}
+
+	protected function validateData(): void {
+	}
+
+	public function bootstrap(): void {
+		$this->validateSystem();
+		$this->validateConfig();
+		$this->validateData();
+		$this->getImportSystem()->bootstrap();
+	}
+}

lib/Service/Importer/Systems/TrelloApiService.php

@@ -0,0 +1,214 @@
+<?php
+/**
+ * @copyright Copyright (c) 2021 Vitor Mattos <vitor@php.rio>
+ *
+ * @author Vitor Mattos <vitor@php.rio>
+ *
+ * @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\Service\Importer\Systems;
+
+use OCP\Http\Client\IClient;
+use OCP\Http\Client\IClientService;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\IUserManager;
+use Psr\Log\LoggerInterface;
+
+class TrelloApiService extends TrelloJsonService {
+	/** @var string */
+	public static $name = 'Trello API';
+	protected $needValidateData = false;
+	/** @var IClient */
+	private $httpClient;
+	/** @var LoggerInterface */
+	protected $logger;
+	/** @var string */
+	private $baseApiUrl = 'https://api.trello.com/1';
+	/** @var ?\stdClass[] */
+	private $boards;
+
+	public function __construct(
+		IUserManager $userManager,
+		IURLGenerator $urlGenerator,
+		IL10N $l10n,
+		LoggerInterface $logger,
+		IClientService $httpClientService
+	) {
+		parent::__construct($userManager, $urlGenerator, $l10n);
+		$this->logger = $logger;
+		$this->httpClient = $httpClientService->newClient();
+	}
+
+	public function bootstrap(): void {
+		$this->populateBoard();
+		$this->populateMembers();
+		$this->populateLabels();
+		$this->populateLists();
+		$this->populateCheckLists();
+		$this->populateCards();
+		$this->populateActions();
+		parent::bootstrap();
+	}
+
+	public function getJsonSchemaPath(): string {
+		return implode(DIRECTORY_SEPARATOR, [
+			__DIR__,
+			'..',
+			'fixtures',
+			'config-trelloApi-schema.json',
+		]);
+	}
+
+	private function populateActions(): void {
+		$data = $this->getImportService()->getData();
+		$data->actions = $this->doRequest(
+			'/boards/' . $data->id . '/actions',
+			[
+				'filter' => 'commentCard,createCard',
+				'fields=memberCreator,type,data,date',
+				'memberCreator_fields' => 'username',
+				'limit' => 1000
+			]
+		);
+	}
+
+	private function populateCards(): void {
+		$data = $this->getImportService()->getData();
+		$data->cards = $this->doRequest(
+			'/boards/' . $data->id . '/cards',
+			[
+				'fields' => 'id,idMembers,dateLastActivity,closed,idChecklists,name,idList,pos,desc,due,labels',
+				'attachments' => true,
+				'attachment_fields' => 'name,url,date',
+				'limit' => 1000
+			]
+		);
+	}
+
+	private function populateCheckLists(): void {
+		$data = $this->getImportService()->getData();
+		$data->checklists = $this->doRequest(
+			'/boards/' . $data->id . '/checkLists',
+			[
+				'fields' => 'id,idCard,name',
+				'checkItem_fields' => 'id,state,name',
+				'limit' => 1000
+			]
+		);
+	}
+
+	private function populateLists(): void {
+		$data = $this->getImportService()->getData();
+		$data->lists = $this->doRequest(
+			'/boards/' . $data->id . '/lists',
+			[
+				'fields' => 'id,name,closed',
+				'limit' => 1000
+			]
+		);
+	}
+
+	private function populateLabels(): void {
+		$data = $this->getImportService()->getData();
+		$data->labels = $this->doRequest(
+			'/boards/' . $data->id . '/labels',
+			[
+				'fields' => 'id,color,name',
+				'limit' => 1000
+			]
+		);
+	}
+
+	private function populateMembers(): void {
+		$data = $this->getImportService()->getData();
+		$data->members = $this->doRequest(
+			'/boards/' . $data->id . '/members',
+			[
+				'fields' => 'username',
+				'limit' => 1000
+			]
+		);
+	}
+
+	private function populateBoard(): void {
+		$toImport = $this->getImportService()->getConfig('board');
+		$board = $this->doRequest(
+			'/boards/' . $toImport,
+			['fields' => 'id,name']
+		);
+		if ($board instanceof \stdClass) {
+			$this->getImportService()->setData($board);
+			return;
+		}
+		throw new \Exception('Invalid board id to import');
+	}
+
+	/**
+	 * @return array|\stdClass
+	 */
+	private function doRequest(string $path = '', array $queryString = []) {
+		$target = $this->baseApiUrl . $path;
+		try {
+			$result = $this->httpClient
+				->get($target, $this->getQueryString($queryString))
+				->getBody();
+			if (is_string($result)) {
+				$data = json_decode($result);
+				if (is_array($data)) {
+					$data = array_merge(
+						$data,
+						$this->paginate($path, $queryString, $data)
+					);
+				}
+				return $data;
+			}
+			throw new \Exception('Invalid return of api');
+		} catch (\Throwable $e) {
+			$this->logger->critical(
+				$e->getMessage(),
+				['app' => 'deck']
+			);
+			throw new \Exception($e->getMessage());
+		}
+	}
+
+	private function paginate(string $path = '', array $queryString = [], array $data = []): array {
+		if (empty($queryString['limit'])) {
+			return [];
+		}
+		if (count($data) < $queryString['limit']) {
+			return [];
+		}
+		$queryString['before'] = end($data)->id;
+		$return = $this->doRequest($path, $queryString);
+		if (is_array($return)) {
+			return $return;
+		}
+		throw new \Exception('Invalid return of api');
+	}
+
+	private function getQueryString(array $params = []): array {
+		$apiSettings = $this->getImportService()->getConfig('api');
+		$params['key'] = $apiSettings->key;
+		$params['token'] = $apiSettings->token;
+		return [
+			'query' => $params
+		];
+	}
+}

lib/Service/Importer/Systems/TrelloJsonService.php

@@ -0,0 +1,400 @@
+<?php
+/**
+ * @copyright Copyright (c) 2021 Vitor Mattos <vitor@php.rio>
+ *
+ * @author Vitor Mattos <vitor@php.rio>
+ *
+ * @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\Service\Importer\Systems;
+
+use OC\Comments\Comment;
+use OCA\Deck\BadRequestException;
+use OCA\Deck\Db\Acl;
+use OCA\Deck\Db\Assignment;
+use OCA\Deck\Db\Attachment;
+use OCA\Deck\Db\Board;
+use OCA\Deck\Db\Card;
+use OCA\Deck\Db\Label;
+use OCA\Deck\Db\Stack;
+use OCA\Deck\Service\Importer\ABoardImportService;
+use OCP\Comments\IComment;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\IUser;
+use OCP\IUserManager;
+
+class TrelloJsonService extends ABoardImportService {
+	/** @var string */
+	public static $name = 'Trello JSON';
+	/** @var IUserManager */
+	private $userManager;
+	/** @var IURLGenerator */
+	private $urlGenerator;
+	/** @var IL10N */
+	private $l10n;
+	/** @var IUser[] */
+	private $members = [];
+
+	public function __construct(
+		IUserManager $userManager,
+		IURLGenerator $urlGenerator,
+		IL10N $l10n
+	) {
+		$this->userManager = $userManager;
+		$this->urlGenerator = $urlGenerator;
+		$this->l10n = $l10n;
+	}
+
+	public function bootstrap(): void {
+		$this->validateUsers();
+	}
+
+	public function getJsonSchemaPath(): string {
+		return implode(DIRECTORY_SEPARATOR, [
+			__DIR__,
+			'..',
+			'fixtures',
+			'config-trelloJson-schema.json',
+		]);
+	}
+
+	public function validateUsers(): void {
+		if (empty($this->getImportService()->getConfig('uidRelation'))) {
+			return;
+		}
+		foreach ($this->getImportService()->getConfig('uidRelation') as $trelloUid => $nextcloudUid) {
+			$user = array_filter($this->getImportService()->getData()->members, function (\stdClass $u) use ($trelloUid) {
+				return $u->username === $trelloUid;
+			});
+			if (!$user) {
+				throw new \LogicException('Trello user ' . $trelloUid . ' not found in property "members" of json data');
+			}
+			if (!is_string($nextcloudUid) && !is_numeric($nextcloudUid)) {
+				throw new \LogicException('User on setting uidRelation is invalid');
+			}
+			$nextcloudUid = (string) $nextcloudUid;
+			$this->getImportService()->getConfig('uidRelation')->$trelloUid = $this->userManager->get($nextcloudUid);
+			if (!$this->getImportService()->getConfig('uidRelation')->$trelloUid) {
+				throw new \LogicException('User on setting uidRelation not found: ' . $nextcloudUid);
+			}
+			$user = current($user);
+			$this->members[$user->id] = $this->getImportService()->getConfig('uidRelation')->$trelloUid;
+		}
+	}
+
+	public function getCardAssignments(): array {
+		$assignments = [];
+		foreach ($this->getImportService()->getData()->cards as $trelloCard) {
+			foreach ($trelloCard->idMembers as $idMember) {
+				if (empty($this->members[$idMember])) {
+					continue;
+				}
+				$assignment = new Assignment();
+				$assignment->setCardId($this->cards[$trelloCard->id]->getId());
+				$assignment->setParticipant($this->members[$idMember]->getUID());
+				$assignment->setType(Assignment::TYPE_USER);
+				$assignments[$trelloCard->id][] = $assignment;
+			}
+		}
+		return $assignments;
+	}
+
+	public function getComments(): array {
+		$comments = [];
+		foreach ($this->getImportService()->getData()->cards as $trelloCard) {
+			$values = array_filter(
+				$this->getImportService()->getData()->actions,
+				function (\stdClass $a) use ($trelloCard) {
+					return $a->type === 'commentCard' && $a->data->card->id === $trelloCard->id;
+				}
+			);
+			$keys = array_map(function (\stdClass $c): string {
+				return $c->id;
+			}, $values);
+			$trelloComments = array_combine($keys, $values);
+			$trelloComments = $this->sortComments($trelloComments);
+			foreach ($trelloComments as $commentId => $trelloComment) {
+				$cardId = $this->cards[$trelloCard->id]->getId();
+				$comment = new Comment();
+				if (!empty($this->getImportService()->getConfig('uidRelation')->{$trelloComment->memberCreator->username})) {
+					$actor = $this->getImportService()->getConfig('uidRelation')->{$trelloComment->memberCreator->username}->getUID();
+				} else {
+					$actor = $this->getImportService()->getConfig('owner')->getUID();
+				}
+				$message = $this->replaceUsernames($trelloComment->data->text);
+				if (mb_strlen($message, 'UTF-8') > IComment::MAX_MESSAGE_LENGTH) {
+					$attachment = new Attachment();
+					$attachment->setCardId($cardId);
+					$attachment->setType('deck_file');
+					$attachment->setCreatedBy($actor);
+					$attachment->setLastModified(time());
+					$attachment->setCreatedAt(time());
+					$attachment->setData('comment_' . $commentId . '.md');
+					$attachment = $this->getImportService()->insertAttachment($attachment, $message);
+
+					$urlToDownloadAttachment = $this->urlGenerator->linkToRouteAbsolute(
+						'deck.attachment.display',
+						[
+							'cardId' => $cardId,
+							'attachmentId' => $attachment->getId()
+						]
+					);
+					$message = $this->l10n->t(
+						"This comment has more than %s characters.\n" .
+						"Added as an attachment to the card with name %s.\n" .
+						"Accessible on URL: %s.",
+						[
+							IComment::MAX_MESSAGE_LENGTH,
+							'comment_' . $commentId . '.md',
+							$urlToDownloadAttachment
+						]
+					);
+				}
+				$comment
+					->setActor('users', $actor)
+					->setMessage($message)
+					->setCreationDateTime(
+						\DateTime::createFromFormat('Y-m-d\TH:i:s.v\Z', $trelloComment->date)
+					);
+				$comments[$cardId][$commentId] = $comment;
+			}
+		}
+		return $comments;
+	}
+
+	private function sortComments(array $comments): array {
+		$comparison = function (\stdClass $a, \stdClass $b): int {
+			if ($a->date == $b->date) {
+				return 0;
+			}
+			return ($a->date < $b->date) ? -1 : 1;
+		};
+
+		usort($comments, $comparison);
+		return $comments;
+	}
+
+	public function getCardLabelAssignment(): array {
+		$cardsLabels = [];
+		foreach ($this->getImportService()->getData()->cards as $trelloCard) {
+			foreach ($trelloCard->labels as $label) {
+				$cardId = $this->cards[$trelloCard->id]->getId();
+				$labelId = $this->labels[$label->id]->getId();
+				$cardsLabels[$cardId][] = $labelId;
+			}
+		}
+		return $cardsLabels;
+	}
+
+	public function getBoard(): Board {
+		$board = $this->getImportService()->getBoard();
+		if (empty($this->getImportService()->getData()->name)) {
+			throw new BadRequestException('Invalid name of board');
+		}
+		$board->setTitle($this->getImportService()->getData()->name);
+		$board->setOwner($this->getImportService()->getConfig('owner')->getUID());
+		$board->setColor($this->getImportService()->getConfig('color'));
+		return $board;
+	}
+
+	/**
+	 * @return Label[]
+	 */
+	public function getLabels(): array {
+		foreach ($this->getImportService()->getData()->labels as $trelloLabel) {
+			$label = new Label();
+			if (empty($trelloLabel->name)) {
+				$label->setTitle('Unnamed ' . $trelloLabel->color . ' label');
+			} else {
+				$label->setTitle($trelloLabel->name);
+			}
+			$label->setColor($this->translateColor($trelloLabel->color));
+			$label->setBoardId($this->getImportService()->getBoard()->getId());
+			$this->labels[$trelloLabel->id] = $label;
+		}
+		return $this->labels;
+	}
+
+	/**
+	 * @return Stack[]
+	 */
+	public function getStacks(): array {
+		$return = [];
+		foreach ($this->getImportService()->getData()->lists as $order => $list) {
+			$stack = new Stack();
+			if ($list->closed) {
+				$stack->setDeletedAt(time());
+			}
+			$stack->setTitle($list->name);
+			$stack->setBoardId($this->getImportService()->getBoard()->getId());
+			$stack->setOrder($order + 1);
+			$return[$list->id] = $stack;
+		}
+		return $return;
+	}
+
+	/**
+	 * @return Card[]
+	 */
+	public function getCards(): array {
+		$checklists = [];
+		foreach ($this->getImportService()->getData()->checklists as $checklist) {
+			$checklists[$checklist->idCard][$checklist->id] = $this->formulateChecklistText($checklist);
+		}
+		$this->getImportService()->getData()->checklists = $checklists;
+
+		$cards = [];
+		foreach ($this->getImportService()->getData()->cards as $trelloCard) {
+			$card = new Card();
+			$lastModified = \DateTime::createFromFormat('Y-m-d\TH:i:s.v\Z', $trelloCard->dateLastActivity);
+			$card->setLastModified($lastModified->format('Y-m-d H:i:s'));
+			if ($trelloCard->closed) {
+				$card->setArchived(true);
+			}
+			if ((count($trelloCard->idChecklists) !== 0)) {
+				foreach ($this->getImportService()->getData()->checklists[$trelloCard->id] as $checklist) {
+					$trelloCard->desc .= "\n" . $checklist;
+				}
+			}
+			$this->appendAttachmentsToDescription($trelloCard);
+
+			$card->setTitle($trelloCard->name);
+			$card->setStackId($this->stacks[$trelloCard->idList]->getId());
+			$cardsOnStack = $this->stacks[$trelloCard->idList]->getCards();
+			$cardsOnStack[] = $card;
+			$this->stacks[$trelloCard->idList]->setCards($cardsOnStack);
+			$card->setType('plain');
+			$card->setOrder($trelloCard->pos);
+			$card->setOwner($this->getImportService()->getConfig('owner')->getUID());
+
+			$lastModified = \DateTime::createFromFormat('Y-m-d\TH:i:s.v\Z', $trelloCard->dateLastActivity);
+			$card->setLastModified($lastModified->format('U'));
+
+			$createCardDate = array_filter(
+				$this->getImportService()->getData()->actions,
+				function (\stdClass $a) use ($trelloCard) {
+					return $a->type === 'createCard' && $a->data->card->id === $trelloCard->id;
+				}
+			);
+			$createCardDate = current($createCardDate);
+			$createCardDate = \DateTime::createFromFormat('Y-m-d\TH:i:s.v\Z', $createCardDate->date);
+			if ($createCardDate) {
+				$card->setCreatedAt($createCardDate->format('U'));
+			} else {
+				$card->setCreatedAt($lastModified->format('U'));
+			}
+
+			$card->setDescription($trelloCard->desc);
+			if ($trelloCard->due) {
+				$duedate = \DateTime::createFromFormat('Y-m-d\TH:i:s.v\Z', $trelloCard->due)
+					->format('Y-m-d H:i:s');
+				$card->setDuedate($duedate);
+			}
+			$cards[$trelloCard->id] = $card;
+		}
+		return $cards;
+	}
+
+	/**
+	 * @return Acl[]
+	 */
+	public function getAclList(): array {
+		$return = [];
+		foreach ($this->members as $member) {
+			if ($member->getUID() === $this->getImportService()->getConfig('owner')->getUID()) {
+				continue;
+			}
+			$acl = new Acl();
+			$acl->setBoardId($this->getImportService()->getBoard()->getId());
+			$acl->setType(Acl::PERMISSION_TYPE_USER);
+			$acl->setParticipant($member->getUID());
+			$acl->setPermissionEdit(false);
+			$acl->setPermissionShare(false);
+			$acl->setPermissionManage(false);
+			$return[] = $acl;
+		}
+		return $return;
+	}
+
+	private function translateColor(string $color): string {
+		switch ($color) {
+			case 'red':
+				return 'ff0000';
+			case 'yellow':
+				return 'ffff00';
+			case 'orange':
+				return 'ff6600';
+			case 'green':
+				return '00ff00';
+			case 'purple':
+				return '9900ff';
+			case 'blue':
+				return '0000ff';
+			case 'sky':
+				return '00ccff';
+			case 'lime':
+				return '00ff99';
+			case 'pink':
+				return 'ff66cc';
+			case 'black':
+				return '000000';
+			default:
+				return 'ffffff';
+		}
+	}
+
+	private function replaceUsernames(string $text): string {
+		foreach ($this->getImportService()->getConfig('uidRelation') as $trello => $nextcloud) {
+			$text = str_replace($trello, $nextcloud->getUID(), $text);
+		}
+		return $text;
+	}
+
+	private function checklistItem(\stdClass $item): string {
+		if (($item->state == 'incomplete')) {
+			$string_start = '- [ ]';
+		} else {
+			$string_start = '- [x]';
+		}
+		$check_item_string = $string_start . ' ' . $item->name . "\n";
+		return $check_item_string;
+	}
+
+	private function formulateChecklistText(\stdClass $checklist): string {
+		$checklist_string = "\n\n## {$checklist->name}\n";
+		foreach ($checklist->checkItems as $item) {
+			$checklist_item_string = $this->checklistItem($item);
+			$checklist_string = $checklist_string . "\n" . $checklist_item_string;
+		}
+		return $checklist_string;
+	}
+
+	private function appendAttachmentsToDescription(\stdClass $trelloCard): void {
+		if (empty($trelloCard->attachments)) {
+			return;
+		}
+		$trelloCard->desc .= "\n\n## {$this->l10n->t('Attachments')}\n";
+		$trelloCard->desc .= "| {$this->l10n->t('File')} | {$this->l10n->t('date')} |\n";
+		$trelloCard->desc .= "|---|---\n";
+		foreach ($trelloCard->attachments as $attachment) {
+			$name = mb_strlen($attachment->name, 'UTF-8') ? $attachment->name : $attachment->url;
+			$trelloCard->desc .= "| [{$name}]({$attachment->url}) | {$attachment->date} |\n";
+		}
+	}
+}

lib/Service/Importer/fixtures/config-trelloApi-schema.json

@@ -0,0 +1,41 @@
+{
+    "type": "object",
+    "properties": {
+        "api": {
+            "type": "object",
+            "properties": {
+                "key": {
+                    "type": "string",
+                    "pattern": "^[0-9a-fA-F]{32}$"
+                },
+                "token": {
+                    "type": "string",
+                    "pattern": "^[0-9a-fA-F]{64}$"
+                }
+            }
+        },
+        "board": {
+            "type": "string",
+            "pattern": "^\\w{1,}$"
+        },
+        "uidRelation": {
+            "type": "object",
+            "comment": "Relationship between Trello and Nextcloud usernames",
+            "example": {
+                "johndoe": "admin"
+            }
+        },
+        "owner": {
+            "type": "string",
+            "required": true,
+            "comment": "Nextcloud owner username"
+        },
+        "color": {
+            "type": "string",
+            "required": true,
+            "pattern": "^[0-9a-fA-F]{6}$",
+            "comment": "Default color for the board. If you don't inform, the default color will be used.",
+            "default": "0800fd"
+        }
+    }
+}

lib/Service/Importer/fixtures/config-trelloJson-schema.json

@@ -0,0 +1,24 @@
+{
+    "type": "object",
+    "properties": {
+        "uidRelation": {
+            "type": "object",
+            "comment": "Relationship between Trello and Nextcloud usernames",
+            "example": {
+                "johndoe": "admin"
+            }
+        },
+        "owner": {
+            "type": "string",
+            "required": true,
+            "comment": "Nextcloud owner username"
+        },
+        "color": {
+            "type": "string",
+            "required": true,
+            "pattern": "^[0-9a-fA-F]{6}$",
+            "comment": "Default color for the board. If you don't inform, the default color will be used.",
+            "default": "0800fd"
+        }
+    }
+}

lib/Service/OverviewService.php

@@ -114,7 +114,7 @@ class OverviewService {
 			$service = $this;
 
 			if (count($userBoard->getAcl()) === 0) {
-				// get cards with due date
+				// private board: get cards with due date
 				$findCards[] = array_map(static function ($card) use ($service, $userBoard, $userId) {
 					$service->enrich($card, $userId);
 					$cardData = $card->jsonSerialize();
@@ -122,13 +122,13 @@ class OverviewService {
 					return $cardData;
 				}, $this->cardMapper->findAllWithDue($userBoard->getId()));
 			} else {
-				// get assigned cards
+				// shared board: get all my assigned or unassigned cards
 				$findCards[] = array_map(static function ($card) use ($service, $userBoard, $userId) {
 					$service->enrich($card, $userId);
 					$cardData = $card->jsonSerialize();
 					$cardData['boardId'] = $userBoard->getId();
 					return $cardData;
-				}, $this->cardMapper->findAssignedCards($userBoard->getId(), $userId));
+				}, $this->cardMapper->findToMeOrNotAssignedCards($userBoard->getId(), $userId));
 			}
 		}
 		return $findCards;
@@ -138,7 +138,7 @@ class OverviewService {
 	private function findAllBoardsFromUser(string $userId): array {
 		$userInfo = $this->getBoardPrerequisites($userId);
 		$userBoards = $this->boardMapper->findAllByUser($userInfo['user'], null, null);
-		$groupBoards = $this->boardMapper->findAllByGroups($userInfo['user'], $userInfo['groups'],null, null);
+		$groupBoards = $this->boardMapper->findAllByGroups($userInfo['user'], $userInfo['groups'], null, null);
 		$circleBoards = $this->boardMapper->findAllByCircles($userInfo['user'], null, null);
 		return array_unique(array_merge($userBoards, $groupBoards, $circleBoards));
 	}

lib/Service/PermissionService.php

@@ -33,6 +33,7 @@ use OCA\Deck\Db\IPermissionMapper;
 use OCA\Deck\Db\User;
 use OCA\Deck\NoPermissionException;
 use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\IConfig;
 use OCP\IGroupManager;
@@ -42,6 +43,8 @@ use OCP\Share\IManager;
 
 class PermissionService {
 
+	/** @var CirclesService */
+	private $circlesService;
 	/** @var BoardMapper */
 	private $boardMapper;
 	/** @var AclMapper */
@@ -61,11 +64,11 @@ class PermissionService {
 	/** @var array */
 	private $users = [];
 
-	private $circlesEnabled = false;
 	private $boardCache;
 
 	public function __construct(
 		ILogger $logger,
+		CirclesService $circlesService,
 		AclMapper $aclMapper,
 		BoardMapper $boardMapper,
 		IUserManager $userManager,
@@ -74,6 +77,7 @@ class PermissionService {
 		IConfig $config,
 		$userId
 	) {
+		$this->circlesService = $circlesService;
 		$this->aclMapper = $aclMapper;
 		$this->boardMapper = $boardMapper;
 		$this->logger = $logger;
@@ -84,9 +88,6 @@ class PermissionService {
 		$this->userId = $userId;
 
 		$this->boardCache = new CappedMemoryCache();
-
-		$this->circlesEnabled = \OC::$server->getAppManager()->isEnabledForUser('circles') &&
-			(version_compare(\OC::$server->getAppManager()->getAppVersion('circles'), '0.17.1') >= 0);
 	}
 
 	/**
@@ -116,7 +117,7 @@ class PermissionService {
 	 */
 	public function matchPermissions(Board $board) {
 		$owner = $this->userIsBoardOwner($board->getId());
-		$acls = $board->getAcl();
+		$acls = $board->getAcl() ?? [];
 		return [
 			Acl::PERMISSION_READ => $owner || $this->userCan($acls, Acl::PERMISSION_READ),
 			Acl::PERMISSION_EDIT => $owner || $this->userCan($acls, Acl::PERMISSION_EDIT),
@@ -154,7 +155,7 @@ class PermissionService {
 		}
 
 		try {
-			$acls = $this->getBoard($boardId)->getAcl();
+			$acls = $this->getBoard($boardId)->getAcl() ?? [];
 			$result = $this->userCan($acls, $permission, $userId);
 			if ($result) {
 				return true;
@@ -210,10 +211,9 @@ class PermissionService {
 				return $acl->getPermission($permission);
 			}
 
-			if ($this->circlesEnabled && $acl->getType() === Acl::PERMISSION_TYPE_CIRCLE) {
+			if ($this->circlesService->isCirclesEnabled() && $acl->getType() === Acl::PERMISSION_TYPE_CIRCLE) {
 				try {
-					$member = \OCA\Circles\Api\v1\Circles::getMember($acl->getParticipant(), $this->userId, 1, true);
-					return $member->getLevel() >= Member::LEVEL_MEMBER && $acl->getPermission($permission);
+					return $this->circlesService->isUserInCircle($acl->getParticipant(), $userId) && $acl->getPermission($permission);
 				} catch (\Exception $e) {
 					$this->logger->info('Member not found in circle that was accessed. This should not happen.');
 				}
@@ -241,6 +241,7 @@ class PermissionService {
 		if (array_key_exists((string) $boardId, $this->users) && !$refresh) {
 			return $this->users[(string) $boardId];
 		}
+
 		try {
 			$board = $this->boardMapper->find($boardId);
 		} catch (DoesNotExistException $e) {
@@ -278,15 +279,19 @@ class PermissionService {
 				}
 			}
 
-			if ($this->circlesEnabled && $acl->getType() === Acl::PERMISSION_TYPE_CIRCLE) {
+			if ($this->circlesService->isCirclesEnabled() && $acl->getType() === Acl::PERMISSION_TYPE_CIRCLE) {
 				try {
-					$circle = \OCA\Circles\Api\v1\Circles::detailsCircle($acl->getParticipant(), true);
+					$circle = $this->circlesService->getCircle($acl->getParticipant());
 					if ($circle === null) {
 						$this->logger->info('No circle found for acl rule ' . $acl->getId());
 						continue;
 					}
 
-					foreach ($circle->getMembers() as $member) {
+					foreach ($circle->getInheritedMembers() as $member) {
+						if ($member->getUserType() !== 1 || $member->getLevel() < Member::LEVEL_MEMBER) {
+							// deck currently only supports user members in circles
+							continue;
+						}
 						$user = $this->userManager->get($member->getUserId());
 						if ($user === null) {
 							$this->logger->info('No user found for circle member ' . $member->getUserId());
@@ -304,6 +309,10 @@ class PermissionService {
 	}
 
 	public function canCreate() {
+		if ($this->userId === null) {
+			return false;
+		}
+
 		$groups = $this->getGroupLimitList();
 		if (count($groups) === 0) {
 			return true;
@@ -324,4 +333,13 @@ class PermissionService {
 		}
 		return $groups;
 	}
+
+	/**
+	 * Set a different user than the current one, e.g. when no user is available in occ
+	 *
+	 * @param string $userId
+	 */
+	public function setUserId(string $userId): void {
+		$this->userId = $userId;
+	}
 }

lib/Service/SearchService.php

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

lib/Service/StackService.php

@@ -35,6 +35,7 @@ use OCA\Deck\Db\ChangeHelper;
 use OCA\Deck\Db\LabelMapper;
 use OCA\Deck\Db\Stack;
 use OCA\Deck\Db\StackMapper;
+use OCA\Deck\NoPermissionException;
 use OCA\Deck\StatusException;
 
 class StackService {
@@ -142,7 +143,12 @@ class StackService {
 	}
 
 	public function findCalendarEntries($boardId) {
-		$this->permissionService->checkPermission(null, $boardId, Acl::PERMISSION_READ);
+		try {
+			$this->permissionService->checkPermission(null, $boardId, Acl::PERMISSION_READ);
+		} catch (NoPermissionException $e) {
+			\OC::$server->getLogger()->error('Unable to check permission for a previously obtained board ' . $boardId, ['exception' => $e]);
+			return [];
+		}
 		return $this->stackMapper->findAll($boardId);
 	}
 

lib/Sharing/DeckShareProvider.php

@@ -500,7 +500,7 @@ class DeckShareProvider implements \OCP\Share\IShareProvider {
 			);
 		}
 
-		$qb->innerJoin('s', 'filecache' ,'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
+		$qb->innerJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
 		$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
 
 		$qb->orderBy('s.id');

mkdocs.yml

@@ -11,4 +11,6 @@ pages:
         - Nextcloud API: API-Nextcloud.md
     - Developer documentation:
         - Data structure: structure.md
-
+        - Import documentation:
+            - Implement import: implement-import.md
+            - Class diagram: import-class-diagram.md

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "deck",
 	"description": "",
-	"version": "1.4.8",
+	"version": "1.7.0-beta1",
 	"authors": [
 		{
 			"name": "Julius Härtl",
@@ -29,34 +29,35 @@
 	},
 	"dependencies": {
 		"@babel/polyfill": "^7.12.1",
-		"@babel/runtime": "^7.13.10",
+		"@babel/runtime": "^7.17.8",
 		"@juliushaertl/vue-richtext": "^1.0.1",
 		"@nextcloud/auth": "^1.3.0",
-		"@nextcloud/axios": "^1.6.0",
-		"@nextcloud/dialogs": "^3.1.1",
-		"@nextcloud/event-bus": "^1.2.0",
-		"@nextcloud/files": "^1.1.0",
-		"@nextcloud/initial-state": "^1.2.0",
+		"@nextcloud/axios": "^1.9.0",
+		"@nextcloud/dialogs": "^3.1.2",
+		"@nextcloud/event-bus": "^2.1.1",
+		"@nextcloud/files": "^2.1.0",
+		"@nextcloud/initial-state": "^1.2.1",
 		"@nextcloud/l10n": "^1.4.1",
-		"@nextcloud/moment": "^1.1.1",
-		"@nextcloud/router": "^1.2.0",
-		"@nextcloud/vue": "^3.8.0",
-		"@nextcloud/vue-dashboard": "^1.1.0",
-		"blueimp-md5": "^2.18.0",
-		"dompurify": "^2.2.7",
+		"@nextcloud/moment": "^1.2.0",
+		"@nextcloud/router": "^2.0.0",
+		"@nextcloud/vue": "^5.1.1",
+		"@nextcloud/vue-dashboard": "^2.0.1",
+		"blueimp-md5": "^2.19.0",
+		"dompurify": "^2.3.6",
 		"lodash": "^4.17.21",
-		"markdown-it": "^12.0.4",
+		"markdown-it": "^12.3.2",
 		"markdown-it-task-lists": "^2.1.1",
+		"markdown-it-link-attributes": "^4.0.0",
 		"moment": "^2.29.1",
 		"nextcloud-vue-collections": "^0.9.0",
 		"p-queue": "^6.6.2",
 		"url-search-params-polyfill": "^8.1.1",
-		"vue": "^2.6.12",
+		"vue": "^2.6.14",
 		"vue-at": "^2.5.0-beta.2",
 		"vue-click-outside": "^1.1.0",
-		"vue-easymde": "^1.4.0",
+		"vue-easymde": "^2.0.0",
 		"vue-infinite-loading": "^2.4.5",
-		"vue-router": "^3.5.1",
+		"vue-router": "^3.5.3",
 		"vue-smooth-dnd": "^0.8.1",
 		"vuex": "^3.6.2",
 		"vuex-router-sync": "^5.0.0"
@@ -65,53 +66,20 @@
 		"extends @nextcloud/browserslist-config"
 	],
 	"engines": {
-		"node": ">=10.0.0"
+		"node": "^14.0.0",
+		"npm": "^7.0.0"
 	},
 	"devDependencies": {
-		"@babel/core": "^7.13.14",
-		"@babel/plugin-syntax-dynamic-import": "^7.8.3",
-		"@babel/preset-env": "^7.13.12",
-		"@nextcloud/browserslist-config": "^1.0.0",
-		"@nextcloud/eslint-config": "^2.2.0",
-		"@nextcloud/eslint-plugin": "^1.5.0",
-		"@nextcloud/webpack-vue-config": "^1.4.1",
-		"@relative-ci/agent": "^1.5.0",
-		"@vue/test-utils": "^1.1.3",
-		"acorn": "^8.1.0",
-		"babel-eslint": "^10.1.0",
-		"babel-jest": "^26.6.3",
-		"babel-loader": "^8.2.2",
-		"css-loader": "^4.3.0",
-		"eslint": "^6.8.0",
-		"eslint-config-standard": "^14.1.1",
-		"eslint-friendly-formatter": "^4.0.1",
-		"eslint-loader": "^4.0.2",
-		"eslint-plugin-import": "^2.22.1",
-		"eslint-plugin-node": "^11.1.0",
-		"eslint-plugin-promise": "^4.3.1",
-		"eslint-plugin-standard": "^4.1.0",
-		"eslint-plugin-vue": "^6.2.2",
-		"file-loader": "^6.2.0",
-		"jest": "^26.6.3",
+		"@nextcloud/babel-config": "^1.0.0",
+		"@nextcloud/browserslist-config": "^2.2.0",
+		"@nextcloud/eslint-config": "^6.1.2",
+		"@nextcloud/stylelint-config": "^2.1.2",
+		"@nextcloud/webpack-vue-config": "^5.0.0",
+		"@relative-ci/agent": "^3.1.2",
+		"@vue/test-utils": "^1.3.0",
+		"jest": "^27.5.1",
 		"jest-serializer-vue": "^2.0.2",
-		"minimist": "^1.2.5",
-		"node-sass": "^4.14.1",
-		"raw-loader": "^4.0.2",
-		"sass-loader": "^10.1.1",
-		"style-loader": "^1.3.0",
-		"stylelint": "^13.12.0",
-		"stylelint-config-recommended": "^4.0.0",
-		"stylelint-config-recommended-scss": "^4.2.0",
-		"stylelint-scss": "^3.19.0",
-		"stylelint-webpack-plugin": "^2.1.1",
-		"url-loader": "^4.1.1",
-		"vue-jest": "^3.0.7",
-		"vue-loader": "^15.9.6",
-		"vue-template-compiler": "^2.6.12",
-		"webpack": "^4.46.0",
-		"webpack-cli": "^3.3.12",
-		"webpack-dev-server": "^3.11.2",
-		"webpack-merge": "^5.7.3"
+		"vue-jest": "^3.0.7"
 	},
 	"jest": {
 		"moduleFileExtensions": [
@@ -129,4 +97,4 @@
 			"<rootDir>/node_modules/jest-serializer-vue"
 		]
 	}
-}
+}

src/App.vue

@@ -59,6 +59,11 @@ export default {
 		Content,
 		AppContent,
 	},
+	provide() {
+		return {
+			boardApi,
+		}
+	},
 	data() {
 		return {
 			addButton: {
@@ -83,7 +88,6 @@ export default {
 			navShown: state => state.navShown,
 			sidebarShownState: state => state.sidebarShown,
 			currentBoard: state => state.currentBoard,
-			cardDetailsInModal: state => state.cardDetailsInModal,
 		}),
 		// TODO: properly handle sidebar showing for route subview and board sidebar
 		sidebarRouterView() {
@@ -93,6 +97,14 @@ export default {
 		sidebarShown() {
 			return this.sidebarRouterView || this.sidebarShownState
 		},
+		cardDetailsInModal: {
+			get() {
+				return this.$store.getters.config('cardDetailsInModal')
+			},
+			set(newValue) {
+				this.$store.dispatch('setConfig', { cardDetailsInModal: newValue })
+			},
+		},
 	},
 	created() {
 		this.$store.dispatch('loadBoards')
@@ -112,11 +124,6 @@ export default {
 			this.$router.push({ name: 'board' })
 		},
 	},
-	provide() {
-		return {
-			boardApi,
-		}
-	},
 }
 </script>
 
@@ -150,10 +157,9 @@ export default {
 
 	.modal__card {
 		min-width: 320px;
-		width: 50vw;
-		max-width: 800px;
+		width: 100%;
 		min-height: 200px;
-		height: 80vh;
+		height: auto;
 	}
 </style>
 
@@ -163,4 +169,10 @@ export default {
 		width: 100%;
 	}
 
+	.modal-wrapper--normal .modal-container{
+		width: 900px !important;
+		height: 800px !important;
+		overflow-y: hidden !important;
+	}
+
 </style>

src/CardCreateDialog.vue

@@ -72,10 +72,10 @@
 			</div>
 			<div v-else id="modal-inner">
 				<EmptyContent v-if="creating" icon="icon-loading">
-					{{ t('deck', 'Creating the new card…') }}
+					{{ t('deck', 'Creating the new card …') }}
 				</EmptyContent>
 				<EmptyContent v-else-if="created" icon="icon-checkmark">
-					{{ t('deck', '"{card}" was added to "{board}"', { card: pendingTitle, board: selectedBoard.title }) }}
+					{{ t('deck', 'Card "{card}" was added to "{board}"', { card: pendingTitle, board: selectedBoard.title }) }}
 					<template #desc>
 						<button class="primary" @click="openNewCard">
 							{{ t('deck', 'Open card') }}
@@ -168,6 +168,7 @@ export default {
 
 		},
 		close() {
+			this.$emit('close')
 			this.$root.$emit('close')
 		},
 		async select() {

src/components/ActivityEntry.vue

@@ -79,7 +79,7 @@ export default {
 				parameters.after.name = moment(dateTime).format('L LTS')
 			}
 
-			Object.keys(parameters).map(function(key, index) {
+			Object.keys(parameters).forEach(function(key, index) {
 				const { type } = parameters[key]
 				switch (type) {
 				case 'highlight':

src/components/ActivityList.vue

@@ -84,7 +84,7 @@ export default {
 			params.append('object_id', '' + this.objectId)
 			params.append('limit', ACTIVITY_FETCH_LIMIT)
 
-			const response = await axios.get(generateOcsUrl('apps/activity/api/v2/activity') + this.filter + '?' + params)
+			const response = await axios.get(generateOcsUrl(`apps/activity/api/v2/activity/${this.filter}`) + '?' + params)
 			let activities = response.data.ocs.data
 			if (this.filter === 'deck') {
 				// We need to manually filter activities here, since currently we use two different types and there is no way

src/components/Controls.vue

@@ -25,6 +25,12 @@
 		<div v-if="overviewName" class="board-title">
 			<div class="board-bullet icon-calendar-dark" />
 			<h2>{{ overviewName }}</h2>
+			<Actions>
+				<ActionButton icon="icon-add" @click="clickShowAddCardModel">
+					{{ t('deck', 'Add card') }}
+				</ActionButton>
+			</Actions>
+			<CardCreateDialog v-if="showAddCardModal" @close="clickHideAddCardModel" />
 		</div>
 		<div v-else-if="board" class="board-title">
 			<div :style="{backgroundColor: '#' + board.color}" class="board-bullet" />
@@ -70,110 +76,108 @@
 						<ActionButton v-else icon="icon-filter" />
 					</Actions>
 
-					<template>
-						<div v-if="filterVisible" class="filter">
-							<h3>{{ t('deck', 'Filter by tag') }}</h3>
-							<div v-for="label in labelsSorted" :key="label.id" class="filter--item">
-								<input
-									:id="label.id"
-									v-model="filter.tags"
-									type="checkbox"
-									class="checkbox"
-									:value="label.id"
-									@change="setFilter">
-								<label :for="label.id"><span class="label" :style="labelStyle(label)">{{ label.title }}</span></label>
-							</div>
-
-							<h3>{{ t('deck', 'Filter by assigned user') }}</h3>
-							<div class="filter--item">
-								<input
-									id="unassigned"
-									v-model="filter.unassigned"
-									type="checkbox"
-									class="checkbox"
-									value="unassigned"
-									@change="setFilter"
-									@click="beforeSetFilter">
-								<label for="unassigned">{{ t('deck', 'Unassigned') }}</label>
-							</div>
-							<div v-for="user in board.users" :key="user.uid" class="filter--item">
-								<input
-									:id="user.uid"
-									v-model="filter.users"
-									type="checkbox"
-									class="checkbox"
-									:value="user.uid"
-									@change="setFilter">
-								<label :for="user.uid"><Avatar :user="user.uid" :size="24" :disable-menu="true" /> {{ user.displayname }}</label>
-							</div>
-
-							<h3>{{ t('deck', 'Filter by due date') }}</h3>
-
-							<div class="filter--item">
-								<input
-									id="overdue"
-									v-model="filter.due"
-									type="radio"
-									class="radio"
-									value="overdue"
-									@change="setFilter"
-									@click="beforeSetFilter">
-								<label for="overdue">{{ t('deck', 'Overdue') }}</label>
-							</div>
-
-							<div class="filter--item">
-								<input
-									id="dueToday"
-									v-model="filter.due"
-									type="radio"
-									class="radio"
-									value="dueToday"
-									@change="setFilter"
-									@click="beforeSetFilter">
-								<label for="dueToday">{{ t('deck', 'Next 24 hours') }}</label>
-							</div>
-
-							<div class="filter--item">
-								<input
-									id="dueWeek"
-									v-model="filter.due"
-									type="radio"
-									class="radio"
-									value="dueWeek"
-									@change="setFilter"
-									@click="beforeSetFilter">
-								<label for="dueWeek">{{ t('deck', 'Next 7 days') }}</label>
-							</div>
-
-							<div class="filter--item">
-								<input
-									id="dueMonth"
-									v-model="filter.due"
-									type="radio"
-									class="radio"
-									value="dueMonth"
-									@change="setFilter"
-									@click="beforeSetFilter">
-								<label for="dueMonth">{{ t('deck', 'Next 30 days') }}</label>
-							</div>
-
-							<div class="filter--item">
-								<input
-									id="noDue"
-									v-model="filter.due"
-									type="radio"
-									class="radio"
-									value="noDue"
-									@change="setFilter"
-									@click="beforeSetFilter">
-								<label for="noDue">{{ t('deck', 'No due date') }}</label>
-							</div>
-
-							<Button :disabled="!isFilterActive" @click="clearFilter">
-								{{ t('deck', 'Clear filter') }}
-							</Button>
+					<div v-if="filterVisible" class="filter">
+						<h3>{{ t('deck', 'Filter by tag') }}</h3>
+						<div v-for="label in labelsSorted" :key="label.id" class="filter--item">
+							<input
+								:id="label.id"
+								v-model="filter.tags"
+								type="checkbox"
+								class="checkbox"
+								:value="label.id"
+								@change="setFilter">
+							<label :for="label.id"><span class="label" :style="labelStyle(label)">{{ label.title }}</span></label>
 						</div>
-					</template>
+
+						<h3>{{ t('deck', 'Filter by assigned user') }}</h3>
+						<div class="filter--item">
+							<input
+								id="unassigned"
+								v-model="filter.unassigned"
+								type="checkbox"
+								class="checkbox"
+								value="unassigned"
+								@change="setFilter"
+								@click="beforeSetFilter">
+							<label for="unassigned">{{ t('deck', 'Unassigned') }}</label>
+						</div>
+						<div v-for="user in board.users" :key="user.uid" class="filter--item">
+							<input
+								:id="user.uid"
+								v-model="filter.users"
+								type="checkbox"
+								class="checkbox"
+								:value="user.uid"
+								@change="setFilter">
+							<label :for="user.uid"><Avatar :user="user.uid" :size="24" :disable-menu="true" /> {{ user.displayname }}</label>
+						</div>
+
+						<h3>{{ t('deck', 'Filter by due date') }}</h3>
+
+						<div class="filter--item">
+							<input
+								id="overdue"
+								v-model="filter.due"
+								type="radio"
+								class="radio"
+								value="overdue"
+								@change="setFilter"
+								@click="beforeSetFilter">
+							<label for="overdue">{{ t('deck', 'Overdue') }}</label>
+						</div>
+
+						<div class="filter--item">
+							<input
+								id="dueToday"
+								v-model="filter.due"
+								type="radio"
+								class="radio"
+								value="dueToday"
+								@change="setFilter"
+								@click="beforeSetFilter">
+							<label for="dueToday">{{ t('deck', 'Next 24 hours') }}</label>
+						</div>
+
+						<div class="filter--item">
+							<input
+								id="dueWeek"
+								v-model="filter.due"
+								type="radio"
+								class="radio"
+								value="dueWeek"
+								@change="setFilter"
+								@click="beforeSetFilter">
+							<label for="dueWeek">{{ t('deck', 'Next 7 days') }}</label>
+						</div>
+
+						<div class="filter--item">
+							<input
+								id="dueMonth"
+								v-model="filter.due"
+								type="radio"
+								class="radio"
+								value="dueMonth"
+								@change="setFilter"
+								@click="beforeSetFilter">
+							<label for="dueMonth">{{ t('deck', 'Next 30 days') }}</label>
+						</div>
+
+						<div class="filter--item">
+							<input
+								id="noDue"
+								v-model="filter.due"
+								type="radio"
+								class="radio"
+								value="noDue"
+								@change="setFilter"
+								@click="beforeSetFilter">
+							<label for="noDue">{{ t('deck', 'No due date') }}</label>
+						</div>
+
+						<Button :disabled="!isFilterActive" @click="clearFilter">
+							{{ t('deck', 'Clear filter') }}
+						</Button>
+					</div>
 				</Popover>
 
 				<Actions>
@@ -206,11 +210,12 @@
 import { mapState, mapGetters } from 'vuex'
 import { Actions, ActionButton, Popover, Avatar } from '@nextcloud/vue'
 import labelStyle from '../mixins/labelStyle'
+import CardCreateDialog from '../CardCreateDialog'
 
 export default {
 	name: 'Controls',
 	components: {
-		Actions, ActionButton, Popover, Avatar,
+		Actions, ActionButton, Popover, Avatar, CardCreateDialog,
 	},
 	mixins: [labelStyle],
 	props: {
@@ -233,6 +238,8 @@ export default {
 			showArchived: false,
 			isAddStackVisible: false,
 			filter: { tags: [], users: [], due: '', unassigned: false },
+			showAddCardModal: false,
+			defaultPageTitle: false,
 		}
 	},
 
@@ -260,11 +267,17 @@ export default {
 			return [...this.board.labels].sort((a, b) => (a.title < b.title) ? -1 : 1)
 		},
 	},
+	beforeDestroy() {
+		this.setPageTitle('')
+	},
 	watch: {
 		board(current, previous) {
 			if (current?.id !== previous?.id) {
 				this.clearFilter()
 			}
+			if (current) {
+				this.setPageTitle(current.title)
+			}
 		},
 	},
 	methods: {
@@ -318,6 +331,28 @@ export default {
 			this.$store.dispatch('setFilter', { ...filterReset })
 			this.filter = filterReset
 		},
+		clickShowAddCardModel() {
+			this.showAddCardModal = true
+		},
+		clickHideAddCardModel() {
+			this.showAddCardModal = false
+		},
+		setPageTitle(title) {
+			if (this.defaultPageTitle === false) {
+				this.defaultPageTitle = window.document.title
+				if (this.defaultPageTitle.indexOf(' - Deck - ') !== -1) {
+					this.defaultPageTitle = this.defaultPageTitle.substring(this.defaultPageTitle.indexOf(' - Deck - ') + 3)
+				}
+				if (this.defaultPageTitle.indexOf('Deck - ') !== 0) {
+					this.defaultPageTitle = 'Deck - ' + this.defaultPageTitle
+				}
+			}
+			let newTitle = this.defaultPageTitle
+			if (title !== '') {
+				newTitle = `${title} - ${newTitle}`
+			}
+			window.document.title = newTitle
+		},
 	},
 }
 </script>

src/components/Sidebar.vue

@@ -45,4 +45,7 @@ export default {
 	#app-sidebar .icon-close {
 		z-index: 100;
 	}
+	.app-deck .app-sidebar {
+		z-index: 20000 !important;
+	}
 </style>

src/components/board/Board.vue

@@ -77,6 +77,7 @@ import Controls from '../Controls'
 import Stack from './Stack'
 import { EmptyContent } from '@nextcloud/vue'
 import GlobalSearchResults from '../search/GlobalSearchResults'
+import { showError } from '../../helpers/errors'
 
 export default {
 	name: 'Board',
@@ -139,6 +140,7 @@ export default {
 				await this.$store.dispatch('loadStacks', this.id)
 			} catch (e) {
 				console.error(e)
+				showError(e)
 			}
 			this.loading = false
 		},

src/components/board/SharingTabSidebar.vue

@@ -53,6 +53,9 @@
 					<ActionCheckbox v-if="canManage" :checked="acl.permissionManage" @change="clickManageAcl(acl)">
 						{{ t('deck', 'Can manage') }}
 					</ActionCheckbox>
+					<ActionCheckbox v-if="acl.type === 0 && isCurrentUser(board.owner.uid)" :checked="acl.owner" @change="clickTransferOwner(acl.participant.uid)">
+						{{ t('deck', 'Owner') }}
+					</ActionCheckbox>
 					<ActionButton v-if="canManage" icon="icon-delete" @click="clickDeleteAcl(acl)">
 						{{ t('deck', 'Delete') }}
 					</ActionButton>
@@ -72,7 +75,7 @@ import { Avatar, Multiselect, Actions, ActionButton, ActionCheckbox } from '@nex
 import { CollectionList } from 'nextcloud-vue-collections'
 import { mapGetters, mapState } from 'vuex'
 import { getCurrentUser } from '@nextcloud/auth'
-import { showError } from '@nextcloud/dialogs'
+import { showError, showSuccess } from '@nextcloud/dialogs'
 import debounce from 'lodash/debounce'
 
 export default {
@@ -97,6 +100,7 @@ export default {
 			isSearching: false,
 			addAcl: null,
 			addAclForAPI: null,
+			newOwner: null,
 		}
 	},
 	computed: {
@@ -194,6 +198,38 @@ export default {
 		clickDeleteAcl(acl) {
 			this.$store.dispatch('deleteAclFromCurrentBoard', acl)
 		},
+		clickTransferOwner(newOwner) {
+			OC.dialogs.confirmDestructive(
+				t('deck', 'Are you sure you want to transfer the board {title} for {user}?', { title: this.board.title, user: newOwner }),
+				t('deck', 'Transfer the board.'),
+				{
+					type: OC.dialogs.YES_NO_BUTTONS,
+					confirm: t('deck', 'Transfer'),
+					confirmClasses: 'error',
+					cancel: t('deck', 'Cancel'),
+				},
+				async (result) => {
+					if (result) {
+						try {
+							this.isLoading = true
+							await this.$store.dispatch('transferOwnership', {
+								boardId: this.board.id,
+								newOwner
+							})
+							const successMessage = t('deck', 'Transfer the board for {user} successfully', { user: newOwner })
+							showSuccess(successMessage)
+							this.$router.push({ name: 'main' })
+						} catch (e) {
+							const errorMessage = t('deck', 'Failed to transfer the board for {user}', { user: newOwner.user })
+							showError(errorMessage)
+						} finally {
+							this.isLoading = false
+						}
+					}
+				},
+				true
+			)
+		},
 	},
 }
 </script>

src/components/board/Stack.vue

@@ -162,7 +162,6 @@ export default {
 		]),
 		...mapState({
 			showArchived: state => state.showArchived,
-			cardDetailsInModal: state => state.cardDetailsInModal,
 		}),
 		cardsByStack() {
 			return this.$store.getters.cardsByStack(this.stack.id).filter((card) => {
@@ -175,6 +174,14 @@ export default {
 		dragHandleSelector() {
 			return this.canEdit ? null : '.no-drag'
 		},
+		cardDetailsInModal: {
+			get() {
+				return this.$store.getters.config('cardDetailsInModal')
+			},
+			set(newValue) {
+				this.$store.dispatch('setConfig', { cardDetailsInModal: newValue })
+			},
+		},
 	},
 
 	methods: {
@@ -264,12 +271,14 @@ export default {
 
 <style lang="scss" scoped>
 
+	@use 'sass:math';
+
 	@import './../../css/variables';
 
 	.stack {
 		width: $stack-width + $stack-spacing*3;
-		margin-left: $stack-spacing/2;
-		margin-right: $stack-spacing/2;
+		margin-left: math.div($stack-spacing, 2);
+		margin-right: math.div($stack-spacing, 2);
 	}
 
 	.stack__header {

src/components/board/TagsTabSidebar.vue

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

src/components/card/AttachmentList.vue

@@ -71,7 +71,7 @@
 					</a>
 				</div>
 				<Actions v-if="selectable">
-					<ActionButton icon="icon-confirm" @click="$emit('selectAttachment', attachment)">
+					<ActionButton icon="icon-confirm" @click="$emit('select-attachment', attachment)">
 						{{ t('deck', 'Add this attachment') }}
 					</ActionButton>
 				</Actions>
@@ -89,10 +89,10 @@
 						{{ t('deck', 'Remove attachment') }}
 					</ActionButton>
 
-					<ActionButton v-if="!attachment.extendedData.fileid && attachment.deletedAt === 0" icon="icon-delete" @click="$emit('deleteAttachment', attachment)">
+					<ActionButton v-if="!attachment.extendedData.fileid && attachment.deletedAt === 0" icon="icon-delete" @click="$emit('delete-attachment', attachment)">
 						{{ t('deck', 'Delete Attachment') }}
 					</ActionButton>
-					<ActionButton v-else-if="!attachment.extendedData.fileid" icon="icon-history" @click="$emit('restoreAttachment', attachment)">
+					<ActionButton v-else-if="!attachment.extendedData.fileid" icon="icon-history" @click="$emit('restore-attachment', attachment)">
 						{{ t('deck', 'Restore Attachment') }}
 					</ActionButton>
 				</Actions>
@@ -222,13 +222,13 @@ export default {
 		},
 		shareFromFiles() {
 			picker.pick()
-				.then(async(path) => {
+				.then(async (path) => {
 					console.debug(`path ${path} selected for sharing`)
 					if (!path.startsWith('/')) {
 						throw new Error(t('files', 'Invalid path selected'))
 					}
 
-					axios.post(generateOcsUrl('apps/files_sharing/api/v1', 2) + 'shares', {
+					axios.post(generateOcsUrl('apps/files_sharing/api/v1/shares'), {
 						path,
 						shareType: 12,
 						shareWith: '' + this.cardId,
@@ -245,7 +245,7 @@ export default {
 		},
 		showViewer(attachment) {
 			if (attachment.extendedData.fileid && window.OCA.Viewer.availableHandlers.map(handler => handler.mimes).flat().includes(attachment.extendedData.mimetype)) {
-				window.OCA.Viewer.open(attachment.extendedData.path)
+				window.OCA.Viewer.open({ path: attachment.extendedData.path })
 				return
 			}
 
@@ -269,7 +269,7 @@ export default {
 			padding-left: 44px;
 			background-position: 16px center;
 			flex-grow: 1;
-			height: 44px;
+			height: auto;
 			margin-bottom: 12px;
 			text-align: left;
 		}

src/components/card/AttachmentsTab.vue

@@ -0,0 +1,39 @@
+<template>
+	<div v-if="activeTabs.includes('attachment')" class="section-details">
+		<AttachmentList
+			:card-id="card.id"
+			:removable="true"
+			@delete-attachment="deleteAttachment"
+			@restore-attachment="restoreAttachment" />
+	</div>
+</template>
+<script>
+import AttachmentList from './AttachmentList'
+
+export default {
+	components: { AttachmentList },
+	props: {
+		card: {
+			type: Object,
+			default: null,
+		},
+		activeTabs: {
+			type: Array,
+			default: () => [],
+		},
+	},
+	data() {
+		return {
+
+		}
+	},
+	methods: {
+		deleteAttachment(attachment) {
+			this.$store.dispatch('deleteAttachment', attachment)
+		},
+		restoreAttachment(attachment) {
+			this.$store.dispatch('restoreAttachment', attachment)
+		},
+	},
+}
+</script>

src/components/card/CardModal.vue

@@ -0,0 +1,460 @@
+<!--
+  - @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
+  -
+  - @author Julius Härtl <jus@bitgrid.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/>.
+  -
+  -->
+
+<template>
+	<div v-if="currentCard" ref="modalContainer" class="container">
+		<div :class="{defaultTop: scrollPosition < 100, fixedTop: scrollPosition > 100}">
+			<div class="top">
+				<h1 class="top-title">
+					{{ currentCard.title }}
+				</h1>
+				<p class="top-modified">
+					{{ t('deck', 'Modified') }}: {{ currentCard.lastModified | fromNow }}. {{ t('deck', 'Created') }} {{ currentCard.createdAt | fromNow }}
+				</p>
+			</div>
+			<div class="tabs">
+				<div class="tab members" :class="{active: activeTabs.includes('members')}" @click="changeActiveTab('members')">
+					<i class="icon-user icon" />
+					{{ t('deck', 'Members') }}
+				</div>
+				<div class="tab tags" :class="{active: activeTabs.includes('tags')}" @click="changeActiveTab('tags')">
+					<i class="icon icon-tag" />
+					{{ t('deck', 'Tags') }}
+				</div>
+				<div class="tab due-date" :class="{active: activeTabs.includes('duedate')}" @click="changeActiveTab('duedate')">
+					<i class="icon icon-calendar-dark" />
+					{{ t('deck', 'Due date') }}
+				</div>
+				<div class="tab project" :class="{active: activeTabs.includes('project')}" @click="changeActiveTab('project')">
+					<i class="icon icon-deck" />
+					{{ t('deck', 'Project') }}
+				</div>
+				<div class="tab attachments" :class="{active: activeTabs.includes('attachment')}" @click="changeActiveTab('attachment')">
+					<i class="icon-attach icon icon-attach-dark" />
+					{{ t('deck', 'Attachments') }}
+				</div>
+			</div>
+		</div>
+		<div class="content">
+			<div :class="[currentCard.labels.length > 3 ? 'content-two-tabs' : 'content-three-tabs']">
+				<MembersTab
+					:card="currentCard"
+					:active-tabs="activeTabs"
+					:current-tab="currentTab"
+					@click="activeTabs.push('members')"
+					@active-tab="changeActiveTab"
+					@remove-active-tab="removeActiveTab" />
+				<TagsTab
+					:active-tabs="activeTabs"
+					:card="currentCard"
+					:current-tab="currentTab"
+					@click="activeTabs.push('tags')"
+					@active-tab="changeActiveTab"
+					@remove-active-tab="removeActiveTab" />
+				<DueDateTab
+					:active-tabs="activeTabs"
+					:card="currentCard"
+					:current-tab="currentTab"
+					@click="activeTabs.push('duedate')"
+					@active-tab="changeActiveTab"
+					@remove-active-tab="removeActiveTab" />
+				<ProjectTab
+					:active-tabs="activeTabs"
+					:card="currentCard"
+					:current-tab="currentTab"
+					@click="activeTabs.push('project')"
+					@active-tab="changeActiveTab" />
+				<AttachmentsTab
+					:active-tabs="activeTabs"
+					:card="currentCard"
+					:current-tab="currentTab"
+					@click="activeTabs.push('attachment')"
+					@active-tab="changeActiveTab" />
+			</div>
+			<Description :key="currentCard.id" :card="currentCard" @change="descriptionChanged" />
+		</div>
+		<div class="activities">
+			<div class="activities-header">
+				<div class="activities-title">
+					<i class="icon-activity" /> {{ t('deck', 'Activity') }}
+				</div>
+				<div class="show-details-btn" @click="showDetails = !showDetails">
+					{{ showDetails ? t('deck', 'Hide details') : t('deck', 'Show details') }}
+				</div>
+			</div>
+			<template v-if="showDetails">
+				<CardSidebarTabComments :card="currentCard" :tab-query="tabQuery" />
+				<ActivityList v-if="hasActivity"
+					filter="deck"
+					:object-id="currentBoard.id"
+					object-type="deck"
+					type="deck" />
+			</template>
+		</div>
+	</div>
+</template>
+
+<script>
+import { generateUrl } from '@nextcloud/router'
+import { mapState, mapGetters } from 'vuex'
+import relativeDate from '../../mixins/relativeDate'
+import { showError } from '@nextcloud/dialogs'
+import { getCurrentUser } from '@nextcloud/auth'
+import MembersTab from './MembersTab.vue'
+import TagsTab from './TagsTab.vue'
+import DueDateTab from './DueDateTab.vue'
+import Description from './Description.vue'
+import ProjectTab from './ProjectTab.vue'
+import AttachmentsTab from './AttachmentsTab.vue'
+import CardSidebarTabComments from './CardSidebarTabComments'
+import moment from '@nextcloud/moment'
+import ActivityList from '../ActivityList'
+
+const capabilities = window.OC.getCapabilities()
+
+export default {
+	name: 'CardModal',
+	components: {
+		MembersTab,
+		Description,
+		TagsTab,
+		DueDateTab,
+		ProjectTab,
+		AttachmentsTab,
+		CardSidebarTabComments,
+		ActivityList,
+	},
+	filters: {
+		fromNow(value) {
+			return moment.unix(value).fromNow()
+		},
+	},
+	mixins: [relativeDate],
+	props: {
+		id: {
+			type: Number,
+			required: true,
+		},
+		tabId: {
+			type: String,
+			required: false,
+			default: null,
+		},
+		tabQuery: {
+			type: String,
+			required: false,
+			default: null,
+		},
+	},
+	data() {
+		return {
+			newComment: '',
+			titleEditable: false,
+			titleEditing: '',
+			hasActivity: capabilities && capabilities.activity,
+			currentUser: getCurrentUser(),
+			comment: '',
+			currentTab: null,
+			activeTabs: [],
+			showDetails: false,
+			scrollPosition: null,
+		}
+	},
+	computed: {
+		...mapGetters([
+			'getCommentsForCard',
+			'hasMoreComments',
+		]),
+		...mapState({
+			currentBoard: state => state.currentBoard,
+			replyTo: state => state.comment.replyTo,
+		}),
+		...mapGetters(['canEdit', 'assignables', 'cardActions', 'stackById']),
+		title() {
+			return this.titleEditable ? this.titleEditing : this.currentCard.title
+		},
+		currentCard() {
+			return this.$store.getters.cardById(this.id)
+		},
+		subtitle() {
+			return t('deck', 'Modified') + ': ' + this.relativeDate(this.currentCard.lastModified * 1000) + ' ' + t('deck', 'Created') + ': ' + this.relativeDate(this.currentCard.createdAt * 1000)
+		},
+		cardRichObject() {
+			return {
+				id: '' + this.currentCard.id,
+				name: this.currentCard.title,
+				boardname: this.currentBoard.title,
+				stackname: this.stackById(this.currentCard.stackId)?.title,
+				link: window.location.protocol + '//' + window.location.host + generateUrl('/apps/deck/') + `#/board/${this.currentBoard.id}/card/${this.currentCard.id}`,
+			}
+		},
+		cardDetailsInModal: {
+			get() {
+				return this.$store.getters.config('cardDetailsInModal')
+			},
+			set(newValue) {
+				this.$store.dispatch('setConfig', { cardDetailsInModal: newValue })
+			},
+		},
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$refs.modalContainer.addEventListener('scroll', this.onScroll)
+		})
+		this.loadComments()
+	},
+
+	methods: {
+		cancelReply() {
+			this.$store.dispatch('setReplyTo', null)
+		},
+		async createComment(content) {
+			const commentObj = {
+				cardId: this.currentCard.id,
+				comment: content,
+			}
+			await this.$store.dispatch('createComment', commentObj)
+			this.$store.dispatch('setReplyTo', null)
+			this.newComment = ''
+			await this.loadComments()
+		},
+		async loadComments() {
+			this.$store.dispatch('setReplyTo', null)
+			this.error = null
+			this.isLoading = true
+			try {
+				await this.$store.dispatch('fetchComments', { cardId: this.currentCard.id })
+				this.isLoading = false
+				if (this.currentCard.commentsUnread > 0) {
+					await this.$store.dispatch('markCommentsAsRead', this.currentCard.id)
+				}
+			} catch (e) {
+				this.isLoading = false
+				console.error('Failed to fetch more comments during infinite loading', e)
+				this.error = t('deck', 'Failed to load comments')
+			}
+		},
+		descriptionChanged(newDesc) {
+			this.copiedCard.description = newDesc
+		},
+		handleUpdateTitleEditable(value) {
+			this.titleEditable = value
+			if (value) {
+				this.titleEditing = this.currentCard.title
+			}
+		},
+		handleUpdateTitle(value) {
+			this.titleEditing = value
+		},
+		handleSubmitTitle(value) {
+			if (value.trim === '') {
+				showError(t('deck', 'The title cannot be empty.'))
+				return
+			}
+			this.titleEditable = false
+			this.$store.dispatch('updateCardTitle', { ...this.currentCard, title: this.titleEditing })
+		},
+		closeSidebar() {
+			this.$router.push({ name: 'board' })
+		},
+		showModal() {
+			this.$store.dispatch('setConfig', { cardDetailsInModal: true })
+		},
+		closeModal() {
+			this.$store.dispatch('setConfig', { cardDetailsInModal: false })
+		},
+		changeActiveTab(tab) {
+			this.currentTab = tab
+			this.activeTabs = this.activeTabs.filter((item) => !['project', 'attachment'].includes(item))
+
+			if (!this.activeTabs.includes(tab)) {
+				this.activeTabs.push(tab)
+			}
+
+		},
+		removeActiveTab(tab) {
+			const index = this.activeTabs.indexOf(tab)
+			if (index > -1) {
+				this.activeTabs = this.activeTabs.splice(index, 1)
+			}
+		},
+		onScroll() {
+			this.scrollPosition = this.$refs.modalContainer.scrollTop
+		},
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+.show-details-btn {
+	cursor: pointer;
+	text-decoration: underline;
+	color: var(--color-text-maxcontrast);
+}
+
+.activities-header{
+	display: flex;
+	justify-content: space-between;
+}
+
+.content-two-tabs, .content-three-tabs {
+	display: grid;
+	align-items: flex-start;
+}
+
+.content-two-tabs {
+	grid-template-columns: 1fr 2fr;
+}
+
+.content-three-tabs {
+	grid-template-columns: 1fr 2fr 1fr;
+}
+
+.icon-activity {
+	background-image: url(../../../img/flash-black.svg);
+	width: 15px;
+	height: 15px;
+	margin-right: 5px;
+}
+
+.icon {
+	margin-right: 5px;
+}
+
+.icon-plus {
+	background-image: url(../../../img/plus.svg);
+	width: 15px;
+	height: 15px;
+	margin-right: 5px;
+}
+
+.log-item {
+	display: flex;
+	justify-content: flex-start;
+	line-height: 45px;
+	align-items: center;
+}
+
+.activities {
+	&-title{
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+		margin-bottom: 15px;
+		font-weight: bold;
+	}
+	margin-top: 100px;
+	padding-left: 20px !important;
+	padding-right: 20px !important;
+}
+
+.content{
+	padding-left: 20px;
+	padding-right: 20px;
+}
+
+.comments {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	&-input{
+		width: 100%;
+		margin-left: 10px;
+	}
+
+	.comment-form{
+		width: 95%;
+	}
+}
+
+.container {
+	overflow-y: scroll;
+	height: 800px;
+}
+
+.top {
+	padding: 20px 20px 0px 20px;
+	&-title {
+		color: black;
+		font-size: 20px;
+		font-weight: bold;
+	}
+	&-modified {
+		color: #767676;
+		line-height: 40px;
+	}
+}
+
+.tabs {
+	padding-left: 20px;
+	padding-right: 20px;
+	margin-top: 20px;
+	margin-bottom: 5px;
+	display: flex;
+}
+
+.tab {
+	cursor: pointer;
+	font-weight: bold;
+	background-color: #ededed;
+	color: rgb(0, 0, 0);
+	flex-grow: 0;
+	flex-shrink: 1;
+	display: flex;
+	flex-direction: row;
+	overflow: hidden;
+	padding: 10px 20px;
+	border-radius: 10px;
+	font-size: 85%;
+	margin-bottom: 3px;
+	margin-right: 15px;
+}
+
+.action-btn {
+	list-style: none;
+}
+
+.edit-btns {
+	display: flex;
+	align-items: center;
+}
+
+.description {
+	display: flex;
+	justify-content: space-between;
+	margin-top: 30px;
+}
+
+.active {
+	color: #409eff;
+	background-color: #ecf5ff;
+}
+
+.fixedTop {
+	position: sticky;
+	top: 0;
+	background-color: #ffffff;
+	z-index: 1000;
+	margin-top: 0px;
+	padding-bottom: 5px;
+}
+</style>

src/components/card/CardSidebar.vue

@@ -25,13 +25,14 @@
 		:active="tabId"
 		:title="title"
 		:subtitle="subtitle"
+		:subtitle-tooltip="subtitleTooltip"
 		:title-editable="titleEditable"
 		@update:titleEditable="handleUpdateTitleEditable"
 		@update:title="handleUpdateTitle"
 		@submit-title="handleSubmitTitle"
 		@close="closeSidebar">
 		<template #secondary-actions>
-			<ActionButton v-if="cardDetailsInModal" icon="icon-menu-sidebar" @click.stop="showModal()">
+			<ActionButton v-if="cardDetailsInModal" icon="icon-menu-sidebar" @click.stop="closeModal()">
 				{{ t('deck', 'Open in sidebar view') }}
 			</ActionButton>
 			<ActionButton v-else icon="icon-external" @click.stop="showModal()">
@@ -88,8 +89,10 @@ import CardSidebarTabAttachments from './CardSidebarTabAttachments'
 import CardSidebarTabComments from './CardSidebarTabComments'
 import CardSidebarTabActivity from './CardSidebarTabActivity'
 import relativeDate from '../../mixins/relativeDate'
+import moment from '@nextcloud/moment'
 
 import { showError } from '@nextcloud/dialogs'
+import { getLocale } from '@nextcloud/l10n'
 
 const capabilities = window.OC.getCapabilities()
 
@@ -126,12 +129,12 @@ export default {
 			titleEditable: false,
 			titleEditing: '',
 			hasActivity: capabilities && capabilities.activity,
+			locale: getLocale(),
 		}
 	},
 	computed: {
 		...mapState({
 			currentBoard: state => state.currentBoard,
-			cardDetailsInModal: state => state.cardDetailsInModal,
 		}),
 		...mapGetters(['canEdit', 'assignables', 'cardActions', 'stackById']),
 		title() {
@@ -143,6 +146,9 @@ export default {
 		subtitle() {
 			return t('deck', 'Modified') + ': ' + this.relativeDate(this.currentCard.lastModified * 1000) + ' ' + t('deck', 'Created') + ': ' + this.relativeDate(this.currentCard.createdAt * 1000)
 		},
+		subtitleTooltip() {
+			return t('deck', 'Modified') + ': ' + this.formatDate(this.currentCard.lastModified) + '\n' + t('deck', 'Created') + ': ' + this.formatDate(this.currentCard.createdAt)
+		},
 		cardRichObject() {
 			return {
 				id: '' + this.currentCard.id,
@@ -152,6 +158,14 @@ export default {
 				link: window.location.protocol + '//' + window.location.host + generateUrl('/apps/deck/') + `#/board/${this.currentBoard.id}/card/${this.currentCard.id}`,
 			}
 		},
+		cardDetailsInModal: {
+			get() {
+				return this.$store.getters.config('cardDetailsInModal')
+			},
+			set(newValue) {
+				this.$store.dispatch('setConfig', { cardDetailsInModal: newValue })
+			},
+		},
 	},
 	methods: {
 		handleUpdateTitleEditable(value) {
@@ -177,7 +191,13 @@ export default {
 		},
 
 		showModal() {
-			this.$store.dispatch('setCardDetailsInModal', true)
+			this.$store.dispatch('setConfig', { cardDetailsInModal: true })
+		},
+		closeModal() {
+			this.$store.dispatch('setConfig', { cardDetailsInModal: false })
+		},
+		formatDate(timestamp) {
+			return moment.unix(timestamp).locale(this.locale).format('LLLL')
 		},
 	},
 }

src/components/card/CardSidebarTabAttachments.vue

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