Merge remote-tracking branch 'upstream/master' into devel

Updated to upstream master 1.43

10 files changed, 51 insertions, 15 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9cdced9..8450e616 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,23 @@
+# v1.43 2018-09-06 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix "No Comments" permission on Wekan and Trello import](https://github.com/wekan/wekan/commit/0a001d505d81961e6bd6715d885fffee0adb702d).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.42 2018-09-06 Wekan release
+
+This release adds the following new features:
+
+- REST API: [Create board options to be modifiable](https://github.com/wekan/wekan/commit/9cea76e4efaacaebcb2e9f0690dfeb4ef6d62527),
+  like permissions, public/private board - now private by default,
+  and board background color.
+  Docs at https://github.com/wekan/wekan/wiki/REST-API-Boards
+- [Add swimlaneId in activity. Create default swimlaneId in API](https://github.com/wekan/wekan/pull/1876).
+
+Thanks to GitHub users andresmanelli and xet7 for their contributions.
+
 # v1.41 2018-09-05 Wekan release
 
 This release tries to fix the following bugs:
diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json
index 986fe230..19d0c2d6 100644
--- a/i18n/fr.i18n.json
+++ b/i18n/fr.i18n.json
@@ -171,8 +171,8 @@
     "comment-placeholder": "Écrire un commentaire",
     "comment-only": "Commentaire uniquement",
     "comment-only-desc": "Ne peut que commenter des cartes.",
-    "no-comments": "No comments",
-    "no-comments-desc": "Can not see comments and activities.",
+    "no-comments": "Aucun commentaire",
+    "no-comments-desc": "Ne peut pas voir les commentaires et les activités.",
     "computer": "Ordinateur",
     "confirm-subtask-delete-dialog": "Êtes-vous sûr de vouloir supprimer la sous-tâche ?",
     "confirm-checklist-delete-dialog": "Êtes-vous sûr de vouloir supprimer la checklist ?",
diff --git a/models/activities.js b/models/activities.js
index 5b54759c..2228f66e 100644
--- a/models/activities.js
+++ b/models/activities.js
@@ -117,6 +117,9 @@ if (Meteor.isServer) {
       params.url = card.absoluteUrl();
       params.cardId = activity.cardId;
     }
+    if (activity.swimlaneId) {
+      params.swimlaneId = activity.swimlaneId;
+    }
     if (activity.commentId) {
       const comment = activity.comment();
       params.comment = comment.text;
diff --git a/models/boards.js b/models/boards.js
index 71049bd9..2a21d6da 100644
--- a/models/boards.js
+++ b/models/boards.js
@@ -846,19 +846,24 @@ if (Meteor.isServer) {
         members: [
           {
             userId: req.body.owner,
-            isAdmin: true,
-            isActive: true,
-            isNoComments: false,
-            isCommentOnly: false,
+            isAdmin: req.body.isAdmin || true,
+            isActive: req.body.isActive || true,
+            isNoComments: req.body.isNoComments || false,
+            isCommentOnly: req.body.isCommentOnly || false,
           },
         ],
-        permission: 'public',
-        color: 'belize',
+        permission: req.body.permission || 'private',
+        color: req.body.color || 'belize',
+      });
+      const swimlaneId = Swimlanes.insert({
+        title: TAPi18n.__('default'),
+        boardId: id,
       });
       JsonRoutes.sendResult(res, {
         code: 200,
         data: {
           _id: id,
+          defaultSwimlaneId: swimlaneId,
         },
       });
     }
diff --git a/models/cards.js b/models/cards.js
index 11f08283..927ca9ce 100644
--- a/models/cards.js
+++ b/models/cards.js
@@ -914,8 +914,9 @@ Cards.mutations({
 
 //FUNCTIONS FOR creation of Activities
 
-function cardMove(userId, doc, fieldNames, oldListId) {
-  if (_.contains(fieldNames, 'listId') && doc.listId !== oldListId) {
+function cardMove(userId, doc, fieldNames, oldListId, oldSwimlaneId) {
+  if ((_.contains(fieldNames, 'listId') && doc.listId !== oldListId) ||
+      (_.contains(fieldNames, 'swimlaneId') && doc.swimlaneId !== oldSwimlaneId)){
     Activities.insert({
       userId,
       oldListId,
@@ -923,6 +924,8 @@ function cardMove(userId, doc, fieldNames, oldListId) {
       listId: doc.listId,
       boardId: doc.boardId,
       cardId: doc._id,
+      swimlaneId: doc.swimlaneId,
+      oldSwimlaneId,
     });
   }
 }
@@ -990,6 +993,7 @@ function cardCreation(userId, doc) {
     boardId: doc.boardId,
     listId: doc.listId,
     cardId: doc._id,
+    swimlaneId: doc.swimlaneId,
   });
 }
 
@@ -1037,7 +1041,8 @@ if (Meteor.isServer) {
   //New activity for card moves
   Cards.after.update(function (userId, doc, fieldNames) {
     const oldListId = this.previous.listId;
-    cardMove(userId, doc, fieldNames, oldListId);
+    const oldSwimlaneId = this.previous.swimlaneId;
+    cardMove(userId, doc, fieldNames, oldListId, oldSwimlaneId);
   });
 
   // Add a new activity if we add or remove a member to the card
diff --git a/models/trelloCreator.js b/models/trelloCreator.js
index 30f0bc2b..b5a255cc 100644
--- a/models/trelloCreator.js
+++ b/models/trelloCreator.js
@@ -150,6 +150,7 @@ export class TrelloCreator {
         userId: Meteor.userId(),
         isAdmin: true,
         isActive: true,
+        isNoComments: false,
         isCommentOnly: false,
         swimlaneId: false,
       }],
@@ -177,6 +178,7 @@ export class TrelloCreator {
               userId: wekanId,
               isAdmin: this.getAdmin(trelloMembership.memberType),
               isActive: true,
+              isNoComments: false,
               isCommentOnly: false,
               swimlaneId: false,
             });
diff --git a/models/wekanCreator.js b/models/wekanCreator.js
index 4551979b..d144821f 100644
--- a/models/wekanCreator.js
+++ b/models/wekanCreator.js
@@ -160,6 +160,7 @@ export class WekanCreator {
         wekanId: Meteor.userId(),
         isActive: true,
         isAdmin: true,
+        isNoComments: false,
         isCommentOnly: false,
         swimlaneId: false,
       }],
diff --git a/package.json b/package.json
index 0ea2c6f7..41ae0bbb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "1.41.0",
+  "version": "1.43.0",
   "description": "The open-source kanban",
   "private": true,
   "scripts": {
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index f7c92a82..fb0507b5 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 = 126,
+    appVersion = 128,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "1.41.0~2018-09-05"),
+    appMarketingVersion = (defaultText = "1.43.0~2018-09-06"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,
diff --git a/server/notifications/outgoing.js b/server/notifications/outgoing.js
index b35b3b2e..aac8749e 100644
--- a/server/notifications/outgoing.js
+++ b/server/notifications/outgoing.js
@@ -8,7 +8,7 @@ const postCatchError = Meteor.wrapAsync((url, options, resolve) => {
   });
 });
 
-const webhooksAtbts = ( (process.env.WEBHOOKS_ATTRIBUTES && process.env.WEBHOOKS_ATTRIBUTES.split(',') ) || ['cardId', 'listId', 'oldListId', 'boardId', 'comment', 'user', 'card', 'commentId']);
+const webhooksAtbts = ( (process.env.WEBHOOKS_ATTRIBUTES && process.env.WEBHOOKS_ATTRIBUTES.split(',') ) || ['cardId', 'listId', 'oldListId', 'boardId', 'comment', 'user', 'card', 'commentId', 'swimlaneId']);
 
 Meteor.methods({
   outgoingWebhooks(integrations, description, params) {