diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-06-24 00:18:14 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-06-24 00:18:14 +0300 |
| commit | 868587c40920ce8a36c90cbc48b328e32dbd313f (patch) | |
| tree | 95519a49d481ff666a162e816df593f649c2937f | |
| parent | 9d74a76ca22bdbb2b703a34f7546bce2097a0583 (diff) | |
| parent | 741a7887bd5eecf1f2dcf67691163956019ee720 (diff) | |
| download | wekan-868587c40920ce8a36c90cbc48b328e32dbd313f.tar.gz wekan-868587c40920ce8a36c90cbc48b328e32dbd313f.tar.bz2 wekan-868587c40920ce8a36c90cbc48b328e32dbd313f.zip | |
Merge branch 'GhassenRjab-fix-trello-import' into devel
Import due date from Trello. Thanks to GhassenRjab ! Closes #1081
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | models/import.js | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 196d9e11..64d802ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Upcoming Wekan release -This release fixes the following bugs: +This release adds the following new features: + +* [Import due date from Trello](https://github.com/wekan/wekan/pull/1082). + +and fixes the following bugs: * [Fix importing Trello board: Attribute correct members to their comments](https://github.com/wekan/wekan/pull/1080); diff --git a/models/import.js b/models/import.js index 709d1699..39a8835e 100644 --- a/models/import.js +++ b/models/import.js @@ -229,6 +229,7 @@ class TrelloCreator { title: card.name, // we attribute the card to its creator if available userId: this._user(this.createdBy.cards[card.id]), + dueAt: card.due ? this._now(card.due) : null, }; // add labels if (card.idLabels) { |