Merge branch 'devel'

CHANGELOG.md

@@ -1,3 +1,11 @@
+# v0.68 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:

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,
             });
           }
         }

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),

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": {

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,