Check for board membership on comments entity event

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Fix undefined users variable
2020-02-11 09:49:16 +01:00 · 2020-02-11 09:47:15 +01:00 · 2020-02-11 09:44:14 +01:00 · 2020-02-11 09:44:07 +01:00 · 2020-02-11 09:41:42 +01:00 · 2019-12-30 09:34:26 +01:00
588 changed files with 32349 additions and 88193 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -0,0 +1,243 @@
+kind: pipeline
+name: checkers
+steps:
+- name: compatibility
+  image: nextcloudci/php7.1:php7.1-16
+  environment:
+    APP_NAME: deck
+    CORE_BRANCH: master
+    DB: sqlite
+  commands:
+    # Pre-setup steps
+    - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+    - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
+    - cd ../server
+    # Code checker
+    - ./occ app:check-code $APP_NAME -c strong-comparison
+    - ./occ app:check-code $APP_NAME -c deprecation
+    - cd apps/$APP_NAME/
+- name: syntax-php7.0
+  image: nextcloudci/php7.0:php7.0-17
+  environment:
+    APP_NAME: deck
+    CORE_BRANCH: stable15
+    DB: sqlite
+  commands:
+    - composer install
+    - ./vendor/bin/parallel-lint --exclude ./vendor/ --exclude ./lib/Collaboration/ .
+- name: syntax-php7.1
+  image: nextcloudci/php7.1:php7.1-15
+  environment:
+    APP_NAME: deck
+    CORE_BRANCH: stable15
+    DB: sqlite
+  commands:
+    - composer install
+    - ./vendor/bin/parallel-lint --exclude ./vendor/ .
+- name: syntax-php7.2
+  image: nextcloudci/php7.2:php7.2-9
+  environment:
+    APP_NAME: deck
+    CORE_BRANCH: stable15
+    DB: sqlite
+  commands:
+    - composer install
+    - ./vendor/bin/parallel-lint --exclude ./vendor/ .
+- name: syntax-php7.3
+  image: nextcloudci/php7.3:php7.3-2
+  environment:
+    APP_NAME: deck
+    CORE_BRANCH: stable15
+    DB: sqlite
+  commands:
+    - composer install
+    - ./vendor/bin/parallel-lint --exclude ./vendor/ .
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+---
+kind: pipeline
+name: unit-php7.0
+steps:
+  - name: php7.0
+    image: nextcloudci/php7.0:php7.0-17
+    environment:
+      APP_NAME: deck
+      CORE_BRANCH: stable15
+      DB: sqlite
+    commands:
+      # Pre-setup steps
+      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
+      - cd ../server/
+      - php occ app:enable deck
+      - cd apps/$APP_NAME
+      # Run phpunit tests
+      - composer install
+      - 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
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+---
+kind: pipeline
+name: unit-php7.1
+steps:
+  - name: php7.1
+    image: nextcloudci/php7.1:php7.1-15
+    environment:
+      APP_NAME: deck
+      CORE_BRANCH: stable15
+      DB: sqlite
+    commands:
+      # Pre-setup steps
+      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
+      - cd ../server/
+      - php occ app:enable deck
+      - cd apps/$APP_NAME
+      - composer install
+      - 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
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+---
+kind: pipeline
+name: unit-php7.2
+steps:
+  - name: php7.2
+    image: nextcloudci/php7.2:php7.2-9
+    environment:
+      APP_NAME: deck
+      CORE_BRANCH: stable15
+      DB: sqlite
+    commands:
+      # Pre-setup steps
+      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
+      - cd ../server/
+      - php occ app:enable deck
+      - cd apps/$APP_NAME
+      - composer install
+      - 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
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+---
+kind: pipeline
+name: unit-php7.3
+steps:
+  - name: php7.3
+    image: nextcloudci/php7.3:php7.3-2
+    environment:
+      APP_NAME: deck
+      CORE_BRANCH: stable15
+      DB: sqlite
+    commands:
+      # Pre-setup steps
+      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
+      - cd ../server/
+      - php occ app:enable deck
+      - cd apps/$APP_NAME
+      - composer install
+      - 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
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+---
+kind: pipeline
+name: integration-stable16
+steps:
+  - name: integration
+    image: nextcloudci/php7.1:php7.1-16
+    environment:
+      APP_NAME: deck
+      CORE_BRANCH: stable16
+      DB: sqlite
+    commands:
+      # Pre-setup steps
+      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
+      - cd ../server/
+      - php occ app:enable deck
+      - cd apps/$APP_NAME
+      - cd tests/integration
+      - ./run.sh || true
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+---
+kind: pipeline
+name: integration-stable15
+steps:
+  - name: integration
+    image: nextcloudci/php7.1:php7.1-16
+    environment:
+      APP_NAME: deck
+      CORE_BRANCH: stable15
+      DB: sqlite
+    commands:
+      # Pre-setup steps
+      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
+      - cd ../server/
+      - php occ app:enable deck
+      - cd apps/$APP_NAME
+      - cd tests/integration
+      - ./run.sh || true
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
+---
+kind: pipeline
+name: frontend
+steps:
+  - name: eslint
+    image: nextcloudci/eslint:eslint-1
+    commands:
+      - ./run-eslint.sh
+  - name: jsbuild
+    image: mhart/alpine-node:6.8.0
+    commands:
+      - apk add --no-cache make
+      - make build-js
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,9 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
-
-[*.{js,vue}]
-indent_style = tab
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,12 +0,0 @@
-module.exports = {
-	extends: [
-		'@nextcloud',
-	],
-	rules: {
-		'jsdoc/require-param-description': ['off'],
-		'jsdoc/require-param-type': ['off'],
-		'jsdoc/check-param-names': ['off'],
-		'jsdoc/no-undefined-types': ['off'],
-		'jsdoc/require-property-description' : ['off']
-	},
-}
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -0,0 +1,43 @@
+root: true
+
+extends:
+  - eslint:recommended
+
+env:
+  browser: true
+  amd: true
+  es6: true
+
+globals:
+  global: false
+  app: false
+  angular: false
+  $: false
+  escapeHTML: false
+  OC: false
+  OCA: false
+  t: false
+  oc_current_user: false
+  oc_requesttoken: false
+  Clipboard: false
+  oc_defaults: false
+
+parserOptions:
+  ecmaVersion: 6
+  sourceType: "module"
+
+rules:
+  curly: error
+  eqeqeq: ["error", "smart"]
+  guard-for-in: error
+  no-console: off
+  no-fallthrough: error
+  no-mixed-spaces-and-tabs: error
+  no-unused-vars: warn
+  no-useless-escape: warn
+  no-use-before-define: error
+  semi: ["error", "always"]
+  indent:
+    - error
+    - tab
+    - SwitchCase: 1
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -4,29 +4,6 @@ about: Create a report to help us improve

 ---

-<!--
-Thanks for reporting issues back!
-
-Guidelines for submitting issues:
-
-* Please search the existing issues first, it's likely that your issue was already reported or even fixed.
-  
-* SECURITY: Report any potential security bug to us via our HackerOne page (https://hackerone.com/nextcloud) following our security policy (https://nextcloud.com/security/) instead of filing an issue in our bug tracker.  
-
-* The issues in other components should be reported in their respective repositories: You will find them in our GitHub Organization (https://github.com/nextcloud/)
-  
-* You can also use the Issue Template app to prefill most of the required information: https://apps.nextcloud.com/apps/issuetemplate
-->
-
-<!--- Please keep this note for other contributors -->
-
-### How to use GitHub
-
-* Please use the 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to show that you are affected by the same issue.
-* Please don't comment if you have no relevant information to add. It's just extra noise for everyone subscribed to this issue.
-* Subscribe to receive notifications on status change and new comments. 
-
-
 **Describe the bug**
 A clear and concise description of what the bug is.

--- a/.github/ISSUE_TEMPLATE/Feature_request.md
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -4,28 +4,6 @@ about: Suggest an idea for this project

 ---

-<!--
-Thanks for reporting issues back!
-
-Guidelines for submitting issues:
-
-* Please search the existing issues first, it's likely that your issue was already reported or even fixed.
-  
-* SECURITY: Report any potential security bug to us via our HackerOne page (https://hackerone.com/nextcloud) following our security policy (https://nextcloud.com/security/) instead of filing an issue in our bug tracker.  
-
-* The issues in other components should be reported in their respective repositories: You will find them in our GitHub Organization (https://github.com/nextcloud/)
-  
-* You can also use the Issue Template app to prefill most of the required information: https://apps.nextcloud.com/apps/issuetemplate
-->
-
-<!--- Please keep this note for other contributors -->
-
-### How to use GitHub
-
-* Please use the 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to show that you are affected by the same issue.
-* Please don't comment if you have no relevant information to add. It's just extra noise for everyone subscribed to this issue.
-* Subscribe to receive notifications on status change and new comments. 
-
 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,51 +0,0 @@
-version: 2
-updates:
- package-ecosystem: npm
-  directory: "/"
-  target-branch: "master"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  open-pull-requests-limit: 10
-  reviewers:
-  - juliushaertl
-  - jakobroehrl
-#- package-ecosystem: npm
-#  directory: "/"
-#  target-branch: "stable1.1"
-#  schedule:
-#    interval: weekly
-#    day: saturday
-#    time: "03:00"
-#    timezone: Europe/Paris
-#  open-pull-requests-limit: 10
-#  reviewers:
-#  - juliushaertl
-#  - jakobroehrl
- package-ecosystem: composer
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  open-pull-requests-limit: 10
-  reviewers:
-  - juliushaertl
-  ignore:
-  - dependency-name: christophwurst/nextcloud
-    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
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -0,0 +1,25 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - "1. to develop"
+  - "2. developing"
+  - "3. to review"
+  - "discussion"
+  - "bounty"
+  - "bug"
+  - "enhancement"
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+# Label to use when marking an issue as stale
+staleLabel: stale
+
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
--- a/.github/workflows/appbuild.yml
+++ b/.github/workflows/appbuild.yml
@@ -1,39 +0,0 @@
-name: Package build
-
-on:
-  pull_request:
-
-jobs:
-  build:
-    runs-on: ubuntu-18.04
-
-    strategy:
-      matrix:
-        node-version: [14.x]
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
-      with:
-        node-version: ${{ matrix.node-version }}
-    - name: Set up npm7
-      run: npm i -g npm@7
-    - name: Setup PHP
-      uses: shivammathur/setup-php@2.18.0
-      with:
-        php-version: '7.4'
-        tools: composer
-    - name: install dependencies
-      run: |
-        wget https://github.com/ChristophWurst/krankerl/releases/download/v0.12.2/krankerl_0.12.2_amd64.deb
-        sudo dpkg -i krankerl_0.12.2_amd64.deb
-    - name: package
-      run: |
-        uname -a
-        RUST_BACKTRACE=1 krankerl --version
-        RUST_BACKTRACE=1 krankerl package
-    - uses: actions/upload-artifact@v2
-      with:
-        name: Deck app tarball
-        path: build/artifacts/deck.tar.gz
--- a/.github/workflows/appstore-build-publish.yml
+++ b/.github/workflows/appstore-build-publish.yml
@@ -1,151 +0,0 @@
-# This workflow is provided via the organization template repository
-#
-# https://github.com/nextcloud/.github
-# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
-
-name: Build and publish app release
-
-on:
-  release:
-    types: [published]
-
-env:
-  PHP_VERSION: 7.4
-
-jobs:
-  build_and_publish:
-    runs-on: ubuntu-latest
-
-    # Only allowed to be run on nextcloud-releases repositories
-    if: ${{ github.repository_owner == 'nextcloud-releases' }}
-
-    steps:
-      - name: Check actor permission
-        uses: skjnldsv/check-actor-permission@v2
-        with:
-          require: write
-
-      - name: Set app env
-        run: |
-          # Split and keep last 
-          echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
-          echo "APP_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
-
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          path: ${{ env.APP_NAME }}
-
-      - name: Get appinfo data
-        id: appinfo
-        uses: skjnldsv/xpath-action@master
-        with:
-          filename: ${{ env.APP_NAME }}/appinfo/info.xml
-          expression: "//info//dependencies//nextcloud/@min-version"
-
-      - name: Read package.json node and npm engines version
-        uses: skjnldsv/read-package-engines-version-actions@v1.2
-        id: versions
-        # Continue if no package.json
-        continue-on-error: true
-        with:
-          path: ${{ env.APP_NAME }}
-          fallbackNode: "^12"
-          fallbackNpm: "^6"
-
-      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        # Skip if no package.json
-        if: ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ steps.versions.outputs.nodeVersion }}
-
-      - name: Set up npm ${{ steps.versions.outputs.npmVersion }}
-        # Skip if no package.json
-        if: ${{ steps.versions.outputs.npmVersion }}
-        run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
-
-      - name: Set up php ${{ env.PHP_VERSION }}
-        uses: shivammathur/setup-php@2.18.0
-        with:
-          php-version: ${{ env.PHP_VERSION }}
-          coverage: none
-
-      - name: Check composer.json
-        id: check_composer
-        uses: andstor/file-existence-action@v1
-        with:
-          files: "${{ env.APP_NAME }}/composer.json"
-
-      - name: Install composer dependencies
-        if: steps.check_composer.outputs.files_exists == 'true'
-        run: |
-          cd ${{ env.APP_NAME }}
-          composer install --no-dev
-
-      - name: Build ${{ env.APP_NAME }}
-        # Skip if no package.json
-        if: ${{ steps.versions.outputs.nodeVersion }}
-        run: |
-          cd ${{ env.APP_NAME }}
-          npm ci
-          npm run build
-
-      - name: Install Krankerl
-        run: |
-          wget https://github.com/ChristophWurst/krankerl/releases/download/v0.13.0/krankerl_0.13.0_amd64.deb
-          sudo dpkg -i krankerl_0.13.0_amd64.deb
-
-      - name: Package ${{ env.APP_NAME }} ${{ env.APP_VERSION }}
-        # Try krankerl, fallback to makefile
-        run: |
-          cd ${{ env.APP_NAME }}
-          krankerl package || make appstore
-
-      - name: Checkout server ${{ fromJSON(steps.appinfo.outputs.result).nextcloud.min-version }}
-        continue-on-error: true
-        id: server-checkout
-        run: |
-          NCVERSION=${{ fromJSON(steps.appinfo.outputs.result).nextcloud.min-version }}
-          wget --quiet https://download.nextcloud.com/server/releases/latest-$NCVERSION.zip
-          unzip latest-$NCVERSION.zip
-
-      - name: Checkout server master fallback
-        uses: actions/checkout@v3
-        if: ${{ steps.server-checkout.outcome != 'success' }}
-        with:
-          repository: nextcloud/server
-          path: nextcloud
-
-      - name: Sign app
-        run: |
-          # Extracting release
-          cd ${{ env.APP_NAME }}/build/artifacts
-          tar -xvf ${{ env.APP_NAME }}.tar.gz
-          cd ../../../
-          # Setting up keys
-          echo "${{ secrets.APP_PRIVATE_KEY }}" > ${{ env.APP_NAME }}.key
-          wget --quiet "https://github.com/nextcloud/app-certificate-requests/raw/master/${{ env.APP_NAME }}/${{ env.APP_NAME }}.crt"
-          # Signing
-          php nextcloud/occ integrity:sign-app --privateKey=../${{ env.APP_NAME }}.key --certificate=../${{ env.APP_NAME }}.crt --path=../${{ env.APP_NAME }}/build/artifacts/${{ env.APP_NAME }}
-          # Rebuilding archive
-          cd ${{ env.APP_NAME }}/build/artifacts
-          tar -zcvf ${{ env.APP_NAME }}.tar.gz ${{ env.APP_NAME }}
-
-      - name: Attach tarball to github release
-        uses: svenstaro/upload-release-action@v2
-        id: attach_to_release
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ env.APP_NAME }}/build/artifacts/${{ env.APP_NAME }}.tar.gz
-          asset_name: ${{ env.APP_NAME }}-${{ env.APP_VERSION }}.tar.gz
-          tag: ${{ github.ref }}
-          overwrite: true
-
-      - name: Upload app to Nextcloud appstore
-        uses: nextcloud-releases/nextcloud-appstore-push-action@v1
-        with:
-          app_name: ${{ env.APP_NAME }}
-          appstore_token: ${{ secrets.APPSTORE_TOKEN }}
-          download_url: ${{ steps.attach_to_release.outputs.browser_download_url }}
-          app_private_key: ${{ secrets.APP_PRIVATE_KEY }}
--- a/.github/workflows/command-rebase.yml
+++ b/.github/workflows/command-rebase.yml
@@ -1,46 +0,0 @@
-# This workflow is provided via the organization template repository
-#
-# https://github.com/nextcloud/.github
-# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
-
-name: Rebase command
-
-on:
-  issue_comment:
-    types: created
-
-jobs:
-  rebase:
-    runs-on: ubuntu-latest
-
-    # On pull requests and if the comment starts with `/rebase`
-    if: github.event.issue.pull_request != '' && startsWith(github.event.comment.body, '/rebase')
-
-    steps:
-      - name: Add reaction on start
-        uses: peter-evans/create-or-update-comment@v2
-        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@v2
-        if: failure()
-        with:
-          token: ${{ secrets.COMMAND_BOT_PAT }}
-          repository: ${{ github.event.repository.full_name }}
-          comment-id: ${{ github.event.comment.id }}
-          reaction-type: "-1"
--- a/.github/workflows/dependabot-approve-merge.yml
+++ b/.github/workflows/dependabot-approve-merge.yml
@@ -1,29 +0,0 @@
-# This workflow is provided via the organization template repository
-#
-# https://github.com/nextcloud/.github
-# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
-
-name: Dependabot
-
-on:
-  pull_request_target:
-    branches:
-      - master
-      - stable*
-
-jobs:
-  auto-approve-merge:
-    if: github.actor == 'dependabot[bot]'
-    runs-on: ubuntu-latest
-
-    steps:
-      # Github actions bot approve
-      - uses: hmarr/auto-approve-action@v2
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      # Nextcloud bot approve and merge request
-      - uses: ahmadnassri/action-dependabot-auto-merge@v2
-        with:
-          target: minor
-          github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}
--- a/.github/workflows/fixup.yml
+++ b/.github/workflows/fixup.yml
@@ -1,20 +0,0 @@
-# This workflow is provided via the organization template repository
-#
-# https://github.com/nextcloud/.github
-# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
-
-name: Pull request checks
-
-on: pull_request
-
-jobs:
-  commit-message-check:
-    name: Block fixup and squash commits
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Run check
-        uses: xt0rted/block-autosquash-commits-action@v2
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -1,91 +0,0 @@
-name: Integration tests
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - stable*
-
-env:
-  APP_NAME: deck
-
-jobs:
-  integration:
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        php-versions: ['7.4']
-        databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['master']
-
-    name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
-
-    services:
-      postgres:
-        image: postgres
-        ports:
-          - 4445:5432/tcp
-        env:
-          POSTGRES_USER: root
-          POSTGRES_PASSWORD: rootpassword
-          POSTGRES_DB: nextcloud
-        options: --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5
-      mysql:
-        image: mariadb:10.5
-        ports:
-          - 4444:3306/tcp
-        env:
-          MYSQL_ROOT_PASSWORD: rootpassword
-        options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 5
-
-    steps:
-      - name: Checkout server
-        uses: actions/checkout@v3
-        with:
-          repository: nextcloud/server
-          ref: ${{ matrix.server-versions }}
-
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-
-      - name: Checkout app
-        uses: actions/checkout@v3
-        with:
-          path: apps/${{ env.APP_NAME }}
-
-      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@2.18.0
-        with:
-          php-version: ${{ matrix.php-versions }}
-          tools: phpunit
-          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, mysql, pdo_mysql, pgsql, pdo_pgsql,
-          coverage: none
-
-      - name: Set up PHPUnit
-        working-directory: apps/${{ env.APP_NAME }}
-        run: composer i
-
-      - name: Set up Nextcloud
-        run: |
-          if [ "${{ matrix.databases }}" = "mysql" ]; then
-            export DB_PORT=4444
-          elif [ "${{ matrix.databases }}" = "pgsql" ]; then
-            export DB_PORT=4445
-          fi
-          mkdir data
-          ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
-          cat config/config.php
-          ./occ user:list
-          ./occ app:enable --force ${{ env.APP_NAME }}
-          php -S localhost:8080 &
-
-      - name: Run behat
-        working-directory: apps/${{ env.APP_NAME }}/tests/integration
-        run: ./run.sh
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,88 +0,0 @@
-name: Lint
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - stable*
-
-jobs:
-  php:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        php-versions: ['7.4', '8.0', "8.1"]
-
-    name: php${{ matrix.php-versions }} lint
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up php${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@2.18.0
-        with:
-          php-version: ${{ matrix.php-versions }}
-          coverage: none
-      - name: Lint
-        run: composer run lint
-
-  php-cs-fixer:
-    name: php-cs check
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-    - name: Set up php
-      uses: shivammathur/setup-php@2.18.0
-      with:
-        php-version: 7.4
-        coverage: none
-    - name: Install dependencies
-      run: composer i
-    - name: Run coding standards check
-      run: composer run cs:check
-
-  node:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [14.x]
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Use node ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-      - name: Set up npm7
-        run: npm i -g npm@7
-      - name: Install dependencies
-        run: npm ci
-      - name: ESLint
-        run: npm run lint
-
-  stylelint:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [14.x]
-
-    name: stylelint node${{ matrix.node-version }}
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up node ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Set up npm7
-        run: npm i -g npm@7
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Lint
-        run: npm run stylelint
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -1,64 +0,0 @@
-name: Package nightly
-
-on:
-  push:
-    branches:
-      - nightly
-  schedule:
-    - cron: '0 1 * * *' # run at 2 AM UTC
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [14.x]
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
-      with:
-        node-version: ${{ matrix.node-version }}
-    - name: Set up npm7
-      run: npm i -g npm@7
-    - name: Setup PHP
-      uses: shivammathur/setup-php@2.18.0
-      with:
-        php-version: '7.4'
-        tools: composer
-    - name: install dependencies
-      run: |
-        wget https://github.com/ChristophWurst/krankerl/releases/download/v0.12.2/krankerl_0.12.2_amd64.deb
-        sudo dpkg -i krankerl_0.12.2_amd64.deb
-    - name: package
-      run: |
-        uname -a
-        RUST_BACKTRACE=1 krankerl --version
-        RUST_BACKTRACE=1 krankerl package
-    - name: Set git config
-      run: |
-        git config --local user.email "action@github.com"
-        git config --local user.name "GitHub Action"
-        git tag -f nightly
-    - name: Push tag
-      uses: juliushaertl/github-push-action@master
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        tags: true
-        force: true
-    - name: Create Release
-      id: create_release
-      uses: juliushaertl/action-release@master
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        tag: nightly
-        files: ./build/artifacts/deck.tar.gz
-        name: Nightly build
-        body: |
-          Nightly release of deck
-        draft: false
-        prerelease: true
-        overwrite: true
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -1,34 +0,0 @@
-name: Node CI
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [14.x]
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
-      with:
-        node-version: ${{ matrix.node-version }}
-    - name: Set up npm7
-      run: npm i -g npm@7
-    - name: install dependencies
-      run: |
-        npm ci
-    - name: build
-      env:
-        RELATIVE_CI_KEY: ${{ secrets.RELATIVE_CI_KEY }}
-        RELATIVE_CI_SLUG: nextcloud/deck
-      run: |
-        mkdir -p js
-        npm run build --if-present -- --profile --json | tail -n +6 > js/webpack-stats.json
-        npx relative-ci-agent
-
-
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -1,94 +0,0 @@
-name: PHPUnit
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - stable*
-
-env:
-  APP_NAME: deck
-
-
-jobs:
-  integration:
-    runs-on: ubuntu-18.04
-
-    strategy:
-      fail-fast: false
-      matrix:
-        php-versions: ['7.4', '8.0', "8.1"]
-        databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['master']
-
-    name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
-
-    services:
-      postgres:
-        image: postgres
-        ports:
-          - 4445:5432/tcp
-        env:
-          POSTGRES_USER: root
-          POSTGRES_PASSWORD: rootpassword
-          POSTGRES_DB: nextcloud
-        options: --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5
-      mysql:
-        image: mariadb:10.5
-        ports:
-          - 4444:3306/tcp
-        env:
-          MYSQL_ROOT_PASSWORD: rootpassword
-        options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 5
-
-    steps:
-      - name: Checkout server
-        uses: actions/checkout@v3
-        with:
-          repository: nextcloud/server
-          ref: ${{ matrix.server-versions }}
-
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-
-      - name: Checkout app
-        uses: actions/checkout@v3
-        with:
-          path: apps/${{ env.APP_NAME }}
-
-      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@2.18.0
-        with:
-          php-version: ${{ matrix.php-versions }}
-          tools: phpunit
-          extensions: zip, gd, mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, mysql, pdo_mysql, pgsql, pdo_pgsql
-          coverage: none
-
-      - name: Set up PHPUnit
-        working-directory: apps/${{ env.APP_NAME }}
-        run: composer i
-
-      - name: Set up Nextcloud
-        run: |
-          if [ "${{ matrix.databases }}" = "mysql" ]; then
-            export DB_PORT=4444
-          elif [ "${{ matrix.databases }}" = "pgsql" ]; then
-            export DB_PORT=4445
-          fi
-          mkdir data
-          ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
-          ./occ app:enable --force ${{ env.APP_NAME }}
-          php -S localhost:8080 &
-
-      - name: PHPUnit
-        working-directory: apps/${{ env.APP_NAME }}
-        run: ./vendor/phpunit/phpunit/phpunit -c tests/phpunit.xml
-
-      - name: PHPUnit integration
-        working-directory: apps/${{ env.APP_NAME }}
-        run: ./vendor/phpunit/phpunit/phpunit -c tests/phpunit.integration.xml
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -1,31 +0,0 @@
-name: Static analysis
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - stable*
-
-jobs:
-  static-psalm-analysis:
-      runs-on: ubuntu-latest
-      strategy:
-          matrix:
-              ocp-version: [ 'dev-master' ]
-      name: Nextcloud ${{ matrix.ocp-version }}
-      steps:
-          - name: Checkout
-            uses: actions/checkout@v3
-          - name: Set up php
-            uses: shivammathur/setup-php@2.18.0
-            with:
-                php-version: 7.4
-                tools: composer:v1
-                coverage: none
-          - name: Install dependencies
-            run: composer i
-          - name: Install dependencies
-            run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }}
-          - name: Run coding standards check
-            run: composer run psalm
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,13 @@
-node_modules/*
-js/
+js/node_modules/*
+js/vendor/
+js/public/
+js/build/
 build/
 css/style.css
 css/vendor.css
 tests/integration/vendor/
 tests/integration/composer.lock
-tests/.phpunit.result.cache
 vendor/
-.php_cs.cache
+*.lock
+
 \.idea/
--- a/.nextcloudignore
+++ b/.nextcloudignore
@@ -1,28 +0,0 @@
-/build/
-/.git
-/.github
-/docs/
-/tests
-/babel.config.js
-/.editorconfig
-/.eslintrc.js
-/.nextcloudignore
-/webpack.*.js
-/.codecov.yml
-/composer.json
-/composer.lock
-/_config.yml
-/.drone.yml
-/.travis.yml
-/.eslintignore
-/.eslintrc.yml
-/.gitignore
-/issue_template.md
-/krankerl.toml
-/Makefile
-/mkdocs.yml
-/run-eslint.sh
-/package.json
-/package-lock.json
-/node_modules/
-/src/
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-require_once './vendor/autoload.php';
-
-use Nextcloud\CodingStandard\Config;
-
-$config = new Config();
-$config
-	->getFinder()
-//	->ignoreVCSIgnored(true)
-	->notPath('build')
-	->notPath('l10n')
-	->notPath('src')
-	->notPath('node_modules')
-	->notPath('vendor')
-	->in(__DIR__);
-return $config;
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,38 @@
+language: php
+services:
+    - mysql
+php:
+    - 7.0
+    - 7.1
+    - 7.2
+    - 7.3
+env:
+    - CORE_BRANCH=stable15 DB=mysql
+
+before_install:
+    - wget https://phar.phpunit.de/phpunit-5.7.phar
+    - chmod +x phpunit-5.7.phar
+    - mkdir bin
+    - mv phpunit-5.7.phar bin/phpunit
+    - export PATH="$PWD/bin:$PATH"
+    - phpunit --version
+    - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+    - bash ./before_install.sh deck $CORE_BRANCH $DB
+    - cd ../server
+    - ./occ app:enable deck
+
+before_script:
+    - cd apps/deck
+
+script:
+    - composer install
+    - make test-unit
+
+after_success:
+    - bash <(curl -s https://codecov.io/bash)
+
+after_failure:
+    - cat ../../data/nextcloud.log
+
+notifications:
+  email: false
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,306 +1,6 @@
 # Changelog
 All notable changes to this project will be documented in this file.

-## 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
-
- #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
-
-### Added
-
-* [#2934](https://github.com/nextcloud/deck/pull/2934) Advanced search queries (see [documentation](https://deck.readthedocs.io/en/latest/User_documentation_en/#search) for more details)
-* [#2933](https://github.com/nextcloud/deck/pull/2933) Move full text search to proper events
-
-### Fixed
-* [#2964](https://github.com/nextcloud/deck/pull/2964) Fix navigating to board details
-
-* Dependency updates
-
-## 1.3.0
-
-### Added
-* [#2638](https://github.com/nextcloud/deck/pull/2638) Sharing files to cards
-* [#2683](https://github.com/nextcloud/deck/pull/2683) Handle clicks on calendar entries
-* Nextcloud 21 compatiblity
-
-### Fixed
-* [#2622](https://github.com/nextcloud/deck/pull/2622) Fix gradient and stack header spacing for safari
-* [#2626](https://github.com/nextcloud/deck/pull/2626) Adding a description icon to cards when they contain a description without any checkmarks @MonkeySon
-* [#2659](https://github.com/nextcloud/deck/pull/2659) Matching color of description cursor with text color @JonFStr
-* [#2676](https://github.com/nextcloud/deck/pull/2676) Only load filter view when shown
-* [#2680](https://github.com/nextcloud/deck/pull/2680) Do not try to add change data if it doesn't exist
-* [#2681](https://github.com/nextcloud/deck/pull/2681) Filter out deleted stacks from results
-* [#2685](https://github.com/nextcloud/deck/pull/2685) Show all boards in move card dialog @jakobroehrl
-* [#2687](https://github.com/nextcloud/deck/pull/2687) 3dots no opacity @jakobroehrl
-* [#2688](https://github.com/nextcloud/deck/pull/2688) Title > boardname @jakobroehrl
-* [#2689](https://github.com/nextcloud/deck/pull/2689) Modal > bigger view wording @jakobroehrl
-
-## 1.3.0-beta2
-
-### Fixed
-* [#2700](https://github.com/nextcloud/deck/pull/2700) Attempt to copy file on dropping it to deck @juliushaertl
-* [#2701](https://github.com/nextcloud/deck/pull/2701) Fix uploading files by drag and drop @juliushaertl
-* [#2707](https://github.com/nextcloud/deck/pull/2707) L10n: Change to a capital letter @Valdnet
-* [#2712](https://github.com/nextcloud/deck/pull/2712) Docs: Fix table in section "GET /api/v1.0/config" @das-g
-* [#2716](https://github.com/nextcloud/deck/pull/2716) Remove repair step which is no longer needed as we cleanup properly @juliushaertl
-* [#2723](https://github.com/nextcloud/deck/pull/2723) Pad random color with leading zeroes @PVince81
-* [#2729](https://github.com/nextcloud/deck/pull/2729) Remove invalid activity parameters @nickvergessen
-* [#2750](https://github.com/nextcloud/deck/pull/2750) Fix deck activity emails not being translated @nickvergessen
-* [#2751](https://github.com/nextcloud/deck/pull/2751) Properly set author for activity events that are triggered by cron @juliushaertl
-
-
-## 1.2.2 - 2020-11-24
-
-### Fixed
-
-* [#2584](https://github.com/nextcloud/deck/pull/2584) Fix updating checkbox state and avoid issues due to duplicate sidebar element
-* [#2586](https://github.com/nextcloud/deck/pull/2586) Fix card details button
-* [#2587](https://github.com/nextcloud/deck/pull/2587) Move modal top spacing to the header to avoid side-effect when scrolling
-* [#2588](https://github.com/nextcloud/deck/pull/2588) Do not render images in editor
-* [#2609](https://github.com/nextcloud/deck/pull/2609) Fix issue with depenendency causing newline comments to not show
-* [#2611](https://github.com/nextcloud/deck/pull/2611) Fix paragraph styling in comments
-
-## 1.2.1 - 2020-11-18
-
-### Fixed
-
-* [#2570](https://github.com/nextcloud/deck/pull/2570) [#2571](https://github.com/nextcloud/deck/pull/2571) Fix error when deleting users @ksteinb
-* [#2573](https://github.com/nextcloud/deck/pull/2573) Fix issue where card description was changed on the wrong card when switching cards
-
-## 1.2.0 - 2020-11-16
-
-### Added
-
-* [#2430](https://github.com/nextcloud/deck/pull/2430) Due date notification setting per board
-* [#2230](https://github.com/nextcloud/deck/pull/2230) Implement scrolling per stack
-* [#1396](https://github.com/nextcloud/deck/pull/1396) API: Expose canCreateBoards through capabilities
-* [#2245](https://github.com/nextcloud/deck/pull/2245) API: ETag support for API endpoints
-
-### Fixed
-
-* [#2330](https://github.com/nextcloud/deck/pull/2330) Enhanced undo handling for deletions @jakobroehrl
-* [#2336](https://github.com/nextcloud/deck/pull/2336) Run unit tests on github actions
-* [#2358](https://github.com/nextcloud/deck/pull/2358) Properly check if FTSEvent has an argument set
-* [#2359](https://github.com/nextcloud/deck/pull/2359) Also exclude deleted items from calendar boards
-* [#2361](https://github.com/nextcloud/deck/pull/2361) Comments do not depend on the comments app @jakobroehrl
-* [#2363](https://github.com/nextcloud/deck/pull/2363) Use uid instead of displayname for sharee results
-* [#2367](https://github.com/nextcloud/deck/pull/2367) Properly handle multiple shares in a row and refactor sharee loading
-* [#2404](https://github.com/nextcloud/deck/pull/2404) Update Controls.vue @Flamenco
-* [#2433](https://github.com/nextcloud/deck/pull/2433) Fix scrollable titles with Dyslexia font
-* [#2434](https://github.com/nextcloud/deck/pull/2434) Move most destructive actions in drop down menus to the bottom @Nienzu
-* [#2435](https://github.com/nextcloud/deck/pull/2435) Do not open the dialog automatically upon card creation, only upon click
-* [#2437](https://github.com/nextcloud/deck/pull/2437) Only remove card padding for editable cards
-* [#2440](https://github.com/nextcloud/deck/pull/2440) Move navigation toggle handling to @nextcloud/vue native one
-* [#2463](https://github.com/nextcloud/deck/pull/2463) Changed triple dots to ellipsis @rakekniven
-* [#2500](https://github.com/nextcloud/deck/pull/2500) Move details and description to dedicated component
-* [#2517](https://github.com/nextcloud/deck/pull/2517) Filter out duplicate cards in overview
-* [#2502](https://github.com/nextcloud/deck/pull/2502) Assignment code refactoring
-* [#2519](https://github.com/nextcloud/deck/pull/2519) Fix invisibility bug on modal component @wrox
-* [#2520](https://github.com/nextcloud/deck/pull/2520) Add placeholder for the description input
-* [#2521](https://github.com/nextcloud/deck/pull/2521) Add migration step to make table layout consistent
-* [#2524](https://github.com/nextcloud/deck/pull/2524) Only try to extract first part of the explode result
-* [#2531](https://github.com/nextcloud/deck/pull/2531) Add proper type to boolean parameter
-* [#2532](https://github.com/nextcloud/deck/pull/2532) Fix handling of notifications if a board does no longer exist
-* [#2536](https://github.com/nextcloud/deck/pull/2536) Only set flex layout on the active tab
-* [#2538](https://github.com/nextcloud/deck/pull/2538) Do not reset filter when staying on the same board
-* [#2539](https://github.com/nextcloud/deck/pull/2539) Apply proper checks for menu items
-* [#2540](https://github.com/nextcloud/deck/pull/2540) Only build one main bundle
-* [#2562](https://github.com/nextcloud/deck/pull/2562) Only try to extract first part of the explode result (Part 2)
-
-
-## 1.1.0 - 2020-10-03
-
-### Features
-
-* [#2115](https://github.com/nextcloud/deck/pull/2115) Dashboard widget for Nextcloud 20
-* [#1545](https://github.com/nextcloud/deck/pull/1545) Show cards in calendar/tasks app and make them available though CalDAV
-* [#2200](https://github.com/nextcloud/deck/pull/2200) Unified search implementation for Nextcloud 20
-* [#1934](https://github.com/nextcloud/deck/pull/1934) Upcoming cards overview @jakobroehrl
-* [#2047](https://github.com/nextcloud/deck/pull/2047) Show card details in modal @jakobroehrl
-* [#1853](https://github.com/nextcloud/deck/pull/1853) Archive all cards from stack @jakobroehrl
-* [#1865](https://github.com/nextcloud/deck/pull/1865) Add stack button on empty board @jakobroehrl
-* [#1926](https://github.com/nextcloud/deck/pull/1926) New filter: unassigned cards @jakobroehrl
-
-### Bugfixes
-
-* [#2035](https://github.com/nextcloud/deck/pull/2035) Attach files in description @jakobroehrl
-* [#2123](https://github.com/nextcloud/deck/pull/2123) Fix control tooltip @jakobroehrl
-* [#2144](https://github.com/nextcloud/deck/pull/2144) Fix nextcloud if install with dev dependencies @matchish
-* [#2158](https://github.com/nextcloud/deck/pull/2158) Fix description in dark mode
-* [#2188](https://github.com/nextcloud/deck/pull/2188) CardBadges: Count checkboxes started with "+ [ ]" @joreiff
-* [#2206](https://github.com/nextcloud/deck/pull/2206) Fix read-only sidebar (fixes #2033)
-* [#2208](https://github.com/nextcloud/deck/pull/2208) Fix design, dark mode and keyboard navigation of the board list
-* [#2210](https://github.com/nextcloud/deck/pull/2210) Fix an incorrect/misleading message in lib/Service/BoardService.php @jordanbancino
-* [#2243](https://github.com/nextcloud/deck/pull/2243) Various smaller styling fixes
-* [#2244](https://github.com/nextcloud/deck/pull/2244) Toggle filter on clicking card labels
-* [#2117](https://github.com/nextcloud/deck/pull/2117) Activity fixes
-* [#2255](https://github.com/nextcloud/deck/pull/2255) Use unified search events to apply on board filtering
-* [#2271](https://github.com/nextcloud/deck/pull/2271) Sort tags in filter @jakobroehrl
-* [#2318](https://github.com/nextcloud/deck/pull/2318) Card title: prevent space and no text @jakobroehrl
-* [#2319](https://github.com/nextcloud/deck/pull/2319) Move style loading to BeforeTemplateRenderedEvent
-* [#2320](https://github.com/nextcloud/deck/pull/2320) Consistent naming @jakobroehrl
-* [#2252](https://github.com/nextcloud/deck/pull/2252) Fix double slash in the deck activity links @baraksoa
-* [#2270](https://github.com/nextcloud/deck/pull/2270) Fix empty content view to align with other widgets
-* [#2275](https://github.com/nextcloud/deck/pull/2275) Wait for services to be registered before performing further setup that requires services
-* [#2278](https://github.com/nextcloud/deck/pull/2278) Fix wrong SQL queries @Chartman123
-* [#2279](https://github.com/nextcloud/deck/pull/2279) L10n:add translation to card placeholder @mjanssens
-* [#2282](https://github.com/nextcloud/deck/pull/2282) Duedate picker localization
-* [#2283](https://github.com/nextcloud/deck/pull/2283) Do not handle exceptions from page controller in the ExceptionMiddleware
-* [#2298](https://github.com/nextcloud/deck/pull/2298) Use absolute URLs for the search @nickvergessen
-
-
-
-## 1.0.5 - 2020-07-15
-
-### Fixed
-
-
-* [#2116](https://github.com/nextcloud/deck/pull/2116) Fix navigation layout issues @juliushaertl
-* [#2118](https://github.com/nextcloud/deck/pull/2118) Use proper parameter when handling attachments @juliushaertl
-
-## 1.0.4 - 2020-06-26
-
-### Fixed
-
-* [#2062](https://github.com/nextcloud/deck/pull/2062) Fix saving card description after toggling checkboxes @juliushaertl
-* [#2065](https://github.com/nextcloud/deck/pull/2065) Adding CSS rule for Markdown Blockquotes @reox
-* [#2059](https://github.com/nextcloud/deck/pull/2059) Fix fetching attachments on card change @juliushaertl
-* [#2060](https://github.com/nextcloud/deck/pull/2060) Use mixing for relative date in card sidebar @juliushaertl
-
-
-## 1.0.3 - 2020-06-19
-
-### Fixed
-
-* [#2019](https://github.com/nextcloud/deck/pull/2019) Remove old global css rule @juliushaertl
-* [#2020](https://github.com/nextcloud/deck/pull/2020) Fix navigation issue with leftover nodes @juliushaertl
-* [#2021](https://github.com/nextcloud/deck/pull/2021) Fix description issues @juliushaertl
-* [#2022](https://github.com/nextcloud/deck/pull/2022) Fix replyto issues with the comments API @juliushaertl
-* [#2027](https://github.com/nextcloud/deck/pull/2027) Allow to unassign current user from card @juliushaertl
-* [#2029](https://github.com/nextcloud/deck/pull/2029) Fix wording : stack -> list @cloud2018
-* [#2032](https://github.com/nextcloud/deck/pull/2032) Force order by id as second sorting key @juliushaertl
-* [#2045](https://github.com/nextcloud/deck/pull/2045) Improve label styling @juliushaertl
-* [#2010](https://github.com/nextcloud/deck/pull/2010) User documentation fixes @Nyco
-* [#1998](https://github.com/nextcloud/deck/pull/1998) Add Checklist explaination to the doc @4rnoP
-
-
-## 1.0.2 - 2020-06-03
-
-### Fixed
-
-* [#1774](https://github.com/nextcloud/deck/pull/1774) Remove deprecated global API calls
-* [#1918](https://github.com/nextcloud/deck/pull/1918) Save compact mode on localstorage @jakobroehrl
-* [#1919](https://github.com/nextcloud/deck/pull/1919) Show sidebar after card creation @jakobroehrl
-* [#1924](https://github.com/nextcloud/deck/pull/1924) Boards ordered in main page @jakobroehrl
-* [#1925](https://github.com/nextcloud/deck/pull/1925) Fix generated fronted urls
-* [#1944](https://github.com/nextcloud/deck/pull/1944) Move navigation to @nextcloud/vue components
-* [#1945](https://github.com/nextcloud/deck/pull/1945) Fix datetime picker
-* [#1946](https://github.com/nextcloud/deck/pull/1946) Fix translations
-* [#1976](https://github.com/nextcloud/deck/pull/1976) Delete boards that users own once they are deleted
-* [#1977](https://github.com/nextcloud/deck/pull/1977) Redirect from previously used routes to the current ones
-
-## 1.0.1 - 2020-05-15
-
-### Fixed
-
-* Removes debug filter output
-* Labels are now sorted
-* Stack title doesn't break up
-* Fix move card modal
-* Sort boards in navigation
-* Fixes the attachment modal
-* Handle deleted boards better
-* User can only clone a board on canManage permissions
-* Fix modal imports
-* Show menu in compact mode
-* Added a filter reset button
-* Add hover effect to board list
-* New filter icon
-* Improve hovering response in board
-* Enable linkify in description renderer @icewind1991
-* Enhance board selector
-* Fix issue if card description might be null
-* Revert markdown styles from old frontend
-* Do not scroll cards into view
-* Fix reodering performance
-
-## 1.0.0 - 2020-05-06
-
-### Added
-
- Completly rewritten frontend
-	- Better maintainability
-	- Various small fixes
-	- Unified user interface with Nextcloud
- Separate comment and activity timelines
- Add ability to reply to comments #1537
- Filter cards on board #1507 @jakobroehrl
- Add cards to projects #1294 @jakobroehrl
- Move cards to other boards #1242 @jakobroehrl
- Clone boards with existing stacks and labels #1221 @jakobroehrl
- Upload multiple files at once and in parallel
-
-A huge thangs goes to our awesome community that put enourmous effort into the frontend migration:
-
-Special thanks for contributing huge parts of the Vue.js migration:
-@jakobroehrl @weeman1337 @nicolad
-
-Testers/reporters:
-@cloud2018 @putt1ck @bpcurse
-
-Android app team for helping to improve our REST API:
-@desperateCoder @stefan-niedermann
-
-## 0.8.0 - 2020-01-16
-
-### Added
- Case insensitive search (@matchish)
-
-### Fixed
- Fix reversed permissions for reordering stacks (@JLueke)
- Fix reversed visibility of 'add stack' field (@JLueke)
- Fix occ export command
- Fix error causing cron execution to fail
- Fix activity entry on moving cards
- Proper wording in activity timeline (@a11exandru)
-
-## 0.7.0 - 2019-08-20
-
-### Added
- Make deck compatible to Nextcloud 17
- Allow to set the description when creating cards though the REST API
-
 ## 0.6.6 - 2019-08-01

 ### Fixed
--- a/72
+++ b/72
@@ -12,32 +12,70 @@ sign_dir=$(build_dir)/sign
 cert_dir=$(HOME)/.nextcloud/certificates


-default: build
+default: package 
+
+clean-build:
+	rm -rf $(build_dir)

 clean-dist:
-	rm -rf node_modules/
+	rm -rf js/node_modules

 install-deps: install-deps-js
 	composer install

-install-deps-nodev: install-deps-js
-	composer install --no-dev
-
 install-deps-js:
-	npm ci
+	cd js && npm install

-build: clean-dist install-deps build-js
-
-release: clean-dist install-deps-nodev build-js
+build: install-deps build-js

 build-js: install-deps-js
-	npm run build
+	cd js && npm run build 

 build-js-dev: install-deps
-	npm run dev
+	cd js && npm run dev

 watch:
-	npm run watch
+	cd js && npm run watch
+
+# appstore: clean install-deps
+appstore: clean-build build
+	rm -rf $(appstore_build_directory)
+	mkdir -p $(appstore_build_directory)
+	tar cvzf $(appstore_package_name).tar.gz \
+	--exclude="../$(app_name)/build" \
+	--exclude="../$(app_name)/tests" \
+	--exclude="../$(app_name)/Makefile" \
+	--exclude="../$(app_name)/*.log" \
+	--exclude="../$(app_name)/phpunit*xml" \
+	--exclude="../$(app_name)/composer.*" \
+	--exclude="../$(app_name)/js/node_modules" \
+	--exclude="../$(app_name)/js/tests" \
+	--exclude="../$(app_name)/js/test" \
+	--exclude="../$(app_name)/js/*.log" \
+	--exclude="../$(app_name)/js/package-lock.json" \
+	--exclude="../$(app_name)/js/package.json" \
+	--exclude="../$(app_name)/js/bower.json" \
+	--exclude="../$(app_name)/js/karma.*" \
+	--exclude="../$(app_name)/js/protractor.*" \
+	--exclude="../$(app_name)/package.json" \
+	--exclude="../$(app_name)/bower.json" \
+	--exclude="../$(app_name)/karma.*" \
+	--exclude="../$(app_name)/protractor\.*" \
+	--exclude="../$(app_name)/.*" \
+	--exclude="../$(app_name)/*.lock" \
+	--exclude="../$(app_name)/run-eslint.sh" \
+	--exclude="../$(app_name)/js/.*" \
+	--exclude="../$(app_name)/vendor" \
+	--exclude-vcs \
+	 ../$(app_name)
+
+
+	@if [ -f $(cert_dir)/$(app_name).key ]; then \
+		echo "Signing package…"; \
+		openssl dgst -sha512 -sign $(cert_dir)/$(app_name).key $(build_dir)/$(app_name).tar.gz | openssl base64; \
+	fi
+
+	echo $(appstore_package_name).tar.gz

 test: test-unit test-integration

@@ -46,15 +84,19 @@ test-unit:
 ifeq (, $(shell which phpunit 2> /dev/null))
 	@echo "No phpunit command available, downloading a copy from the web"
 	mkdir -p $(build_tools_directory)
-	curl -sSL https://phar.phpunit.de/phpunit-8.2.phar -o $(build_tools_directory)/phpunit.phar
+	curl -sSL https://phar.phpunit.de/phpunit-5.7.phar -o $(build_tools_directory)/phpunit.phar
 	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.integration.xml --testsuite=integration-database --coverage-clover build/php-integration.coverage.xml
+	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
 endif

 test-integration:
 	cd tests/integration && ./run.sh

 test-js: install-deps
-	npm run test
+	cd js && run test
+
+package:
+	krankerl package
--- a/README.md
+++ b/README.md
@@ -5,28 +5,19 @@

 Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.

- Add your tasks to cards and put them in order
- Write down additional notes in markdown
- Assign labels for even better organization
- Share with your team, friends or family
- Integrates with the [Circles](https://github.com/nextcloud/circles) app!
- 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
+- :inbox_tray: Add your tasks to cards and put them in order
+- :page_facing_up: Write down additional notes in markdown
+- :bookmark: Assign labels for even better organization
+- :busts_in_silhouette: Share with your team, friends or family
+- :family: Integrates with the [Circles](https://github.com/nextcloud/circles) app!
+- :paperclip: Attach files and embed them in your markdown description
+- :speech_balloon: Discuss with your team using comments
+- :zap: Keep track of changes in the activity stream
+- :rocket: Get your project organized

-![Deck - Manage cards on your board](http://download.bitgrid.net/nextcloud/deck/screenshots/1.0/Deck-2.png)

-### Mobile apps
+![Deck - Manage cards on your board](https://download.bitgrid.net/nextcloud/deck/screenshots/Deck.png)

- [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.
@@ -50,7 +41,7 @@ Please make sure you have installed the following dependencies: `make, which, ta

 ### Install the nightly builds

-Instead of setting everything up manually, you can just [download the nightly build](https://github.com/nextcloud/deck/releases/tag/nightly) instead. These builds are updated every 24 hours, and are pre-configured with all the needed dependencies.
+Instead of setting everything up manually, you can just [download the nightly builds](https://download.bitgrid.net/nextcloud/deck/nightly/) instead. These builds are updated every 24 hours, and are pre-configured with all the needed dependencies.

 ## Developing

@@ -62,27 +53,6 @@ Nothing to prepare, just dig into the code.

 Deck requires running a `make build-js` to install npm dependencies and build the JavaScript code using webpack. While developing you can also use `make watch` to rebuild everytime the code changes.

-#### Hot reloading
-
-Enable debug mode in your config.php `'debug' => true,`
-
-Without SSL:
-```
-npx webpack-dev-server --config webpack.hot.js \
-    --public localhost:3000 \
-    --output-public-path 'http://localhost:3000/js/'
-```
-
-With SSL:
-```
-npx webpack-dev-server --config webpack.dev.js --https \
-	--cert ~/repos/nextcloud/nc-dev/data/ssl/nextcloud.local.crt \
-    --key ~/repos/nextcloud/nc-dev/data/ssl/nextcloud.local.key \
-    --public nextcloud.local:3000 \
-    --output-public-path 'https://nextcloud.local:3000/js/'
-```
-
-
 ### Running tests
 You can use the provided Makefile to run all tests by using:

--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,29 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-| Version | Nextcloud version | Supported          |
-| ------- | ----------------- | ------------------ |
-| 1.0.x   | 18, 19            | :white_check_mark: |
-| 0.8.x   | 17                | :white_check_mark: |
-| <0.7.x   | -                 | :x:                |
-
-
-## Reporting a Vulnerability
-
-Security is very important to us. If you have discovered a security issue with Nextcloud,
-please read our responsible disclosure guidelines and contact us at [hackerone.com/nextcloud](https://hackerone.com/nextcloud).
-Your report should include:
-
- Product version
- A vulnerability description
- Reproduction steps
-
-A member of the security team will confirm the vulnerability, determine its impact, and develop a fix.
-The fix will be applied to the master branch, tested, and packaged in the next security release.
-The vulnerability will be publicly announced after the release. Finally, your name will be added
-to the [hall of fame](https://hackerone.com/nextcloud/thanks) as a thank you from the entire Nextcloud community. Note our 
-[threat model](https://nextcloud.com/security/threat-model) to know what is expected behavior.
-
-
-Please visit https://nextcloud.com/security/ for further information about security.
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 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/>.
+ *
+ */
+
+if ((@include_once __DIR__ . '/../vendor/autoload.php')===false) {
+	throw new Exception('Cannot include autoload. Did you run install dependencies using composer?');
+}
+
+$app = new \OCA\Deck\AppInfo\Application();
+$app->registerNavigationEntry();
+$app->registerNotifications();
+$app->registerCommentsEntity();
+$app->registerFullTextSearch();
+
+/** Load activity style global so it is availabile in the activity app as well */
+\OC_Util::addStyle('deck', 'activity');
--- a/appinfo/autoload.php
+++ b/appinfo/autoload.php
@@ -23,6 +23,8 @@

 namespace OCA\Deck\AppInfo;

+use OCP\AppFramework\App;
+
 /**
 * Additional autoloader registration, e.g. registering composer autoloaders
 */
--- a/appinfo/database.xml
+++ b/appinfo/database.xml
@@ -0,0 +1,482 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<database>
+    <name>*dbname*</name>
+    <create>true</create>
+    <overwrite>false</overwrite>
+    <charset>utf8</charset>
+    <table>
+        <name>*dbprefix*deck_boards</name>
+        <declaration>
+            <field>
+                <name>id</name>
+                <type>integer</type>
+                <default>0</default>
+                <notnull>true</notnull>
+                <autoincrement>1</autoincrement>
+                <length>4</length>
+            </field>
+            <field>
+                <name>title</name>
+                <type>text</type>
+                <notnull>true</notnull>
+                <length>100</length>
+            </field>
+            <field>
+                <name>owner</name>
+                <type>text</type>
+                <notnull>true</notnull>
+                <length>64</length>
+            </field>
+            <field>
+                <name>color</name>
+                <type>text</type>
+                <length>6</length>
+                <notnull>false</notnull>
+            </field>
+            <field>
+                <name>archived</name>
+                <type>boolean</type>
+                <default>false</default>
+            </field>
+            <field>
+                <name>deleted_at</name>
+                <type>integer</type>
+                <default>0</default>
+                <length>8</length>
+                <notnull>false</notnull>
+                <unsigned>true</unsigned>
+            </field>
+            <field>
+                <name>last_modified</name>
+                <type>integer</type>
+                <default></default>
+                <notnull>false</notnull>
+                <unsigned>true</unsigned>
+            </field>
+        </declaration>
+    </table>
+    <table>
+        <name>*dbprefix*deck_stacks</name>
+        <declaration>
+            <field>
+                <name>id</name>
+                <type>integer</type>
+                <default>0</default>
+                <notnull>true</notnull>
+                <autoincrement>1</autoincrement>
+                <length>4</length>
+            </field>
+            <field>
+                <name>title</name>
+                <type>text</type>
+                <notnull>true</notnull>
+                <length>100</length>
+            </field>
+            <field>
+                <name>board_id</name>
+                <type>integer</type>
+                <length>8</length>
+                <notnull>true</notnull>
+            </field>
+            <field>
+                <name>order</name>
+                <type>integer</type>
+                <length>8</length>
+                <notnull>false</notnull>
+            </field>
+            <field>
+                <name>deleted_at</name>
+                <type>integer</type>
+                <default>0</default>
+                <length>8</length>
+                <notnull>false</notnull>
+                <unsigned>true</unsigned>
+            </field>
+            <field>
+                <name>last_modified</name>
+                <type>integer</type>
+                <default></default>
+                <notnull>false</notnull>
+                <unsigned>true</unsigned>
+            </field>
+            <index>
+                <name>deck_stacks_board_id_index</name>
+                <field>
+                    <name>board_id</name>
+                </field>
+            </index>
+            <index>
+                <name>deck_stacks_order_index</name>
+                <field>
+                    <name>order</name>
+                </field>
+            </index>
+        </declaration>
+    </table>
+    <table>
+        <name>*dbprefix*deck_cards</name>
+        <declaration>
+            <field>
+                <name>id</name>
+                <type>integer</type>
+                <default>0</default>
+                <notnull>true</notnull>
+                <autoincrement>1</autoincrement>
+                <length>4</length>
+            </field>
+            <field>
+                <name>title</name>
+                <type>text</type>
+                <length>100</length>
+                <notnull>true</notnull>
+            </field>
+            <field>
+                <name>description</name>
+                <type>clob</type>
+                <notnull>false</notnull>
+            </field>
+            <field>
+                <name>description_prev</name>
+                <type>clob</type>
+                <notnull>false</notnull>
+            </field>
+            <field>
+                <name>stack_id</name>
+                <type>integer</type>
+                <length>8</length>
+                <notnull>true</notnull>
+            </field>
+            <field>
+                <name>type</name>
+                <type>text</type>
+                <notnull>true</notnull>
+                <length>64</length>
+                <default>plain</default>
+            </field>
+            <field>
+                <name>last_modified</name>
+                <type>integer</type>
+                <default></default>
+                <notnull>false</notnull>
+                <unsigned>true</unsigned>
+            </field>
+            <field>
+                <name>last_editor</name>
+                <type>text</type>
+                <notnull>false</notnull>
+                <length>64</length>
+            </field>
+            <field>
+                <name>created_at</name>
+                <type>integer</type>
+                <default></default>
+                <notnull>false</notnull>
+                <unsigned>true</unsigned>
+            </field>
+            <field>
+                <name>owner</name>
+                <type>text</type>
+                <notnull>true</notnull>
+                <length>64</length>
+            </field>
+            <field>
+                <name>order</name>
+                <type>integer</type>
+                <length>8</length>
+                <notnull>false</notnull>
+            </field>
+            <field>
+                <name>archived</name>
+                <type>boolean</type>
+                <default>false</default>
+            </field>
+            <field>
+                <name>duedate</name>
+                <type>timestamp</type>
+                <default>0</default>
+            </field>
+            <field>
+                <name>notified</name>
+                <type>boolean</type>
+                <default>false</default>
+            </field>
+            <field>
+                <name>deleted_at</name>
+                <type>integer</type>
+                <default>0</default>
+                <length>8</length>
+                <notnull>false</notnull>
+                <unsigned>true</unsigned>
+            </field>
+            <index>
+                <name>deck_cards_stack_id_index</name>
+                <field>
+                    <name>stack_id</name>
+                </field>
+            </index>
+            <index>
+                <name>deck_cards_order_index</name>
+                <field>
+                    <name>order</name>
+                </field>
+            </index>
+            <index>
+                <name>deck_cards_archived_index</name>
+                <field>
+                    <name>archived</name>
+                </field>
+            </index>
+        </declaration>
+    </table>
+    <table>
+        <name>*dbprefix*deck_attachment</name>
+        <declaration>
+            <field>
+                <name>id</name>
+                <type>integer</type>
+                <default>0</default>
+                <notnull>true</notnull>
+                <autoincrement>1</autoincrement>
+                <length>4</length>
+            </field>
+            <field>
+                <name>card_id</name>
+                <type>integer</type>
+                <length>8</length>
+                <notnull>true</notnull>
+            </field>
+            <field>
+                <name>type</name>
+                <type>text</type>
+                <notnull>true</notnull>
+                <length>64</length>
+            </field>
+            <field>
+                <name>data</name>
+                <type>text</type>
+            </field>
+            <field>
+                <name>last_modified</name>
+                <type>integer</type>
+                <default/>
+                <length>8</length>
+                <notnull>false</notnull>
+                <unsigned>true</unsigned>
+            </field>
+            <field>
+                <name>created_at</name>
+                <type>integer</type>
+                <default/>
+                <length>8</length>
+                <notnull>false</notnull>
+                <unsigned>true</unsigned>
+            </field>
+            <field>
+                <name>created_by</name>
+                <type>text</type>
+                <notnull>true</notnull>
+                <length>64</length>
+            </field>
+            <field>
+                <name>deleted_at</name>
+                <type>integer</type>
+                <default>0</default>
+                <length>8</length>
+                <notnull>false</notnull>
+                <unsigned>true</unsigned>
+            </field>
+        </declaration>
+    </table>
+
+    <table>
+        <name>*dbprefix*deck_labels</name>
+        <declaration>
+            <field>
+                <name>id</name>
+                <type>integer</type>
+                <default>0</default>
+                <notnull>true</notnull>
+                <autoincrement>1</autoincrement>
+                <length>4</length>
+            </field>
+            <field>
+                <name>title</name>
+                <type>text</type>
+                <notnull>false</notnull>
+                <length>100</length>
+            </field>
+            <field>
+                <name>color</name>
+                <type>text</type>
+                <length>6</length>
+                <notnull>false</notnull>
+            </field>
+            <field>
+                <name>board_id</name>
+                <type>integer</type>
+                <notnull>true</notnull>
+                <length>8</length>
+            </field>
+            <field>
+                <name>last_modified</name>
+                <type>integer</type>
+                <default></default>
+                <notnull>false</notnull>
+                <unsigned>true</unsigned>
+            </field>
+            <index>
+                <name>deck_labels_board_id_index</name>
+                <field>
+                    <name>board_id</name>
+                </field>
+            </index>
+        </declaration>
+    </table>
+
+    <table>
+        <name>*dbprefix*deck_assigned_labels</name>
+        <declaration>
+            <field>
+                <name>id</name>
+                <type>integer</type>
+                <default>0</default>
+                <notnull>true</notnull>
+                <autoincrement>1</autoincrement>
+                <length>4</length>
+            </field>
+            <field>
+                <name>label_id</name>
+                <type>integer</type>
+                <default>0</default>
+                <notnull>true</notnull>
+                <length>4</length>
+            </field>
+            <field>
+                <name>card_id</name>
+                <type>integer</type>
+                <default>0</default>
+                <notnull>true</notnull>
+                <length>4</length>
+            </field>
+            <index>
+                <name>deck_assigned_labels_idx_i</name>
+                <field>
+                    <name>label_id</name>
+                </field>
+            </index>
+            <index>
+                <name>deck_assigned_labels_idx_c</name>
+                <field>
+                    <name>card_id</name>
+                </field>
+            </index>
+        </declaration>
+    </table>
+    <table>
+        <name>*dbprefix*deck_assigned_users</name>
+        <declaration>
+            <field>
+                <name>id</name>
+                <type>integer</type>
+                <default>0</default>
+                <notnull>true</notnull>
+                <autoincrement>1</autoincrement>
+                <length>4</length>
+            </field>
+            <field>
+                <name>participant</name>
+                <type>text</type>
+                <notnull>true</notnull>
+                <length>64</length>
+            </field>
+            <field>
+                <name>card_id</name>
+                <type>integer</type>
+                <default>0</default>
+                <notnull>true</notnull>
+                <length>4</length>
+            </field>
+            <index>
+                <name>deck_assigned_users_idx_p</name>
+                <field>
+                    <name>participant</name>
+                </field>
+            </index>
+            <index>
+                <name>deck_assigned_users_idx_c</name>
+                <field>
+                    <name>card_id</name>
+                </field>
+            </index>
+        </declaration>
+    </table>
+    <table>
+        <name>*dbprefix*deck_board_acl</name>
+        <declaration>
+            <field>
+                <name>id</name>
+                <type>integer</type>
+                <default>0</default>
+                <notnull>true</notnull>
+                <autoincrement>1</autoincrement>
+                <length>4</length>
+            </field>
+            <field>
+                <name>board_id</name>
+                <type>integer</type>
+                <notnull>true</notnull>
+                <length>8</length>
+            </field>
+            <field>
+                <name>type</name>
+                <type>integer</type>
+                <notnull>true</notnull>
+                <length>4</length>
+            </field>
+            <field>
+                <name>participant</name>
+                <type>text</type>
+                <notnull>true</notnull>
+                <length>64</length>
+            </field>
+            <field>
+                <name>permission_edit</name>
+                <type>boolean</type>
+                <default>false</default>
+            </field>
+            <field>
+                <name>permission_share</name>
+                <type>boolean</type>
+                <default>false</default>
+            </field>
+            <field>
+                <name>permission_manage</name>
+                <type>boolean</type>
+                <default>false</default>
+            </field>
+            <index>
+                <name>deck_board_acl_uq_i</name>
+                <unique>true</unique>
+                <field>
+                    <name>board_id</name>
+                    <sorting>ascending</sorting>
+                </field>
+                <field>
+                    <name>type</name>
+                    <sorting>ascending</sorting>
+                </field>
+                <field>
+                    <name>participant</name>
+                    <sorting>ascending</sorting>
+                </field>
+            </index>
+            <index>
+                <name>deck_board_acl_idx_i</name>
+                <field>
+                    <name>board_id</name>
+                </field>
+            </index>
+        </declaration>
+
+    </table>
+</database>
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -1,50 +1,55 @@
-<?xml version="1.0" encoding="utf-8"?>
-<info xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
+<?xml version="1.0"?>
+<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
    <id>deck</id>
    <name>Deck</name>
-    <summary>Personal planning and team project organization</summary>
+    <summary>A kanban style project and personal management tool for Nextcloud</summary>
    <description>Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.


 - 📥 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.7.0-alpha1</version>
+    <version>0.6.6</version>
    <licence>agpl</licence>
    <author>Julius Härtl</author>
    <namespace>Deck</namespace>
    <types>
-        <dav/>
+        <dav />
    </types>
    <category>organization</category>
    <category>office</category>
    <website>https://github.com/nextcloud/deck</website>
    <bugs>https://github.com/nextcloud/deck/issues</bugs>
    <repository type="git">https://github.com/nextcloud/deck.git</repository>
-    <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>
+    <screenshot>https://download.bitgrid.net/nextcloud/deck/screenshots/0.5/deck-notifications.png</screenshot>
+    <screenshot>https://download.bitgrid.net/nextcloud/deck/screenshots/0.5/deck-comment2.png</screenshot>
    <dependencies>
+        <php min-version="5.6"/>
        <database min-version="9.4">pgsql</database>
        <database>sqlite</database>
-        <database min-version="8.0">mysql</database>
-        <nextcloud min-version="24" max-version="24"/>
+        <database min-version="5.5">mysql</database>
+        <nextcloud min-version="15" max-version="16" />
    </dependencies>
    <background-jobs>
        <job>OCA\Deck\Cron\DeleteCron</job>
        <job>OCA\Deck\Cron\ScheduledNotifications</job>
        <job>OCA\Deck\Cron\CardDescriptionActivity</job>
    </background-jobs>
+    <repair-steps>
+        <post-migration>
+            <step>OCA\Deck\Migration\UnknownUsers</step>
+        </post-migration>
+    </repair-steps>
    <commands>
        <command>OCA\Deck\Command\UserExport</command>
-        <command>OCA\Deck\Command\BoardImport</command>
-        <command>OCA\Deck\Command\TransferOwnership</command>
    </commands>
    <activity>
        <settings>
@@ -59,20 +64,9 @@
            <provider>OCA\Deck\Activity\DeckProvider</provider>
        </providers>
    </activity>
+
    <fulltextsearch>
        <provider min-version="16">OCA\Deck\Provider\DeckProvider</provider>
    </fulltextsearch>
-    <navigations>
-        <navigation>
-            <name>Deck</name>
-            <route>deck.page.index</route>
-            <icon>deck.svg</icon>
-            <order>10</order>
-        </navigation>
-    </navigations>
-    <sabre>
-        <calendar-plugins>
-            <plugin>OCA\Deck\DAV\CalendarPlugin</plugin>
-        </calendar-plugins>
-    </sabre>
+
 </info>
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -25,7 +25,9 @@
 return [
 	'routes' => [
 		['name' => 'page#index', 'url' => '/', 'verb' => 'GET'],
-		['name' => 'page#redirectToCard', 'url' => '/card/{cardId}', 'verb' => 'GET'],
+
+		['name' => 'Config#get', 'url' => '/config', 'verb' => 'GET'],
+		['name' => 'Config#setValue', 'url' => '/config/{key}', 'verb' => 'POST'],

 		// boards
 		['name' => 'board#index', 'url' => '/boards', 'verb' => 'GET'],
@@ -36,10 +38,8 @@ return [
 		['name' => 'board#deleteUndo', 'url' => '/boards/{boardId}/deleteUndo', 'verb' => 'POST'],
 		['name' => 'board#getUserPermissions', 'url' => '/boards/{boardId}/permissions', 'verb' => 'GET'],
 		['name' => 'board#addAcl', 'url' => '/boards/{boardId}/acl', 'verb' => 'POST'],
-		['name' => 'board#updateAcl', 'url' => '/boards/{boardId}/acl/{aclId}', 'verb' => 'PUT'],
+		['name' => 'board#updateAcl', 'url' => '/boards/{boardId}/acl', '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'],
@@ -63,9 +63,8 @@ return [
 		['name' => 'card#assignLabel', 'url' => '/cards/{cardId}/label/{labelId}', 'verb' => 'POST'],
 		['name' => 'card#removeLabel', 'url' => '/cards/{cardId}/label/{labelId}', 'verb' => 'DELETE'],
 		['name' => 'card#assignUser', 'url' => '/cards/{cardId}/assign', 'verb' => 'POST'],
-		['name' => 'card#unassignUser', 'url' => '/cards/{cardId}/unassign', 'verb' => 'PUT'],
+		['name' => 'card#unassignUser', 'url' => '/cards/{cardId}/assign/{userId}', 'verb' => 'DELETE'],

-		// attachments
 		['name' => 'attachment#getAll', 'url' => '/cards/{cardId}/attachments', 'verb' => 'GET'],
 		['name' => 'attachment#create', 'url' => '/cards/{cardId}/attachment', 'verb' => 'POST'],
 		['name' => 'attachment#display', 'url' => '/cards/{cardId}/attachment/{attachmentId}', 'verb' => 'GET'],
@@ -82,72 +81,46 @@ return [
 		['name' => 'label#delete', 'url' => '/labels/{labelId}', 'verb' => 'DELETE'],

 		// api
-		['name' => 'board_api#index', 'url' => '/api/v{apiVersion}/boards', 'verb' => 'GET'],
-		['name' => 'board_api#get', 'url' => '/api/v{apiVersion}/boards/{boardId}', 'verb' => 'GET'],
-		['name' => 'board_api#create', 'url' => '/api/v{apiVersion}/boards', 'verb' => 'POST'],
-		['name' => 'board_api#delete', 'url' => '/api/v{apiVersion}/boards/{boardId}', 'verb' => 'DELETE'],
-		['name' => 'board_api#update', 'url' => '/api/v{apiVersion}/boards/{boardId}', 'verb' => 'PUT'],
-		['name' => 'board_api#undo_delete', 'url' => '/api/v{apiVersion}/boards/{boardId}/undo_delete', 'verb' => 'POST'],
-		['name' => 'board_api#addAcl', 'url' => '/api/v{apiVersion}/boards/{boardId}/acl', 'verb' => 'POST'],
-		['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' => 'board_api#index', 'url' => '/api/v1.0/boards', 'verb' => 'GET'],
+		['name' => 'board_api#get', 'url' => '/api/v1.0/boards/{boardId}', 'verb' => 'GET'],
+		['name' => 'board_api#create', 'url' => '/api/v1.0/boards', 'verb' => 'POST'],
+		['name' => 'board_api#delete', 'url' => '/api/v1.0/boards/{boardId}', 'verb' => 'DELETE'],
+		['name' => 'board_api#update', 'url' => '/api/v1.0/boards/{boardId}', 'verb' => 'PUT'],
+		['name' => 'board_api#undo_delete', 'url' => '/api/v1.0/boards/{boardId}/undo_delete', 'verb' => 'POST'],
+		['name' => 'board_api#addAcl', 'url' => '/api/v1.0/boards/{boardId}/acl', 'verb' => 'POST'],
+		['name' => 'board_api#deleteAcl', 'url' => '/api/v1.0/boards/{boardId}/acl/{aclId}', 'verb' => 'DELETE'],
+		['name' => 'board_api#updateAcl', 'url' => '/api/v1.0/boards/{boardId}/acl/{aclId}', 'verb' => 'PUT'],


-		['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'],
-		['name' => 'stack_api#get', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}', 'verb' => 'GET'],
-		['name' => 'stack_api#create', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks', 'verb' => 'POST'],
-		['name' => 'stack_api#update', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}', 'verb' => 'PUT'],
-		['name' => 'stack_api#delete', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}', 'verb' => 'DELETE'],
+		['name' => 'stack_api#index', 'url' => '/api/v1.0/boards/{boardId}/stacks', 'verb' => 'GET'],
+		['name' => 'stack_api#getArchived', 'url' => '/api/v1.0/boards/{boardId}/stacks/archived', 'verb' => 'GET'],
+		['name' => 'stack_api#get', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}', 'verb' => 'GET'],
+		['name' => 'stack_api#create', 'url' => '/api/v1.0/boards/{boardId}/stacks', 'verb' => 'POST'],
+		['name' => 'stack_api#update', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}', 'verb' => 'PUT'],
+		['name' => 'stack_api#delete', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}', 'verb' => 'DELETE'],

-		['name' => 'card_api#get', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}', 'verb' => 'GET'],
-		['name' => 'card_api#create', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards', 'verb' => 'POST'],
-		['name' => 'card_api#update', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}', 'verb' => 'PUT'],
-		['name' => 'card_api#assignLabel', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/assignLabel', 'verb' => 'PUT'],
-		['name' => 'card_api#removeLabel', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/removeLabel', 'verb' => 'PUT'],
-		['name' => 'card_api#assignUser', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/assignUser', 'verb' => 'PUT'],
-		['name' => 'card_api#unassignUser', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/unassignUser', 'verb' => 'PUT'],
-		['name' => 'card_api#reorder', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/reorder', 'verb' => 'PUT'],
-		['name' => 'card_api#delete', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}', 'verb' => 'DELETE'],
+		['name' => 'card_api#get', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}', 'verb' => 'GET'],
+		['name' => 'card_api#create', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards', 'verb' => 'POST'],
+		['name' => 'card_api#update', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}', 'verb' => 'PUT'],
+		['name' => 'card_api#assignLabel', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/assignLabel', 'verb' => 'PUT'],
+		['name' => 'card_api#removeLabel', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/removeLabel', 'verb' => 'PUT'],
+		['name' => 'card_api#assignUser', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/assignUser', 'verb' => 'PUT'],
+		['name' => 'card_api#unassignUser', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/unassignUser', 'verb' => 'PUT'],
+		['name' => 'card_api#reorder', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/reorder', 'verb' => 'PUT'],
+		['name' => 'card_api#delete', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}', 'verb' => 'DELETE'],

-		['name' => 'card_api#findAllWithDue', 'url' => '/api/v{apiVersion}/dashboard/due', 'verb' => 'GET'],
+		['name' => 'label_api#get', 'url' => '/api/v1.0/boards/{boardId}/labels/{labelId}', 'verb' => 'GET'],
+		['name' => 'label_api#create', 'url' => '/api/v1.0/boards/{boardId}/labels', 'verb' => 'POST'],
+		['name' => 'label_api#update', 'url' => '/api/v1.0/boards/{boardId}/labels/{labelId}', 'verb' => 'PUT'],
+		['name' => 'label_api#delete', 'url' => '/api/v1.0/boards/{boardId}/labels/{labelId}', 'verb' => 'DELETE'],

-		['name' => 'label_api#get', 'url' => '/api/v{apiVersion}/boards/{boardId}/labels/{labelId}', 'verb' => 'GET'],
-		['name' => 'label_api#create', 'url' => '/api/v{apiVersion}/boards/{boardId}/labels', 'verb' => 'POST'],
-		['name' => 'label_api#update', 'url' => '/api/v{apiVersion}/boards/{boardId}/labels/{labelId}', 'verb' => 'PUT'],
-		['name' => 'label_api#delete', 'url' => '/api/v{apiVersion}/boards/{boardId}/labels/{labelId}', 'verb' => 'DELETE'],
+		['name' => 'attachment_api#getAll', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments', 'verb' => 'GET'],
+		['name' => 'attachment_api#display', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments/{attachmentId}', 'verb' => 'GET'],
+		['name' => 'attachment_api#create', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments', 'verb' => 'POST'],
+		['name' => 'attachment_api#update', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments/{attachmentId}', 'verb' => 'PUT'],
+		['name' => 'attachment_api#delete', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments/{attachmentId}', 'verb' => 'DELETE'],
+		['name' => 'attachment_api#restore', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments/{attachmentId}/restore', 'verb' => 'PUT'],

-		['name' => 'attachment_api#getAll', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments', 'verb' => 'GET', 'requirements' => ['apiVersion' => '1.0']],
-		['name' => 'attachment_api#display', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments/{attachmentId}', 'verb' => 'GET', 'requirements' => ['apiVersion' => '1.0']],
-		['name' => 'attachment_api#create', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments', 'verb' => 'POST', 'requirements' => ['apiVersion' => '1.0']],
-		['name' => 'attachment_api#update', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments/{attachmentId}', 'verb' => 'PUT', 'requirements' => ['apiVersion' => '1.0']],
-		['name' => 'attachment_api#delete', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments/{attachmentId}', 'verb' => 'DELETE', 'requirements' => ['apiVersion' => '1.0']],
-		['name' => 'attachment_api#restore', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments/{attachmentId}/restore', 'verb' => 'PUT', 'requirements' => ['apiVersion' => '1.0']],
-
-		['name' => 'attachment_api_v11#getAll', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments', 'verb' => 'GET', 'requirements' => ['apiVersion' => '1.1']],
-		['name' => 'attachment_api_v11#display', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments/{type}/{attachmentId}', 'verb' => 'GET', 'requirements' => ['apiVersion' => '1.1']],
-		['name' => 'attachment_api_v11#create', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments', 'verb' => 'POST', 'requirements' => ['apiVersion' => '1.1']],
-		['name' => 'attachment_api_v11#update', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments/{type}/{attachmentId}', 'verb' => 'PUT', 'requirements' => ['apiVersion' => '1.1']],
-		['name' => 'attachment_api_v11#delete', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments/{type}/{attachmentId}', 'verb' => 'DELETE', 'requirements' => ['apiVersion' => '1.1']],
-		['name' => 'attachment_api_v11#restore', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments/{type}/{attachmentId}/restore', 'verb' => 'PUT', 'requirements' => ['apiVersion' => '1.1']],
-
-		['name' => 'board_api#preflighted_cors', 'url' => '/api/v{apiVersion}/{path}','verb' => 'OPTIONS', 'requirements' => ['path' => '.+']],
-	],
-	'ocs' => [
-		['name' => 'Config#get', 'url' => '/api/v{apiVersion}/config', 'verb' => 'GET'],
-		['name' => 'Config#setValue', 'url' => '/api/v{apiVersion}/config/{key}', 'verb' => 'POST'],
-
-		['name' => 'comments_api#list', 'url' => '/api/v{apiVersion}/cards/{cardId}/comments', 'verb' => 'GET'],
-		['name' => 'comments_api#create', 'url' => '/api/v{apiVersion}/cards/{cardId}/comments', 'verb' => 'POST'],
-		['name' => 'comments_api#update', 'url' => '/api/v{apiVersion}/cards/{cardId}/comments/{commentId}', 'verb' => 'PUT'],
-		['name' => 'comments_api#delete', 'url' => '/api/v{apiVersion}/cards/{cardId}/comments/{commentId}', 'verb' => 'DELETE'],
-
-		['name' => 'overview_api#upcomingCards', 'url' => '/api/v{apiVersion}/overview/upcoming', 'verb' => 'GET'],
-
-		['name' => 'search#search', 'url' => '/api/v{apiVersion}/search', 'verb' => 'GET'],
+		['name' => 'board_api#preflighted_cors', 'url' => '/api/v1.0/{path}','verb' => 'OPTIONS', 'requirements' => ['path' => '.+']],
 	]
 ];
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,3 +0,0 @@
-const babelConfig = require('@nextcloud/babel-config')
-
-module.exports = babelConfig
--- a/composer.json
+++ b/composer.json
@@ -1,47 +1,19 @@
 {
-	"name": "nextcloud/deck",
-	"type": "project",
-	"license": "AGPLv3",
-	"authors": [
-		{
-			"name": "Julius Härtl",
-			"email": "jus@bitgrid.net"
-		}
-	],
-	"require": {
-		"cogpowered/finediff": "0.3.*",
-		"justinrainbow/json-schema": "^5.2"
-	},
-	"require-dev": {
-		"roave/security-advisories": "dev-master",
-		"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,
-		"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",
-		"cs:check": "php-cs-fixer fix --dry-run --diff",
-		"cs:fix": "php-cs-fixer fix",
-		"psalm": "psalm",
-		"psalm:fix": "psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MismatchingDocblockParamType,MismatchingDocblockReturnType,MissingParamType,InvalidFalsableReturnType",
-		"test": [
-			"@test:unit",
-			"@test:integration"
-		],
-		"test:unit": "phpunit -c tests/phpunit.xml",
-		"test:integration": "phpunit -c tests/phpunit.integration.xml && cd tests/integration && ./run.sh"
-	}
+    "name": "nextcloud/deck",
+    "type": "project",
+    "license": "AGPLv3",
+    "authors": [
+        {
+            "name": "Julius Härtl",
+            "email": "jus@bitgrid.net"
+        }
+    ],
+    "require": {
+        "cogpowered/finediff": "0.3.*"
+    },
+    "require-dev": {
+        "roave/security-advisories": "dev-master",
+        "christophwurst/nextcloud": "^15.0",
+        "jakub-onderka/php-parallel-lint": "^1.0.0"
+    }
 }
--- a/composer.lock
+++ b/composer.lock
--- a/lib/Controller/AttachmentApiV11Controller.php
+++ b/lib/Controller/AttachmentApiV11Controller.php
@@ -1,8 +1,7 @@
-<?php
-/**
- * @copyright Copyright (c) 2018 Ryan Fletcher <ryan.fletcher@codepassion.ca>
+/*
+ * @copyright Copyright (c) 2018 Michael Weimann <mail@michael-weimann.eu>
 *
- * @author Ryan Fletcher <ryan.fletcher@codepassion.ca>
+ * @author 2018 Michael Weimann <mail@michael-weimann.eu>
 *
 * @license GNU AGPL version 3 or any later version
 *
@@ -20,7 +19,25 @@
 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
-namespace OCA\Deck\Controller;

-class AttachmentApiV11Controller extends AttachmentApiController {
+.compact-item.ng-enter,
+.compact-item.ng-leave {
+  overflow: hidden;
+  transition: all 250ms linear;
+}
+
+.compact-item.ng-enter {
+  max-height: 0;
+
+  &.ng-enter-active {
+    max-height: 50px;
+  }
+}
+
+.compact-item.ng-leave {
+  max-height: 50px;
+
+  &.ng-leave-active {
+    max-height: 0;
+  }
 }
--- a/css/autocomplete.scss
+++ b/css/autocomplete.scss
@@ -0,0 +1,77 @@
+/**
+ * based upon apps/comments/js/vendor/At.js/dist/css/jquery.atwho.css,
+ * only changed colors and font-weight
+ */
+
+.atwho-view {
+	position:absolute;
+	top: 0;
+	left: 0;
+	display: none;
+	margin-top: 18px;
+	background: var(--color-main-background);
+	color: var(--color-main-text);
+	border: 1px solid var(--color-border);
+	border-radius: var(--border-radius);
+	box-shadow: 0 0 5px var(--color-box-shadow);
+	min-width: 120px;
+	z-index: 11110 !important;
+}
+
+.atwho-view .atwho-header {
+	padding: 5px;
+	margin: 5px;
+	cursor: pointer;
+	border-bottom: solid 1px var(--color-border);
+	color: var(--color-main-text);
+	font-size: 11px;
+	font-weight: bold;
+}
+
+.atwho-view .atwho-header .small {
+	color: var(--color-main-text);
+	float: right;
+	padding-top: 2px;
+	margin-right: -5px;
+	font-size: 12px;
+	font-weight: normal;
+}
+
+.atwho-view .atwho-header:hover {
+	cursor: default;
+}
+
+.atwho-view .cur {
+	background: var(--color-primary);
+	color: var(--color-primary-text);
+}
+.atwho-view .cur small {
+	color: var(--color-primary-text);
+}
+.atwho-view strong {
+	color: var(--color-main-text);
+	font-weight: normal;
+}
+.atwho-view .cur strong {
+	color: var(--color-primary-text);
+	font-weight: normal;
+}
+.atwho-view ul {
+	/* width: 100px; */
+	list-style:none;
+	padding:0;
+	margin:auto;
+	max-height: 200px;
+	overflow-y: auto;
+}
+.atwho-view ul li {
+	display: block;
+	padding: 5px 10px;
+	border-bottom: 1px solid var(--color-border);
+	cursor: pointer;
+}
+.atwho-view small {
+	font-size: smaller;
+	color: var(--color-main-text);
+	font-weight: normal;
+}
--- a/css/collections.css
+++ b/css/collections.css
@@ -1,7 +1,10 @@
-.resource-type-deck img {
-	opacity: 0.4 !important;
+.icon-deck {
+  background-image: url('../img/deck-dark.svg');
 }

-.resource-type-deck:hover img {
-	opacity: 0.7 !important;
+.resource-type-deck img {
+  opacity: 0.4 !important;
+}
+.resource-type-deck:hover img {
+  opacity: 0.7 !important;
 }
--- a/css/comments.scss
+++ b/css/comments.scss
@@ -0,0 +1,261 @@
+/*
+ * Copyright (c) 2016
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+#commentsTabView .emptycontent {
+	margin-top: 0;
+}
+
+#commentsTabView .newCommentForm {
+	margin-left: 36px;
+	position: relative;
+}
+
+#commentsTabView .newCommentForm .message {
+	width: 100%;
+	padding: 10px;
+	min-height: 44px;
+	margin: 0;
+
+	/* Prevent the text from overlapping with the submit button. */
+	padding-right: 30px;
+}
+
+#commentsTabView .newCommentForm {
+	.submit,
+	.submitLoading {
+		width: 44px;
+		height: 44px;
+		margin: 0;
+		padding: 13px;
+		background-color: transparent;
+		border: none;
+		opacity: .3;
+		position: absolute;
+		bottom: 0;
+		right: 0;
+	}
+}
+
+#commentsTabView .deleteLoading {
+	padding: 14px;
+	vertical-align: middle;
+}
+
+#commentsTabView .newCommentForm .submit:not(:disabled):hover,
+#commentsTabView .newCommentForm .submit:not(:disabled):focus {
+	opacity: 1;
+}
+
+#commentsTabView .newCommentForm div.message {
+	resize: none;
+}
+
+#commentsTabView .newCommentForm div.message:empty:before {
+	content: attr(data-placeholder);
+	color: grey;
+}
+
+#commentsTabView .comment {
+	position: relative;
+	/** padding bottom is little more so that the top and bottom gap look uniform **/
+	padding: 10px 0 15px;
+}
+
+#commentsTabView .comments .comment {
+	border-top: 1px solid var(--color-border);
+}
+
+#commentsTabView .comment .avatar,
+.atwho-view-ul * .avatar{
+	width: 32px;
+	height: 32px;
+	line-height: 32px;
+	margin-right: 5px;
+}
+
+#commentsTabView .comment .message .avatar,
+.atwho-view-ul * .avatar
+{
+	display: inline-block;
+}
+
+#activityTabView li.comment.collapsed .activitymessage,
+#commentsTabView .comment.collapsed .message {
+	white-space: pre-wrap;
+}
+
+#activityTabView li.comment.collapsed .activitymessage,
+#commentsTabView .comment.collapsed .message {
+	max-height: 70px;
+	overflow: hidden;
+}
+
+#activityTabView li.comment .message-overlay,
+#commentsTabView .comment .message-overlay {
+	display: none;
+}
+
+#activityTabView li.comment.collapsed .message-overlay,
+#commentsTabView .comment.collapsed .message-overlay {
+	display: block;
+	position: absolute;
+	z-index: 2;
+	height: 50px;
+	pointer-events: none;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background: -moz-linear-gradient(rgba(var(--color-main-background), 0), var(--color-main-background));
+	background: -webkit-linear-gradient(rgba(var(--color-main-background), 0), var(--color-main-background));
+	background: -o-linear-gradient(rgba(var(--color-main-background), 0), var(--color-main-background));
+	background: -ms-linear-gradient(rgba(var(--color-main-background), 0), var(--color-main-background));
+	background: linear-gradient(rgba(var(--color-main-background), 0), var(--color-main-background));
+	background-repeat: no-repeat;
+}
+
+#commentsTabView .hidden {
+	display: none !important;
+}
+
+/** set min-height as 44px to ensure that it fits the button sizes. **/
+#commentsTabView .comment .authorRow {
+	min-height: 44px;
+}
+#commentsTabView .comment .authorRow .tooltip {
+	/** because of the padding on the element, the tooltip appear too far up,
+	 adding this brings them closer to the element**/
+	margin-top: 5px;
+}
+
+.atwho-view-ul * .avatar-name-wrapper,
+#commentsTabView .comment .authorRow {
+	position: relative;
+	display: inline-flex;
+	align-items: center;
+	width: 100%;
+}
+
+#commentsTabView .comment:not(.newCommentRow) .message .avatar-name-wrapper:not(.currentUser),
+#commentsTabView .comment:not(.newCommentRow) .message .avatar-name-wrapper:not(.currentUser) .avatar,
+#commentsTabView .comment:not(.newCommentRow) .message .avatar-name-wrapper:not(.currentUser) .avatar img,
+#commentsTabView .comment .authorRow .avatar:not(.currentUser),
+#commentsTabView .comment .authorRow .author:not(.currentUser) {
+	cursor: pointer;
+}
+
+.atwho-view-ul .avatar-name-wrapper,
+.atwho-view-ul .avatar-name-wrapper .avatar,
+.atwho-view-ul .avatar-name-wrapper .avatar img {
+	cursor: pointer;
+}
+
+#commentsTabView .comments li .message .atwho-inserted,
+#commentsTabView .newCommentForm .atwho-inserted {
+	.avatar-name-wrapper {
+		/* Make the wrapper the positioning context of its child contacts
+		 * menu. */
+		position: relative;
+
+		display: inline;
+		vertical-align: top;
+		background-color: var(--color-background-dark);
+		border-radius: 50vh;
+		padding: 1px 7px 1px 1px;
+
+		/* Ensure that the avatar and the user name will be kept together. */
+		white-space: nowrap;
+
+		.avatar {
+			img {
+				vertical-align: top;
+			}
+			height: 16px;
+			width: 16px;
+			vertical-align: middle;
+			padding: 1px;
+			margin-top: -3px;
+			margin-left: 0;
+			margin-right: 2px;
+		}
+		strong {
+			/* Ensure that the user name is shown in bold, as different browsers
+			 * use different font weights for strong elements. */
+			font-weight: bold;
+		}
+	}
+	.avatar-name-wrapper.currentUser {
+		background-color: var(--color-primary);
+		color: var(--color-primary-text);
+	}
+}
+
+.atwho-view-ul * .avatar-name-wrapper {
+	white-space: nowrap;
+}
+#commentsTabView .comment .author,
+#commentsTabView .comment .date {
+	opacity: .5;
+}
+#commentsTabView .comment .author {
+	max-width: 210px;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
+}
+#commentsTabView .comment .date {
+	margin-left: auto;
+	/** this is to fix the tooltip being too close due to the margin-top applied
+	 to bring the tooltip closer for the action icons **/
+	padding: 10px 0px;
+}
+
+#commentsTabView .comments > li:not(.newCommentRow) .message {
+	padding-left: 40px;
+	word-wrap: break-word;
+	overflow-wrap: break-word;
+}
+
+#commentsTabView .comment .action {
+	opacity: 0.3;
+	padding: 14px;
+	display: block;
+}
+
+#commentsTabView .comment .action:hover,
+#commentsTabView .comment .action:focus {
+	opacity: 1;
+}
+
+#commentsTabView .newCommentRow .action-container {
+	margin-left: auto;
+}
+
+#commentsTabView .comment.disabled .message {
+	opacity: 0.3;
+}
+
+#commentsTabView .comment.disabled .action {
+	display: none;
+}
+
+#commentsTabView .message.error {
+	color: #e9322d;
+	border-color: #e9322d;
+	box-shadow: 0 0 6px #f8b9b7;
+}
+
+.app-files .action-comment {
+	padding: 16px 14px;
+}
+
+#commentsTabView .comment .message .contactsmenu-popover {
+	left: -6px;
+	top: 24px;
+}
--- a/css/comp-appnav.scss
+++ b/css/comp-appnav.scss
@@ -0,0 +1,113 @@
+/*
+ * @copyright Copyright (c) 2017 Julius Härtl <jus@bitgrid.net>
+ * @copyright Copyright (c) 2016, John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @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/>.
+ *
+ */
+
+/**
+ * Hotfix for support <NC13 with new app sidebar
+ */
+#app-navigation {
+  .app-navigation-entry-menu.open {
+    ul li a {
+      background-position: 10px center;
+      padding: 0 10px 0 36px !important;
+    }
+  }
+  .app-navigation-entry-edit {
+    display: none;
+  }
+  .editing {
+    .app-navigation-entry-edit {
+      display: block;
+      position: absolute;
+      background: $color-main-background;
+      height: auto;
+      z-index: 250;
+    }
+  }
+}
+
+
+/**
+ * copied styles from core/css/styles.scss
+ * to have the same breadcrumb styling in NC12
+ */
+.breadcrumb {
+  display: inline-flex;
+}
+div.crumb {
+  display: inline-flex;
+  background-repeat: no-repeat;
+  background-position: right center;
+  height: 44px;
+  background-size: auto 24px;
+  flex: 0 0 auto;
+  order: 1;
+  padding-right: 7px;
+  &.crumbmenu {
+    order: 2;
+    position: relative;
+    a {
+      opacity: 0.5
+    }
+  }
+  &.hidden {
+    display: none;
+    ~ .crumb {
+      order: 3;
+    }
+  }
+  > a,
+  > span {
+    position: relative;
+    padding: 12px;
+    opacity: 0.5;
+    top: 0 !important;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    flex: 0 0 auto;
+    &.icon-home {
+      // Hide home text
+      text-indent: -9999px;
+    }
+  }
+  > a[class^='icon-'] {
+    padding: 0;
+    width: 44px;
+  }
+  &:not(:first-child) a {
+  }
+  &:last-child {
+    font-weight: 600;
+    margin-right: 10px;
+    // Allow multiple span next to the main 'a'
+    a ~ span {
+      padding-left: 0;
+    }
+  }
+  &:hover, &:focus, a:focus, &:active {
+    > a,
+    > span {
+      opacity: .7;
+    }
+  }
+}
--- a/lib/Exceptions/ConflictException.php
+++ b/lib/Exceptions/ConflictException.php
@@ -1,8 +1,7 @@
-<?php
-/**
- * @copyright Copyright (c) 2020 Jakob Röhrl <jakob.roehrl@web.de>
+/*
+ * @copyright Copyright (c) 2018 Michael Weimann <mail@michael-weimann.eu>
 *
- * @author Jakob Röhrl <jakob.roehrl@web.de>
+ * @author 2018 Michael Weimann <mail@michael-weimann.eu>
 *
 * @license GNU AGPL version 3 or any later version
 *
@@ -21,23 +20,24 @@
 *
 */

-namespace OCA\Deck\Exceptions;
+.compact-mode {
+  .card {
+    margin: $compact-board-item-margin;

-use OCA\Deck\StatusException;
+    &:last-child {
+      margin: $compact-board-last-item-margin;
+    }
+  }

-class ConflictException extends StatusException {
-	private $data;
+  .stack {
+    .as-sortable-placeholder {
+      margin: $compact-board-item-margin;
+      min-height: 43px;
+      height: 43px;

-	public function __construct($message, $data = null) {
-		parent::__construct($message);
-		$this->data = $data;
-	}
-
-	public function getStatus() {
-		return 409;
-	}
-
-	public function getData() {
-		return $this->data;
-	}
+      &:last-child {
+        margin: $compact-board-last-item-margin;
+      }
+    }
+  }
 }
--- a/css/deck.scss
+++ b/css/deck.scss
@@ -1 +0,0 @@
-@include icon-black-white('deck', 'deck', 1);
--- a/css/icons.scss
+++ b/css/icons.scss
@@ -1,41 +1,80 @@
 /**
 * Custom icons
 */
-@include icon-black-white('deck', 'deck', 1);
-@include icon-black-white('archive', 'deck', 1);
-@include icon-black-white('circles', 'deck', 1);
-@include icon-black-white('clone', 'deck', 1);
-@include icon-black-white('filter', 'deck', 1);
-@include icon-black-white('filter_set', 'deck', 1);
-@include icon-black-white('attach', 'deck', 1);
-@include icon-black-white('reply', 'deck', 1);
-@include icon-black-white('notifications-dark', 'deck', 1);
-@include icon-black-white('description', 'deck', 1);
+.icon-deck {
+  background-image: url('../img/deck-dark.svg');
+}
+
+.icon-group {
+  background-image: url('../../../settings/img/users.svg');
+}
+
+.icon-help {
+  background-image: url('../../../settings/img/help.svg');
+}
+
+.icon-add-white {
+  background-image: url('../img/add-white.svg');
+}
+
+.icon-archive {
+  background-image: url('../img/archive.svg');
+}
+
+.icon-archive-white {
+  background-image: url('../img/archive-white.svg');
+}
+
+.icon-details {
+  background-image: url('../img/details.svg');
+}
+
+.icon-details-white {
+  background-image: url('../img/details-white.svg');
+}
+
+.icon-home {
+  background-image: var(--icon-home-000, url('../../../core/img/places/home.svg'));
+}
+
+.icon-description {
+  background-image: var(--icon-text-000, url('../img/description.svg'));
+}
+
+.icon-badge {
+  background-image: url('../img/calendar-dark.svg');
+}

 .icon-toggle-compact-collapsed {
-	@include icon-color('toggle-view-expand', 'deck', $color-black);
+  background-image: url('../img/toggle-view-expand.svg');
 }

 .icon-toggle-compact-expanded {
-	@include icon-color('toggle-view-collapse', 'deck', $color-black);
+  background-image: url('../img/toggle-view-collapse.svg');
 }
-.icon-activity {
-	@include icon-color('activity-dark', 'activity', $color-black);
-}
-.icon-comment--unread {
-	@include icon-color('comment', 'actions', $color-primary, 1, true);
+
+@if mixin-exists('icon-black-white') {
+	@include icon-black-white('deck', 'deck', 1);
+	@include icon-black-white('archive', 'deck', 1);
+	@include icon-black-white('circles', 'deck', 1);
+	
+	.icon-toggle-compact-collapsed {
+		@include icon-color('toggle-view-expand', 'deck', $color-black);
+	}
+
+	.icon-toggle-compact-expanded {
+		@include icon-color('toggle-view-collapse', 'deck', $color-black);
+	}
+	.icon-activity {
+		@include icon-color('activity-dark', 'activity', $color-black);
+	}
 }

 .avatardiv.circles {
-	background: var(--color-primary);
+  background: var(--color-primary);
 }
-
 .icon-circles {
-	opacity: 1;
-	background-size: 20px;
-	background-position: center center;
-}
-
-.icon-colorpicker {
-	background-image: url('../img/color_picker.svg');
-}
+  opacity: 1;
+  background-size: 20px;
+  background-position: center center;
+}
--- a/css/print.scss
+++ b/css/print.scss
@@ -2,26 +2,21 @@
 	/* hide stuff */
 	#body-user {
 		#header,
-		.app-navigation,
-		.app-sidebar,
-		.board-header-controls,
-		.board-actions,
+		div#app-navigation,
+		div.board-header-controls,
 		#app-navigation-toggle,
 		#app-navigation-toggle-custom,
 		div#controls.ng-scope div.crumb:not(.title),
 		div#controls.ng-scope div.crumb a.bullet,
 		a.ng-binding + a,
 		div.card.create,
-		.stack__header .action-item,
 		button.card-options {
 			display: none !important;
 		}
-
 		#content {
 			margin: 0;
 			padding: 0;
 		}
-
 		#app-content {
 			margin: 0 !important;
 		}
@@ -64,6 +59,8 @@
 		white-space: nowrap;
 	}

+	span.due { }
+
 	div.card-assigned-users {
 		margin-right:10px;
 	}
@@ -78,12 +75,7 @@
 	@page {
 		size: A4 landscape;
 		margin: 2cm;
-	}
-
-	.board {
-		max-height: none !important;
-		overflow: visible !important;
-	}
+		}

 	div#innerBoard {
 		display:flex;
--- a/css/style.scss
+++ b/css/style.scss
--- a/docs/API-Nextcloud.md
+++ b/docs/API-Nextcloud.md
@@ -1,34 +1,5 @@
 # Nextcloud APIs

-## Capabilities
-
-The [Nextcloud Capabilities API](https://docs.nextcloud.com/server/latest/developer_manual/client_apis/OCS/ocs-api-overview.html#capabilities-api) provides the following information for the Deck app:
-
- `version` Current version of the Deck app running
- `canCreateBoards` Ability of the current user to create new boards for themselves
-
-```
-{
-  "ocs": {
-    "meta": {
-      "status": "ok",
-      "statuscode": 200,
-      "message": "OK"
-    },
-    "data": {
-      "capabilities": {
-        "deck": {
-          "version": "0.8.0",
-          "canCreateBoards": true
-        },
-      }
-    }
-  }
-}
-```
-
-
-
 ## Available sharees

 When sharing a board to a user, group or circle, the possible sharees can be obtained though the files_sharing API.
--- a/docs/API.md
+++ b/docs/API.md
@@ -1,11 +1,10 @@

-The REST API provides access for authenticated users to their data inside the Deck app. To get a better understanding of Decks data models and their relations, please have a look at the  [data structure](structure.md) documentation.
+The REST API provides access for authenticated users to their data inside the Deck app. To get a better understand of Decks data models and their relations, please have a look at the  [data structure](structure.md) documentation.

 # Prequisited

 - All requests require a `OCS-APIRequest` HTTP header to be set to `true` and a `Content-Type` of `application/json`.
 - The API is located at https://nextcloud.local/index.php/apps/deck/api/v1.0
- All request parameters are required, unless otherwise specified

 ## Naming

@@ -21,7 +20,7 @@ The REST API provides access for authenticated users to their data inside the De

 ### 400 Bad request

-In case the request is invalid, e.g. because a parameter is missing or an invalid value has been transmitted, a 400 error will be returned:
+In case the request is invalid, e.g. because a parameter is missing, a 400 error will be returned:

 ```json
 {
@@ -41,24 +40,11 @@ In any case a user doesn't have access to a requested entity, a 403 error will b
 }
 ```

-## Formats
-
-### Date
-
-Datetime values in request data need to be provided in ISO-8601. Example: 2020-01-20T09:52:43+00:00
-
 ## Headers

 ### If-Modified-Since

 Some index endpoints support limiting the result set to entries that have been changed since the given time.
-The supported date formats are:
-
-* IMF-fixdate:                 `Sun, 03 Aug 2019 10:34:12 GMT`
-* (obsolete) RFC 850:          `Sunday, 03-Aug-19 10:34:12 GMT`
-* (obsolete) ANSI C asctime(): `Sun Aug  3 10:34:12 2019`
-
-It is highly recommended to only use the IMF-fixdate format. Note that according to [RFC2616](https://tools.ietf.org/html/rfc2616#section-3.3) all HTTP date/time stamps MUST be represented in Greenwich Mean Time (GMT), without exception.

 Example curl request:

@@ -66,58 +52,9 @@ Example curl request:
 curl -u admin:admin -X GET \
    'http://localhost:8000/index.php/apps/deck/api/v1.0/boards/2/stacks' \
    -H "OCS-APIRequest: true" \
-    -H "If-Modified-Since: Mon, 05 Nov 2018 09:28:00 GMT"
+    -H "If-Modified-Since: Mon, 5 Nov 2018 09:28:00 GMT"
 ```

-### ETag
-
-An ETag header is returned in order to determine if further child elements have been updated for the following endpoints:
-
- Fetch all user board `GET /api/v1.0/boards`
- Fetch a single board `GET /api/v1.0/boards/{boardId}`
- Fetch all stacks of a board `GET /api/v1.0/boards/{boardId}/stacks`
- Fetch a single stacks of a board `GET /api/v1.0/boards/{boardId}/stacks/{stackId}`
- Fetch a single card of a board `GET /api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}`
- Fetch attachments of a card `GET /api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments`
-
-If a `If-None-Match` header is provided and the requested element has not changed a `304` Not Modified response will be returned. 
-
-Changes of child elements will propagate to their parents and also cause an update of the ETag which will be useful for determining if a sync is necessary on any client integration side. As an example, if a label is added to a card, the ETag of all related entities (the card, stack and board) will change.
-
-If available the ETag will also be part of JSON response objects as shown below for a card:
-
-```json
-{
-  "id": 81,
-  "ETag": "bdb10fa2d2aeda092a2b6b469454dc90",
-  "title": "Test card"
-}
-```
-
-# Changelog
-
-## 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

 ## Boards
@@ -132,7 +69,7 @@ The board list endpoint supports setting an `If-Modified-Since` header to limit

 | Parameter | Type    | Description                  |
 | --------- | ------- | ---------------------------- |
-| details   | Bool    | **Optional** Enhance boards with details about labels, stacks and users |
+| options   | Bool    | **Optional** Enhance boards with details about labels, stacks and users |

 #### Response

@@ -162,12 +99,7 @@ Returns an array of board items
        "users": [],
        "shared": 0,
        "deletedAt": 0,
-        "id": 10,
-        "lastModified": 1586269585,
-        "settings": {
-            "notify-due": "off",
-            "calendar": true
-        }
+        "id": 10
    }
 ]
 ```
@@ -178,7 +110,7 @@ Returns an array of board items

 | Parameter | Type   | Description                                          |
 | --------- | ------ | ---------------------------------------------------- |
-| title     | String | The title of the new board, maximum length is limited to 100 characters |
+| title     | String | The title of the new board                           |
 | color     | String | The hexadecimal color of the new board (e.g. FF0000) |

 ```json
@@ -241,15 +173,10 @@ Returns an array of board items
    },
    "users": [],
    "deletedAt": 0,
-    "id": 10,
-    "lastModified": 1586269585
+    "id": 10
 }
 ```

-##### 403 Forbidden
-
-A 403 response might be returned if the users ability to create new boards has been disabled by the administrator. For checking this before, see the `canCreateBoards` value in the [Nextcloud capabilties](./API-Nextcloud.md).
-
 ### GET /boards/{boardId} - Get board details

 #### Request parameters
@@ -327,9 +254,9 @@ A 403 response might be returned if the users ability to create new boards has b

 | Parameter | Type   | Description                                          |
 | --------- | ------ | ---------------------------------------------------- |
-| title     | String | The title of the board, maximum length is limited to 100 characters |
-| color     | String | The hexadecimal color of the board (e.g. FF0000) |
-| archived  | Bool   | Whether or not this board should be archived. |
+| title     | String | The title of the new board                           |
+| color     | String | The hexadecimal color of the new board (e.g. FF0000) |
+| archived  | Bool   | The hexadecimal color of the new board (e.g. FF0000) |

 ```json
 {
@@ -499,13 +426,6 @@ The board list endpoint supports setting an `If-Modified-Since` header to limit

 ### POST /boards/{boardId}/stacks - Create a new stack

-#### Request body
-
-| Parameter | Type    | Description                                          |
-| --------- | ------- | ---------------------------------------------------- |
-| title     | String | The title of the new stack, maximum length is limited to 100 characters |
-| order     | Integer | Order for sorting the stacks                         |
-
 #### Request parameters

 | Parameter | Type    | Description                  |
@@ -529,7 +449,7 @@ The board list endpoint supports setting an `If-Modified-Since` header to limit

 | Parameter | Type    | Description                                          |
 | --------- | ------- | ---------------------------------------------------- |
-| title     | String | The title of the stack, maximum length is limited to 100 characters |
+| title     | String  | The title of the new stack                           |
 | order     | Integer | Order for sorting the stacks                         |

 #### Response
@@ -578,11 +498,9 @@ The board list endpoint supports setting an `If-Modified-Since` header to limit

 | Parameter | Type    | Description                                          |
 | --------- | ------- | ---------------------------------------------------- |
-| title     | String | The title of the card, maximum length is limited to 255 characters |
+| title     | String  | The title of the new stack                           |
 | type      | String  | Type of the card (for later use) use 'plain' for now |
 | order     | Integer | Order for sorting the stacks                         |
-| description | String  | _(optional)_ The markdown description of the card  |
-| duedate   | timestamp | _(optional)_ The duedate of the card or null       |

 #### Response

@@ -601,7 +519,7 @@ The board list endpoint supports setting an `If-Modified-Since` header to limit
   "owner":"admin",
   "order":999,
   "archived":false,
-   "duedate": "2019-12-24T19:29:30+00:00",
+   "duedate":null,
   "deletedAt":0,
   "commentsUnread":0,
   "id":10,
@@ -625,11 +543,11 @@ The board list endpoint supports setting an `If-Modified-Since` header to limit

 | Parameter   | Type      | Description                                          |
 |-------------|-----------|------------------------------------------------------|
-| title     | String | The title of the card, maximum length is limited to 255 characters |
+| title       | String    | The card title                                       |
 | description | String    | The markdown description of the card                 |
 | type        | String    | Type of the card (for later use) use 'plain' for now |
 | order       | Integer   | Order for sorting the stacks                         |
-| duedate     | timestamp | The ISO-8601 formatted duedate of the card or null   |
+| duedate     | timestamp | The duedate of the card or null                      |


 ```
@@ -638,7 +556,7 @@ The board list endpoint supports setting an `If-Modified-Since` header to limit
   "description": "A card description",
   "type": "plain",
   "order": 999,
-   "duedate": "2019-12-24T19:29:30+00:00",
+   "duedate": null,
 }
 ```

@@ -719,34 +637,7 @@ The board list endpoint supports setting an `If-Modified-Since` header to limit

 ##### 200 Success

-```json
-{
-  "id": 3,
-  "participant": {
-    "primaryKey": "admin",
-    "uid": "admin",
-    "displayname": "admin"
-  },
-  "cardId": 1
-}
-```
-
-##### 400 Bad request
-
-```json
-{
-  "status": 400,
-  "message": "The user is already assigned to the card"
-}
-```
-
-The request can fail with a bad request response for the following reasons:
- Missing or wrongly formatted request parameters
- The user is already assigned to the card
- The user is not part of the board
-
-
-### PUT /boards/{boardId}/stacks/{stackId}/cards/{cardId}/unassignUser - Unassign a user from a card
+### PUT /boards/{boardId}/stacks/{stackId}/cards/{cardId}/unassignUser - Assign a user to a card

 #### Request parameters

@@ -760,7 +651,7 @@ The request can fail with a bad request response for the following reasons:

 | Parameter | Type    | Description                             |
 | --------- | ------- | --------------------------------------- |
-| userId    | String  | The user id to unassign from the card   |
+| userId    | String  | The user id to assign to the card       |

 #### Response

@@ -944,8 +835,7 @@ 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             |

- 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
+For now only `deck_file` is supported as an attachment type.

 #### Response

@@ -977,7 +867,6 @@ For now only `deck_file` is supported as an attachment type.

 ### DELETE /boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments/{attachmentId} - Delete an attachment

-    
 #### Request parameters

 | Parameter    | Type    | Description                                   |
@@ -1006,388 +895,3 @@ 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/`. 
-This has the benefit that both the web UI as well as external integrations can use the same API.
-
-## Config
-
-Deck stores user and app configuration values globally and per board. The GET endpoint allows to fetch the current global configuration while board settings will be exposed through the board element on the regular API endpoints. 
-
-### GET /api/v1.0/config - Fetch app configuration values
-
-#### Response
-
-| 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)|  
-
-```
-{
-  "ocs": {
-    "meta": {
-      "status": "ok",
-      "statuscode": 200,
-      "message": "OK"
-    },
-    "data": {
-      "calendar": true,
-      "cardDetailsInModal": true,
-      "groupLimit": [
-        {
-          "id": "admin",
-          "displayname": "admin"
-        }
-      ]
-    }
-  }
-}
-
-```
-
-### POST /api/v1.0/config/{id}/{key} - Set a config value
-
-
-#### Request parameters
-
-| Parameter | Type    | Description                             |
-| --------- | ------- | --------------------------------------- |
-| id    | Integer | The id of the board                      |
-| key     | String | The config key to set, prefixed with `board:{boardId}:` for board specific settings |
-| value    | String | The value that should be stored for the config key |
-
-##### Board configuration
-
-| Key | Value |
-| --- | ----- |
-| notify-due | `off`, `assigned` or `all` |
-| calendar | Boolean |
-| cardDetailsInModal | Boolean |
- 
-#### Example request
-
-```
-curl -X POST 'https://admin:admin@nextcloud.local/ocs/v2.php/apps/deck/api/v1.0/config/calendar' -H 'Accept: application/json' -H "Content-Type: application/json" -H 'OCS-APIRequest: true' --data-raw '{"value":false}'
-
-{
-  "ocs": {
-    "meta": {
-      "status": "ok",
-      "statuscode": 200,
-      "message": "OK"
-    },
-    "data": false
-  }
-}
-
-```
-
-## Comments
-
-### GET /cards/{cardId}/comments - List comments
-
-#### Request parameters
-
-string $cardId, int $limit = 20, int $offset = 0
-
-| Parameter | Type    | Description                             |
-| --------- | ------- | --------------------------------------- |
-| cardId    | Integer | The id of the card                      |
-| limit     | Integer | The maximum number of comments that should be returned, defaults to 20 |
-| offset    | Integer | The start offset used for pagination, defaults to 0 |
-
-```
-curl 'https://admin:admin@nextcloud/ocs/v2.php/apps/deck/api/v1.0/cards/12/comments' \
-    -H 'Accept: application/json' -H 'OCS-APIRequest: true'
-```
-
-#### Response
-
-A list of comments will be provided under the `ocs.data` key. If no or no more comments are available the list will be empty.
-
-##### 200 Success
-
-```
-{
-  "ocs": {
-    "meta": {
-      "status": "ok",
-      "statuscode": 200,
-      "message": "OK"
-    },
-    "data": [
-      {
-        "id": 175,
-        "objectId": 12,
-        "message": "This is a comment with a mention to  @alice",
-        "actorId": "admin",
-        "actorType": "users",
-        "actorDisplayName": "Administrator",
-        "creationDateTime": "2020-03-10T10:23:07+00:00",
-        "mentions": [
-          {
-            "mentionId": "alice",
-            "mentionType": "user",
-            "mentionDisplayName": "alice"
-          }
-        ]
-      }
-    ]
-  }
-}
-```
-
-In case a comment is marked as a reply to another comment object, the parent comment will be added as `replyTo` entry to the response. Only the next parent node is added, nested replies are not exposed directly. 
-
-```json
-[
-  {
-    "id": 175,
-    "objectId": 12,
-    "message": "This is a comment with a mention to  @alice",
-    "actorId": "admin",
-    "actorType": "users",
-    "actorDisplayName": "Administrator",
-    "creationDateTime": "2020-03-10T10:23:07+00:00",
-    "mentions": [
-      {
-        "mentionId": "alice",
-        "mentionType": "user",
-        "mentionDisplayName": "alice"
-      }
-    ],
-    "replyTo": {
-     "id": 175,
-     "objectId": 12,
-     "message": "This is a comment with a mention to  @alice",
-     "actorId": "admin",
-     "actorType": "users",
-     "actorDisplayName": "Administrator",
-     "creationDateTime": "2020-03-10T10:23:07+00:00",
-     "mentions": [
-       {
-         "mentionId": "alice",
-         "mentionType": "user",
-         "mentionDisplayName": "alice"
-       }
-     ]
-   }
-  }
-]
-```
-
-
-### POST /cards/{cardId}/comments - Create a new comment
-
-#### Request parameters
-
-| Parameter | Type    | Description                             |
-| --------- | ------- | --------------------------------------- |
-| cardId    | Integer | The id of the card                      |
-| message     | String | The message of the comment, maximum length is limited to 1000 characters |
-| parentId    | Integer | _(optional)_ The start offset used for pagination, defaults to null |
-
-Mentions will be parsed by the server. The server will return a list of mentions in the response to this request as shown below.
-
-```
-curl -X POST 'https://admin:admin@nextcloud/ocs/v2.php/apps/deck/api/v1.0/cards/12/comments' \
-    -H 'Accept: application/json' -H 'OCS-APIRequest: true'
-    -H 'Content-Type: application/json;charset=utf-8'
-    --data '{"message":"My message to @bob","parentId":null}'
-```
-
-#### Response
-
-A list of comments will be provided under the `ocs.data` key. If no or no more comments are available the list will be empty.
-
-##### 200 Success
-
-```
-{
-  "ocs": {
-    "meta": {
-      "status": "ok",
-      "statuscode": 200,
-      "message": "OK"
-    },
-    "data": {
-      "id": "177",
-      "objectId": "13",
-      "message": "My message to @bob",
-      "actorId": "admin",
-      "actorType": "users",
-      "actorDisplayName": "Administrator",
-      "creationDateTime": "2020-03-10T10:30:17+00:00",
-      "mentions": [
-        {
-          "mentionId": "bob",
-          "mentionType": "user",
-          "mentionDisplayName": "bob"
-        }
-      ]
-    }
-  }
-}
-```
-
-##### 400 Bad request
-
-A bad request response is returned if invalid input values are provided. The response message will contain details about which part was not valid.
-
-##### 404 Not found
-
-A not found response might be returned if:
- The card for the given cardId could not be found
- The parent comment could not be found
-
-
-### PUT /cards/{cardId}/comments/{commentId} - Update a comment
-
-#### Request parameters
-
-| Parameter | Type    | Description                             |
-| --------- | ------- | --------------------------------------- |
-| cardId    | Integer | The id of the card                      |
-| commentId    | Integer | The id of the comment                      |
-| message     | String | The message of the comment, maximum length is limited to 1000 characters |
-
-Mentions will be parsed by the server. The server will return a list of mentions in the response to this request as shown below.
-
-Updating comments is limited to the current user being the same as the comment author specified in the `actorId` of the comment.
-
-```
-curl -X POST 'https://admin:admin@nextcloud/ocs/v2.php/apps/deck/api/v1.0/cards/12/comments' \
-    -H 'Accept: application/json' -H 'OCS-APIRequest: true'
-    -H 'Content-Type: application/json;charset=utf-8'
-    --data '{"message":"My message"}'
-```
-
-#### Response
-
-A list of comments will be provided under the `ocs.data` key. If no or no more comments are available the list will be empty.
-
-##### 200 Success
-
-```
-{
-  "ocs": {
-    "meta": {
-      "status": "ok",
-      "statuscode": 200,
-      "message": "OK"
-    },
-    "data": {
-      "id": "177",
-      "objectId": "13",
-      "message": "My message",
-      "actorId": "admin",
-      "actorType": "users",
-      "actorDisplayName": "Administrator",
-      "creationDateTime": "2020-03-10T10:30:17+00:00",
-      "mentions": []
-    }
-  }
-}
-```
-
-##### 400 Bad request
-
-A bad request response is returned if invalid input values are provided. The response message will contain details about which part was not valid.
-
-##### 404 Not found
-
-A not found response might be returned if:
- The card for the given cardId could not be found
- The comment could not be found
-
-### DELETE /cards/{cardId}/comments/{commentId} - Delete a comment
-
-#### Request parameters
-
-| Parameter | Type    | Description                             |
-| --------- | ------- | --------------------------------------- |
-| cardId    | Integer | The id of the card                      |
-| commentId    | Integer | The id of the comment                      |
-
-Deleting comments is limited to the current user being the same as the comment author specified in the `actorId` of the comment.
-
-```
-curl -X DELETE 'https://admin:admin@nextcloud/ocs/v2.php/apps/deck/api/v1.0/cards/12/comments' \
-    -H 'Accept: application/json' -H 'OCS-APIRequest: true'
-    -H 'Content-Type: application/json;charset=utf-8'
-```
-
-#### Response
-
-A list of comments will be provided under the `ocs.data` key. If no or no more comments are available the list will be empty.
-
-##### 200 Success
-
-```
-{
-  "ocs": {
-    "meta": {
-      "status": "ok",
-      "statuscode": 200,
-      "message": "OK"
-    },
-    "data": []
-  }
-}
-```
-
-##### 400 Bad request
-
-A bad request response is returned if invalid input values are provided. The response message will contain details about which part was not valid.
-
-##### 404 Not found
-
-A not found response might be returned if:
- The card for the given cardId could not be found
- The comment could not be found
--- a/docs/Markdown.md
+++ b/docs/Markdown.md
@@ -1,6 +1,6 @@
 ## What is Markdown

-The [wikipedia markdown entry](https://en.wikipedia.org/wiki/Markdown) introduced markdown as :
+The [wikipedia markdown entry](https://en.wikipedia.org/wiki/Markdown) introduced markdown as : 

 > Markdown is a lightweight markup language with plain text formatting syntax. It is designed so that it can be converted to HTML and many other formats using a tool by the same name. Markdown is often used to format readme files, for writing messages in online discussion forums, and to create rich text using a plain text editor. As the initial description of Markdown contained ambiguities and unanswered questions, many implementations and extensions of Markdown appeared over the years to answer these issues.

@@ -14,18 +14,14 @@ That same link offers also a comprehensive list of what is supported, and what i

 [CommonMark Markdown Reference](http://commonmark.org/help/)

-## Note about checklists
-
-It is possible to create checklists in Deck by writing it in Markdown, using the following syntax:
-```md
- [ ] This is a not checked item
- [x] This is a checked item
-```
-Then, the items can be checked and unchecked by clicking on the rendered checkbox.
-Also, a summary of the completed items will be visible at the bottom of the card element.
-
 ## Known Issues

-As per [issue #127](https://github.com/nextcloud/deck/issues/127) Due to a known limitation of the current script to support markdown, Links that contain the `")"` character will not display well, or will break.
+As per [issue #127](https://github.com/nextcloud/deck/issues/127) Due to a known limitation of the current script to support markdown, Links that contain the `")"` character will not display well, or will break. 
 The recommended solution is to use `"<"` and `">"` to wrap those links. It should assure their integrity.
 If you come by another case of broken link, or broken display of links, please report it by opening a new issue.
+
+
+
+
+
+
--- a/docs/User_documentation_en.md
+++ b/docs/User_documentation_en.md
@@ -1,6 +1,6 @@
 ## Introduction
 ### What about Deck ?
-You may know Kanban website like Trello? Deck is about the same thing but secured and respectful of your privacy!  
+You may know Kanban website like Trello ? Deck is about the same thing but secured and respectful of your privacy !  
 Integrated in Nextcloud, you can easily manage your projects while having your data secured.

 ### Use cases
@@ -14,9 +14,6 @@ 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.
@@ -39,7 +36,6 @@ And all the magic of this software consists on moving your cards from a stack to

 ### 3. Handle cards options
 Once you have created your cards, you can modify them or add options by clicking on them. So, what are the options? Well, there are several of them:
-
 - Tag Management
 - Assign a card to a user (s·he will receive a notification)
 - Render date, or deadline
@@ -61,7 +57,6 @@ Once finished or obsolete, a task could be archived. The tasks is not deleted, i
 ### 5. Manage your board
 You can manage the settings of your Deck once you are inside it, by clicking on the small wheel at the top right.
 Once in this menu, you have access to several things:
-
 - Sharing
 - Tags
 - Deleted objects
@@ -72,109 +67,3 @@ 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!

-### 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
-
-| Filter      | Operators         | Query                                                        |
-| ----------- | ----------------- | ------------------------------------------------------------ |
-| title       | `:`               | text token used for a case-insentitive search on the cards title |
-| description | `:`               | text token used for a case-insentitive search on the cards description |
-| list        | `:`               | text token used for a case-insentitive search on the cards list name |
-| tag         | `:`               | text token used for a case-insentitive search on the assigned tags |
-| date        | `:`               | 'overdue', 'today', 'week', 'month', 'none'                  |
-|             | `>` `<` `>=` `<=` | Compare the card due date to the passed date (see [supported date formats](https://www.php.net/manual/de/datetime.formats.php)) Card due dates are always considered UTC for comparison |
-| assigned    | `:`               | id or displayname of a user or group for a search on the assigned users or groups |
-
-Other text tokens will be used to perform a case-insensitive search on the card title and description
-
-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
-```
--- a/docs/extra.css
+++ b/docs/extra.css
@@ -1,3 +1,3 @@
 .subnav ul {
-	padding-left: 20px;
+    padding-left: 20px;
 }
--- a/docs/implement-import.md
+++ b/docs/implement-import.md
@@ -1,32 +0,0 @@
-## 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
--- a/docs/import-class-diagram.md
+++ b/docs/import-class-diagram.md
@@ -1,7 +0,0 @@
-## 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)
--- a/docs/resources/BoardImport.svg
+++ b/docs/resources/BoardImport.svg
@@ -1,214 +0,0 @@
-<?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>
--- a/docs/resources/BoardImport.yuml
+++ b/docs/resources/BoardImport.yuml
@@ -1,24 +0,0 @@
-// 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]
--- a/img/attach.svg
+++ b/img/attach.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M16.5 6v11.5c0 2.21-1.79 4-4 4s-4-1.79-4-4V5c0-1.38 1.12-2.5 2.5-2.5s2.5 1.12 2.5 2.5v10.5c0 .55-.45 1-1 1s-1-.45-1-1V6H10v9.5c0 1.38 1.12 2.5 2.5 2.5s2.5-1.12 2.5-2.5V5c0-2.21-1.79-4-4-4S7 2.79 7 5v12.5c0 3.04 2.46 5.5 5.5 5.5s5.5-2.46 5.5-5.5V6h-1.5z"/><path d="M0 0h24v24H0z" fill="none"/></svg>
--- a/img/clone.svg
+++ b/img/clone.svg
@@ -1 +0,0 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M11.8 13.8H2.2V4.2h9.6m1.2 0c0-.67-.53-1.2-1.2-1.2H2.2C1.53 3 1 3.53 1 4.2v9.6c0 .67.53 1.2 1.2 1.2h9.6c.67 0 1.2-.53 1.2-1.2"/><path d="m4.2 1c-0.67 0-1.2 0.54-1.2 1.2h10.8v10.8c0.67 0 1.2-0.53 1.2-1.2v-9.6c0-0.67-0.53-1.2-1.2-1.2z"/></svg>
--- a/img/description.svg
+++ b/img/description.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M14,17L4,17v2h10v-2zM20,9L4,9v2h16L20,9zM4,15h16v-2L4,13v2zM4,5v2h16L20,5L4,5z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" version="1.1" height="16"><path fill="#000" d="m2.5 1c-0.28 0-0.5 0.22-0.5 0.5v13c0 0.28 0.22 0.5 0.5 0.5h11c0.28 0 0.5-0.22 0.5-0.5v-10.5l-3-3h-8.5zm1.5 2h6v1h-6v-1zm0 3h5v1h-5v-1zm0 3h8v1h-8v-1zm0 3h4v1h-4v-1z"/></svg>
--- a/img/filter.svg
+++ b/img/filter.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 4.233 4.233"><g paint-order="stroke fill markers"><path d="M.52.465h3.283L2.631 1.918h-.99zM1.642 1.918h.992v1.866l-.996-.455z"/></g></svg>
--- a/img/filter_set.svg
+++ b/img/filter_set.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 4.233 4.233" height="16" width="16"><path d="M.52.465h3.283L2.631 1.918h-.99zm1.122 1.453h.992v1.866l-.996-.455z" paint-order="stroke fill markers"/><ellipse ry=".691" rx=".674" cy="3.461" cx="3.45" fill="#000"/></svg>
--- a/img/notifications-dark.svg
+++ b/img/notifications-dark.svg
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16">
- <path d="m8 2c-0.5523 0-1 0.4477-1 1 0 0.0472 0.021 0.0873 0.0273 0.1328-1.7366 0.4362-3.0273 1.9953-3.0273 3.8672v2l-1 1v1h10v-1l-1-1v-2c0-1.8719-1.291-3.431-3.0273-3.8672 0.0063-0.0455 0.0273-0.0856 0.0273-0.1328 0-0.5523-0.4477-1-1-1zm-2 10c0 1.1046 0.8954 2 2 2s2-0.8954 2-2z" fill="#000"/>
-</svg>
--- a/img/reply.svg
+++ b/img/reply.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M15 15s-.4-7.8-7-10V1L1 8l7 7v-4c5.1 0 7 4 7 4z"/></svg>
--- a/js/.babelrc.js
+++ b/js/.babelrc.js
@@ -0,0 +1,12 @@
+module.exports = {
+	presets: [
+		[
+			'@babel/preset-env',
+			{
+				targets: {
+					browsers: ['last 2 versions', 'ie >= 11']
+				}
+			}
+		]
+	]
+}
--- a/js/.jshintrc
+++ b/js/.jshintrc
@@ -0,0 +1,49 @@
+{
+  "esversion": 6,
+
+  "globals": {
+    "jasmine"    : false,
+    "spyOn"      : false,
+    "it"         : false,
+    "describe"   : false,
+    "expect"     : false,
+    "beforeEach" : false,
+    "waits"      : false,
+    "waitsFor"   : false,
+    "runs"       : false,
+    "require"    : false,
+    "module": true
+  },
+
+  "asi"       : true,
+  "boss"      : true,
+  "browser"   : true,
+  "curly"     : true,
+  "debug"     : true,
+  "devel"     : true,
+  "eqeqeq"    : true,
+  "eqnull"    : false,
+  "evil"      : false,
+  "forin"     : true,
+  "immed"     : true,
+  "indent"    : 4,
+  "jquery"    : true,
+  "latedef"   : true,
+  "laxbreak"  : false,
+  "newcap"    : true,
+  "noarg"     : true,
+  "node"      : false,
+  "noempty"   : false,
+  "nomen"     : false,
+  "nonew"     : true,
+  "onevar"    : true,
+  "plusplus"  : false,
+  "quotmark"  : "single",
+  "regexp"    : false,
+  "sub"       : true,
+  "trailing"  : true,
+  "undef"     : true,
+  "unused"    : true,
+  "white"     : false,
+  "scripturl" : true
+}
--- a/js/app/App.js
+++ b/js/app/App.js
@@ -0,0 +1,64 @@
+/*
+ * @copyright Copyright (c) 2016 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/>.
+ *
+ */
+
+/* global angular */
+
+
+angular.module('markdown', [])
+	.provider('markdown', [function () {
+		var opts = {};
+		return {
+			config: function (newOpts) {
+				opts = newOpts;
+			},
+			$get: function () {
+				return new window.showdown.Converter(opts);
+			}
+		};
+	}])
+	.filter('markdown', ['markdown', function (markdown) {
+		return function (text) {
+			return markdown.makeHtml(text || '');
+		};
+	}]);
+
+import uirouter from '@uirouter/angularjs';
+import ngsanitize from 'angular-sanitize';
+import angularuiselect from 'ui-select';
+import ngsortable from 'ng-sortable';
+import md from 'angular-markdown-it';
+import nganimate from 'angular-animate';
+import 'angular-file-upload';
+import ngInfiniteScroll from 'ng-infinite-scroll';
+import '../legacy/jquery.atwho.min';
+import '../legacy/jquery.caret.min';
+
+var app = angular.module('Deck', [
+	ngsanitize,
+	uirouter,
+	angularuiselect,
+	ngsortable, md, nganimate,
+	'angularFileUpload',
+	ngInfiniteScroll
+]);
+
+export default app;
--- a/js/app/Config.js
+++ b/js/app/Config.js
@@ -0,0 +1,117 @@
+/*
+ * @copyright Copyright (c) 2016 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/>.
+ *  
+ */
+
+/* global app oc_requesttoken markdownitLinkTarget */
+
+import app from './App.js';
+import md from 'angular-markdown-it';
+import markdownitLinkTarget from 'markdown-it-link-target';
+import markdownitCheckbox from 'legacy/markdown-it-checkbox.js';
+
+app.config(function ($provide, $interpolateProvider, $httpProvider, $urlRouterProvider, $stateProvider, $compileProvider, markdownItConverterProvider) {
+	'use strict';
+	$httpProvider.defaults.headers.common.requesttoken = oc_requesttoken;
+
+
+	$compileProvider.debugInfoEnabled(true);
+	// This should fix adding "unsafe:" prefix to ui-select href links containing javascript
+	// inline JS is blocked by CSP anyway and filtered out by our markdown renderer as well
+	$compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|javascript):/);
+
+	markdownItConverterProvider.config({
+		breaks: true,
+		linkify: true,
+		xhtmlOut: true
+	});
+	markdownItConverterProvider.use(markdownitLinkTarget).use(markdownitCheckbox);
+
+	$urlRouterProvider.otherwise('/');
+
+	$stateProvider
+		.state('list', {
+			url: '/:filter',
+			templateUrl: '/boardlist.mainView.html',
+			controller: 'ListController',
+			reloadOnSearch: false,
+			params: {
+				filter: {value: '', dynamic: true}
+			}
+		})
+		.state('board', {
+			url: '/board/:boardId/:filter',
+			templateUrl: '/board.html',
+			controller: 'BoardController',
+			params: {
+				filter: {value: '', dynamic: true}
+			}
+		})
+		.state('board.detail', {
+			url: '/detail/',
+			reloadOnSearch: false,
+			params: {
+				tab: {value: 0, dynamic: true},
+			},
+			views: {
+				'sidebarView@': {
+					templateUrl: '/board.sidebarView.html',
+					controller: 'BoardController'
+				}
+			}
+		})
+		.state('board.card', {
+			url: '/card/:cardId',
+			params: {
+				tab: {value: 0, dynamic: true},
+			},
+			views: {
+				'sidebarView@': {
+					templateUrl: '/card.sidebarView.html',
+					controller: 'CardController'
+				}
+			}
+		});
+
+	$provide.decorator('nvFileOverDirective', function ($delegate) {
+		var directive = $delegate[0],
+			link = directive.link;
+
+		directive.compile = function () {
+			return function (scope, element, attrs) {
+				var overClass = attrs.overClass || 'nv-file-over';
+				link.apply(this, arguments);
+				let counter = 0;
+				element.on('dragenter', function (event) {
+					counter++;
+				});
+				element.on('dragleave', function (event) {
+					counter--;
+					if (counter <= 0) {
+						$('.' + overClass).removeClass(overClass);
+					}
+				});
+			};
+		};
+
+		return $delegate;
+	});
+
+});
--- a/js/app/Run.js
+++ b/js/app/Run.js
@@ -0,0 +1,64 @@
+/*
+ * @copyright Copyright (c) 2016 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/>.
+ *
+ */
+import app from './App.js';
+
+/* global Snap */
+app.run(function ($document, $rootScope, $transitions, BoardService) {
+	'use strict';
+
+	$document.click(function (event) {
+		$rootScope.$broadcast('documentClicked', event);
+	});
+	$transitions.onEnter({from: 'list'}, function ($state, $transition$) {
+		BoardService.unsetCurrrent();
+	});
+	$transitions.onEnter({to: 'list'}, function ($state, $transition$) {
+		BoardService.unsetCurrrent();
+		document.title = "Deck - " + oc_defaults.name;
+	});
+	$transitions.onEnter({to: 'board.card'}, function ($state, $transition$) {
+		$rootScope.sidebar.show = true;
+	});
+	$transitions.onEnter({to: 'board.detail'}, function ($state, $transition$) {
+		$rootScope.sidebar.show = true;
+	});
+	$transitions.onEnter({to: 'board'}, function ($state) {
+		$rootScope.sidebar.show = false;
+	});
+	$transitions.onExit({from: 'board.card'}, function ($state) {
+		$rootScope.sidebar.show = false;
+	});
+	$transitions.onExit({from: 'board.detail'}, function ($state) {
+		$rootScope.sidebar.show = false;
+	});
+
+	$('link[rel="shortcut icon"]').attr(
+		'href',
+		OC.filePath('deck', 'img', 'app-512.png')
+	);
+
+	// Select all elements with data-toggle="tooltips" in the document
+	$('body').tooltip({
+		selector: '[data-toggle="tooltip"]'
+	});
+
+});
--- a/js/controller/ActivityController.js
+++ b/js/controller/ActivityController.js
@@ -0,0 +1,350 @@
+/*
+ * @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/>.
+ *
+ */
+
+/* global OC OCA OCP t escapeHTML Handlebars moment */
+
+import CommentCollection from '../legacy/commentcollection';
+import CommentModel from '../legacy/commentmodel';
+
+class ActivityController {
+	constructor ($scope, CardService, ActivityService, BoardService) {
+		'ngInject';
+		this.cardservice = CardService;
+		this.boardservice = BoardService;
+		this.activityservice = ActivityService;
+		this.$scope = $scope;
+		this.type = '';
+		this.loading = false;
+		this.status = {
+			commentCreateLoading: false
+		};
+		this.$scope.newComment = '';
+		this.$scope.newCommentString = 'New comment…';
+
+		this.currentUser = OC.getCurrentUser();
+
+		const self = this;
+		this.$scope.$watch(function () {
+			return self.element.id;
+		}, function (params) {
+			if (self.type === 'deck_card') {
+				self.activityservice.loadComments(self.element.id);
+			}
+
+			if (self.getData(self.element.id).length === 0) {
+				self.loading = true;
+				self.fetchUntilResults();
+			}
+			self.activityservice.fetchNewerActivities(self.type, self.element.id).then(function () {});
+			if (self.type === 'deck_card') {
+				self.cardservice.getCurrent().commentsUnread = 0;
+			}
+		}, true);
+
+		let $target = $('.newCommentForm .message');
+		this.applyAtWho($target);
+
+		this.activityservice.subscribe(this.$scope, function() {
+			self.$scope.$apply();
+		});
+
+		if (typeof OCA.Activity.Templates !== 'undefined') {
+			OCA.Activity.Templates.userLocal = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+				var helper;
+				// Compiled handlesbars template
+				// '<span class="avatar-name-wrapper"><avatar ng-attr-contactsmenu ng-attr-tooltip ng-attr-user="{{ id }}" ng-attr-displayname="{{name}}" ng-attr-size="16"></avatar> {{ name }}</span>';
+				return "<span class=\"avatar-name-wrapper\"><avatar ng-attr-contactsmenu ng-attr-tooltip ng-attr-user=\""
+					+ container.escapeExpression(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"id","hash":{},"data":data}) : helper)))
+					+ "\" ng-attr-displayname=\""
+					+ container.escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"name","hash":{},"data":data}) : helper)))
+					+ "\" ng-attr-size=\"16\"></avatar> "
+					+ container.escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"name","hash":{},"data":data}) : helper)))
+					+ "</span>";
+			},"useData":true});
+		} else {
+			OCA.Activity.RichObjectStringParser._userLocalTemplate = '<span class="avatar-name-wrapper"><avatar ng-attr-contactsmenu ng-attr-tooltip ng-attr-user="{{ id }}" ng-attr-displayname="{{name}}" ng-attr-size="16"></avatar> {{ name }}</span>';
+		}
+	}
+
+	applyAtWho($target) {
+		const self = this;
+		if (!$target) {
+			return;
+		}
+		$target.atwho({
+			at: '@',
+			callbacks: {
+				remoteFilter: function(query, callback) {
+					let uids = self.boardservice.getUsers();
+					uids = uids.filter((x) => x.uid.toLowerCase().includes(query.toLowerCase()) || x.displayname.toLowerCase().includes(query.toLowerCase()));
+					callback(uids);
+				},
+				highlighter: function (li) {
+					// misuse the highlighter callback to instead of
+					// highlighting loads the avatars.
+					var $li = $(li);
+					$li.find('.avatar').avatar(undefined, 32);
+					return $li;
+				},
+				sorter: function (q, items) { return items; }
+			},
+			displayTpl: function (item) {
+				return '<li>' +
+					'<span class="avatar-name-wrapper">' +
+					'<span class="avatar" ' +
+					'data-username="' + escapeHTML(item.uid) + '" ' + // for avatars
+					'data-user="' + escapeHTML(item.uid) + '" ' + // for contactsmenu
+					'data-user-display-name="' + escapeHTML(item.displayname) + '">' +
+					'</span>' +
+					'<strong>' + escapeHTML(item.displayname) + '</strong>' +
+					'</span></li>';
+			},
+			insertTpl: function (item) {
+				return '' +
+					'<span class="avatar-name-wrapper">' +
+					'<span class="avatar" ' +
+					'data-username="' + escapeHTML(item.uid) + '" ' + // for avatars
+					'data-user="' + escapeHTML(item.uid) + '" ' + // for contactsmenu
+					'data-user-display-name="' + escapeHTML(item.displayname) + '">' +
+					'</span>' +
+					'<strong>' + escapeHTML(item.displayname) + '</strong>' +
+					'</span>';
+			},
+			searchKey: 'displayname'
+		});
+		$target.on('inserted.atwho', function (je, $el) {
+			$(je.target).find(
+				'span[data-username="' + $el.find('[data-username]').data('username') + '"]'
+			).avatar(undefined, 16);
+		});
+		$target.on('shown.atwho', function (je) {
+			$target.find('.avatar').avatar(undefined, 16);
+		});
+	}
+
+	commentBodyToPlain(content) {
+		let $comment = $('<div/>').html(content);
+		$comment.find('.avatar-name-wrapper').each(function () {
+			var $this = $(this);
+			var $inserted = $this.parent();
+			$inserted.html('@' + $this.find('.avatar').data('username'));
+		});
+		$comment.html(OCP.Comments.richToPlain($comment.html()));
+		$comment.html($comment.html().replace(/<br\s*[\/]?>/gi, '\n'));
+		return $comment.text();
+	}
+
+	static _composeHTMLMention(uid, displayName) {
+		var avatar = '' +
+			'<span class="avatar" data-username="' + escapeHTML(uid) + '" data-user="' + escapeHTML(uid) + '" ng-attr-size="16" ' +
+			'ng-attr-user="' + escapeHTML(uid) + '" ' +
+			'ng-attr-displayname="' + escapeHTML(displayName) + '" ng-attr-contactsmenu="true">' +
+			'</span>';
+
+		var isCurrentUser = (uid === OC.getCurrentUser().uid);
+
+		return '' +
+			'<span class="atwho-inserted" contenteditable="false">' +
+			'<span class="avatar-name-wrapper' + (isCurrentUser ? ' currentUser' : '') + '">' +
+			avatar +
+			'<strong>' + escapeHTML(displayName) + '</strong>' +
+			'</span>' +
+			'</span>';
+	}
+
+	formatMessage(activity) {
+		let message = activity.message;
+		let mentions = activity.commentModel.get('mentions');
+		const editMode = false;
+		message = escapeHTML(message).replace(/\n/g, '<br/>');
+
+		for(var i in mentions) {
+			if(!mentions.hasOwnProperty(i)) {
+				return;
+			}
+			var mention = '@' + mentions[i].mentionId;
+			// escape possible regex characters in the name
+			mention = mention.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+
+			const displayName = ActivityController._composeHTMLMention(mentions[i].mentionId, mentions[i].mentionDisplayName);
+			// replace every mention either at the start of the input or after a whitespace
+			// followed by a non-word character.
+			message = message.replace(new RegExp('(^|\\s)(' + mention + ')\\b', 'g'),
+				function(match, p1) {
+					// to  get number of whitespaces (0 vs 1) right
+					return p1+displayName;
+				}
+			);
+
+		}
+		if(editMode !== true) {
+			message = OCP.Comments.plainToRich(message);
+		}
+		return message;
+	}
+
+	postComment() {
+		const self = this;
+		this.status.commentCreateLoading = true;
+
+		let content = this.commentBodyToPlain(self.$scope.newComment);
+		if (content.length < 1) {
+			self.status.commentCreateLoading = false;
+			OC.Notification.showTemporary(t('deck', 'Please provide a content for your comment.'));
+			return;
+		}
+		var model = this.activityservice.commentCollection.create({
+			actorId: OC.getCurrentUser().uid,
+			actorDisplayName: OC.getCurrentUser().displayName,
+			actorType: 'users',
+			verb: 'comment',
+			message: content,
+			creationDateTime: (new Date()).toUTCString()
+		}, {
+			at: 0,
+			// wait for real creation before adding
+			wait: true,
+			success: function() {
+				self.$scope.newComment = '';
+				self.activityservice.fetchNewerActivities(self.type, self.element.id).then(function () {});
+				self.status.commentCreateLoading = false;
+			},
+			error: function() {
+				self.status.commentCreateLoading = false;
+				OC.Notification.showTemporary(t('deck', 'Posting the comment failed.'));
+			}
+		});
+	}
+
+	updateComment(item) {
+		item.commentEdit = this.formatMessage(item);
+		let $target = $('.newCommentForm .message');
+		this.applyAtWho($target);
+		/** Workaround to trigger avatar rendering after the view has been updated */
+		window.setTimeout(function () {
+			$target.find('.avatar').avatar(undefined, 16);
+		}, 0);
+	}
+
+	editComment(item) {
+		const self = this;
+		let content = this.commentBodyToPlain(item.commentEdit);
+		if (content.length < 1) {
+			OC.Notification.showTemporary(t('deck', 'Please provide a content for your comment.'));
+			return;
+		}
+		/** We need to save the model and afterwards run a fetch to update the mentions
+		 * and call apply to propagate the changes to angular
+		 */
+		item.commentModel.on('sync', function() {
+			item.commentModel.off('sync');
+			item.commentModel.fetch({
+				success: function() {
+					self.$scope.$apply();
+				}
+			});
+		});
+		item.commentModel.save({
+			message: content,
+		});
+		item.message = content;
+		item.commentEdit = undefined;
+	}
+
+	deleteComment(item) {
+		item.commentModel.destroy();
+		item.deleted = true;
+		item.commentModel = undefined;
+		item.message = t('deck', 'The comment has been deleted');
+	}
+
+	getData(id) {
+		return this.activityservice.getData(this.type, id);
+	}
+
+	parseMessage(activity) {
+		let subject = activity.subject_rich[0];
+		let parameters = activity.subject_rich[1];
+		if (parameters.after && typeof parameters.after.id === 'string' && parameters.after.id.startsWith('dt:')) {
+			let dateTime = parameters.after.id.substr(3);
+			parameters.after.name = moment(dateTime).format('L LTS');
+		}
+		return OCA.Activity.RichObjectStringParser.parseMessage(subject, parameters);
+	}
+
+	fetchUntilResults () {
+		const self = this;
+		let dataLengthBefore = self.getData(self.element.id).length;
+		let _executeFetch = function() {
+			let promise = self.activityservice.fetchMoreActivities(self.type, self.element.id);
+			promise.then(function (data) {
+				let dataLengthAfter = self.getData(self.element.id).length;
+				if (data !== null && (dataLengthAfter <= dataLengthBefore || dataLengthAfter < self.activityservice.RESULT_PER_PAGE)) {
+					_executeFetch();
+				} else {
+					self.loading = false;
+				}
+			}, function () {
+				self.loading = false;
+				self.$scope.$apply();
+			});
+
+		};
+		_executeFetch();
+	}
+
+	getComments() {
+		return this.activityservice.comments;
+	}
+
+	getActivityStream() {
+		let activities = this.activityservice.getData(this.type, this.element.id);
+		return activities;
+	}
+
+	page() {
+		if (!this.activityservice.since[this.type][this.element.id].finished) {
+			this.loading = true;
+			this.fetchUntilResults();
+		} else {
+			this.loading = false;
+		}
+	}
+
+	loadingNewer() {
+		return this.activityservice.runningNewer;
+	}
+
+	t(text) {
+		return t('deck', text);
+	}
+}
+
+let activityComponent = {
+	templateUrl: OC.linkTo('deck', 'templates/part.card.activity.html'),
+	controller: ActivityController,
+	bindings: {
+		type: '@',
+		element: '='
+	}
+};
+export default activityComponent;
--- a/js/controller/AppController.js
+++ b/js/controller/AppController.js
@@ -0,0 +1,44 @@
+/*
+ * @copyright Copyright (c) 2016 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/>.
+ *
+ */
+
+import app from '../app/App.js';
+
+/* globals oc_current_user: false */
+app.controller('AppController', function ($scope, $location, $http, $log, $rootScope, $attrs) {
+	$rootScope.sidebar = {
+		show: false
+	};
+	$scope.sidebar = $rootScope.sidebar;
+	$scope.user = oc_current_user;
+	$rootScope.config = JSON.parse($attrs.config);
+
+	$rootScope.compactMode = localStorage.getItem('deck.compactMode') === 'true';
+	$scope.appNavigationHide = localStorage.getItem('deck.appNavigationHide') === 'true';
+
+	$scope.toggleSidebar = function() {
+		if ($(window).width() > 768) {
+			$log.debug($scope.appNavigationHide);
+			$scope.appNavigationHide = !$scope.appNavigationHide;
+			localStorage.setItem('deck.appNavigationHide', JSON.stringify($scope.appNavigationHide));
+		}
+	};
+});
--- a/js/controller/AttachmentController.js
+++ b/js/controller/AttachmentController.js
@@ -0,0 +1,78 @@
+/*
+ * @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/>.
+ *  
+ */
+
+/* global OC */
+
+class AttachmentListController {
+	constructor ($scope, CardService, FileService) {
+		'ngInject';
+		this.cardservice = CardService;
+		this.fileservice = FileService;
+		this.attachments = CardService.getCurrent().attachments;
+	}
+
+	mimetypeForAttachment(attachment) {
+		let url = OC.MimeType.getIconUrl(attachment.extendedData.mimetype);
+		let styles = {
+			'background-image': `url("${url}")`,
+		};
+		return styles;
+	}
+
+	attachmentUrl(attachment) {
+		let cardId = this.cardservice.getCurrent().id;
+		let attachmentId = attachment.id;
+		return OC.generateUrl(`/apps/deck/cards/${cardId}/attachment/${attachmentId}`);
+	}
+
+	getAttachmentMarkdown(attachment) {
+		const inlineMimetypes = ['image/png', 'image/jpg', 'image/jpeg'];
+		let url = this.attachmentUrl(attachment);
+		let filename = attachment.data;
+		let insertText = `[📎 ${filename}](${url})`;
+		if (inlineMimetypes.indexOf(attachment.extendedData.mimetype) > -1) {
+			insertText = `![📎 ${filename}](${url})`;
+		}
+		return insertText;
+	}
+
+	select(attachment) {
+		this.onSelect({attachment: this.getAttachmentMarkdown(attachment)});
+	}
+
+	abort() {
+		this.onAbort();
+	}
+
+}
+
+let attachmentListComponent = {
+	templateUrl: '/card.attachments.html',
+	controller: AttachmentListController,
+	bindings: {
+		isFileSelector: '<',
+		attachments: '=',
+		onSelect: '&',
+		onAbort: '&'
+	}
+};
+export default attachmentListComponent;
--- a/js/controller/BoardController.js
+++ b/js/controller/BoardController.js
@@ -0,0 +1,568 @@
+/*
+ * @copyright Copyright (c) 2016 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/>.
+ *
+ */
+/* global oc_defaults oc_config OC OCP OCA t n */
+
+import app from '../app/App.js';
+import Vue from 'vue';
+
+Vue.prototype.t = t;
+Vue.prototype.n = n;
+Vue.prototype.OC = OC;
+
+import CollaborationView from '../views/CollaborationView';
+
+app.controller('BoardController', function ($rootScope, $scope, $element, $stateParams, StatusService, BoardService, StackService, CardService, LabelService, $state, $transitions, $filter, FileService) {
+
+	$scope.sidebar = $rootScope.sidebar;
+
+	$scope.id = $stateParams.boardId;
+	$scope.status = {
+		addCard: [],
+	};
+	$scope.newLabel = {};
+
+	$scope.OC = OC;
+	$scope.stackservice = StackService;
+	$scope.boardservice = BoardService;
+	$scope.cardservice = CardService;
+	$scope.statusservice = StatusService.getInstance();
+	$scope.labelservice = LabelService;
+	$scope.defaultColors = ['31CC7C', '317CCC', 'FF7A66', 'F1DB50', '7C31CC', 'CC317C', '3A3B3D', 'CACBCD'];
+	$scope.board = BoardService.getCurrent();
+	$scope.uploader = FileService.uploader;
+	$scope.searchText = '';
+
+	$scope.startTitleEdit = function(card) {
+		card.renameTitle = card.title;
+		card.status = card.status || {};
+		card.status.editCard = true;
+	};
+
+	$scope.finishTitleEdit = function(card) {
+		var newTitle;
+		if (!card.renameTitle || !card.renameTitle.trim()) {
+			newTitle = '';
+		} else {
+			newTitle = card.renameTitle.trim();
+		}
+
+		if (newTitle === card.title) {
+			// title unchanged
+			card.status.editCard = false;
+			delete card.renameTitle;
+		} else if (newTitle !== '') {
+			// title changed
+			card.title = newTitle;
+			CardService.update(card).then(function (data) {
+				card.status.editCard = false;
+				delete card.renameTitle;
+			});
+		} else {
+			// empty title
+			card.status.editCard = false;
+			delete card.renameTitle;
+		}
+	};
+
+	$scope.$watch(function() {
+		return $scope.params.tab;
+	}, function (newTab, oldTab) {
+		if (newTab === 2 && oldTab !== 2) {
+			CardService.fetchDeleted($scope.id);
+			StackService.fetchDeleted($scope.id);
+		}
+	});
+
+	// workaround for $stateParams changes not being propagated
+	$scope.$watch(function() {
+		return $state.params;
+	}, function (params) {
+		$scope.params = params;
+	}, true);
+	$scope.params = $state.params;
+
+	/**
+	 * Check for markdown checkboxes in description to render the counter
+	 *
+	 * This should probably be moved to the backend at some point
+	 *
+	 * @param text
+	 * @returns array of [finished, total] checkboxes
+	 */
+	$scope.getCheckboxes = function(text) {
+		const regTotal = /\[(X|\s|\_|\-)\]/igm;
+		const regFinished = /\[(X|\_|\-)\]/igm;
+		return [
+			((text || '').match(regFinished) || []).length,
+			((text || '').match(regTotal) || []).length
+		];
+	};
+
+	$scope.search = function (searchText) {
+		$scope.searchText = searchText;
+		$scope.refreshData();
+	};
+
+	$scope.$watch(function () {
+		if (typeof BoardService.getCurrent() !== 'undefined') {
+			return BoardService.getCurrent().title;
+		} else {
+			return null;
+		}
+	}, function () {
+		$scope.setPageTitle();
+	});
+	$scope.setPageTitle = function () {
+		if (BoardService.getCurrent()) {
+			document.title = BoardService.getCurrent().title + ' | Deck - ' + oc_defaults.name;
+		} else {
+			document.title = 'Deck - ' + oc_defaults.name;
+		}
+	};
+
+	$scope.statusservice.retainWaiting();
+	$scope.statusservice.retainWaiting();
+
+	// handle filter parameter for switching between archived/unarchived cards
+	$scope.switchFilter = function (filter) {
+		$state.go('.', {filter: filter});
+	};
+	$scope.$watch(function() {
+		return $scope.params.filter;
+	}, function (filter) {
+		if (filter === 'archive') {
+			$scope.loadArchived();
+		} else {
+			$scope.loadDefault();
+		}
+	});
+
+	if (parseInt(oc_config.version.split('.')[0]) >= 16) {
+		const ComponentVM = new Vue({
+			render: h => h(CollaborationView),
+			data: {
+				model: BoardService.getCurrent()
+			},
+		});
+		$scope.mountCollections = function () {
+			const MountingPoint = document.getElementById('collaborationResources');
+			if (MountingPoint) {
+				ComponentVM.model = BoardService.getCurrent();
+				ComponentVM.$mount(MountingPoint);
+			}
+		};
+		$scope.$$postDigest($scope.mountCollections);
+		$scope.$watch(function () {
+			return BoardService.getCurrent();
+		}, function () {
+			ComponentVM.model = BoardService.getCurrent();
+			if ($scope.sidebar.show) {
+				$scope.$$postDigest($scope.mountCollections);
+			}
+		});
+	}
+
+	$scope.toggleCompactMode = function() {
+		$rootScope.compactMode = !$rootScope.compactMode;
+		localStorage.setItem('deck.compactMode', JSON.stringify($rootScope.compactMode));
+	};
+
+	$scope.stacksData = StackService;
+	$scope.stacks = [];
+	$scope.$watch('stacksData', function () {
+		$scope.refreshData();
+	}, true);
+	$scope.refreshData = function () {
+		if ($scope.params.filter === 'archive') {
+			$scope.filterData('-lastModified', $scope.searchText);
+		} else {
+			$scope.filterData('order', $scope.searchText);
+		}
+	};
+	$scope.checkCanEdit = function () {
+		return !BoardService.getCurrent().archived;
+	};
+
+	// filter cards here, as ng-sortable will not work nicely with html-inline filters
+	$scope.filterData = function (order, text) {
+		if ($scope.stacks === undefined) {
+			return;
+		}
+		angular.copy(StackService.getData(), $scope.stacks);
+		$scope.stacks = $filter('orderBy')($scope.stacks, 'order');
+		angular.forEach($scope.stacks, function (value, key) {
+			var cards = $filter('cardSearchFilter')(value.cards, text);
+			cards = $filter('orderBy')(cards, order);
+			$scope.stacks[key].cards = cards;
+		});
+	};
+
+	$scope.loadDefault = function () {
+		StackService.fetchAll($scope.id).then(function (data) {
+			$scope.statusservice.releaseWaiting();
+		}, function (error) {
+			$scope.statusservice.setError('Error occured', error);
+		});
+	};
+
+	$scope.loadArchived = function () {
+		StackService.fetchArchived($scope.id).then(function (data) {
+			$scope.statusservice.releaseWaiting();
+		}, function (error) {
+			$scope.statusservice.setError('Error occured', error);
+		});
+	};
+
+	// Handle initial Loading
+	BoardService.fetchOne($scope.id).then(function (data) {
+		$scope.statusservice.releaseWaiting();
+		$scope.setPageTitle();
+	}, function (error) {
+		$scope.statusservice.setError('Error occured', error);
+	});
+
+	$scope.searchForUser = function (search) {
+		BoardService.searchUsers(search);
+	};
+
+	$scope.newStack = {'boardId': $scope.id};
+	$scope.newCard = {};
+
+	// Create a new Stack
+	$scope.createStack = function () {
+		StackService.create($scope.newStack).then(function (data) {
+			$scope.newStack.title = '';
+		});
+	};
+
+	$scope.createCard = function (stack, title) {
+		if (this['addCardForm' + stack].$valid) {
+			var newCard = {
+				'title': title,
+				'stackId': stack,
+				'type': 'plain'
+			};
+			CardService.create(newCard).then(function (data) {
+				$scope.stackservice.addCard(data);
+				$scope.newCard.title = '';
+			});
+		}
+	};
+
+	$scope.stackDelete = function (stack) {
+		$scope.stackservice.delete(stack.id);
+	};
+
+	$scope.stackUndoDelete = function (deletedStack) {
+		return StackService.undoDelete(deletedStack);
+	};
+
+	$scope.cardDelete = function (card) {
+		CardService.delete(card.id).then(function () {
+			StackService.removeCard(card);
+			$scope.sidebar.show = false;
+		});
+	};
+
+	$scope.cardOrCardAndStackUndoDelete = function (deletedCard) {
+		var associatedDeletedStack = $scope.stackservice.deleted[deletedCard.stackId];
+		if(associatedDeletedStack !== undefined) {
+			$scope.cardAndStackUndoDeleteAskForConfirmation(deletedCard, associatedDeletedStack);
+		} else {
+			$scope.cardUndoDelete(deletedCard);
+		}
+	};
+
+	$scope.cardAndStackUndoDeleteAskForConfirmation = function(deletedCard, associatedDeletedStack) {
+		OC.dialogs.confirm(
+			t('deck', 'The associated stack is deleted as well, it will be restored as well.'),
+			t('deck', 'Restore associated stack'),
+			function(state) {
+				if (state) {
+					$scope.cardAndStackUndoDelete(deletedCard, associatedDeletedStack);
+				}
+			}
+		);
+	};
+
+	$scope.cardAndStackUndoDelete = function(deletedCard, associatedDeletedStack) {
+		$scope.stackUndoDelete(associatedDeletedStack).then(function() {
+			$scope.cardUndoDelete(deletedCard);
+		});
+	};
+
+	$scope.cardUndoDelete = function(deletedCard) {
+		CardService.undoDelete(deletedCard).then(function() {
+			StackService.addCard(deletedCard);
+		});
+	};
+
+	$scope.cardArchive = function (card) {
+		CardService.archive(card);
+		StackService.removeCard(card);
+	};
+
+	$scope.isCurrentUserAssigned = function (card) {
+		if (! CardService.get(card.id).assignedUsers) {
+			return false;
+		}
+		var userList = CardService.get(card.id).assignedUsers.filter(function (obj) {
+			return obj.participant.uid === OC.getCurrentUser().uid;
+		});
+		return userList.length === 1;
+	};
+
+	$scope.cardAssignToMe = function (card) {
+		CardService.assignUser(card, OC.getCurrentUser().uid)
+			.then(
+				function() {StackService.updateCard(card);}
+			);
+		// TODO: remove this jquery call. Fix and use appPopoverMenuUtils instead
+		$('.popovermenu').addClass('hidden');
+	};
+
+	$scope.cardUnassignFromMe = function (card) {
+		CardService.unassignUser(card, OC.getCurrentUser().uid);
+		StackService.updateCard(card);
+		// TODO: remove this jquery call.Fix and use appPopoverMenuUtils instead
+		$('.popovermenu').addClass('hidden');
+	};
+	$scope.cardUnarchive = function (card) {
+		CardService.unarchive(card);
+		StackService.removeCard(card);
+	};
+
+	$scope.labelDelete = function (label) {
+		LabelService.delete(label.id);
+		// remove from board data
+		var i = BoardService.getCurrent().labels.indexOf(label);
+		BoardService.getCurrent().labels.splice(i, 1);
+
+		// remove from cards
+		var cards = CardService.data;
+		for (var card in cards) {
+			if (Object.prototype.hasOwnProperty.call(cards, card)) {
+				var labelsFromCard = cards[card].labels;
+
+				labelsFromCard.forEach(function (labelFromCard, index) {
+					if (labelFromCard.id === label.id) {
+						cards[card].labels.splice(index, 1);
+					}
+				});
+			}
+		}
+	};
+
+	$scope.labelCreate = function (label) {
+		label.boardId = $scope.id;
+		LabelService.create(label).then(function (data) {
+			$scope.newStack.title = '';
+			BoardService.getCurrent().labels.push(data);
+			$scope.status.createLabel = false;
+			$scope.newLabel = {};
+		}).catch((err) => {
+			OC.Notification.showTemporary(err);
+		});
+	};
+
+	$scope.labelUpdateBefore = function (label) {
+		label.renameTitle = label.title;
+	};
+
+	$scope.labelUpdate = function (label) {
+		label.edit = false;
+		LabelService.update(label).catch((err) => {
+			label.title = label.renameTitle;
+			OC.Notification.showTemporary(err);
+		});
+
+		// update labels in UI
+		var cards = CardService.data;
+		for (var card in cards) {
+			if (Object.prototype.hasOwnProperty.call(cards, card)) {
+				var labelsFromCard = cards[card].labels;
+
+				labelsFromCard.forEach(function (labelFromCard, index) {
+					if (labelFromCard.id === label.id) {
+						cards[card].labels[index] = label;
+					}
+				});
+			}
+		}
+	};
+
+	$scope.aclAdd = function (sharee) {
+		sharee.boardId = $scope.id;
+		BoardService.addAcl(sharee);
+		$scope.status.addSharee = null;
+	};
+
+	$scope.aclDelete = function (acl) {
+		BoardService.deleteAcl(acl).then(function(data) {
+			$scope.loadDefault();
+			$scope.refreshData();
+		});
+	};
+
+	$scope.aclUpdate = function (acl) {
+		BoardService.updateAcl(acl);
+	};
+
+	$scope.aclTypeString = function (acl) {
+		if (typeof acl === 'undefined') {
+			return '';
+		}
+		switch (acl.type) {
+			case OC.Share.SHARE_TYPE_USER:
+				return 'user';
+			case OC.Share.SHARE_TYPE_GROUP:
+				return 'group';
+			case OC.Share.SHARE_TYPE_CIRCLE:
+				return 'circles';
+			default:
+				return '';
+		}
+	};
+
+	// settings for card sorting
+	$scope.sortOptions = {
+		id: 'card',
+		itemMoved: function (event) {
+			event.source.itemScope.modelValue.status = event.dest.sortableScope.$parent.column;
+			var order = event.dest.index;
+			var card = $scope.cardservice.get(event.source.itemScope.c.id);
+			var newStack = event.dest.sortableScope.$parent.s.id;
+			var oldStack = card.stackId;
+			card.stackId = newStack;
+			CardService.update(card);
+			CardService.reorder(card, order).then(function (data) {
+				StackService.addCard(card);
+				StackService.reorderCard(card, order);
+				StackService.removeCard({
+					id: card.id,
+					stackId: oldStack
+				});
+			});
+		},
+		orderChanged: function (event) {
+			var order = event.dest.index;
+			var card = $scope.cardservice.get(event.source.itemScope.c.id);
+			var stack = event.dest.sortableScope.$parent.s.id;
+			CardService.reorder(card, order).then(function (data) {
+				StackService.reorderCard(card, order);
+				$scope.refreshData();
+			});
+		},
+		scrollableContainer: '#innerBoard',
+		containerPositioning: 'relative',
+		containment: '#innerBoard',
+		longTouch: true,
+		// auto scroll on drag
+		dragMove: function (itemPosition, containment, eventObj) {
+			if (eventObj) {
+				var container = $('#board');
+				var offset = container.offset();
+				var targetX = eventObj.pageX - (offset.left || container.scrollLeft());
+				var targetY = eventObj.pageY - (offset.top || container.scrollTop());
+				if (targetX < offset.left) {
+					container.scrollLeft(container.scrollLeft() - 25);
+				} else if (targetX > container.width()) {
+					container.scrollLeft(container.scrollLeft() + 25);
+				}
+				if (targetY < offset.top) {
+					container.scrollTop(container.scrollTop() - 25);
+				} else if (targetY > container.height()) {
+					container.scrollTop(container.scrollTop() + 25);
+				}
+			}
+		},
+		accept: function (sourceItemHandleScope, destSortableScope, destItemScope) {
+			return sourceItemHandleScope.sortableScope.options.id === 'card';
+		}
+	};
+
+	$scope.sortOptionsStack = {
+		id: 'stack',
+		orderChanged: function (event) {
+			var order = event.dest.index;
+			var stack = event.source.itemScope.s;
+			StackService.reorder(stack, order).then(function (data) {
+				$scope.refreshData();
+			});
+		},
+		scrollableContainer: '#board',
+		containerPositioning: 'relative',
+		containment: '#innerBoard',
+		dragMove: function (itemPosition, containment, eventObj) {
+			if (eventObj) {
+				var container = $('#board');
+				var offset = container.offset();
+				var targetX = eventObj.pageX - (offset.left || container.scrollLeft());
+				var targetY = eventObj.pageY - (offset.top || container.scrollTop());
+				if (targetX < offset.left) {
+					container.scrollLeft(container.scrollLeft() - 50);
+				} else if (targetX > container.width()) {
+					container.scrollLeft(container.scrollLeft() + 50);
+				}
+				if (targetY < offset.top) {
+					container.scrollTop(container.scrollTop() - 50);
+				} else if (targetY > container.height()) {
+					container.scrollTop(container.scrollTop() + 50);
+				}
+			}
+		},
+		accept: function (sourceItemHandleScope, destSortableScope, destItemScope) {
+			return sourceItemHandleScope.sortableScope.options.id === 'stack';
+		}
+	};
+
+	$scope.labelStyle = function (color) {
+		return {
+			'background-color': '#' + color,
+			'color': $filter('textColorFilter')(color)
+		};
+	};
+
+	$scope.colorValue = function(color) {
+		const re = /^#([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/;
+		if (re.test(color)) {
+			return color;
+		}
+		return '';
+	};
+
+	$scope.attachmentCount = function(card) {
+		if (Array.isArray(card.attachments)) {
+			return card.attachments.filter((obj) => obj.deletedAt === 0).length;
+		}
+		return card.attachmentCount;
+	};
+
+	$scope.unreadCommentCount = function(card) {
+		return card.commentsUnread;
+	};
+
+	$scope.isTimelineEnabled = function() {
+		return OCP.Comments && OCA.Activity;
+	};
+
+});
--- a/js/controller/CardController.js
+++ b/js/controller/CardController.js
@@ -0,0 +1,286 @@
+/*
+ * @copyright Copyright (c) 2016 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/>.
+ *
+ */
+
+/* global app moment angular OC OCP OCA */
+import app from '../app/App.js';
+
+app.controller('CardController', function ($scope, $rootScope, $sce, $location, $stateParams, $state, $interval, $timeout, $filter, BoardService, CardService, StackService, StatusService, markdownItConverter, FileService) {
+	$scope.sidebar = $rootScope.sidebar;
+	$scope.status = {
+		renameTitle: '',
+		lastEdit: 0,
+		lastSave: Date.now()
+	};
+
+	$scope.cardservice = CardService;
+	$scope.fileservice = FileService;
+	$scope.cardId = $stateParams.cardId;
+
+	$scope.statusservice = StatusService.getInstance();
+	$scope.boardservice = BoardService;
+
+	$scope.isArray = angular.isArray;
+	// workaround for $stateParams changes not being propagated
+	$scope.$watch(function() {
+		return $state.params;
+	}, function (params) {
+		$scope.params = params;
+		$scope.fileservice.reset();
+	}, true);
+	$scope.params = $state.params;
+
+	$scope.addAttachmentToDescription = function(insertText) {
+		let el = document.querySelectorAll('textarea')[0];
+		let start = el.selectionStart;
+		let end = el.selectionEnd;
+		let text = $scope.status.edit.description || '';
+		let before = text.substring(0, start);
+		let after = text.substring(end, text.length);
+		let newText = before + '\n' + insertText + '\n' + after;
+		$scope.status.edit.description = newText;
+		el.selectionStart = el.selectionEnd = start + newText.length;
+		el.focus();
+		$scope.status.continueEdit = false;
+		$scope.cardEditDescriptionChanged();
+		$scope.status.selectAttachment = false;
+	};
+
+	$scope.abortAttachmentSelection = function() {
+		$scope.status.continueEdit = false;
+		$scope.status.selectAttachment = false;
+		let el = document.querySelectorAll('textarea')[0];
+		el.focus();
+	};
+
+	$scope.statusservice.retainWaiting();
+
+	$scope.description = function() {
+		return $scope.rendered;
+	};
+
+	$scope.updateMarkdown = function(content) {
+		// only trust the html from markdown-it-checkbox
+		$scope.rendered = $sce.trustAsHtml(markdownItConverter.render(content || ''));
+	};
+
+	CardService.fetchOne($scope.cardId).then(function (data) {
+		$scope.statusservice.releaseWaiting();
+		$scope.archived = CardService.getCurrent().archived;
+		$scope.updateMarkdown(CardService.getCurrent().description);
+	}, function (error) {
+	});
+
+	$scope.cardRenameShow = function () {
+		if ($scope.archived || !BoardService.canEdit()) {
+			return false;
+		} else {
+			$scope.status.renameTitle = CardService.getCurrent().title;
+			$scope.status.cardRename = true;
+		}
+	};
+
+	$scope.toggleCheckbox = function (id) {
+		$('#markdown input[type=checkbox]').attr('disabled', true);
+		$scope.status.edit = angular.copy(CardService.getCurrent());
+		var reg = /\[(X|\s|\_|\-)\]/ig;
+		var nth = 0;
+		$scope.status.edit.description = $scope.status.edit.description.replace(reg, function (match, i, original) {
+			var result = match;
+			if ('' + nth++ === '' + id) {
+				if (match.match(/^\[\s\]/i)) {
+					result = match.replace(/\[\s\]/i, '[x]');
+				}
+				if (match.match(/^\[x\]/i)) {
+					result = match.replace(/\[x\]/i, '[ ]');
+				}
+				return result;
+			}
+			return match;
+		});
+		CardService.update($scope.status.edit).then(function (data) {
+			var header = $('.tabDetails');
+			header.find('.save-indicator.unsaved').hide();
+			header.find('.save-indicator.saved').fadeIn(250).fadeOut(1000);
+		});
+		$('#markdown input[type=checkbox]').removeAttr('disabled');
+
+	};
+	$scope.clickCardDescription = function ($event) {
+		var checkboxId = $($event.target).data('id');
+		if ($event.target.tagName === 'LABEL') {
+			$scope.toggleCheckbox(checkboxId);
+			$event.stopPropagation();
+			return false;
+		}
+		if ($event.target.tagName === 'INPUT') {
+			$event.stopPropagation();
+			return;
+		}
+		if (BoardService.isArchived() || CardService.getCurrent().archived) {
+			return false;
+		}
+		if ($scope.card.archived || !$scope.boardservice.canEdit()) {
+			return false;
+		}
+		$scope.status.cardEditDescription = true;
+		$scope.status.edit = angular.copy(CardService.getCurrent());
+		return true;
+	};
+	$scope.cardEditDescriptionChanged = function ($event) {
+		$scope.status.lastEdit = Date.now();
+		var header = $('.tabDetails');
+		header.find('.save-indicator.unsaved').show();
+		header.find('.save-indicator.saved').hide();
+	};
+	$interval(function() {
+		var currentTime = Date.now();
+		var timeSinceEdit = currentTime-$scope.status.lastEdit;
+		if (timeSinceEdit > 1000 && $scope.status.lastEdit > $scope.status.lastSave && !$scope.status.saving) {
+			$scope.status.lastSave = currentTime;
+			$scope.status.saving = true;
+			var header = $('.tabDetails');
+			header.find('.save-indicator.unsaved').fadeIn(500);
+			CardService.update($scope.status.edit).then(function (data) {
+				var header = $('.tabDetails');
+				header.find('.save-indicator.unsaved').hide();
+				header.find('.save-indicator.saved').fadeIn(250).fadeOut(1000);
+				$scope.status.saving = false;
+			});
+		}
+	}, 500, 0, false);
+
+	// handle rename to update information on the board as well
+	$scope.cardRename = function (card) {
+		var newTitle;
+		if (!$scope.status.renameTitle || !$scope.status.renameTitle.trim()) {
+			newTitle = '';
+		} else {
+			newTitle = $scope.status.renameTitle.trim();
+		}
+
+		if (newTitle === card.title) {
+			// title unchanged
+			$scope.status.renameCard = false;
+		} else if (newTitle !== '') {
+			// title changed
+			card.title = newTitle;
+			CardService.rename(card).then(function (data) {
+				$scope.status.renameCard = false;
+			});
+		} else {
+			// empty title
+			$scope.status.renameTitle = card.title;
+			$scope.status.renameCard = false;
+		}
+	};
+	$scope.cardUpdate = function (card) {
+		CardService.update(card).then(function (data) {
+			$scope.status.cardEditDescription = false;
+			$scope.updateMarkdown($scope.status.edit.description);
+			var header = $('.tabDetails');
+			header.find('.save-indicator.unsaved').hide();
+			header.find('.save-indicator.saved').fadeIn(500).fadeOut(1000);
+		});
+	};
+
+	$scope.labelAssign = function (element, model) {
+		CardService.assignLabel($scope.cardId, element.id).then(function (data) {
+		});
+	};
+
+	$scope.labelRemove = function (element, model) {
+		CardService.removeLabel($scope.cardId, element.id).then(function (data) {
+		});
+	};
+
+	$scope.setDuedate = function (duedate) {
+		var element = CardService.getCurrent();
+		var newDate = moment(element.duedate);
+		if(!newDate.isValid()) {
+			newDate = moment();
+		}
+		newDate.date(duedate.date());
+		newDate.month(duedate.month());
+		newDate.year(duedate.year());
+		element.duedate = newDate.toISOString();
+		CardService.update(element);
+	};
+	$scope.setDuedateTime = function (time) {
+		var element = CardService.getCurrent();
+		var newDate = moment(element.duedate);
+		if(!newDate.isValid()) {
+			newDate = moment();
+		}
+		newDate.hour(time.hour());
+		newDate.minute(time.minute());
+		element.duedate = newDate.toISOString();
+		CardService.update(element);
+	};
+
+	$scope.resetDuedate = function () {
+		var element = CardService.getCurrent();
+		element.duedate = null;
+		CardService.update(element);
+	};
+
+	/**
+	 * Show ui-select field when clicking the add button
+	 */
+	$scope.toggleAssignUser = function() {
+		$scope.status.showAssignUser = !$scope.status.showAssignUser;
+		if ($scope.status.showAssignUser === true) {
+			$timeout(function () {
+				$('#assignUserSelect').find('a').click();
+			});
+		}
+	};
+
+	/**
+	 * Hide ui-select when select list is closed
+	 */
+	$scope.assingUserOpenClose = function(isOpen) {
+		$scope.status.showAssignUser = isOpen;
+	};
+
+	$scope.addAssignedUser = function(item) {
+		CardService.assignUser(CardService.getCurrent(), item.uid).then(function (data) {
+		});
+		$scope.status.showAssignUser = false;
+	};
+
+	$scope.removeAssignedUser = function(uid) {
+		CardService.unassignUser(CardService.getCurrent(), uid).then(function (data) {
+		});
+	};
+
+	$scope.labelStyle = function (color) {
+		return {
+			'background-color': '#' + color,
+			'color': $filter('textColorFilter')(color)
+		};
+	};
+
+	$scope.isTimelineEnabled = function() {
+		return OCP.Comments && OCA.Activity;
+	};
+
+});
--- a/js/controller/ColorPickerController.js
+++ b/js/controller/ColorPickerController.js
@@ -0,0 +1,44 @@
+/*
+ * @copyright Copyright (c) 2018 Oskar Kurz <oskar.kurz@gmail.com>
+ *
+ * @author Oskar Kurz <oskar.kurz@gmail.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import app from '../app/App.js';
+
+/* global oc_defaults OC */
+app.controller('ColorPickerController', ['$scope', function ($scope) {
+	$scope.hashedColor = '';
+
+	$scope.setColor = function (object, color) {
+		object.color = color;
+		object.hashedColor = '#' + color;
+
+		return object;
+	};
+
+	$scope.setHashedColor = function (object) {
+		object.color = object.hashedColor.substr(1);
+		return object;
+	};
+
+	$scope.getCustomBackground = function (color) {
+		return {'background-color': color};
+	};
+}]);
--- a/js/controller/ListController.js
+++ b/js/controller/ListController.js
@@ -0,0 +1,255 @@
+/*
+ * @copyright Copyright (c) 2016 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/>.
+ *
+ */
+
+/* global app angular oc_isadmin */
+
+var ListController = function ($scope, $location, $filter, BoardService, $element, $timeout, $stateParams, $state, StatusService, $http, $q, $rootScope) {
+
+	function calculateNewColor() {
+		var boards = BoardService.getAll();
+		var boardKeys = Object.keys(boards);
+		var colorOccurrences = [];
+
+		for (var i = 0; i < $scope.colors.length; i++) {
+			colorOccurrences.push(0);
+		}
+
+		for (var j = 0; j < boardKeys.length; j++) {
+			var key = boardKeys[j];
+			var board = boards[key];
+
+			if (board && $scope.colors.indexOf(board.color) !== -1) {
+				colorOccurrences[$scope.colors.indexOf(board.color)]++;
+			}
+		}
+
+		return $scope.colors[colorOccurrences.indexOf(Math.min.apply(Math, colorOccurrences))];
+	}
+
+	$scope.boards = [];
+	$scope.newBoard = {};
+	$scope.status = {
+		deleteUndo: [],
+		filter: $stateParams.filter ? $stateParams.filter : '',
+		sidebar: false
+	};
+	$scope.colors = ['0082c9', '00c9c6','00c906', 'c92b00', 'F1DB50', '7C31CC', '3A3B3D', 'CACBCD'];
+	$scope.boardservice = BoardService;
+	$scope.updatingBoard = null;
+	$scope.isAdmin = oc_isadmin;
+	$scope.canCreate = $rootScope.config.canCreate;
+
+	if ($scope.isAdmin) {
+		OC.Apps.enableDynamicSlideToggle();
+		$scope.groups = [];
+		$scope.groupLimit = [];
+		$scope.groupLimitDisabled = true;
+		let fetchGroups = function () {
+			var deferred = $q.defer();
+			// TODO: move to groups/details once 15 is min version
+			$http.get(OC.linkToOCS('cloud', 2) + 'groups').then(function (response) {
+				$scope.groups = response.data.ocs.data.groups.reduce((obj, item) => {
+					obj.push({
+						id: item,
+						displayname: item,
+					});
+					return obj;
+				}, []);
+				deferred.resolve($scope.groups);
+			}, function (error) {
+				deferred.reject('Error while loading groups');
+			});
+			$http.get(OC.generateUrl('apps/deck/config')).then(function (response) {
+				$scope.groupLimit = response.data.groupLimit;
+				$scope.groupLimitDisabled = false;
+				deferred.resolve(response.data);
+			}, function (error) {
+				deferred.reject('Error while loading groupLimit');
+			});
+			return deferred.promise;
+		};
+
+		let updateConfig = function() {
+			$scope.groupLimitDisabled = true;
+			var deferred = $q.defer();
+			$http.post(OC.generateUrl('apps/deck/config/groupLimit'), {value: $scope.groupLimit}).then(function (response) {
+				$scope.groupLimitDisabled = false;
+				deferred.resolve(response.data);
+			}, function (error) {
+				deferred.reject('Error while saving groupLimit');
+			});
+			return deferred.promise;
+		};
+
+		$scope.groupLimitAdd = function (element, model) {
+			$scope.groupLimit.push(element);
+			updateConfig();
+		};
+		$scope.groupLimitRemove = function (element, model) {
+			$scope.groupLimit = $scope.groupLimit.filter((el) => {
+				return el.id !== element.id;
+			});
+			updateConfig();
+		};
+		fetchGroups();
+	}
+
+	var filterData = function () {
+		if($element.attr('id') === 'app-navigation') {
+			$scope.boardservice.sidebar = $scope.boardservice.getData();
+			$scope.boardservice.sidebar = $filter('orderBy')($scope.boardservice.sidebar, 'title');
+			$scope.boardservice.sidebar = $filter('cardFilter')($scope.boardservice.sidebar, {archived: false});
+		} else {
+			$scope.boardservice.sorted = $scope.boardservice.getData();
+			if ($scope.status.filter === 'archived') {
+				var filter = {};
+				filter[$scope.status.filter] = true;
+				$scope.boardservice.sorted = $filter('cardFilter')($scope.boardservice.sorted, filter);
+			} else if ($scope.status.filter === 'shared') {
+				$scope.boardservice.sorted = $filter('cardFilter')($scope.boardservice.sorted, {archived: false});
+				$scope.boardservice.sorted = $filter('boardFilterAcl')($scope.boardservice.sorted);
+			} else {
+				$scope.boardservice.sorted = $filter('cardFilter')($scope.boardservice.sorted, {archived: false});
+			}
+			$scope.boardservice.sorted = $filter('orderBy')($scope.boardservice.sorted, ['deletedAt', 'title']);
+		}
+	};
+
+	var finishedLoading = function() {
+		filterData();
+		$scope.newBoard.color = calculateNewColor();
+	};
+
+	var initialize = function () {
+		$scope.statusservice = StatusService.listStatus;
+
+		if($element.attr('id') === 'app-navigation') {
+			$scope.statusservice.retainWaiting();
+			BoardService.fetchAll().then(function(data) {
+				finishedLoading();
+				$scope.statusservice.releaseWaiting();
+				BoardService.loaded = true;
+			}, function (error) {
+				$scope.statusservice.setError('Error occured', error);
+			});
+		} else {
+			/* initialize main list controller when board list is loaded */
+			var boardDataWatch = $scope.$watch(function () {
+				return $scope.boardservice.loaded;
+			}, function () {
+				if (BoardService.loaded === true) {
+					boardDataWatch();
+					finishedLoading();
+				}
+			});
+		}
+
+		$scope.$watch(function () {
+			return $scope.boardservice.data;
+		}, function () {
+			filterData();
+		}, true);
+
+		/* Watch for board filter change */
+		$scope.$watchCollection(function(){
+			return $state.params;
+		}, function(){
+			$scope.status.filter = $state.params.filter;
+			filterData();
+		});
+	};
+	initialize();
+
+	$scope.selectColor = function(color) {
+		$scope.newBoard.color = color;
+	};
+
+	$scope.gotoBoard = function(board) {
+		if(board.deletedAt > 0) {
+			return false;
+		}
+		return $state.go('board', {boardId: board.id});
+	};
+
+	$scope.boardCreate = function() {
+		if(!$scope.newBoard.title || !$scope.newBoard.color) {
+			$scope.status.addBoard=false;
+			return;
+		}
+		BoardService.create($scope.newBoard)
+			.then(function (response) {
+				$scope.newBoard = {};
+				$scope.newBoard.color = calculateNewColor();
+				$scope.status.addBoard=false;
+				filterData();
+			}, function(error) {
+				$scope.status.createBoard = 'Unable to insert board: ' + error.message;
+			});
+	};
+
+	$scope.boardUpdate = function(board) {
+		BoardService.update(board).then(function(data) {
+			board.status.edit = false;
+			filterData();
+		});
+	};
+
+	$scope.boardUpdateBegin = function(board) {
+		$scope.updatingBoard = angular.copy(board);
+	};
+
+	$scope.boardUpdateReset = function(board) {
+		board.title = $scope.updatingBoard.title;
+		board.color = $scope.updatingBoard.color;
+		filterData();
+		board.status.edit = false;
+	};
+
+	$scope.boardArchive = function (board) {
+		board.archived = true;
+		BoardService.update(board).then(function(data) {
+			filterData();
+		});
+	};
+
+	$scope.boardUnarchive = function (board) {
+		board.archived = false;
+		BoardService.update(board).then(function(data) {
+			filterData();
+		});
+	};
+
+	$scope.boardDelete = function(board) {
+		BoardService.delete(board.id).then(function (data) {
+			filterData();
+		});
+	};
+
+	$scope.boardDeleteUndo = function (board) {
+		BoardService.deleteUndo(board.id).then(function (data) {
+			filterData();
+		});
+	};
+
+};
+
+export default ListController;
--- a/js/directive/appPopoverMenuUtils.js
+++ b/js/directive/appPopoverMenuUtils.js
@@ -0,0 +1,48 @@
+/*
+ * @copyright Copyright (c) 2016 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/>.
+ *
+ */
+import app from '../app/App.js';
+
+app.directive('appPopoverMenuUtils', function () {
+	'use strict';
+	return {
+		restrict: 'C',
+		link: function (scope, elm) {
+			var menu = elm.find('.popovermenu');
+			var button = elm.find('button');
+			button.click(function (e) {
+				var popovermenus = $('.popovermenu');
+				var shouldShow = menu.hasClass('hidden');
+				popovermenus.addClass('hidden');
+				if (shouldShow) {
+					menu.toggleClass('hidden');
+				}
+				e.stopPropagation();
+			});
+			scope.$on('documentClicked', function (scope, event) {
+				/* prevent closing popover if target has no-close class */
+				if (event.target !== button && !$(event.target).hasClass('no-close')) {
+					menu.addClass('hidden');
+				}
+			});
+		}
+	};
+});
--- a/js/directive/appnavigationentryutils.js
+++ b/js/directive/appnavigationentryutils.js
@@ -0,0 +1,47 @@
+/*
+ * @copyright Copyright (c) 2016 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/>.
+ *
+ */
+
+import app from '../app/App.js';
+// OwnCloud Click Handling
+// https://doc.owncloud.org/server/8.0/developer_manual/app/css.html
+app.directive('appNavigationEntryUtils', function () {
+	'use strict';
+	return {
+		restrict: 'C',
+		link: function (scope, elm) {
+
+			var menu = elm.siblings('.app-navigation-entry-menu');
+			var button = $(elm)
+				.find('.app-navigation-entry-utils-menu-button button');
+
+			button.click(function () {
+				menu.toggleClass('open');
+			});
+			scope.$on('documentClicked', function (scope, event) {
+				if (event.target !== button[0]) {
+					menu.removeClass('open');
+				}
+			});
+		}
+	};
+});
+
--- a/js/directive/autofocusoninsert.js
+++ b/js/directive/autofocusoninsert.js
@@ -2,27 +2,28 @@
 * @copyright Copyright (c) 2016 Julius Härtl <jus@bitgrid.net>
 *
 * @author Julius Härtl <jus@bitgrid.net>
- * @author Artem Anufrij <artem.anufrij@live.de>
- * @author Marin Treselj <marin@pixelipo.com>
- * @author Oskar Kurz <oskar.kurz@gmail.com>
- * @author Ryan Fletcher <ryan.fletcher@codepassion.ca>
 *
 * @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/>.
- *
+ *  
 */
+import app from '../app/App.js';

-@import 'icons';
-@import 'print';
+app.directive('autofocusOnInsert', function () {
+	'use strict';
+	return function (scope, elm) {
+		elm.focus();
+	};
+});
--- a/js/directive/avatar.js
+++ b/js/directive/avatar.js
@@ -0,0 +1,55 @@
+/*
+ * @copyright Copyright (c) 2016 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/>.
+ *
+ */
+import app from '../app/App.js';
+
+app.directive('avatar', function() {
+	'use strict';
+	return {
+		restrict: 'AEC',
+		transclude: true,
+		replace: true,
+		template: '<div class="avatardiv-container"><div class="avatardiv" data-toggle="tooltip" ng-transclude></div></div>',
+		scope: { attr: '=' },
+		link: function(scope, element, attr){
+			scope.uid = attr.displayname;
+			scope.displayname = attr.displayname;
+			scope.size = attr.size;
+			if (typeof scope.size === 'undefined') {
+				scope.size = 32;
+			}
+			var value = attr.user;
+			var avatardiv = $(element).find('.avatardiv');
+			if(typeof attr.contactsmenu !== 'undefined' && attr.contactsmenu !== 'false') {
+				avatardiv.contactsMenu(value, 0, $(element));
+				avatardiv.addClass('has-contactsmenu');
+			}
+			if(typeof attr.tooltip !== 'undefined' && attr.tooltip !== 'false') {
+				$(element).tooltip({
+					title: scope.displayname,
+					placement: 'top'
+				});
+			}
+			avatardiv.avatar(value, scope.size, false, false, false, attr.displayname);
+		},
+		controller: function () {}
+	};
+});
--- a/src/helpers/applyOrderToArray.js
+++ b/src/helpers/applyOrderToArray.js
@@ -19,21 +19,20 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 *
 */
+import app from '../app/App.js';

-const arrayMove = function(arrayToSort, removedIndex, addedIndex) {
-	if (removedIndex === null && addedIndex === null) return arrayToSort
+app.directive('bindHtmlCompile', function ($compile) {
+	'use strict';

-	const result = [...arrayToSort]
-	let itemToAdd = arrayToSort[removedIndex]
-
-	if (removedIndex !== null) {
-		itemToAdd = result.splice(removedIndex, 1)[0]
-	}
-
-	if (addedIndex !== null) {
-		result.splice(addedIndex, 0, itemToAdd)
-	}
-	return result
-}
-
-export default arrayMove
+	return {
+		restrict: 'A',
+		link: function (scope, element, attrs) {
+			scope.$watch(function () {
+				return scope.$eval(attrs.bindHtmlCompile);
+			}, function (value) {
+				element.html(value);
+				$compile(element.contents())(scope);
+			});
+		}
+	};
+});
--- a/js/directive/contactsmenudelete.js
+++ b/js/directive/contactsmenudelete.js
@@ -0,0 +1,42 @@
+/*
+ * @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/>.
+ *
+ */
+import app from '../app/App.js';
+
+app.directive('contactsmenudelete', function() {
+	'use strict';
+	return {
+		restrict: 'A',
+		priority: 1,
+		link: function(scope, element, attr){
+			var user = attr.user;
+			var menu = $(element).parent().find('.contactsmenu-popover');
+			if (oc_current_user === user) {
+				menu.children(':first').remove();
+			}
+			var menuEntry = $('<li><a><span class="icon icon-delete"></span><span>' + t('deck', 'Remove user from card') + '</span></a></li>');
+			menuEntry.on('click', function () {
+				scope.removeAssignedUser(user);
+			});
+			$(menu).append(menuEntry);
+		}
+	};
+});
--- a/js/directive/contenteditable.js
+++ b/js/directive/contenteditable.js
@@ -0,0 +1,59 @@
+/*
+ * @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/>.
+ *
+ */
+
+import app from '../app/App';
+
+app.directive('ngContenteditable', function($compile) {
+	return {
+		require: 'ngModel',
+		restrict: 'A',
+		scope: {
+			submit: '&ngSubmit'
+		},
+		link: function(scope, element, attrs, ngModel) {
+
+			//read the text typed in the div (syncing model with the view)
+			function read() {
+				ngModel.$setViewValue(element.html());
+			}
+
+			//render the data now in your model into your view
+			//$render is invoked when the modelvalue differs from the viewvalue
+			//see documentation: https://docs.angularjs.org/api/ng/type/ngModel.NgModelController#
+			ngModel.$render = function() {
+				element.html(ngModel.$viewValue || '');
+			};
+
+			//do this whenever someone starts typing
+			element.bind('blur keyup change', function(event) {
+				scope.$apply(read);
+			});
+
+			element.bind('keydown', function(event) {
+				if(event.which === 13 && event.shiftKey) {
+					scope.submit();
+				}
+			});
+
+		}
+	};
+});
--- a/js/directive/datepicker.js
+++ b/js/directive/datepicker.js
@@ -0,0 +1,55 @@
+/*
+ * @copyright Copyright (c) 2017 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/>.
+ *
+ */
+import app from '../app/App.js';
+
+/* global app */
+/* gloabl t */
+/* global moment */
+
+app.directive('datepicker', function () {
+	'use strict';
+	return {
+		link: function (scope, elm, attr) {
+			return elm.datepicker({
+				dateFormat: moment.localeData().longDateFormat('L').replace('YYYY', 'YY').toLowerCase(),
+				onSelect: function(date, inst) {
+					var selectedDate = $(this).datepicker('getDate');
+					scope.setDuedate(moment(selectedDate));
+					scope.$apply();
+				},
+				beforeShow: function(input, inst) {
+					var dp, marginLeft;
+					dp = $(inst).datepicker('widget');
+					marginLeft = -Math.abs($(input).outerWidth() - dp.outerWidth()) / 2 + 'px';
+					dp.css({
+						'margin-left': marginLeft
+					});
+					$('div.ui-datepicker:before').css({
+						'left': 100 + 'px'
+					});
+					return $('.hasDatepicker').datepicker();
+				},
+				minDate: null
+			});
+		}
+	};
+});
--- a/js/directive/elastic.js
+++ b/js/directive/elastic.js
@@ -0,0 +1,41 @@
+/*
+ * @copyright Copyright (c) 2016 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/>.
+ *  
+ */
+import app from '../app/App.js';
+
+// original idea from blockloop: http://stackoverflow.com/a/24090733
+app.directive('elastic', [
+	'$timeout',
+	function($timeout) {
+		return {
+			restrict: 'A',
+			link: function($scope, element) {
+				$scope.initialHeight = $scope.initialHeight || element[0].style.height;
+				var resize = function() {
+					element[0].style.height = $scope.initialHeight;
+					element[0].style.height = "" + element[0].scrollHeight + "px";
+				};
+				element.on("input change", resize);
+				$timeout(resize, 0);
+			}
+		};
+	}
+]);
--- a/js/directive/search.js
+++ b/js/directive/search.js
@@ -0,0 +1,61 @@
+/*
+ * @copyright Copyright (c) 2016 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/>.
+ *
+ */
+import app from '../app/App.js';
+
+app.directive('search', function ($document, $location) {
+	'use strict';
+
+	return {
+		restrict: 'E',
+		scope: {
+			'onSearch': '='
+		},
+		link: function (scope) {
+			if (OCA.Search && OCA.Search.Core) {
+				// eslint-disable-next-line no-unused-vars
+				const search = new OCA.Search((term) => {
+					scope.$apply(function () {
+						scope.onSearch(term);
+					});
+				}, () => {
+					scope.$apply(function () {
+						scope.onSearch('');
+					});
+				});
+			} else {
+				const box = $('#searchbox');
+				box.val($location.search().search);
+
+				var doSearch = function () {
+					var value = box.val();
+					scope.$apply(function () {
+						scope.onSearch(value);
+					});
+				};
+
+				box.on('search keyup', function (event) {
+					doSearch();
+				});
+			}
+		}
+	};
+});
--- a/js/directive/timepicker.js
+++ b/js/directive/timepicker.js
@@ -0,0 +1,48 @@
+/*
+ * @copyright Copyright (c) 2017 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/>.
+ *
+ */
+import app from '../app/App.js';
+import '../legacy/jquery.ui.timepicker.js';
+import 'legacy/jquery.ui.timepicker.css';
+
+/* global app */
+/* global t */
+/* global moment */
+
+app.directive('timepicker', function() {
+	'use strict';
+	return {
+		restrict: 'A',
+		link: function(scope, elm, attr) {
+			return $(elm).timepicker({
+				onSelect: function(date, inst) {
+					scope.setDuedateTime(moment('2000-01-01 ' + date));
+					scope.$apply();
+				},
+				myPosition: 'center top',
+				atPosition: 'center bottom',
+				hourText: t('deck', 'Hours'),
+				minuteText: t('deck', 'Minutes'),
+				showPeriodLabels: false
+			});
+		}
+	};
+});
--- a/js/filters/boardFilterAcl.js
+++ b/js/filters/boardFilterAcl.js
@@ -0,0 +1,34 @@
+/*
+ * @copyright Copyright (c) 2017 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/>.
+ *  
+ */
+import app from '../app/App.js';
+
+app.filter('boardFilterAcl', function() {
+	return function(boards) {
+		var _result = [];
+		angular.forEach(boards, function(board){
+			if(board.acl !== null && Object.keys(board.acl).length > 0) {
+				_result.push(board);
+			}
+		});
+		return _result;
+	};
+});
--- a/js/filters/bytesFilter.js
+++ b/js/filters/bytesFilter.js
@@ -20,36 +20,18 @@
 *
 */

-/**
- * Board model
- *
- * @typedef {object} Board
- * @property {string} title
- * @property {boolean} archived
- * @property {number} shared 1 (shared) or 0 (not shared)
- */
+import app from '../app/App.js';

-/**
- * Stack model
- *
- * @typedef {object} Stack
- * @property {string} title
- * @property {number} boardId
- * @property {number} order
- */
-
-/**
- * Card model
- *
- * @typedef {object} Card
- * @property {string} title
- * @property {boolean} archived
- * @property {number} order
- */
-/**
- * Label model
- *
- * @typedef {object} Label
- * @property {string} title
- * @property {string} color
- */
+app.filter('bytes', function () {
+	return function (bytes, precision) {
+		if (isNaN(parseFloat(bytes, 10)) || !isFinite(bytes)) {
+			return '-';
+		}
+		if (typeof precision === 'undefined') {
+			precision = 2;
+		}
+		var units = ['bytes', 'KB', 'MB', 'GB', 'TB', 'PB'],
+			number = Math.floor(Math.log(bytes) / Math.log(1024));
+		return (bytes / Math.pow(1024, Math.floor(number))).toFixed(precision) +  ' ' + units[number];
+	};
+});
--- a/js/filters/cardFilter.js
+++ b/js/filters/cardFilter.js
@@ -0,0 +1,40 @@
+/*
+ * @copyright Copyright (c) 2016 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/>.
+ *  
+ */
+import app from '../app/App.js';
+
+// usage | cardFilter({ member: 'admin'})
+
+app.filter('cardFilter', function() {
+	return function(cards, rules) {
+		var _result = [];
+		angular.forEach(cards, function(card){
+			var _card = card;
+			var keys = Object.keys(rules);
+			keys.some(function(key, condition) {
+				if(_card[key]===rules[key]) {
+					_result.push(_card);
+				}
+			});
+		});
+		return _result;
+	};
+});
--- a/js/filters/cardSearchFilter.js
+++ b/js/filters/cardSearchFilter.js
@@ -0,0 +1,44 @@
+/*
+ * @copyright Copyright (c) 2016 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/>.
+ *  
+ */
+import app from '../app/App.js';
+
+app.filter('cardSearchFilter', function() {
+	return function(cards, searchString) {
+		var _result = {};
+		var rules = {
+			title: searchString,
+			//owner: searchString,
+		};
+		angular.forEach(cards, function(card){
+			var _card = card;
+			Object.keys(rules).some(function(rule) {
+				if(_card[rule].search(rules[rule])>=0) {
+					_result[_card.id] = _card;
+				}
+			});
+		});
+
+		return $.map(_result, function(value, index) {
+			return [value];
+		});
+	};
+});
--- a/js/filters/dateFilters.js
+++ b/js/filters/dateFilters.js
@@ -0,0 +1,63 @@
+/*
+ * @copyright Copyright (c) 2016 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/>.
+ *  
+ */
+import app from '../app/App.js';
+
+/* global app */
+/* global OC */
+/* global moment */
+
+app.filter('relativeDateFilter', function() {
+	return function (timestamp) {
+		return OC.Util.relativeModifiedDate(timestamp*1000);
+	};
+});
+
+app.filter('relativeDateFilterString', function() {
+	return function (date) {
+		return OC.Util.relativeModifiedDate(Date.parse(date));
+	};
+});
+
+app.filter('dateToTimestamp', function() {
+	return function (date) {
+		return Date.parse(date);
+	};
+});
+
+app.filter('parseDate', function() {
+	return function (date) {
+		if(moment(date).isValid()) {
+			var dateFormat = moment.localeData().longDateFormat('L');
+			return moment(date).format(dateFormat);
+		}
+		return '';
+	};
+});
+
+app.filter('parseTime', function() {
+	return function (date) {
+		if(moment(date).isValid()) {
+			return moment(date).format('HH:mm');
+		}
+		return '';
+	};
+});
--- a/js/filters/iconWhiteFilter.js
+++ b/js/filters/iconWhiteFilter.js
@@ -0,0 +1,67 @@
+/*
+ * @copyright Copyright (c) 2016 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/>.
+ *  
+ */
+import app from '../app/App.js';
+
+app.filter('iconWhiteFilter', function () {
+	return function (hex) {
+		// RGB2HLS by Garry Tan
+		// http://axonflux.com/handy-rgb-to-hsl-and-rgb-to-hsv-color-model-c
+		var result = /^([A-Fa-f\d]{2})([A-Fa-f\d]{2})([A-Fa-f\d]{2})$/i.exec(hex);
+		var color = result ? {
+			r: parseInt(result[1], 16),
+			g: parseInt(result[2], 16),
+			b: parseInt(result[3], 16)
+		} : null;
+		if (result === null) {
+			return '';
+		}
+		var r = color.r / 255;
+		var g = color.g / 255;
+		var b = color.b / 255;
+		var max = Math.max(r, g, b), min = Math.min(r, g, b);
+		var h, s, l = (max + min) / 2;
+
+		if (max === min) {
+			h = s = 0; // achromatic
+		} else {
+			var d = max - min;
+			s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
+			switch (max) {
+				case r:
+					h = (g - b) / d + (g < b ? 6 : 0);
+					break;
+				case g:
+					h = (b - r) / d + 2;
+					break;
+				case b:
+					h = (r - g) / d + 4;
+					break;
+			}
+			h /= 6;
+		}
+		if (l < 0.5) {
+			return '-white';
+		} else {
+			return '';
+		}
+	};
+});
--- a/js/filters/lightenColorFilter.js
+++ b/js/filters/lightenColorFilter.js
@@ -0,0 +1,38 @@
+/*
+ * @copyright Copyright (c) 2016 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/>.
+ *  
+ */
+import app from '../app/App.js';
+
+app.filter('lightenColorFilter', function() {
+	return function (hex) {
+		var result = /^([A-Fa-f\d]{2})([A-Fa-f\d]{2})([A-Fa-f\d]{2})$/i.exec(hex);
+		var color = result ? {
+			r: parseInt(result[1], 16),
+			g: parseInt(result[2], 16),
+			b: parseInt(result[3], 16)
+		} : null;
+		if (result !== null) {
+			return 'rgba(' + color.r + ',' + color.g + ',' + color.b + ',0.7)';
+		} else {
+			return '#' + hex;
+		}
+	};
+});
--- a/js/filters/orderObjectBy.js
+++ b/js/filters/orderObjectBy.js
@@ -0,0 +1,43 @@
+/*
+ * @copyright Copyright (c) 2016 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/>.
+ *  
+ */
+import app from '../app/App.js';
+
+app.filter('orderObjectBy', function(){
+	return function(input, attribute) {
+		if (!angular.isObject(input)) {
+			return input;
+		}
+		var array = [];
+		for(var objectKey in input) {
+			if ({}.hasOwnProperty.call(input, objectKey)) {
+				array.push(input[objectKey]);
+			}
+		}
+
+		array.sort(function(a, b){
+			a = parseInt(a[attribute]);
+			b = parseInt(b[attribute]);
+			return a < b;
+		});
+		return array;
+	};
+});
--- a/js/filters/textColorFilter.js
+++ b/js/filters/textColorFilter.js
@@ -0,0 +1,69 @@
+/*
+ * @copyright Copyright (c) 2016 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/>.
+ *  
+ */
+import app from '../app/App.js';
+
+app.filter('textColorFilter', function () {
+	return function (hex) {
+		// RGB2HLS by Garry Tan
+		// http://axonflux.com/handy-rgb-to-hsl-and-rgb-to-hsv-color-model-c
+		var result = /^#?([A-Fa-f\d]{2})([A-Fa-f\d]{2})([A-Fa-f\d]{2})$/i.exec(hex);
+		var color = result ? {
+			r: parseInt(result[1], 16),
+			g: parseInt(result[2], 16),
+			b: parseInt(result[3], 16)
+		} : null;
+		if (result !== null) {
+			var r = color.r / 255;
+			var g = color.g / 255;
+			var b = color.b / 255;
+			var max = Math.max(r, g, b), min = Math.min(r, g, b);
+			var h, s, l = (max + min) / 2;
+
+			if (max === min) {
+				h = s = 0; // achromatic
+			} else {
+				var d = max - min;
+				s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
+				switch (max) {
+					case r:
+						h = (g - b) / d + (g < b ? 6 : 0);
+						break;
+					case g:
+						h = (b - r) / d + 2;
+						break;
+					case b:
+						h = (r - g) / d + 4;
+						break;
+				}
+				h /= 6;
+			}
+			if (l < 0.5) {
+				return '#ffffff';
+			} else {
+				return '#000000';
+			}
+		} else {
+			return '#000000';
+		}
+
+	};
+});
--- a/js/filters/withoutAssignedUsers.js
+++ b/js/filters/withoutAssignedUsers.js
@@ -0,0 +1,46 @@
+/*
+ * @copyright Copyright (c) 2017 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/>.
+ *  
+ */
+import app from '../app/App.js';
+
+/* global app */
+/* global angular */
+
+/*
+ * Remove all assignedUsers from users list
+ */
+app.filter('withoutAssignedUsers', function () {
+	return function (users, assignedUsers) {
+		var _result = [];
+		angular.forEach(users, function (user) {
+			var _found = false;
+			angular.forEach(assignedUsers, function (assignedUser) {
+				if (assignedUser.participant.uid === user.uid) {
+					_found = true;
+				}
+			});
+			if (_found === false) {
+				_result.push(user);
+			}
+		});
+		return _result;
+	};
+});
--- a/js/init-collections.js
+++ b/js/init-collections.js
@@ -0,0 +1,69 @@
+/*
+ * @copyright Copyright (c) 2019 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/>.
+ *
+ */
+
+'use strict';
+
+/* global __webpack_nonce__ __webpack_public_path__ OC t n */
+// eslint-disable-next-line
+__webpack_nonce__ = btoa(OC.requestToken);
+// eslint-disable-next-line
+__webpack_public_path__ = OC.linkTo('deck', 'js/build/');
+
+import Vue from 'vue';
+
+Vue.prototype.t = t;
+Vue.prototype.n = n;
+Vue.prototype.OC = OC;
+
+import BoardSelector from './views/BoardSelector';
+
+import './../css/collections.css';
+
+((function(OCP) {
+
+	OCP.Collaboration.registerType('deck', {
+		action: () => {
+			return new Promise((resolve, reject) => {
+				const container = document.createElement('div');
+				container.id = 'deck-board-select';
+				const body = document.getElementById('body-user');
+				body.append(container);
+				const ComponentVM = new Vue({
+					render: h => h(BoardSelector),
+				});
+				ComponentVM.$mount(container);
+				ComponentVM.$root.$on('close', () => {
+					ComponentVM.$el.remove();
+					ComponentVM.$destroy();
+					reject();
+				});
+				ComponentVM.$root.$on('select', (id) => {
+					resolve(id);
+					ComponentVM.$el.remove();
+					ComponentVM.$destroy();
+				});
+			});
+		},
+		typeString: t('deck', 'Link to a board'),
+		typeIconClass: 'icon-deck'
+	});
+})(window.OCP));
--- a/js/init.js
+++ b/js/init.js
@@ -0,0 +1,38 @@
+'use strict';
+
+import "@babel/polyfill";
+
+/* global __webpack_nonce__ __webpack_public_path__ OC t n */
+// eslint-disable-next-line
+__webpack_nonce__ = btoa(OC.requestToken);
+// eslint-disable-next-line
+__webpack_public_path__ = OC.linkTo('deck', 'js/build/');
+
+// used for building a vendor stylesheet
+import 'ng-sortable/dist/ng-sortable.css';
+
+import angular from 'angular';
+import markdownit from 'markdown-it';
+global.markdownit = markdownit;
+
+import app from './app/App.js';
+import './app/Config.js';
+import './app/Run.js';
+
+
+import ListController from 'controller/ListController.js';
+import attachmentListComponent from './controller/AttachmentController.js';
+import activityComponent from './controller/ActivityController.js';
+
+app.controller('ListController', ListController);
+app.component('attachmentListComponent', attachmentListComponent);
+app.component('activityComponent', activityComponent);
+
+
+// require all the js files from subdirectories
+var context = require.context('.', true, /(controller|service|filters|directive)\/(.*)\.js$/);
+
+context.keys().forEach(function (key) {
+	context(key);
+});
+
--- a/js/legacy/commentcollection.js
+++ b/js/legacy/commentcollection.js
@@ -0,0 +1,161 @@
+/**
+ * @licence
+ */
+
+import CommentModel from './commentmodel.js';
+import CommentSummaryModel from './commentsummarymodel.js';
+
+/**
+ * @class CommentCollection
+ * @classdesc
+ *
+ * Collection of comments assigned to a file
+ *
+ */
+var CommentCollection = OC.Backbone.Collection.extend(
+	/** @lends OCA.AnnouncementCenter.Comments.CommentCollection.prototype */ {
+
+	sync: OC.Backbone.davSync,
+
+	model: CommentModel,
+
+	/**
+	 * Object type
+	 *
+	 * @type string
+	 */
+	_objectType: 'deckCard',
+
+	/**
+	 * Object id
+	 *
+	 * @type string
+	 */
+	_objectId: null,
+
+	/**
+	 * True if there are no more page results left to fetch
+	 *
+	 * @type bool
+	 */
+	_endReached: false,
+
+	/**
+	 * Number of comments to fetch per page
+	 *
+	 * @type int
+	 */
+	_limit : 5,
+
+	/**
+	 * Initializes the collection
+	 *
+	 * @param {string} [options.objectType] object type
+	 * @param {string} [options.objectId] object id
+	 */
+	initialize: function(models, options) {
+		options = options || {};
+		if (options.objectType) {
+			this._objectType = options.objectType;
+		}
+		if (options.objectId) {
+			this._objectId = options.objectId;
+		}
+	},
+
+	url: function() {
+		return OC.linkToRemote('dav') + '/comments/' +
+			encodeURIComponent(this._objectType) + '/' +
+			encodeURIComponent(this._objectId) + '/';
+	},
+
+	setObjectId: function(objectId) {
+		this._objectId = objectId;
+	},
+
+	hasMoreResults: function() {
+		return !this._endReached;
+	},
+
+	reset: function() {
+		this._endReached = false;
+		this._summaryModel = null;
+		return OC.Backbone.Collection.prototype.reset.apply(this, arguments);
+	},
+
+	/**
+	 * Fetch the next set of results
+	 */
+	fetchNext: function(options) {
+		var self = this;
+		if (!this.hasMoreResults()) {
+			return null;
+		}
+
+		var body = '<?xml version="1.0" encoding="utf-8" ?>\n' +
+			'<oc:filter-comments xmlns:D="DAV:" xmlns:oc="http://owncloud.org/ns">\n' +
+			// load one more so we know there is more
+			'    <oc:limit>' + (this._limit + 1) + '</oc:limit>\n' +
+			'    <oc:offset>' + this.length + '</oc:offset>\n' +
+			'</oc:filter-comments>\n';
+
+		options = options || {};
+		var success = options.success;
+		options = _.extend({
+			remove: false,
+			parse: true,
+			data: body,
+			davProperties: CommentCollection.prototype.model.prototype.davProperties,
+			success: function(resp) {
+				if (resp.length <= self._limit) {
+					// no new entries, end reached
+					self._endReached = true;
+				} else {
+					// remove last entry, for next page load
+					resp = _.initial(resp);
+				}
+				if (!self.set(resp, options)) {
+					return false;
+				}
+				if (success) {
+					success.apply(null, arguments);
+				}
+				self.trigger('sync', 'REPORT', self, options);
+			}
+		}, options);
+
+		return this.sync('REPORT', this, options);
+	},
+
+	/**
+	 * Returns the matching summary model
+	 *
+	 * @return {OCA.AnnouncementCenter.Comments.CommentSummaryModel} summary model
+	 */
+	getSummaryModel: function() {
+		if (!this._summaryModel) {
+			this._summaryModel = new CommentSummaryModel({
+				id: this._objectId,
+				objectType: this._objectType
+			});
+		}
+		return this._summaryModel;
+	},
+
+	/**
+	 * Updates the read marker for this comment thread
+	 *
+	 * @param {Date} [date] optional date, defaults to now
+	 * @param {Object} [options] backbone options
+	 */
+	updateReadMarker: function(date, options) {
+		options = options || {};
+
+		return this.getSummaryModel().save({
+			readMarker: (date || new Date()).toUTCString()
+		}, options);
+	}
+});
+
+export default CommentCollection;
+
--- a/js/legacy/commentmodel.js
+++ b/js/legacy/commentmodel.js
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2016
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+var NS_OWNCLOUD = 'http://owncloud.org/ns';
+/**
+ * @class CommentModel
+ * @classdesc
+ *
+ * Comment
+ *
+ */
+var CommentModel = OC.Backbone.Model.extend(
+	/** @lends OCA.Comments.CommentModel.prototype */ {
+	sync: OC.Backbone.davSync,
+
+	/**
+	 * Object type
+	 *
+	 * @type string
+	 */
+	_objectType: 'deckCard',
+
+	/**
+	 * Object id
+	 *
+	 * @type string
+	 */
+	_objectId: null,
+
+	initialize: function(model, options) {
+		options = options || {};
+		if (options.objectType) {
+			this._objectType = options.objectType;
+		}
+		if (options.objectId) {
+			this._objectId = options.objectId;
+		}
+	},
+
+	defaults: {
+		actorType: 'users',
+		objectType: 'deckCard'
+	},
+
+	davProperties: {
+		'id': '{' + NS_OWNCLOUD + '}id',
+		'message': '{' + NS_OWNCLOUD + '}message',
+		'actorType': '{' + NS_OWNCLOUD + '}actorType',
+		'actorId': '{' + NS_OWNCLOUD + '}actorId',
+		'actorDisplayName': '{' + NS_OWNCLOUD + '}actorDisplayName',
+		'creationDateTime': '{' + NS_OWNCLOUD + '}creationDateTime',
+		'objectType': '{' + NS_OWNCLOUD + '}objectType',
+		'objectId': '{' + NS_OWNCLOUD + '}objectId',
+		'isUnread': '{' + NS_OWNCLOUD + '}isUnread',
+		'mentions': '{' + NS_OWNCLOUD + '}mentions'
+	},
+
+	parse: function(data) {
+		return {
+			id: data.id,
+			message: data.message,
+			actorType: data.actorType,
+			actorId: data.actorId,
+			actorDisplayName: data.actorDisplayName,
+			creationDateTime: data.creationDateTime,
+			objectType: data.objectType,
+			objectId: data.objectId,
+			isUnread: (data.isUnread === 'true'),
+			mentions: this._parseMentions(data.mentions)
+		};
+	},
+
+	_parseMentions: function(mentions) {
+		if(_.isUndefined(mentions)) {
+			return {};
+		}
+		var result = {};
+		for(var i in mentions) {
+			var mention = mentions[i];
+			if(_.isUndefined(mention.localName) || mention.localName !== 'mention') {
+				continue;
+			}
+			result[i] = {};
+			for (var child = mention.firstChild; child; child = child.nextSibling) {
+				if(_.isUndefined(child.localName) || !child.localName.startsWith('mention')) {
+					continue;
+				}
+				result[i][child.localName] = child.textContent;
+			}
+		}
+		return result;
+	},
+
+	url: function() {
+		let baseUrl;
+		if (typeof this.collection === 'undefined') {
+			baseUrl = OC.linkToRemote('dav') + '/comments/' +
+				encodeURIComponent(this.get('objectType')) + '/' +
+				encodeURIComponent(this.get('objectId')) + '/';
+		} else {
+			baseUrl = this.collection.url();
+		}
+		if (typeof this.get('id') !== 'undefined') {
+			return baseUrl + this.get('id');
+		} else {
+			return baseUrl;
+		}
+	}
+});
+
+export default CommentModel;
+
--- a/js/legacy/commentsummarymodel.js
+++ b/js/legacy/commentsummarymodel.js
@@ -0,0 +1,54 @@
+
+var NS_OWNCLOUD = 'http://owncloud.org/ns';
+/**
+ * @class OCA.AnnouncementCenter.Comments.CommentSummaryModel
+ * @classdesc
+ *
+ * Model containing summary information related to comments
+ * like the read marker.
+ *
+ */
+var CommentSummaryModel = OC.Backbone.Model.extend(
+	/** @lends OCA.AnnouncementCenter.Comments.CommentSummaryModel.prototype */ {
+	sync: OC.Backbone.davSync,
+
+	/**
+	 * Object type
+	 *
+	 * @type string
+	 */
+	_objectType: 'deckCard',
+
+	/**
+	 * Object id
+	 *
+	 * @type string
+	 */
+	_objectId: null,
+
+	davProperties: {
+		'readMarker': '{' + NS_OWNCLOUD + '}readMarker'
+	},
+
+	/**
+	 * Initializes the summary model
+	 *
+	 * @param {string} [options.objectType] object type
+	 * @param {string} [options.objectId] object id
+	 */
+	initialize: function(attrs, options) {
+		options = options || {};
+		if (options.objectType) {
+			this._objectType = options.objectType;
+		}
+	},
+
+	url: function() {
+		return OC.linkToRemote('dav') + '/comments/' +
+			encodeURIComponent(this._objectType) + '/' +
+			encodeURIComponent(this.id) + '/';
+	}
+});
+
+export default CommentSummaryModel;
+
--- a/js/legacy/jquery.atwho.min.js
+++ b/js/legacy/jquery.atwho.min.js
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Julius Härtl	912f9ab236	Check for board membership on comments entity event Signed-off-by: Julius Härtl <jus@bitgrid.net>	2020-02-11 09:49:16 +01:00
Julius Härtl	498265d551	Fix undefined users variable Signed-off-by: Julius Härtl <jus@bitgrid.net>	2020-02-11 09:47:15 +01:00
alexandru.puiu	1a87ab7bed	Probably a better method to solve the update card title issue. Signed-off-by: alexandru.puiu <alexandrup@newro.co>	2020-02-11 09:44:14 +01:00
alexandru.puiu	58a9d86e30	Solving timeline small bugs. Signed-off-by: alexandru.puiu <alexandrup@newro.co>	2020-02-11 09:44:07 +01:00
Jaco Lüken	8d3bdc4c44	Fix reversed permissions for reordering stacks (#1301 ) Signed-off-by: Jaco Lüken <j.lueken@mhq-services.com>	2020-02-11 09:41:42 +01:00
Julius Härtl	aa344c37ed	[stable-0.6] Catch exception during cron execution and log to d… (#1422 ) [stable-0.6] Catch exception during cron execution and log to debug	2019-12-30 09:34:26 +01:00
Julius Härtl	7da712428e	Merge pull request #1424 from nextcloud/backport/1397/stable-0.6 [stable-0.6] Make user id from occ command available in the service	2019-12-30 09:34:11 +01:00
Julius Härtl	ac398b24ec	Make user id from occ command available in the service Signed-off-by: Julius Härtl <jus@bitgrid.net>	2019-12-29 09:08:43 +00:00
Julius Härtl	82208d9817	Catch exception during cron execution and log to debug Signed-off-by: Julius Härtl <jus@bitgrid.net>	2019-12-29 09:07:56 +00:00
Julius Härtl	cd62de76ae	[Security] Bump angular from 1.7.8 to 1.7.9 in /js (#1341 ) [Security] Bump angular from 1.7.8 to 1.7.9 in /js	2019-11-27 21:38:27 +01:00
dependabot-preview[bot]	7a9b174c5b	[Security] Bump angular from 1.7.8 to 1.7.9 in /js Bumps [angular](https://github.com/angular/angular.js) from 1.7.8 to 1.7.9. This update includes a security fix. - [Release notes](https://github.com/angular/angular.js/releases) - [Changelog](https://github.com/angular/angular.js/blob/master/CHANGELOG.md) - [Commits](https://github.com/angular/angular.js/compare/v1.7.8...v1.7.9) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-11-20 15:32:47 +00:00
Julius Härtl	f5fbe88d55	[stable-0.6] Fix reversed visibility of 'add stack' field (#130… (#1321 ) [stable-0.6] Fix reversed visibility of 'add stack' field (#1300)	2019-11-07 23:42:57 +01:00
Jaco Lüken	51a8ffe8a1	Fix reversed visibility of 'add stack' field (#1300 ) Signed-off-by: Jaco Lüken <j.lueken@mhq-services.com>	2019-11-07 22:34:41 +00:00
Julius Härtl	757cf2128a	[stable-0.6] Unify reorder results to always be an array (#1276 ) [stable-0.6] Unify reorder results to always be an array	2019-10-04 20:17:29 +02:00
Julius Härtl	fb8eaa89bc	Unify output of reorder results Signed-off-by: Julius Härtl <jus@bitgrid.net>	2019-10-04 16:22:53 +00:00
Julius Härtl	33be14baf8	Bump version to 0.6.6 Signed-off-by: Julius Härtl <jus@bitgrid.net>	2019-08-01 16:14:28 +02:00
Julius Härtl	82d4aef424	Bump dependencies Signed-off-by: Julius Härtl <jus@bitgrid.net>	2019-08-01 16:10:58 +02:00
Julius Härtl	b41acee461	Bump version to 0.6.5 Signed-off-by: Julius Härtl <jus@bitgrid.net>	2019-07-28 13:18:07 +02:00
				`@@ -1 +0,0 @@`
				`@include icon-black-white('deck', 'deck', 1);`
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M16.5 6v11.5c0 2.21-1.79 4-4 4s-4-1.79-4-4V5c0-1.38 1.12-2.5 2.5-2.5s2.5 1.12 2.5 2.5v10.5c0 .55-.45 1-1 1s-1-.45-1-1V6H10v9.5c0 1.38 1.12 2.5 2.5 2.5s2.5-1.12 2.5-2.5V5c0-2.21-1.79-4-4-4S7 2.79 7 5v12.5c0 3.04 2.46 5.5 5.5 5.5s5.5-2.46 5.5-5.5V6h-1.5z"/><path d="M0 0h24v24H0z" fill="none"/></svg>`
				`@@ -1 +0,0 @@`
				`<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M11.8 13.8H2.2V4.2h9.6m1.2 0c0-.67-.53-1.2-1.2-1.2H2.2C1.53 3 1 3.53 1 4.2v9.6c0 .67.53 1.2 1.2 1.2h9.6c.67 0 1.2-.53 1.2-1.2"/><path d="m4.2 1c-0.67 0-1.2 0.54-1.2 1.2h10.8v10.8c0.67 0 1.2-0.53 1.2-1.2v-9.6c0-0.67-0.53-1.2-1.2-1.2z"/></svg>`