From b267015d8cf3c8dac459c430b95b4426c4c4ce65 Mon Sep 17 00:00:00 2001 From: ViViDboarder Date: Tue, 6 Feb 2018 19:33:32 -0800 Subject: Fixing cards query to apply sort Issue #1461 --- models/lists.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/lists.js b/models/lists.js index 7ed27361..7333db94 100644 --- a/models/lists.js +++ b/models/lists.js @@ -82,8 +82,8 @@ Lists.helpers({ }; if (swimlaneId) selector.swimlaneId = swimlaneId; - return Cards.find(Filter.mongoSelector(selector, - { sort: ['sort'] })); + return Cards.find(Filter.mongoSelector(selector), + { sort: ['sort'] }); }, allCards() { -- cgit v1.2.3-1-g7c22 From fcebb2a5373d6dea41b98b530c176cbee31bee4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Manelli?= Date: Wed, 7 Feb 2018 01:18:08 -0300 Subject: Fix move parameters --- client/components/cards/cardDetails.js | 10 +++++----- models/cards.js | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 94a938f0..d70167ce 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -172,13 +172,13 @@ Template.cardDetailsActionsPopup.events({ 'click .js-copy-card': Popup.open('copyCard'), 'click .js-move-card-to-top' (evt) { evt.preventDefault(); - const minOrder = _.min(this.list().cards().map((c) => c.sort)); - this.move(this.listId, minOrder - 1); + const minOrder = _.min(this.list().cards(this.swimlaneId).map((c) => c.sort)); + this.move(this.swimlaneId, this.listId, minOrder - 1); }, 'click .js-move-card-to-bottom' (evt) { evt.preventDefault(); - const maxOrder = _.max(this.list().cards().map((c) => c.sort)); - this.move(this.listId, maxOrder + 1); + const maxOrder = _.max(this.list().cards(this.swimlaneId).map((c) => c.sort)); + this.move(this.swimlaneId, this.listId, maxOrder + 1); }, 'click .js-archive' (evt) { evt.preventDefault(); @@ -215,7 +215,7 @@ Template.moveCardPopup.events({ // instead from a “component” state. const card = Cards.findOne(Session.get('currentCard')); const newListId = this._id; - card.move(newListId); + card.move(card.swimlaneId, newListId, 0); Popup.close(); }, }); diff --git a/models/cards.js b/models/cards.js index d175a430..43e7d843 100644 --- a/models/cards.js +++ b/models/cards.js @@ -225,10 +225,9 @@ Cards.mutations({ swimlaneId, listId, boardId: list.boardId, + sort: sortIndex, }; - if (sortIndex) { - mutatedFields.sort = sortIndex; - } + return {$set: mutatedFields}; }, -- cgit v1.2.3-1-g7c22 From 5871a478e1280818f12fcb7250b7cbccf6907cf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Manelli?= Date: Wed, 7 Feb 2018 01:47:18 -0300 Subject: Fix import Trello board without swimlanes --- models/trelloCreator.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/models/trelloCreator.js b/models/trelloCreator.js index 972673e6..2d85ee71 100644 --- a/models/trelloCreator.js +++ b/models/trelloCreator.js @@ -23,6 +23,8 @@ export class TrelloCreator { // Map of labels Trello ID => Wekan ID this.labels = {}; + // Default swimlane + this.swimlane = null; // Map of lists Trello ID => Wekan ID this.lists = {}; // Map of cards Trello ID => Wekan ID @@ -230,6 +232,7 @@ export class TrelloCreator { dateLastActivity: this._now(), description: card.desc, listId: this.lists[card.idList], + swimlaneId: this.swimlane, sort: card.pos, title: card.name, // we attribute the card to its creator if available @@ -397,6 +400,22 @@ export class TrelloCreator { }); } + createSwimlanes(boardId) { + const swimlaneToCreate = { + archived: false, + boardId, + // We are being defensing here by providing a default date (now) if the + // creation date wasn't found on the action log. This happen on old + // Wekan boards (eg from 2013) that didn't log the 'createList' action + // we require. + createdAt: this._now(), + title: 'Default', + }; + const swimlaneId = Swimlanes.direct.insert(swimlaneToCreate); + Swimlanes.direct.update(swimlaneId, {$set: {'updatedAt': this._now()}}); + this.swimlane = swimlaneId; + } + createChecklists(trelloChecklists) { trelloChecklists.forEach((checklist) => { if (this.cards[checklist.idCard]) { @@ -607,6 +626,7 @@ export class TrelloCreator { this.parseActions(board.actions); const boardId = this.createBoardAndLabels(board); this.createLists(board.lists, boardId); + this.createSwimlanes(boardId); this.createCards(board.cards, boardId); this.createChecklists(board.checklists); this.importActions(board.actions, boardId); -- cgit v1.2.3-1-g7c22 From ce1fd005170f0a8c63bc86b8c41a0b31eab57f52 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 7 Feb 2018 15:17:40 +0200 Subject: Update translations. --- i18n/de.i18n.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json index 2ba3f5d0..ae622728 100644 --- a/i18n/de.i18n.json +++ b/i18n/de.i18n.json @@ -106,7 +106,7 @@ "card-comments-title": "Diese Karte hat %s Kommentar(e).", "card-delete-notice": "Löschen ist unwiderruflich. Alle Aktionen die dieser Karte zugeordnet sind werden ebenfalls gelöscht.", "card-delete-pop": "Alle Aktionen werden vom Aktivitätsfeed entfernt und die Karte kann nicht mehr geöffnet werden. Das Löschen kann nicht widerrufen werden!", - "card-delete-suggest-archive": "Sie können eine Karte archivieren, um sie von dem Board zu entfernen und die Aktivitäten zu behalten.", + "card-delete-suggest-archive": "Sie können eine Karte archivieren, um sie vom Board zu entfernen und die Aktivitäten zu behalten.", "card-due": "Ende", "card-due-on": "Ende am", "card-spent": "Aufgewendete Zeit", @@ -135,8 +135,8 @@ "changePermissionsPopup-title": "Berechtigungen ändern", "changeSettingsPopup-title": "Einstellungen ändern", "checklists": "Checklisten", - "click-to-star": "Klicken um dem Board einen Stern zu geben.", - "click-to-unstar": "Klicken um den Stern von dem Board zu entfernen.", + "click-to-star": "Klicken Sie, um das Board mit einem Stern zu markieren.", + "click-to-unstar": "Klicken Sie, um den Stern vom Board zu entfernen.", "clipboard": "Zwischenablage oder Drag & Drop", "close": "Schließen", "close-board": "Board schließen", @@ -219,7 +219,7 @@ "filter-no-label": "Kein Label", "filter-no-member": "Kein Mitglied", "filter-on": "Filter ist aktiv", - "filter-on-desc": "Sie filtern die Karten in diesem Board. Klicken um die Filter zu bearbeiten.", + "filter-on-desc": "Sie filtern die Karten in diesem Board. Klicken Sie, um den Filter zu bearbeiten.", "filter-to-selection": "Ergebnisse auswählen", "fullname": "Vollständiger Name", "header-logo-title": "Zurück zur Board Seite.", @@ -270,7 +270,7 @@ "listMorePopup-title": "Mehr", "link-list": "Link zu dieser Liste", "list-delete-pop": "Alle Aktionen werden aus dem Verlauf gelöscht. Die Liste kann nicht wiederhergestellt werden.", - "list-delete-suggest-archive": "Listen können archiviert werden um sie aus dem Board zu entfernen und den Verlauf zu erhalten.", + "list-delete-suggest-archive": "Listen können archiviert werden, um sie aus dem Board zu entfernen und den Verlauf zu erhalten.", "lists": "Listen", "swimlanes": "Swimlanes", "log-out": "Ausloggen", @@ -329,7 +329,7 @@ "save": "Speichern", "search": "Suchen", "select-color": "Farbe auswählen", - "set-wip-limit-value": "Setzen einer Limite für die maximale Anzahl Aufgaben in dieser Liste", + "set-wip-limit-value": "Setzen Sie ein Limit für die maximale Anzahl von Aufgaben in dieser Liste", "setWipLimitPopup-title": "WIP-Limit setzen", "shortcut-assign-self": "Fügen Sie sich zur aktuellen Karte hinzu", "shortcut-autocomplete-emoji": "Emojis vervollständigen", @@ -344,7 +344,7 @@ "sidebar-open": "Seitenleiste öffnen", "sidebar-close": "Seitenleiste schließen", "signupPopup-title": "Benutzerkonto erstellen", - "star-board-title": "Klicken um das Board mit einem Stern zu markieren. Es erscheint dann oben in ihrer Boardliste.", + "star-board-title": "Klicken Sie, um das Board mit einem Stern zu markieren. Es erscheint dann oben in ihrer Boardliste.", "starred-boards": "Markierte Boards", "starred-boards-description": "Markierte Boards erscheinen oben in ihrer Boardliste.", "subscribe": "Abonnieren", @@ -373,12 +373,12 @@ "watching": "Beobachten", "watching-info": "Sie werden über alle Änderungen in diesem Board benachrichtigt", "welcome-board": "Willkommen-Board", - "welcome-swimlane": "Milestone 1", + "welcome-swimlane": "Meilenstein 1", "welcome-list1": "Grundlagen", "welcome-list2": "Fortgeschritten", "what-to-do": "Was wollen Sie tun?", "wipLimitErrorPopup-title": "Ungültiges WIP-Limit", - "wipLimitErrorPopup-dialog-pt1": "Die Anzahl Aufgaben in dieser Liste ist grösser als das von Ihnen definierte WIP-Limit.", + "wipLimitErrorPopup-dialog-pt1": "Die Anzahl von Aufgaben in dieser Liste ist größer als das von Ihnen definierte WIP-Limit.", "wipLimitErrorPopup-dialog-pt2": "Bitte verschieben Sie einige Aufgaben aus dieser Liste oder setzen Sie ein grösseres WIP-Limit.", "admin-panel": "Administration", "settings": "Einstellungen", -- cgit v1.2.3-1-g7c22 From 92122f0fa2b9c793a13df08cc8c876bec5a13d42 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 7 Feb 2018 15:21:02 +0200 Subject: Fix card sorting. Thanks to ViViDboarder ! Closes #1461 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a181d45e..abb12fe9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Upcoming Wekan release + +This release fixes the following bugs: + +- [Fix card sorting](https://github.com/wekan/wekan/pull/1465). + +Thanks to GitHub user ViViDboarder for contributions. + # v0.71 2018-02-03 Wekan release This release fixes the following bugs: -- cgit v1.2.3-1-g7c22 From f795edc64087b80718ead000c1d04a2929b9f98c Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 7 Feb 2018 15:33:29 +0200 Subject: Fix import Trello board without swimlanes. Fix swimlane move parameters. Thanks to andresmanelli ! Closes #1442 --- CHANGELOG.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index abb12fe9..5fa175c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,15 +2,17 @@ This release fixes the following bugs: -- [Fix card sorting](https://github.com/wekan/wekan/pull/1465). +- [Fix card sorting](https://github.com/wekan/wekan/pull/1465); +- [Fix import Trello board without swimlanes](https://github.com/wekan/wekan/commit/5871a478e1280818f12fcb7250b7cbccf6907cf0); +- [Fix swimlane move parameters](https://github.com/wekan/wekan/commit/fcebb2a5373d6dea41b98b530c176cbee31bee4b). -Thanks to GitHub user ViViDboarder for contributions. +Thanks to GitHub users andresmanelli and ViViDboarder for their contributions. # v0.71 2018-02-03 Wekan release This release fixes the following bugs: -- [Fix Welcome board is not editable: Added default swimlane to Welcome board](https://github.com/wekan/wekan/commit/9df3e3d26bffb2268cdcc7fa768eda60e4f0975c). +- [Fix Welcome board is not editable: Added default swimlane to Welcome board](https://github.com/wekan/wekan/commit/9df3e3d26bffb2268cdcc7fa768eda60e4f0975c); - [Fix Import Wekan board with swimlanes](https://github.com/wekan/wekan/commit/ec0a8449ba98aea708e484d386e5a209e2be8fff). Thanks to GitHub user andresmanelli for contributions. -- cgit v1.2.3-1-g7c22 From b3d31588634b3ff01b113579a7a715f1f9f2f234 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 7 Feb 2018 15:37:02 +0200 Subject: v0.72 --- 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 5fa175c1..35d7675a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan release +# v0.72 2018-02-07 Wekan release This release fixes the following bugs: diff --git a/package.json b/package.json index e1f541ad..f88010ba 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "0.71.0", + "version": "0.72.0", "description": "The open-source Trello-like kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index ec33db58..75a2cbc2 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 = 56, + appVersion = 57, # Increment this for every release. - appMarketingVersion = (defaultText = "0.71.0~2018-02-03"), + appMarketingVersion = (defaultText = "0.72.0~2018-02-07"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, -- cgit v1.2.3-1-g7c22 From 3cb356eb1d0ccddf941b7daa6cbd319c273ed5b7 Mon Sep 17 00:00:00 2001 From: Ondrej Kubik Date: Thu, 8 Feb 2018 11:03:58 +0000 Subject: Fixing snap store rejection Signed-off-by: Ondrej Kubik --- snapcraft.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index ece489de..1a85f682 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -76,9 +76,8 @@ parts: - node-gyp - node-pre-gyp - fibers@2.0.0 - stage-packages: - - ca-certificates build-packages: + - ca-certificates - apt-utils - python - g++ @@ -118,6 +117,7 @@ parts: install: | cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/ cp .build/bundle/.node_version.txt $SNAPCRAFT_PART_INSTALL/ + rm $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan organize: README: README.wekan -- cgit v1.2.3-1-g7c22 From cea810157447355754329f8cd8793f0e80e0fe18 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 8 Feb 2018 13:35:40 +0200 Subject: Fix snap store rejection. Thanks to kubiko ! Closes wekan/wekan-snap#20, closes wekan/wekan-snap#27, closes wekan/wekan-snap#24 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35d7675a..ab40cad7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Upcoming Wekan release + +This release fixes the following bugs: + +- [Fix Ubuntu snap build](https://github.com/wekan/wekan/pull/1469). + +Thanks to GitHub user kubiko for contributions. + # v0.72 2018-02-07 Wekan release This release fixes the following bugs: -- cgit v1.2.3-1-g7c22 From edc2459ff85106ce21465467a64f53ac721ce5b4 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 8 Feb 2018 13:45:09 +0200 Subject: v0.73 --- 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 ab40cad7..fcf20b77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan release +# v0.73 2018-02-08 Wekan release This release fixes the following bugs: diff --git a/package.json b/package.json index f88010ba..dc20ce14 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "0.72.0", + "version": "0.73.0", "description": "The open-source Trello-like kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 75a2cbc2..3849d9e3 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 = 57, + appVersion = 58, # Increment this for every release. - appMarketingVersion = (defaultText = "0.72.0~2018-02-07"), + appMarketingVersion = (defaultText = "0.73.0~2018-02-08"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, -- cgit v1.2.3-1-g7c22