Merge branch 'edge' into devel

CHANGELOG.md

@@ -1,3 +1,10 @@
+# Upcoming Wekan release
+
+This release fixes the following bugs:
+
+- [Add proper variables for unjoin card](https://github.com/wekan/wekan/pull/2313).
+  Thanks to chotaire.
+
 # v2.57 2019-04-02 Wekan release
 
 This release fixes the following bugs, thanks to justinr1234:

i18n/de.i18n.json

@@ -576,16 +576,16 @@
     "r-rule": "Regel",
     "r-add-trigger": "Auslöser hinzufügen",
     "r-add-action": "Aktion hinzufügen",
-    "r-board-rules": "Board Regeln",
+    "r-board-rules": "Boardregeln",
     "r-add-rule": "Regel hinzufügen",
     "r-view-rule": "Regel anzeigen",
     "r-delete-rule": "Regel löschen",
     "r-new-rule-name": "Neuer Regeltitel",
     "r-no-rules": "Keine Regeln",
-    "r-when-a-card": "Wenn eine Karte",
-    "r-is": "ist",
+    "r-when-a-card": "Wenn Karte",
+    "r-is": "wird",
     "r-is-moved": "verschoben wird",
-    "r-added-to": "hinzugefügt wird zu",
+    "r-added-to": "hinzugefügt zu",
     "r-removed-from": "Entfernt von",
     "r-the-board": "das Board",
     "r-list": "Liste",

models/cards.js

@@ -1403,6 +1403,9 @@ function cardMembers(userId, doc, fieldNames, modifier) {
         activityType: 'unjoinMember',
         boardId: doc.boardId,
         cardId: doc._id,
+        memberId,
+        listId: doc.listId,
+        swimlaneId: doc.swimlaneId,
       });
     }
   }