diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-03-02 12:38:02 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-03-02 12:38:02 +0200 |
| commit | a8ae6adbc26e38c1d15e74a9a1def082bc21be47 (patch) | |
| tree | 53abe1acb5b8baa1f20f21e3c81838cdcba83c26 | |
| parent | bbca361aeb8e0216d6fd9ace5ac17e777aad3524 (diff) | |
| parent | 946dcf0b0a9c4fa044d48b2b1cead6ac29b94b19 (diff) | |
| download | wekan-a8ae6adbc26e38c1d15e74a9a1def082bc21be47.tar.gz wekan-a8ae6adbc26e38c1d15e74a9a1def082bc21be47.tar.bz2 wekan-a8ae6adbc26e38c1d15e74a9a1def082bc21be47.zip | |
Merge branch 'GhassenRjab-hotfix/wekan-import' into devel
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | models/wekanCreator.js | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 77f69a75..9afdeceb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,16 @@ # Upcoming Wekan release -This release fixes the following bugs: +This release adds the following new features: + +- [Allow swimlanes reordering](https://github.com/wekan/wekan/commit/37c94622e476f50bf2387bc8b140454d66200e78); +- [Import missing card fields: isOvertime, startAt and spentTime](https://github.com/wekan/wekan/commit/b475127c53031fa498da139a7d16f3e54d43b90d). + +and fixes the following bugs: - [Fix lint errors related to sandstorm](https://github.com/wekan/wekan/commit/0a16147470246c8f49bb918f5ddc7bb2e54fba14); - [Add Swimlanes to globals](https://github.com/wekan/wekan/commit/373e9782dcf87a9c1169b5d1f8175ce14e4898c9); - [Fix lint errors related to trello creator](https://github.com/wekan/wekan/commit/951a0db380d60f3d948ae38d50b85a54983a51de); - [Fix lint errors related to language names](https://github.com/wekan/wekan/commit/c0d33d97f2c8d4e9371a03d4ad3022df3ed64d3d); -- [Allow swimlanes reordering](https://github.com/wekan/wekan/commit/37c94622e476f50bf2387bc8b140454d66200e78); - [Avoid swimlane title overlap](https://github.com/wekan/wekan/commit/c4fa9010f34966b633c7bf7e46ad49fc101127c9); - [Fix scrollbar inside list and outer scroll](https://github.com/wekan/wekan/commit/a033c35a3411902b9bf8f62a40cd68f641e573d3); - [Remove list max-height 350px](https://github.com/wekan/wekan/commit/b6d3e79548d1e88c93fa2965a936595176a95565); diff --git a/models/wekanCreator.js b/models/wekanCreator.js index d774db67..99d1df2d 100644 --- a/models/wekanCreator.js +++ b/models/wekanCreator.js @@ -228,7 +228,10 @@ export class WekanCreator { title: card.title, // we attribute the card to its creator if available userId: this._user(this.createdBy.cards[card._id]), + isOvertime: card.isOvertime || false, + startAt: card.startAt ? this._now(card.startAt) : null, dueAt: card.dueAt ? this._now(card.dueAt) : null, + spentTime: card.spentTime || null, }; // add labels if (card.labelIds) { |