From 4d1e6100dbcf2679082bf8170e6fbc839703ffe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Sat, 10 Nov 2018 09:56:16 +0100 Subject: [PATCH 1/5] Bump version to 0.5.0-rc1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- CHANGELOG.md | 3 +++ appinfo/info.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ebf4bbb2..5b1199add 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,11 +17,14 @@ All notable changes to this project will be documented in this file. - Notify users about card assignments - Add shortcut to assign a card to yourself - Improved view for printing +- Support for Nextcloud 15 ### Fixed - Accesibility improvements - Don't allow empty card titles +- Improved checkbox handling in markdown + ## 0.4.0 - 2018-07-11 diff --git a/appinfo/info.xml b/appinfo/info.xml index 5a958dbbb..fdd4fbc75 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -17,7 +17,7 @@ - 🚀 Get your project organized - 0.5.0-beta1 + 0.5.0-rc1 agpl Julius Härtl Deck From 24db3fbdc96956f6f99a22ce0f6f24f49e2cbb7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Sat, 10 Nov 2018 10:54:05 +0100 Subject: [PATCH 2/5] Add dependencies to info.xml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- appinfo/info.xml | 4 ++++ krankerl.toml | 2 ++ 2 files changed, 6 insertions(+) diff --git a/appinfo/info.xml b/appinfo/info.xml index fdd4fbc75..2cc15b471 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -32,6 +32,10 @@ https://download.bitgrid.net/nextcloud/deck/screenshots/Deck_Board.png https://download.bitgrid.net/nextcloud/deck/screenshots/Deck_Details.png + + pgsql + sqlite + mysql diff --git a/krankerl.toml b/krankerl.toml index 3d36507c2..a5e4fa631 100644 --- a/krankerl.toml +++ b/krankerl.toml @@ -15,6 +15,7 @@ exclude = [ "js/Gruntfile.js", "js/package.json", "js/package-lock.json", + "docs/", "tests", ".codecov.yml", "composer.json", @@ -28,6 +29,7 @@ exclude = [ "issue_template.md", "krankerl.toml", "Makefile", + "mkdocs.yml", "run-eslint.sh" ] From a56907862c3d1580e49a29a7c81f4d975718af11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Sat, 10 Nov 2018 11:04:15 +0100 Subject: [PATCH 3/5] Fix loading and activity warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/Activity/DeckProvider.php | 6 +++++- lib/Service/BoardService.php | 2 +- lib/Service/StackService.php | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/Activity/DeckProvider.php b/lib/Activity/DeckProvider.php index 844f1cb2d..7b2bc42e2 100644 --- a/lib/Activity/DeckProvider.php +++ b/lib/Activity/DeckProvider.php @@ -142,7 +142,11 @@ protected function setSubjects(IEvent $event, $subject, array $parameters) { $placeholders = $replacements = []; foreach ($parameters as $placeholder => $parameter) { $placeholders[] = '{' . $placeholder . '}'; - $replacements[] = $parameter['name']; + if (array_key_exists('name', $parameter)) { + $replacements[] = $parameter['name']; + } else { + $replacements[] = ''; + } } $event->setParsedSubject(str_replace($placeholders, $replacements, $subject)) diff --git a/lib/Service/BoardService.php b/lib/Service/BoardService.php index c2bbcb04a..3eba4ece6 100644 --- a/lib/Service/BoardService.php +++ b/lib/Service/BoardService.php @@ -88,7 +88,7 @@ public function __construct( /** * @return array */ - public function findAll($since = 0) { + public function findAll($since = -1) { $userInfo = $this->getBoardPrerequisites(); $userBoards = $this->boardMapper->findAllByUser($userInfo['user'], null, null, $since); $groupBoards = $this->boardMapper->findAllByGroups($userInfo['user'], $userInfo['groups'],null, null, $since); diff --git a/lib/Service/StackService.php b/lib/Service/StackService.php index c9cc04f21..2e6b27e47 100644 --- a/lib/Service/StackService.php +++ b/lib/Service/StackService.php @@ -127,7 +127,7 @@ public function find($stackId) { * @throws \OCA\Deck\NoPermissionException * @throws BadRequestException */ - public function findAll($boardId, $since = 0) { + public function findAll($boardId, $since = -1) { if (is_numeric($boardId) === false) { throw new BadRequestException('boardId must be a number'); } From b4929e1b45d1cc52f9e784b55ef9b2ac93140160 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Sat, 10 Nov 2018 11:09:20 +0100 Subject: [PATCH 4/5] Conditional loading for activity templates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- templates/main.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/main.php b/templates/main.php index 288c518c6..87092f1a7 100644 --- a/templates/main.php +++ b/templates/main.php @@ -24,7 +24,9 @@ use OCP\Util; Util::addScript('activity', 'richObjectStringParser'); -Util::addScript('activity', 'templates'); +if (\OC_Util::getVersion()[0] > 14) { + Util::addScript('activity', 'templates'); +} Util::addScript('activity', 'script'); Util::addStyle('activity', 'style'); From 4aea8817dfc7f23d2f6daf788fbb099c73027497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Sat, 10 Nov 2018 11:11:03 +0100 Subject: [PATCH 5/5] Fix tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/Activity/DeckProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Activity/DeckProvider.php b/lib/Activity/DeckProvider.php index 7b2bc42e2..e14dc55a2 100644 --- a/lib/Activity/DeckProvider.php +++ b/lib/Activity/DeckProvider.php @@ -142,7 +142,7 @@ protected function setSubjects(IEvent $event, $subject, array $parameters) { $placeholders = $replacements = []; foreach ($parameters as $placeholder => $parameter) { $placeholders[] = '{' . $placeholder . '}'; - if (array_key_exists('name', $parameter)) { + if (is_array($parameter) && array_key_exists('name', $parameter)) { $replacements[] = $parameter['name']; } else { $replacements[] = '';