summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-02-03 12:57:15 +0200
committerLauri Ojansivu <x@xet7.org>2018-02-03 12:57:15 +0200
commitb2d3138220d37e8e21e22e2437b888b490341eb9 (patch)
treecf031d4a87cd861574b9d9cf3577e9ada4ea96b7
parent405514fd6beeca7f17a4e58bfa0c28756468a8e2 (diff)
parent79ae90825e155a772124938ed12dd5e373e05f95 (diff)
downloadwekan-b2d3138220d37e8e21e22e2437b888b490341eb9.tar.gz
wekan-b2d3138220d37e8e21e22e2437b888b490341eb9.tar.bz2
wekan-b2d3138220d37e8e21e22e2437b888b490341eb9.zip
Merge branch 'devel'
-rw-r--r--CHANGELOG.md11
-rw-r--r--i18n/ar.i18n.json1
-rw-r--r--i18n/br.i18n.json1
-rw-r--r--i18n/ca.i18n.json1
-rw-r--r--i18n/cs.i18n.json1
-rw-r--r--i18n/de.i18n.json15
-rw-r--r--i18n/el.i18n.json1
-rw-r--r--i18n/en-GB.i18n.json1
-rw-r--r--i18n/en.i18n.json1
-rw-r--r--i18n/eo.i18n.json1
-rw-r--r--i18n/es-AR.i18n.json1
-rw-r--r--i18n/es.i18n.json1
-rw-r--r--i18n/eu.i18n.json1
-rw-r--r--i18n/fa.i18n.json1
-rw-r--r--i18n/fi.i18n.json1
-rw-r--r--i18n/fr.i18n.json1
-rw-r--r--i18n/gl.i18n.json1
-rw-r--r--i18n/he.i18n.json1
-rw-r--r--i18n/hu.i18n.json1
-rw-r--r--i18n/id.i18n.json1
-rw-r--r--i18n/ig.i18n.json1
-rw-r--r--i18n/it.i18n.json1
-rw-r--r--i18n/ja.i18n.json1
-rw-r--r--i18n/ko.i18n.json1
-rw-r--r--i18n/lv.i18n.json1
-rw-r--r--i18n/mn.i18n.json1
-rw-r--r--i18n/nb.i18n.json1
-rw-r--r--i18n/nl.i18n.json1
-rw-r--r--i18n/pl.i18n.json1
-rw-r--r--i18n/pt-BR.i18n.json1
-rw-r--r--i18n/pt.i18n.json1
-rw-r--r--i18n/ro.i18n.json1
-rw-r--r--i18n/ru.i18n.json1
-rw-r--r--i18n/sr.i18n.json1
-rw-r--r--i18n/sv.i18n.json1
-rw-r--r--i18n/ta.i18n.json1
-rw-r--r--i18n/th.i18n.json1
-rw-r--r--i18n/tr.i18n.json1
-rw-r--r--i18n/uk.i18n.json1
-rw-r--r--i18n/vi.i18n.json1
-rw-r--r--i18n/zh-CN.i18n.json1
-rw-r--r--i18n/zh-TW.i18n.json1
-rw-r--r--models/export.js1
-rw-r--r--models/users.js5
-rw-r--r--models/wekanCreator.js36
-rw-r--r--package.json2
-rw-r--r--sandstorm-pkgdef.capnp4
47 files changed, 103 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 951a4a2f..a181d45e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# 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 Import Wekan board with swimlanes](https://github.com/wekan/wekan/commit/ec0a8449ba98aea708e484d386e5a209e2be8fff).
+
+Thanks to GitHub user andresmanelli for contributions.
+
# v0.70 2018-02-02 Wekan release
This release adds the following new features:
@@ -5,7 +14,7 @@ This release adds the following new features:
- [Add ability to edit swimlane name](https://github.com/wekan/wekan/commit/3414cb84ad8ac800e23bbda6ce12822f40d1bd19);
- [Add swimlane popup menu and archive icon](https://github.com/wekan/wekan/commit/5953fb8a44a3582ed0d8816ffb32a5b7f41f50a3).
-and fixes following bugs:
+and fixes the following bugs:
- [Two empty columns in swimlane view](https://github.com/wekan/wekan/issues/1459).
diff --git a/i18n/ar.i18n.json b/i18n/ar.i18n.json
index 716a3524..933ab122 100644
--- a/i18n/ar.i18n.json
+++ b/i18n/ar.i18n.json
@@ -373,6 +373,7 @@
"watching": "مشاهدة",
"watching-info": "You will be notified of any change in this board",
"welcome-board": "لوحة التّرحيب",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "المبادئ",
"welcome-list2": "متقدم",
"what-to-do": "ماذا تريد أن تنجز?",
diff --git a/i18n/br.i18n.json b/i18n/br.i18n.json
index 606da14b..a16370f5 100644
--- a/i18n/br.i18n.json
+++ b/i18n/br.i18n.json
@@ -373,6 +373,7 @@
"watching": "Watching",
"watching-info": "You will be notified of any change in this board",
"welcome-board": "Welcome Board",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Basics",
"welcome-list2": "Advanced",
"what-to-do": "What do you want to do?",
diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json
index 974b9480..7e3d1a90 100644
--- a/i18n/ca.i18n.json
+++ b/i18n/ca.i18n.json
@@ -373,6 +373,7 @@
"watching": "En observació",
"watching-info": "Seràs notificat de cada canvi en aquest tauler",
"welcome-board": "Tauler de benvinguda",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Bàsics",
"welcome-list2": "Avançades",
"what-to-do": "Què vols fer?",
diff --git a/i18n/cs.i18n.json b/i18n/cs.i18n.json
index 9f7a222d..c2185071 100644
--- a/i18n/cs.i18n.json
+++ b/i18n/cs.i18n.json
@@ -373,6 +373,7 @@
"watching": "Watching",
"watching-info": "You will be notified of any change in this board",
"welcome-board": "Welcome Board",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Basics",
"welcome-list2": "Advanced",
"what-to-do": "Co chcete dělat?",
diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json
index 5d19e04f..2ba3f5d0 100644
--- a/i18n/de.i18n.json
+++ b/i18n/de.i18n.json
@@ -12,7 +12,7 @@
"act-archivedBoard": "hat __board__ archiviert",
"act-archivedCard": "hat __card__ archiviert",
"act-archivedList": "hat __list__ archiviert",
- "act-archivedSwimlane": "archived __swimlane__",
+ "act-archivedSwimlane": "__swimlane__ wurde archiviert",
"act-importBoard": "hat __board__ importiert",
"act-importCard": "hat __card__ importiert",
"act-importList": "hat __list__ importiert",
@@ -45,7 +45,7 @@
"add-attachment": "Datei anhängen",
"add-board": "neues Board",
"add-card": "Karte hinzufügen",
- "add-swimlane": "Add Swimlane",
+ "add-swimlane": "Swimlane hinzufügen",
"add-checklist": "Checkliste hinzufügen",
"add-checklist-item": "Punkt zu einer Checkliste hinzufügen",
"add-cover": "Cover hinzufügen",
@@ -69,7 +69,7 @@
"archive-board": "Board archivieren",
"archive-card": "Karte archivieren",
"archive-list": "Liste archivieren",
- "archive-swimlane": "Archive Swimlane",
+ "archive-swimlane": "Swimlane archivieren",
"archive-selection": "Auswahl archivieren",
"archiveBoardPopup-title": "Board archivieren?",
"archived-items": "Archivierte Einträge",
@@ -97,7 +97,7 @@
"boardChangeWatchPopup-title": "Beobachtung ändern",
"boardMenuPopup-title": "Boardmenü",
"boards": "Boards",
- "board-view": "Board View",
+ "board-view": "Boardansicht",
"board-view-swimlanes": "Swimlanes",
"board-view-lists": "Listen",
"bucket-example": "z.B. \"Löffelliste\"",
@@ -157,7 +157,7 @@
"comment-only-desc": "Kann Karten nur Kommentieren",
"computer": "Computer",
"confirm-checklist-delete-dialog": "Sind Sie sicher, dass Sie die Checkliste löschen möchten?",
- "copy-card-link-to-clipboard": "Kopiere die Karte in die Zwischenablage",
+ "copy-card-link-to-clipboard": "Kopiere Link zur Karte in die Zwischenablage",
"copyCardPopup-title": "Karte kopieren",
"create": "Erstellen",
"createBoardPopup-title": "Board erstellen",
@@ -265,7 +265,7 @@
"list-move-cards": "Alle Karten in dieser Liste verschieben",
"list-select-cards": "Alle Karten in dieser Liste auswählen",
"listActionPopup-title": "Listenaktionen",
- "swimlaneActionPopup-title": "Swimlane Actions",
+ "swimlaneActionPopup-title": "Swimlaneaktionen",
"listImportCardPopup-title": "Eine Trello-Karte importieren",
"listMorePopup-title": "Mehr",
"link-list": "Link zu dieser Liste",
@@ -292,7 +292,7 @@
"name": "Name",
"no-archived-cards": "Keine archivierten Karten.",
"no-archived-lists": "Keine archivierten Listen.",
- "no-archived-swimlanes": "No archived swimlanes.",
+ "no-archived-swimlanes": "Keine archivierten Swimlanes",
"no-results": "Keine Ergebnisse",
"normal": "Normal",
"normal-desc": "Kann Karten anschauen und bearbeiten, aber keine Einstellungen ändern.",
@@ -373,6 +373,7 @@
"watching": "Beobachten",
"watching-info": "Sie werden über alle Änderungen in diesem Board benachrichtigt",
"welcome-board": "Willkommen-Board",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Grundlagen",
"welcome-list2": "Fortgeschritten",
"what-to-do": "Was wollen Sie tun?",
diff --git a/i18n/el.i18n.json b/i18n/el.i18n.json
index a4d63317..85facaee 100644
--- a/i18n/el.i18n.json
+++ b/i18n/el.i18n.json
@@ -373,6 +373,7 @@
"watching": "Watching",
"watching-info": "You will be notified of any change in this board",
"welcome-board": "Welcome Board",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Basics",
"welcome-list2": "Advanced",
"what-to-do": "What do you want to do?",
diff --git a/i18n/en-GB.i18n.json b/i18n/en-GB.i18n.json
index 192ee49d..94bb1571 100644
--- a/i18n/en-GB.i18n.json
+++ b/i18n/en-GB.i18n.json
@@ -373,6 +373,7 @@
"watching": "Watching",
"watching-info": "You will be notified of any changes in this board",
"welcome-board": "Welcome Board",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Basics",
"welcome-list2": "Advanced",
"what-to-do": "What do you want to do?",
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index ec9c1c96..92391c91 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -373,6 +373,7 @@
"watching": "Watching",
"watching-info": "You will be notified of any change in this board",
"welcome-board": "Welcome Board",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Basics",
"welcome-list2": "Advanced",
"what-to-do": "What do you want to do?",
diff --git a/i18n/eo.i18n.json b/i18n/eo.i18n.json
index bef1c351..1fde9a8a 100644
--- a/i18n/eo.i18n.json
+++ b/i18n/eo.i18n.json
@@ -373,6 +373,7 @@
"watching": "Rigardante",
"watching-info": "You will be notified of any change in this board",
"welcome-board": "Welcome Board",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Basics",
"welcome-list2": "Advanced",
"what-to-do": "Kion vi volas fari?",
diff --git a/i18n/es-AR.i18n.json b/i18n/es-AR.i18n.json
index cce90c79..4b26cced 100644
--- a/i18n/es-AR.i18n.json
+++ b/i18n/es-AR.i18n.json
@@ -373,6 +373,7 @@
"watching": "Siguiendo",
"watching-info": "Serás notificado de cualquier cambio en este tablero",
"welcome-board": "Tablero de Bienvenida",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Básicos",
"welcome-list2": "Avanzado",
"what-to-do": "¿Qué querés hacer?",
diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json
index ba95a588..1fb922fd 100644
--- a/i18n/es.i18n.json
+++ b/i18n/es.i18n.json
@@ -373,6 +373,7 @@
"watching": "Vigilando",
"watching-info": "Serás notificado de cualquier cambio en este tablero",
"welcome-board": "Tablero de bienvenida",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Básicos",
"welcome-list2": "Avanzados",
"what-to-do": "¿Qué deseas hacer?",
diff --git a/i18n/eu.i18n.json b/i18n/eu.i18n.json
index f0b6ae05..65fc5093 100644
--- a/i18n/eu.i18n.json
+++ b/i18n/eu.i18n.json
@@ -373,6 +373,7 @@
"watching": "Ikuskatzen",
"watching-info": "Arbel honi egindako aldaketak jakinaraziko zaizkizu",
"welcome-board": "Ongi etorri arbela",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Oinarrizkoa",
"welcome-list2": "Aurreratua",
"what-to-do": "Zer egin nahi duzu?",
diff --git a/i18n/fa.i18n.json b/i18n/fa.i18n.json
index 6326c2ae..36ab25f5 100644
--- a/i18n/fa.i18n.json
+++ b/i18n/fa.i18n.json
@@ -373,6 +373,7 @@
"watching": "درحال دیده بانی",
"watching-info": "شما از هر تغییری دراین تخته آگاه خواهید شد",
"welcome-board": "به این تخته خوش آمدید",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "پایه ای ها",
"welcome-list2": "پیشرفته",
"what-to-do": "چه کاری می خواهید انجام دهید؟",
diff --git a/i18n/fi.i18n.json b/i18n/fi.i18n.json
index 51565d84..5faf83fc 100644
--- a/i18n/fi.i18n.json
+++ b/i18n/fi.i18n.json
@@ -373,6 +373,7 @@
"watching": "Seurataan",
"watching-info": "Sinulle ilmoitetaan tämän taulun muutoksista",
"welcome-board": "Tervetuloa taulu",
+ "welcome-swimlane": "Merkkipaalu 1",
"welcome-list1": "Perusasiat",
"welcome-list2": "Edistynyt",
"what-to-do": "Mitä haluat tehdä?",
diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json
index 6a88475f..e06660e8 100644
--- a/i18n/fr.i18n.json
+++ b/i18n/fr.i18n.json
@@ -373,6 +373,7 @@
"watching": "Suivi",
"watching-info": "Vous serez notifié de toute modification dans ce tableau",
"welcome-board": "Tableau de bienvenue",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Basiques",
"welcome-list2": "Avancés",
"what-to-do": "Que voulez-vous faire ?",
diff --git a/i18n/gl.i18n.json b/i18n/gl.i18n.json
index 80a6b592..60eb40b4 100644
--- a/i18n/gl.i18n.json
+++ b/i18n/gl.i18n.json
@@ -373,6 +373,7 @@
"watching": "Vixiando",
"watching-info": "Recibirá unha notificación sobre calquera cambio que se produza neste taboleiro",
"welcome-board": "Taboleiro de benvida",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Fundamentos",
"welcome-list2": "Avanzado",
"what-to-do": "Que desexa facer?",
diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json
index 907f2c5f..6a911cb5 100644
--- a/i18n/he.i18n.json
+++ b/i18n/he.i18n.json
@@ -373,6 +373,7 @@
"watching": "במעקב",
"watching-info": "מעתה יגיעו אליך דיווחים על כל שינוי בלוח זה",
"welcome-board": "לוח קבלת פנים",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "יסודות",
"welcome-list2": "מתקדם",
"what-to-do": "מה ברצונך לעשות?",
diff --git a/i18n/hu.i18n.json b/i18n/hu.i18n.json
index 1670c4a2..1bf98d3f 100644
--- a/i18n/hu.i18n.json
+++ b/i18n/hu.i18n.json
@@ -373,6 +373,7 @@
"watching": "Megfigyelés",
"watching-info": "Értesítve lesz a táblán lévő összes változásról",
"welcome-board": "Üdvözlő tábla",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Alapok",
"welcome-list2": "Speciális",
"what-to-do": "Mit szeretne tenni?",
diff --git a/i18n/id.i18n.json b/i18n/id.i18n.json
index d3a47b84..9b58b42f 100644
--- a/i18n/id.i18n.json
+++ b/i18n/id.i18n.json
@@ -373,6 +373,7 @@
"watching": "Mengamati",
"watching-info": "Anda akan diberitahu semua perubahan di panel ini",
"welcome-board": "Panel Selamat Datang",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Tingkat dasar",
"welcome-list2": "Tingkat lanjut",
"what-to-do": "Apa yang mau Anda lakukan?",
diff --git a/i18n/ig.i18n.json b/i18n/ig.i18n.json
index a4637db3..700a200e 100644
--- a/i18n/ig.i18n.json
+++ b/i18n/ig.i18n.json
@@ -373,6 +373,7 @@
"watching": "Watching",
"watching-info": "You will be notified of any change in this board",
"welcome-board": "Welcome Board",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Basics",
"welcome-list2": "Advanced",
"what-to-do": "What do you want to do?",
diff --git a/i18n/it.i18n.json b/i18n/it.i18n.json
index 2fe77f99..30406a16 100644
--- a/i18n/it.i18n.json
+++ b/i18n/it.i18n.json
@@ -373,6 +373,7 @@
"watching": "Stai seguendo",
"watching-info": "Sarai notificato per tutte le modifiche in questa bacheca",
"welcome-board": "Bacheca di benvenuto",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Basi",
"welcome-list2": "Avanzate",
"what-to-do": "Cosa vuoi fare?",
diff --git a/i18n/ja.i18n.json b/i18n/ja.i18n.json
index 48cc97cc..df0de2d2 100644
--- a/i18n/ja.i18n.json
+++ b/i18n/ja.i18n.json
@@ -373,6 +373,7 @@
"watching": "ウォッチしています",
"watching-info": "このボードの変更が通知されます",
"welcome-board": "ウェルカムボード",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "基本",
"welcome-list2": "高度",
"what-to-do": "何をしたいですか?",
diff --git a/i18n/ko.i18n.json b/i18n/ko.i18n.json
index edd39e66..bdbb0e46 100644
--- a/i18n/ko.i18n.json
+++ b/i18n/ko.i18n.json
@@ -373,6 +373,7 @@
"watching": "감시 중",
"watching-info": "\"이 보드의 변경사항을 알림으로 받습니다.",
"welcome-board": "보드예제",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "신규",
"welcome-list2": "진행",
"what-to-do": "무엇을 하고 싶으신가요?",
diff --git a/i18n/lv.i18n.json b/i18n/lv.i18n.json
index 65e68ac7..be457024 100644
--- a/i18n/lv.i18n.json
+++ b/i18n/lv.i18n.json
@@ -373,6 +373,7 @@
"watching": "Watching",
"watching-info": "You will be notified of any change in this board",
"welcome-board": "Welcome Board",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Basics",
"welcome-list2": "Advanced",
"what-to-do": "What do you want to do?",
diff --git a/i18n/mn.i18n.json b/i18n/mn.i18n.json
index 2f43cfaa..57ecf1c8 100644
--- a/i18n/mn.i18n.json
+++ b/i18n/mn.i18n.json
@@ -373,6 +373,7 @@
"watching": "Watching",
"watching-info": "You will be notified of any change in this board",
"welcome-board": "Welcome Board",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Basics",
"welcome-list2": "Advanced",
"what-to-do": "What do you want to do?",
diff --git a/i18n/nb.i18n.json b/i18n/nb.i18n.json
index 21d82ad7..adadc678 100644
--- a/i18n/nb.i18n.json
+++ b/i18n/nb.i18n.json
@@ -373,6 +373,7 @@
"watching": "Watching",
"watching-info": "You will be notified of any change in this board",
"welcome-board": "Welcome Board",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Basics",
"welcome-list2": "Advanced",
"what-to-do": "What do you want to do?",
diff --git a/i18n/nl.i18n.json b/i18n/nl.i18n.json
index bd1c5fc8..024f8eab 100644
--- a/i18n/nl.i18n.json
+++ b/i18n/nl.i18n.json
@@ -373,6 +373,7 @@
"watching": "Bekijken",
"watching-info": "Je zal op de hoogte worden gesteld als er een verandering gebeurt op dit bord.",
"welcome-board": "Welkom Bord",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Basis",
"welcome-list2": "Geadvanceerd",
"what-to-do": "Wat wil je doen?",
diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json
index 610b1f21..1c00b41e 100644
--- a/i18n/pl.i18n.json
+++ b/i18n/pl.i18n.json
@@ -373,6 +373,7 @@
"watching": "Obserwujesz",
"watching-info": "You will be notified of any change in this board",
"welcome-board": "Welcome Board",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Podstawy",
"welcome-list2": "Zaawansowane",
"what-to-do": "Co chcesz zrobić?",
diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json
index 27d712b3..f827c79c 100644
--- a/i18n/pt-BR.i18n.json
+++ b/i18n/pt-BR.i18n.json
@@ -373,6 +373,7 @@
"watching": "Observando",
"watching-info": "Você será notificado em qualquer alteração desse board",
"welcome-board": "Board de Boas Vindas",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Básico",
"welcome-list2": "Avançado",
"what-to-do": "O que você gostaria de fazer?",
diff --git a/i18n/pt.i18n.json b/i18n/pt.i18n.json
index be9c53d9..af001b31 100644
--- a/i18n/pt.i18n.json
+++ b/i18n/pt.i18n.json
@@ -373,6 +373,7 @@
"watching": "Watching",
"watching-info": "You will be notified of any change in this board",
"welcome-board": "Welcome Board",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Basics",
"welcome-list2": "Advanced",
"what-to-do": "What do you want to do?",
diff --git a/i18n/ro.i18n.json b/i18n/ro.i18n.json
index 71344c1c..aeae6a62 100644
--- a/i18n/ro.i18n.json
+++ b/i18n/ro.i18n.json
@@ -373,6 +373,7 @@
"watching": "Watching",
"watching-info": "You will be notified of any change in this board",
"welcome-board": "Welcome Board",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Basics",
"welcome-list2": "Advanced",
"what-to-do": "Ce ai vrea sa faci?",
diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json
index 453510cf..6e3710b0 100644
--- a/i18n/ru.i18n.json
+++ b/i18n/ru.i18n.json
@@ -373,6 +373,7 @@
"watching": "Отслеживается",
"watching-info": "Вы будете уведомлены об любых изменениях в этой доске.",
"welcome-board": "Приветственная Доска",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Основы",
"welcome-list2": "Расширенно",
"what-to-do": "Что вы хотите сделать?",
diff --git a/i18n/sr.i18n.json b/i18n/sr.i18n.json
index aa605c39..7d4bb907 100644
--- a/i18n/sr.i18n.json
+++ b/i18n/sr.i18n.json
@@ -373,6 +373,7 @@
"watching": "Posmatranje",
"watching-info": "Bićete obavešteni o promenama u ovoj tabli",
"welcome-board": "Tabla dobrodošlice",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Osnove",
"welcome-list2": "Napredno",
"what-to-do": "Šta želiš da uradiš ?",
diff --git a/i18n/sv.i18n.json b/i18n/sv.i18n.json
index 63038f81..1d8a9564 100644
--- a/i18n/sv.i18n.json
+++ b/i18n/sv.i18n.json
@@ -373,6 +373,7 @@
"watching": "Bevakar",
"watching-info": "Du kommer att meddelas om alla ändringar på denna anslagstavla",
"welcome-board": "Välkomstanslagstavla",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Grunderna",
"welcome-list2": "Avancerad",
"what-to-do": "Vad vill du göra?",
diff --git a/i18n/ta.i18n.json b/i18n/ta.i18n.json
index 8406cb1c..15960646 100644
--- a/i18n/ta.i18n.json
+++ b/i18n/ta.i18n.json
@@ -373,6 +373,7 @@
"watching": "Watching",
"watching-info": "You will be notified of any change in this board",
"welcome-board": "Welcome Board",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Basics",
"welcome-list2": "Advanced",
"what-to-do": "What do you want to do?",
diff --git a/i18n/th.i18n.json b/i18n/th.i18n.json
index 39d701bf..5f609372 100644
--- a/i18n/th.i18n.json
+++ b/i18n/th.i18n.json
@@ -373,6 +373,7 @@
"watching": "เฝ้าดู",
"watching-info": "คุณจะได้รับแจ้งหากมีการเปลี่ยนแปลงใด ๆ ในบอร์ดนี้",
"welcome-board": "ยินดีต้อนรับสู่บอร์ด",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "พื้นฐาน",
"welcome-list2": "ก้าวหน้า",
"what-to-do": "ต้องการทำอะไร",
diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json
index d5ffc742..2c86ad0e 100644
--- a/i18n/tr.i18n.json
+++ b/i18n/tr.i18n.json
@@ -373,6 +373,7 @@
"watching": "Takip Ediliyor",
"watching-info": "Bu pano hakkındaki tüm değişiklikler hakkında bildirim alacaksınız",
"welcome-board": "Hoş Geldiniz Panosu",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Temel",
"welcome-list2": "Gelişmiş",
"what-to-do": "Ne yapmak istiyorsunuz?",
diff --git a/i18n/uk.i18n.json b/i18n/uk.i18n.json
index ded7bba7..4d34f57c 100644
--- a/i18n/uk.i18n.json
+++ b/i18n/uk.i18n.json
@@ -373,6 +373,7 @@
"watching": "Watching",
"watching-info": "You will be notified of any change in this board",
"welcome-board": "Welcome Board",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Basics",
"welcome-list2": "Advanced",
"what-to-do": "What do you want to do?",
diff --git a/i18n/vi.i18n.json b/i18n/vi.i18n.json
index 9182d2ef..2664a7de 100644
--- a/i18n/vi.i18n.json
+++ b/i18n/vi.i18n.json
@@ -373,6 +373,7 @@
"watching": "Watching",
"watching-info": "You will be notified of any change in this board",
"welcome-board": "Welcome Board",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "Basics",
"welcome-list2": "Advanced",
"what-to-do": "What do you want to do?",
diff --git a/i18n/zh-CN.i18n.json b/i18n/zh-CN.i18n.json
index 0d436158..500168c0 100644
--- a/i18n/zh-CN.i18n.json
+++ b/i18n/zh-CN.i18n.json
@@ -373,6 +373,7 @@
"watching": "关注",
"watching-info": "当此看板发生变更时会通知你",
"welcome-board": "“欢迎”看板",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "基本",
"welcome-list2": "高阶",
"what-to-do": "要做什么?",
diff --git a/i18n/zh-TW.i18n.json b/i18n/zh-TW.i18n.json
index 18cd452c..279c3709 100644
--- a/i18n/zh-TW.i18n.json
+++ b/i18n/zh-TW.i18n.json
@@ -373,6 +373,7 @@
"watching": "觀察中",
"watching-info": "你將會收到關於這個看板所有的變更通知",
"welcome-board": "歡迎進入看板",
+ "welcome-swimlane": "Milestone 1",
"welcome-list1": "基本",
"welcome-list2": "進階",
"what-to-do": "要做什麼?",
diff --git a/models/export.js b/models/export.js
index 49656134..c6632198 100644
--- a/models/export.js
+++ b/models/export.js
@@ -53,6 +53,7 @@ class Exporter {
_.extend(result, Boards.findOne(this._boardId, { fields: { stars: 0 } }));
result.lists = Lists.find(byBoard, noBoardId).fetch();
result.cards = Cards.find(byBoard, noBoardId).fetch();
+ result.swimlanes = Swimlanes.find(byBoard, noBoardId).fetch();
result.comments = CardComments.find(byBoard, noBoardId).fetch();
result.activities = Activities.find(byBoard, noBoardId).fetch();
result.checklists = [];
diff --git a/models/users.js b/models/users.js
index 92cee9f6..88a0627b 100644
--- a/models/users.js
+++ b/models/users.js
@@ -549,6 +549,11 @@ if (Meteor.isServer) {
permission: 'private',
}, fakeUser, (err, boardId) => {
+ Swimlanes.insert({
+ title: TAPi18n.__('welcome-swimlane'),
+ boardId,
+ }, fakeUser);
+
['welcome-list1', 'welcome-list2'].forEach((title) => {
Lists.insert({title: TAPi18n.__(title), boardId}, fakeUser);
});
diff --git a/models/wekanCreator.js b/models/wekanCreator.js
index b1533baa..d774db67 100644
--- a/models/wekanCreator.js
+++ b/models/wekanCreator.js
@@ -14,6 +14,7 @@ export class WekanCreator {
board: null,
cards: {},
lists: {},
+ swimlanes: {},
};
// The object creator Wekan Id, indexed by the object Wekan id
// (so we only parse actions once!)
@@ -23,6 +24,8 @@ export class WekanCreator {
// Map of labels Wekan ID => Wekan ID
this.labels = {};
+ // Map of swimlanes Wekan ID => Wekan ID
+ this.swimlanes = {};
// Map of lists Wekan ID => Wekan ID
this.lists = {};
// Map of cards Wekan ID => Wekan ID
@@ -121,6 +124,13 @@ export class WekanCreator {
})]);
}
+ checkSwimlanes(wekanSwimlanes) {
+ check(wekanSwimlanes, [Match.ObjectIncluding({
+ archived: Boolean,
+ title: String,
+ })]);
+ }
+
checkChecklists(wekanChecklists) {
check(wekanChecklists, [Match.ObjectIncluding({
cardId: String,
@@ -213,6 +223,7 @@ export class WekanCreator {
dateLastActivity: this._now(),
description: card.description,
listId: this.lists[card.listId],
+ swimlaneId: this.swimlanes[card.swimlaneId],
sort: card.sort,
title: card.title,
// we attribute the card to its creator if available
@@ -402,6 +413,24 @@ export class WekanCreator {
});
}
+ createSwimlanes(wekanSwimlanes, boardId) {
+ wekanSwimlanes.forEach((swimlane) => {
+ const swimlaneToCreate = {
+ archived: swimlane.archived,
+ 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(this.createdAt.swimlanes[swimlane._id]),
+ title: swimlane.title,
+ };
+ const swimlaneId = Swimlanes.direct.insert(swimlaneToCreate);
+ Swimlanes.direct.update(swimlaneId, {$set: {'updatedAt': this._now()}});
+ this.swimlanes[swimlane._id] = swimlaneId;
+ });
+ }
+
createChecklists(wekanChecklists) {
wekanChecklists.forEach((checklist, checklistIndex) => {
// Create the checklist
@@ -474,6 +503,11 @@ export class WekanCreator {
const listId = activity.listId;
this.createdAt.lists[listId] = activity.createdAt;
break;
+ }
+ case 'createSwimlane': {
+ const swimlaneId = activity.swimlaneId;
+ this.createdAt.swimlanes[swimlaneId] = activity.createdAt;
+ break;
}}
});
}
@@ -595,6 +629,7 @@ export class WekanCreator {
this.checkBoard(board);
this.checkLabels(board.labels);
this.checkLists(board.lists);
+ this.checkSwimlanes(board.swimlanes);
this.checkCards(board.cards);
this.checkChecklists(board.checklists);
} catch (e) {
@@ -613,6 +648,7 @@ export class WekanCreator {
this.parseActivities(board);
const boardId = this.createBoardAndLabels(board);
this.createLists(board.lists, boardId);
+ this.createSwimlanes(board.swimlanes, boardId);
this.createCards(board.cards, boardId);
this.createChecklists(board.checklists);
this.importActivities(board.activities, boardId);
diff --git a/package.json b/package.json
index f2e026d1..e1f541ad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wekan",
- "version": "0.70.0",
+ "version": "0.71.0",
"description": "The open-source Trello-like kanban",
"private": true,
"scripts": {
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index 2f1ee692..ec33db58 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 = 55,
+ appVersion = 56,
# Increment this for every release.
- appMarketingVersion = (defaultText = "0.70.0~2018-02-02"),
+ appMarketingVersion = (defaultText = "0.71.0~2018-02-03"),
# Human-readable presentation of the app version.
minUpgradableAppVersion = 0,