diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-04-06 07:44:03 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-04-06 07:44:03 +0300 |
| commit | 2b603cfbb5d939802425bafe7ca14299f685d176 (patch) | |
| tree | f03394f7cb13c8f7da5f09d477f796a171da3cc1 | |
| parent | e91c43466d514d4857f8f30fb80fbed7def5aed0 (diff) | |
| parent | a1fe22c08c157c6c795b008be3bf6b822497deb4 (diff) | |
| download | wekan-2b603cfbb5d939802425bafe7ca14299f685d176.tar.gz wekan-2b603cfbb5d939802425bafe7ca14299f685d176.tar.bz2 wekan-2b603cfbb5d939802425bafe7ca14299f685d176.zip | |
Merge branch 'edge' into devel
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | i18n/de.i18n.json | 8 | ||||
| -rw-r--r-- | models/cards.js | 3 |
3 files changed, 14 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index bdfbba1c..32f1a819 100644 --- a/CHANGELOG.md +++ b/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: diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json index 86a091eb..babd12c9 100644 --- a/i18n/de.i18n.json +++ b/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", diff --git a/models/cards.js b/models/cards.js index 12488354..047a760e 100644 --- a/models/cards.js +++ b/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, }); } } |