diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-06-19 11:43:23 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-06-19 11:43:23 +0300 |
commit | 2e1162ed73a08ecc3904ed12549d8017337660f2 (patch) | |
tree | 50d20f08974d3504fab08d712b3aa21e24360069 | |
parent | 8b6856fc89fc741f665b59ecac0178afd64b04fb (diff) | |
parent | 56e5585730750063771406ef512b05348fb22c82 (diff) | |
download | wekan-2e1162ed73a08ecc3904ed12549d8017337660f2.tar.gz wekan-2e1162ed73a08ecc3904ed12549d8017337660f2.tar.bz2 wekan-2e1162ed73a08ecc3904ed12549d8017337660f2.zip |
Merge branch 'edge' into meteor-1.8
-rw-r--r-- | CHANGELOG.md | 9 | ||||
-rw-r--r-- | Stackerfile.yml | 2 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | sandstorm-pkgdef.capnp | 4 | ||||
-rw-r--r-- | server/rulesHelper.js | 4 |
5 files changed, 15 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0850928a..91f86d0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# v2.85 2019-06-19 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: diff --git a/Stackerfile.yml b/Stackerfile.yml index 8b916ad4..a820b6c6 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 aa24757a..c28f19d5 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 e5d60fb5..70c24b1d 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, diff --git a/server/rulesHelper.js b/server/rulesHelper.js index 197e3756..2188d931 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; |