date shortcuts

Signed-off-by: Jakob Röhrl <jakob.roehrl@web.de>

.drone.yml

@@ -5,7 +5,7 @@ steps:
   image: nextcloudci/php7.3:latest
   environment:
     APP_NAME: deck
-    CORE_BRANCH: stable20
+    CORE_BRANCH: master
     DB: sqlite
   commands:
     # Pre-setup steps
@@ -20,7 +20,7 @@ steps:
   image: nextcloudci/php7.2:latest
   environment:
     APP_NAME: deck
-    CORE_BRANCH: stable20
+    CORE_BRANCH: master
     DB: sqlite
   commands:
     - composer install
@@ -29,7 +29,7 @@ steps:
   image: nextcloudci/php7.3:php7.3-2
   environment:
     APP_NAME: deck
-    CORE_BRANCH: stable20
+    CORE_BRANCH: master
     DB: sqlite
   commands:
     - composer install
@@ -38,7 +38,7 @@ steps:
   image: nextcloudci/php7.4:latest
   environment:
       APP_NAME: deck
-      CORE_BRANCH: stable20
+      CORE_BRANCH: master
       DB: sqlite
   commands:
       - composer install
@@ -58,7 +58,7 @@ steps:
     image: nextcloudci/php7.3:latest
     environment:
       APP_NAME: deck
-      CORE_BRANCH: stable20
+      CORE_BRANCH: master
       DB: sqlite
     commands:
       # Pre-setup steps
@@ -84,7 +84,7 @@ steps:
     image: nextcloudci/php7.4:latest
     environment:
       APP_NAME: deck
-      CORE_BRANCH: stable20
+      CORE_BRANCH: master
       DB: sqlite
     commands:
       # Pre-setup steps
@@ -111,7 +111,7 @@ steps:
     image: nextcloudci/php7.3:latest
     environment:
       APP_NAME: deck
-      CORE_BRANCH: stable20
+      CORE_BRANCH: master
       DB: sqlite
     commands:
       # Pre-setup steps

.travis.yml

@@ -2,13 +2,9 @@ language: php
 services:
     - mysql
 php:
-    - 7.2
     - 7.3
-    - 7.4
 env:
-    - CORE_BRANCH=stable20 DB=mysql
+    - CORE_BRANCH=master DB=mysql
-    - CORE_BRANCH=stable19 DB=mysql
-    - CORE_BRANCH=stable18 DB=mysql
 
 matrix:
   include:
@@ -21,13 +17,10 @@ before_install:
     - 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
-    - composer install --no-dev
-    - cd ../../
-    - ./occ app:enable deck
-    - cd apps/deck
 
 script:
     - composer install

CHANGELOG.md

@@ -1,57 +1,31 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## 1.1.1 - 2020-10-13
+## 1.1.0 - unreleased
 
-## Bugfixes
+### Merged PRs
 
-* [#2364](https://github.com/nextcloud/deck/pull/2364) Use uid instead of displayname for sharee results
-* [#2365](https://github.com/nextcloud/deck/pull/2365) Comments do not depend on the comments app (@jakobroehrl)
-* [#2395](https://github.com/nextcloud/deck/pull/2395) Fix failure if full text search app was enabled
-* [#2396](https://github.com/nextcloud/deck/pull/2396) Also exclude deleted items from calendar boards
-* [#2425](https://github.com/nextcloud/deck/pull/2425) Fix filter popover styling (@Flamenco)
-* [#2432](https://github.com/nextcloud/deck/pull/2432) Properly handle multiple shares in a row and refactor sharee loading
-
-## 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
-
+* [#1934](https://github.com/nextcloud/deck/pull/1934) Card dashboard @jakobroehrl
-### Bugfixes
-
 * [#2035](https://github.com/nextcloud/deck/pull/2035) Attach files in description @jakobroehrl
+* [#2047](https://github.com/nextcloud/deck/pull/2047) Show card details in modal @jakobroehrl
+* [#2115](https://github.com/nextcloud/deck/pull/2115) Dashboard panel @juliushaertl
 * [#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
+* [#2157](https://github.com/nextcloud/deck/pull/2157) Build/webpack shared config @juliushaertl
+* [#2158](https://github.com/nextcloud/deck/pull/2158) Fix description in dark mode @juliushaertl
+* [#2169](https://github.com/nextcloud/deck/pull/2169) Bump webpack-merge from 5.0.9 to 5.1.0 @dependabot
+* [#2170](https://github.com/nextcloud/deck/pull/2170) Add lastModified date to boards API documentation @stefan-niedermann
 * [#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)
+* [#2200](https://github.com/nextcloud/deck/pull/2200) Unified search implementation @juliushaertl
-* [#2208](https://github.com/nextcloud/deck/pull/2208) Fix design, dark mode and keyboard navigation of the board list
+* [#2206](https://github.com/nextcloud/deck/pull/2206) Fix read-only sidebar (fixes #2033) @juliushaertl
+* [#2208](https://github.com/nextcloud/deck/pull/2208) Fix design, dark mode and keyboard navigation of the board list @juliushaertl
 * [#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
+* [#2211](https://github.com/nextcloud/deck/pull/2211) Update incorrect field in API documentation (docs/API.md) @jordanbancino
-* [#2244](https://github.com/nextcloud/deck/pull/2244) Toggle filter on clicking card labels
+* [#2243](https://github.com/nextcloud/deck/pull/2243) Various smaller styling fixes @juliushaertl
-* [#2117](https://github.com/nextcloud/deck/pull/2117) Activity fixes
+* [#2244](https://github.com/nextcloud/deck/pull/2244) Toggle filter on clicking card labels @juliushaertl
-* [#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

appinfo/info.xml

@@ -17,7 +17,7 @@
 - 🚀 Get your project organized
 
 </description>
-    <version>1.1.1</version>
+    <version>1.1.0-beta2</version>
     <licence>agpl</licence>
     <author>Julius Härtl</author>
     <namespace>Deck</namespace>
@@ -36,7 +36,7 @@
         <database min-version="9.4">pgsql</database>
         <database>sqlite</database>
         <database min-version="5.5">mysql</database>
-        <nextcloud min-version="18" max-version="20" />
+        <nextcloud min-version="18" max-version="21" />
     </dependencies>
     <background-jobs>
         <job>OCA\Deck\Cron\DeleteCron</job>

l10n/cs.js

@@ -191,7 +191,6 @@ OC.L10N.register(
     "Select Date" : "Vybrat datum",
     "Modified" : "Změněno",
     "Created" : "Vytvořeno",
-    "The title cannot be empty." : "Nadpis je třeba vyplnit.",
     "No comments yet. Begin the discussion!" : "Zatím bez komentářů. Zahajte diskuzi!",
     "Save" : "Uložit",
     "The comment cannot be empty." : "Komentář je třeba vyplnit",
@@ -217,7 +216,6 @@ OC.L10N.register(
     "Show boards in calendar/tasks" : "Zobrazit tabule v kalendáři/úkolech",
     "Limit deck usage of groups" : "Omezit využití deck na skupiny",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Omezení nastavené pro Deck brání uživatelům, kteří nejsou součástí těchto skupin, ve vytváření vlastních tabulí. Nicméně i tak ale pořád budou moci pracovat na tabulích, které jsou jim nasdíleny.",
-    "Board name" : "Název tabule",
     "Edit board" : "Upravit tabuli",
     "Clone board " : "Klonovat tabuli ",
     "Unarchive board " : "Vrátit tabuli zpět z archivu ",

l10n/cs.json

@@ -189,7 +189,6 @@
     "Select Date" : "Vybrat datum",
     "Modified" : "Změněno",
     "Created" : "Vytvořeno",
-    "The title cannot be empty." : "Nadpis je třeba vyplnit.",
     "No comments yet. Begin the discussion!" : "Zatím bez komentářů. Zahajte diskuzi!",
     "Save" : "Uložit",
     "The comment cannot be empty." : "Komentář je třeba vyplnit",
@@ -215,7 +214,6 @@
     "Show boards in calendar/tasks" : "Zobrazit tabule v kalendáři/úkolech",
     "Limit deck usage of groups" : "Omezit využití deck na skupiny",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Omezení nastavené pro Deck brání uživatelům, kteří nejsou součástí těchto skupin, ve vytváření vlastních tabulí. Nicméně i tak ale pořád budou moci pracovat na tabulích, které jsou jim nasdíleny.",
-    "Board name" : "Název tabule",
     "Edit board" : "Upravit tabuli",
     "Clone board " : "Klonovat tabuli ",
     "Unarchive board " : "Vrátit tabuli zpět z archivu ",

l10n/de.js

@@ -100,7 +100,7 @@ OC.L10N.register(
     "Personal planning and team project organization" : "Persönliche Planung und Teamprojektorganisation",
     "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized" : "Deck ist ein Organisationstool im Kanban-Stil für die persönliche Planung und Projektorganisation von Teams, die in Nextcloud integriert sind.\n\n\n- 📥 Füge Deine Aufgaben zu den Karten hinzu und ordne diese\n- 📄 Zusätzliche Hinweise in der Abschrift notieren\n- 🔖 Vergabe von Schlagworten für noch bessere Organisation\n- 👥 Teile mit Deinem Team, Freunden oder der Familie\n- 📎 Füge Dateien hinzu und verwende diese in Deinen Markdown-Beschreibungen\n- 💬 Diskutiere mit Deinem Team mit Kommentaren\n- ⚡ Behalte Überblick über Änderungen mit dem Aktivitäten-Stream\n- 🚀 Organisiere Dein Projekt",
     "Card details" : "Kartendetails",
-    "Add board" : "Board hinzufügen",
+    "Add board" : "Benötigt keine Übersetzung. Für Android wird nur die formelle Übersetzung verwendet (de_DE).",
     "Select the board to link to a project" : "Wähle ein Board aus, um dieses mit einem Projekt zu verknüpfen",
     "Search by board title" : "Nach einem Board suchen",
     "Select board" : "Board auswählen",
@@ -117,7 +117,7 @@ OC.L10N.register(
     "This board is read only" : "Dieses Board ist schreibgeschützt",
     "Drop your files to upload" : "Dateien zum Hochladen hineinziehen",
     "Archived cards" : "Archivierte Karten",
-    "Add list" : "Liste hinzufügen",
+    "Add list" : "Benötigt keine Übersetzung. Für Android wird nur die formelle Übersetzung verwendet (de_DE).",
     "List name" : "Listenname",
     "Apply filter" : "Filter anwenden",
     "Filter by tag" : "Nach Schlagwort filtern",
@@ -191,7 +191,6 @@ OC.L10N.register(
     "Select Date" : "Datum auswählen",
     "Modified" : "Geändert",
     "Created" : "Erstellt",
-    "The title cannot be empty." : "Der Titel darf nicht leer sein.",
     "No comments yet. Begin the discussion!" : "Bislang keine Kommentare. Beginne die Diskussion!",
     "Save" : "Speichern",
     "The comment cannot be empty." : "Der Kommentar darf nicht leer sein.",
@@ -217,7 +216,6 @@ OC.L10N.register(
     "Show boards in calendar/tasks" : "Board im Kalender/Aufgaben anzeigen",
     "Limit deck usage of groups" : "Nutzung von Deck auf Gruppen einschränken",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Durch die Begrenzung von Deck werden Benutzer, die nicht Teil dieser Gruppen sind, daran gehindert, eigene Boards zu erstellen. Benutzer können weiterhin an Boards arbeiten, die für sie freigegeben wurden.",
-    "Board name" : "Board-Name",
     "Edit board" : "Board bearbeiten",
     "Clone board " : "Board duplizieren",
     "Unarchive board " : "Board dearchivieren",

l10n/de.json

@@ -98,7 +98,7 @@
     "Personal planning and team project organization" : "Persönliche Planung und Teamprojektorganisation",
     "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized" : "Deck ist ein Organisationstool im Kanban-Stil für die persönliche Planung und Projektorganisation von Teams, die in Nextcloud integriert sind.\n\n\n- 📥 Füge Deine Aufgaben zu den Karten hinzu und ordne diese\n- 📄 Zusätzliche Hinweise in der Abschrift notieren\n- 🔖 Vergabe von Schlagworten für noch bessere Organisation\n- 👥 Teile mit Deinem Team, Freunden oder der Familie\n- 📎 Füge Dateien hinzu und verwende diese in Deinen Markdown-Beschreibungen\n- 💬 Diskutiere mit Deinem Team mit Kommentaren\n- ⚡ Behalte Überblick über Änderungen mit dem Aktivitäten-Stream\n- 🚀 Organisiere Dein Projekt",
     "Card details" : "Kartendetails",
-    "Add board" : "Board hinzufügen",
+    "Add board" : "Benötigt keine Übersetzung. Für Android wird nur die formelle Übersetzung verwendet (de_DE).",
     "Select the board to link to a project" : "Wähle ein Board aus, um dieses mit einem Projekt zu verknüpfen",
     "Search by board title" : "Nach einem Board suchen",
     "Select board" : "Board auswählen",
@@ -115,7 +115,7 @@
     "This board is read only" : "Dieses Board ist schreibgeschützt",
     "Drop your files to upload" : "Dateien zum Hochladen hineinziehen",
     "Archived cards" : "Archivierte Karten",
-    "Add list" : "Liste hinzufügen",
+    "Add list" : "Benötigt keine Übersetzung. Für Android wird nur die formelle Übersetzung verwendet (de_DE).",
     "List name" : "Listenname",
     "Apply filter" : "Filter anwenden",
     "Filter by tag" : "Nach Schlagwort filtern",
@@ -189,7 +189,6 @@
     "Select Date" : "Datum auswählen",
     "Modified" : "Geändert",
     "Created" : "Erstellt",
-    "The title cannot be empty." : "Der Titel darf nicht leer sein.",
     "No comments yet. Begin the discussion!" : "Bislang keine Kommentare. Beginne die Diskussion!",
     "Save" : "Speichern",
     "The comment cannot be empty." : "Der Kommentar darf nicht leer sein.",
@@ -215,7 +214,6 @@
     "Show boards in calendar/tasks" : "Board im Kalender/Aufgaben anzeigen",
     "Limit deck usage of groups" : "Nutzung von Deck auf Gruppen einschränken",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Durch die Begrenzung von Deck werden Benutzer, die nicht Teil dieser Gruppen sind, daran gehindert, eigene Boards zu erstellen. Benutzer können weiterhin an Boards arbeiten, die für sie freigegeben wurden.",
-    "Board name" : "Board-Name",
     "Edit board" : "Board bearbeiten",
     "Clone board " : "Board duplizieren",
     "Unarchive board " : "Board dearchivieren",

l10n/de_DE.js

@@ -191,7 +191,6 @@ OC.L10N.register(
     "Select Date" : "Datum auswählen",
     "Modified" : "Geändert",
     "Created" : "Erstellt",
-    "The title cannot be empty." : "Der Titel darf nicht leer sein.",
     "No comments yet. Begin the discussion!" : "Bislang keine Kommentare. Beginnen Sie die Diskussion!",
     "Save" : "Speichern",
     "The comment cannot be empty." : "Der Kommentar darf nicht leer sein.",
@@ -217,7 +216,6 @@ OC.L10N.register(
     "Show boards in calendar/tasks" : "Board in Kalender/Aufgaben anzeigen",
     "Limit deck usage of groups" : "Nutzung von Deck auf Gruppen einschränken",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Durch die Begrenzung von Deck werden Benutzer, die nicht Teil dieser Gruppen sind, daran gehindert, eigene Boards zu erstellen. Benutzer können weiterhin an Boards arbeiten, die für sie freigegeben wurden.",
-    "Board name" : "Board-Name",
     "Edit board" : "Board bearbeiten",
     "Clone board " : "Board duplizieren",
     "Unarchive board " : "Board dearchivieren",

l10n/de_DE.json

@@ -189,7 +189,6 @@
     "Select Date" : "Datum auswählen",
     "Modified" : "Geändert",
     "Created" : "Erstellt",
-    "The title cannot be empty." : "Der Titel darf nicht leer sein.",
     "No comments yet. Begin the discussion!" : "Bislang keine Kommentare. Beginnen Sie die Diskussion!",
     "Save" : "Speichern",
     "The comment cannot be empty." : "Der Kommentar darf nicht leer sein.",
@@ -215,7 +214,6 @@
     "Show boards in calendar/tasks" : "Board in Kalender/Aufgaben anzeigen",
     "Limit deck usage of groups" : "Nutzung von Deck auf Gruppen einschränken",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Durch die Begrenzung von Deck werden Benutzer, die nicht Teil dieser Gruppen sind, daran gehindert, eigene Boards zu erstellen. Benutzer können weiterhin an Boards arbeiten, die für sie freigegeben wurden.",
-    "Board name" : "Board-Name",
     "Edit board" : "Board bearbeiten",
     "Clone board " : "Board duplizieren",
     "Unarchive board " : "Board dearchivieren",

l10n/es.js

@@ -191,7 +191,6 @@ OC.L10N.register(
     "Select Date" : "Seleccione la fecha",
     "Modified" : "Modificado",
     "Created" : "Creado",
-    "The title cannot be empty." : "El título no puede estar vacío.",
     "No comments yet. Begin the discussion!" : "Todavía no hay comentarios. ¡Comienza la discusión!",
     "Save" : "Guardar",
     "The comment cannot be empty." : "El comentario no puede estar vacío.",
@@ -217,7 +216,6 @@ OC.L10N.register(
     "Show boards in calendar/tasks" : "Mostrar tableros en calendario/tareas",
     "Limit deck usage of groups" : "Limitar el uso de Deck a grupos",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Limitar Deck impedirá que usuarios que no formen parte de esos grupos creen sus propios tableros. Los usuarios todavía podrán trabajar en tableros que hayan sido compartidos con ellos.",
-    "Board name" : "Nombre del tablero",
     "Edit board" : "Editar tablero",
     "Clone board " : "Clonar tablero",
     "Unarchive board " : "Desarchivar tablero",

l10n/es.json

@@ -189,7 +189,6 @@
     "Select Date" : "Seleccione la fecha",
     "Modified" : "Modificado",
     "Created" : "Creado",
-    "The title cannot be empty." : "El título no puede estar vacío.",
     "No comments yet. Begin the discussion!" : "Todavía no hay comentarios. ¡Comienza la discusión!",
     "Save" : "Guardar",
     "The comment cannot be empty." : "El comentario no puede estar vacío.",
@@ -215,7 +214,6 @@
     "Show boards in calendar/tasks" : "Mostrar tableros en calendario/tareas",
     "Limit deck usage of groups" : "Limitar el uso de Deck a grupos",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Limitar Deck impedirá que usuarios que no formen parte de esos grupos creen sus propios tableros. Los usuarios todavía podrán trabajar en tableros que hayan sido compartidos con ellos.",
-    "Board name" : "Nombre del tablero",
     "Edit board" : "Editar tablero",
     "Clone board " : "Clonar tablero",
     "Unarchive board " : "Desarchivar tablero",

l10n/fr.js

@@ -191,7 +191,6 @@ OC.L10N.register(
     "Select Date" : "Sélectionnez une date",
     "Modified" : "Modifié",
     "Created" : "Créé",
-    "The title cannot be empty." : "Le titre ne peut pas être vide.",
     "No comments yet. Begin the discussion!" : "Aucun commentaire pour l'instant, démarrez la discussion !",
     "Save" : "Enregistrer",
     "The comment cannot be empty." : "Un commentaire ne peut pas être vide.",
@@ -217,7 +216,6 @@ OC.L10N.register(
     "Show boards in calendar/tasks" : "Afficher les tableaux dans les agendas/tâches",
     "Limit deck usage of groups" : "Limiter l'utilisation du tableau aux groupes",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Limiter Deck empêchera les utilisateurs ne faisant pas partie de ces groupes de créer leurs propres tableaux. Ces utilisateurs pourront toujours travailler sur les tableaux qui ont été partagés avec eux.",
-    "Board name" : "Nom du tableau",
     "Edit board" : "Modifier le tableau",
     "Clone board " : "Dupliquer le tableau",
     "Unarchive board " : "Sortir le tableau des archives",

l10n/fr.json

@@ -189,7 +189,6 @@
     "Select Date" : "Sélectionnez une date",
     "Modified" : "Modifié",
     "Created" : "Créé",
-    "The title cannot be empty." : "Le titre ne peut pas être vide.",
     "No comments yet. Begin the discussion!" : "Aucun commentaire pour l'instant, démarrez la discussion !",
     "Save" : "Enregistrer",
     "The comment cannot be empty." : "Un commentaire ne peut pas être vide.",
@@ -215,7 +214,6 @@
     "Show boards in calendar/tasks" : "Afficher les tableaux dans les agendas/tâches",
     "Limit deck usage of groups" : "Limiter l'utilisation du tableau aux groupes",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Limiter Deck empêchera les utilisateurs ne faisant pas partie de ces groupes de créer leurs propres tableaux. Ces utilisateurs pourront toujours travailler sur les tableaux qui ont été partagés avec eux.",
-    "Board name" : "Nom du tableau",
     "Edit board" : "Modifier le tableau",
     "Clone board " : "Dupliquer le tableau",
     "Unarchive board " : "Sortir le tableau des archives",

l10n/gl.js

@@ -117,7 +117,7 @@ OC.L10N.register(
     "This board is read only" : "Este taboleiro é só de lectura",
     "Drop your files to upload" : "Arrastre os seus ficheiros para envialos",
     "Archived cards" : "Tarxetas arquivadas",
-    "Add list" : "Engadir unha lista",
+    "Add list" : "Engadir unha lista...",
     "List name" : "Nome da lista",
     "Apply filter" : "Aplicar filtro",
     "Filter by tag" : "Filtrar pola etiqueta",
@@ -191,7 +191,6 @@ OC.L10N.register(
     "Select Date" : "Seleccione a data",
     "Modified" : "Modificado",
     "Created" : "Creado",
-    "The title cannot be empty." : "O título non pode estar baleiro.",
     "No comments yet. Begin the discussion!" : "Aínda non hai comentarios. Comece o debate!",
     "Save" : "Gardar",
     "The comment cannot be empty." : "O comentario non pode estar baleiro",
@@ -217,7 +216,6 @@ OC.L10N.register(
     "Show boards in calendar/tasks" : "Amosar taboleiros no calendario/tarefas",
     "Limit deck usage of groups" : "Limitar o uso da plataforma a grupos",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Limitando Deck bloqueará os usuarios que non formen parte destes grupos, para crear os seus propios taboleiros. Os usuarios aínda así poderán traballar en taboleiros compartidos con eles.",
-    "Board name" : "Nome do taboleiro",
     "Edit board" : "Editar taboleiro",
     "Clone board " : "Clonar taboleiro",
     "Unarchive board " : "Desarquivar taboleiro",

l10n/gl.json

@@ -115,7 +115,7 @@
     "This board is read only" : "Este taboleiro é só de lectura",
     "Drop your files to upload" : "Arrastre os seus ficheiros para envialos",
     "Archived cards" : "Tarxetas arquivadas",
-    "Add list" : "Engadir unha lista",
+    "Add list" : "Engadir unha lista...",
     "List name" : "Nome da lista",
     "Apply filter" : "Aplicar filtro",
     "Filter by tag" : "Filtrar pola etiqueta",
@@ -189,7 +189,6 @@
     "Select Date" : "Seleccione a data",
     "Modified" : "Modificado",
     "Created" : "Creado",
-    "The title cannot be empty." : "O título non pode estar baleiro.",
     "No comments yet. Begin the discussion!" : "Aínda non hai comentarios. Comece o debate!",
     "Save" : "Gardar",
     "The comment cannot be empty." : "O comentario non pode estar baleiro",
@@ -215,7 +214,6 @@
     "Show boards in calendar/tasks" : "Amosar taboleiros no calendario/tarefas",
     "Limit deck usage of groups" : "Limitar o uso da plataforma a grupos",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Limitando Deck bloqueará os usuarios que non formen parte destes grupos, para crear os seus propios taboleiros. Os usuarios aínda así poderán traballar en taboleiros compartidos con eles.",
-    "Board name" : "Nome do taboleiro",
     "Edit board" : "Editar taboleiro",
     "Clone board " : "Clonar taboleiro",
     "Unarchive board " : "Desarquivar taboleiro",

l10n/hr.js

@@ -121,7 +121,6 @@ OC.L10N.register(
     "Apply filter" : "Primijeni filtar",
     "Filter by tag" : "Filtriraj prema oznaci",
     "Filter by assigned user" : "Filtriraj prema dodijeljenom korisniku",
-    "Unassigned" : "Nedodijeljeno",
     "Filter by due date" : "Filtriraj prema datumu dospijeća",
     "Overdue" : "Kasni",
     "Next 24 hours" : "Sljedeća 24 sata",
@@ -134,8 +133,6 @@ OC.L10N.register(
     "Toggle compact mode" : "Prebaci u kompaktni način rada",
     "Details" : "Pojedinosti",
     "Loading board" : "Učitavanje ploče",
-    "No lists available" : "Nema dostupnih popisa",
-    "Create a new list to add cards to this board" : "Stvorite novi popis kako biste dodali kartice na ovu ploču",
     "Board not found" : "Ploča nije pronađena",
     "Sharing" : "Dijeljenje",
     "Tags" : "Oznake",

l10n/hr.json

@@ -119,7 +119,6 @@
     "Apply filter" : "Primijeni filtar",
     "Filter by tag" : "Filtriraj prema oznaci",
     "Filter by assigned user" : "Filtriraj prema dodijeljenom korisniku",
-    "Unassigned" : "Nedodijeljeno",
     "Filter by due date" : "Filtriraj prema datumu dospijeća",
     "Overdue" : "Kasni",
     "Next 24 hours" : "Sljedeća 24 sata",
@@ -132,8 +131,6 @@
     "Toggle compact mode" : "Prebaci u kompaktni način rada",
     "Details" : "Pojedinosti",
     "Loading board" : "Učitavanje ploče",
-    "No lists available" : "Nema dostupnih popisa",
-    "Create a new list to add cards to this board" : "Stvorite novi popis kako biste dodali kartice na ovu ploču",
     "Board not found" : "Ploča nije pronađena",
     "Sharing" : "Dijeljenje",
     "Tags" : "Oznake",

l10n/it.js

@@ -191,7 +191,6 @@ OC.L10N.register(
     "Select Date" : "Seleziona data",
     "Modified" : "Modificato",
     "Created" : "Creato il",
-    "The title cannot be empty." : "Il titolo non può essere vuoto.",
     "No comments yet. Begin the discussion!" : "Ancora nessun commento. Inizia la discussione.",
     "Save" : "Salva",
     "The comment cannot be empty." : "Il commento non può essere vuoto.",
@@ -217,7 +216,6 @@ OC.L10N.register(
     "Show boards in calendar/tasks" : "Mostra le lavagne in calendario/attività",
     "Limit deck usage of groups" : "Limita utilizzo di Deck dei gruppi",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "La limitazione di Deck impedirà agli utenti che non fanno parte di tali gruppi di creare le proprie lavagne. Gli utenti saranno ancora in grado di lavorare sulle lavagne che sono state condivise con loro,",
-    "Board name" : "Nome della lavagna",
     "Edit board" : "Modifica lavagna",
     "Clone board " : "Clona lavagna",
     "Unarchive board " : "Recupera lavagna dall'archivio",

l10n/it.json

@@ -189,7 +189,6 @@
     "Select Date" : "Seleziona data",
     "Modified" : "Modificato",
     "Created" : "Creato il",
-    "The title cannot be empty." : "Il titolo non può essere vuoto.",
     "No comments yet. Begin the discussion!" : "Ancora nessun commento. Inizia la discussione.",
     "Save" : "Salva",
     "The comment cannot be empty." : "Il commento non può essere vuoto.",
@@ -215,7 +214,6 @@
     "Show boards in calendar/tasks" : "Mostra le lavagne in calendario/attività",
     "Limit deck usage of groups" : "Limita utilizzo di Deck dei gruppi",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "La limitazione di Deck impedirà agli utenti che non fanno parte di tali gruppi di creare le proprie lavagne. Gli utenti saranno ancora in grado di lavorare sulle lavagne che sono state condivise con loro,",
-    "Board name" : "Nome della lavagna",
     "Edit board" : "Modifica lavagna",
     "Clone board " : "Clona lavagna",
     "Unarchive board " : "Recupera lavagna dall'archivio",

l10n/pl.js

@@ -98,7 +98,7 @@ OC.L10N.register(
     "A PHP extension stopped the file upload" : "Rozszerzenie PHP zatrzymało wysyłanie pliku",
     "No file uploaded or file size exceeds maximum of %s" : "Brak przesłanego pliku lub rozmiar pliku przekracza maksymalny limit %s",
     "Personal planning and team project organization" : "Indywidualne planowanie i organizacja projektu zespołowego",
-    "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized" : "Tablica to narzędzie organizacyjne w stylu kanban, którego celem jest osobiste planowanie i organizacja projektu dla zespołów zintegrowanych z Nextcloud.\n\n\n- 📥 Dodaj swoje zadania do kart i porządkuj je\n- 📄 Zapisuj dodatkowe notatki w markdown\n- 🔖 Przypisuj etykiety dla jeszcze lepszej organizacji\n- 👥 Współdziel ze swoim zespołem, przyjaciółmi lub rodziną\n- 📎 Dołączaj pliki i umieszczaj je z opisem\n- 💬 Porozmawiaj ze swoim zespołem za pomocą komentarzy\n- ⚡ Śledź zmiany w strumieniu aktywności\n- 🚀 Organizuj swój projekt",
+    "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized" : "Tablica to narzędzie organizacyjne w stylu kanban, którego celem jest osobiste planowanie i organizacja projektu dla zespołów zintegrowanych z Nextcloud.\n\n\n- 📥 Dodaj swoje zadania do kart i porządkuj je\n- 📄 Zapisuj dodatkowe notatki\n- 🔖 Przypisuj etykiety dla jeszcze lepszej organizacji\n- 👥 Współdziel ze swoim zespołem, przyjaciółmi lub rodziną\n- 📎 Dołączaj pliki i umieszczaj je z opisem\n- 💬 Porozmawiaj ze swoim zespołem za pomocą komentarzy\n- ⚡ Śledź zmiany w strumieniu aktywności\n- 🚀 Organizuj swój projekt",
     "Card details" : "Szczegóły karty",
     "Add board" : "Dodaj tablicę",
     "Select the board to link to a project" : "Wybierz tablicę, aby połączyć się z projektem",
@@ -191,7 +191,6 @@ OC.L10N.register(
     "Select Date" : "Wybierz datę",
     "Modified" : "Zmodyfikowany",
     "Created" : "Utworzono",
-    "The title cannot be empty." : "Tytuł nie może być pusty.",
     "No comments yet. Begin the discussion!" : "Brak komentarzy. Rozpocznij dyskusję!",
     "Save" : "Zapisz",
     "The comment cannot be empty." : "Komentarz nie może być pusty.",
@@ -217,7 +216,6 @@ OC.L10N.register(
     "Show boards in calendar/tasks" : "Pokaż tablice w kalendarzu/zadaniach",
     "Limit deck usage of groups" : "Ogranicz użycie tablic dla grup",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Ograniczenie Deck zablokuje użytkownikom z tych grup możliwość tworzenia własnych tablic. Użytkownicy nadal będą mogli pracować na tablicach, które zostały im udostępnione.",
-    "Board name" : "Nazwa tablicy",
     "Edit board" : "Edytuj tablicę",
     "Clone board " : "Klonuj tablicę ",
     "Unarchive board " : "Przywróć tablicę ",

l10n/pl.json

@@ -96,7 +96,7 @@
     "A PHP extension stopped the file upload" : "Rozszerzenie PHP zatrzymało wysyłanie pliku",
     "No file uploaded or file size exceeds maximum of %s" : "Brak przesłanego pliku lub rozmiar pliku przekracza maksymalny limit %s",
     "Personal planning and team project organization" : "Indywidualne planowanie i organizacja projektu zespołowego",
-    "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized" : "Tablica to narzędzie organizacyjne w stylu kanban, którego celem jest osobiste planowanie i organizacja projektu dla zespołów zintegrowanych z Nextcloud.\n\n\n- 📥 Dodaj swoje zadania do kart i porządkuj je\n- 📄 Zapisuj dodatkowe notatki w markdown\n- 🔖 Przypisuj etykiety dla jeszcze lepszej organizacji\n- 👥 Współdziel ze swoim zespołem, przyjaciółmi lub rodziną\n- 📎 Dołączaj pliki i umieszczaj je z opisem\n- 💬 Porozmawiaj ze swoim zespołem za pomocą komentarzy\n- ⚡ Śledź zmiany w strumieniu aktywności\n- 🚀 Organizuj swój projekt",
+    "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized" : "Tablica to narzędzie organizacyjne w stylu kanban, którego celem jest osobiste planowanie i organizacja projektu dla zespołów zintegrowanych z Nextcloud.\n\n\n- 📥 Dodaj swoje zadania do kart i porządkuj je\n- 📄 Zapisuj dodatkowe notatki\n- 🔖 Przypisuj etykiety dla jeszcze lepszej organizacji\n- 👥 Współdziel ze swoim zespołem, przyjaciółmi lub rodziną\n- 📎 Dołączaj pliki i umieszczaj je z opisem\n- 💬 Porozmawiaj ze swoim zespołem za pomocą komentarzy\n- ⚡ Śledź zmiany w strumieniu aktywności\n- 🚀 Organizuj swój projekt",
     "Card details" : "Szczegóły karty",
     "Add board" : "Dodaj tablicę",
     "Select the board to link to a project" : "Wybierz tablicę, aby połączyć się z projektem",
@@ -189,7 +189,6 @@
     "Select Date" : "Wybierz datę",
     "Modified" : "Zmodyfikowany",
     "Created" : "Utworzono",
-    "The title cannot be empty." : "Tytuł nie może być pusty.",
     "No comments yet. Begin the discussion!" : "Brak komentarzy. Rozpocznij dyskusję!",
     "Save" : "Zapisz",
     "The comment cannot be empty." : "Komentarz nie może być pusty.",
@@ -215,7 +214,6 @@
     "Show boards in calendar/tasks" : "Pokaż tablice w kalendarzu/zadaniach",
     "Limit deck usage of groups" : "Ogranicz użycie tablic dla grup",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Ograniczenie Deck zablokuje użytkownikom z tych grup możliwość tworzenia własnych tablic. Użytkownicy nadal będą mogli pracować na tablicach, które zostały im udostępnione.",
-    "Board name" : "Nazwa tablicy",
     "Edit board" : "Edytuj tablicę",
     "Clone board " : "Klonuj tablicę ",
     "Unarchive board " : "Przywróć tablicę ",

l10n/tr.js

@@ -191,7 +191,6 @@ OC.L10N.register(
     "Select Date" : "Tarih Seçin",
     "Modified" : "Değiştirilme",
     "Created" : "Oluşturulma",
-    "The title cannot be empty." : "Başlık boş olamaz.",
     "No comments yet. Begin the discussion!" : "Henüz bir yorum yapılmamış. Tartışmayı başlatın!",
     "Save" : "Kaydet",
     "The comment cannot be empty." : "Yorum boş olamaz.",
@@ -217,7 +216,6 @@ OC.L10N.register(
     "Show boards in calendar/tasks" : "Takvimler ve görevlerde panolar görüntülensin",
     "Limit deck usage of groups" : "Tahtayı şu gruplar kullanabilsin",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Tahta kullanımı gruplar ile sınırlandığında belirtilen grupların üyesi olmayan kişiler kendi tahtalarını oluşturamaz. Bu kullanıcılar ancak kendileri ile paylaşılan tahtalar üzerinde çalışabilir.",
-    "Board name" : "Pano adı",
     "Edit board" : "Panoyu sil",
     "Clone board " : "Panoyu kopyala",
     "Unarchive board " : "Panoyu arşivden çıkar",

l10n/tr.json

@@ -189,7 +189,6 @@
     "Select Date" : "Tarih Seçin",
     "Modified" : "Değiştirilme",
     "Created" : "Oluşturulma",
-    "The title cannot be empty." : "Başlık boş olamaz.",
     "No comments yet. Begin the discussion!" : "Henüz bir yorum yapılmamış. Tartışmayı başlatın!",
     "Save" : "Kaydet",
     "The comment cannot be empty." : "Yorum boş olamaz.",
@@ -215,7 +214,6 @@
     "Show boards in calendar/tasks" : "Takvimler ve görevlerde panolar görüntülensin",
     "Limit deck usage of groups" : "Tahtayı şu gruplar kullanabilsin",
     "Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Tahta kullanımı gruplar ile sınırlandığında belirtilen grupların üyesi olmayan kişiler kendi tahtalarını oluşturamaz. Bu kullanıcılar ancak kendileri ile paylaşılan tahtalar üzerinde çalışabilir.",
-    "Board name" : "Pano adı",
     "Edit board" : "Panoyu sil",
     "Clone board " : "Panoyu kopyala",
     "Unarchive board " : "Panoyu arşivden çıkar",

lib/Activity/ActivityManager.php

@@ -240,25 +240,9 @@ class ActivityManager {
 	}
 
 	public function triggerEvent($objectType, $entity, $subject, $additionalParams = [], $author = null) {
-		if ($author === null) {
-			$author = $this->userId;
-		}
 		try {
 			$event = $this->createEvent($objectType, $entity, $subject, $additionalParams, $author);
 			if ($event !== null) {
-				$json = json_encode($event->getSubjectParameters());
-				if (mb_strlen($json) > 4000) {
-					$params = json_decode(json_encode($event->getSubjectParameters()), true);
-
-					$newContent = $params['after'];
-					unset($params['before'], $params['after'], $params['card']['description']);
-
-					$params['after'] = mb_substr($newContent, 0, 2000);
-					if (mb_strlen($newContent) > 2000) {
-						$params['after'] .= '...';
-					}
-					$event->setSubject($event->getSubject(), $params);
-				}
 				$this->sendToUsers($event);
 			}
 		} catch (\Exception $e) {

lib/Activity/DeckProvider.php

@@ -96,7 +96,6 @@ class DeckProvider implements IProvider {
 			unset($subjectParams['author']);
 		}
 		$user = $this->userManager->get($author);
-		$params = [];
 		if ($user !== null) {
 			$params = [
 				'user' => [
@@ -329,8 +328,8 @@ class DeckProvider implements IProvider {
 		if (array_key_exists('diff', $subjectParams) && $subjectParams['diff']) {
 			$diff = new Diff();
 			// Don't add diff as message since we are limited to 255 chars here
-			$event->setParsedMessage($subjectParams['after']);
+			//$event->setMessage($subjectParams['after']);
-			//$event->setParsedMessage('<pre class="visualdiff">' . $diff->render($subjectParams['before'], $subjectParams['after']) . '</pre>');
+			$event->setParsedMessage('<pre class="visualdiff">' . $diff->render($subjectParams['before'], $subjectParams['after']) . '</pre>');
 			return $params;
 		}
 		if (array_key_exists('before', $subjectParams)) {

lib/DAV/DeckCalendarBackend.php

@@ -59,7 +59,7 @@ class DeckCalendarBackend {
 	}
 
 	public function getBoards(): array {
-		return $this->boardService->findAll(-1, null, false);
+		return $this->boardService->findAll();
 	}
 
 	public function getBoard(int $id): Board {

lib/Db/BoardMapper.php

@@ -93,18 +93,10 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
 	 * @param null $offset
 	 * @return array
 	 */
-	public function findAllByUser($userId, $limit = null, $offset = null, $since = -1, $includeArchived = true) {
+	public function findAllByUser($userId, $limit = null, $offset = null, $since = -1) {
-		// FIXME: One moving to QBMapper we should allow filtering the boards probably by method chaining for additional where clauses
+		$sql = 'SELECT id, title, owner, color, archived, deleted_at, 0 as shared, last_modified FROM `*PREFIX*deck_boards` WHERE owner = ? AND last_modified > ? UNION ' .
-		$sql = 'SELECT id, title, owner, color, archived, deleted_at, 0 as shared, last_modified FROM `*PREFIX*deck_boards` WHERE owner = ? AND last_modified > ?';
-		if (!$includeArchived) {
-			$sql .= ' AND NOT archived AND deleted_at = 0';
-		}
-		$sql .= ' UNION ' .
 			'SELECT boards.id, title, owner, color, archived, deleted_at, 1 as shared, last_modified FROM `*PREFIX*deck_boards` as boards ' .
 			'JOIN `*PREFIX*deck_board_acl` as acl ON boards.id=acl.board_id WHERE acl.participant=? AND acl.type=? AND boards.owner != ? AND last_modified > ?';
-		if (!$includeArchived) {
-			$sql .= ' AND NOT archived AND deleted_at = 0';
-		}
 		$entries = $this->findEntities($sql, [$userId, $since, $userId, Acl::PERMISSION_TYPE_USER, $userId, $since], $limit, $offset);
 		/* @var Board $entry */
 		foreach ($entries as $entry) {
@@ -128,7 +120,7 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
 	 * @param null $offset
 	 * @return array
 	 */
-	public function findAllByGroups($userId, $groups, $limit = null, $offset = null, $since = -1,$includeArchived = true) {
+	public function findAllByGroups($userId, $groups, $limit = null, $offset = null) {
 		if (count($groups) <= 0) {
 			return [];
 		}
@@ -140,10 +132,7 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
 				$sql .= ' OR ';
 			}
 		}
-		$sql .= ')';
+		$sql .= ');';
-		if (!$includeArchived) {
-			$sql .= ' AND NOT archived AND deleted_at = 0';
-		}
 		$entries = $this->findEntities($sql, array_merge([$userId, Acl::PERMISSION_TYPE_GROUP], $groups), $limit, $offset);
 		/* @var Board $entry */
 		foreach ($entries as $entry) {
@@ -153,7 +142,7 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
 		return $entries;
 	}
 
-	public function findAllByCircles($userId, $limit = null, $offset = null, $since = -1,$includeArchived = true) {
+	public function findAllByCircles($userId, $limit = null, $offset = null) {
 		if (!$this->circlesEnabled) {
 			return [];
 		}
@@ -172,10 +161,7 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
 				$sql .= ' OR ';
 			}
 		}
-		$sql .= ')';
+		$sql .= ');';
-		if (!$includeArchived) {
-			$sql .= ' AND NOT archived AND deleted_at = 0';
-		}
 		$entries = $this->findEntities($sql, array_merge([$userId, Acl::PERMISSION_TYPE_CIRCLE], $circles), $limit, $offset);
 		/* @var Board $entry */
 		foreach ($entries as $entry) {

lib/Event/FTSEvent.php

@@ -42,7 +42,7 @@ class FTSEvent extends Event {
 	}
 
 	public function getArgument($key) {
-		if (isset($this->arguments[$key])) {
+		if ($this->hasArgument($key)) {
 			return $this->arguments[$key];
 		}
 

lib/Service/BoardService.php

@@ -107,11 +107,11 @@ class BoardService {
 		$this->userId = $userId;
 	}
 
-	public function getUserBoards(int $since = -1, $includeArchived = true): array {
+	public function getUserBoards(int $since = -1): array {
 		$userInfo = $this->getBoardPrerequisites();
-		$userBoards = $this->boardMapper->findAllByUser($userInfo['user'], null, null, $since, $includeArchived);
+		$userBoards = $this->boardMapper->findAllByUser($userInfo['user'], null, null, $since);
-		$groupBoards = $this->boardMapper->findAllByGroups($userInfo['user'], $userInfo['groups'],null, null, $since, $includeArchived);
+		$groupBoards = $this->boardMapper->findAllByGroups($userInfo['user'], $userInfo['groups'],null, null,  $since);
-		$circleBoards = $this->boardMapper->findAllByCircles($userInfo['user'], null, null,  $since, $includeArchived);
+		$circleBoards = $this->boardMapper->findAllByCircles($userInfo['user'], null, null,  $since);
 		$mergedBoards = array_merge($userBoards, $groupBoards, $circleBoards);
 		$result = [];
 		/** @var Board $item */
@@ -125,11 +125,11 @@ class BoardService {
 	/**
 	 * @return array
 	 */
-	public function findAll($since = -1, $details = null, $includeArchived = true) {
+	public function findAll($since = -1, $details = null) {
 		if ($this->boardsCache) {
 			return $this->boardsCache;
 		}
-		$complete = $this->getUserBoards($since, $includeArchived);
+		$complete = $this->getUserBoards($since);
 		$result = [];
 		/** @var Board $item */
 		foreach ($complete as &$item) {

lib/Service/CardService.php

@@ -415,11 +415,8 @@ class CardService {
 		if ($card->getArchived()) {
 			throw new StatusException('Operation not allowed. This card is archived.');
 		}
-		$changes = new ChangeSet($card);
 		$card->setStackId($stackId);
 		$this->cardMapper->update($card);
-		$changes->setAfter($card);
-		$this->activityManager->triggerUpdateEvents(ActivityManager::DECK_OBJECT_CARD, $changes, ActivityManager::SUBJECT_CARD_UPDATE);
 
 		$cards = $this->cardMapper->findAll($stackId);
 		$result = [];

package.json

@@ -33,30 +33,29 @@
 		"@juliushaertl/vue-richtext": "^0.3.3",
 		"@nextcloud/auth": "^1.3.0",
 		"@nextcloud/axios": "^1.4.0",
-		"@nextcloud/dialogs": "^3.0.0",
+		"@nextcloud/dialogs": "^2.0.1",
-		"@nextcloud/event-bus": "^1.2.0",
 		"@nextcloud/files": "^1.1.0",
-		"@nextcloud/initial-state": "^1.2.0",
+		"@nextcloud/initial-state": "^1.1.2",
 		"@nextcloud/l10n": "^1.4.1",
 		"@nextcloud/moment": "^1.1.1",
 		"@nextcloud/router": "^1.2.0",
-		"@nextcloud/vue": "^2.7.0",
+		"@nextcloud/vue": "^2.6.5",
 		"@nextcloud/vue-dashboard": "^1.0.1",
 		"blueimp-md5": "^2.18.0",
-		"dompurify": "^2.1.1",
+		"dompurify": "^2.0.16",
 		"lodash": "^4.17.20",
 		"markdown-it": "^11.0.1",
 		"markdown-it-task-lists": "^2.1.1",
-		"moment": "^2.29.1",
+		"moment": "^2.28.0",
 		"nextcloud-vue-collections": "^0.8.1",
 		"p-queue": "^6.6.1",
 		"url-search-params-polyfill": "^8.1.0",
 		"vue": "^2.6.12",
 		"vue-at": "^2.5.0-beta.2",
 		"vue-click-outside": "^1.1.0",
-		"vue-easymde": "^1.3.0",
+		"vue-easymde": "^1.2.2",
 		"vue-infinite-loading": "^2.4.5",
-		"vue-router": "^3.4.6",
+		"vue-router": "^3.4.3",
 		"vue-smooth-dnd": "^0.8.1",
 		"vuex": "^3.5.1",
 		"vuex-router-sync": "^5.0.0"
@@ -73,44 +72,44 @@
 		"@babel/preset-env": "^7.11.5",
 		"@nextcloud/browserslist-config": "^1.0.0",
 		"@nextcloud/eslint-config": "^2.1.0",
-		"@nextcloud/eslint-plugin": "^1.5.0",
+		"@nextcloud/eslint-plugin": "^1.4.0",
 		"@nextcloud/webpack-vue-config": "^1.4.1",
 		"@vue/test-utils": "^1.1.0",
-		"acorn": "^8.0.4",
+		"acorn": "^8.0.1",
 		"babel-eslint": "^10.1.0",
-		"babel-jest": "^26.5.2",
+		"babel-jest": "^26.3.0",
 		"babel-loader": "^8.1.0",
 		"css-loader": "^4.3.0",
 		"eslint": "^6.8.0",
 		"eslint-config-standard": "^12.0.0",
 		"eslint-friendly-formatter": "^4.0.1",
 		"eslint-loader": "^3.0.4",
-		"eslint-plugin-import": "^2.22.1",
+		"eslint-plugin-import": "^2.22.0",
 		"eslint-plugin-node": "^11.1.0",
 		"eslint-plugin-promise": "^4.2.1",
 		"eslint-plugin-standard": "^4.0.1",
 		"eslint-plugin-vue": "^6.2.2",
-		"file-loader": "^6.1.1",
+		"file-loader": "^6.1.0",
-		"jest": "^26.5.2",
+		"jest": "^26.4.2",
 		"jest-serializer-vue": "^2.0.2",
 		"minimist": "^1.2.5",
 		"node-sass": "^4.14.1",
-		"raw-loader": "^4.0.2",
+		"raw-loader": "^4.0.1",
-		"sass-loader": "^10.0.3",
+		"sass-loader": "^10.0.2",
-		"style-loader": "^1.3.0",
+		"style-loader": "^1.2.1",
-		"stylelint": "^13.7.2",
+		"stylelint": "^13.7.1",
 		"stylelint-config-recommended": "^3.0.0",
 		"stylelint-config-recommended-scss": "^4.2.0",
 		"stylelint-scss": "^3.18.0",
 		"stylelint-webpack-plugin": "^2.1.0",
-		"url-loader": "^4.1.1",
+		"url-loader": "^4.1.0",
 		"vue-jest": "^3.0.7",
 		"vue-loader": "^15.9.3",
 		"vue-template-compiler": "^2.6.12",
 		"webpack": "^4.44.2",
 		"webpack-cli": "^3.3.12",
 		"webpack-dev-server": "^3.11.0",
-		"webpack-merge": "^5.2.0"
+		"webpack-merge": "^5.1.4"
 	},
 	"jest": {
 		"moduleFileExtensions": [

src/components/Controls.vue

@@ -395,7 +395,6 @@ export default {
 		width: 250px;
 		max-height: 80vh;
 		overflow: auto;
-		padding: 8px;
 	}
 
 	.filter h3 {

src/components/board/SharingTabSidebar.vue

@@ -7,19 +7,10 @@
 			:options="formatedSharees"
 			:user-select="true"
 			label="displayName"
-			:loading="isLoading || !!isSearching"
-			:disabled="isLoading"
 			track-by="multiselectKey"
 			:internal-search="true"
 			@input="clickAddAcl"
-			@search-change="asyncFind">
+			@search-change="asyncFind" />
-			<template #noOptions>
-				{{ isSearching ? t('deck', 'Searching for users, groups and circles ...') : t('deck', 'No participants found') }}
-			</template>
-			<template #noResult>
-				{{ isSearching ? t('deck', 'Searching for users, groups and circles ...') : t('deck', 'No participants found') }}
-			</template>
-		</Multiselect>
 
 		<ul
 			id="shareWithList"
@@ -72,7 +63,6 @@ import { Avatar, Multiselect, Actions, ActionButton, ActionCheckbox } from '@nex
 import { CollectionList } from 'nextcloud-vue-collections'
 import { mapGetters, mapState } from 'vuex'
 import { getCurrentUser } from '@nextcloud/auth'
-import { showError } from '@nextcloud/dialogs'
 
 export default {
 	name: 'SharingTabSidebar',
@@ -93,7 +83,6 @@ export default {
 	data() {
 		return {
 			isLoading: false,
-			isSearching: false,
 			addAcl: null,
 			addAclForAPI: null,
 		}
@@ -113,7 +102,7 @@ export default {
 		formatedSharees() {
 			return this.unallocatedSharees.map(item => {
 				const sharee = {
-					user: item.value.shareWith,
+					user: item.label,
 					displayName: item.label,
 					icon: 'icon-user',
 					multiselectKey: item.shareType + ':' + item.primaryKey,
@@ -130,7 +119,7 @@ export default {
 
 				sharee.value = item.value
 				return sharee
-			}).slice(0, 10)
+			})
 		},
 		unallocatedSharees() {
 			return this.sharees.filter((sharee) => {
@@ -148,20 +137,13 @@ export default {
 		this.asyncFind('')
 	},
 	methods: {
-		async asyncFind(query) {
+		asyncFind(query) {
-			// manual debounce to handle async searching more easily and have more control over the loading state
+			this.isLoading = true
-			const timestamp = (new Date()).getTime()
+			this.$store.dispatch('loadSharees', query).then(response => {
-			if (!this.isSearching || timestamp > this.isSearching + 300) {
+				this.isLoading = false
-				this.isSearching = timestamp
+			})
-				await this.$store.dispatch('loadSharees', query)
-
-				// only reset searching flag if the most recent search finished
-				if (this.isSearching === timestamp) {
-					this.isSearching = false
-				}
-			}
 		},
-		async clickAddAcl() {
+		clickAddAcl() {
 			this.addAclForAPI = {
 				type: this.addAcl.value.shareType,
 				participant: this.addAcl.value.shareWith,
@@ -169,16 +151,7 @@ export default {
 				permissionShare: false,
 				permissionManage: false,
 			}
-			this.isLoading = true
+			this.$store.dispatch('addAclToCurrentBoard', this.addAclForAPI)
-			try {
-				await this.$store.dispatch('addAclToCurrentBoard', this.addAclForAPI)
-			} catch (e) {
-				const errorMessage = t('deck', 'Failed to create share with {displayName}', { displayName: this.addAcl.displayName })
-				console.error(errorMessage, e)
-				showError(errorMessage)
-			}
-			this.addAcl = null
-			this.isLoading = false
 		},
 		clickEditAcl(acl) {
 			this.addAclForAPI = Object.assign({}, acl)

src/components/card/CardSidebar.vue

@@ -120,6 +120,7 @@
 						:lang="lang"
 						:format="format"
 						:disabled="saving || !canEdit"
+						:shortcuts="shortcuts"
 						confirm />
 					<Actions v-if="canEdit">
 						<ActionButton v-if="copiedCard.duedate" icon="icon-delete" @click="removeDue()">
@@ -179,7 +180,7 @@
 			<CardSidebarTabAttachments :card="currentCard" />
 		</AppSidebarTab>
 
-		<AppSidebarTab
+		<AppSidebarTab v-if="hasComments"
 			id="comments"
 			:order="2"
 			:name="t('deck', 'Comments')"
@@ -283,6 +284,7 @@ export default {
 			descriptionSaveTimeout: null,
 			descriptionSaving: false,
 			hasActivity: capabilities && capabilities.activity,
+			hasComments: !!OC.appswebroots['comments'],
 			modalShow: false,
 			lang: {
 				days: getDayNamesMin(),
@@ -298,6 +300,23 @@ export default {
 				stringify: this.stringify,
 				parse: this.parse,
 			},
+			shortcuts: [
+				{
+					text: 'Today',
+					onClick() {
+						const date = new Date()
+						return date
+					},
+				},
+				{
+					text: 'Tomorrow',
+					onClick() {
+						const date = new Date()
+						date.setTime(date.getTime() + 3600 * 1000 * 24)
+						return date
+					},
+				},
+			],
 		}
 	},
 	computed: {

src/components/cards/CardItem.vue

@@ -118,7 +118,7 @@ export default {
 				return this.$store.getters.canEdit
 			}
 			const board = this.$store.getters.boards.find((item) => item.id === this.card.boardId)
-			return board ? board.permissions.PERMISSION_EDIT : false
+			return board.permissions.PERMISSION_EDIT
 		},
 		card() {
 			return this.item ? this.item : this.$store.getters.cardById(this.id)

src/main.js

@@ -27,7 +27,6 @@ import { sync } from 'vuex-router-sync'
 import { translate, translatePlural } from '@nextcloud/l10n'
 import { generateFilePath } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
-import { subscribe } from '@nextcloud/event-bus'
 import { Tooltip } from '@nextcloud/vue'
 import ClickOutside from 'vue-click-outside'
 import './models'
@@ -75,17 +74,8 @@ new Vue({
 		}
 	},
 	created() {
-		subscribe('nextcloud:unified-search.search', ({ query }) => {
-			this.$store.commit('setSearchQuery', query)
-		})
-		subscribe('nextcloud:unified-search.reset', () => {
-			this.$store.commit('setSearchQuery', '')
-		})
-
-		// FIXME remove this once Nextcloud 20 is minimum required version
 		// eslint-disable-next-line
 		new OCA.Search(this.filter, this.cleanSearch)
-
 		this.interval = setInterval(() => {
 			this.time = Date.now()
 		}, 1000)

src/store/main.js

@@ -34,6 +34,7 @@ import comment from './comment'
 import trashbin from './trashbin'
 import attachment from './attachment'
 import overview from './overview'
+import debounce from 'lodash/debounce'
 Vue.use(Vuex)
 
 const apiClient = new BoardApi()
@@ -391,7 +392,7 @@ export default new Vuex.Store({
 			const boards = await apiClient.loadBoards()
 			commit('setBoards', boards)
 		},
-		async loadSharees({ commit }, query) {
+		loadSharees: debounce(function({ commit }, query) {
 			const params = new URLSearchParams()
 			if (typeof query === 'undefined') {
 				return
@@ -401,9 +402,10 @@ export default new Vuex.Store({
 			params.append('perPage', 20)
 			params.append('itemType', [0, 1, 7])
 
-			const response = await axios.get(generateOcsUrl('apps/files_sharing/api/v1') + 'sharees', { params })
+			axios.get(generateOcsUrl('apps/files_sharing/api/v1') + 'sharees', { params }).then((response) => {
-			commit('setSharees', response.data.ocs.data)
+				commit('setSharees', response.data.ocs.data)
-		},
+			})
+		}, 250),
 
 		setBoardFilter({ commmit }, filter) {
 			commmit('setBoardFilter', filter)
@@ -452,11 +454,13 @@ export default new Vuex.Store({
 		},
 
 		// acl actions
-		async addAclToCurrentBoard({ dispatch, commit }, newAcl) {
+		addAclToCurrentBoard({ dispatch, commit }, newAcl) {
 			newAcl.boardId = this.state.currentBoard.id
-			const result = await apiClient.addAcl(newAcl)
+			apiClient.addAcl(newAcl)
-			commit('addAclToCurrentBoard', result)
+				.then((returnAcl) => {
-			dispatch('refreshBoard', newAcl.boardId)
+					commit('addAclToCurrentBoard', returnAcl)
+					dispatch('refreshBoard', newAcl.boardId)
+				})
 		},
 		updateAclFromCurrentBoard({ commit }, acl) {
 			acl.boardId = this.state.currentBoard.id

tests/unit/Activity/DeckProviderTest.php

@@ -287,7 +287,7 @@ class DeckProviderTest extends TestCase {
 		$this->assertEquals('test string Card', $event->getParsedSubject());
 		$this->assertEquals('test string {card}', $event->getRichSubject());
 		$this->assertEquals('BCD', $event->getMessage());
-		$this->assertEquals('BCD', $event->getParsedMessage());
+		$this->assertEquals('<pre class="visualdiff"><del>A</del>BC<ins>D</ins></pre>', $event->getParsedMessage());
 	}
 
 	public function testParseParamForBoard() {