From 65c081acc0859e9cb2f09f9aa050258952403795 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Mon, 29 Jan 2018 12:07:42 +0200
Subject: [PATCH 1/2] Fix: Trello board import fails because of missing
 "Swimlane id". Thanks to xet7 ! Closes #1442

---
 CHANGELOG.md            | 8 ++++++++
 models/trelloCreator.js | 2 ++
 models/wekanCreator.js  | 1 +
 3 files changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d4496363..a0516fe09 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# Upcoming Wekan release
+
+This release fixes the following bugs:
+
+* [Fix: Trello board import fails because of missing "Swimlane id"](https://github.com/wekan/wekan/issues/1442).
+
+Thanks to GitHub user xet7 for contributions.
+
 # v0.67 2018-01-28 Wekan release
 
 This release fixes the following bugs:
diff --git a/models/trelloCreator.js b/models/trelloCreator.js
index 0f801ea36..972673e68 100644
--- a/models/trelloCreator.js
+++ b/models/trelloCreator.js
@@ -149,6 +149,7 @@ export class TrelloCreator {
         isAdmin: true,
         isActive: true,
         isCommentOnly: false,
+        swimlaneId: false,
       }],
       permission: this.getPermission(trelloBoard.prefs.permissionLevel),
       slug: getSlug(trelloBoard.name) || 'board',
@@ -175,6 +176,7 @@ export class TrelloCreator {
               isAdmin: this.getAdmin(trelloMembership.memberType),
               isActive: true,
               isCommentOnly: false,
+              swimlaneId: false,
             });
           }
         }
diff --git a/models/wekanCreator.js b/models/wekanCreator.js
index ae8e32ca5..b1533baa1 100644
--- a/models/wekanCreator.js
+++ b/models/wekanCreator.js
@@ -146,6 +146,7 @@ export class WekanCreator {
         isActive: true,
         isAdmin: true,
         isCommentOnly: false,
+        swimlaneId: false,
       }],
       // Standalone Export has modifiedAt missing, adding modifiedAt to fix it
       modifiedAt: this._now(boardToImport.modifiedAt),

From 23cba8a43f2efae57e57d4fab21dffd067e459b4 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Mon, 29 Jan 2018 12:10:31 +0200
Subject: [PATCH 2/2] v0.68

---
 CHANGELOG.md           | 2 +-
 package.json           | 2 +-
 sandstorm-pkgdef.capnp | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0516fe09..da19c7f85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Upcoming Wekan release
+# v0.68 Wekan release
 
 This release fixes the following bugs:
 
diff --git a/package.json b/package.json
index 5950f9296..6efbe2dc0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "0.67.0",
+  "version": "0.68.0",
   "description": "The open-source Trello-like kanban",
   "private": true,
   "scripts": {
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index 342afff24..3b6358646 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 = 52,
+    appVersion = 53,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "0.67.0~2018-01-28"),
+    appMarketingVersion = (defaultText = "0.68.0~2018-01-29"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,