diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-02-03 05:19:58 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-02-03 05:19:58 +0200 |
| commit | 3a845d13f856a5c9a6e698ea5443198a7475660b (patch) | |
| tree | 7b9394195f80ebea0fed0c30eecd2c77fc78441c | |
| parent | 2cb4df9e0b1c9b6626e9c1a28bf2f7e50a34f84e (diff) | |
| parent | 9a07649b8acaddf93dfd4b896a195aed159a2d55 (diff) | |
| download | wekan-3a845d13f856a5c9a6e698ea5443198a7475660b.tar.gz wekan-3a845d13f856a5c9a6e698ea5443198a7475660b.tar.bz2 wekan-3a845d13f856a5c9a6e698ea5443198a7475660b.zip | |
Merge branch 'edge' into meteor-1.8
| -rw-r--r-- | CHANGELOG.md | 11 | ||||
| -rw-r--r-- | Stackerfile.yml | 2 | ||||
| -rw-r--r-- | client/components/swimlanes/swimlanes.js | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | sandstorm-pkgdef.capnp | 4 |
5 files changed, 15 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index cf5f4a83..8e1a6502 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +# 2.16 2019-02-03 Wekan release + +This release fixes the following bugs: + +- [Part 2](https://github.com/ChronikEwok/wekan/commit/9a6ac544dd5618e58ce107352124fd9b495e5c30): + [Fix: Not displaying card content of public board: Snap, Docker and Sandstorm Shared Wekan Board + Link](https://github.com/wekan/wekan/issues/1623) with + [code from ChronikEwok](https://github.com/ChronikEwok/wekan/commit/cad9b20451bb6149bfb527a99b5001873b06c3de). + +Thanks to ChronikEwok for contributions. + # v2.15 2019-02-03 Wekan release This release fixes the following bugs: diff --git a/Stackerfile.yml b/Stackerfile.yml index bbda526e..b8ef52f1 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v2.15.0" +appVersion: "v2.16.0" files: userUploads: - README.md diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js index bf53fd28..ce327f54 100644 --- a/client/components/swimlanes/swimlanes.js +++ b/client/components/swimlanes/swimlanes.js @@ -5,8 +5,6 @@ function currentCardIsInThisList(listId, swimlaneId) { const currentUser = Meteor.user(); if (currentUser && currentUser.profile.boardView === 'board-view-swimlanes') return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId; - else if (currentUser.profile.boardView === 'board-view-cal') - return currentCard; else // Default view: board-view-lists return currentCard && currentCard.listId === listId; // https://github.com/wekan/wekan/issues/1623 diff --git a/package.json b/package.json index 5a9a6250..34277ba2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v2.15.0", + "version": "v2.16.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 5ecf7c71..b2653cda 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 = 217, + appVersion = 218, # Increment this for every release. - appMarketingVersion = (defaultText = "2.15.0~2019-02-03"), + appMarketingVersion = (defaultText = "2.16.0~2019-02-03"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, |