From 8102ee5b4ffedc1cd640d6858fbd50fbb0cbbbc5 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 30 Jan 2018 15:18:27 +0200 Subject: Add release date to changelog. --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index da19c7f8..4a94ac1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ -# v0.68 Wekan release +# v0.68 2018-01-30 Wekan release This release fixes the following bugs: -* [Fix: Trello board import fails because of missing "Swimlane id"](https://github.com/wekan/wekan/issues/1442). +* [Partial fix: Trello board import fails because of missing "Swimlane id"](https://github.com/wekan/wekan/issues/1442), still needs some work. Thanks to GitHub user xet7 for contributions. -- cgit v1.2.3-1-g7c22 From f6fb05d3f49c656e9890351f5d7c0827bf2605c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Manelli?= Date: Wed, 31 Jan 2018 13:02:50 -0300 Subject: Fix card details bug --- client/components/swimlanes/swimlanes.jade | 2 +- client/components/swimlanes/swimlanes.js | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/client/components/swimlanes/swimlanes.jade b/client/components/swimlanes/swimlanes.jade index 77afa399..e6a0cd34 100644 --- a/client/components/swimlanes/swimlanes.jade +++ b/client/components/swimlanes/swimlanes.jade @@ -14,7 +14,7 @@ template(name="swimlane") else each currentBoard.lists +list(this) - if currentCardIsInThisList + if currentCardIsInThisList _id ../_id +cardDetails(currentCard) if currentUser.isBoardMember +addListForm diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js index 397f9e9b..68039b17 100644 --- a/client/components/swimlanes/swimlanes.js +++ b/client/components/swimlanes/swimlanes.js @@ -28,10 +28,9 @@ BlazeComponent.extendComponent({ }); }, - currentCardIsInThisList() { + currentCardIsInThisList(listId, swimlaneId) { const currentCard = Cards.findOne(Session.get('currentCard')); - const listId = this.currentData()._id; - return currentCard && currentCard.listId === listId; //TODO: AND IN THIS SWIMLANE + return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId; }, events() { -- cgit v1.2.3-1-g7c22 From d3c110cd8f3ad16a4ced5520c27ab542cc79b548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Manelli?= Date: Wed, 31 Jan 2018 14:12:08 -0300 Subject: Workaround to avoid drag bug --- client/components/lists/list.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/components/lists/list.js b/client/components/lists/list.js index e922a3fd..ce18ce14 100644 --- a/client/components/lists/list.js +++ b/client/components/lists/list.js @@ -18,7 +18,9 @@ BlazeComponent.extendComponent({ // callback, we basically solve all issues related to reactive updates. A // comment below provides further details. onRendered() { - const boardComponent = this.parentComponent().parentComponent(); + let boardComponent = this.parentComponent().parentComponent(); + if (!boardComponent) + boardComponent = this.parentComponent(); const itemsSelector = '.js-minicard:not(.placeholder, .js-card-composer)'; const $cards = this.$('.js-minicards'); $cards.sortable({ -- cgit v1.2.3-1-g7c22 From ff9ca755f338e3c45a1bd726dfbce1c607f2ff4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Manelli?= Date: Wed, 31 Jan 2018 15:46:59 -0300 Subject: Fix details view in lists only mode --- client/components/lists/listsGroup.js | 13 +++++++++++++ client/components/swimlanes/swimlanes.jade | 2 +- client/components/swimlanes/swimlanes.js | 9 ++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 client/components/lists/listsGroup.js diff --git a/client/components/lists/listsGroup.js b/client/components/lists/listsGroup.js new file mode 100644 index 00000000..f94f681f --- /dev/null +++ b/client/components/lists/listsGroup.js @@ -0,0 +1,13 @@ +BlazeComponent.extendComponent({ + currentCardIsInThisList(listId, swimlaneId) { + const currentCard = Cards.findOne(Session.get('currentCard')); + const currentBoardId = Session.get('currentBoard'); + const board = Boards.findOne(currentBoardId); + if (board.view === 'board-view-lists') + return currentCard && currentCard.listId === listId; + else if (board.view === 'board-view-swimlanes') + return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId; + else + return false; + }, +}).register('listsGroup'); diff --git a/client/components/swimlanes/swimlanes.jade b/client/components/swimlanes/swimlanes.jade index e6a0cd34..765f6d49 100644 --- a/client/components/swimlanes/swimlanes.jade +++ b/client/components/swimlanes/swimlanes.jade @@ -33,7 +33,7 @@ template(name="listsGroup") else each currentBoard.lists +list(this) - if currentCardIsInThisList + if currentCardIsInThisList _id null +cardDetails(currentCard) if currentUser.isBoardMember +addListForm diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js index 68039b17..211f84f2 100644 --- a/client/components/swimlanes/swimlanes.js +++ b/client/components/swimlanes/swimlanes.js @@ -30,7 +30,14 @@ BlazeComponent.extendComponent({ currentCardIsInThisList(listId, swimlaneId) { const currentCard = Cards.findOne(Session.get('currentCard')); - return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId; + const currentBoardId = Session.get('currentBoard'); + const board = Boards.findOne(currentBoardId); + if (board.view === 'board-view-lists') + return currentCard && currentCard.listId === listId; + else if (board.view === 'board-view-swimlanes') + return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId; + else + return false; }, events() { -- cgit v1.2.3-1-g7c22 From 8322500e47d96ed329dac3b157d8490de7ca5eb6 Mon Sep 17 00:00:00 2001 From: Rico Date: Wed, 31 Jan 2018 23:21:07 +0100 Subject: Fix typo in issue template --- .github/ISSUE_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 6a1a4fc6..a9e08009 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -10,7 +10,7 @@ * ROOT_URL environment variable (Is there a subfolder?): **Problem description**: -- *be as explicit has you can* +- *be as explicit as you can* - *describe the problem and its symptoms* - *explain how to reproduce* - *attach whatever information that can help understanding the context (screen capture, log files)* -- cgit v1.2.3-1-g7c22 From e0e6f06a832118e697bdcf2abe46dc2a13d88ac8 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 1 Feb 2018 15:59:22 +0200 Subject: Fix swimlanes card details and drag bugs. Thanks to andresmanelli ! --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a94ac1b..9b491f80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# Upcoming Wekan release + +This release fixes the following bugs: + +- [Fix swimlanes card details bug](https://github.com/wekan/wekan/commit/f6fb05d3f49c656e9890351f5d7c0827bf2605c1); +- [Workaround to avoid swimlanes drag bug](https://github.com/wekan/wekan/commit/d3c110cd8f3ad16a4ced5520c27ab542cc79b548); +- [Fix swimlanes details view in lists only mode](https://github.com/wekan/wekan/commit/ff9ca755f338e3c45a1bd726dfbce1c607f2ff4c). + +Thanks to GitHub user andresmanelli for contributions. + # v0.68 2018-01-30 Wekan release This release fixes the following bugs: -- cgit v1.2.3-1-g7c22 From 5dd8c9829d44e265eb1825f5393b377a53271ab5 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 1 Feb 2018 16:20:29 +0200 Subject: Update translations: Hebrew. Related #884 --- i18n/he.i18n.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json index 74abf889..631c5e6c 100644 --- a/i18n/he.i18n.json +++ b/i18n/he.i18n.json @@ -44,7 +44,7 @@ "add-attachment": "הוספת קובץ מצורף", "add-board": "הוספת לוח", "add-card": "הוספת כרטיס", - "add-swimlane": "Add Swimlane", + "add-swimlane": "הוסף מסלול שחייה", "add-checklist": "הוספת רשימת מטלות", "add-checklist-item": "הוספת פריט לרשימת משימות", "add-cover": "הוספת כיסוי", @@ -95,8 +95,8 @@ "boardChangeWatchPopup-title": "שינוי הגדרת המעקב", "boardMenuPopup-title": "תפריט לוח", "boards": "לוחות", - "board-view": "Board View", - "board-view-swimlanes": "Swimlanes", + "board-view": "תצוגת לוח", + "board-view-swimlanes": "מסלול שחייה", "board-view-lists": "רשימות", "bucket-example": "כמו למשל „רשימת המשימות“", "cancel": "ביטול", @@ -350,7 +350,7 @@ "overtime-hours": "שעות נוספות", "overtime": "שעות נוספות", "has-overtime-cards": "יש כרטיסי שעות נוספות", - "has-spenttime-cards": "Has spent time cards", + "has-spenttime-cards": "ניצל את כרטיסי הזמן שהושקע", "time": "זמן", "title": "כותרת", "tracking": "מעקב", -- cgit v1.2.3-1-g7c22 From 69dfa1033fc0e8da196751359991468541205c3d Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 1 Feb 2018 16:23:51 +0200 Subject: Fix typo in issue template. Thanks to d-Rickyy-b ! --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b491f80..4f7ffe0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,9 @@ This release fixes the following bugs: - [Fix swimlanes card details bug](https://github.com/wekan/wekan/commit/f6fb05d3f49c656e9890351f5d7c0827bf2605c1); - [Workaround to avoid swimlanes drag bug](https://github.com/wekan/wekan/commit/d3c110cd8f3ad16a4ced5520c27ab542cc79b548); - [Fix swimlanes details view in lists only mode](https://github.com/wekan/wekan/commit/ff9ca755f338e3c45a1bd726dfbce1c607f2ff4c). +- [Fix typo in issue template](https://github.com/wekan/wekan/pull/1451). -Thanks to GitHub user andresmanelli for contributions. +Thanks to GitHub user andresmanelli and d-Rickyy-b for their contributions. # v0.68 2018-01-30 Wekan release -- cgit v1.2.3-1-g7c22 From 66bfb1cdc86bd9fd57b25ca37e1ba8c2ae71bcb3 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 1 Feb 2018 16:24:57 +0200 Subject: Fix typo. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f7ffe0e..d788eea7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ This release fixes the following bugs: - [Fix swimlanes details view in lists only mode](https://github.com/wekan/wekan/commit/ff9ca755f338e3c45a1bd726dfbce1c607f2ff4c). - [Fix typo in issue template](https://github.com/wekan/wekan/pull/1451). -Thanks to GitHub user andresmanelli and d-Rickyy-b for their contributions. +Thanks to GitHub users andresmanelli and d-Rickyy-b for their contributions. # v0.68 2018-01-30 Wekan release -- cgit v1.2.3-1-g7c22 From d94f11c7786a48112bd9b024ef7794091b74bb40 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 1 Feb 2018 16:47:14 +0200 Subject: v0.69 --- CHANGELOG.md | 2 +- package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d788eea7..8552a64e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan release +# v0.69 2018-02-01 Wekan release This release fixes the following bugs: diff --git a/package.json b/package.json index 6efbe2dc..abaf94d4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "0.68.0", + "version": "0.69.0", "description": "The open-source Trello-like kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 3b635864..71f64fad 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 = 53, + appVersion = 54, # Increment this for every release. - appMarketingVersion = (defaultText = "0.68.0~2018-01-29"), + appMarketingVersion = (defaultText = "0.69.0~2018-02-01"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, -- cgit v1.2.3-1-g7c22