From 6789e8564ac278df8faddce21e522287b20342c5 Mon Sep 17 00:00:00 2001 From: Christoph Jahn Date: Wed, 19 Jun 2019 06:57:58 +0200 Subject: [PATCH 1/3] Fixed bug #2501 card.move needs boardId as first parameter --- server/rulesHelper.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/rulesHelper.js b/server/rulesHelper.js index 197e3756f..2188d9316 100644 --- a/server/rulesHelper.js +++ b/server/rulesHelper.js @@ -51,7 +51,7 @@ RulesHelper = { listId = list._id; } const minOrder = _.min(list.cardsUnfiltered(card.swimlaneId).map((c) => c.sort)); - card.move(card.swimlaneId, listId, minOrder - 1); + card.move(boardId, card.swimlaneId, listId, minOrder - 1); } if(action.actionType === 'moveCardToBottom'){ let listId; @@ -64,7 +64,7 @@ RulesHelper = { listId = list._id; } const maxOrder = _.max(list.cardsUnfiltered(card.swimlaneId).map((c) => c.sort)); - card.move(card.swimlaneId, listId, maxOrder + 1); + card.move(boardId, card.swimlaneId, listId, maxOrder + 1); } if(action.actionType === 'sendEmail'){ const to = action.emailTo; From 51a0dd88613b9a64e6efc0a27f4638c480803990 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 19 Jun 2019 11:36:13 +0300 Subject: [PATCH 2/3] [Fixed bug: rule doesn't move card to top/bottom](https://github.com/wekan/wekan/pull/2502). Thanks to road42 ! Closes #2501 --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0850928a2..e6a4e48ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# Upcoming Wekan release + +This release fixes the following bugs: + +- [Fixed bug: rule doesn't move card to top/bottom](https://github.com/wekan/wekan/pull/2502). + Thanks to road42. + +Thanks to above GitHub users for their contributions and translators for their translations. + # v2.84 2019-06-18 Wekan release This release fixes the following bugs: From 56e5585730750063771406ef512b05348fb22c82 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 19 Jun 2019 11:41:59 +0300 Subject: [PATCH 3/3] v2.85 --- CHANGELOG.md | 2 +- Stackerfile.yml | 2 +- package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6a4e48ce..91f86d0d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan release +# v2.85 2019-06-19 Wekan release This release fixes the following bugs: diff --git a/Stackerfile.yml b/Stackerfile.yml index 8b916ad4b..a820b6c69 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v2.84.0" +appVersion: "v2.85.0" files: userUploads: - README.md diff --git a/package.json b/package.json index 63c9bfddd..d5fe29193 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v2.84.0", + "version": "v2.85.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index e5d60fb54..70c24b1d6 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = ( appTitle = (defaultText = "Wekan"), # The name of the app as it is displayed to the user. - appVersion = 286, + appVersion = 287, # Increment this for every release. - appMarketingVersion = (defaultText = "2.84.0~2019-06-18"), + appMarketingVersion = (defaultText = "2.85.0~2019-06-19"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0,