Merge branch 'edge' into meteor-1.8

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:

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

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v2.15.0",
+  "version": "v2.16.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {

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,